diff --git a/.gitignore b/.gitignore index 64e3509..b213f95 100644 --- a/.gitignore +++ b/.gitignore @@ -1,35 +1,153 @@ -# Eclipse stuff -/.classpath -/.project -/.settings +### Eclipse ### +*.pydevproject +.metadata +.gradle +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath -# netbeans -/nbproject +# Eclipse Core +.project -# we use maven! -/build.xml +# External tool builders +.externalToolBuilders/ -# maven -/target +# Locally stored "Eclipse launch configurations" +*.launch -# vim -.*.sw[a-p] +# CDT-specific +.cproject -# various other potential build files -/build -/bin -/dist -/manifest.mf +# JDT-specific (Eclipse Java Development Tools) +.classpath -# Mac filesystem dust -/.DS_Store +# PDT-specific +.buildpath + +# sbteclipse plugin +.target + +# TeXlipse plugin +.texlipse + + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +nbactions.xml +nb-configuration.xml +.nb-gradle/ + + +### Intellij ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm -# intellij *.iml + +## Directory-based project format: +.idea/ +# if you remove the above rule, at least ignore the following: + +# User-specific stuff: +# .idea/workspace.xml +# .idea/tasks.xml +# .idea/dictionaries + +# Sensitive or high-churn files: +# .idea/dataSources.ids +# .idea/dataSources.xml +# .idea/sqlDataSources.xml +# .idea/dynamic.xml +# .idea/uiDesigner.xml + +# Gradle: +# .idea/gradle.xml +# .idea/libraries + +# Mongo Explorer plugin: +# .idea/mongoSettings.xml + +## File-based project format: *.ipr *.iws -.idea/ -/dependency-reduced-pom.xml -/*.pack -/local_launcher.properties \ No newline at end of file +## Plugin-specific files: + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties + + +### Java ### +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + + +### Maven ### +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties + + +### Gradle ### +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + + +### Windows ### +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# Windows shortcuts +*.lnk diff --git a/README.md b/README.md index 77e258d..46f7f5f 100644 --- a/README.md +++ b/README.md @@ -4,73 +4,56 @@ SKCraft Launcher This project provides an open-source Minecraft launcher platform for downloading, installing, and updating modpacks. -Introduction ------------- +The launcher has its roots in MC Alpha as a launcher for sk89q's server. -This launcher is maintained by sk89q, who writes WorldEdit, WorldGuard, and so on. It has -been primarily developed for his server, but you can use it for your own modpack or -server. +**Note:** "SKMCLauncher" is the *older* version of this launcher. This project is called "SKCraft Launcher." + +## Introduction -* One of Minecraft's oldest launchers -- since Minecraft Alpha * Requires almost no configuration files to make a modpack * Add a new mod by dropping in the .jar (and its configuration) * Remove a mod by deleting its .jar (and configuration). * Builds **server** modpacks with no extra configuration * Advanced download system: incremental, file removal detection, optional feature/mod selection, etc. * Very easy for users to use and install modpacks -* Pretty well-documented with easy-to-understand, well-organized code* * Open source! -*Except for the Launcher frame class. That one is pretty bad. +## Usage -### Previous Versions - -This repository only contains code for the launcher versions 4.x and newer. - -You can find [the 3.x version on GitHub](https://github.com/sk89q/skmclauncher). - -Documentation -------------- - -First off, be aware that the launcher in this directory has been branded for sk89q's -server, so you will have to replace that with your own. There's only a few places that -you need to do that, and it's all documented on our documentation page. - -**You can fork the project on GitHub** and make modifications. +1. Download the code. +2. See if you can compile it (see instructions below). +3. Read the documentation to (1) learn how to change the launcher to use your own website and (2) create modpacks in the right format for the launcher. * [Documentation](http://wiki.sk89q.com/wiki/Launcher) +* [Forum to ask for help](http://forum.enginehub.org/forums/launcher.25/) -Note that documentation may be lacking in some places. If you run into problems, -**do not hesitate to ask**. +You can also [contact sk89q](http://www.sk89q.com/contact/). -If you want to contact me about some sort of partnership, want to make the launcher -the official launcher for something, please email me (see -[my website](http://www.sk89q.com/contact/)). While you do not have to do this, we -can make future decisions with awareness of what the needs of other users may be. +## Compiling -Compiling ---------- +First, make sure to install the Java Development Kit (JDK). -The launcher can be compiled using [Maven](http://maven.apache.org/). +In your command prompt or terminal, run: - mvn clean package + ./gradlew clean build -If you wish to import the project into an IDE, you must add support for -Project Lombok. +If you are on Windows: -Contributing ------------- + gradlew clean build -Pull requests can be submitted on GitHub, but we will accept them -at our discretion. Please note that your code must follow -Oracle's Java Code Conventions. +Once compiled, look for the "-all" .jar files in the following folders: -Contributions by third parties must be dual licensed under the two licenses -described within LICENSE.txt (GNU General Public License, version 3, and the -3-clause BSD license). +* `launcher/build/libs/` - The main launcher +* `launcher-builder/build/libs/` - Command line app to build modpacks +If you wish to import the project into an IDE, you must add support for Project Lombok (IntelliJ IDEA users: also enable annotation processing in compiler settings). -License -------- +## Contributing + +Pull requests can be submitted on GitHub, but we will accept them at our discretion. Please note that your code must follow Oracle's Java Code Conventions. + +Contributions by third parties must be dual licensed under the two licenses described within LICENSE.txt (GNU General Public License, version 3, and the 3-clause BSD license). + +## License The launcher is licensed under the GNU General Public License, version 3. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..ce16d93 --- /dev/null +++ b/build.gradle @@ -0,0 +1,41 @@ +println """ +******************************************* + You are building SKCraft Launcher! + + Output files will be in [subproject]/build/libs +******************************************* +""" + +buildscript { + repositories { + mavenCentral() + jcenter() + } + + dependencies { + classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.0' + } +} + +subprojects { + apply plugin: 'java' + apply plugin: 'maven' + + group = 'com.skcraft' + version = '4.2.3-SNAPSHOT' + + sourceCompatibility = 1.6 + targetCompatibility = 1.6 + + repositories { + mavenCentral() + maven { url "http://repo.maven.apache.org/maven2" } + } + + if (JavaVersion.current().isJava8Compatible()) { + // Java 8 turns on doclint which we fail + tasks.withType(Javadoc) { + options.addStringOption('Xdoclint:none', '-quiet') + } + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..3d0dee6 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..b9c1aac --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Feb 18 18:57:36 PST 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..91a7e26 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# 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 +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# 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\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +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" ] ; 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"` + + # 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 + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..8a0b282 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@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 + +@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= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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 Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_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=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +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/launcher-builder/build.gradle b/launcher-builder/build.gradle new file mode 100644 index 0000000..828447c --- /dev/null +++ b/launcher-builder/build.gradle @@ -0,0 +1,21 @@ +apply plugin: 'com.github.johnrengelman.shadow' + +jar { + manifest { + attributes("Main-Class": "com.skcraft.launcher.builder.PackageBuilder") + } +} + +dependencies { + compile project(':launcher') + compile 'org.tukaani:xz:1.0' + compile 'org.apache.commons:commons-compress:1.9' +} + +shadowJar { + dependencies { + exclude(dependency('org.projectlombok:lombok')) + } +} + +build.dependsOn(shadowJar) \ No newline at end of file diff --git a/src/main/java/com/skcraft/launcher/builder/BuilderConfig.java b/launcher-builder/src/main/java/com/skcraft/launcher/builder/BuilderConfig.java similarity index 100% rename from src/main/java/com/skcraft/launcher/builder/BuilderConfig.java rename to launcher-builder/src/main/java/com/skcraft/launcher/builder/BuilderConfig.java diff --git a/src/main/java/com/skcraft/launcher/builder/BuilderOptions.java b/launcher-builder/src/main/java/com/skcraft/launcher/builder/BuilderOptions.java similarity index 100% rename from src/main/java/com/skcraft/launcher/builder/BuilderOptions.java rename to launcher-builder/src/main/java/com/skcraft/launcher/builder/BuilderOptions.java diff --git a/src/main/java/com/skcraft/launcher/builder/BuilderUtils.java b/launcher-builder/src/main/java/com/skcraft/launcher/builder/BuilderUtils.java similarity index 100% rename from src/main/java/com/skcraft/launcher/builder/BuilderUtils.java rename to launcher-builder/src/main/java/com/skcraft/launcher/builder/BuilderUtils.java diff --git a/src/main/java/com/skcraft/launcher/builder/ClientFileCollector.java b/launcher-builder/src/main/java/com/skcraft/launcher/builder/ClientFileCollector.java similarity index 100% rename from src/main/java/com/skcraft/launcher/builder/ClientFileCollector.java rename to launcher-builder/src/main/java/com/skcraft/launcher/builder/ClientFileCollector.java diff --git a/src/main/java/com/skcraft/launcher/builder/Compressor.java b/launcher-builder/src/main/java/com/skcraft/launcher/builder/Compressor.java similarity index 100% rename from src/main/java/com/skcraft/launcher/builder/Compressor.java rename to launcher-builder/src/main/java/com/skcraft/launcher/builder/Compressor.java diff --git a/src/main/java/com/skcraft/launcher/builder/DirectoryWalker.java b/launcher-builder/src/main/java/com/skcraft/launcher/builder/DirectoryWalker.java similarity index 100% rename from src/main/java/com/skcraft/launcher/builder/DirectoryWalker.java rename to launcher-builder/src/main/java/com/skcraft/launcher/builder/DirectoryWalker.java diff --git a/src/main/java/com/skcraft/launcher/builder/FeaturePattern.java b/launcher-builder/src/main/java/com/skcraft/launcher/builder/FeaturePattern.java similarity index 100% rename from src/main/java/com/skcraft/launcher/builder/FeaturePattern.java rename to launcher-builder/src/main/java/com/skcraft/launcher/builder/FeaturePattern.java diff --git a/src/main/java/com/skcraft/launcher/builder/FileInfo.java b/launcher-builder/src/main/java/com/skcraft/launcher/builder/FileInfo.java similarity index 100% rename from src/main/java/com/skcraft/launcher/builder/FileInfo.java rename to launcher-builder/src/main/java/com/skcraft/launcher/builder/FileInfo.java diff --git a/src/main/java/com/skcraft/launcher/builder/FileInfoScanner.java b/launcher-builder/src/main/java/com/skcraft/launcher/builder/FileInfoScanner.java similarity index 100% rename from src/main/java/com/skcraft/launcher/builder/FileInfoScanner.java rename to launcher-builder/src/main/java/com/skcraft/launcher/builder/FileInfoScanner.java diff --git a/src/main/java/com/skcraft/launcher/builder/FnMatch.java b/launcher-builder/src/main/java/com/skcraft/launcher/builder/FnMatch.java similarity index 100% rename from src/main/java/com/skcraft/launcher/builder/FnMatch.java rename to launcher-builder/src/main/java/com/skcraft/launcher/builder/FnMatch.java diff --git a/src/main/java/com/skcraft/launcher/builder/FnPatternList.java b/launcher-builder/src/main/java/com/skcraft/launcher/builder/FnPatternList.java similarity index 100% rename from src/main/java/com/skcraft/launcher/builder/FnPatternList.java rename to launcher-builder/src/main/java/com/skcraft/launcher/builder/FnPatternList.java diff --git a/src/main/java/com/skcraft/launcher/builder/JarFileFilter.java b/launcher-builder/src/main/java/com/skcraft/launcher/builder/JarFileFilter.java similarity index 100% rename from src/main/java/com/skcraft/launcher/builder/JarFileFilter.java rename to launcher-builder/src/main/java/com/skcraft/launcher/builder/JarFileFilter.java diff --git a/src/main/java/com/skcraft/launcher/builder/PackageBuilder.java b/launcher-builder/src/main/java/com/skcraft/launcher/builder/PackageBuilder.java similarity index 100% rename from src/main/java/com/skcraft/launcher/builder/PackageBuilder.java rename to launcher-builder/src/main/java/com/skcraft/launcher/builder/PackageBuilder.java diff --git a/src/main/java/com/skcraft/launcher/builder/PropertiesApplicator.java b/launcher-builder/src/main/java/com/skcraft/launcher/builder/PropertiesApplicator.java similarity index 100% rename from src/main/java/com/skcraft/launcher/builder/PropertiesApplicator.java rename to launcher-builder/src/main/java/com/skcraft/launcher/builder/PropertiesApplicator.java diff --git a/src/main/java/com/skcraft/launcher/builder/ServerCopyExport.java b/launcher-builder/src/main/java/com/skcraft/launcher/builder/ServerCopyExport.java similarity index 100% rename from src/main/java/com/skcraft/launcher/builder/ServerCopyExport.java rename to launcher-builder/src/main/java/com/skcraft/launcher/builder/ServerCopyExport.java diff --git a/src/main/java/com/skcraft/launcher/builder/ServerExportOptions.java b/launcher-builder/src/main/java/com/skcraft/launcher/builder/ServerExportOptions.java similarity index 100% rename from src/main/java/com/skcraft/launcher/builder/ServerExportOptions.java rename to launcher-builder/src/main/java/com/skcraft/launcher/builder/ServerExportOptions.java diff --git a/launcher/build.gradle b/launcher/build.gradle new file mode 100644 index 0000000..7385044 --- /dev/null +++ b/launcher/build.gradle @@ -0,0 +1,34 @@ +apply plugin: 'com.github.johnrengelman.shadow' + +jar { + manifest { + attributes("Main-Class": "com.skcraft.launcher.Launcher") + } +} + +dependencies { + compile 'org.projectlombok:lombok:1.12.2' + compile 'com.fasterxml.jackson.core:jackson-databind:2.3.0' + compile 'commons-lang:commons-lang:2.6' + compile 'commons-io:commons-io:1.2' + compile 'com.google.guava:guava:15.0' + compile 'com.beust:jcommander:1.32' + compile 'org.tukaani:xz:1.0' + compile 'org.apache.commons:commons-compress:1.9' +} + +processResources { + filesMatching('**/*.properties') { + filter { + it.replace('${project.version}', project.version) + } + } +} + +shadowJar { + dependencies { + exclude(dependency('org.projectlombok:lombok')) + } +} + +build.dependsOn(shadowJar) \ No newline at end of file diff --git a/src/main/java/com/skcraft/concurrency/DefaultProgress.java b/launcher/src/main/java/com/skcraft/concurrency/DefaultProgress.java similarity index 100% rename from src/main/java/com/skcraft/concurrency/DefaultProgress.java rename to launcher/src/main/java/com/skcraft/concurrency/DefaultProgress.java diff --git a/src/main/java/com/skcraft/concurrency/ObservableFuture.java b/launcher/src/main/java/com/skcraft/concurrency/ObservableFuture.java similarity index 100% rename from src/main/java/com/skcraft/concurrency/ObservableFuture.java rename to launcher/src/main/java/com/skcraft/concurrency/ObservableFuture.java diff --git a/src/main/java/com/skcraft/concurrency/ProgressFilter.java b/launcher/src/main/java/com/skcraft/concurrency/ProgressFilter.java similarity index 100% rename from src/main/java/com/skcraft/concurrency/ProgressFilter.java rename to launcher/src/main/java/com/skcraft/concurrency/ProgressFilter.java diff --git a/src/main/java/com/skcraft/concurrency/ProgressObservable.java b/launcher/src/main/java/com/skcraft/concurrency/ProgressObservable.java similarity index 100% rename from src/main/java/com/skcraft/concurrency/ProgressObservable.java rename to launcher/src/main/java/com/skcraft/concurrency/ProgressObservable.java diff --git a/src/main/java/com/skcraft/launcher/AssetsRoot.java b/launcher/src/main/java/com/skcraft/launcher/AssetsRoot.java similarity index 100% rename from src/main/java/com/skcraft/launcher/AssetsRoot.java rename to launcher/src/main/java/com/skcraft/launcher/AssetsRoot.java diff --git a/src/main/java/com/skcraft/launcher/Configuration.java b/launcher/src/main/java/com/skcraft/launcher/Configuration.java similarity index 100% rename from src/main/java/com/skcraft/launcher/Configuration.java rename to launcher/src/main/java/com/skcraft/launcher/Configuration.java diff --git a/src/main/java/com/skcraft/launcher/Instance.java b/launcher/src/main/java/com/skcraft/launcher/Instance.java similarity index 100% rename from src/main/java/com/skcraft/launcher/Instance.java rename to launcher/src/main/java/com/skcraft/launcher/Instance.java diff --git a/src/main/java/com/skcraft/launcher/InstanceList.java b/launcher/src/main/java/com/skcraft/launcher/InstanceList.java similarity index 100% rename from src/main/java/com/skcraft/launcher/InstanceList.java rename to launcher/src/main/java/com/skcraft/launcher/InstanceList.java diff --git a/src/main/java/com/skcraft/launcher/Launcher.java b/launcher/src/main/java/com/skcraft/launcher/Launcher.java similarity index 100% rename from src/main/java/com/skcraft/launcher/Launcher.java rename to launcher/src/main/java/com/skcraft/launcher/Launcher.java diff --git a/src/main/java/com/skcraft/launcher/LauncherArguments.java b/launcher/src/main/java/com/skcraft/launcher/LauncherArguments.java similarity index 100% rename from src/main/java/com/skcraft/launcher/LauncherArguments.java rename to launcher/src/main/java/com/skcraft/launcher/LauncherArguments.java diff --git a/src/main/java/com/skcraft/launcher/LauncherException.java b/launcher/src/main/java/com/skcraft/launcher/LauncherException.java similarity index 100% rename from src/main/java/com/skcraft/launcher/LauncherException.java rename to launcher/src/main/java/com/skcraft/launcher/LauncherException.java diff --git a/src/main/java/com/skcraft/launcher/LauncherUtils.java b/launcher/src/main/java/com/skcraft/launcher/LauncherUtils.java similarity index 100% rename from src/main/java/com/skcraft/launcher/LauncherUtils.java rename to launcher/src/main/java/com/skcraft/launcher/LauncherUtils.java diff --git a/src/main/java/com/skcraft/launcher/auth/Account.java b/launcher/src/main/java/com/skcraft/launcher/auth/Account.java similarity index 100% rename from src/main/java/com/skcraft/launcher/auth/Account.java rename to launcher/src/main/java/com/skcraft/launcher/auth/Account.java diff --git a/src/main/java/com/skcraft/launcher/auth/AccountList.java b/launcher/src/main/java/com/skcraft/launcher/auth/AccountList.java similarity index 100% rename from src/main/java/com/skcraft/launcher/auth/AccountList.java rename to launcher/src/main/java/com/skcraft/launcher/auth/AccountList.java diff --git a/src/main/java/com/skcraft/launcher/auth/AuthenticationException.java b/launcher/src/main/java/com/skcraft/launcher/auth/AuthenticationException.java similarity index 100% rename from src/main/java/com/skcraft/launcher/auth/AuthenticationException.java rename to launcher/src/main/java/com/skcraft/launcher/auth/AuthenticationException.java diff --git a/src/main/java/com/skcraft/launcher/auth/LoginService.java b/launcher/src/main/java/com/skcraft/launcher/auth/LoginService.java similarity index 100% rename from src/main/java/com/skcraft/launcher/auth/LoginService.java rename to launcher/src/main/java/com/skcraft/launcher/auth/LoginService.java diff --git a/src/main/java/com/skcraft/launcher/auth/OfflineSession.java b/launcher/src/main/java/com/skcraft/launcher/auth/OfflineSession.java similarity index 100% rename from src/main/java/com/skcraft/launcher/auth/OfflineSession.java rename to launcher/src/main/java/com/skcraft/launcher/auth/OfflineSession.java diff --git a/src/main/java/com/skcraft/launcher/auth/Session.java b/launcher/src/main/java/com/skcraft/launcher/auth/Session.java similarity index 100% rename from src/main/java/com/skcraft/launcher/auth/Session.java rename to launcher/src/main/java/com/skcraft/launcher/auth/Session.java diff --git a/src/main/java/com/skcraft/launcher/auth/UserType.java b/launcher/src/main/java/com/skcraft/launcher/auth/UserType.java similarity index 100% rename from src/main/java/com/skcraft/launcher/auth/UserType.java rename to launcher/src/main/java/com/skcraft/launcher/auth/UserType.java diff --git a/src/main/java/com/skcraft/launcher/auth/YggdrasilLoginService.java b/launcher/src/main/java/com/skcraft/launcher/auth/YggdrasilLoginService.java similarity index 100% rename from src/main/java/com/skcraft/launcher/auth/YggdrasilLoginService.java rename to launcher/src/main/java/com/skcraft/launcher/auth/YggdrasilLoginService.java diff --git a/src/main/java/com/skcraft/launcher/dialog/ConfigurationDialog.java b/launcher/src/main/java/com/skcraft/launcher/dialog/ConfigurationDialog.java similarity index 100% rename from src/main/java/com/skcraft/launcher/dialog/ConfigurationDialog.java rename to launcher/src/main/java/com/skcraft/launcher/dialog/ConfigurationDialog.java diff --git a/src/main/java/com/skcraft/launcher/dialog/ConsoleFrame.java b/launcher/src/main/java/com/skcraft/launcher/dialog/ConsoleFrame.java similarity index 100% rename from src/main/java/com/skcraft/launcher/dialog/ConsoleFrame.java rename to launcher/src/main/java/com/skcraft/launcher/dialog/ConsoleFrame.java diff --git a/src/main/java/com/skcraft/launcher/dialog/FeatureSelectionDialog.java b/launcher/src/main/java/com/skcraft/launcher/dialog/FeatureSelectionDialog.java similarity index 100% rename from src/main/java/com/skcraft/launcher/dialog/FeatureSelectionDialog.java rename to launcher/src/main/java/com/skcraft/launcher/dialog/FeatureSelectionDialog.java diff --git a/src/main/java/com/skcraft/launcher/dialog/LauncherFrame.java b/launcher/src/main/java/com/skcraft/launcher/dialog/LauncherFrame.java similarity index 100% rename from src/main/java/com/skcraft/launcher/dialog/LauncherFrame.java rename to launcher/src/main/java/com/skcraft/launcher/dialog/LauncherFrame.java diff --git a/src/main/java/com/skcraft/launcher/dialog/LoginDialog.java b/launcher/src/main/java/com/skcraft/launcher/dialog/LoginDialog.java similarity index 100% rename from src/main/java/com/skcraft/launcher/dialog/LoginDialog.java rename to launcher/src/main/java/com/skcraft/launcher/dialog/LoginDialog.java diff --git a/src/main/java/com/skcraft/launcher/dialog/ProcessConsoleFrame.java b/launcher/src/main/java/com/skcraft/launcher/dialog/ProcessConsoleFrame.java similarity index 100% rename from src/main/java/com/skcraft/launcher/dialog/ProcessConsoleFrame.java rename to launcher/src/main/java/com/skcraft/launcher/dialog/ProcessConsoleFrame.java diff --git a/src/main/java/com/skcraft/launcher/dialog/ProgressDialog.java b/launcher/src/main/java/com/skcraft/launcher/dialog/ProgressDialog.java similarity index 100% rename from src/main/java/com/skcraft/launcher/dialog/ProgressDialog.java rename to launcher/src/main/java/com/skcraft/launcher/dialog/ProgressDialog.java diff --git a/src/main/java/com/skcraft/launcher/install/Downloader.java b/launcher/src/main/java/com/skcraft/launcher/install/Downloader.java similarity index 100% rename from src/main/java/com/skcraft/launcher/install/Downloader.java rename to launcher/src/main/java/com/skcraft/launcher/install/Downloader.java diff --git a/src/main/java/com/skcraft/launcher/install/FeatureCache.java b/launcher/src/main/java/com/skcraft/launcher/install/FeatureCache.java similarity index 100% rename from src/main/java/com/skcraft/launcher/install/FeatureCache.java rename to launcher/src/main/java/com/skcraft/launcher/install/FeatureCache.java diff --git a/src/main/java/com/skcraft/launcher/install/FileCopy.java b/launcher/src/main/java/com/skcraft/launcher/install/FileCopy.java similarity index 100% rename from src/main/java/com/skcraft/launcher/install/FileCopy.java rename to launcher/src/main/java/com/skcraft/launcher/install/FileCopy.java diff --git a/src/main/java/com/skcraft/launcher/install/FileMover.java b/launcher/src/main/java/com/skcraft/launcher/install/FileMover.java similarity index 100% rename from src/main/java/com/skcraft/launcher/install/FileMover.java rename to launcher/src/main/java/com/skcraft/launcher/install/FileMover.java diff --git a/src/main/java/com/skcraft/launcher/install/HttpDownloader.java b/launcher/src/main/java/com/skcraft/launcher/install/HttpDownloader.java similarity index 100% rename from src/main/java/com/skcraft/launcher/install/HttpDownloader.java rename to launcher/src/main/java/com/skcraft/launcher/install/HttpDownloader.java diff --git a/src/main/java/com/skcraft/launcher/install/InstallLog.java b/launcher/src/main/java/com/skcraft/launcher/install/InstallLog.java similarity index 100% rename from src/main/java/com/skcraft/launcher/install/InstallLog.java rename to launcher/src/main/java/com/skcraft/launcher/install/InstallLog.java diff --git a/src/main/java/com/skcraft/launcher/install/InstallLogFileMover.java b/launcher/src/main/java/com/skcraft/launcher/install/InstallLogFileMover.java similarity index 100% rename from src/main/java/com/skcraft/launcher/install/InstallLogFileMover.java rename to launcher/src/main/java/com/skcraft/launcher/install/InstallLogFileMover.java diff --git a/src/main/java/com/skcraft/launcher/install/InstallTask.java b/launcher/src/main/java/com/skcraft/launcher/install/InstallTask.java similarity index 100% rename from src/main/java/com/skcraft/launcher/install/InstallTask.java rename to launcher/src/main/java/com/skcraft/launcher/install/InstallTask.java diff --git a/src/main/java/com/skcraft/launcher/install/Installer.java b/launcher/src/main/java/com/skcraft/launcher/install/Installer.java similarity index 100% rename from src/main/java/com/skcraft/launcher/install/Installer.java rename to launcher/src/main/java/com/skcraft/launcher/install/Installer.java diff --git a/src/main/java/com/skcraft/launcher/install/UpdateCache.java b/launcher/src/main/java/com/skcraft/launcher/install/UpdateCache.java similarity index 100% rename from src/main/java/com/skcraft/launcher/install/UpdateCache.java rename to launcher/src/main/java/com/skcraft/launcher/install/UpdateCache.java diff --git a/src/main/java/com/skcraft/launcher/install/ZipExtract.java b/launcher/src/main/java/com/skcraft/launcher/install/ZipExtract.java similarity index 100% rename from src/main/java/com/skcraft/launcher/install/ZipExtract.java rename to launcher/src/main/java/com/skcraft/launcher/install/ZipExtract.java diff --git a/src/main/java/com/skcraft/launcher/launch/JavaProcessBuilder.java b/launcher/src/main/java/com/skcraft/launcher/launch/JavaProcessBuilder.java similarity index 100% rename from src/main/java/com/skcraft/launcher/launch/JavaProcessBuilder.java rename to launcher/src/main/java/com/skcraft/launcher/launch/JavaProcessBuilder.java diff --git a/src/main/java/com/skcraft/launcher/launch/JavaRuntimeFinder.java b/launcher/src/main/java/com/skcraft/launcher/launch/JavaRuntimeFinder.java similarity index 100% rename from src/main/java/com/skcraft/launcher/launch/JavaRuntimeFinder.java rename to launcher/src/main/java/com/skcraft/launcher/launch/JavaRuntimeFinder.java diff --git a/src/main/java/com/skcraft/launcher/launch/LaunchProcessHandler.java b/launcher/src/main/java/com/skcraft/launcher/launch/LaunchProcessHandler.java similarity index 100% rename from src/main/java/com/skcraft/launcher/launch/LaunchProcessHandler.java rename to launcher/src/main/java/com/skcraft/launcher/launch/LaunchProcessHandler.java diff --git a/src/main/java/com/skcraft/launcher/launch/Runner.java b/launcher/src/main/java/com/skcraft/launcher/launch/Runner.java similarity index 100% rename from src/main/java/com/skcraft/launcher/launch/Runner.java rename to launcher/src/main/java/com/skcraft/launcher/launch/Runner.java diff --git a/src/main/java/com/skcraft/launcher/model/loader/InstallData.java b/launcher/src/main/java/com/skcraft/launcher/model/loader/InstallData.java similarity index 100% rename from src/main/java/com/skcraft/launcher/model/loader/InstallData.java rename to launcher/src/main/java/com/skcraft/launcher/model/loader/InstallData.java diff --git a/src/main/java/com/skcraft/launcher/model/loader/InstallProfile.java b/launcher/src/main/java/com/skcraft/launcher/model/loader/InstallProfile.java similarity index 100% rename from src/main/java/com/skcraft/launcher/model/loader/InstallProfile.java rename to launcher/src/main/java/com/skcraft/launcher/model/loader/InstallProfile.java diff --git a/src/main/java/com/skcraft/launcher/model/loader/VersionInfo.java b/launcher/src/main/java/com/skcraft/launcher/model/loader/VersionInfo.java similarity index 100% rename from src/main/java/com/skcraft/launcher/model/loader/VersionInfo.java rename to launcher/src/main/java/com/skcraft/launcher/model/loader/VersionInfo.java diff --git a/src/main/java/com/skcraft/launcher/model/minecraft/Asset.java b/launcher/src/main/java/com/skcraft/launcher/model/minecraft/Asset.java similarity index 100% rename from src/main/java/com/skcraft/launcher/model/minecraft/Asset.java rename to launcher/src/main/java/com/skcraft/launcher/model/minecraft/Asset.java diff --git a/src/main/java/com/skcraft/launcher/model/minecraft/AssetsIndex.java b/launcher/src/main/java/com/skcraft/launcher/model/minecraft/AssetsIndex.java similarity index 100% rename from src/main/java/com/skcraft/launcher/model/minecraft/AssetsIndex.java rename to launcher/src/main/java/com/skcraft/launcher/model/minecraft/AssetsIndex.java diff --git a/src/main/java/com/skcraft/launcher/model/minecraft/Library.java b/launcher/src/main/java/com/skcraft/launcher/model/minecraft/Library.java similarity index 100% rename from src/main/java/com/skcraft/launcher/model/minecraft/Library.java rename to launcher/src/main/java/com/skcraft/launcher/model/minecraft/Library.java diff --git a/src/main/java/com/skcraft/launcher/model/minecraft/PlatformDeserializer.java b/launcher/src/main/java/com/skcraft/launcher/model/minecraft/PlatformDeserializer.java similarity index 100% rename from src/main/java/com/skcraft/launcher/model/minecraft/PlatformDeserializer.java rename to launcher/src/main/java/com/skcraft/launcher/model/minecraft/PlatformDeserializer.java diff --git a/src/main/java/com/skcraft/launcher/model/minecraft/PlatformSerializer.java b/launcher/src/main/java/com/skcraft/launcher/model/minecraft/PlatformSerializer.java similarity index 100% rename from src/main/java/com/skcraft/launcher/model/minecraft/PlatformSerializer.java rename to launcher/src/main/java/com/skcraft/launcher/model/minecraft/PlatformSerializer.java diff --git a/src/main/java/com/skcraft/launcher/model/minecraft/ReleaseList.java b/launcher/src/main/java/com/skcraft/launcher/model/minecraft/ReleaseList.java similarity index 100% rename from src/main/java/com/skcraft/launcher/model/minecraft/ReleaseList.java rename to launcher/src/main/java/com/skcraft/launcher/model/minecraft/ReleaseList.java diff --git a/src/main/java/com/skcraft/launcher/model/minecraft/Version.java b/launcher/src/main/java/com/skcraft/launcher/model/minecraft/Version.java similarity index 100% rename from src/main/java/com/skcraft/launcher/model/minecraft/Version.java rename to launcher/src/main/java/com/skcraft/launcher/model/minecraft/Version.java diff --git a/src/main/java/com/skcraft/launcher/model/minecraft/VersionManifest.java b/launcher/src/main/java/com/skcraft/launcher/model/minecraft/VersionManifest.java similarity index 100% rename from src/main/java/com/skcraft/launcher/model/minecraft/VersionManifest.java rename to launcher/src/main/java/com/skcraft/launcher/model/minecraft/VersionManifest.java diff --git a/src/main/java/com/skcraft/launcher/model/modpack/BaseManifest.java b/launcher/src/main/java/com/skcraft/launcher/model/modpack/BaseManifest.java similarity index 100% rename from src/main/java/com/skcraft/launcher/model/modpack/BaseManifest.java rename to launcher/src/main/java/com/skcraft/launcher/model/modpack/BaseManifest.java diff --git a/src/main/java/com/skcraft/launcher/model/modpack/Condition.java b/launcher/src/main/java/com/skcraft/launcher/model/modpack/Condition.java similarity index 100% rename from src/main/java/com/skcraft/launcher/model/modpack/Condition.java rename to launcher/src/main/java/com/skcraft/launcher/model/modpack/Condition.java diff --git a/src/main/java/com/skcraft/launcher/model/modpack/Feature.java b/launcher/src/main/java/com/skcraft/launcher/model/modpack/Feature.java similarity index 100% rename from src/main/java/com/skcraft/launcher/model/modpack/Feature.java rename to launcher/src/main/java/com/skcraft/launcher/model/modpack/Feature.java diff --git a/src/main/java/com/skcraft/launcher/model/modpack/FileInstall.java b/launcher/src/main/java/com/skcraft/launcher/model/modpack/FileInstall.java similarity index 100% rename from src/main/java/com/skcraft/launcher/model/modpack/FileInstall.java rename to launcher/src/main/java/com/skcraft/launcher/model/modpack/FileInstall.java diff --git a/src/main/java/com/skcraft/launcher/model/modpack/LaunchModifier.java b/launcher/src/main/java/com/skcraft/launcher/model/modpack/LaunchModifier.java similarity index 100% rename from src/main/java/com/skcraft/launcher/model/modpack/LaunchModifier.java rename to launcher/src/main/java/com/skcraft/launcher/model/modpack/LaunchModifier.java diff --git a/src/main/java/com/skcraft/launcher/model/modpack/Manifest.java b/launcher/src/main/java/com/skcraft/launcher/model/modpack/Manifest.java similarity index 100% rename from src/main/java/com/skcraft/launcher/model/modpack/Manifest.java rename to launcher/src/main/java/com/skcraft/launcher/model/modpack/Manifest.java diff --git a/src/main/java/com/skcraft/launcher/model/modpack/ManifestEntry.java b/launcher/src/main/java/com/skcraft/launcher/model/modpack/ManifestEntry.java similarity index 100% rename from src/main/java/com/skcraft/launcher/model/modpack/ManifestEntry.java rename to launcher/src/main/java/com/skcraft/launcher/model/modpack/ManifestEntry.java diff --git a/src/main/java/com/skcraft/launcher/model/modpack/ManifestInfo.java b/launcher/src/main/java/com/skcraft/launcher/model/modpack/ManifestInfo.java similarity index 100% rename from src/main/java/com/skcraft/launcher/model/modpack/ManifestInfo.java rename to launcher/src/main/java/com/skcraft/launcher/model/modpack/ManifestInfo.java diff --git a/src/main/java/com/skcraft/launcher/model/modpack/PackageList.java b/launcher/src/main/java/com/skcraft/launcher/model/modpack/PackageList.java similarity index 100% rename from src/main/java/com/skcraft/launcher/model/modpack/PackageList.java rename to launcher/src/main/java/com/skcraft/launcher/model/modpack/PackageList.java diff --git a/src/main/java/com/skcraft/launcher/model/modpack/RequireAll.java b/launcher/src/main/java/com/skcraft/launcher/model/modpack/RequireAll.java similarity index 100% rename from src/main/java/com/skcraft/launcher/model/modpack/RequireAll.java rename to launcher/src/main/java/com/skcraft/launcher/model/modpack/RequireAll.java diff --git a/src/main/java/com/skcraft/launcher/model/modpack/RequireAny.java b/launcher/src/main/java/com/skcraft/launcher/model/modpack/RequireAny.java similarity index 100% rename from src/main/java/com/skcraft/launcher/model/modpack/RequireAny.java rename to launcher/src/main/java/com/skcraft/launcher/model/modpack/RequireAny.java diff --git a/src/main/java/com/skcraft/launcher/persistence/MkdirByteSink.java b/launcher/src/main/java/com/skcraft/launcher/persistence/MkdirByteSink.java similarity index 100% rename from src/main/java/com/skcraft/launcher/persistence/MkdirByteSink.java rename to launcher/src/main/java/com/skcraft/launcher/persistence/MkdirByteSink.java diff --git a/src/main/java/com/skcraft/launcher/persistence/Persistence.java b/launcher/src/main/java/com/skcraft/launcher/persistence/Persistence.java similarity index 100% rename from src/main/java/com/skcraft/launcher/persistence/Persistence.java rename to launcher/src/main/java/com/skcraft/launcher/persistence/Persistence.java diff --git a/src/main/java/com/skcraft/launcher/persistence/Scrambled.java b/launcher/src/main/java/com/skcraft/launcher/persistence/Scrambled.java similarity index 100% rename from src/main/java/com/skcraft/launcher/persistence/Scrambled.java rename to launcher/src/main/java/com/skcraft/launcher/persistence/Scrambled.java diff --git a/src/main/java/com/skcraft/launcher/persistence/ScramblingSinkFilter.java b/launcher/src/main/java/com/skcraft/launcher/persistence/ScramblingSinkFilter.java similarity index 100% rename from src/main/java/com/skcraft/launcher/persistence/ScramblingSinkFilter.java rename to launcher/src/main/java/com/skcraft/launcher/persistence/ScramblingSinkFilter.java diff --git a/src/main/java/com/skcraft/launcher/persistence/ScramblingSourceFilter.java b/launcher/src/main/java/com/skcraft/launcher/persistence/ScramblingSourceFilter.java similarity index 100% rename from src/main/java/com/skcraft/launcher/persistence/ScramblingSourceFilter.java rename to launcher/src/main/java/com/skcraft/launcher/persistence/ScramblingSourceFilter.java diff --git a/src/main/java/com/skcraft/launcher/selfupdate/ComparableVersion.java b/launcher/src/main/java/com/skcraft/launcher/selfupdate/ComparableVersion.java similarity index 100% rename from src/main/java/com/skcraft/launcher/selfupdate/ComparableVersion.java rename to launcher/src/main/java/com/skcraft/launcher/selfupdate/ComparableVersion.java diff --git a/src/main/java/com/skcraft/launcher/selfupdate/LatestVersionInfo.java b/launcher/src/main/java/com/skcraft/launcher/selfupdate/LatestVersionInfo.java similarity index 100% rename from src/main/java/com/skcraft/launcher/selfupdate/LatestVersionInfo.java rename to launcher/src/main/java/com/skcraft/launcher/selfupdate/LatestVersionInfo.java diff --git a/src/main/java/com/skcraft/launcher/selfupdate/SelfUpdater.java b/launcher/src/main/java/com/skcraft/launcher/selfupdate/SelfUpdater.java similarity index 100% rename from src/main/java/com/skcraft/launcher/selfupdate/SelfUpdater.java rename to launcher/src/main/java/com/skcraft/launcher/selfupdate/SelfUpdater.java diff --git a/src/main/java/com/skcraft/launcher/selfupdate/UpdateChecker.java b/launcher/src/main/java/com/skcraft/launcher/selfupdate/UpdateChecker.java similarity index 100% rename from src/main/java/com/skcraft/launcher/selfupdate/UpdateChecker.java rename to launcher/src/main/java/com/skcraft/launcher/selfupdate/UpdateChecker.java diff --git a/src/main/java/com/skcraft/launcher/swing/ActionListeners.java b/launcher/src/main/java/com/skcraft/launcher/swing/ActionListeners.java similarity index 100% rename from src/main/java/com/skcraft/launcher/swing/ActionListeners.java rename to launcher/src/main/java/com/skcraft/launcher/swing/ActionListeners.java diff --git a/src/main/java/com/skcraft/launcher/swing/CheckboxTable.java b/launcher/src/main/java/com/skcraft/launcher/swing/CheckboxTable.java similarity index 100% rename from src/main/java/com/skcraft/launcher/swing/CheckboxTable.java rename to launcher/src/main/java/com/skcraft/launcher/swing/CheckboxTable.java diff --git a/src/main/java/com/skcraft/launcher/swing/DoubleClickToButtonAdapter.java b/launcher/src/main/java/com/skcraft/launcher/swing/DoubleClickToButtonAdapter.java similarity index 100% rename from src/main/java/com/skcraft/launcher/swing/DoubleClickToButtonAdapter.java rename to launcher/src/main/java/com/skcraft/launcher/swing/DoubleClickToButtonAdapter.java diff --git a/src/main/java/com/skcraft/launcher/swing/FeatureTableModel.java b/launcher/src/main/java/com/skcraft/launcher/swing/FeatureTableModel.java similarity index 100% rename from src/main/java/com/skcraft/launcher/swing/FeatureTableModel.java rename to launcher/src/main/java/com/skcraft/launcher/swing/FeatureTableModel.java diff --git a/src/main/java/com/skcraft/launcher/swing/FormPanel.java b/launcher/src/main/java/com/skcraft/launcher/swing/FormPanel.java similarity index 100% rename from src/main/java/com/skcraft/launcher/swing/FormPanel.java rename to launcher/src/main/java/com/skcraft/launcher/swing/FormPanel.java diff --git a/src/main/java/com/skcraft/launcher/swing/HeaderPanel.java b/launcher/src/main/java/com/skcraft/launcher/swing/HeaderPanel.java similarity index 100% rename from src/main/java/com/skcraft/launcher/swing/HeaderPanel.java rename to launcher/src/main/java/com/skcraft/launcher/swing/HeaderPanel.java diff --git a/src/main/java/com/skcraft/launcher/swing/InstanceTable.java b/launcher/src/main/java/com/skcraft/launcher/swing/InstanceTable.java similarity index 100% rename from src/main/java/com/skcraft/launcher/swing/InstanceTable.java rename to launcher/src/main/java/com/skcraft/launcher/swing/InstanceTable.java diff --git a/src/main/java/com/skcraft/launcher/swing/InstanceTableModel.java b/launcher/src/main/java/com/skcraft/launcher/swing/InstanceTableModel.java similarity index 100% rename from src/main/java/com/skcraft/launcher/swing/InstanceTableModel.java rename to launcher/src/main/java/com/skcraft/launcher/swing/InstanceTableModel.java diff --git a/src/main/java/com/skcraft/launcher/swing/LinedBoxPanel.java b/launcher/src/main/java/com/skcraft/launcher/swing/LinedBoxPanel.java similarity index 100% rename from src/main/java/com/skcraft/launcher/swing/LinedBoxPanel.java rename to launcher/src/main/java/com/skcraft/launcher/swing/LinedBoxPanel.java diff --git a/src/main/java/com/skcraft/launcher/swing/LinkButton.java b/launcher/src/main/java/com/skcraft/launcher/swing/LinkButton.java similarity index 100% rename from src/main/java/com/skcraft/launcher/swing/LinkButton.java rename to launcher/src/main/java/com/skcraft/launcher/swing/LinkButton.java diff --git a/src/main/java/com/skcraft/launcher/swing/MessageLog.java b/launcher/src/main/java/com/skcraft/launcher/swing/MessageLog.java similarity index 100% rename from src/main/java/com/skcraft/launcher/swing/MessageLog.java rename to launcher/src/main/java/com/skcraft/launcher/swing/MessageLog.java diff --git a/src/main/java/com/skcraft/launcher/swing/ObjectSwingMapper.java b/launcher/src/main/java/com/skcraft/launcher/swing/ObjectSwingMapper.java similarity index 100% rename from src/main/java/com/skcraft/launcher/swing/ObjectSwingMapper.java rename to launcher/src/main/java/com/skcraft/launcher/swing/ObjectSwingMapper.java diff --git a/src/main/java/com/skcraft/launcher/swing/PopupMouseAdapter.java b/launcher/src/main/java/com/skcraft/launcher/swing/PopupMouseAdapter.java similarity index 100% rename from src/main/java/com/skcraft/launcher/swing/PopupMouseAdapter.java rename to launcher/src/main/java/com/skcraft/launcher/swing/PopupMouseAdapter.java diff --git a/src/main/java/com/skcraft/launcher/swing/SelectionKeeper.java b/launcher/src/main/java/com/skcraft/launcher/swing/SelectionKeeper.java similarity index 100% rename from src/main/java/com/skcraft/launcher/swing/SelectionKeeper.java rename to launcher/src/main/java/com/skcraft/launcher/swing/SelectionKeeper.java diff --git a/src/main/java/com/skcraft/launcher/swing/SwingHelper.java b/launcher/src/main/java/com/skcraft/launcher/swing/SwingHelper.java similarity index 100% rename from src/main/java/com/skcraft/launcher/swing/SwingHelper.java rename to launcher/src/main/java/com/skcraft/launcher/swing/SwingHelper.java diff --git a/src/main/java/com/skcraft/launcher/swing/TextFieldPopupMenu.java b/launcher/src/main/java/com/skcraft/launcher/swing/TextFieldPopupMenu.java similarity index 100% rename from src/main/java/com/skcraft/launcher/swing/TextFieldPopupMenu.java rename to launcher/src/main/java/com/skcraft/launcher/swing/TextFieldPopupMenu.java diff --git a/src/main/java/com/skcraft/launcher/swing/WebpageLayoutManager.java b/launcher/src/main/java/com/skcraft/launcher/swing/WebpageLayoutManager.java similarity index 100% rename from src/main/java/com/skcraft/launcher/swing/WebpageLayoutManager.java rename to launcher/src/main/java/com/skcraft/launcher/swing/WebpageLayoutManager.java diff --git a/src/main/java/com/skcraft/launcher/swing/WebpagePanel.java b/launcher/src/main/java/com/skcraft/launcher/swing/WebpagePanel.java similarity index 100% rename from src/main/java/com/skcraft/launcher/swing/WebpagePanel.java rename to launcher/src/main/java/com/skcraft/launcher/swing/WebpagePanel.java diff --git a/src/main/java/com/skcraft/launcher/update/BaseUpdater.java b/launcher/src/main/java/com/skcraft/launcher/update/BaseUpdater.java similarity index 100% rename from src/main/java/com/skcraft/launcher/update/BaseUpdater.java rename to launcher/src/main/java/com/skcraft/launcher/update/BaseUpdater.java diff --git a/src/main/java/com/skcraft/launcher/update/HardResetter.java b/launcher/src/main/java/com/skcraft/launcher/update/HardResetter.java similarity index 100% rename from src/main/java/com/skcraft/launcher/update/HardResetter.java rename to launcher/src/main/java/com/skcraft/launcher/update/HardResetter.java diff --git a/src/main/java/com/skcraft/launcher/update/Remover.java b/launcher/src/main/java/com/skcraft/launcher/update/Remover.java similarity index 100% rename from src/main/java/com/skcraft/launcher/update/Remover.java rename to launcher/src/main/java/com/skcraft/launcher/update/Remover.java diff --git a/src/main/java/com/skcraft/launcher/update/Updater.java b/launcher/src/main/java/com/skcraft/launcher/update/Updater.java similarity index 100% rename from src/main/java/com/skcraft/launcher/update/Updater.java rename to launcher/src/main/java/com/skcraft/launcher/update/Updater.java diff --git a/src/main/java/com/skcraft/launcher/util/Environment.java b/launcher/src/main/java/com/skcraft/launcher/util/Environment.java similarity index 100% rename from src/main/java/com/skcraft/launcher/util/Environment.java rename to launcher/src/main/java/com/skcraft/launcher/util/Environment.java diff --git a/src/main/java/com/skcraft/launcher/util/HttpRequest.java b/launcher/src/main/java/com/skcraft/launcher/util/HttpRequest.java similarity index 100% rename from src/main/java/com/skcraft/launcher/util/HttpRequest.java rename to launcher/src/main/java/com/skcraft/launcher/util/HttpRequest.java diff --git a/src/main/java/com/skcraft/launcher/util/LimitLinesDocumentListener.java b/launcher/src/main/java/com/skcraft/launcher/util/LimitLinesDocumentListener.java similarity index 100% rename from src/main/java/com/skcraft/launcher/util/LimitLinesDocumentListener.java rename to launcher/src/main/java/com/skcraft/launcher/util/LimitLinesDocumentListener.java diff --git a/src/main/java/com/skcraft/launcher/util/PastebinPoster.java b/launcher/src/main/java/com/skcraft/launcher/util/PastebinPoster.java similarity index 100% rename from src/main/java/com/skcraft/launcher/util/PastebinPoster.java rename to launcher/src/main/java/com/skcraft/launcher/util/PastebinPoster.java diff --git a/src/main/java/com/skcraft/launcher/util/Platform.java b/launcher/src/main/java/com/skcraft/launcher/util/Platform.java similarity index 100% rename from src/main/java/com/skcraft/launcher/util/Platform.java rename to launcher/src/main/java/com/skcraft/launcher/util/Platform.java diff --git a/src/main/java/com/skcraft/launcher/util/SharedLocale.java b/launcher/src/main/java/com/skcraft/launcher/util/SharedLocale.java similarity index 100% rename from src/main/java/com/skcraft/launcher/util/SharedLocale.java rename to launcher/src/main/java/com/skcraft/launcher/util/SharedLocale.java diff --git a/src/main/java/com/skcraft/launcher/util/SimpleLogFormatter.java b/launcher/src/main/java/com/skcraft/launcher/util/SimpleLogFormatter.java similarity index 100% rename from src/main/java/com/skcraft/launcher/util/SimpleLogFormatter.java rename to launcher/src/main/java/com/skcraft/launcher/util/SimpleLogFormatter.java diff --git a/src/main/java/com/skcraft/launcher/util/SwingExecutor.java b/launcher/src/main/java/com/skcraft/launcher/util/SwingExecutor.java similarity index 100% rename from src/main/java/com/skcraft/launcher/util/SwingExecutor.java rename to launcher/src/main/java/com/skcraft/launcher/util/SwingExecutor.java diff --git a/src/main/java/com/skcraft/launcher/util/WinRegistry.java b/launcher/src/main/java/com/skcraft/launcher/util/WinRegistry.java similarity index 100% rename from src/main/java/com/skcraft/launcher/util/WinRegistry.java rename to launcher/src/main/java/com/skcraft/launcher/util/WinRegistry.java diff --git a/src/main/resources/com/skcraft/launcher/custom_instance_icon.png b/launcher/src/main/resources/com/skcraft/launcher/custom_instance_icon.png similarity index 100% rename from src/main/resources/com/skcraft/launcher/custom_instance_icon.png rename to launcher/src/main/resources/com/skcraft/launcher/custom_instance_icon.png diff --git a/src/main/resources/com/skcraft/launcher/download_icon.png b/launcher/src/main/resources/com/skcraft/launcher/download_icon.png similarity index 100% rename from src/main/resources/com/skcraft/launcher/download_icon.png rename to launcher/src/main/resources/com/skcraft/launcher/download_icon.png diff --git a/src/main/resources/com/skcraft/launcher/icon.png b/launcher/src/main/resources/com/skcraft/launcher/icon.png similarity index 100% rename from src/main/resources/com/skcraft/launcher/icon.png rename to launcher/src/main/resources/com/skcraft/launcher/icon.png diff --git a/src/main/resources/com/skcraft/launcher/instance_icon.png b/launcher/src/main/resources/com/skcraft/launcher/instance_icon.png similarity index 100% rename from src/main/resources/com/skcraft/launcher/instance_icon.png rename to launcher/src/main/resources/com/skcraft/launcher/instance_icon.png diff --git a/src/main/resources/com/skcraft/launcher/lang/Launcher.properties b/launcher/src/main/resources/com/skcraft/launcher/lang/Launcher.properties similarity index 100% rename from src/main/resources/com/skcraft/launcher/lang/Launcher.properties rename to launcher/src/main/resources/com/skcraft/launcher/lang/Launcher.properties diff --git a/src/main/resources/com/skcraft/launcher/launcher.properties b/launcher/src/main/resources/com/skcraft/launcher/launcher.properties similarity index 100% rename from src/main/resources/com/skcraft/launcher/launcher.properties rename to launcher/src/main/resources/com/skcraft/launcher/launcher.properties diff --git a/src/main/resources/com/skcraft/launcher/maven_repos.json b/launcher/src/main/resources/com/skcraft/launcher/maven_repos.json similarity index 100% rename from src/main/resources/com/skcraft/launcher/maven_repos.json rename to launcher/src/main/resources/com/skcraft/launcher/maven_repos.json diff --git a/src/main/resources/com/skcraft/launcher/tray_closed.png b/launcher/src/main/resources/com/skcraft/launcher/tray_closed.png similarity index 100% rename from src/main/resources/com/skcraft/launcher/tray_closed.png rename to launcher/src/main/resources/com/skcraft/launcher/tray_closed.png diff --git a/src/main/resources/com/skcraft/launcher/tray_ok.png b/launcher/src/main/resources/com/skcraft/launcher/tray_ok.png similarity index 100% rename from src/main/resources/com/skcraft/launcher/tray_ok.png rename to launcher/src/main/resources/com/skcraft/launcher/tray_ok.png diff --git a/pom.xml b/pom.xml deleted file mode 100644 index cf35f51..0000000 --- a/pom.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - - 4.0.0 - - com.skcraft - launcher - 4.2.3-SNAPSHOT - - - - com.fasterxml.jackson.core - jackson-databind - 2.3.0 - - - commons-lang - commons-lang - 2.6 - - - commons-io - commons-io - 1.2 - - - org.projectlombok - lombok - 1.12.2 - - - com.google.guava - guava - 15.0 - - - com.beust - jcommander - 1.32 - - - org.tukaani - xz - 1.0 - - - org.apache.commons - commons-compress - 1.9 - - - - - SKCraftLauncher - - - - src/main/resources - true - - **/*.properties - - - - src/main/resources - false - - **/*.properties - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.1 - - - false - - com.skcraft.launcher.Launcher - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 2.1 - - - package - - shade - - - - - org.projectlombok:lombok - - - - - - - false - - - - - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..2cff48c --- /dev/null +++ b/settings.gradle @@ -0,0 +1,3 @@ +rootProject.name = 'launcher-parent' + +include 'launcher', 'launcher-builder' \ No newline at end of file