Fix patching merely claiming to work

Worked fine for testing the patches, but in doing so broke the patcher finding them to actually apply
Updates ForgeFlower to match what the patches are generated using

Author: Chocohead

build.gradle

@@ -74,7 +74,7 @@ dependencies {
     compile 'com.nothome:javaxdelta:2.0.1' // GDIFF implementation for BinPatches
     compile 'com.google.code.gson:gson:2.2.4' // Used instead of Argo for buuilding changelog.
     compile 'com.github.tony19:named-regexp:0.2.3' // 1.7 Named regexp features
-    compile 'net.minecraftforge:forgeflower:1.0.342-SNAPSHOT' // Fernflower Forge edition
+    compile 'net.minecraftforge:forgeflower:1.5.380.22' // Fernflower Forge edition
 
     shade 'net.md-5:SpecialSource:1.8.2' // deobf and reobf
 

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

@@ -127,15 +127,18 @@ public String asRead(String name, String file) throws Exception
         file = FFPatcher.processFile(file);
 
         // patch the file
-        Collection<File> patchFiles = patchesMap.get(name.replace('/', '.'));
+        Collection<File> patchFiles = patchesMap.get(name);
         if (!patchFiles.isEmpty())
         {
-            getLogger().debug("applying MCP patches");
+            getLogger().debug("applying " + patchFiles.size() + " MCP patch(es)");
             ContextProvider provider = new ContextProvider(file);
             ContextualPatch patch = findPatch(patchFiles, provider,getLogger());
             if (patch != null) {
                 patchErrors.add(new PatchAttempt(patch.patch(false),file));
                 file = provider.getAsString();
+            } else {
+            	//This shouldn't ever happen
+            	throw new IllegalStateException("Cannot find patches " + patchFiles + " for " + name);
             }
         }
 
@@ -258,7 +261,7 @@ private static ContextualPatch findPatch(Collection<File> files, ContextProvider
     {
         ContextualPatch patch = null;
         File lastFile = null;
-        boolean success = true;
+        boolean success = false;
         for (File f : files)
         {
             logger.debug("trying MCP patch " + f.getName());

src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java

@@ -314,7 +314,7 @@ protected void makeDecompTasks(final String globalPattern, final String localPat
             deobfDecomp.setExceptionsCfg(delayedFile(MCP_DATA_EXCEPTIONS));
             deobfDecomp.setInJar(transformedJar);
             deobfDecomp.setOutJar(deobfDecompJar);
-            deobfDecomp.dependsOn(inputTask, TASK_GENERATE_SRGS, TASK_EXTRACT_DEP_ATS, TASK_DD_COMPILE, TASK_DD_PROVIDED); // todo grab correct task to depend on
+            deobfDecomp.dependsOn(transformAccess);
         }
 
         final ApplyFernFlowerTask decompile = makeTask(TASK_DECOMPILE, ApplyFernFlowerTask.class);

src/main/java/net/minecraftforge/gradle/util/patching/ContextualPatch.java

@@ -185,6 +185,7 @@ public List<PatchReport> patch(boolean dryRun) throws PatchException, IOExceptio
 
     private void init() throws IOException
     {
+    	unreadPatchLine();
         if (patchString != null)
         {
             //Just read the string as is, without trying to read the magic/encoding as the string shuldn't need encoding!