Get setupDecompWorkspace fully working

Updates Special Source to fix a ProGuard bug
Fix injecting new files into the jar

Author: Chocohead

build.gradle

@@ -76,7 +76,7 @@ dependencies {
     compile 'com.github.tony19:named-regexp:0.2.3' // 1.7 Named regexp features
     compile 'net.minecraftforge:forgeflower:1.5.380.22' // Fernflower Forge edition
 
-    shade 'net.md-5:SpecialSource:1.8.2' // deobf and reobf
+    shade 'net.md-5:SpecialSource:1.8.3' // deobf and reobf
 
     // because curse
     compile 'org.apache.httpcomponents:httpclient:4.3.3'
@@ -214,7 +214,7 @@ pluginBundle {
 uploadArchives {
     repositories.mavenDeployer {
 
-        dependsOn 'build'
+        dependsOn 'jar'
 
         if (project.hasProperty('forgeMavenPass'))
         {

src/main/java/net/minecraftforge/gradle/tasks/PostDecompileTask.java

@@ -182,26 +182,23 @@ protected void postWriteEntry(JarOutputStream jarOut, String entryName) throws I
     protected void postWrite(JarOutputStream jarOut) throws IOException
     {
         File file = ((DelayedFile)this.injectDir).call();
-        File info = new File(file, "package-info-template.java");
-        if (info.exists())
-        {
-            String template = Resources.toString(info.toURI().toURL(), Charsets.UTF_8);
-            getLogger().debug("Adding package-infos");
-            for (String pkg : this.seenPackages)
-            {
-                jarOut.putNextEntry(new ZipEntry(pkg + "/package-info.java"));
-                jarOut.write(template.replaceAll("\\{PACKAGE\\}", pkg.replace('/', '.')).getBytes());
-                jarOut.closeEntry();
-            }
-        }
 
-        for (File f : this.getProject().fileTree(info))
-        {
-        	if ("package-info-template.java".equals(f.getName())) continue;
-            String name = f.getAbsolutePath().substring(info.getAbsolutePath().length() + 1).replace('\\', '/');
-            jarOut.putNextEntry(new ZipEntry(name));
-            jarOut.write(Resources.toByteArray(f.toURI().toURL()));
-            jarOut.closeEntry();
+        for (File f : getProject().fileTree(file)) {
+        	if ("package-info-template.java".equals(f.getName())) {
+        		String template = Files.toString(f, Charsets.UTF_8);
+                getLogger().debug("Adding package-infos");
+
+                for (String pkg : seenPackages) {
+                    jarOut.putNextEntry(new ZipEntry(pkg + "/package-info.java"));
+                    jarOut.write(template.replaceAll("\\{PACKAGE\\}", pkg.replace('/', '.')).getBytes());
+                    jarOut.closeEntry();
+                }
+        	} else {
+	            String name = f.getAbsolutePath().substring(file.getAbsolutePath().length() + 1).replace('\\', '/');
+	            jarOut.putNextEntry(new ZipEntry(name));
+	            jarOut.write(Files.asByteSource(f).read());
+	            jarOut.closeEntry();
+        	}
         }
     }