Updated project supporting the new asset types and extracts natives f…

…rom library folder

.classpath

@@ -2,10 +2,15 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="MinecraftMiddleKnife/src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="lib/snakeyaml-1.10.jar"/>
-	<classpathentry kind="lib" path="lib/commons-lang3-3.1.jar"/>
-	<classpathentry kind="lib" path="lib/guava-13.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/jcommander-1.31-SNAPSHOT.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" path="res"/>
+	<classpathentry exported="true" kind="lib" path="/Users/mbilker/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.4/5fe28b9518e58819180a43a850fbc0dd24b7c050/commons-lang3-3.4.jar" sourcepath="/Users/mbilker/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.4/b49dafc9cfef24c356827f322e773e7c26725dd2/commons-lang3-3.4-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="/Users/mbilker/.gradle/caches/modules-2/files-2.1/commons-io/commons-io/2.4/b1b6ea3b7e4aa4f492509a4952029cd8e48019ad/commons-io-2.4.jar" sourcepath="/Users/mbilker/.gradle/caches/modules-2/files-2.1/commons-io/commons-io/2.4/f2d8698c46d1167ff24b06a840a87d91a02db891/commons-io-2.4-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="/Users/mbilker/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.48/bfcb96281ea3b59d626704f74bc6d625ff51cbce/jcommander-1.48.jar" sourcepath="/Users/mbilker/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.48/6deefcf90f144dfca29d4950c665a592ba029d42/jcommander-1.48-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="/Users/mbilker/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/18.0/cce0823396aa693798f8882e64213b1772032b09/guava-18.0.jar" sourcepath="/Users/mbilker/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/18.0/ad97fe8faaf01a3d3faacecd58e8fa6e78a973ca/guava-18.0-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="/Users/mbilker/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.15/3b132bea69e8ee099f416044970997bde80f4ea6/snakeyaml-1.15.jar" sourcepath="/Users/mbilker/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.15/7dc55271cad1cf73bb495e372164269e75d9345a/snakeyaml-1.15-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="/Users/mbilker/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.3.1/ecb6e1f8e4b0e84c4b886c2f14a1500caf309757/gson-2.3.1.jar" sourcepath="/Users/mbilker/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.3.1/563dcb685903c96ce8abbd03adf7fa49e19aa8b4/gson-2.3.1-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="/Users/mbilker/.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.16.4/398110b5c579cc69d7be47600c2ff810c5c34487/lombok-1.16.4.jar" sourcepath="/Users/mbilker/.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.16.4/450329f3f47a26833270f49da5f9acc5d3d6bb37/lombok-1.16.4-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="/Users/mbilker/.gradle/caches/modules-2/files-2.1/es.usc.citius.common/parallel-loops/1.0/9e4dbbdb1f33a74de2d3cd77025355c30856b712/parallel-loops-1.0.jar" sourcepath="/Users/mbilker/.gradle/caches/modules-2/files-2.1/es.usc.citius.common/parallel-loops/1.0/9dbe0731d7b61cc63902a39e6e477a5c4be31823/parallel-loops-1.0-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.gitignore

@@ -1,5 +1,7 @@
 .DS_Store
 ._*
+.gradle
 data
 bin
+build
 logs

.project

@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>MinecraftTinyLauncher</name>
-	<comment></comment>
-	<projects>
-	</projects>
+	<comment/>
+	<projects/>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
+			<arguments/>
 		</buildCommand>
 	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
+	<linkedResources/>
 </projectDescription>

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+encoding//src/us/mbilker/tinylauncher/json/Action.java=UTF-8
+encoding//src/us/mbilker/tinylauncher/json/AssetIndex.java=UTF-8
+encoding//src/us/mbilker/tinylauncher/json/DateAdapter.java=UTF-8
+encoding//src/us/mbilker/tinylauncher/json/EnumAdaptorFactory.java=UTF-8
+encoding//src/us/mbilker/tinylauncher/json/ExtractRule.java=UTF-8
+encoding//src/us/mbilker/tinylauncher/json/FileAdapter.java=UTF-8
+encoding//src/us/mbilker/tinylauncher/json/Library.java=UTF-8
+encoding//src/us/mbilker/tinylauncher/json/OS.java=UTF-8
+encoding//src/us/mbilker/tinylauncher/json/OSRule.java=UTF-8
+encoding//src/us/mbilker/tinylauncher/json/Version.java=UTF-8

.settings/org.eclipse.jdt.core.prefs

@@ -1,11 +1,13 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+#
+#Mon Apr 27 18:51:24 EDT 2015
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

build.gradle

@@ -0,0 +1,42 @@
+apply plugin: 'application'
+apply plugin: 'maven'
+apply plugin: 'java'
+apply plugin: 'eclipse'
+
+version = '1.0'
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
+mainClassName = 'us.mbilker.tinylauncher.Main'
+
+repositories {
+  mavenCentral()
+}
+
+dependencies {
+  //compile fileTree(dir: 'lib', include: '*.jar')
+  compile 'org.apache.commons:commons-lang3:3.4'
+  compile 'commons-io:commons-io:2.4'
+  compile 'com.beust:jcommander:1.48'
+  compile 'com.google.guava:guava:18.0'
+  compile 'org.yaml:snakeyaml:1.15'
+  compile 'com.google.code.gson:gson:2.3.1'
+  compile 'org.projectlombok:lombok:1.16.4'
+  compile 'es.usc.citius.common:parallel-loops:1.0'
+}
+
+jar {
+  manifest {
+    attributes 'Implementation-Version': version,
+               'Main-Class': mainClassName
+  }
+
+  from configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+}
+
+sourceSets {
+  main {
+    java.srcDirs = ['MinecraftMiddleKnife/src', 'src']
+    resources.srcDirs = ['res']
+  }
+}

src/us/mbilker/tinylauncher/CommandOptions.java

@@ -34,7 +34,7 @@ public class CommandOptions {
 	public String assetsDir = "assets";
 
 	@Parameter(names = { "-version" })
-	public String version = "1.7.4";
+	public String version = "1.8.4";
 
 	@Parameter(names = { "-dump" })
 	public boolean dump = false;