From 7d13c3afc04ead69068cbaaf177409390ac36f09 Mon Sep 17 00:00:00 2001
From: StevenRS11 <stevenrs11@aol.com>
Date: Tue, 5 Nov 2013 21:27:37 -0500
Subject: [PATCH] more buildserver2

---
 build.xml | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/build.xml b/build.xml
index 65337fd..13e1c3c 100644
--- a/build.xml
+++ b/build.xml
@@ -70,9 +70,6 @@
 		<copy todir="${classes.dir}/schematics" overwrite="true">
 			<fileset dir="schematics" />
 		</copy>
-		<copy todir="${classes.dir}/com">
-			<fileset dir="com" />
-		</copy>
 		<zip destfile="${dist.dir}/DimensionalDoors-${grep.out}-${build.number}.zip" basedir="${classes.dir}"/>
 		<delete dir="${classes.dir}" />
 		<delete dir="${mcp.dir}/reobf"/>
@@ -154,27 +151,23 @@
 		<exec dir="${forge.dir}" executable="sh" osfamily="unix" inputstring="Yes\n">
 			<arg value="install.sh" />
 		</exec>
+		
+		<get src="http://mirror.technicpack.net/Technic/lib/fml/fml_libs15.zip" dest="${download.dir}/fml_libs15.zip" />
+		<unzip src="${download.dir}/fml_libs15.zip" dest="${lib.dir}/" />
+		
+		<exec dir="${forge.dir}" executable="cmd" osfamily="windows" inputstring="Yes">
+			<arg line="/c install.cmd"/>
+		</exec>
+
+		<exec dir="${forge.dir}" executable="sh" osfamily="unix" inputstring="Yes">
+			<arg value="install.sh" />
+		</exec>
 
-		<chmod file="${mcp.dir}/decompile.sh" perm="+x"/>
 		<chmod file="${mcp.dir}/updatemd5.sh" perm="+x"/>
 		<chmod file="${mcp.dir}/recompile.sh" perm="+x"/>
 		<chmod file="${mcp.dir}/reobfuscate_srg.sh" perm="+x"/>
 		<chmod file="${mcp.dir}/runtime/bin/astyle-osx" perm="+x" />
 		<chmod file="${mcp.dir}/runtime/bin/jad-osx" perm="+x" />
-		
-		<!-- Remove below after 1.5 -->
-		<get src="http://mirror.technicpack.net/Technic/lib/fml/fml_libs15.zip" dest="${download.dir}/fml_libs15.zip" />
-		<unzip src="${download.dir}/fml_libs15.zip" dest="${lib.dir}/" />
-		
-		<exec dir="${mcp.dir}" executable="cmd" osfamily="windows" inputstring="Yes\n">
-			<arg line="/c decompile.bat"/>
-		</exec>
-		
-		<exec dir="${mcp.dir}" executable="sh" osfamily="unix" inputstring="Yes\n">
-			<arg value="decompile.sh" />
-		</exec>
-		<!-- Remove above after 1.5 -->
-		
 		<!-- Copy libraries -->
 <!-- 		<copy todir="${mcp.dir}/lib" >
 			<fileset dir="lib" >