Merge pull request #277 from Barteks2x/master

Allow to remove access modifiers in AccessTransformers  without breaking source patches, add final modifier as special case

Author: AbrarSyed

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

@@ -1254,24 +1254,38 @@ private boolean similar(String target, String hunk, char lineType)
             }
             String[] t = target.split(" ");
             String[] h = hunk.split(" ");
-            if (t.length != h.length)
-            {
-                return false;
-            }
-            for (int x = 0; x < t.length; x++)
+
+            //don't check length, changing any modifier to default (removing it) will change length
+            int targetIndex = 0;
+            int hunkIndex = 0;
+            while (targetIndex < t.length && hunkIndex < h.length)
             {
-                if (isAccess(t[x]) && isAccess(h[x]))
+                boolean isTargetAccess = isAccess(t[targetIndex]);
+                boolean isHunkAccess = isAccess(h[hunkIndex]);
+                if (isTargetAccess || isHunkAccess)
                 {
+                    //Skip access modifiers
+                    if (isTargetAccess)
+                    {
+                        targetIndex++;
+                    }
+                    if (isHunkAccess)
+                    {
+                        hunkIndex++;
+                    }
                     continue;
                 }
-                else if (!t[x].equals(h[x]))
+                String hunkPart = h[hunkIndex];
+                String targetPart = t[targetIndex];
+                boolean labels = isLabel(targetPart) && isLabel(hunkPart);
+                if (!labels && !targetPart.equals(hunkPart))
                 {
-                    if (isLabel(t[x]) && isLabel(h[x]))
-                        continue;
                     return false;
                 }
+                hunkIndex++;
+                targetIndex++;
             }
-            return true;
+            return h.length == hunkIndex && t.length == targetIndex;
         }
         if (c14nWhitespace)
         {
@@ -1287,11 +1301,12 @@ private boolean isAccess(String data)
     {
         return data.equalsIgnoreCase("public") ||
                 data.equalsIgnoreCase("private") ||
-                data.equalsIgnoreCase("protected");
+                data.equalsIgnoreCase("protected") ||
+                data.equalsIgnoreCase("final");
     }
 
     private boolean isLabel(String data) //Damn FernFlower
     {
         return data.startsWith("label");
     }
-}
+}