fixed CI workspace setup

Author: AbrarSyed

src/main/java/net/minecraftforge/gradle/user/patcherUser/PatcherUserBasePlugin.java

@@ -81,8 +81,8 @@ public Boolean call()
             task.setOutJar(patchedJar);
             task.setPatches(delayedFile(BINPATCH_USERDEV));
             task.setClassJar(delayedFile(ZIP_UD_CLASSES));
-            task.setResourceJar(delayedTree(ZIP_UD_RES));
-            task.dependsOn("mergeJars");
+            task.setResourceJar(delayedFile(ZIP_UD_RES));
+            task.dependsOn(TASK_MERGE_JARS, TASK_EXTRACT_USERDEV);
 
             project.getTasks().getByName(TASK_DEOBF_BIN).dependsOn(task);
 

src/main/java/net/minecraftforge/gradle/user/patcherUser/PatcherUserConstants.java

@@ -23,7 +23,7 @@ public final class PatcherUserConstants
     public static final String ZIP_UD_SRC            = DIR_USERDEV + "/sources.zip";
     public static final String ZIP_UD_RES            = DIR_USERDEV + "/resources.zip";
     public static final String ZIP_UD_PATCHES        = DIR_USERDEV + "/patches.zip";
-    public static final String ZIP_UD_CLASSES        = DIR_USERDEV + "/classes.zip";
+    public static final String ZIP_UD_CLASSES        = DIR_USERDEV + "/classes.jar";
     public static final String BINPATCH_USERDEV      = DIR_USERDEV + "/devbinpatches.pack.lzma";
 
     public static final String TASK_EXTRACT_USERDEV  = "extractUserdev";

src/main/java/net/minecraftforge/gradle/user/patcherUser/TaskApplyBinPatches.java

@@ -21,16 +21,9 @@
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
-import lzma.sdk.lzma.Decoder;
-import lzma.streams.LzmaInputStream;
-import net.minecraftforge.gradle.util.ZipFileTree;
-import net.minecraftforge.gradle.util.caching.Cached;
-import net.minecraftforge.gradle.util.caching.CachedTask;
-
 import org.gradle.api.file.FileVisitDetails;
 import org.gradle.api.file.FileVisitor;
 import org.gradle.api.tasks.InputFile;
-import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
 
@@ -41,12 +34,18 @@
 import com.google.common.io.ByteStreams;
 import com.nothome.delta.GDiffPatcher;
 
+import lzma.sdk.lzma.Decoder;
+import lzma.streams.LzmaInputStream;
+import net.minecraftforge.gradle.util.ZipFileTree;
+import net.minecraftforge.gradle.util.caching.Cached;
+import net.minecraftforge.gradle.util.caching.CachedTask;
+
 public class TaskApplyBinPatches extends CachedTask
 {
     //@formatter:off
     @InputFile  Object inJar;
     @InputFile  Object classesJar;
-    @InputFiles Object resourcesJar;
+    @InputFile  Object resourcesJar;
     @InputFile  Object patches;
     //@formatter:on