From f1717526d8dc823ddf0ce9bc93cf0c964ff2edcd Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Thu, 2 Aug 2012 23:36:00 -0700
Subject: [PATCH] Download argo/guava source references in install, and updated
 eclipse workspaces to reference them.

---
 fml/eclipse/FML-Client/.classpath     | 4 ++--
 fml/eclipse/FML-Client/.project       | 5 -----
 fml/eclipse/FML-Server/.classpath     | 4 ++--
 fml/eclipse/MCP-Client/.classpath     | 4 ++--
 fml/install/eclipse/Client/.classpath | 4 ++--
 fml/install/eclipse/Server/.classpath | 3 +++
 fml/install/fml.py                    | 2 +-
 7 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/fml/eclipse/FML-Client/.classpath b/fml/eclipse/FML-Client/.classpath
index 850b2a82e1..a3cdf8217b 100644
--- a/fml/eclipse/FML-Client/.classpath
+++ b/fml/eclipse/FML-Client/.classpath
@@ -23,7 +23,7 @@
 	</classpathentry>
 	<classpathentry exported="true" kind="lib" path="jars/bin/minecraft.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/argo-2.25.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/asm-all-4.0.jar" sourcepath="libref/asm-4.0"/>
-	<classpathentry exported="true" kind="lib" path="lib/guava-12.0.jar" sourcepath="libref/guava-12.0-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/asm-all-4.0.jar" sourcepath="lib/asm-4.0-source.zip"/>
+	<classpathentry exported="true" kind="lib" path="lib/guava-12.0.1.jar" sourcepath="lib/guava-12.0.1-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/fml/eclipse/FML-Client/.project b/fml/eclipse/FML-Client/.project
index 76fcb0e25a..fad25895ae 100644
--- a/fml/eclipse/FML-Client/.project
+++ b/fml/eclipse/FML-Client/.project
@@ -40,11 +40,6 @@
 			<type>2</type>
 			<locationURI>MCP_LOC/lib</locationURI>
 		</link>
-		<link>
-			<name>libref</name>
-			<type>2</type>
-			<locationURI>MCP_LOC/libref</locationURI>
-		</link>
 		<link>
 			<name>src</name>
 			<type>2</type>
diff --git a/fml/eclipse/FML-Server/.classpath b/fml/eclipse/FML-Server/.classpath
index d6fe2a3672..15f2d6226f 100644
--- a/fml/eclipse/FML-Server/.classpath
+++ b/fml/eclipse/FML-Server/.classpath
@@ -7,7 +7,7 @@
 	<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="jars/minecraft_server.jar"/>
 	<classpathentry kind="lib" path="lib/argo-2.25.jar"/>
-	<classpathentry kind="lib" path="lib/asm-all-4.0.jar"/>
-	<classpathentry kind="lib" path="lib/guava-12.0.jar"/>
+	<classpathentry kind="lib" path="lib/asm-all-4.0.jar" sourcepath="lib/asm-4.0-source.zip"/>
+	<classpathentry kind="lib" path="lib/guava-12.0.1.jar" sourcepath="lib/guava-12.0.1-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/fml/eclipse/MCP-Client/.classpath b/fml/eclipse/MCP-Client/.classpath
index 5618678ff1..698ecdb60e 100644
--- a/fml/eclipse/MCP-Client/.classpath
+++ b/fml/eclipse/MCP-Client/.classpath
@@ -19,7 +19,7 @@
 	</classpathentry>
 	<classpathentry exported="true" kind="lib" path="jars/bin/minecraft.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/argo-2.25.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/asm-all-4.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/guava-12.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/asm-all-4.0.jar" sourcepath="lib/asm-4.0-source.zip"/>
+	<classpathentry exported="true" kind="lib" path="lib/guava-12.0.1.jar" sourcepath="lib/guava-12.0.1-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/fml/install/eclipse/Client/.classpath b/fml/install/eclipse/Client/.classpath
index 6251c5420c..38758db7ff 100644
--- a/fml/install/eclipse/Client/.classpath
+++ b/fml/install/eclipse/Client/.classpath
@@ -20,7 +20,7 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="jars/bin/minecraft.jar"/>
 	<classpathentry kind="lib" path="lib/argo-2.25.jar"/>
-	<classpathentry kind="lib" path="lib/asm-all-4.0.jar"/>
-	<classpathentry kind="lib" path="lib/guava-12.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/asm-all-4.0.jar" sourcepath="lib/asm-4.0-source.zip"/>
+	<classpathentry exported="true" kind="lib" path="lib/guava-12.0.1.jar" sourcepath="lib/guava-12.0.1-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/fml/install/eclipse/Server/.classpath b/fml/install/eclipse/Server/.classpath
index ce227638d9..068dadfa12 100644
--- a/fml/install/eclipse/Server/.classpath
+++ b/fml/install/eclipse/Server/.classpath
@@ -4,5 +4,8 @@
 	<classpathentry kind="src" path="common"/>
 	<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="jars/minecraft_server.jar"/>
+	<classpathentry kind="lib" path="lib/argo-2.25.jar"/>
+	<classpathentry kind="lib" path="lib/asm-all-4.0.jar" sourcepath="lib/asm-4.0-source.zip"/>
+	<classpathentry kind="lib" path="lib/guava-12.0.1.jar" sourcepath="lib/guava-12.0.1-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/fml/install/fml.py b/fml/install/fml.py
index b4e39a7b52..a4bb79ea55 100644
--- a/fml/install/fml.py
+++ b/fml/install/fml.py
@@ -29,7 +29,7 @@ def download_deps(mcp_path):
             print "Downloading Fernflower failed download manually from http://goo.gl/PnJHp"
             ret = False
     
-    for lib in ['argo-2.25.jar', 'guava-12.0.1.jar', 'asm-all-4.0.jar']:
+    for lib in ['argo-2.25.jar', 'guava-12.0.1.jar', 'guava-12.0.1-sources.jar', 'asm-all-4.0.jar', 'asm-4.0-source.zip']:
         libF = os.path.join(mcp_path, 'lib')
         if not os.path.isdir(libF):
             os.makedirs(libF)