From 7534b3cac6bb8b93a03e3b39533e0bab38de9a61 Mon Sep 17 00:00:00 2001
From: SizableShrimp <sizableshrimp@sizableshrimp.me>
Date: Tue, 21 Mar 2023 22:41:17 -0500
Subject: [PATCH 01/22] Rebase on upstream 4961b5b (#138)

---
 FernFlower                                    |  2 +-
 ...izers-for-anon-and-synthetic-classes.patch |  4 +-
 ...screpancies-to-produce-stable-output.patch |  6 +-
 ...Convert-Exprent.bytecode-to-a-BitMap.patch | 56 +++++++++----------
 ...e-DotExporter-for-debugging-purposes.patch |  2 +-
 ...pport-for-Enhanced-For-loop-detectio.patch | 24 ++++----
 ...of-Generics-system-for-better-output.patch | 55 +++++++++---------
 .../0010-Improvements-to-var-and-var.patch    |  8 +--
 .../0011-JAD-Style-variable-naming.patch      | 19 ++-----
 .../0012-Fix-primitive-un-boxing-issues.patch |  6 +-
 ...ance-Generic-Invocations-Temporarily.patch |  6 +-
 ...Class-Objects.requireNonNull-cleanup.patch |  4 +-
 ...output-for-float-and-double-literals.patch |  2 +-
 .../0024-Add-try-with-resource-support.patch  |  4 +-
 ...and-enclosing-class-when-encounterin.patch |  2 +-
 .../0026-Fix-ambiguous-lambdas.patch          |  6 +-
 .../0027-Fix-field-initalizers.patch          |  4 +-
 .../0028-Improve-inferred-generic-types.patch | 26 ++++-----
 ...9-Improve-stack-var-processor-output.patch | 12 ++--
 ...t-to-invocations-of-java-nio-Buffer-.patch |  2 +-
 ...change-to-FieldExprent-getExprentUse.patch |  2 +-
 ...t-It-will-filter-what-classes-are-de.patch |  2 +-
 ...ot-rebuild-variable-names-in-lambdas.patch |  2 +-
 ...037-Add-toString-to-MethodDescriptor.patch |  2 +-
 .../0038-Make-decomp-threaded.patch           |  2 +-
 .../0040-Fixup-J9-string-concat.patch         |  7 +--
 ...when-finding-where-to-inject-local-c.patch |  6 +-
 ...Reduce-allocations-in-getAllExprents.patch | 28 +++++-----
 28 files changed, 145 insertions(+), 156 deletions(-)

diff --git a/FernFlower b/FernFlower
index 0e3593f..4961b5b 160000
--- a/FernFlower
+++ b/FernFlower
@@ -1 +1 @@
-Subproject commit 0e3593f12741eed59e88368eba933bb10fd4f6a6
+Subproject commit 4961b5bb7f9e06c4dd15e5e3def5a25773e895a1
diff --git a/FernFlower-Patches/0003-Fix-initializers-for-anon-and-synthetic-classes.patch b/FernFlower-Patches/0003-Fix-initializers-for-anon-and-synthetic-classes.patch
index d86e8a7..29e15fd 100644
--- a/FernFlower-Patches/0003-Fix-initializers-for-anon-and-synthetic-classes.patch
+++ b/FernFlower-Patches/0003-Fix-initializers-for-anon-and-synthetic-classes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix initializers for anon and synthetic classes
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index c012edd94f3f13c3bde885c992a74ce6d58eb0ee..1989a01b158570651f332cf80dca0e0baeb4153c 100644
+index 31f14c60939faaf73e8b971cb64c81b49decda81..9b4e9fb3ab0a2f54c124c8a4c3943e6d7a5d01d2 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 @@ -46,6 +46,7 @@ public class ClassWriter {
@@ -17,7 +17,7 @@ index c012edd94f3f13c3bde885c992a74ce6d58eb0ee..1989a01b158570651f332cf80dca0e0b
      if (node.type == ClassNode.CLASS_ROOT &&
          !cl.isVersion5() &&
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index 168d7dfdeb65138ef7c26e30971738cd5161ffff..4a539357120d333d47f20f5e05b57ef4ad7b1fa8 100644
+index b09304aac7771bda2dcec3ef535f9035904f3c94..8dc45a1de093a5e81ef74e034faf2041618ced99 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 @@ -88,6 +88,31 @@ public class ClassesProcessor implements CodeConstants {
diff --git a/FernFlower-Patches/0004-Fix-output-discrepancies-to-produce-stable-output.patch b/FernFlower-Patches/0004-Fix-output-discrepancies-to-produce-stable-output.patch
index 6eb7cc6..73c6a48 100644
--- a/FernFlower-Patches/0004-Fix-output-discrepancies-to-produce-stable-output.patch
+++ b/FernFlower-Patches/0004-Fix-output-discrepancies-to-produce-stable-output.patch
@@ -7,7 +7,7 @@ Running JVM and timestamp result in output varying between
 environments and runs.
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index 4a539357120d333d47f20f5e05b57ef4ad7b1fa8..9104ad3f1edae3deb11913bb08d101269370ca7d 100644
+index 8dc45a1de093a5e81ef74e034faf2041618ced99..8173ecd04da97e5e9a8f5f9a2e309726439697e0 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 @@ -249,6 +249,7 @@ public class ClassesProcessor implements CodeConstants {
@@ -156,7 +156,7 @@ index 05e6e2d720aa5812ef12c4741eab06b8ea477e0f..f9c8c6a0334512699c545c8812071947
        }
      }
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 7fca17c41c49b5378614130cf3b94b4aef6d1176..09eb2ca3b49093d291aaa4fc8bb769316d5a62ac 100644
+index da1fc15420faf03e1afbf74c39f888a6cb9c9ce8..6e5fe5474d6878d789758a5e7791b03e5da6685e 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 @@ -218,6 +218,7 @@ public class NestedClassProcessor {
@@ -354,7 +354,7 @@ index 82ae0a25a20d2727f611d359e699d6666d1e0ae4..a86f0d2887c6c19cb1d911ec43830eb6
  
      return res;
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-index caa160fdc4ff5954b0976b11d81177278ae79ab6..39df4ddd7afa01bba116063323630e514679a01f 100644
+index 743074d1b43f6b331cef74c94bb11a49fefbfb61..623d59228cc526cca3bbd52e95e4d493c689f133 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 @@ -216,7 +216,7 @@ public class ConstExprent extends Exprent {
diff --git a/FernFlower-Patches/0005-Convert-Exprent.bytecode-to-a-BitMap.patch b/FernFlower-Patches/0005-Convert-Exprent.bytecode-to-a-BitMap.patch
index fb8047f..2b12c8a 100644
--- a/FernFlower-Patches/0005-Convert-Exprent.bytecode-to-a-BitMap.patch
+++ b/FernFlower-Patches/0005-Convert-Exprent.bytecode-to-a-BitMap.patch
@@ -141,7 +141,7 @@ index c6a23b3277c3a93be621d6686b1554d51be01c9b..32ca965883f26cd8944bfb5e838d5cf5
      }
    }
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 09eb2ca3b49093d291aaa4fc8bb769316d5a62ac..8126a50cf043593c0a041ea8942971f12cf4f090 100644
+index 6e5fe5474d6878d789758a5e7791b03e5da6685e..327a6e64f06d7ef60dc1bb3139aab490a2f7c2df 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 @@ -533,7 +533,7 @@ public class NestedClassProcessor {
@@ -163,7 +163,7 @@ index 09eb2ca3b49093d291aaa4fc8bb769316d5a62ac..8126a50cf043593c0a041ea8942971f1
              }
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
-index c78b5ea78197f3c18ffb99caf5bd0e6bb49469f2..d85dead7cab48a9f551cb1226ef952807a067ec8 100644
+index f4cb77bea6031ddfe1197fb9d684f95ef39cda5a..5d47c847133cf0413365eddd5f1a2104b2f6ac6b 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
 @@ -11,8 +11,8 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
@@ -380,7 +380,7 @@ index ae166cc9ea414d5a0b698d8d06c7a24836c21316..478a3aef4cbc9d555abd82e38200a62b
          BasicBlock dummyBlock = new BasicBlock(++graph.last_id, seq);
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
-index 84de9258ddf94a35d4b1b1854e6a9bb4755214c5..982b660190ba9488c3ff62022aca0dfecbefab48 100644
+index 05849823262a46b66561164a0f0257123ce5307a..4beaf1ee874de373d956177ece541f0ecce64dc4 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
 @@ -6,6 +6,7 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
@@ -391,7 +391,7 @@ index 84de9258ddf94a35d4b1b1854e6a9bb4755214c5..982b660190ba9488c3ff62022aca0dfe
  import java.util.List;
  import java.util.Objects;
  
-@@ -98,4 +99,10 @@ public class AnnotationExprent extends Exprent {
+@@ -97,4 +98,10 @@ public class AnnotationExprent extends Exprent {
             parNames.equals(ann.parNames) &&
             parValues.equals(ann.parValues);
    }
@@ -404,7 +404,7 @@ index 84de9258ddf94a35d4b1b1854e6a9bb4755214c5..982b660190ba9488c3ff62022aca0dfe
  }
 \ No newline at end of file
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
-index c5bce7deb9b3ddee4adb41e356838979c2508fac..88b429ca3bc60303f9075eab36e279f9c58f4520 100644
+index e2b79d56e9f7c2ca22713e83dbd2aeddce5f9885..406848324e427a2b18d3666e321172f0f130ec4c 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
 @@ -14,7 +14,7 @@ public class ArrayExprent extends Exprent {
@@ -416,7 +416,7 @@ index c5bce7deb9b3ddee4adb41e356838979c2508fac..88b429ca3bc60303f9075eab36e279f9
      super(EXPRENT_ARRAY);
      this.array = array;
      this.index = index;
-@@ -106,4 +106,11 @@ public class ArrayExprent extends Exprent {
+@@ -105,4 +105,11 @@ public class ArrayExprent extends Exprent {
    public Exprent getIndex() {
      return index;
    }
@@ -453,7 +453,7 @@ index 0dcb63d34c036a9cd21e21d77c2ea01f6f5b9266..097c10a32ed819368c48efa51866420c
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
-index 13faa7fd16307e584d00bdf9f990e7cc7245babd..6cc60fd5314369cef21bd56c12e2af8e4c56292d 100644
+index b8678cdc0f0e778c3d1c8834ae764bbaa2e77ae1..06567749310f70d0f3263a9b2bad4588237bdda9 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
 @@ -36,7 +36,7 @@ public class AssignmentExprent extends Exprent {
@@ -465,7 +465,7 @@ index 13faa7fd16307e584d00bdf9f990e7cc7245babd..6cc60fd5314369cef21bd56c12e2af8e
      super(EXPRENT_ASSIGNMENT);
      this.left = left;
      this.right = right;
-@@ -166,6 +166,13 @@ public class AssignmentExprent extends Exprent {
+@@ -165,6 +165,13 @@ public class AssignmentExprent extends Exprent {
             condType == as.getCondType();
    }
  
@@ -480,7 +480,7 @@ index 13faa7fd16307e584d00bdf9f990e7cc7245babd..6cc60fd5314369cef21bd56c12e2af8e
    // getter and setter methods
    // *****************************************************************************
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-index 39df4ddd7afa01bba116063323630e514679a01f..56745ac71bbff7cbf8353579cd09f7482206677f 100644
+index 623d59228cc526cca3bbd52e95e4d493c689f133..b0bda600031b4cc52b6b083d5afd07a92ccef1af 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 @@ -52,20 +52,20 @@ public class ConstExprent extends Exprent {
@@ -508,7 +508,7 @@ index 39df4ddd7afa01bba116063323630e514679a01f..56745ac71bbff7cbf8353579cd09f748
      super(EXPRENT_CONST);
      this.constType = constType;
      this.value = value;
-@@ -497,6 +497,11 @@ public class ConstExprent extends Exprent {
+@@ -496,6 +496,11 @@ public class ConstExprent extends Exprent {
      return boolPermitted;
    }
  
@@ -521,7 +521,7 @@ index 39df4ddd7afa01bba116063323630e514679a01f..56745ac71bbff7cbf8353579cd09f748
    // IMatchable implementation
    // *****************************************************************************
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
-index 8dfa6cb4ad9ff9e465a1b42ca206e55ac07aabf8..b0c626320205e7e6fac1f8ceafdffbe89a5daf41 100644
+index 655e56241cf1d4eaa8bad524851f682c7af2bfb9..54f6a306cd28f68879d25a536a1dea7a496a4aa3 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
 @@ -16,9 +16,9 @@ import org.jetbrains.java.decompiler.struct.match.MatchNode;
@@ -544,7 +544,7 @@ index 8dfa6cb4ad9ff9e465a1b42ca206e55ac07aabf8..b0c626320205e7e6fac1f8ceafdffbe8
      super(EXPRENT_EXIT);
      this.exitType = exitType;
      this.value = value;
-@@ -141,6 +141,13 @@ public class ExitExprent extends Exprent {
+@@ -140,6 +140,13 @@ public class ExitExprent extends Exprent {
      return retType;
    }
  
@@ -628,7 +628,7 @@ index 9b1b3de632a63bbba1f5f7a99d5f75bf537bd171..67fc1f2beab815f0ca07ecf8a34b98fa
    }
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-index ec3a8668a94c7da89091a09a3002fd14346cc684..11669fe44ea78ab7322b82c844c8b220ca1a9975 100644
+index 4cd97c42682b27f96414ddf5302fc81db2561e56..379242393a83c6b3502a88c8d745a5b0bc1b5476 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
 @@ -19,9 +19,9 @@ import org.jetbrains.java.decompiler.util.TextBuffer;
@@ -656,7 +656,7 @@ index ec3a8668a94c7da89091a09a3002fd14346cc684..11669fe44ea78ab7322b82c844c8b220
      super(EXPRENT_FIELD);
      this.name = name;
      this.classname = classname;
-@@ -183,6 +183,12 @@ public class FieldExprent extends Exprent {
+@@ -182,6 +182,12 @@ public class FieldExprent extends Exprent {
      return name;
    }
  
@@ -670,7 +670,7 @@ index ec3a8668a94c7da89091a09a3002fd14346cc684..11669fe44ea78ab7322b82c844c8b220
    // IMatchable implementation
    // *****************************************************************************
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-index a4ee85ba5deafed6f9618f9a8b93c5f554878a1d..ac2b3a50e65c46ff998173335d505cdfc8a27b21 100644
+index 4290039f07249ef112eb357ba0c9914ef5c08b40..b2b26fb3f8b075182caee14d57b4cc351ffb120a 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
 @@ -183,7 +183,7 @@ public class FunctionExprent extends Exprent {
@@ -700,7 +700,7 @@ index a4ee85ba5deafed6f9618f9a8b93c5f554878a1d..ac2b3a50e65c46ff998173335d505cdf
      this(funcType, new ArrayList<>(1), bytecodeOffsets);
      lstOperands.add(operand);
    }
-@@ -566,6 +566,12 @@ public class FunctionExprent extends Exprent {
+@@ -565,6 +565,12 @@ public class FunctionExprent extends Exprent {
      this.implicitType = implicitType;
    }
  
@@ -714,7 +714,7 @@ index a4ee85ba5deafed6f9618f9a8b93c5f554878a1d..ac2b3a50e65c46ff998173335d505cdf
    // IMatchable implementation
    // *****************************************************************************
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
-index d5a743fd1a4e068616a82e8f23d119a8ba2b1d59..18d2c40d9af0e822004f4baaa3c6b567914a7545 100644
+index fda309fdc9d9fcaba4d089778122a56d1524e083..7c9ee0a57cd291ae20b466d70f57a8f11bf4abaa 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
 @@ -9,9 +9,9 @@ import org.jetbrains.java.decompiler.util.ListStack;
@@ -746,7 +746,7 @@ index d5a743fd1a4e068616a82e8f23d119a8ba2b1d59..18d2c40d9af0e822004f4baaa3c6b567
      super(EXPRENT_IF);
      this.condition = condition;
  
-@@ -135,4 +135,10 @@ public class IfExprent extends Exprent {
+@@ -134,4 +134,10 @@ public class IfExprent extends Exprent {
    public void setCondition(Exprent condition) {
      this.condition = condition;
    }
@@ -760,7 +760,7 @@ index d5a743fd1a4e068616a82e8f23d119a8ba2b1d59..18d2c40d9af0e822004f4baaa3c6b567
 +  }
 +}
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index d4ce3d808e9802b9f25a0a07a821f18fe3fed3f4..d94561755621c6517976a763f8b9a0a4e49528e2 100644
+index dc9c2a593185c2f5de7289b0c7676071bf50f5a4..3cedf46af2faa91029231205455a1df1db7be3de 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 @@ -65,7 +65,7 @@ public class InvocationExprent extends Exprent {
@@ -772,7 +772,7 @@ index d4ce3d808e9802b9f25a0a07a821f18fe3fed3f4..d94561755621c6517976a763f8b9a0a4
      this();
  
      name = cn.elementname;
-@@ -603,6 +603,13 @@ public class InvocationExprent extends Exprent {
+@@ -602,6 +602,13 @@ public class InvocationExprent extends Exprent {
      return bootstrapArguments;
    }
  
@@ -787,7 +787,7 @@ index d4ce3d808e9802b9f25a0a07a821f18fe3fed3f4..d94561755621c6517976a763f8b9a0a4
    // IMatchable implementation
    // *****************************************************************************
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
-index 5c4b2f37b57ec1f084e4147f2d9605e89d895b91..3ad223c61453159d096405bb73184644595b75a9 100644
+index 7259ce4ee91540cabf7a76105a5f18b2ab0390fa..cd465813bc3e9076d3bbafd1c7b10c9bed0a1407 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
 @@ -7,9 +7,9 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
@@ -810,7 +810,7 @@ index 5c4b2f37b57ec1f084e4147f2d9605e89d895b91..3ad223c61453159d096405bb73184644
      super(EXPRENT_MONITOR);
      this.monType = monType;
      this.value = value;
-@@ -75,4 +75,10 @@ public class MonitorExprent extends Exprent {
+@@ -74,4 +74,10 @@ public class MonitorExprent extends Exprent {
    public Exprent getValue() {
      return value;
    }
@@ -822,7 +822,7 @@ index 5c4b2f37b57ec1f084e4147f2d9605e89d895b91..3ad223c61453159d096405bb73184644
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-index 6257de67e8acd4b4882c758befa3c1e5223ddc0c..6df45768b067fd2e01ffd61bb157158cb369ad7e 100644
+index 2f8da49a36ee84e09ff6192aea5d0904c4f06255..c47ae33d7d62a5049a89bb586032fc18bdc80173 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 @@ -31,11 +31,11 @@ public class NewExprent extends Exprent {
@@ -839,7 +839,7 @@ index 6257de67e8acd4b4882c758befa3c1e5223ddc0c..6df45768b067fd2e01ffd61bb157158c
      super(EXPRENT_NEW);
      this.newType = newType;
      this.lstDims = lstDims;
-@@ -436,6 +436,14 @@ public class NewExprent extends Exprent {
+@@ -435,6 +435,14 @@ public class NewExprent extends Exprent {
             Objects.equals(lstArrayElements, ne.lstArrayElements);
    }
  
@@ -855,7 +855,7 @@ index 6257de67e8acd4b4882c758befa3c1e5223ddc0c..6df45768b067fd2e01ffd61bb157158c
      return constructor;
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
-index 3b77fa20c3bfe1790e5f9386b5a38f02ca9c51fe..105c4d951f806fffb8d42386933a7629fa61d76c 100644
+index f475db7b7441d47661340b366116dbae7b1d9e5e..11000d30cbdc93e360cb1bc96b53987bc692e3bd 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
 @@ -9,16 +9,16 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
@@ -877,7 +877,7 @@ index 3b77fa20c3bfe1790e5f9386b5a38f02ca9c51fe..105c4d951f806fffb8d42386933a7629
      super(EXPRENT_SWITCH);
      this.value = value;
  
-@@ -100,6 +100,22 @@ public class SwitchExprent extends Exprent {
+@@ -99,6 +99,22 @@ public class SwitchExprent extends Exprent {
      return Objects.equals(value, sw.getValue());
    }
  
@@ -901,7 +901,7 @@ index 3b77fa20c3bfe1790e5f9386b5a38f02ca9c51fe..105c4d951f806fffb8d42386933a7629
      return value;
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index eb0ef2bf829f55541711e24e483b68890735320a..4c40e5152ffca092883170401453525093da011a 100644
+index e488a34ea11ab46cd1bd6383cd332f05d45df2af..2b508a172340285dff5afa73cd4d7fcbf0dfeaff 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 @@ -26,6 +26,7 @@ import org.jetbrains.java.decompiler.util.TextUtil;
@@ -963,7 +963,7 @@ index eb0ef2bf829f55541711e24e483b68890735320a..4c40e5152ffca0928831704014535250
          if (originalIndex != null) {
            // first try from signature
            if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
-@@ -181,6 +182,11 @@ public class VarExprent extends Exprent {
+@@ -180,6 +181,11 @@ public class VarExprent extends Exprent {
             Objects.equals(getVarType(), ve.getVarType()); // FIXME: varType comparison redundant?
    }
  
diff --git a/FernFlower-Patches/0007-Reintroduce-DotExporter-for-debugging-purposes.patch b/FernFlower-Patches/0007-Reintroduce-DotExporter-for-debugging-purposes.patch
index a6b010b..0d3d6de 100644
--- a/FernFlower-Patches/0007-Reintroduce-DotExporter-for-debugging-purposes.patch
+++ b/FernFlower-Patches/0007-Reintroduce-DotExporter-for-debugging-purposes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reintroduce DotExporter for debugging purposes
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 8126a50cf043593c0a041ea8942971f12cf4f090..216db28b337c729ea839415bdccc3b48a1219709 100644
+index 327a6e64f06d7ef60dc1bb3139aab490a2f7c2df..7d41769adee0974a02e0ef5a0518f9f9e53c8b58 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 @@ -24,6 +24,7 @@ import org.jetbrains.java.decompiler.struct.attr.StructEnclosingMethodAttribute;
diff --git a/FernFlower-Patches/0008-LVT-Fixes-and-Support-for-Enhanced-For-loop-detectio.patch b/FernFlower-Patches/0008-LVT-Fixes-and-Support-for-Enhanced-For-loop-detectio.patch
index a99ab53..bf8867f 100644
--- a/FernFlower-Patches/0008-LVT-Fixes-and-Support-for-Enhanced-For-loop-detectio.patch
+++ b/FernFlower-Patches/0008-LVT-Fixes-and-Support-for-Enhanced-For-loop-detectio.patch
@@ -158,7 +158,7 @@ index 80f024eb8e069cc4d208a9b79dbc7edf67161ec7..fa4b5ed56fa58f2d864ea3acd758a36f
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 216db28b337c729ea839415bdccc3b48a1219709..5d0ec234807e0fa186ae88e7f74059710a47bd46 100644
+index 7d41769adee0974a02e0ef5a0518f9f9e53c8b58..bb2d0f0eb067a92472dcd8d69a0029d15c34c520 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 @@ -22,6 +22,7 @@ import org.jetbrains.java.decompiler.struct.StructField;
@@ -374,7 +374,7 @@ index 216db28b337c729ea839415bdccc3b48a1219709..5d0ec234807e0fa186ae88e7f7405971
                }
              }
  
-@@ -913,4 +961,41 @@ public class NestedClassProcessor {
+@@ -911,4 +959,41 @@ public class NestedClassProcessor {
        return fieldKey.hashCode() + varPair.hashCode();
      }
    }
@@ -1748,7 +1748,7 @@ index 0000000000000000000000000000000000000000..9123d92be14259e0117a0bb7b06a3d09
 +}
 \ No newline at end of file
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index d94561755621c6517976a763f8b9a0a4e49528e2..8d2ce0f8f4d4368f87ed596e4e76442ff97fed19 100644
+index 3cedf46af2faa91029231205455a1df1db7be3de..6776219b98b6b244bb9deda8cffc7b8fc63e4ac6 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 @@ -443,7 +443,7 @@ public class InvocationExprent extends Exprent {
@@ -1760,7 +1760,7 @@ index d94561755621c6517976a763f8b9a0a4e49528e2..8d2ce0f8f4d4368f87ed596e4e76442f
      return !isStatic && parameters.size() == 0 && className.equals(UNBOXING_METHODS.get(name));
    }
  
-@@ -644,4 +644,4 @@ public class InvocationExprent extends Exprent {
+@@ -643,4 +643,4 @@ public class InvocationExprent extends Exprent {
  
      return true;
    }
@@ -1768,7 +1768,7 @@ index d94561755621c6517976a763f8b9a0a4e49528e2..8d2ce0f8f4d4368f87ed596e4e76442f
 \ No newline at end of file
 +}
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index 4c40e5152ffca092883170401453525093da011a..2fda2ba5fc05992faf891d2af14910023228c6b6 100644
+index 2b508a172340285dff5afa73cd4d7fcbf0dfeaff..8abfd33115391d24d08d349af9a5b64b1d75c1bf 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 @@ -9,11 +9,13 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
@@ -1872,7 +1872,7 @@ index 4c40e5152ffca092883170401453525093da011a..2fda2ba5fc05992faf891d2af1491002
        MethodWrapper method = (MethodWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_WRAPPER);
        if (method != null) {
          Integer originalIndex = null;
-@@ -196,6 +213,10 @@ public class VarExprent extends Exprent {
+@@ -195,6 +212,10 @@ public class VarExprent extends Exprent {
    }
  
    public VarType getVarType() {
@@ -1883,7 +1883,7 @@ index 4c40e5152ffca092883170401453525093da011a..2fda2ba5fc05992faf891d2af1491002
      VarType vt = null;
      if (processor != null) {
        vt = processor.getVarType(getVarVersionPair());
-@@ -248,6 +269,93 @@ public class VarExprent extends Exprent {
+@@ -247,6 +268,93 @@ public class VarExprent extends Exprent {
      this.stack = stack;
    }
  
@@ -2004,7 +2004,7 @@ index a20acdff7d3ef1415fe6c90d05b92a90cfaf0073..6f21cd6df597613099861d874bb320ef
      // 0 - success, do nothing
      // 1 - cancel iteration
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
-index 592860d16b742ea70f85d2fe0270e2cbf5830f42..ccb7b3d9d0b38a5be9a6c9c727b4800bf815e715 100644
+index 552ae9594a64c737095bc5ec095e134926c1315c..234a42e3a73426204cf3debdb9b77c28f4afbb10 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
 @@ -201,7 +201,7 @@ public class FlattenStatementsHelper {
@@ -2095,7 +2095,7 @@ index 9498f3c548d18ead3bcbc076222bd5ace82b8275..e65af740228e237d3159cf4dd3398a9f
  
    //TODO: Cleanup/cache?
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 49729c1d27c1a1a42904949c25c0635f6a03a736..6f8a2619c728d168431673b14f53b94ba783cf2f 100644
+index 0113b76b89a886a96d8f1668142b008cb85ab637..f2c0589344ed69685dd3103d060109c700c7ee41 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -4,18 +4,28 @@ package org.jetbrains.java.decompiler.modules.decompiler.vars;
@@ -2274,7 +2274,7 @@ index 49729c1d27c1a1a42904949c25c0635f6a03a736..6f8a2619c728d168431673b14f53b94b
    private Statement findFirstBlock(Statement stat, Integer varindex) {
  
      LinkedList<Statement> stack = new LinkedList<>();
-@@ -250,6 +325,7 @@ public class VarDefinitionHelper {
+@@ -249,6 +324,7 @@ public class VarDefinitionHelper {
            if (st.type == StatementType.DO) {
              DoStatement dost = (DoStatement)st;
              if (dost.getLoopType() != LoopType.FOR &&
@@ -2282,7 +2282,7 @@ index 49729c1d27c1a1a42904949c25c0635f6a03a736..6f8a2619c728d168431673b14f53b94b
                  dost.getLoopType() != LoopType.DO) {
                currVars.add(dost.getConditionExprent());
              }
-@@ -320,7 +396,7 @@ public class VarDefinitionHelper {
+@@ -319,7 +395,7 @@ public class VarDefinitionHelper {
      return res;
    }
  
@@ -2291,7 +2291,7 @@ index 49729c1d27c1a1a42904949c25c0635f6a03a736..6f8a2619c728d168431673b14f53b94b
      if (expr.type == Exprent.EXPRENT_ASSIGNMENT) {
        Exprent left = ((AssignmentExprent)expr).getLeft();
        if (left.type == Exprent.EXPRENT_VAR) {
-@@ -333,4 +409,660 @@ public class VarDefinitionHelper {
+@@ -332,4 +408,660 @@ public class VarDefinitionHelper {
      }
      return false;
    }
diff --git a/FernFlower-Patches/0009-Rework-of-Generics-system-for-better-output.patch b/FernFlower-Patches/0009-Rework-of-Generics-system-for-better-output.patch
index ddf3586..79bb0ea 100644
--- a/FernFlower-Patches/0009-Rework-of-Generics-system-for-better-output.patch
+++ b/FernFlower-Patches/0009-Rework-of-Generics-system-for-better-output.patch
@@ -34,7 +34,7 @@ index 4c4916e4cc5ccdd06dd4138dae54c31fb7f3bd34..decfe747ba2ab3643209987294ef7bcb
 \ No newline at end of file
 +}
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index 1989a01b158570651f332cf80dca0e0baeb4153c..31236841f1b4bf4f452f30d6b95f21fcc99ec5b9 100644
+index 9b4e9fb3ab0a2f54c124c8a4c3943e6d7a5d01d2..31236841f1b4bf4f452f30d6b95f21fcc99ec5b9 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 @@ -371,9 +371,14 @@ public class ClassWriter {
@@ -179,14 +179,13 @@ index 1989a01b158570651f332cf80dca0e0baeb4153c..31236841f1b4bf4f452f30d6b95f21fc
            if (mask == null || mask.get(i) == null) {
              if (paramCount > 0) {
                buffer.append(", ");
-@@ -765,24 +728,12 @@ public class ClassWriter {
+@@ -765,23 +728,12 @@ public class ClassWriter {
              }
  
              String typeName;
 -            boolean isVarArg = i == lastVisibleParameterIndex && mt.hasModifier(CodeConstants.ACC_VARARGS);
              List<TypeAnnotation> typeParamAnnotations = TargetInfo.FormalParameterTarget.extract(typeAnnotations, i);
--            if (paramType instanceof GenericType) {
--              GenericType genParamType = (GenericType) paramType;
+-            if (paramType instanceof GenericType genParamType) {
 -              isVarArg &= genParamType.getArrayDim() > 0;
 -              if (isVarArg) {
 -                genParamType = genParamType.decreaseArrayDim();
@@ -208,7 +207,7 @@ index 1989a01b158570651f332cf80dca0e0baeb4153c..31236841f1b4bf4f452f30d6b95f21fc
  
              if (ExprProcessor.UNDEFINED_TYPE_STRING.equals(typeName) &&
                  DecompilerContext.getOption(IFernflowerPreferences.UNDEFINED_PARAM_TYPE_OBJECT)) {
-@@ -801,7 +752,7 @@ public class ClassWriter {
+@@ -800,7 +752,7 @@ public class ClassWriter {
              paramCount++;
            }
  
@@ -217,7 +216,7 @@ index 1989a01b158570651f332cf80dca0e0baeb4153c..31236841f1b4bf4f452f30d6b95f21fc
          }
  
          buffer.append(')');
-@@ -811,19 +762,14 @@ public class ClassWriter {
+@@ -810,19 +762,14 @@ public class ClassWriter {
            throwsExceptions = true;
            buffer.append(" throws ");
  
@@ -240,7 +239,7 @@ index 1989a01b158570651f332cf80dca0e0baeb4153c..31236841f1b4bf4f452f30d6b95f21fc
            }
          }
        }
-@@ -1051,7 +997,7 @@ public class ClassWriter {
+@@ -1050,7 +997,7 @@ public class ClassWriter {
  
      final List<TypeAnnotation> typeAnnotations = TypeAnnotation.listFrom(cd);
      if (descriptor != null) {
@@ -249,7 +248,7 @@ index 1989a01b158570651f332cf80dca0e0baeb4153c..31236841f1b4bf4f452f30d6b95f21fc
          varArgComponent ? descriptor.type.decreaseArrayDim() : descriptor.type,
          TypeAnnotationWriteHelper.create(typeAnnotations)
        ));
-@@ -1105,14 +1051,7 @@ public class ClassWriter {
+@@ -1104,14 +1051,7 @@ public class ClassWriter {
    private static Map.Entry<VarType, GenericFieldDescriptor> getFieldTypeData(StructField fd) {
      VarType fieldType = new VarType(fd.getDescriptor(), false);
  
@@ -265,7 +264,7 @@ index 1989a01b158570651f332cf80dca0e0baeb4153c..31236841f1b4bf4f452f30d6b95f21fc
      return new AbstractMap.SimpleImmutableEntry<>(fieldType, descriptor);
    }
  
-@@ -1249,22 +1188,11 @@ public class ClassWriter {
+@@ -1248,22 +1188,11 @@ public class ClassWriter {
      }
    }
  
@@ -292,7 +291,7 @@ index 1989a01b158570651f332cf80dca0e0baeb4153c..31236841f1b4bf4f452f30d6b95f21fc
      buffer.append('<');
      for (int i = 0; i < parameters.size(); i++) {
        if (i > 0) {
-@@ -1272,15 +1200,15 @@ public class ClassWriter {
+@@ -1271,15 +1200,15 @@ public class ClassWriter {
        }
        TargetInfo.TypeParameterTarget.extract(typeAnnotations, i).forEach(typeAnnotation -> typeAnnotation.writeTo(buffer));
        buffer.append(parameters.get(i));
@@ -311,7 +310,7 @@ index 1989a01b158570651f332cf80dca0e0baeb4153c..31236841f1b4bf4f452f30d6b95f21fc
          }
        }
      }
-@@ -1297,4 +1225,4 @@ public class ClassWriter {
+@@ -1296,4 +1225,4 @@ public class ClassWriter {
        }
      }
    }
@@ -493,7 +492,7 @@ index eb96762fa2174047a3f9dcecfb8c57bf4721c11f..dc3d20eed5ddcac36204fc9ed75d73c5
 \ No newline at end of file
 +}
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
-index 6cc60fd5314369cef21bd56c12e2af8e4c56292d..c713a4055dfc5aa05143a6cd856c5bd98e05c8c1 100644
+index 06567749310f70d0f3263a9b2bad4588237bdda9..ed470ffbbf57c7aea4e82174a99c8d31a097bc32 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
 @@ -5,7 +5,6 @@ import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -545,7 +544,7 @@ index 6cc60fd5314369cef21bd56c12e2af8e4c56292d..c713a4055dfc5aa05143a6cd856c5bd9
  
      buffer.append(condType == CONDITION_NONE ? " = " : OPERATORS[condType]).append(res);
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
-index b0c626320205e7e6fac1f8ceafdffbe89a5daf41..db2a53744ffeb8b0bdc7b045a822be2df1695b4e 100644
+index 54f6a306cd28f68879d25a536a1dea7a496a4aa3..9b9a0b4198688968201783fb804130a3312aa522 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
 @@ -10,6 +10,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
@@ -594,7 +593,7 @@ index b0c626320205e7e6fac1f8ceafdffbe89a5daf41..db2a53744ffeb8b0bdc7b045a822be2d
        }
  
        return buffer;
-@@ -141,6 +148,10 @@ public class ExitExprent extends Exprent {
+@@ -140,6 +147,10 @@ public class ExitExprent extends Exprent {
      return retType;
    }
  
@@ -774,7 +773,7 @@ index 67fc1f2beab815f0ca07ecf8a34b98fa23344749..33150f76d649f124bc818036b0f7c633
    // IMatchable implementation
    // *****************************************************************************
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-index 11669fe44ea78ab7322b82c844c8b220ca1a9975..b76d5dd1f39f3ef9a2847414bcf1cc3738b0fdae 100644
+index 379242393a83c6b3502a88c8d745a5b0bc1b5476..040e5d21985979a9686cb9fee6e3048fe87e5464 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
 @@ -8,6 +8,8 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
@@ -823,7 +822,7 @@ index 11669fe44ea78ab7322b82c844c8b220ca1a9975..b76d5dd1f39f3ef9a2847414bcf1cc37
    @Override
    public int getExprentUse() {
      return 0; // multiple references to a field considered dangerous in a multithreaded environment, thus no Exprent.MULTIPLE_USES set here
-@@ -211,4 +235,4 @@ public class FieldExprent extends Exprent {
+@@ -210,4 +234,4 @@ public class FieldExprent extends Exprent {
  
      return true;
    }
@@ -831,7 +830,7 @@ index 11669fe44ea78ab7322b82c844c8b220ca1a9975..b76d5dd1f39f3ef9a2847414bcf1cc37
 \ No newline at end of file
 +}
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-index ac2b3a50e65c46ff998173335d505cdfc8a27b21..0a6281872ae535dbc0569cb08b301d58b6c5c9a3 100644
+index b2b26fb3f8b075182caee14d57b4cc351ffb120a..f18ef04b350a5f6d4599282aef5ea3f6e3dce778 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
 @@ -2,6 +2,8 @@
@@ -906,7 +905,7 @@ index ac2b3a50e65c46ff998173335d505cdfc8a27b21..0a6281872ae535dbc0569cb08b301d58
    @Override
    public int getExprentUse() {
      if (funcType >= FUNCTION_IMM && funcType <= FUNCTION_PPI) {
-@@ -439,8 +481,12 @@ public class FunctionExprent extends Exprent {
+@@ -438,8 +480,12 @@ public class FunctionExprent extends Exprent {
        case FUNCTION_BIT_NOT -> wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("~");
        case FUNCTION_BOOL_NOT -> wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("!");
        case FUNCTION_NEG -> wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("-");
@@ -921,7 +920,7 @@ index ac2b3a50e65c46ff998173335d505cdfc8a27b21..0a6281872ae535dbc0569cb08b301d58
        case FUNCTION_ARRAY_LENGTH -> {
          Exprent arr = lstOperands.get(0);
          TextBuffer res = wrapOperandString(arr, false, indent, tracer);
-@@ -571,7 +617,7 @@ public class FunctionExprent extends Exprent {
+@@ -570,7 +616,7 @@ public class FunctionExprent extends Exprent {
      measureBytecode(values, lstOperands);
      measureBytecode(values);
    }
@@ -931,7 +930,7 @@ index ac2b3a50e65c46ff998173335d505cdfc8a27b21..0a6281872ae535dbc0569cb08b301d58
    // IMatchable implementation
    // *****************************************************************************
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 8d2ce0f8f4d4368f87ed596e4e76442ff97fed19..6eab93e5ed261b0903ae3fe4677118bfa2d1d60e 100644
+index 6776219b98b6b244bb9deda8cffc7b8fc63e4ac6..2d8abaec74b301f76fcd4149600c1da72cc9b6c4 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 @@ -19,6 +19,8 @@ import org.jetbrains.java.decompiler.struct.consts.LinkConstant;
@@ -1137,7 +1136,7 @@ index 8d2ce0f8f4d4368f87ed596e4e76442ff97fed19..6eab93e5ed261b0903ae3fe4677118bf
            ambiguous.set(i);
            break;
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-index 6df45768b067fd2e01ffd61bb157158cb369ad7e..2501863f7396c721a42eaab481b2c89d88209d23 100644
+index c47ae33d7d62a5049a89bb586032fc18bdc80173..2405fe08663102626f6ab007ccf5ee6c0e8922ea 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 @@ -14,7 +14,6 @@ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
@@ -1219,7 +1218,7 @@ index 6df45768b067fd2e01ffd61bb157158cb369ad7e..2501863f7396c721a42eaab481b2c89d
  
            boolean firstParam = true;
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index 2fda2ba5fc05992faf891d2af14910023228c6b6..9ba49d3d3ee30e6e8db7cacd836f7f627ecb4b67 100644
+index 8abfd33115391d24d08d349af9a5b64b1d75c1bf..bbe17e0b2c4dcb7214e0c94cc34156e5c9f233a0 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 @@ -20,6 +20,7 @@ import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTypeTableAtt
@@ -1284,7 +1283,7 @@ index 018d3fbdf53036db90b6c64e872098542133b630..d58218e0baa786456f15a14ef23a8d82
          tracer.incrementCurrentSourceLine();
          buf.append(ExprProcessor.jmpWrapper(first, indent + 1, true, tracer));
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 6f8a2619c728d168431673b14f53b94ba783cf2f..abe421340550d258edce046fc901479fa027a23e 100644
+index f2c0589344ed69685dd3103d060109c700c7ee41..f9a7e55c108959b9696cb52cfd91aee341e40b06 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -24,7 +24,6 @@ import org.jetbrains.java.decompiler.struct.StructMethod;
@@ -1295,7 +1294,7 @@ index 6f8a2619c728d168431673b14f53b94ba783cf2f..abe421340550d258edce046fc901479f
  import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
  
  import java.util.*;
-@@ -987,7 +986,7 @@ public class VarDefinitionHelper {
+@@ -986,7 +985,7 @@ public class VarDefinitionHelper {
  
      private VarInfo(LocalVariable lvt, VarType type) {
        if (lvt != null && lvt.getSignature() != null)
@@ -1693,7 +1692,7 @@ index e50983daf2a1bf6c93ec92c99221587d7c4f7c6a..11fa1a3e621221a09c0e611a7f912932
    }
  }
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
-index 7007b680a005a28a5d919e5e9e4298ed6c0ec566..49494925b2d67b95920bb2b8c8371e886341492f 100644
+index 267eb5067594bebb435f960b912754a5a2cff9e1..2096754661e845cfe3148d47c5c3ff914bcb0322 100644
 --- a/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
 +++ b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
 @@ -2,14 +2,24 @@
@@ -1757,7 +1756,7 @@ index 7007b680a005a28a5d919e5e9e4298ed6c0ec566..49494925b2d67b95920bb2b8c8371e88
    public String buildNewDescriptor(NewClassNameBuilder builder) {
      boolean updated = false;
  
-@@ -126,4 +165,4 @@ public final class MethodDescriptor {
+@@ -125,4 +164,4 @@ public final class MethodDescriptor {
      result = 31 * result + params.length;
      return result;
    }
@@ -1765,7 +1764,7 @@ index 7007b680a005a28a5d919e5e9e4298ed6c0ec566..49494925b2d67b95920bb2b8c8371e88
 \ No newline at end of file
 +}
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
-index 30b31f5604f0c1566c536737aa7d9c61363e08c5..44d120256a8020b833567fe0f24c7b2c67caafde 100644
+index 2d18843b486376752fa29c03cec82308e9440bf5..f4115448cfa13ba37fb1ee1795903ffb0c79a6af 100644
 --- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
 +++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
 @@ -3,6 +3,7 @@ package org.jetbrains.java.decompiler.struct.gen;
@@ -1819,7 +1818,7 @@ index 30b31f5604f0c1566c536737aa7d9c61363e08c5..44d120256a8020b833567fe0f24c7b2c
    @Override
    public boolean equals(Object o) {
      if (o == this) {
-@@ -374,4 +384,15 @@ public class VarType implements Type {  // TODO: optimize switch
+@@ -373,4 +383,15 @@ public class VarType implements Type {  // TODO: optimize switch
        default -> throw new IllegalArgumentException("Invalid type: " + c);
      };
    }
diff --git a/FernFlower-Patches/0010-Improvements-to-var-and-var.patch b/FernFlower-Patches/0010-Improvements-to-var-and-var.patch
index 46d95a3..040d37c 100644
--- a/FernFlower-Patches/0010-Improvements-to-var-and-var.patch
+++ b/FernFlower-Patches/0010-Improvements-to-var-and-var.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Improvements to var++ and var--
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 5d0ec234807e0fa186ae88e7f74059710a47bd46..866cea112a60907c3ef02160a3b6c0bac1a075ae 100644
+index bb2d0f0eb067a92472dcd8d69a0029d15c34c520..fde1c3bca1b12454b6f9a692c5f870ba946a590e 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-@@ -916,7 +916,7 @@ public class NestedClassProcessor {
+@@ -915,7 +915,7 @@ public class NestedClassProcessor {
          case Exprent.EXPRENT_FIELD -> res = classname.equals(((FieldExprent)expr).getClassname());
          case Exprent.EXPRENT_INVOCATION -> res = classname.equals(((InvocationExprent)expr).getClassName());
          case Exprent.EXPRENT_NEW -> {
@@ -114,10 +114,10 @@ index 81b4c480810a2f74388a4626a4dc0c2bfc523365..f0f66146eb4ecad4ed1bbd41712cace8
            }
          }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-index 56745ac71bbff7cbf8353579cd09f7482206677f..311fe8507fba664bd4b1e627f8ffbdb4c0c97cab 100644
+index b0bda600031b4cc52b6b083d5afd07a92ccef1af..401917e6947c0ae541c966777cf2deddf54ed644 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-@@ -501,7 +501,12 @@ public class ConstExprent extends Exprent {
+@@ -500,7 +500,12 @@ public class ConstExprent extends Exprent {
    public void getBytecodeRange(BitSet values) {
      measureBytecode(values);
    }
diff --git a/FernFlower-Patches/0011-JAD-Style-variable-naming.patch b/FernFlower-Patches/0011-JAD-Style-variable-naming.patch
index df4721b..1a30eab 100644
--- a/FernFlower-Patches/0011-JAD-Style-variable-naming.patch
+++ b/FernFlower-Patches/0011-JAD-Style-variable-naming.patch
@@ -60,7 +60,7 @@ index 31236841f1b4bf4f452f30d6b95f21fcc99ec5b9..aa990406ef8d91838aa2d928bdfb183f
              firstParameter = false;
            }
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index 9104ad3f1edae3deb11913bb08d101269370ca7d..7149145b1f3ed3583f8bbe416947a0d68de523db 100644
+index 8173ecd04da97e5e9a8f5f9a2e309726439697e0..3398f884985021a324fc5ae6ac6a461f8e5b2f33 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 @@ -146,6 +146,7 @@ public class ClassesProcessor implements CodeConstants {
@@ -105,15 +105,6 @@ index 9104ad3f1edae3deb11913bb08d101269370ca7d..7149145b1f3ed3583f8bbe416947a0d6
  
      for (ClassNode nd : node.nested) {
        destroyWrappers(nd);
-@@ -500,7 +521,7 @@ public class ClassesProcessor implements CodeConstants {
- 
-       anonymousClassType = new VarType(lambda_class_name, true);
- 
--      boolean is_method_reference = (content_class_name != classStruct.qualifiedName);
-+      boolean is_method_reference = !classStruct.qualifiedName.equals(content_class_name);
-       if (!is_method_reference) { // content method in the same class, check synthetic flag
-         StructMethod mt = classStruct.getMethod(content_method_name, content_method_descriptor);
-         is_method_reference = !mt.isSynthetic(); // if not synthetic -> method reference
 @@ -563,4 +584,4 @@ public class ClassesProcessor implements CodeConstants {
        public boolean is_content_method_static;
      }
@@ -373,7 +364,7 @@ index c1126a2b7559e2f8a69a54ee0b7db2ceda3d9776..964bff5a00b35969fa08e48ca355801f
        if (attr != null) {
          // only param names here
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index abe421340550d258edce046fc901479fa027a23e..cf7f00021cad6818e144342dcbf5b6198e8adeb3 100644
+index f9a7e55c108959b9696cb52cfd91aee341e40b06..b35985211d1f0488f76cbd6e87f18e3732b2d589 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -2,6 +2,7 @@
@@ -400,7 +391,7 @@ index abe421340550d258edce046fc901479fa027a23e..cf7f00021cad6818e144342dcbf5b619
  
  import java.util.*;
  import java.util.Map.Entry;
-@@ -843,6 +846,53 @@ public class VarDefinitionHelper {
+@@ -842,6 +845,53 @@ public class VarDefinitionHelper {
      for (Entry<VarVersionPair, VarInfo> e : types.entrySet()) {
        typeNames.put(e.getKey(), e.getValue().getCast());
      }
@@ -454,7 +445,7 @@ index abe421340550d258edce046fc901479fa027a23e..cf7f00021cad6818e144342dcbf5b619
      Map<VarVersionPair, LocalVariable> lvts = new HashMap<>();
  
      for (Entry<VarVersionPair, VarInfo> e : types.entrySet()) {
-@@ -852,7 +902,16 @@ public class VarDefinitionHelper {
+@@ -851,7 +901,16 @@ public class VarDefinitionHelper {
          continue;
        }
        LocalVariable lvt = e.getValue().getLVT();
@@ -471,7 +462,7 @@ index abe421340550d258edce046fc901479fa027a23e..cf7f00021cad6818e144342dcbf5b619
          varproc.setVarLVT(idx, lvt);
          lvts.put(idx, lvt);
        }
-@@ -986,7 +1045,7 @@ public class VarDefinitionHelper {
+@@ -985,7 +1044,7 @@ public class VarDefinitionHelper {
  
      private VarInfo(LocalVariable lvt, VarType type) {
        if (lvt != null && lvt.getSignature() != null)
diff --git a/FernFlower-Patches/0012-Fix-primitive-un-boxing-issues.patch b/FernFlower-Patches/0012-Fix-primitive-un-boxing-issues.patch
index 3fa637f..80cad44 100644
--- a/FernFlower-Patches/0012-Fix-primitive-un-boxing-issues.patch
+++ b/FernFlower-Patches/0012-Fix-primitive-un-boxing-issues.patch
@@ -30,10 +30,10 @@ index e005b2941b4e76b736b8d00905726ac8500c3dc2..bc8c421206b44539c2f2da859658102f
        }
      }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-index 0a6281872ae535dbc0569cb08b301d58b6c5c9a3..513ae5c2d5e1674694e86701e507c1e46c2f031b 100644
+index f18ef04b350a5f6d4599282aef5ea3f6e3dce778..ec2d6931c9426913680fd2ec180483389d96ac4b 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-@@ -534,6 +534,19 @@ public class FunctionExprent extends Exprent {
+@@ -533,6 +533,19 @@ public class FunctionExprent extends Exprent {
            .append(")");
        default -> {
          assert funcType <= FUNCTION_I2S;
@@ -54,7 +54,7 @@ index 0a6281872ae535dbc0569cb08b301d58b6c5c9a3..513ae5c2d5e1674694e86701e507c1e4
            TYPES[funcType - FUNCTION_I2L], Collections.emptyList()) + ")");
        }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 6eab93e5ed261b0903ae3fe4677118bfa2d1d60e..7ebc36c1de0265db791b47b9558c41e303a3d7b2 100644
+index 2d8abaec74b301f76fcd4149600c1da72cc9b6c4..d51f0eba4a80cad4159a5135b2d87b8d405c0ed9 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 @@ -59,6 +59,8 @@ public class InvocationExprent extends Exprent {
diff --git a/FernFlower-Patches/0017-Enhance-Generic-Invocations-Temporarily.patch b/FernFlower-Patches/0017-Enhance-Generic-Invocations-Temporarily.patch
index 55fb93d..dcd2dfe 100644
--- a/FernFlower-Patches/0017-Enhance-Generic-Invocations-Temporarily.patch
+++ b/FernFlower-Patches/0017-Enhance-Generic-Invocations-Temporarily.patch
@@ -24,7 +24,7 @@ index 33150f76d649f124bc818036b0f7c6331d5e74be..e2f36231b51e547b4aae610c8450d83b
          left = left.resizeArrayDim(0);
          right = right.resizeArrayDim(0);
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-index 513ae5c2d5e1674694e86701e507c1e46c2f031b..cb80c8d7be08b9f3d6770541910832bb3d9a58a9 100644
+index ec2d6931c9426913680fd2ec180483389d96ac4b..cb15c8bc3d924e99c0bf9db350e8fe102bc5f97a 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
 @@ -278,11 +278,11 @@ public class FunctionExprent extends Exprent {
@@ -57,7 +57,7 @@ index 513ae5c2d5e1674694e86701e507c1e46c2f031b..cb80c8d7be08b9f3d6770541910832bb
        }
        else { //TODO: Capture generics to make cast better?
          this.needsCast = right.getType() == CodeConstants.TYPE_NULL || !DecompilerContext.getStructContext().instanceOf(right.getValue(), cast.getValue());
-@@ -644,4 +653,4 @@ public class FunctionExprent extends Exprent {
+@@ -643,4 +652,4 @@ public class FunctionExprent extends Exprent {
      Integer type = (Integer)matchNode.getRuleValue(MatchProperties.EXPRENT_FUNCTYPE);
      return type == null || this.funcType == type;
    }
@@ -65,7 +65,7 @@ index 513ae5c2d5e1674694e86701e507c1e46c2f031b..cb80c8d7be08b9f3d6770541910832bb
 \ No newline at end of file
 +}
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 7ebc36c1de0265db791b47b9558c41e303a3d7b2..28bae14b7342dd6897e638889682178248039ad7 100644
+index d51f0eba4a80cad4159a5135b2d87b8d405c0ed9..f23110233f59728ab4b700bfc0fa2b625f0d7071 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 @@ -399,6 +399,7 @@ public class InvocationExprent extends Exprent {
diff --git a/FernFlower-Patches/0021-Synthetic-getClass-Objects.requireNonNull-cleanup.patch b/FernFlower-Patches/0021-Synthetic-getClass-Objects.requireNonNull-cleanup.patch
index f86925c..4afe873 100644
--- a/FernFlower-Patches/0021-Synthetic-getClass-Objects.requireNonNull-cleanup.patch
+++ b/FernFlower-Patches/0021-Synthetic-getClass-Objects.requireNonNull-cleanup.patch
@@ -135,7 +135,7 @@ index dc3d20eed5ddcac36204fc9ed75d73c53a8c9805..efa677ae6cfdc08635eff080c7241ec0
    private static boolean isConstructorInvocationRemote(List<Exprent> list, int index) {
      Exprent current = list.get(index);
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 28bae14b7342dd6897e638889682178248039ad7..eda61adada8942006a5a49d5f0905ba010505fea 100644
+index f23110233f59728ab4b700bfc0fa2b625f0d7071..c77ac2f2e4f8936c131f932940878fab9f5c2eb8 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 @@ -61,6 +61,7 @@ public class InvocationExprent extends Exprent {
@@ -154,7 +154,7 @@ index 28bae14b7342dd6897e638889682178248039ad7..eda61adada8942006a5a49d5f0905ba0
    }
  
    @Override
-@@ -955,6 +957,14 @@ public class InvocationExprent extends Exprent {
+@@ -954,6 +956,14 @@ public class InvocationExprent extends Exprent {
      return bootstrapArguments;
    }
  
diff --git a/FernFlower-Patches/0023-Give-nicer-output-for-float-and-double-literals.patch b/FernFlower-Patches/0023-Give-nicer-output-for-float-and-double-literals.patch
index ef7c128..980223a 100644
--- a/FernFlower-Patches/0023-Give-nicer-output-for-float-and-double-literals.patch
+++ b/FernFlower-Patches/0023-Give-nicer-output-for-float-and-double-literals.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Give nicer output for float and double literals
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-index 311fe8507fba664bd4b1e627f8ffbdb4c0c97cab..da281b179a137434b55171d69266a039c7c1f6f1 100644
+index 401917e6947c0ae541c966777cf2deddf54ed644..f0c519aa31ca4ca83dac02d1bf729ff67e9e8992 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 @@ -48,6 +48,81 @@ public class ConstExprent extends Exprent {
diff --git a/FernFlower-Patches/0024-Add-try-with-resource-support.patch b/FernFlower-Patches/0024-Add-try-with-resource-support.patch
index 59abf10..cab16c1 100644
--- a/FernFlower-Patches/0024-Add-try-with-resource-support.patch
+++ b/FernFlower-Patches/0024-Add-try-with-resource-support.patch
@@ -749,7 +749,7 @@ index 0000000000000000000000000000000000000000..cdd05cd3d40ad85380e00ddeba7e2894
 +  }
 +}
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
-index ccb7b3d9d0b38a5be9a6c9c727b4800bf815e715..99fc1c604cadabc1f106a3be745980b1e9b3ad3f 100644
+index 234a42e3a73426204cf3debdb9b77c28f4afbb10..940d41923c8df57fd82cf4b42c2a38d523f7e0c3 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
 @@ -128,6 +128,13 @@ public class FlattenStatementsHelper {
@@ -888,7 +888,7 @@ index 7c83c48777e2dc683d1321fb297f89466f62e8ce..97c1d3f816dcfc21811da2097744bfe9
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index cf7f00021cad6818e144342dcbf5b6198e8adeb3..ad32facfe21c854c69c16ee51aa885b8c266d7b9 100644
+index b35985211d1f0488f76cbd6e87f18e3732b2d589..13d023de573ced3cde29f9b42212051a47232733 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -110,7 +110,11 @@ public class VarDefinitionHelper {
diff --git a/FernFlower-Patches/0025-Prioritize-self-and-enclosing-class-when-encounterin.patch b/FernFlower-Patches/0025-Prioritize-self-and-enclosing-class-when-encounterin.patch
index 12206a1..5d0ed68 100644
--- a/FernFlower-Patches/0025-Prioritize-self-and-enclosing-class-when-encounterin.patch
+++ b/FernFlower-Patches/0025-Prioritize-self-and-enclosing-class-when-encounterin.patch
@@ -23,7 +23,7 @@ index 0fb12b6d99f3c1dc7652e5ab49e36683d7a6db08..6f2f8419d41a240c6d1428be0b0ca925
        TextBuffer buffer,
        List<String> parameters,
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index 7149145b1f3ed3583f8bbe416947a0d68de523db..2c67a4fbcdf011cc91b9166f616feb27ce9dcd4c 100644
+index 3398f884985021a324fc5ae6ac6a461f8e5b2f33..921b3b653743ff77dead340be940fcef759bcead 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 @@ -41,10 +41,20 @@ public class ClassesProcessor implements CodeConstants {
diff --git a/FernFlower-Patches/0026-Fix-ambiguous-lambdas.patch b/FernFlower-Patches/0026-Fix-ambiguous-lambdas.patch
index 82d1c42..c57c3e1 100644
--- a/FernFlower-Patches/0026-Fix-ambiguous-lambdas.patch
+++ b/FernFlower-Patches/0026-Fix-ambiguous-lambdas.patch
@@ -41,7 +41,7 @@ index f7e086c560b6e1e5d67d93813c91ecc70db49ce1..c5b8af9d9047d9c06840dfcb95e18a87
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index eda61adada8942006a5a49d5f0905ba010505fea..01ce4f5c3d827e51934de816723ccac236ed9e18 100644
+index c77ac2f2e4f8936c131f932940878fab9f5c2eb8..165a152ea68e6b6580a9064bd1f4a4d39677f972 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 @@ -791,7 +791,8 @@ public class InvocationExprent extends Exprent {
@@ -95,7 +95,7 @@ index eda61adada8942006a5a49d5f0905ba010505fea..01ce4f5c3d827e51934de816723ccac2
  
          MethodDescriptor md = MethodDescriptor.parseDescriptor(mtt.getDescriptor());
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-index 2501863f7396c721a42eaab481b2c89d88209d23..5ee4fb58a5687a0e26558fbc4fdaa989695bc6fa 100644
+index 2405fe08663102626f6ab007ccf5ee6c0e8922ea..049bf247002da65a90392f054ad2c57a04ebae81 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 @@ -5,6 +5,8 @@ import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -133,7 +133,7 @@ index 2501863f7396c721a42eaab481b2c89d88209d23..5ee4fb58a5687a0e26558fbc4fdaa989
          }
        }
      }
-@@ -511,4 +515,17 @@ public class NewExprent extends Exprent {
+@@ -510,4 +514,17 @@ public class NewExprent extends Exprent {
    public void setEnumConst(boolean enumConst) {
      this.enumConst = enumConst;
    }
diff --git a/FernFlower-Patches/0027-Fix-field-initalizers.patch b/FernFlower-Patches/0027-Fix-field-initalizers.patch
index b988b9d..1c3a634 100644
--- a/FernFlower-Patches/0027-Fix-field-initalizers.patch
+++ b/FernFlower-Patches/0027-Fix-field-initalizers.patch
@@ -249,7 +249,7 @@ index b44a78019f0717213822ef5572c5d7ecde6d4ee3..20d3f0391343689eb604b8b953cabb26
 +  }
 +}
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-index b76d5dd1f39f3ef9a2847414bcf1cc3738b0fdae..be789c6f999339fc4d755850dfd888f600f73a45 100644
+index 040e5d21985979a9686cb9fee6e3048fe87e5464..e98b53eb94ed7f1f5c936887be8418e6637b2b43 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
 @@ -33,18 +33,24 @@ public class FieldExprent extends Exprent {
@@ -286,7 +286,7 @@ index b76d5dd1f39f3ef9a2847414bcf1cc3738b0fdae..be789c6f999339fc4d755850dfd888f6
          buf.append(DecompilerContext.getImportCollector().getNestedNameInClassContext(ExprProcessor.buildJavaClassName(classname)));
          buf.append(".");
        }
-@@ -207,6 +213,10 @@ public class FieldExprent extends Exprent {
+@@ -206,6 +212,10 @@ public class FieldExprent extends Exprent {
      return name;
    }
  
diff --git a/FernFlower-Patches/0028-Improve-inferred-generic-types.patch b/FernFlower-Patches/0028-Improve-inferred-generic-types.patch
index adcffd2..879c65a 100644
--- a/FernFlower-Patches/0028-Improve-inferred-generic-types.patch
+++ b/FernFlower-Patches/0028-Improve-inferred-generic-types.patch
@@ -25,7 +25,7 @@ index 53349248a038cea0ef82cdc2138ca93e722d1d06..a25566f0e6ba9a4f67c6412fc379874f
      defaults.put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name());
      defaults.put(MAX_PROCESSING_METHOD, "0");
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
-index 88b429ca3bc60303f9075eab36e279f9c58f4520..b03bcfc45ba7d58bcfc92612460c7f3de4bab1e4 100644
+index 406848324e427a2b18d3666e321172f0f130ec4c..e14e8821ea5e7642ff49b04eb4cf1e4d0aa32190 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
 @@ -39,6 +39,17 @@ public class ArrayExprent extends Exprent {
@@ -47,7 +47,7 @@ index 88b429ca3bc60303f9075eab36e279f9c58f4520..b03bcfc45ba7d58bcfc92612460c7f3d
    public int getExprentUse() {
      return array.getExprentUse() & index.getExprentUse() & Exprent.MULTIPLE_USES;
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-index da281b179a137434b55171d69266a039c7c1f6f1..6526b901bc08d5b3a21f0ee3ea31661d86d23799 100644
+index f0c519aa31ca4ca83dac02d1bf729ff67e9e8992..df602b646b7ab2b6f13c42617634f334f828cc0e 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 @@ -4,6 +4,7 @@ package org.jetbrains.java.decompiler.modules.decompiler.exps;
@@ -181,7 +181,7 @@ index e2f36231b51e547b4aae610c8450d83bc0952e44..0509360d7637650341acca72e72e4902
    // IMatchable implementation
    // *****************************************************************************
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-index be789c6f999339fc4d755850dfd888f600f73a45..66ea2304968dae841fdd736c81e7332c75d9ecd5 100644
+index e98b53eb94ed7f1f5c936887be8418e6637b2b43..3099a4611a01341d3a923d84723303ed0e76741b 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
 @@ -14,6 +14,7 @@ import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribu
@@ -231,7 +231,7 @@ index be789c6f999339fc4d755850dfd888f600f73a45..66ea2304968dae841fdd736c81e7332c
  
      return getExprType();
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-index cb80c8d7be08b9f3d6770541910832bb3d9a58a9..c2136584b0ae2a5c7ba34370666bd8b5f4276aaa 100644
+index cb15c8bc3d924e99c0bf9db350e8fe102bc5f97a..e74a3c65c126f3378a4551bc96dd82aff9dc4601 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
 @@ -316,6 +316,11 @@ public class FunctionExprent extends Exprent {
@@ -246,7 +246,7 @@ index cb80c8d7be08b9f3d6770541910832bb3d9a58a9..c2136584b0ae2a5c7ba34370666bd8b5
      return getExprType();
    }
  
-@@ -634,6 +639,17 @@ public class FunctionExprent extends Exprent {
+@@ -633,6 +638,17 @@ public class FunctionExprent extends Exprent {
      this.implicitType = implicitType;
    }
  
@@ -265,7 +265,7 @@ index cb80c8d7be08b9f3d6770541910832bb3d9a58a9..c2136584b0ae2a5c7ba34370666bd8b5
    public void getBytecodeRange(BitSet values) {
      measureBytecode(values, lstOperands);
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 01ce4f5c3d827e51934de816723ccac236ed9e18..962b7a9b85ef5fd29bce0c2953748a6cd3a87ea7 100644
+index 165a152ea68e6b6580a9064bd1f4a4d39677f972..1661a1deb02a4caa5238b5342e5d6043e4e37b7b 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 @@ -32,6 +32,7 @@ import org.jetbrains.java.decompiler.util.TextUtil;
@@ -962,7 +962,7 @@ index 01ce4f5c3d827e51934de816723ccac236ed9e18..962b7a9b85ef5fd29bce0c2953748a6c
    @Override
    public void replaceExprent(Exprent oldExpr, Exprent newExpr) {
      if (oldExpr == instance) {
-@@ -981,6 +1443,19 @@ public class InvocationExprent extends Exprent {
+@@ -980,6 +1442,19 @@ public class InvocationExprent extends Exprent {
      return isSyntheticNullCheck;
    }
  
@@ -983,7 +983,7 @@ index 01ce4f5c3d827e51934de816723ccac236ed9e18..962b7a9b85ef5fd29bce0c2953748a6c
    public void getBytecodeRange(BitSet values) {
      measureBytecode(values, parameters);
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-index 5ee4fb58a5687a0e26558fbc4fdaa989695bc6fa..8d68274e8cb064cb94365eb36df65772f8bdb54a 100644
+index 049bf247002da65a90392f054ad2c57a04ebae81..72205fbd81840cda91ca303d15758df4a2e79699 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 @@ -5,7 +5,16 @@ import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -1429,7 +1429,7 @@ index 5ee4fb58a5687a0e26558fbc4fdaa989695bc6fa..8d68274e8cb064cb94365eb36df65772
    @Override
    public void replaceExprent(Exprent oldExpr, Exprent newExpr) {
      if (oldExpr == constructor) {
-@@ -528,4 +793,11 @@ public class NewExprent extends Exprent {
+@@ -527,4 +792,11 @@ public class NewExprent extends Exprent {
      }
      return "";
    }
@@ -1442,7 +1442,7 @@ index 5ee4fb58a5687a0e26558fbc4fdaa989695bc6fa..8d68274e8cb064cb94365eb36df65772
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index 9ba49d3d3ee30e6e8db7cacd836f7f627ecb4b67..4f8602a2c55bc1be876d254346fdc38b15c5a2f5 100644
+index bbe17e0b2c4dcb7214e0c94cc34156e5c9f233a0..e7bb1eb49b73102af8f967b7d5d3dbed5a1fc86a 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 @@ -13,6 +13,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
@@ -1453,7 +1453,7 @@ index 9ba49d3d3ee30e6e8db7cacd836f7f627ecb4b67..4f8602a2c55bc1be876d254346fdc38b
  import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
  import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute;
  import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute.LocalVariable;
-@@ -236,7 +237,21 @@ public class VarExprent extends Exprent {
+@@ -235,7 +236,21 @@ public class VarExprent extends Exprent {
  
      VarType vt = null;
      if (processor != null) {
@@ -1547,10 +1547,10 @@ index 1274df19dd56bf8061384af8d3db78856f836928..80ad6c5234031d18947bebfb87eda789
      for (String line : string.split("\n")) {
        String[] pts = line.split(" ");
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
-index 44d120256a8020b833567fe0f24c7b2c67caafde..1aabd99f31376417b6b72f3150af3823b04f9de8 100644
+index f4115448cfa13ba37fb1ee1795903ffb0c79a6af..d089b8180169910658f302a143d3372137f735c2 100644
 --- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
 +++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
-@@ -390,8 +390,10 @@ public class VarType implements Type {  // TODO: optimize switch
+@@ -389,8 +389,10 @@ public class VarType implements Type {  // TODO: optimize switch
    }
  
    public VarType remap(Map<VarType, VarType> map) {
diff --git a/FernFlower-Patches/0029-Improve-stack-var-processor-output.patch b/FernFlower-Patches/0029-Improve-stack-var-processor-output.patch
index 57e1138..064adcf 100644
--- a/FernFlower-Patches/0029-Improve-stack-var-processor-output.patch
+++ b/FernFlower-Patches/0029-Improve-stack-var-processor-output.patch
@@ -24,7 +24,7 @@ index 4713a0212ee1ae4cc269dd24f2227a91a2c9beed..9ae846d540337db99dc054ec1a43271e
  
        if (TryHelper.enhanceTryStats(root, mt)) {
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 866cea112a60907c3ef02160a3b6c0bac1a075ae..1b2401d38d63dcca4eb4b4d7ed24aa23da9c98fb 100644
+index fde1c3bca1b12454b6f9a692c5f870ba946a590e..95db638383c843bf01df05daf2d94240cfe5ebc8 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 @@ -141,6 +141,9 @@ public class NestedClassProcessor {
@@ -318,7 +318,7 @@ index d8fd9bdf784704836e69cfdd1596ae29b2732232..139ccdb55347a5d66627c1489ee73910
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 962b7a9b85ef5fd29bce0c2953748a6cd3a87ea7..ee533a7ab76350ce982406120e439919070fa18f 100644
+index 1661a1deb02a4caa5238b5342e5d6043e4e37b7b..4633697497baaa977d1f5451c5340eae3769472f 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 @@ -162,6 +162,11 @@ public class InvocationExprent extends Exprent {
@@ -334,7 +334,7 @@ index 962b7a9b85ef5fd29bce0c2953748a6cd3a87ea7..ee533a7ab76350ce982406120e439919
  
    @Override
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index 4f8602a2c55bc1be876d254346fdc38b15c5a2f5..135c633ac8ed35d6ccb4d24131395ec6d94ea566 100644
+index e7bb1eb49b73102af8f967b7d5d3dbed5a1fc86a..8807a1534a587af70c2779f2bf8f7cdf3ec9d7f2 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 @@ -46,6 +46,7 @@ public class VarExprent extends Exprent {
@@ -353,7 +353,7 @@ index 4f8602a2c55bc1be876d254346fdc38b15c5a2f5..135c633ac8ed35d6ccb4d24131395ec6
      return var;
    }
  
-@@ -312,6 +314,14 @@ public class VarExprent extends Exprent {
+@@ -311,6 +313,14 @@ public class VarExprent extends Exprent {
      return lvt;
    }
  
@@ -564,7 +564,7 @@ index 5e1e323a6e2043d776c513e800056be200ab2971..0262a3378080ce4a283ee12a44d11e92
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index ad32facfe21c854c69c16ee51aa885b8c266d7b9..c4c7253e1062be0bae6a15dbd02678ee7c36fee7 100644
+index 13d023de573ced3cde29f9b42212051a47232733..347ba24dbcc6a530307d9a1d4eae946efa1dfac6 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -11,6 +11,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
@@ -583,7 +583,7 @@ index ad32facfe21c854c69c16ee51aa885b8c266d7b9..c4c7253e1062be0bae6a15dbd02678ee
    }
  
  
-@@ -1127,4 +1129,79 @@ public class VarDefinitionHelper {
+@@ -1126,4 +1128,79 @@ public class VarDefinitionHelper {
      }
      return false;
    }
diff --git a/FernFlower-Patches/0032-Add-explicit-cast-to-invocations-of-java-nio-Buffer-.patch b/FernFlower-Patches/0032-Add-explicit-cast-to-invocations-of-java-nio-Buffer-.patch
index 5fc2440..c6c2647 100644
--- a/FernFlower-Patches/0032-Add-explicit-cast-to-invocations-of-java-nio-Buffer-.patch
+++ b/FernFlower-Patches/0032-Add-explicit-cast-to-invocations-of-java-nio-Buffer-.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add explicit cast to invocations of java/nio/Buffer
 Java 9+ added overrides to these functions to return the specific subclass, however, when there is a compiler "bug" that when targeting release * or below, it will still reference these new methods, causing exceptions at runtime on Java 8.
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index ee533a7ab76350ce982406120e439919070fa18f..fd4fb8c060432591710e25e2941d99c538b547b6 100644
+index 4633697497baaa977d1f5451c5340eae3769472f..1a3bd9c6b051447ef2aca98b58ff70b3b89da52c 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 @@ -47,6 +47,8 @@ public class InvocationExprent extends Exprent {
diff --git a/FernFlower-Patches/0033-Revert-change-to-FieldExprent-getExprentUse.patch b/FernFlower-Patches/0033-Revert-change-to-FieldExprent-getExprentUse.patch
index c39036d..8624781 100644
--- a/FernFlower-Patches/0033-Revert-change-to-FieldExprent-getExprentUse.patch
+++ b/FernFlower-Patches/0033-Revert-change-to-FieldExprent-getExprentUse.patch
@@ -7,7 +7,7 @@ Revert part of a change introduced upstream. https://github.com/MinecraftForge/F
 This upstream change causes local variables to not be inlined in many cases, and makes decomp very messy for the reason of 'thread safety'.
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-index 66ea2304968dae841fdd736c81e7332c75d9ecd5..e6e3e9d6f50239c716d285d64f37679bbf0ff553 100644
+index 3099a4611a01341d3a923d84723303ed0e76741b..34ee7377dfef29d73f4cd0e5bf53944befafbd7d 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
 @@ -105,7 +105,13 @@ public class FieldExprent extends Exprent {
diff --git a/FernFlower-Patches/0034-Add-only-argument-It-will-filter-what-classes-are-de.patch b/FernFlower-Patches/0034-Add-only-argument-It-will-filter-what-classes-are-de.patch
index 87bdb01..63b4c60 100644
--- a/FernFlower-Patches/0034-Add-only-argument-It-will-filter-what-classes-are-de.patch
+++ b/FernFlower-Patches/0034-Add-only-argument-It-will-filter-what-classes-are-de.patch
@@ -8,7 +8,7 @@ Uses a prefix system, so -only=net/minecraft/block/ will decompile all classes i
 Useful for debugging to limit scope/runtime.
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index 2c67a4fbcdf011cc91b9166f616feb27ce9dcd4c..3e168efbd10b661519a01fb48a3aabc16460f840 100644
+index 921b3b653743ff77dead340be940fcef759bcead..ff19c7105c0e6bcfa280dca8255eaf32357a2fc3 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 @@ -36,6 +36,7 @@ public class ClassesProcessor implements CodeConstants {
diff --git a/FernFlower-Patches/0036-Do-not-rebuild-variable-names-in-lambdas.patch b/FernFlower-Patches/0036-Do-not-rebuild-variable-names-in-lambdas.patch
index c941329..ac30e63 100644
--- a/FernFlower-Patches/0036-Do-not-rebuild-variable-names-in-lambdas.patch
+++ b/FernFlower-Patches/0036-Do-not-rebuild-variable-names-in-lambdas.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Do not rebuild variable names in lambdas.
 Breaks outer this references. Code existed before my time, no idea what it's intention is.
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 1b2401d38d63dcca4eb4b4d7ed24aa23da9c98fb..5a52b4d9b2c4810cceeb7df3e2271a3dd6ddbe7f 100644
+index 95db638383c843bf01df05daf2d94240cfe5ebc8..1518aae1cf006454e11471b52c54267991b65596 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 @@ -163,7 +163,7 @@ public class NestedClassProcessor {
diff --git a/FernFlower-Patches/0037-Add-toString-to-MethodDescriptor.patch b/FernFlower-Patches/0037-Add-toString-to-MethodDescriptor.patch
index 20145cd..305ca18 100644
--- a/FernFlower-Patches/0037-Add-toString-to-MethodDescriptor.patch
+++ b/FernFlower-Patches/0037-Add-toString-to-MethodDescriptor.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add toString to MethodDescriptor
 
 
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
-index 49494925b2d67b95920bb2b8c8371e886341492f..9b0d6157a3827b0b269a4e396cd91ff93bdf2261 100644
+index 2096754661e845cfe3148d47c5c3ff914bcb0322..c033ae3122302a16f760df24110ab3dd07e39852 100644
 --- a/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
 +++ b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
 @@ -19,11 +19,13 @@ import java.util.Objects;
diff --git a/FernFlower-Patches/0038-Make-decomp-threaded.patch b/FernFlower-Patches/0038-Make-decomp-threaded.patch
index 2b9d615..f5af630 100644
--- a/FernFlower-Patches/0038-Make-decomp-threaded.patch
+++ b/FernFlower-Patches/0038-Make-decomp-threaded.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Make decomp threaded
 `-thr AUTO` to auto select, (default)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index 3e168efbd10b661519a01fb48a3aabc16460f840..573e8342b16e51b8c9a945b4513657c6f64f17c2 100644
+index ff19c7105c0e6bcfa280dca8255eaf32357a2fc3..a1629d28780be9743ab816b5ffbfe664291008a3 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 @@ -30,12 +30,13 @@ import org.jetbrains.java.decompiler.util.TextBuffer;
diff --git a/FernFlower-Patches/0040-Fixup-J9-string-concat.patch b/FernFlower-Patches/0040-Fixup-J9-string-concat.patch
index 9ea99da..8cff824 100644
--- a/FernFlower-Patches/0040-Fixup-J9-string-concat.patch
+++ b/FernFlower-Patches/0040-Fixup-J9-string-concat.patch
@@ -20,7 +20,7 @@ index 9ae846d540337db99dc054ec1a43271e2d41ab7d..74532a087d53613065490b1bd3bf5457
        LabelHelper.cleanUpEdges(root);
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
-index d85dead7cab48a9f551cb1226ef952807a067ec8..2aa9f91fc062ba76939d915428e84f6183fb7f71 100644
+index 5d47c847133cf0413365eddd5f1a2104b2f6ac6b..2aa9f91fc062ba76939d915428e84f6183fb7f71 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
 @@ -4,6 +4,7 @@ package org.jetbrains.java.decompiler.modules.decompiler;
@@ -78,12 +78,11 @@ index d85dead7cab48a9f551cb1226ef952807a067ec8..2aa9f91fc062ba76939d915428e84f61
          for (int i = 0; i < recipe.length(); i++) {
            char c = recipe.charAt(i);
  
-@@ -173,13 +207,12 @@ public final class ConcatenationHelper {
+@@ -173,12 +207,12 @@ public final class ConcatenationHelper {
              if (c == TAG_ARG) {
                Exprent exprent = parameters.get(parameterId++);
  
--              if ((exprent instanceof VarExprent) && res.isEmpty()) {
--                VarExprent varExprent = (VarExprent) exprent;
+-              if ((exprent instanceof VarExprent varExprent) && res.isEmpty()) {
 -
 -                if (!VarType.VARTYPE_STRING.equals(varExprent.getVarType())) {
 -                  // First item of concatenation is a variable and variable's type is not a String.
diff --git a/FernFlower-Patches/0044-Search-generics-when-finding-where-to-inject-local-c.patch b/FernFlower-Patches/0044-Search-generics-when-finding-where-to-inject-local-c.patch
index 693af80..51c7254 100644
--- a/FernFlower-Patches/0044-Search-generics-when-finding-where-to-inject-local-c.patch
+++ b/FernFlower-Patches/0044-Search-generics-when-finding-where-to-inject-local-c.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Search generics when finding where to inject local classes.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 5a52b4d9b2c4810cceeb7df3e2271a3dd6ddbe7f..52aabbb2d9c79a35555fe953b9d27253321b1f29 100644
+index 1518aae1cf006454e11471b52c54267991b65596..fe68098cb9bc2ecfb002438a7b1ed9748d957497 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 @@ -25,6 +25,7 @@ import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
@@ -16,7 +16,7 @@ index 5a52b4d9b2c4810cceeb7df3e2271a3dd6ddbe7f..52aabbb2d9c79a35555fe953b9d27253
  import org.jetbrains.java.decompiler.util.DotExporter;
  import org.jetbrains.java.decompiler.util.InterpreterUtil;
  
-@@ -925,9 +926,15 @@ public class NestedClassProcessor {
+@@ -924,9 +925,15 @@ public class NestedClassProcessor {
          case Exprent.EXPRENT_VAR -> {
            VarExprent varExpr = (VarExprent)expr;
            if (varExpr.isDefinition()) {
@@ -36,7 +36,7 @@ index 5a52b4d9b2c4810cceeb7df3e2271a3dd6ddbe7f..52aabbb2d9c79a35555fe953b9d27253
            }
          }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index 135c633ac8ed35d6ccb4d24131395ec6d94ea566..f670f30e2f5c8e2f619d22efc4b61842692b3f11 100644
+index 8807a1534a587af70c2779f2bf8f7cdf3ec9d7f2..0dd8768a10a4edb5901d3112145df58c871b68c9 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 @@ -151,7 +151,8 @@ public class VarExprent extends Exprent {
diff --git a/FernFlower-Patches/0045-Reduce-allocations-in-getAllExprents.patch b/FernFlower-Patches/0045-Reduce-allocations-in-getAllExprents.patch
index dd16b52..5657a2e 100644
--- a/FernFlower-Patches/0045-Reduce-allocations-in-getAllExprents.patch
+++ b/FernFlower-Patches/0045-Reduce-allocations-in-getAllExprents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Reduce allocations in getAllExprents
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
-index 982b660190ba9488c3ff62022aca0dfecbefab48..8dcde8a4d88fa068b6c2b25e00c4de1eae7253a3 100644
+index 4beaf1ee874de373d956177ece541f0ecce64dc4..7bd39cb6416fa4703bab38a04b3922d2823fe3e5 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
 @@ -26,6 +26,13 @@ public class AnnotationExprent extends Exprent {
@@ -23,7 +23,7 @@ index 982b660190ba9488c3ff62022aca0dfecbefab48..8dcde8a4d88fa068b6c2b25e00c4de1e
    public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
      TextBuffer buffer = new TextBuffer();
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
-index b03bcfc45ba7d58bcfc92612460c7f3de4bab1e4..dfc36a0e0aebabd0af296ccbc385d591e5c41993 100644
+index e14e8821ea5e7642ff49b04eb4cf1e4d0aa32190..6fcc4845d6912512f52026c13a7b77d9437ce6f3 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
 @@ -64,8 +64,7 @@ public class ArrayExprent extends Exprent {
@@ -54,7 +54,7 @@ index 097c10a32ed819368c48efa51866420c01584395..34d99a13692ca6a7cedc59b7d4d9de4e
    public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
      TextBuffer buffer = new TextBuffer();
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
-index c713a4055dfc5aa05143a6cd856c5bd98e05c8c1..a67a38179233f983107222a963a3c7664725c9ba 100644
+index ed470ffbbf57c7aea4e82174a99c8d31a097bc32..3adb833472bca27bb0d2084a1ad09061d56012fe 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
 @@ -74,8 +74,7 @@ public class AssignmentExprent extends Exprent {
@@ -68,7 +68,7 @@ index c713a4055dfc5aa05143a6cd856c5bd98e05c8c1..a67a38179233f983107222a963a3c766
      lst.add(right);
      return lst;
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-index 6526b901bc08d5b3a21f0ee3ea31661d86d23799..8cac6350d5053b9f0b66030ca848cd9675106ba8 100644
+index df602b646b7ab2b6f13c42617634f334f828cc0e..c9d1cab8dedad63498cd003ba6aece1308b2719b 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 @@ -199,8 +199,8 @@ public class ConstExprent extends Exprent {
@@ -83,7 +83,7 @@ index 6526b901bc08d5b3a21f0ee3ea31661d86d23799..8cac6350d5053b9f0b66030ca848cd96
  
    @Override
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
-index db2a53744ffeb8b0bdc7b045a822be2df1695b4e..fe9839a9301333360873df16757eab29ce6002de 100644
+index 9b9a0b4198688968201783fb804130a3312aa522..dcc98dfa3fe511a5028ed756717373f9e9e46b90 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
 @@ -16,7 +16,6 @@ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
@@ -104,7 +104,7 @@ index db2a53744ffeb8b0bdc7b045a822be2df1695b4e..fe9839a9301333360873df16757eab29
      if (value != null) {
        lst.add(value);
      }
-@@ -158,7 +156,7 @@ public class ExitExprent extends Exprent {
+@@ -157,7 +155,7 @@ public class ExitExprent extends Exprent {
      measureBytecode(values);
    }
  
@@ -169,7 +169,7 @@ index 0509360d7637650341acca72e72e49026dc535a7..1a21f128c31aff9338e3be8cf5d8c603
      throw new RuntimeException("not implemented");
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-index e6e3e9d6f50239c716d285d64f37679bbf0ff553..e02bb03f2517be75a947175b212c39883d29cd65 100644
+index 34ee7377dfef29d73f4cd0e5bf53944befafbd7d..926a3d1bd1baa27879b29c7482e69acdcad042f4 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
 @@ -21,7 +21,6 @@ import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
@@ -191,7 +191,7 @@ index e6e3e9d6f50239c716d285d64f37679bbf0ff553..e02bb03f2517be75a947175b212c3988
        lst.add(instance);
      }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-index c2136584b0ae2a5c7ba34370666bd8b5f4276aaa..2e020987da5a8d9013d12727427d56e369e00549 100644
+index e74a3c65c126f3378a4551bc96dd82aff9dc4601..54a1becbeb480e2f021d6db8236fe8d36da745b3 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
 @@ -427,8 +427,9 @@ public class FunctionExprent extends Exprent {
@@ -207,7 +207,7 @@ index c2136584b0ae2a5c7ba34370666bd8b5f4276aaa..2e020987da5a8d9013d12727427d56e3
  
    @Override
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
-index 18d2c40d9af0e822004f4baaa3c6b567914a7545..de3723ed7b731fc76afe15482d4caff83de29571 100644
+index 7c9ee0a57cd291ae20b466d70f57a8f11bf4abaa..9644863730e5cda55fa3b2556c90903c578d7408 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
 @@ -8,7 +8,6 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
@@ -229,7 +229,7 @@ index 18d2c40d9af0e822004f4baaa3c6b567914a7545..de3723ed7b731fc76afe15482d4caff8
      return lst;
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index fd4fb8c060432591710e25e2941d99c538b547b6..20a42e0a68dc8974fd4fc8bd3b50deddd66d307d 100644
+index 1a3bd9c6b051447ef2aca98b58ff70b3b89da52c..7f4127e65c89b2f63c94cc6a58a96ec9d2f701f0 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 @@ -523,8 +523,7 @@ public class InvocationExprent extends Exprent {
@@ -243,7 +243,7 @@ index fd4fb8c060432591710e25e2941d99c538b547b6..20a42e0a68dc8974fd4fc8bd3b50dedd
        lst.add(instance);
      }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
-index 3ad223c61453159d096405bb73184644595b75a9..525a931a299f8d4ac1765160c9267a207a557894 100644
+index cd465813bc3e9076d3bbafd1c7b10c9bed0a1407..29b2c217335ce379e779f80427287de5b33d61ba 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
 @@ -6,7 +6,6 @@ package org.jetbrains.java.decompiler.modules.decompiler.exps;
@@ -265,7 +265,7 @@ index 3ad223c61453159d096405bb73184644595b75a9..525a931a299f8d4ac1765160c9267a20
      return lst;
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-index 8d68274e8cb064cb94365eb36df65772f8bdb54a..9398bd0b6feaaad12cd86c9d5b85c47aa5462c9a 100644
+index 72205fbd81840cda91ca303d15758df4a2e79699..b962f9154d44bf276816bf109e6a236fec0184e1 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 @@ -270,9 +270,8 @@ public class NewExprent extends Exprent {
@@ -280,7 +280,7 @@ index 8d68274e8cb064cb94365eb36df65772f8bdb54a..9398bd0b6feaaad12cd86c9d5b85c47a
        lst.addAll(lstDims);
        lst.addAll(lstArrayElements);
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
-index 105c4d951f806fffb8d42386933a7629fa61d76c..7699ea8d3139df210e69208c04eb604c26c8db22 100644
+index 11000d30cbdc93e360cb1bc96b53987bc692e3bd..048e49d62e902485ac89643350d750e7eb57995c 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
 @@ -67,8 +67,7 @@ public class SwitchExprent extends Exprent {
@@ -294,7 +294,7 @@ index 105c4d951f806fffb8d42386933a7629fa61d76c..7699ea8d3139df210e69208c04eb604c
      return lst;
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index f670f30e2f5c8e2f619d22efc4b61842692b3f11..8763564ef768721a913c8e96f0cd1f203289602e 100644
+index 0dd8768a10a4edb5901d3112145df58c871b68c9..e79c4571e227ad532760bdbc4ecf52030b31bfb6 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 @@ -27,7 +27,6 @@ import org.jetbrains.java.decompiler.struct.match.MatchNode;

From 38535fe0c2f52e4f41622272705e78dfea0d0ae4 Mon Sep 17 00:00:00 2001
From: Curle <curle@gemwire.uk>
Date: Tue, 20 Oct 2020 22:07:45 +0100
Subject: [PATCH 02/22] Made changes to bring feature parity with
 FernFlowerLegacy/FernFlower:2.0-SNAPSHOT

---
 FernFlower                                    |    2 +-
 ...ew-wrapper-and-deploy-to-Forge-Maven.patch | 1326 +++++
 ...eric-parametrs-for-anonymous-classes.patch |   48 +
 .../0002-Test-Framework-upgrades.patch        |  283 -
 ...izers-for-anon-and-synthetic-classes.patch |  123 -
 ...ctions-on-field-initalizers-allowing.patch |  116 +
 ...screpancies-to-produce-stable-output.patch | 1373 -----
 ...ixed-this-calls-not-having-arguments.patch |   57 +
 ...Convert-Exprent.bytecode-to-a-BitMap.patch | 4516 ---------------
 ...-synthetic-classes-can-have-content-.patch |   27 +
 ...-lists-to-produce-a-consistant-decom.patch |   81 +
 ...so-we-can-quickly-iterate-LVT-hackin.patch |  153 +
 ...e-DotExporter-for-debugging-purposes.patch |  393 --
 ...and-LVTT-properly-into-some-structur.patch |  172 +
 ...pport-for-Enhanced-For-loop-detectio.patch | 4949 -----------------
 ...o-an-incoming-LVT-if-they-re-out-of-.patch |   33 +
 ...of-Generics-system-for-better-output.patch | 3116 -----------
 ...10-Fix-tests-for-inner-class-sorting.patch |  486 ++
 .../0010-Improvements-to-var-and-var.patch    |  327 --
 ...e-field-initalizers-would-incorrectl.patch |   62 +
 .../0011-JAD-Style-variable-naming.patch      |  981 ----
 .../0012-Fix-primitive-un-boxing-issues.patch | 1035 ----
 ...non-classes-are-being-detected-as-me.patch |   26 +
 .../0013-Add-Minecraft-test-framework.patch   |  148 -
 .../0013-Fixed-last-test-all-tests-pass.patch |   74 +
 ...pes-are-determined-was-detecting-ano.patch |  197 +
 ...line-argument-sef-SkipExtraFiles-To-.patch |   48 -
 ...ructors-with-anon-class-as-last-argu.patch |   71 +
 ...id-logic-in-ExprUtils.-https-github..patch |   61 -
 ...ces-printing-floats-with-an-undefine.patch |   93 +
 ...ance-Generic-Invocations-Temporarily.patch |  268 -
 ...bles-and-variable-definitions.-Again.patch |  150 +
 ...-Used-to-specify-a-text-file-with-ad.patch |   92 -
 ...thetic-classes-allowed-in-parameters.patch |   39 +
 ...destination-to-be-a-zip-file-if-ther.patch |  163 -
 ...hange-LVT-indexing-to-VarVersionPair.patch |  142 +
 ...ile-named-fernflower_abstract_parame.patch |  127 -
 ...bytecode-to-a-BitMap-as-it-gives-bet.patch |  876 +++
 ...-data-from-the-Struct-for-easier-abi.patch |  335 ++
 ...er-to-MethodProcessorRunnable-for-th.patch |  179 +
 ...impler-than-the-complex-one-almost-p.patch |  120 +
 .../0024-Add-the-test-to-the-harness.patch    |   22 +
 ...and-enclosing-class-when-encounterin.patch |   71 -
 ...ns-to-the-printout.-Also-fixed-a-fas.patch |  267 +
 ...the-varversionpair-in-the-oldnames-t.patch |  126 +
 .../0026-Fix-ambiguous-lambdas.patch          |  155 -
 .../0027-Fix-field-initalizers.patch          |  498 --
 ...it-seems-that-it-increases-as-the-vi.patch |  148 +
 ...-without-an-LVT-entry.-They-re-likel.patch |  196 +
 .../0028-Improve-inferred-generic-types.patch | 1901 -------
 ...9-Improve-stack-var-processor-output.patch |  752 ---
 ...nts-will-now-use-the-correct-variabl.patch |  257 +
 ...Each-loop-detection-and-re-introduce.patch |  802 +++
 ...lly-processor-instruction-comparison.patch |   29 -
 ...-on-gradlew.-It-s-writeable-on-linux.patch |   16 +
 ...mbda-syntax-support-isl-0-to-disable.patch |  155 -
 ...t-to-invocations-of-java-nio-Buffer-.patch |   34 -
 ...-TryCatch-statements-will-now-use-th.patch |  115 +
 ...-variables-that-seem-to-come-into-sc.patch |   66 +
 ...change-to-FieldExprent-getExprentUse.patch |   27 -
 ...t-It-will-filter-what-classes-are-de.patch |  126 -
 ...o-VarExprent-and-print-generic-types.patch |  288 +
 ...-local-variables-incorrectly-merging.patch |   36 -
 ...ement-retain-all-bytecode-data.-And-.patch |  274 +
 ...efintionHelper-that-splits-variables.patch |  501 ++
 ...ot-rebuild-variable-names-in-lambdas.patch |   20 -
 ...037-Add-toString-to-MethodDescriptor.patch |   46 -
 FernFlower-Patches/0037-Lex-s-tests.patch     |  279 +
 .../0038-Fix-inverted-null-test.patch         |   25 +
 .../0038-Make-decomp-threaded.patch           |  809 ---
 .../0039-More-tweaks.-Closer.patch            |  608 ++
 ...e-tweaks-it-passes-the-TestLVT-tests.patch |  160 +
 ...m-lex-merges-RHS-and-LHS-of-exprents.patch |  382 ++
 ...th-start-and-end-to-avoid-weirdness-.patch |  111 +
 ...etter-remapping-of-assignment-merges.patch |  131 +
 .../0044-PPMM-test-for-lex.patch              |   67 +
 ...ange-begin-end-detection.-Less-derpy.patch |  309 +
 ...PMM-helper-and-expand-PPMM-test-to-i.patch |  247 +
 .../0047-Prevent-infinite-loops-in-PPMM.patch |   29 +
 ...in-and-use-alternative-code-for-ppmm.patch |  225 +
 ...ng-tracking-entirely-and-just-do-a-f.patch |  101 +
 .../0050-Types-are-merged-properly-now.patch  |  167 +
 ...-does-some-things-better.-But-still-.patch |  143 +
 ...erging.-It-s-pretty-decent.-But-stil.patch |   52 +
 ...erging-variables.-Use-top-down-manua.patch |  535 ++
 ...onstant-don-t-give-it-a-type.-Cleans.patch |   54 +
 ...-the-time-we-create-the-exprents.-Th.patch |  157 +
 .../0056-Some-code-cleanup-damn-cpw.patch     |  251 +
 ...ta-post-merge.-And-fix-injected-var-.patch |  273 +
 ...-LVT-first-and-fallback-to-other-typ.patch |   77 +
 .../0059-NPE-protection-in-LVT-loading.patch  |   32 +
 ...intions-in-IfStatement-s-headers-hav.patch |   36 +
 ...terator-is-being-used-elseware-befor.patch |  125 +
 ...0062-NPE-Protection-in-EnumProcessor.patch |   27 +
 ...ed-variables-in-synchronized-headers.patch |  275 +
 ...-Include-LVT-info-in-VarExprent.copy.patch |   72 +
 ...etection-and-restore-do-loop-collaps.patch |  110 +
 ...-to-before-MergeHelper-and-add-more-.patch |  182 +
 ...tractHelper-to-include-break-edges-t.patch |   90 +
 ...extracted-ifs-from-being-inlined-aga.patch |  123 +
 ...source-vars-in-itteration-allows-for.patch |   25 +
 ...-detection-to-be-before-For-detectio.patch |  273 +
 ...0071-Propogate-LVTs-to-inner-classes.patch |  316 ++
 ...For-loops-would-be-enhanced-to-ForEa.patch |   41 +
 ...arguments-for-non-static-inner-class.patch |   92 +
 ...turn-generic-typevar-casting-support.patch |  156 +
 ...er-option-iec-Include_Entire_Classpa.patch |   95 +
 ...pe-to-be-subclass-of-VarType-and-con.patch | 1068 ++++
 ...ing-for-an-init-exprent-not-to-look-.patch |  301 +
 ...eClasspath-so-it-doesn-t-dump-out-ra.patch |   41 +
 ...pe-parsing-of-inner-classes-with-gen.patch |   34 +
 .../0080-Foo.-Bar-baz-generation.patch        |  351 ++
 ...anges-to-Exprent.getInferredExprType.patch |  448 ++
 ...ion-from-InvocationExprent-s-inferre.patch |  115 +
 ...-to-the-VarType-added-type-inference.patch |  294 +
 ...ists-with-multiple-arguments-in-meth.patch |   45 +
 ...c-info-from-InvocationExprent-correc.patch |  140 +
 ...ced-for-loops-can-also-have-a-copy-i.patch |   36 +
 ...e-strict-in-detecting-copy-var-usage.patch |   45 +
 .../0088-Enhance-switches-on-enums.patch      |  310 ++
 ...e-inner-class-fields-would-not-be-re.patch |   98 +
 ...r-and-field-accessors-in-inner-class.patch |   88 +
 ...cleanup-of-InvocationExprent-changes.patch |  200 +
 ...ion-test-to-new-settings-no-syntheti.patch |   28 +
 ...th-trailing-zeros-and-incorrect-type.patch |   59 +
 ...bel-names-based-on-jvm-instruction-i.patch |  147 +
 FernFlower-Patches/0095-Version-2.0.patch     |   25 +
 ...Fixed-invalid-reference-to-ASM.-Oops.patch |   34 +
 ...xed-potential-NPE-in-lvt-propogation.patch |   28 +
 ...d-nested-inner-generic-type-printing.patch |   25 +
 .../0099-Fixed-JUint-tests.patch              |  109 +
 ...g-not-propogating-type-data-to-var-d.patch |   55 +
 ...e-we-might-be-doing-a-bit-more-work-.patch |   26 +
 ...-that-are-itterated-in-hash-sets-in-.patch |   53 +
 ...-cases-leaking-variables-incorrectly.patch |   26 +
 ...ashSet-to-LinkedHashSet-to-stabelize.patch |  207 +
 .../0105-Bulk-test-for-MC.patch               |  256 +
 .../0106-Add-a-parameter-renamer.patch        |   64 +
 ...lk-decompilation-test-for-all-to-use.patch |  317 ++
 FernFlower-Patches/0108-Fix-NPE.patch         |   25 +
 ...areas-on-Java-8.-Notibly-the-exit-ma.patch |  154 +
 ...ble-declarations-including-those-wit.patch |  135 +
 .../0111-Renaming-thinger.patch               |  846 +++
 ...-issues.-Still-outstanding-propogati.patch |  103 +
 ...gate-renamer-state-to-nested-classes.patch |  191 +
 ...lement-options-for-the-renamer-stuff.patch |   87 +
 ...-the-param-renamer-needed-for-sane-p.patch |   67 +
 ...gger-so-that-it-can-be-used-during-i.patch |   40 +
 ...-More-fixage-to-the-way-init-happens.patch |   56 +
 ...the-renamer-after-we-re-done-with-th.patch |   41 +
 ...esources-after-we-re-done-not-before.patch |   42 +
 ...-renamer-for-every-single-method-rea.patch |   33 +
 ...-access-a-bit-ensure-it-s-loaded-for.patch |  110 +
 ...aibles-when-the-to-target-is-read-fu.patch |  163 +
 154 files changed, 21561 insertions(+), 22663 deletions(-)
 create mode 100644 FernFlower-Patches/0001-Add-Gradlew-wrapper-and-deploy-to-Forge-Maven.patch
 create mode 100644 FernFlower-Patches/0002-Output-generic-parametrs-for-anonymous-classes.patch
 delete mode 100644 FernFlower-Patches/0002-Test-Framework-upgrades.patch
 delete mode 100644 FernFlower-Patches/0003-Fix-initializers-for-anon-and-synthetic-classes.patch
 create mode 100644 FernFlower-Patches/0003-Loosen-up-restrictions-on-field-initalizers-allowing.patch
 delete mode 100644 FernFlower-Patches/0004-Fix-output-discrepancies-to-produce-stable-output.patch
 create mode 100644 FernFlower-Patches/0004-Fixed-this-calls-not-having-arguments.patch
 delete mode 100644 FernFlower-Patches/0005-Convert-Exprent.bytecode-to-a-BitMap.patch
 create mode 100644 FernFlower-Patches/0005-NUll-constructor-synthetic-classes-can-have-content-.patch
 create mode 100644 FernFlower-Patches/0006-Sort-inner-class-lists-to-produce-a-consistant-decom.patch
 create mode 100644 FernFlower-Patches/0007-Add-an-LVT-test-so-we-can-quickly-iterate-LVT-hackin.patch
 delete mode 100644 FernFlower-Patches/0007-Reintroduce-DotExporter-for-debugging-purposes.patch
 create mode 100644 FernFlower-Patches/0008-Capture-the-LVT-and-LVTT-properly-into-some-structur.patch
 delete mode 100644 FernFlower-Patches/0008-LVT-Fixes-and-Support-for-Enhanced-For-loop-detectio.patch
 create mode 100644 FernFlower-Patches/0009-Merge-any-LVTT-to-an-incoming-LVT-if-they-re-out-of-.patch
 delete mode 100644 FernFlower-Patches/0009-Rework-of-Generics-system-for-better-output.patch
 create mode 100644 FernFlower-Patches/0010-Fix-tests-for-inner-class-sorting.patch
 delete mode 100644 FernFlower-Patches/0010-Improvements-to-var-and-var.patch
 create mode 100644 FernFlower-Patches/0011-Fixed-issue-where-field-initalizers-would-incorrectl.patch
 delete mode 100644 FernFlower-Patches/0011-JAD-Style-variable-naming.patch
 delete mode 100644 FernFlower-Patches/0012-Fix-primitive-un-boxing-issues.patch
 create mode 100644 FernFlower-Patches/0012-Some-synthetic-anon-classes-are-being-detected-as-me.patch
 delete mode 100644 FernFlower-Patches/0013-Add-Minecraft-test-framework.patch
 create mode 100644 FernFlower-Patches/0013-Fixed-last-test-all-tests-pass.patch
 create mode 100644 FernFlower-Patches/0014-Fix-how-class-types-are-determined-was-detecting-ano.patch
 delete mode 100644 FernFlower-Patches/0015-Add-new-command-line-argument-sef-SkipExtraFiles-To-.patch
 create mode 100644 FernFlower-Patches/0015-Force-hide-constructors-with-anon-class-as-last-argu.patch
 delete mode 100644 FernFlower-Patches/0016-Bugfix-Fix-invalid-logic-in-ExprUtils.-https-github..patch
 create mode 100644 FernFlower-Patches/0016-Fix-JVM-differences-printing-floats-with-an-undefine.patch
 delete mode 100644 FernFlower-Patches/0017-Enhance-Generic-Invocations-Temporarily.patch
 create mode 100644 FernFlower-Patches/0017-Sort-local-variables-and-variable-definitions.-Again.patch
 delete mode 100644 FernFlower-Patches/0018-Add-cfg-argument-Used-to-specify-a-text-file-with-ad.patch
 create mode 100644 FernFlower-Patches/0018-No-Synthetic-classes-allowed-in-parameters.patch
 delete mode 100644 FernFlower-Patches/0019-Add-support-for-destination-to-be-a-zip-file-if-ther.patch
 create mode 100644 FernFlower-Patches/0019-Change-LVT-indexing-to-VarVersionPair.patch
 delete mode 100644 FernFlower-Patches/0020-Add-a-metadata-file-named-fernflower_abstract_parame.patch
 create mode 100644 FernFlower-Patches/0020-Convert-Exprent.bytecode-to-a-BitMap-as-it-gives-bet.patch
 create mode 100644 FernFlower-Patches/0021-Seperate-the-LVT-data-from-the-Struct-for-easier-abi.patch
 create mode 100644 FernFlower-Patches/0022-Aded-debug-printer-to-MethodProcessorRunnable-for-th.patch
 create mode 100644 FernFlower-Patches/0023-A-scoping-test-simpler-than-the-complex-one-almost-p.patch
 create mode 100644 FernFlower-Patches/0024-Add-the-test-to-the-harness.patch
 delete mode 100644 FernFlower-Patches/0025-Prioritize-self-and-enclosing-class-when-encounterin.patch
 create mode 100644 FernFlower-Patches/0025-Some-modifications-to-the-printout.-Also-fixed-a-fas.patch
 create mode 100644 FernFlower-Patches/0026-Change-to-track-the-varversionpair-in-the-oldnames-t.patch
 delete mode 100644 FernFlower-Patches/0026-Fix-ambiguous-lambdas.patch
 delete mode 100644 FernFlower-Patches/0027-Fix-field-initalizers.patch
 create mode 100644 FernFlower-Patches/0027-Sort-by-version-it-seems-that-it-increases-as-the-vi.patch
 create mode 100644 FernFlower-Patches/0028-Ignore-variables-without-an-LVT-entry.-They-re-likel.patch
 delete mode 100644 FernFlower-Patches/0028-Improve-inferred-generic-types.patch
 delete mode 100644 FernFlower-Patches/0029-Improve-stack-var-processor-output.patch
 create mode 100644 FernFlower-Patches/0029-TryCatch-statements-will-now-use-the-correct-variabl.patch
 create mode 100644 FernFlower-Patches/0030-Add-enhanced-ForEach-loop-detection-and-re-introduce.patch
 delete mode 100644 FernFlower-Patches/0030-Fix-finally-processor-instruction-comparison.patch
 create mode 100644 FernFlower-Patches/0031-Fix-permissions-on-gradlew.-It-s-writeable-on-linux.patch
 delete mode 100644 FernFlower-Patches/0031-Simple-lambda-syntax-support-isl-0-to-disable.patch
 delete mode 100644 FernFlower-Patches/0032-Add-explicit-cast-to-invocations-of-java-nio-Buffer-.patch
 create mode 100644 FernFlower-Patches/0032-Partially-revert-TryCatch-statements-will-now-use-th.patch
 create mode 100644 FernFlower-Patches/0033-Added-a-test-for-variables-that-seem-to-come-into-sc.patch
 delete mode 100644 FernFlower-Patches/0033-Revert-change-to-FieldExprent-getExprentUse.patch
 delete mode 100644 FernFlower-Patches/0034-Add-only-argument-It-will-filter-what-classes-are-de.patch
 create mode 100644 FernFlower-Patches/0034-Hook-in-LVT-to-VarExprent-and-print-generic-types.patch
 delete mode 100644 FernFlower-Patches/0035-Fix-local-variables-incorrectly-merging.patch
 create mode 100644 FernFlower-Patches/0035-Make-Loop-Enhancement-retain-all-bytecode-data.-And-.patch
 create mode 100644 FernFlower-Patches/0036-Add-step-to-VarDefintionHelper-that-splits-variables.patch
 delete mode 100644 FernFlower-Patches/0036-Do-not-rebuild-variable-names-in-lambdas.patch
 delete mode 100644 FernFlower-Patches/0037-Add-toString-to-MethodDescriptor.patch
 create mode 100644 FernFlower-Patches/0037-Lex-s-tests.patch
 create mode 100644 FernFlower-Patches/0038-Fix-inverted-null-test.patch
 delete mode 100644 FernFlower-Patches/0038-Make-decomp-threaded.patch
 create mode 100644 FernFlower-Patches/0039-More-tweaks.-Closer.patch
 create mode 100644 FernFlower-Patches/0040-More-tweaks-it-passes-the-TestLVT-tests.patch
 create mode 100644 FernFlower-Patches/0041-Another-fix-from-lex-merges-RHS-and-LHS-of-exprents.patch
 create mode 100644 FernFlower-Patches/0042-need-to-match-both-start-and-end-to-avoid-weirdness-.patch
 create mode 100644 FernFlower-Patches/0043-Better-remapping-of-assignment-merges.patch
 create mode 100644 FernFlower-Patches/0044-PPMM-test-for-lex.patch
 create mode 100644 FernFlower-Patches/0045-Change-begin-end-detection.-Less-derpy.patch
 create mode 100644 FernFlower-Patches/0046-Fixup-NPE-from-PPMM-helper-and-expand-PPMM-test-to-i.patch
 create mode 100644 FernFlower-Patches/0047-Prevent-infinite-loops-in-PPMM.patch
 create mode 100644 FernFlower-Patches/0048-Merge-in-and-use-alternative-code-for-ppmm.patch
 create mode 100644 FernFlower-Patches/0049-Kill-the-remapping-tracking-entirely-and-just-do-a-f.patch
 create mode 100644 FernFlower-Patches/0050-Types-are-merged-properly-now.patch
 create mode 100644 FernFlower-Patches/0051-More-merging.-It-does-some-things-better.-But-still-.patch
 create mode 100644 FernFlower-Patches/0052-More-tweaks-to-merging.-It-s-pretty-decent.-But-stil.patch
 create mode 100644 FernFlower-Patches/0053-New-aproach-to-merging-variables.-Use-top-down-manua.patch
 create mode 100644 FernFlower-Patches/0054-If-it-s-a-null-constant-don-t-give-it-a-type.-Cleans.patch
 create mode 100644 FernFlower-Patches/0055-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch
 create mode 100644 FernFlower-Patches/0056-Some-code-cleanup-damn-cpw.patch
 create mode 100644 FernFlower-Patches/0057-Propogate-LVT-data-post-merge.-And-fix-injected-var-.patch
 create mode 100644 FernFlower-Patches/0058-Fix-types-to-use-LVT-first-and-fallback-to-other-typ.patch
 create mode 100644 FernFlower-Patches/0059-NPE-protection-in-LVT-loading.patch
 create mode 100644 FernFlower-Patches/0060-Fix-variable-defintions-in-IfStatement-s-headers-hav.patch
 create mode 100644 FernFlower-Patches/0061-Detect-if-the-itterator-is-being-used-elseware-befor.patch
 create mode 100644 FernFlower-Patches/0062-NPE-Protection-in-EnumProcessor.patch
 create mode 100644 FernFlower-Patches/0063-Cleanup-unwanted-variables-in-synchronized-headers.patch
 create mode 100644 FernFlower-Patches/0064-Include-LVT-info-in-VarExprent.copy.patch
 create mode 100644 FernFlower-Patches/0065-Remove-dowhile-detection-and-restore-do-loop-collaps.patch
 create mode 100644 FernFlower-Patches/0066-Move-LoopExtract-to-before-MergeHelper-and-add-more-.patch
 create mode 100644 FernFlower-Patches/0067-Loosen-up-LoopExtractHelper-to-include-break-edges-t.patch
 create mode 100644 FernFlower-Patches/0068-Hack-to-prevent-extracted-ifs-from-being-inlined-aga.patch
 create mode 100644 FernFlower-Patches/0069-Include-ForEach-source-vars-in-itteration-allows-for.patch
 create mode 100644 FernFlower-Patches/0070-Re-write-ForEach-detection-to-be-before-For-detectio.patch
 create mode 100644 FernFlower-Patches/0071-Propogate-LVTs-to-inner-classes.patch
 create mode 100644 FernFlower-Patches/0072-Fix-issue-where-For-loops-would-be-enhanced-to-ForEa.patch
 create mode 100644 FernFlower-Patches/0073-Fix-constructor-arguments-for-non-static-inner-class.patch
 create mode 100644 FernFlower-Patches/0074-Return-generic-typevar-casting-support.patch
 create mode 100644 FernFlower-Patches/0075-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch
 create mode 100644 FernFlower-Patches/0076-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch
 create mode 100644 FernFlower-Patches/0077-Fix-up-the-scouting-for-an-init-exprent-not-to-look-.patch
 create mode 100644 FernFlower-Patches/0078-Fix-IncludeEntireClasspath-so-it-doesn-t-dump-out-ra.patch
 create mode 100644 FernFlower-Patches/0079-Fixed-generic-type-parsing-of-inner-classes-with-gen.patch
 create mode 100644 FernFlower-Patches/0080-Foo.-Bar-baz-generation.patch
 create mode 100644 FernFlower-Patches/0081-concentrated-changes-to-Exprent.getInferredExprType.patch
 create mode 100644 FernFlower-Patches/0082-passing-information-from-InvocationExprent-s-inferre.patch
 create mode 100644 FernFlower-Patches/0083-pushed-remapping-to-the-VarType-added-type-inference.patch
 create mode 100644 FernFlower-Patches/0084-handle-generic-lists-with-multiple-arguments-in-meth.patch
 create mode 100644 FernFlower-Patches/0085-using-the-generic-info-from-InvocationExprent-correc.patch
 create mode 100644 FernFlower-Patches/0086-Itterator-enchanced-for-loops-can-also-have-a-copy-i.patch
 create mode 100644 FernFlower-Patches/0087-Be-a-bit-more-strict-in-detecting-copy-var-usage.patch
 create mode 100644 FernFlower-Patches/0088-Enhance-switches-on-enums.patch
 create mode 100644 FernFlower-Patches/0089-Fixed-issue-where-inner-class-fields-would-not-be-re.patch
 create mode 100644 FernFlower-Patches/0090-Added-support-for-and-field-accessors-in-inner-class.patch
 create mode 100644 FernFlower-Patches/0091-cleanup-of-InvocationExprent-changes.patch
 create mode 100644 FernFlower-Patches/0092-Tweak-decompilation-test-to-new-settings-no-syntheti.patch
 create mode 100644 FernFlower-Patches/0093-Fix-constants-with-trailing-zeros-and-incorrect-type.patch
 create mode 100644 FernFlower-Patches/0094-Deterministic-label-names-based-on-jvm-instruction-i.patch
 create mode 100644 FernFlower-Patches/0095-Version-2.0.patch
 create mode 100644 FernFlower-Patches/0096-Fixed-invalid-reference-to-ASM.-Oops.patch
 create mode 100644 FernFlower-Patches/0097-Fixed-potential-NPE-in-lvt-propogation.patch
 create mode 100644 FernFlower-Patches/0098-Fixed-nested-inner-generic-type-printing.patch
 create mode 100644 FernFlower-Patches/0099-Fixed-JUint-tests.patch
 create mode 100644 FernFlower-Patches/0100-Fixed-var-merging-not-propogating-type-data-to-var-d.patch
 create mode 100644 FernFlower-Patches/0101-Snapshots-because-we-might-be-doing-a-bit-more-work-.patch
 create mode 100644 FernFlower-Patches/0102-Sort-some-blocks-that-are-itterated-in-hash-sets-in-.patch
 create mode 100644 FernFlower-Patches/0103-Fixed-switch-cases-leaking-variables-incorrectly.patch
 create mode 100644 FernFlower-Patches/0104-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch
 create mode 100644 FernFlower-Patches/0105-Bulk-test-for-MC.patch
 create mode 100644 FernFlower-Patches/0106-Add-a-parameter-renamer.patch
 create mode 100644 FernFlower-Patches/0107-Bulk-decompilation-test-for-all-to-use.patch
 create mode 100644 FernFlower-Patches/0108-Fix-NPE.patch
 create mode 100644 FernFlower-Patches/0109-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch
 create mode 100644 FernFlower-Patches/0110-Gather-all-variable-declarations-including-those-wit.patch
 create mode 100644 FernFlower-Patches/0111-Renaming-thinger.patch
 create mode 100644 FernFlower-Patches/0112-Fix-up-some-name-issues.-Still-outstanding-propogati.patch
 create mode 100644 FernFlower-Patches/0113-Propogate-renamer-state-to-nested-classes.patch
 create mode 100644 FernFlower-Patches/0114-Properly-implement-options-for-the-renamer-stuff.patch
 create mode 100644 FernFlower-Patches/0115-Add-the-index-to-the-param-renamer-needed-for-sane-p.patch
 create mode 100644 FernFlower-Patches/0116-Early-set-the-logger-so-that-it-can-be-used-during-i.patch
 create mode 100644 FernFlower-Patches/0117-More-fixage-to-the-way-init-happens.patch
 create mode 100644 FernFlower-Patches/0118-Try-and-release-the-renamer-after-we-re-done-with-th.patch
 create mode 100644 FernFlower-Patches/0119-Try-to-release-resources-after-we-re-done-not-before.patch
 create mode 100644 FernFlower-Patches/0120-Don-t-allocate-a-renamer-for-every-single-method-rea.patch
 create mode 100644 FernFlower-Patches/0121-Clean-up-renamer-access-a-bit-ensure-it-s-loaded-for.patch
 create mode 100644 FernFlower-Patches/0122-Do-not-merge-varaibles-when-the-to-target-is-read-fu.patch

diff --git a/FernFlower b/FernFlower
index 4961b5b..6a802a6 160000
--- a/FernFlower
+++ b/FernFlower
@@ -1 +1 @@
-Subproject commit 4961b5bb7f9e06c4dd15e5e3def5a25773e895a1
+Subproject commit 6a802a6fc971f37b1cde2db35c97d9984c877626
diff --git a/FernFlower-Patches/0001-Add-Gradlew-wrapper-and-deploy-to-Forge-Maven.patch b/FernFlower-Patches/0001-Add-Gradlew-wrapper-and-deploy-to-Forge-Maven.patch
new file mode 100644
index 0000000..cf55f70
--- /dev/null
+++ b/FernFlower-Patches/0001-Add-Gradlew-wrapper-and-deploy-to-Forge-Maven.patch
@@ -0,0 +1,1326 @@
+From e8661f9befc8ce9b4422eb13de5bc2ffd370f1ed Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sat, 1 Aug 2015 11:35:52 -0700
+Subject: [PATCH 001/122] Add Gradlew wrapper and deploy to Forge Maven.
+
+---
+ .gitignore                               |  19 +++
+ build.gradle                             |  90 +++++++++++++
+ gradle/wrapper/gradle-wrapper.jar        | Bin 0 -> 51018 bytes
+ gradle/wrapper/gradle-wrapper.properties |   6 +
+ gradlew                                  | 164 +++++++++++++++++++++++
+ gradlew.bat                              |  90 +++++++++++++
+ settings.gradle                          |   1 +
+ 7 files changed, 370 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 build.gradle
+ create mode 100644 gradle/wrapper/gradle-wrapper.jar
+ create mode 100644 gradle/wrapper/gradle-wrapper.properties
+ create mode 100644 gradlew
+ create mode 100644 gradlew.bat
+ create mode 100644 settings.gradle
+
+diff --git a/.gitignore b/.gitignore
+new file mode 100644
+index 0000000..f7284b5
+--- /dev/null
++++ b/.gitignore
+@@ -0,0 +1,19 @@
++#eclipse
++.settings
++.classpath
++.project
++bin
++
++#idea
++.idea
++*.iws
++*.iml
++out
++
++#gradle
++.gradle
++build
++
++#other
++repo
++
+diff --git a/build.gradle b/build.gradle
+new file mode 100644
+index 0000000..4ba85ee
+--- /dev/null
++++ b/build.gradle
+@@ -0,0 +1,90 @@
++apply plugin: 'eclipse'
++apply plugin: 'idea'
++apply plugin: 'maven'
++apply plugin: 'java'
++
++version = "1.0"
++group = "net.minecraftforge" //not sure if we shoulkd publish under this name, but it's our fork so meh
++archivesBaseName = "fernflower"
++
++sourceCompatibility = '1.6'
++targetCompatibility = '1.6'
++
++sourceSets {
++    main.java.srcDirs = ['src']
++    test.java.srcDirs = ['test']
++}
++
++repositories {
++    mavenCentral()
++}
++
++configurations {
++    deployerJars
++}
++
++dependencies {
++    testCompile "junit:junit:4.12"
++    testCompile 'org.hamcrest:hamcrest-core:1.3'
++    testCompile 'org.hamcrest:hamcrest-library:1.3'
++
++    // maven deployment
++    deployerJars "org.apache.maven.wagon:wagon-ssh:2.2"
++}
++
++compileJava.options.encoding = "utf-8"
++compileJava.options.deprecation = true
++
++jar.manifest {
++    attributes "Main-Class" : "org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler"
++}
++
++uploadArchives {
++    repositories {
++        add getProject().repositories.mavenLocal()
++    }
++    repositories.mavenDeployer {
++        configuration = configurations.deployerJars
++
++        if (project.hasProperty("filesmaven")) {
++            logger.info('Publishing to files server')
++            repository(url: project.filesmaven.url) {
++                authentication(userName: project.filesmaven.username, privateKey: project.filesmaven.key)
++            }
++        } else {
++            logger.info('Publishing to repo folder')
++            repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
++        }
++
++        pom {
++            groupId = project.group
++            version = project.version
++            artifactId = project.archivesBaseName
++            project {
++                name project.archivesBaseName
++                packaging 'jar'
++                description 'Fernflower from https://github.com/JetBrains/intellij-community as standalone library'
++                url 'https://github.com/MinecraftForge/FernFlower'
++
++                scm {
++                    url 'https://github.com/MinecraftForge/FernFlower'
++                    connection 'scm:git:git://github.com/MinecraftForge/FernFlower.git'
++                    developerConnection 'scm:git:git@github.com:MinecraftForge/FernFlower.git'
++                }
++
++                issueManagement {
++                    system 'github'
++                    url 'https://github.com/MinecraftForge/FernFlower/issues'
++                }
++
++                licenses {
++                    license {
++                        name 'Apache License 2.0'
++                        url 'http://www.apache.org/licenses/LICENSE-2.0'
++                        distribution 'repo'
++                    }
++                }
++            }
++        }
++    }
++}
+diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
+new file mode 100644
+index 0000000000000000000000000000000000000000..c97a8bdb9088d370da7e88784a7a093b971aa23a
+GIT binary patch
+literal 51018
+zcmagFbChSz(k5C}UABH@+qP}H%eL+6vTawFZQHiHY}>BeGv~~A=l$l)y}5Som4C!u
+znHei0^2sM+D@gwUg$4qGgao=#br%Kt+d%%u>u-bl+hs*n1ZgGZ#OQwjDf~mwOBOy}
+z@UMW{-;Vmf3(5-0Ns5UotI)}c-OEl+$Vk)D&B002QcX|JG$=7FGVdJTP124^PRUMD
+zOVR*CpM@Bw929C&wxW|39~2sn_BUajVxD5&Io>(~|F<ds&hlSt1N}R;b2R%umi52O
+z!2Dar%+bKu+T{OJ6y=|yZjJ`__9l-1$0z0i#-;^-MVJ0|;{W`Kh@G3QwVi=62_v16
+zwSkk9Pn0ZlKLcX$wmGXNwJUu9%t}a3AHF>y9gm>3ur-vVWO-L648qRuK~#rxo+Dno
+zN$;BHeJBFq{$312A@64P)Cr$5QiJxUsyQ{(bEyq5gJ$No=5CfVip&aH46>kLmk4Td
+zXj+eR5gq9fKfj77AR$KvvG!=REopfPZmgAl3g31WCOgP`{y1k$L|*R_{GeGPSRpYC
+zaQx8d0XP?0T%Z4@<yftU7_`48VE<ReBL6>oRQ7OkHnCA~wEL?pXA2Xjzaw`KK^JFp
+z6I*8sBLinU$A2lINZG~?SrE||jUsepZm&$gDtT?$Q{^ziZcZNyYIraxjckc51i=&r
+zo5QJ#*ef#0uSn0jAe_G!-y{pH98{9=mhWP6nt5ijp}~va*Y^`XFKUEro+7PQfuS~~
+zUl!$jRl<Nd*yM7HsV;b(Y|kFn8oPBM&ie=~XU!yxd+0}q2(2|#NKrd_*h*J{FyZ!%
+za4wN6ueIa%FKPMfk-nfaccg*0F9M}KbNLV*!enxyyBLV2oU<?i57}y=G5s!R5JD@y
+zSR%o!<41+&&E^AIy;h&G4iOi<pwC_e4=X3%KIj2Qtx{g96$BG2ko*2$1_PAK{5P>1
+za6yh{<f^b6CO~6u(@RR#Cw+r4ZWz!`$e5F#wd9$5MI|GNoPkoB5y7x%Wy3f>VIy&i
+z+Ka0B?$#wFemv78?abqT08h7K{b5vSw#P?s4h;pzW4!p<w#RhrQI!L(IF|cG$W8Lb
+zW8P7~2W#OYUts$qgtmk)KEDvXk$R{{7*^ht<cpY<8<!Y~s?w#kQff?6q@R+_68067
+z7K_zqllmA3#p)sT=d2zMqff;{Sc>^^LJ@j!@FmJ1Um}Wd%JKojYOknfl_H3>Hesd!
+z{3~Odlw$N@58>CeT$W*<+}bdulAir8=ut_T<2CvCq4*)><jz{_hH`yf9U7aKv~3c@
+za()*;8-HFc^p)K{y;4>eOH?}`yuvtM_7miv0p<8Y!>RnQy{-T4ME}|DB>$Il{mZIE
+zqx=547Hr7(<mnMAQYW<Tqv3651@sR=g$LahCN?SVGiSa`2>jkqWbR~4$g$Lq*L&|x
+zd?2(FuM<y5NZ)*FQdW7$#8a|k_30#vKL+T*dgClwW=cT~#Dp4~hKfn)YGw$$6J9=y
+zb*0Zif{h<Pr_P1@H8PWmLdcbB$8YixLs+r;Z;a^Mr2af5MYfVeeH9!jhYHv$K(qy+
+zX;0WlyIih5SYP-0{rKljLCZWhwf}mU;$IJ={m(lU|DPdC)yc$B!p_D-#?H>l#r|KL
+zj#k!^#}Y*S5{uVaepITYXll090@eDXd8xWEI8h$10!aWRZyXF&P1j-k)A~cbi^S4$
+zeuVEqoRxP#iF!1!W2|k;t=s8na`Kv=-xoxqzdS&3a?Cw{hcZVpj1p2`S4{gQ98s*6
+zV7DzG4yX&!Q&CLGT((~tN*Xp%>+R`HkV<cDtlF;VVO~&fCdG9j*Ez)gY?XtRWumr1
+zbJ|I^qkWuVGn(3@{xm9Q3SHXEGv2^_p$<F8zzb}^(s8dRc;y*}kEPXgt@t_qH-8QV
+z11MWIG-*_!Oy)JaRp`bPb|@OU4~NMB6-G7XhbzMlZaQ3u$hbp=<`OFv+6rHXSl6_U
+zP01l1OKZpZqWidmT!xFKPwN_z8Adeu2W>`7vyEmJ!=2_IOShtftYWPrLw~}xNM_0e
+zRS^b3Z9b2B$*=<?L6T0Tx+nnnqbVG)pX|+5U8#E@0Pu`xns$=&F1FA}wP6COvryq4
+z>9$yt@&Hre9*Y2b?}h{6a?>O6c9WLc6{B!fxqFK>pr7o8xk89_9Yu)N<3ozvWjp3h
+zPmt{pchc%36=FVB%|NpiUe62UAds^kig7jKwKz<(`KIWJ`xzEtkpLLNu;@?R6!$~j
+zXa67|Oy>|zNJO2JV4nX0gRZZq6-P0qPt6enL86NPi;{-~x1R;CDN$b2_<?1>C-sE>
+z>NCJISRlR>ygMi`HI7TT{{{SK+Db5y2rQ9Wm@90o<TOD@+j&1S8U@)C>B3o0bt<Kn
+zx3W4UfIcq>qU?)v@dh#63Dz%^=BeNIf>g+{Sk?83{-0)wv!}B@1O^23_7@#6|7SB5
+zbvLqhak6kV5woy15i~L~adMJ1ur)9<`FGq;R+F|zF~Rw^$sn_6w;>cDRImmLZd3@M
+zKwAh%Sv54*%!4Ze1GJ2>>9lV~XUa<Z5b&M7yWE^)7cddiYCsHQii?i~a_#%y_77pw
+z=U~v|4Q{t&rgY=Nzv6u#Uw^-`@qfK9!2u!cClWOOZU8|l9GpKCcSF?0dEOU6<a3Ug
+zkaReM%2U6v5ac9H=_ZgX*pBrFng&%Q4rArO9%OcBlTe-kbAX?D{|(AOfyxYQ9GrnA
+zLK{LAKVXlDHLY$4+Kyk~i{YDwyj&PV&NbsgqI`MmDevM;@=hA0bezmcT1+iQw``@A
+z5pNZ*kjxMrP=(=|n~$yv1!!g~&k*gXAP|(2DxJ=3&tb7%!cuk?d}y)^F~v_&z>_7z
+zej{;5F-?hJrJPdeh%5*!PgVnWQGH=%j@T;E$Y@Os)AiCQNY)r{bgauNGIn8Qv!#6P
+zv>aNaH-0b_#8&2J(Xp8@UKIK*&6t#BiBu}@0ExVoZ;O+GiQ-6mRb_7FNn?bSo^MhX
+zf-6nYPRG;CG8y^yvg5&Ow2+odsO6eDg%OLCXlp7)ve=dY4rdku7*Kc&*!MSx3X>_j
+z-(_TmF$kMY0-0L;Mj(I!-ko8sA6AO0<U9jEPhgw*bNO=+rB{0NXoE&D)1E%5N+<0*
+z{KFa!PaD_3ifhv`?M-l5cxoLBJIH6Q;t+O-PIK|vQg$TO^zp`LX~<>1SG9jl(Zo<e
+z_QX_>_vfODRxZJd*D_9smUMGwEQgH0;Q$Y$lY~VT5i>Qt!6uU!hDOcLMy4XB<(dr_
+zui*M9iaRE}emTsJTIB#9ekn})-h^6*TVq^GOHZ{XV^sYK3d5+&I`x^TQ4I7T3cAs>
+z-bmk0l6{j-B7+4f(bS!~VH54a3SaGnTP)qw_+Dk-PQraznR>me*DFdaL+|5y!rx4n
+zF;0Ux5s)}`4i7{r<;EdP*2da%)`ror>1xK+ZNyhuqSnkzBF_%xU6(?>Be8BKouSX4
+zF9O4%qwlxzQL*u6IjNMvLB;PG4)6neISC4A0M?rEvL`6f2YCz2e7MNa8ToiylcdSV
+zxsXFVuG||t<8Z3>q%M^L6#>So=F<d{3ytO>bPQx%F0O>7%77nVlL4ik<j~Dr<0162
+zffRD7#pfB+lO+_R49E?{-8O6qsv+Lz<sg%hHnN3T$Cv(qs${%Y4}pb&3#6m+&b$h$
+z^Ydstl=vml#0r!0kezjKm}1?=C6ox>NlYEO6`zJubx-V*ScKH>)+DEz=cD8S{oa)F
+z3MqfFWx8}9@B<$B4-N5`ALEF_t`|VtB3nF=L?mR{$8i|0;zEY!?DjSXHourmHmtBp
+z2w830pyiD=Rg-ialH9m0b*tA~ZN<Uh)E92>l!&UaGHTK7<@%!!vVw>aW*9FDP&eJr
+zUVf(nk1_wa?!BT+n(1X{fa8z#r&I|F&@NWsglp>v-=I{<PTA9?)b)j1n&P9xgM{c7
+zhoEoj9;V+-SK<4FonkJ<G>5KAA6{!^zsMG%(8Vi0;}U<nnlYfNLGWr*D6+o8V$<&C
+zCca>q%5%*FC1{M#2_B=gh7R^1%b#k{Z{FB&!gWF30~q9QoMDiVjgakbIw4lS5aDU-
+zlDRYMa?01<kukq=7CS_yw+C-$`{4Wb;~sytG^BE-_k?*?cceX2IIZ@|uq)L=L8RRV
+z@)W(WSK+_E+MOZ6#&ZRX#ECO+4+gddsmbgi@;1$>gXk6DZs+~j-lOpCU3gdt*E8Qm
+z^Jp1+5A5V0dynkoKKK;QDRo2uY4i@vd1?rNU=-GiO&FG%R?8{*@j$~_Vmj^~_QHlo
+zUKPdELl}cL+=<YGyg-<=&yak;`ASalO+u-wbQZ4mu!+=6+XGpI#yhdO-+1CyYT5bs
+zK+z6icL_G82dgMOYPO_}{y{EzN!k^g#j@VC4ON)Jw6w8~S-M^*j!DHxaN5fAg#XV|
+z!KlW+UH>n5K?MK5f*19F-JXQ)Y)vi9TpSIYE$nRn4PFw~Z5IR(L(CF6<Z#)if78+)
+z3;d4JIs<P7QdCW1!zmO{6w(UM9G8qbr&^7_{57cTFA_8ehR`caXu2YoNrN2@Gc!3o
+z&42H4vF+#k1@eoFM?t_}6F!PFE$|V?TEQ<iL)KEpve~$F!an!cn$rM<J@>%qBQHqs
+zQTpQ;6E8Otf>uoqB8A)*e}hn_0B7~7R*q5g?X=TNdyAU0l)%>>ydhZhp0?}y<A!;t
+zfMyLY(&)u2Z|6!zwOJ3Q@5O2#cg2Dk^GEd(e?3TQPNFdxmy0k+Q!zeAF^Wc4w~a4+
+zWnVA+<o@dQ>lVZcCOF!V0L@fg!Dkse%^B+#Zc`jR)#(CjQd56Zgr1GThOH-VvVuxy
+z>9-cOCGK^^HIf;i(uZHS5?Ky!FSC#)i>L9^V74i@!#R>VU)4s54lu6J2iIkOdBu)R
+z9(pNuesI`#9s+%@K)}Gi#rnDU8yX8$g+fU=pA3P@zv=sfh2zi=1tOcd16vUAEe-aq
+z52e(IDMrba=0STqG?<z;^W*oZIr@!rlt;i<#_f+VMY(7Kn<Qr9IE^fmx{v5F^f|g+
+z0s#YXVlX;`bCW2w8(^GiECW|e-YZx-a$%W=2RWv0;j43x1{!JIY((kfJ?gaBA#RQA
+z{H5VHNJn%E=!q>6*<=@uh>8Swmhpya(D-T?fq9<Ma>N7h7{p(N9*DTCO_&4^fwO(8
+zgkgh$){ug>;esT1#xSgpm;{<2j#`ijhk|&}f@(tqKk*KbEb(T5D9H%if(V!p>S;mS
+zsKMhs;z~;YWCJTn2`s0HeZ&0IR26-2Ee`);Y|Os^hT%U0nE!r(l`ydVOBMVZy+o^>
+zJE5qee%oXk54cVgC`d^KLxNbmh5Z6pLsQL46(Nu)&;+#0+9d`Xvs<$@0sy%$VxRr6
+zF$3y+oPh%vz0;#^-xQB-?7ycX*GxUHx{h6DUbCHMF1EivUeSMjzWf}Ziz;;&7Df?c
+z$r>z;U}t?Hy-xxM7~L_@xuH;zsb;C&ri7?PfjWp)LrG3cIm!jblo3o@xnnQPUkJf$
+z^$nqE_je?8lGAgO7hPL1Fc3>B4bTLs<X8zpTL6k9CZIuti%r_a0W9L}C8#ek>kUGE
+zA&d*iD8Uy|_S0C*n2u}17lrZZOgPFp6EeA(Z1>QfBi7^qY0hD5vB4u;;#3qlnz}SM
+z(WgeE`<)CTzxi4U*F9*qk{~T=)mmmI*FUYMgEHJ~hNdE&9nLhZretik2j=K3RYB*F
+z#1#Z8MckH$(6*8ytik?G^b_Lbq38)j#~IC{Kkor`6i&B=m;+Kn=BApI5sQ_(WDEU2
+zU9UDT!jd$0K6507^*PFf)HH0HQpeIKh)$KZjJxynrGo<%)j2|}q}LzY4xLRFjaAGl
+z^NK3#MuSX{ERkj%0l#dj5Nm)ana42c?3%Dl9NS4Er0>fE=#FyGT=L%5etXuQaf+YX
+z>-5X~4AHVbF>-%2to~DyQVS!el(ci^DJK0Wt&H0tc*0(_;WR&5;*lCb&Bdg@U~LhU
+z8W3aFnDAhJS{uLMp!&A8kynE1Tn*}5tlws;rUJ=r*}$d7z}!$j=8C`_a~X8J&<|~9
+zZIn`fBjqyS6m=K|58)xHjSHro2s}l-nx+@BYv@<VzgA@^I6}lX>wt@2{vt6l()xQ3
+z1vfX~r+3JV3r;UORrjKUvSWAu3RU;qEp7M0Ew8VFgY-!3i=?3QB|^IY;!_Vu7qT=w
+zdc(#k4jsBi)>?Jk4{@>@{q=~_J635pKPIE&B4*4O(amlNp9bfZx^amStA`1C7uL@_
+zt5gl^bcrq^)_gdk(w!_>?x#*~8Ql-u8TUZ%Qc3R2`<tJnMIo{5y__kC)j^F)(KOIn
+z6&Q}TDQ1ZHKFOX#)|M5=Ox=y~xri{%yA7R1STTpc-D;WM_ALe^!z#cGNJRs2)Wj@s
+z>GtIzYVD?zT%JmBI(j)*@i1*Pf}@*w_7afP#$~<W*rhTOUavoM-{_AOfwS0uW&R0+
+zhG%EcOBCjr*`^!qA)|2Qi@(~X99G>ui{%Tt>mc8f#=1#cuZvZorz8lltv*K-MQAdw
+z<oSglc=x3twD2Iz5-S>c^9kZN^GW(L1{p;!m|c9lBVwnAbpBGa8OV2%m>G9H#v4SQ
+zk|$69J9+JVoei}vo{kMLxBQHlncHaN5%d(kMbykE78)R^H~NgRj=IqY)dmxPcn$L!
+zc|v3Ou1|nUk$(>V6a>;ul!L7zY>C8umET2P_#{=8t>PVJ&pf^T{;W9T!-5j;b7BVa
+z={~0=%<-2#P#_Xa6XHIFFK$J_MjR$P3k}<#lX^yq!2_9}c|`QI0ElK~-5+QZm9L!M
+zlJPg&I&5qX3vLWax5`gJa9sFvLA)9)%1!WXp^2kk8g6Wgk<&ikFPxL{;^mqA>IOIG
+z?L{thfTmxFln;=Tud#>QW8cCvix+wU2y^uBY41HRD|Slx)g;4c%zI{c80p5xI=S_)
+z!+k^iGh|LXo<{&6fPie_fq=;VbI4RMa5fioax$?o{I5WntoCYzt&a4yybSP2<cM%u
+zZ3;9bkEZ#9CaFvziE^_fQdRRtCAZdUWkqa9b=}@kF&N^ALh<Ya3X=2=j;={L*a+-<
+z5DU`%M@OrfYT*f@i~ZVSYm%LLJG15cYvz+3IBU3Pk0YWVFKb8%2i$g$vWq}iG31a!
+z=1;S69r945!=Pdut`-S7xcZS2j^akrr501ASRLAkpf^cO?6{xVtr9GL<ler6H%M;O
+zuCjwSR&M-|nP@xi(6RBCH_pgSJ*-~XUZkQoWeEMqTyV|cjjG~T2CN=><~HJKCZo6X
+zk=@8mHbyu0$n%X)p96Ua{@{%;rw4gN2Q++?Mx>_0sJ-^O21Q$l36+9VaoKvH=#+!A
+zcwfA9;-@h2z&*3_K;nJsh<NC6Nin&TQ7S5ln5{W`leHo<%pXcD2AE^O1#Y9v$dZhk
+z8g+^@*gF~7NG=Xu))rS&jlR`uKHvVylZn+&7H{T|WS@SDGZrL|4F<U9{D5JV=gNTD
+zyyTL#FQkFR5vd87cHSylRF_-&9W&PTIG0*X$5hz-E1bFup=Gz^E)y$i>h|pH*^MG!
+zu_hVW%ozAW*LF0!cbN7LX8ijy&*q$4Gcm7CiX>}U=NY%2sudJF$<_mFhYkRk%haMv
+zDM51{=UW<Cc+{cAGJ2-<gds+APsBLBHrPDCNVL!WtZK;%-C?=RyU`e(-f9||^k_B}
+zuX?}eYPV~mecv3+XO!Y3rXp`Z-SJ^4!KT&f&)lV-GJj|75i~b;H9Um^#{O>`wNQ2R
+z$7BM2q!FjS{<XJy7iD~17ng<Gc^sy$3yR5*1f%JI@psO1*tpF0%<S~ZOXT`Or(rtV
+zcz5N@VRa2xFb6DL{ou|Ex2v3Js&`=}1-z_!si%CpOyf6r_{T9Q0J^>6kOvRmP^=2<
+z{s>jh04u=BU2{koV_$U3_UDlNO+*A3&7IUrJ_ZHmP^WFhOWDZ>EWeppJ(VwE1<XrP
+zgkJcARcHRrWQSSn>WeIDk1C^o$<OvgxhE3o6>U+*ZhK)p=Yp5)i0yrZ&X)q=Sg~7i
+zfM0*EYUREvz^_ja(C99na!SXokLp-lfe!j;m2VGR1G85j5a^PYmsi!!{gX+@=;!v6
+z*?XQU)lp*cAz7-#MxjA<(ng_tHea2Nff&Wcz_!Z9NJvDFwAfW-$I%*i*&bY{q$6l{
+zEPBJB=}Id51qEK|ODO6I$d{xoH1jm6WLM!XiS!Xnu}h?Wf?cX1SjpC|ENQ!n8!aos
+za$_rStUYa6J8F$;&W$-PlDes`;5B#q4scJQPTR7IJz<AsyB)4@!xxz0z#Stv48E}6
+zW_M@9$jW_f*LuaeazkK3CI#^dZDx@2jXzhsE^gVO{U_h;?6-xf@BWxa>=BU>PnVaN
+z+hqvjDU+`->|b)5R7{H6W2&gl{_O0R2-X<H7ExJNj}t|51q_?cwMprf4E>*FS`Vu(
+zP_|oU|DF4{vlkb}pAg*l?IV=5)=#?wW!gSHcb1?R^LjKEq9wyyrU5k<l?xgBXA{22
+z<kpd>_A9QyOp*H^TU_II9b%1ppYE`gRO)b}_CB`j?Wz2(YU7Mob#sm%1nRN&Y8;^p
+z0E!yVa{N7vV_0W`!RrQJsq&g2U|2`AAHx3r<fWAD4vcZroiQQh$v#0~Bo>DpPk9Rs
+z&Z{f%G~pz*po0uHuWaAa@`}?f3+YT))R57|UR02=MPAGRk?CMI#O%Z#L%_u!0q^Pn
+zvg$>qC$c98b2tYIBR{aI<NnNc2-g!b*Aq`A`9}rg9}vg$RlCa)V6^92yN!hXj6(|T
+zb@&!I1}PA8fvTqJLLC=@ThNzmbPloFebS?KXmC6(DDp~{2R{?#*NkMQ2p+}L0vIkY
+zhA4_4SzkB6##;OQgtB6b!fWfIgaJ5s(l}5({sm6a>1AyS*NeQ3)hkI?EYhyS!pTqa
+zcE7of2o-oFZ&($W{T&cg13S(9w>x;q$={J}o^NI;5|{aw7qrAiz+<L@!wz`?B$@I_
+z4&FY_KXjbJQ7Y%gAaV}(X<UzEDj%J21W*`R61lQzT+t_JU#6M5A=engDRayXO^X?Y
+zX>^jzZllm;x6$7CyjO*{3G~2#=dBje@|%p25mFt_gx+<6n9tLPpO}=EI!QXsa}1-!
+z%srCY@SZ=&KO400H0_7(5sQXZdCuoDa|!+FGuI4DqF+z&E|HG1+E)cbdCz%qe;-ds
+zsPp2P8tbbVh!rvwn+_)ud|9flHFq`};LR+EV}#~;Xe)a74ECr5Z*%y6r+UaSF(pYN
+z3eMmT&e!}l;7vSvRGSid7TM-Crgpz>Pa@s%-eWn<Myk&JbMQ)xU>V0JUCbw5v!W5`
+zkwp-57L2<l#1-VN0KCcVhkJdmF%p{G<c&K1{ok@`FPr<}H-8V+Yyu#lzt8{7UH&^S
+z`M;8llD1CH2G-X9x+!OCKzXAcyZFg_O<J--Iup_!X&6B{OK)iCTkBwuwnrhl_x%!I
+zi^u5fAfA~H5V_!Ru(!7+w=nnIX_P(VDze=q<7hV4x}7U_S!k49AmdGFmcu6J^|kTb
+zwh;cdGnKbs96lL&_PNKs{^)t`w(GeYNYx|Fr~SAk5IvPId@W|#PB@a6p8H6T`r?sr
+zc_<dzenRxye<T1qp*OyyFM5@W+seNNKlOT07xaw#(#+^lJh2N@5%eS1`quq@ojS)q
+z%TM(n5Bz2p{6#7e{ZJ#QDf>-!|BaXT9rwi#c&j0(Dq#;)k^QEf`j)u=@$+3Te(xLP
+zK{&mwoPlx@m=3BI0_6g3-t<XwAECbAUy1H8uir%QtdRXjW&SaszD`?=I<PZ>8ns%b
+zRjOGX!h(GT)B?Rmt(8r}OEf@78+`|n&pn!j8qiHC!P}{}>mqoz-vq3SzXJyh57Bpi
+zq_j2KB0yb@U?2F98MJO{fd#OIo~K}!UQimY+8~qd=*JbrD#6d&mHX2wx?2Tp2Q#nu
+z2YdI@Q6J*rC|huAsN>MdEza(c?sbE>U=#Y<1p4vu`Wg?P$GP54|6;b!Kj&8X2k`*8
+zcn1QmemM?LRrVa0p{8NG(PVSf-~(PUpv#oV!V2oW7ESsTxI3B>k#&a5uo%rmliyr(
+z0e2w<E&3GKjMm0ftc45wZT{TRTdYCeg*?&Io2Xbz20IcLV`@84*y`cWm<E+a*4#5T
+zW0#ksk~~>xV-OoHDp!Q!NzV~*-2F8xa!6NfS<CI^P*=CLY-oCCm#K=GCZ{>c!>)?A
+zPz$_;2I_lyqUJ@dDdt^v&cj+s6v@I`e%4TZ9fk<3oMyY}xsTYqX?s&?n)n9ZRT@*V
+za*8RosiA!0In%%e;?U4m;_JDL>~$I{OGH4IiA>>v*G2?ma>oHm`zE8WJ&+caVZNc>
+z7GJQzYD8brg3Or!5ilMj+;AXpv))SU<3!l6-$YE0m}+V%S>@%#6N*M+-3CJX0=e-<
+zlEHRn<r&MD-i8peD9xAFG$ai;cM~$2nRY3Byqp%8%+(QFr3Qjcs#j2zBV6Eh=w@o@
+zLI$>EKSFO3y1Zc8E(iVyOsZlg4M-Q-XikrDADUk;(Ny65CBaoZ?PTQj{UOq%U}2?3
+zqE3TMOK5!B7*i7HiL`Z;THehb$C7B@qR!MdB*=!2fclgyLxV}t&g$=Z%gQJ>=L;ZQ
+zXwO1S=VLM`Uy8_LAAJ`htp2X=W*E^VkD1xOG48lhaUzM}S`w2n6?vxjaDsg_B8L<K
+z30$n6<4>YXsFNW9aEhAc@N&VcRsfwTLYl+u&t2b#jN8@}fiGo;{>G4A$Tsj{)&%h=
+z(0Ss<Cl)r`-~dxcjl{$vMc!iRAT3dv;AknP!$R88NP4zkfn&-F)APWM<wiqF4dhgV
+z-erTFKgR7SA}+kmULJyMrc6F}SFyyo5rsbMi5S7mCJU`=XPa7kIfRW#>~uA_X}T13
+z?vja|;h^r;c*Z}&RkUZ0&<?f9<g8Mi<b_=h3pttD<3{(la~3G=eB~X=v^z<mv$81=
+z*90^C`hf|b@Xq_RWiGH6an@JdTwR&q&}xuRwS5Lo3yhnUGic|nr|Q;-DxbP(EArd8
+zds<D+ZMyiX&X3|@t89cSF2&4or*OCELZ3HkKko!H2%Gjp4&w%lOvf`8b@IwieJ<-|
+zi*oaFRZd|ZI;DC<X38HF-_oSOv(-)qoCQe}uYo$S+kcM!woTqkQaI&{pxh{Mq<^N|
+zp#StuzCQRtbw_8bW>r%q%KJ-D=!}=DCl!LwwOb7up^QgnhT!!u&Xpm#Ho7%OR!Qc0
+z>vR_WSiSt_DCFSCesM8zH^?H?fxecN7-<>VY1Q;Jv6+%_9q%ePyDt<EZr#)!dW^bq
+z#xl{>ny!<y!>$@vly1b&c#ox66>nD&>4PpA;SOWr)(SfQC>s=p8OP5JxzsysBp%AC
+z_p+JBMsBv^&cIXbkl4Fr90?Qm(1_|YK!cXUfMh-dUGZA*u0suuQeh6xv~Y4v*#X64
+ztHEjnJ~{Rt>bIlPq1R7kccDW`JY|mZ`P9PEMLOQxA{@L08}nq!%-wYDO<4JKHFb?c
+z${e*<R1AX0T!oj$@#kBe(cU3xa=JTF$E=QG$EbZGGa;;oUeiDG<@vff0^oKMY$St;
+z&t}bl6p3WoKh0m46(q_|HR%zexOt>C1yolp1&lh<AQYw=bRz*_s6+;I)-u7zlPWJX
+zy4V51s86dU5B6B<`#*mDHY8g|p(v#y|D(oHbce}TaYs{7O=-5dR&mGan>&th6G+vg
+zr=XzRxYx^-fQ<G^7|fq{2LZ;3a39LVrl*Fd%13|YAwp5DbCwbx(Ec+Of8bSmFCHN>
+zFwRl8U<Kf-au|Dq3(a4AxBn3|j(-?SxLlJ>XAd?uDUtR2$hPa&%Vl^aM)<xnj5<;q
+z1q%YaaQg#Z51wK}x_S+=Xt=mYKJ@1Cz?jQ}7$Mi~F{@OYsLTm>0y>j=P4Hr(n+AN#
+zMUcADA7iPe$j)O^w8jelB#w?;8I8`@Rh*tf0>gyLRrf16=`dIo2T7mgeV>`lu#f*x
+zr2Rfk+f|&iIZH#i4#reAzF``M!y;<|w{=H#*T2m8TtE@&^Q{tQLCIq&taw`bx5Xds
+zqDhG-lLX!{%efQeFHAv)&DO)WSPqFc=zvE{C}sm72oSj9v*CQtYFiq|9#<h?x@Mfq
+zyP3lrG{6KIDU3x(G>?{s{82(P-b_zMOn~H-<r%unSYUot+E}XWVGb{{=O&6Ib4tC7
+z`p7RE({goHBvV9tv2Me#c}E<&R=brWQK8+<w(1vI?I@LGEvcS!W42$9Cwceo>t4c$
+z+E1WK8k60Bs~dooiGjclGq>WKo{Y73#Ucv9Jd|Q$P5kc0wGb)Rj`BRvFd;;#Mu`37
+z74e|UWBIt5T%ubs?eQ8U(Pc%qoqV6e!`8Oa>>~R^Rb=PDfOeBoaF}Sj_=`v4Ie`Z2
+zgZQjU_)~@Wv2&p>PWco*Z{Ig^nT0t0=)Ck?4zLS$F5PK&RL~1Z(JRs@m#e58p+k^w
+zBuKfIiCyorn_%lA1MJFVotZ_;V!}F6iL#5sEU@%Qog=6Y<zgL*w8ygXo}C`3>qZJO
+z8=v>7<@oOMwr4v9r0$8ph?0u{4~JmT-2x_4wDfT`ZI56|H5?+ejTH{RC}2a*%djql
+z8<7gMC{8E23P+1k<C&3>Rx!g7NilMNH=G1Nno$V&KCEjUSqv%M-xnGx@NKZkQ+ITl
+ztGm21{6xE>RT3@aJb>}gLN9g9Dc3DIo1u?4Ls=7}Dj^$Pl(8yZiZ{!Z=BJ)<%_!m=
+z-6??Q62JZt?3m^Kiw~%+g76dK)ZnBE+z-EhRQwosfQdIC+a0?|_DNKUL7HV_qh4TZ
+zw>h;m<P>>{cK%Glr0N+^9_g+*qFXo%Qsn_x!QK~{D@R|W(|+L*zMQO}NgP`+hb4Z7
+z)L3A@tfL}tv?v!^nhMXY$=b2epb5wA*ud<Gib&Bn_TvG`6ZQd*+(XI1^9X7(Y1E7U
+z(tlgLChuCe@G%~2jR6!Qh<=XEnH`~}t9{}8&uPW&l6!8xy;iiHRVx2MZb@{igbm!Q
+zUcQ#p$*2duUiaJOa@Nf`Zh-jini1j`9>*bv%RE#&V1M1BUvUTMiA4#_2gmT;;05gs
+z=?!#xWzMu+f*<<PHefz?P(ph>TeXq9${c7>q${D)^J)?$?UfM%gFoim{jeQ=-!4F!
+z@@N}m_?$led7Ma9T$2hL&3pk7fqwod>>FSi<xZ73OtdwAR2Np`lA}3{R@yXyeK)PF
+zl}dk*S@J|~vG254Cy`ydlrmm*-w5~KT##9Ud*67^bg5UU6EC`k8-LkCr?3KYd3r}b
+zuZz=KC5?1`8R-nRmA4kB<k0~Wte|h5bH(BKdgdlP&f|ihSG+{Gq6<5*VeoCgj@`%^
+z`}|eZS*PYf{zk3P8In^xvAF**qo~IvC#OKWMw#Y|b;MK(9se^hZ6gGAHh6G0urRMr
+z+pPATFztg8<I@bWLVh7Ik4=1rz>qKW)+sFW7>SvF;r&$g;sY)JnA<**!!=~wz8kmi
+zhD7EIk#)A@q@?#2q^ckn{2Hir6QMjeB(kIToB5%^{+4<59rY9ED924qp8Lg@`uwTo
+zq#<U#;>7CV9wR(NFIYwy{x9l~9XV9=PL}vk!E=uX&nbAGT=0U>qJlWKC_S*a^T>VV
+z$(+JUhL07O@V(c7dp!fnEliZffwtJ9x*MS9l57(3rINgVr71+!zp``)_>H@H6KA&F
+zzO0^`pP7kk-Bi5}ZBH9#R?;&3PV&k#lk+T*r++RX7Z%L`Nr(dgEsQWP6~kd6K+Zq{
+zt9sdj1|`pKJRIm0>XGRIshdE;&K0(Hw>L%c$*JZbx*pH4Lf3w%CB8$~S0JB#wY5)x
+zY;Bb&Kr*iC(ALIHI$$Lmo9Nv^Bu0qt(BStDw-ilOd*uMpIXbn~e>jgs1@4U%gI-2E
+zSq0f#IJATJFgbG{?GYdcy&$JwfJT2J7aq4tt?^Y#+oDbcHbaH(bOpo0g+Lv|LvxPf
+zgFMj|@B@}>i)&i;HHHO=3ivfe)k^|8x;TJY1vF&yYXH}N$${gPrP8=x2<;6*KQ~lA
+z_P%xq>>>A;C=+IB&Q&qGIbJhw%w3}ZJ(tC^;c^W6X_2#L7i2BWh1zc&k+)}o5b;w$
+z?{+3F60gPxGh4O>{z#TU;qQKFJy_V5ybO!@>@9gk539@)@N#+W?l+%b2FQZmOzK*j
+zlRdwlOei`eton#x>mLcSfI-4cMXmGniu9aBtn=svfyX|uPgYLZ2@E;+KH<pIO+~c<
+zdE15bC5judyh>HcM`%f^e${zzxB*so(CtD!$)=^V>ho-hCoM&bzYeZvuZtyJ^HNzU
+z*Sq&XRow!m5kq^VdQ$l|l4EpxlvN{hT?-a+0VCHDKe+USX{m+C>G!rVv-$ICN^~^L
+za}%gVp}M+!K$%~MzrjBZ7zx`rF0CNL|L{9LeKW?<hF5}0zIsUvUkpNgee(a4hTiOz
+z2_O8Mxl8_Ag8YA}kQ1`Ab9Qq6n`xFcu&`BjHgI(Qf75n9wbs=TdHd_Z%8`4m8A0tq
+zP&0?*l%=rqSfGMyF%tAsxC$d{>BU4+N@-9|Qs^w+vESBGyV>YNYP@B)-|62L{pMV&
+zjRV>5mJr<1)483dC%cS3UuW#-fjj;2O<o+-#pq2*I_VA6#Hf#qHwHSR{<4M!k|7X`
+zm=hYi1D~EeI|-qW8p(*M3?v0eR>;dH*80l*5RVe}?6EJkL!l#&FABrrFB<*ij|#7j
+zT4Lx4$VwpI${D}^EP(L*z6k+x7?xoKj%J+Fr*4~MYgk^i$tL+qOILY>Tbh6ACP2N^
+zp`|9kVXks!u_>d>7R}W>`{HZJcavS1UTgfR#!75kkup^&3A{z42YrHIGxW6hgSEUu
+zj0>xUc1l9N9eFBh+JY<7`KDAYgQ#(l0ga%8@OTQ=piSFXLm;q1M}<}>mjx~pca6C{
+zV`^B2bw~okULIpIrn+WWO69{oM1h+Kc#5<R7YSkNabj|dl`=G&6dY}R?&o|=J6F9m
+zz5K?UFQZ3QvTaF7aoh2q0h09=)`d~2oubvbC>5D0%rPBPPGe6YfJeD8-IckVi^{|q
+zIfRy~XEtUbA{ywTMPuB)>9kZm=dntj+Ah&XU;sfir8`6msIzt)7qC>BSRed6vMa!R
+zHStEoKPCz!5J4~v`3c|+EiH)VOzwGtCAv{A`T(*&%4;@LM=`qlYxaH-r7Gfr(mg^L
+zSoV1Decek13Q8QBZ{S$eIGANNc%{iEW)B8TZ;u*m=7#mwaUd3LAXY2{55+^epB=h;
+z$W7(q9;kwIV43NnQXj<BY%(hc8mkz0vFw5kX03zfL<thj2ORyn5}dVwLe3(|#)f-@
+z7Zd`bJ`f3P=9V|~Deza{_iN)xbk+}Q!Gor$M^!3kWeRQ2O?0ve>L!KSDAk|CqxDrp
+zD?^$s#p$^G<7+g^U$qf<RPr1(34ah&A~992?du>=iFNEF*aH&Ut1mTWip<<7(;Hd~
+z_PU#BDya{58YXkfZa=t%Yamzh7TRyVAcU5tN+R_AHS0(>svS%#&SYLxqxZ)}xh&T*
+z9Q65qb9+~?M0ssb^rMRGTE_qCj$l&?EKG!K&(WU2HlWa6k|rVQ%D)5G&iQH}+f<<}
+zV8&c34i&&#w=8->LfT-YWhy7oAdY2)%n_|V_5QJP^1Y1kbuX|(8$Ep97&%Wfdx6Up
+zaua~&a#ApN49Pt!U$BRz4^*=t6N^GvzZd#V#vOh%^*i2Zu_~)S5z#L+?I!AIcWMBg
+z-#<zGlM#z-5M>mYF?IzcUvF%GK8StiQIG6=IH&|n_Le7u+#5Jo0NJmfS>`=u3LRb(
+zzGMUnCC@&)@w%U(+7Nd0VQN+wAE*m{(gR%zm`pF2@jzgk<Q*yCVn8@*KH?omIH)y}
+z<#`v}C)s^W9mRG}wjPT*&eg>(-ZqPbNOFse{y|=0bdyo^VXo6TVtKH(=Mv-6!<i<w
+zGwUfT(#G(4<^<OQ#m=$ZL;Duu?&Jfi``7czasJIjk6(5^^=^+QiFd%2(Zh#>n!hVF
+z3^YpNCIwQb;JL#%ZwZ&IK_IAGz^J=J`q^Jflxs!iV4Jiml<!ydKCfmt&el(<lq`{(
+zfNj^kjaP(!hQmHlf^p%$MGQ@7KtL4#nLPY=&5fwLiIK~HmE9+6xangrVSZ;5i`P3k
+zgjt*I{(=PNt~X(pmJl-M0V&qikW&h6KK<Fgif)|Ek<D}>p=GW?Ya@w13x<1YYaR~Q
+zDj>Z+JKyz8x9K%2`|9Inc3P-Ce-pah@w~<Ex9u+Pdoc!q2V!51486b1pbO}$C@Af-
+z>Tjiu(8P%n>a#LAb}{JW3t$hr9j34y!Bt$`ou)wB(Z{fhFhqi1j=!5?>J$xW8NXrM
+z?UoMd2tK$(>J&b58=vktI9C9@PI={J>SPai9{cdc<U{O(F!_pu4IOAD4?u{Vj)lDL
+zQgq%6(_p35W4?3I1AUGhLI`4{W<eMo%f5S@W5A2r^TvtVAxy`Q*)c-$<_QoddJzH5
+zjoMMJ_hE?=FIc58&P{n`X2Q|=HFEPa{;rLI4_}nNn?R}?V<`2;gz=JE(Ho!_xp)2|
+z2D+_M+gU=-$~C{zWYTD7Za<O||Ajk1EIiOfTwnxk_}S68scEJ*A?sXhJuxa<sa{*V
+zJ_)d<HM3i)7uD&DfCkpdRO;e`l5Tm1yOxNCkA6_gRjG%w!|LKmt2!geXqoJ^{S%_A
+zP&?REV~+i2dUu}BrjlOShOM5ZeyfOOQtoFYx)%$zcxXt3Yqxo-2xqnJ`0=B*7`7Ya
+zammz%oRLsphVMegNmgy6jN0{vkp)RTS4*2yi?DJd%Q}OTvE{0TCX0D$PO}$mWP!z{
+zvc0HP5ulGszOcltCWlT5Lp7*<3Kmyu(eB`(Z*Q^HHX6DEbV|nRPgRD==-N8!DvuQ^
+zO@T{J?=Dr=ksX6$NS9(CseiK?u@4SHGnE2G<(S(>2Yb~qud~ooVc$s=AE$Wg0WELM
+zPtRCIedri;(NVMs1$(J;EOkM-7Veg)2gzD!(>bZseI35=6j+L&TiW66`KBo1`3*yp
+z^ccW7UbfUiMwMB!1*|qMaOS+VR*RGzr-XIRdT~Iz%ufxU<wd4}ZV?+!N*1t|uy~`Q
+z(=`=I6puH@Nkum=AB=6&MRMo$SctwIIZ-q!b1NS%O6+Ca(eO>xDs^0~XTgNGLImRm
+ze>0t8iv>Pf{=9JU3{r~lK*FgE0wOqIF7u$>2$flHqF`vOksk;6C1O8h4a8cFQ!|wx
+zJb-uaiTd1gH$5vItO71nyZ9RH6i_Iwe!R%3DT!^D0UDfSn_OGC*%_Z@C-4}c!RC``
+zql&Xc+#;Ln%FVe%x&u_ddpb*3a#Nu-D^4~|=Cxdt*2^PUx`men!)eU6lL-s<yk7Vs
+zD=uy%7|pPiJ<G5Fjb3a+6aD+#7BZcOl|s@yMvm#sm#y8YuUma0^b=TEsVQi~2r3_l
+z{K&!lre)d2;}xqh6)I7Nkr7p^#e07+lnn|>`+MmC{C)CeH2c)`bX9p3FPM1hw~ia7
+zd&l|J0frh4<f<P+6uy+9XH8;!qG>LvkLr#$=Mg_r_t_n9v^dQnPtt-)*J(_d;bG^0
+z?s<VAHcV1N)WP@dx>3nE>^&2`AiNYr@Q<zJ)<t#^E6+(Z>`nQ%iQHfnM|8%~Rmm+@
+z=f_V;{0@#(a}9DS+M|D=?(i`KAlvd%NO~S@Z<T9-jTDf6ZC+IlKWtfq?I=L}R=j2B
+z;e!w}DN(%{g}M)JX_{i9A7m~<!&`Au5iLiXIZ1hPmu{+C^2#Zqb)Zcx<Dt}ApGU&a
+zUWD=Vj*Xuh9(imnl27j_tJTkFi+QnEGh5vs3NXufVAEy7H9I8H%Z1#(4%p&X*&uqM
+ze?-r(*_Gz_F5A<4al`mlywxkK^jQTACsKWl2v9_nFH+p2T4S;7%dO;bJ{f;l`s7wL
+z$E_?F+J=CGnoi@m(o`#dO2(~;Q#`-T*Zy|KhkJFM;rXgCt=_G>oUuxF=vE#AGi&S0
+zPtj3QYE`cai2UJM_C0MM$={mJ2KH!IuBTGk&4%8h#)leI{`<@^dC#Q83QlE70g|X1
+zjnKrGrm6#*^wO31nn?`iE7)r<9^f507*3xtCpod9>>077C_}|tCM`;r<P{TJmUa2`
+zK961g!DLGnU$QYNndlE()+9?b2x&1bEiZUiXe(J`qF_JBcAVe2YXSD0)}m%K+o0UX
+z>07p$n2|hRLwVNLsB54$bnfe*ddEeNdRpgA+5+C)lLZUKK_GBiNok<v@R15LkVaN_
+z$zz(0!~X|jjnM$Q{Ww6EtFc0#8(16nrMkiq-|VJjALOgIdcYA@KdyqX+A{9IbG1cx
+z_%XTr@l-qZWqC@w#QR(|Y|LchI&Gt6dXjo2-2=r*S0a0+&uQ$Iry86wSGzajCxuZ%
+zDW>$`(G&qo<XRo(q+O=qOD(Y*#K`Lbu;z_-jI=hLc?|q3GHoSDRH`vHB)7`gAPbS3
+z{vVpNVZ*uEKn(^q`uKK)Ggve}8c!7evopq6BkbVDg(>*lwZh{J?>0-q83OgH`V^d|
+zjW%w^K+gzWk+~9_zCDq5q(NjG@!2>DJV7Ju=yu%q^|fnZ<vm@z8T~Pq6t3Jl6DC=s
+zS6DTfeHFKwKbu;o7uiQw*;iLX*<H*VU8+}G>C;<h!sfc@jy(M9kDanSdUzRv69dn)
+zdkqK419OjUFeRgYI*9$2H2ogtgRihRU>tDh2}eXEwJCb&1qkPm_nz8;a0fj}$aH;E
+zt6?3rV|}L}ME1-nLL+kHL}+Qfg@LP^@U9W}q~S{Y-cS+uFH`K8;!wIF-j2-~t&LA8
+zm8`LbZHWZW`36`}R}9*}EgJD{sYhsz%+G&6>6W%eovt27u3OGTXcpftjm}3<Rtsf0
+z@vuv`*El}`39_R}%N6WXpv~kbj-_YyaWZo}GgNWaaH)cqIfkWk?3JqMAmvE)<a<lb
+zp-fur^5i|t?0FxJfrYOIFET`%4btt!g;hPOp>tQb04g50EPsSrXbT}>Q|`_CKdmxb
+zZIY0yl+`KFq-P8l+i0^k%NLycI<M%j6VhPVZ=C)i%V`Q%Zma=EizssD$b19^uM7b`
+zGg*RXIKkAkts9RhT%CIJLQ>ZIke%%TcGMkMz{&~A-hsJ*;DNQY=Y^K5p(sE~ZfOl2
+z_BABj)#8lYVg%{*$cui`9qySxAmpNOO5oHIE;ySL=_ea*DnktdfTF0Vj?k2wc^gI9
+zqa2%-qx{&1U!<09>X;wnx4?{MaYHDYOm9l{^Y-?zIpCQ_9uLz}_gR7~+ktT#bW-hW
+za`zwEKD}Lm_G7(o;yYSHzK01fkCaRilV%QY>R7AMK$mK!HCy99&nds~VyxSU9def}
+z11iEf8mAk+|BOk&pwvAZBn?U3<+>BIczOgSRRIy$o5_XA`Ei~-585Bj7A#w|7JTjv
+zK%=9C-3KRMWR>%C0D~Gv*0(TcM6(~!zoW2B3|;4J#+PG&@EY&mwBPEz*%;;CCu=Uy
+zn*F8DP}q`k7o9H!E&qr*z9RdPz!F{u1;@3#t#oI)+5yPOE?(6;XC11GQ>NXjQaIeR
+z;X}`q#>(W4hOR<>Q|ANwClHP4Pr4!c3q*te0#T~}3`GC+=i0yF=>NEz|5rZS9c2XY
+z1u>!P(FIP7Z7o;}VA%OVBO!!rEo5j7VI5>+U3(svQe8Bp7S|ZlxF?ZVtnOLjws2&g
+z!Dg}0L1JUVZYwlXD0}_hef`jV-S~YWRZl}ZvVxGdG}-yO{ka7j%l|q{4AdO)NaebN
+z2GF|k=Ij)Jr&qZl0vtNF;n1tyAk*uf4OKZlF#+gDs8KtWM4L8hhAR&4DpWhcYgFws
+zp>rEPxBy-5T_PPi@NOyzJ8}TGT{!3~wHq<|tN3#}r8+D-HT#+fvW*f$z*hcF71gp-
+zQipv{K#Rw%E8zSV9&kO_aZuwnvCHe|UV~oJ=`IkAjxf&Yzg4pL`SL3Q)>L(JH;@Xi
+zzcT=V(p_Vy$X#T}!h1C`c9a?aanA^vkIv6m$d-?a9Y0YZ*7H^p>Vc9TPyNQCY=YMD
+zB?_H=?AomBB`acP9|pSnWGMAum%ic!x|=GrrtF2Q`}bbvONzkfRs7YK!uD=pfe&%$
+zGwkI#HxG+<o}alwFM7Kie=&rSry&)GC22u;8J+(b9&>#CLlA56$b5)E-hsQ_w*S?a
+zf}R~-iJ>?PQj;rmQd46Ll)L97Bmy0bD9W%t7oP<Q!bu{d@E!Ajr?rf{*db5HNnLRP
+zr9T`YGbbQR>MTADi6>{#%rwf_zJ(Xp&Gh}jJmAh_?*qEhnp1_UYf4964yk6@L`z_b
+z2;oH1zX)D*5mpyB8goO3E0LwmLNq!_8%ZId*y2%4Qj4*GTp8T2k~WDMClcIi(p_6#
+zq_BQ~4bGoxz;qA8|G?j72trK0n1+}y%S;t$Hj!Hlb||YZ-#HjYI#a%I2WQMmNwk(F
+zzCdp+VmJWiTuC0{oFI79Xt=1N-t?5)AZQ^)vMh6RgRwhJYOUc~WOa1xXN5S?&^Q!J
+z6Ajz_Uiw4YS*?SJ1r3oMt?T?<B}*`mrKZ#<Xx%bLB-8*j9?mH~Z+h(miif}Cel#QA
+z;k7r7v1Cznz4dUE@py6R#4UwXsu8?D$_Xl|Md73~leKe+gwctEKfvS98w#_<#Lpu|
+z8z$UnQL(66r0lvoV>a*KN$5>k>))hj6$Q<Rau_u<V+HV%)dsNpSk5>LaUn&7AQ4C$
+z>fTl_Y~8}5k<o&g_j=Jz&Q2LgnI)%6aN9%AsNQ-52sgt1k>9b_vp2*a8Uyk-%3%Bp
+zH%=b`2DOOmUJr{8d_H0W^tVAFdb=xFd+sqI=Y5GieRhBkxq<6j2!B;N!A<%K9U8LQ
+zHIs%Fo}93B&!E$j3!If3*bNHW=aHe}@obFcs?#f#@vw$gQqs-bgBvsdXu81;4P7NP
+z@_F)tlq-sN^pE5|#S?|{^Q;SvQU&BEJLs?KUHq4l5I;%!FRh3t{Ebmh7h0VxYqU~L
+z=L5-))HWZ!WVPRrLSdv46bnJ(N!0m5C=oYQ`AR6|rTJac3EC`=Lhez8C~7RW2kew>
+zv#5$y;YCU+Gf0-D;U@WF`ev~?5@~7#hO@{H!vX|23(94fSgiJgGT`-l;2J$Y#1l+;
+z5KSx67nQ~I_um$WV?-4>Sv<0lnpx_!Ur0tYWfvt~zw)wOGZW>u02$(yh}5S`g3S7f
+zp!FpF+EU6v&O}0VF1Ep{D3AGqD86-4J4%MeFv0`|>LCJ_!;s>!BGD2A85}=+Ly6R^
+z_CTT<QrZ_mJgY}!?l%l!4y_XoR|u1J3c|!>S;B!D<h4t~nldy(u>o^5%KK?FOLb`;
+zANqUd0l<7o)H_o&4##twRFjn)scla?4Fa%-mTNyFCKb>+Ej9mEfRxNT5F2DmH}X_l
+zcZ%mLpOPq>`bcilsERe`I(9VW*05D~wd|znOs}F9!&cM^vmUgITd=Fur-J$G94nr}
+zC}`ZbYepX36(=;eoABN@p)M%>VPducxE2~%w#~*b=X9JZ1IYH=9S~g07k^pRw7@OM
+zzKMwFzM`!^Ou9uz(-vLX_uSFacQe~pl?+8o|7DKd+AitJH`yW#SML;>gl*?`$NNvo
+ztG#R=w~iXFCPS!a8>YbOTm7yK@&*q?3saEXuhumzK33x^$kSb7<f-qS{(!<+DWtBj
+z&{|9mI(zg<6t_COzP^rMf;3qhREaNpiaU;5*LgBmc*!33_pqf3QhJhLHpziUT0kzl
+zyF!a|zw$U#i-Vvi<<VUr*X+u8RmzJ%A7014VwWx;2<x=L=VUibYLLAfLlt#ev7u`I
+zKa8DIcqH7mt~>15wrwXJ+qP}nNyoNr+wR!v*tYF-PW^kWea_O^&%UUq>Y^?RW6n9o
+zH^1?Y>t5$M?yG~b6~j2+5zN9}3!#p@{x;s~5%XHq;F0W_<wZ|e$h0zt?5)+Sy=);m
+zvyF|${==$lOjmXF`It^oNxJT8+v90_#3v55st~kgpRsDo{H&Y<t=q|!$lzL+zC!YT
+zMkTb5md5XwhGHmgRSDzL$8|=B9jTS8CyBT<1-Z~awzt``@JVyoSk#|@u3c|8x=(;G
+zn5GI(F}1^JSAg^(KQQ_zK;c#zC8y!hCJ(<<Azoc~UQlX4Ur|3&TBiiL^%JG-tLo6P
+z9bm<#2zv>&C+tXbB1+>ULPdh~sg|!Y2NLApamJq<ZeXShy$#V&v+;hBgP3ewQ~F_S
+zg)`|Lo&=4Q#+b?{|77EhwN#|Nq<K!2>M-$@(*kGBMs-r(Dt|$(QJowROIU+BV^ZHe
+zo*tL2-R|^&d(6ZW9>Dp?PX06A;!%~6HgX2J4d$fI969X4BJ<MS2r;?W?@>kC-vN_>
+z?z|q16?48Lz}&16Tf7qH*`yDv=>WOr0LGS&jtlX-=)FFfzB1AQW&MSu9fp0!aYIT-
+zsuRb-dBlJ_TMzzf*UCDfrD8A};(i&4XnS}*k%IV7HG_M<&;#Y4^b#JSCIgh^-%IbO
+zd4*vDyKUL2T@q`L;7x=;iRR2~9lg4D`;8RmZ48JhH=XfM86$7uY}+9koEG`z4N{k2
+zQqX7g#T>oKWkV_}{<d1l$#5u&#<1^dgQ_CQGvhP^Hml<01(}-Jze*$aidzYEE3B>j
+z5l*><-BN0{&^Q9w{#ZTR+}TX$8KLzVw()@3KYDQRdNkU*&Fd>({nWG`)3*XgH?emB
+zPrc~IU(EN==K9SWIU$=ka@cc;>Adw5y#3_-jynn$*~F&Msm&1Whn!h(yCa%fc7w;_
+zEZcfR0!zYohSBCvZCpXz5KIbUm}G?uW7ESbH8C;V5y+fc0dm<npFHH(jmhyhP#yK@
+zYYdY|7qdDmyLF?omcvtrpc9k4r{FcpvBk@tP0WkcR!Xto^ptF{j#m2j<+ADIAiguF
+z-A}q<;honkzcXh=K%|JDSM*Nzfxu<h#a>+=+QXhei))Oz)R^<n(<fzMc1+irv(ey~
+z>ROnUJ28qtU}m~u<jak)Ih&N`Gs{}5s5afnY>zyV)pCbslXo>lpt;wd5OZ%dx<fB#
+zi*eVzlQChoVz|iFIWfoe)z`e?-qE?Qg-em2Dlsmg5ogWGp)28Xtd#h!{r)-Ayz+AI
+zzyh=w{)YMg(;)ulm;7(g3cwhohOCD2#lu9%7!^UGSw&IZ6hblBTpd6GtZ69>2G-o-
+zBA#R5oEDx48Mf)xxw6*1;?wLZLXG&Cm6NmI>U(SS74Zk!=6Z^RU$AH-VL<Du`}*0}
+z&Et9s-%sxywiin~Cz$JE-;|G?XX61Jp&tkz4qQG$h?g73AOE|%W13j(%PqxoZ2bWQ
+zI~KdohA_y9;3WK5VqqhK*e`r8Eqv%54j5JVq`sgbaLAk-ioj@NOq`-N%m<^eA@Wa*
+zr+pN7eE1#6t!ikwyNXia!CMRboZDRu{2XKo{DmmZfe6cCLY{gZ_M+abQAQhi=yTPy
+z<7i+LYvlPv*-TsL$(bqZZu-NMl=f{lGPLwL$m{E~JdtAAUpZAev~?tgtGD(WONJpZ
+z@T;0cgqQZA>CP+z`kiE(3)!YWV|JuNUb7;m9JQ7oAt<U<qqx(tf6J_<W1S>E@m9zB
+zREE`6@?=!sb5kp)ReS?ofSXTpt;{D)Odydm(^u{c8KnjlolgCJ4rPR94~~S4_&CU6
+zPwH9S3%nc$Y!>tb$HFScr190?6hF1aig!JUDaE=mM0#M(5O@!P(Wy#U7)~<Kk$-Z$
+zv{#q{eR8OUMoizJCv+e@E0q;YD&vllojLL;Q6YUNi_FJ8XY}ZUiG>+&Ytv0y)T2~m
+z({p1XD@mq|b{@9m0=aq8e7vRjG)Rk5QMzcQWm9!LMsnGM6?+?;tq`RpQ(-{z%+x#8
+z`K>w)p1#Z-k-psd&r*eYuqP_)Mo_)x5LcHpgc7^F16C#&noPq*Nk8lUx?%@nVoQYD
+zO-01=4VOuIA6LyD%*^sGEUMjJRYYr>N2ba3jt-EWkYFP&>h*3F{B`BaH~hJfc4b6c
+z*udx)d)XntP2Ujt%R=akvUd!<vUhl`vUjwd_lxR~hxhRS80z*t93O!od8G{2oB=`w
+zdPI>4Jn}~DOSoXuHg_>OQdOb!G6x!^?=U@YR7G2u6qT<@5}B*Zm^7<YvQirT&ofM9
+z(Jr!7X_T<uJ*{gY@4}V^oK;a5vby?{u`8E%)d}v35hZ5?h-Qa1&O1=RHGGVeS?qAr
+z2GQ;BE+y=^VA8Xr6g$*mw$qD+@1>QcwWF#av=2X0sFBq1Xk4cbfDoIRcve#;R72=+
+zmlSzU@3N%0wcZj^;vEn0rcO(H&3~6k&keO@)C`Z>=y`~2q(!M%M4gKr9kzLKoQ?t!
+znHEzZCnHNeAp{BWD`K0|geg8@%%Bv%is(~NL*`&AV<!(4Y%!mHVm<X(h+dyZP&tuT
+z-=ewjdRV*}ArF}JeV`NZ*-lQ#6^k4;%^;<z#kowI#XPNjmFU#Dzp?U=>j`?DubTN^
+zUFqxG9_Jf&B=v9BlKwc92#}wYPAzPYu~^!Mo1)~cIUb7sdZ#@yuTU!F3Gdo%vA7*`
+zqfe0K93)zpJ(dc?J4==ypLl)xUS>D?^Z;(`>4|j$G9~nNUYAqFK3fJ$dZYM@qsbA5
+zsL2wBH2;m!T~K8lBWV`Zoj#!j^jSem(u)7&S*g-=IP&%zR$nfJ^GE_JVaf#nG=c=H
+zCwAI5Ym!v7+X?s8N1b*!4Q!F5QnpaU_zvYm7{8D>yn(1(D_!Uf3N1mPenNE=U1+$V
+zqu~q3d&rG4b3{ta!A1P%1M*|~jRoyNSI}gs%#g5rR8hhRQKQJ=`!#zERm!5?kRkk;
+zPTmhMC+Xq(qD19I;LIedL#h<0D1GAC6v&U5IhifW7uF!XL()CE;0th-Er*RouRpoi
+zN;KE5=}B!Zs1uvzrS_DWZ8VmpK_M^OLiwvj#<R%|8&bPkzqN{^OcN#{&jm=EVIdSD
+zt&51l<oDo}5@O<>Sc-39im!n!Y7CHV<$>)AF#QZ7A@nQN{n6?n)`fp)4)Hcc`dXut
+z*9pNC5G#Gtc>wawNZ6JZIm%a|t_v2`{Rppqu=?3g8b=$Ow-RYngvvov@jHXEBlDrZ
+z)#wLz5I6h}@yeY(YlHR<xPG575-17Rlveq0kqsnbJK>U#u6&k&Lgs~1b}4<}kTo65
+zciD^S2d_Hz!gE1(Fd&FH6<j92uYchTSrS;rH30#@Wgy?aar|cu<DXjGNTltI46KDM
+z0A>RVLzn;8%bu*LC4~(D@l2a;E;?5_G`Fm2HF<<tov-a_NeLi<5;g^+;d@g^ClJbZ
+ztimSBM1D#3$=~Dym{uy>%pr4S2;M8{PVaP1D-*xa{l0Y#RdP=1S3|(d$vjNr%=mOY
+zD3HC_u#Uzm=Q3=cMC1~wYIM~iz4~rcP|Muh8L^gKAh2PjUk&2Yu7yYWS^U11!u3OZ
+zz1`9$@R|~~9QMFhuDFX0>OOn8mH0hoeIK{8)X+jg!=g;Z2kRwM{tFTusb6#nX)J$s
+z{9wPpDhdhBrgr+N*%Hnvxj1NtK&H5cG@#hS*sY>@oEFJfYbE~mi?lOG(dGW=DuR1N
+zixrbxuQA_t?3^SEVU?}zn+P`qf<8|#jw#4X+GD+dyPIF^#jvJ?@LD(@duKy3GL%Z=
+z_#F#d)qU>nEuRv<Ik!CumJolrG0hsB9TNO&*73y;oHlQIF)d>G2W;5~&mh4EQ_$zA
+zb2v1b&~$~#1(OAM8bX0^Y7<i<8noBI=%^GU;zHXdJOh&|)O#848R27!tUtuh)(Tqv
+zJD&Q|;_lw$E8UR1?I0IB;XG=qv@e%~+2|ig9sd#u>%pPqoPcIWPuOqY2>){={4;PW
+zSk*!c8{kA06VLb!@J%q(1JbxXkqc5=BQe=5tSICmP$d*`lUA4Sr@#%xm?owN#hIPO
+z7W2*$na;%$%WXCtE9JD>LJ7Q|JMf?MpU^hjKOiLZdFb}qovt~bY3_TDbK1Y&W;Wr!
+zMeX8qy%7>&3>M&|IKxd~-Eq<F6hs8Tp^D(5S>uv+k$e}sa&U2{sBA0RYlvaf{*5@K
+zf}1;VT>J)&)l;@F)kYRde-6-wumZl=H?i~2Yb{<nVp4Bmacg%nu|yB{v>dl974IrS
+z?5x~n2HaS@)drqf0OG+pm2cjDsJqZmCY5i|-Uw7)uee5vJsDKVIh2}!-dn|a_+FGz
+zYS8{+@Wg6zCHeSPLtU5m(u1{_fV1h-By(fp>BDQd*>Q;+wY(yftMp3Bd3p-F9ol$-
+zNJ&MWi}%$+`Pl0H>B6c+1Y9$<IkQx8z(Z1NwM8QZ%3ujyTI%HQ01Mja5*~6pTHL}q
+zgY_<ZZNSAy?xdE-bz6W?_`A(j>cb2*gzO6EuzBXVmSKmsHo`RYkzik}rP)+}*XhAw
+z2NjIxghxT0+qi3rXeth~8bV<zZV6G=@5CpQO8rbuvQ}~{t;pBn2I7{1{nFKhxcFx6
+zMgG1X%Z`*A(PLAkMdkaalX7o?7mEs0x?_mc`a-Q%q=78^?k<%_+)c|${@ktvRMK*1
+zl@DQochi-mL&y;(=*iLxlormM0+Xf-sN=zeGDT5$^zq2Z0MPH#(afZk+F7VfpDhVS
+z^kWxf7Y)vm{ker|ofniRHHS_m7s=yz`RJzcTY-aNuUBhG$*hLqRnjRxfIZIKmM)Z3
+z3q7I^j3>b6k)1L%s7@pw*eg-9K^HBBQ?ZYNlM|EII_k?RxXvm(C04IQQAMp=72NyB
+z=;k%n=zeGr=9>oFsrH6F7!ia!fQZ>I^ddWQ00p4wJax^9OQ;4<Y7NQ30=gU3>_31|
+zo4>yBxiD=+hUj6sf?HKS=6Y*ytUv(55Ny`41nMv58@QTA7WQ47=XR8KQB83%qeqqs
+zWB=`mU3jWL<~uqcW4#(##GrRPAwIy$AFI83_LIGO4njjRAlJKg;JUrEs)Jz>>)=%C
+zDh?yP+YZaUSgNp9QtIA#qI4=6j1`qsYc|*uhB^gnS7C>Z1x_s@)^A-8IQC-jZQbD@
+zSBzi3ei@7t%h$#;L!+zPQEjo`0Pz;>f|wJy%QTgDcwPr`;3&;%#A^LW(rQ@UNw=qg
+ztQ~(+0sEfG(pciMmFh09x5jtmmT<M^vA)#oqUKIMRG>k3L-NStTtxfsjW24HTz6yA
+zQ8K`Tef~6Mq<$^9yEml0<?y-X<~lFX97+k{!3OUaXwVJmLULsnaw~jaq9|8wIdd<H
+zQ0=LvQ0Ju;MvGh8*&ebPvN9QwI)2gQqFdm78B$WTlOOWDwN}lQ8MX?H`^zT;>3H~E
+zDZ1J=B#4dC7Gb`EM6JnE6&JLi5>uF^^WuQVv53i>>d;TqTMVqnghH!Mr@ooUC-lJX
+zw`&C10MBodjrQ`(?-d$8dx%@wZyv=Mf(V@+oSsql16_@vHwra;OLe|DjH?`+v140f
+zW?>y9F%I4d)QMj1I{e4IR7pSk)*)bEHbtS;`Z9Y0OF3MHw!)tnR&<4L80h8SPioLd
+zC@(h|M&@7I{A|u11}OhXgTvg6`0BvAMRXR|P@{DO-tY)7=b0v{n7bjAk3_!l;s=L(
+zJ~+<C8d<NX>{F!mN?fJz9=B;-*<n}k*XBJA{p`zE!C2pXoZtL*90+UCx;SS$K$58R
+zvC8b8l0rEhn8ZEudOD>)&IdUJXStMYL5hi0r7y<R6=H4*YlA6jqbD-r%&jdzgGmyS
+zEy0Qx<ubGg<vJXQ>P#+#8@jgKT!hA1Fe2no9T3VCD+X-0UvKMUc3^TJwpHzBpvHJN
+ztaaiI-)Y2ydT}eV7siXTtm!IBwc_>p>$&J^7wTz9=s9ml2=xJOTj<LkELK}gZ_d0z
+zwV2D++dc6bsh_p#hDY@!S*x7TBtLYYLd|Hy0i(LA6mLlh|C~a=a76q>VeXCP+$_s|
+za`r57kXdR>1VF0rj27<^q|qaesYM=Q58r_@xt4#TGhwIb6j{Z}c}}Nbl%&2sQPK{@
+zJQR^;4mo3X3PEJCgxg21I)&)w3)U#gmjbuks9tW<s&z!~)$ye^F?hI@Wsu7i=$WB%
+znz~sXrQz#ZocmyB&EQ4^X`N+4JvZ{<#rI0ucedsmF=lY(=M}6EyhDt^O@L=jF<;&i
+z^D7Bf{pn1`kv1K)m+wr517FH)sV!sHl<!=^!#(-4Ij$%0CpK%_`-eX>47U`-+=>2N
+zXWA2QiFcd?{QFLTCSUy-bm$G`p94&*!ydVJv#LN{-T@8hOC^pOjX2%mTa9VK2bZWN
+zG01BMNS&Kq*f^GSu^8uxBZNF#1oP!G>_M@-uYa*KZ42_C$^*_@S-|5jit69`AZh>J
+z2TA*1*i?G}Wq{89|AIx8rl;g6rzBLwC1fThCuqhdXZ97Jre>6GCg_zIm=qXT>X;Y-
+z$VXLsS6BrGCI*&WDvI$LNf|oI78!a;=`o2#ndz|uDyk{!u}PWcL*RdC&fEY%Z(*k#
+zdS?J11Q(DNVgQ~ET`a7PX&p_BOf2l3|KU^c#7@}`62JsqcS$xwAPc&}YkO8IUlyy>
+zCKHlPQ1OG3ob9u}&%YhnaWgmQ3~=Wxo0q30Av1b`<Ps{{V4xF&QG6>Olz7znB6>2Q
+z8^KsxH*a!l;p5EjK9i4c(a%-^{>Y2Piq-rU&<eFmx}3t0fN253i;82m*Dg)75E~@b
+zePGHxoxFm|{!ySPBn$r1JJcFSvwT1Gfj9ToNbl!4LW&;h%ORaq20D_GP<xQ!fl{}Z
+z6I<V`*#68O`tAVI!o#FnpAhdg&F7(cb%Fl>6qmn#1i<(HzjR%A!0W&0x_|FbHL|w&
+zClu~qZ;u;&NZ|%>pp*cFK*oQ6yMW<e=3FCZAv+rz08>ZW!qx=9gK`C6V*lHwo2;w@
+zV8WvCfIvr5w}jbLZ_mOX7CNu<rVENg{5BV?K%5&KF~MB6(NBdDD)j5$E}&=mJ&3;(
+z%e18tC!f;vU~s&}>2=-ibhNd}=jZna+&+vL1oGl!g%zPM1_*a1`B~6|6W0S53|Az?
+zedtkJ!zAqJt`tUd^V&XSG35L<(V%upWWv%7Qi9!k{VYebU*#RLY;5MrKY!sS*odqD
+z%(>mdO{Z}QPuyU&;p*8lWm&=4W&6jmpreB6O55aP^H=Wm37K%RYNa+Q+a?|{%t-ri
+zx{GbP&V<usD@uX-1oKMg6K1OkCw_={Bq`2ZLrYjdjl`T4-69XoX!J8J<4%Bqm2U53
+z-}ZM#l<t$HWXvkc;B(HOEff~U47xt`9(o-;?6dVF_LZkxIi#ThH5d98Yz5=ro$;xv
+z_v<1oF**dL%b-Q)@u4z*xvJndsy*81ElTwF+JsEHEGG*?zDuNWi0|RSVMeg0A%rY+
+zk%e563I|V23NHpRUpUCgW(vaQBYqrk2?)75EzkJB%^CJhGIVKkG`)Hx5HvCiiMahC
+zQ>MacUU;z5c%ueLVkg^(gi=%atP-7A8lr5fZQtGnWKrDAqrdB8Q8$r|0I7>aTx?2-
+zXV4T*S1aTcyo;(5cfLZ$$D)Vjphyy%2P--Rt!zQuUe7~O8w+?qR?YhomnmZ$%TiI=
+zWpCB>cFM^G6)3s;hbC1{$3t?kkso7>@MR41mAsH2SOswpHS&9g<kY7Qsp_|W0sV92
+zGU=JbmH<NV1n~G5d*ok{`wt-~Z{P?(s{XfP7#t<=7n)h*%e+|=+V!v_%t~lR9tBjS
+z4|&kFjMf5J;?bUt+dmXZNxQ?I_nr^mbnE=n9e5NW6hcTi=)~H#WyhvEt!`9iT~g=D
+zYKq(fcin~fIss6x31X_9pY?7oCJ~wj71t-1RneeE3NG#)dn6<Bhq-AsP9;0X;1Zt3
+z3rgsO?-%bD5Ep%kOPq0nc$=MoZ39PngJXE*zD0k)KGLRp|I1dTC<uvL23U5_0Bw}}
+z-<RFLe^(g`CnpPAGdcUeDpvtVGk{gz+2rqc^2s`K^ZF<wUo&hS)#t`}1U*dXN!<iS
+zVgCMP0rZTrEPeU`YVcL*teZ-6XxsE%x5L<<1iIn{#JBzMJE2TDrL<1iQo|`^mz;6{
+zu+?&t-=9Bkuz5kKsEh|Hg9>4ZEToH-R7hzlW+IeR!i?BMtl&dyF0fL<j3W#WD~Y-G
+z>%T8yQ#-i=pZFm*b(!1uPv8c$R~ssaDyFDQbT=5I_cBx}9TX_B1)o33V)#=i$0G<~
+zp3w#bTk!d96A2qkRVZ==EZTb1)|W0zz1NEpcN>}qretif72)BCub>0xa6ODUVhAgE
+z?^<+VD>N^1M8xE%NLBXjT3zO>m;J;P8V*xGQ0X(Yl_RlhWNateX+s!VE17-~(_<#2
+zm<w3D@H_iIEq?})F3~z*Q2l1wUX*QjgP+GDFbOA1>?{y$Hgn2U&^G%vaNiTMwOM*V
+zD|#{&)s>7v7PH@<XRGe@6yrM+7s=!~XsY=nG(ezu$5tya1PKd`F<%#kjWxa76+#*%
+zCQ$YI=PAsfA{C8!@@b1dMEcp4K^o79!?(~V#HmfFg8fEEDb>KVfrmcotl6-(1Ui*)
+za|+Yq&3}kc%|cx^kOYj7laLFO=#tlh(39-$;#<D=E_wfZQOGEcF&^2B8;1UMegiy*
+zgjrz^r))f^T!OmjvPBfwZ1J~>185iF9#(g#14TdUJqp;E0A`MJ2XiUlX`u)?OoH^U
+zpZ2&Q!R1^@*EVf(cyyQ8Z1!W{$Vron5XR6M@ciw-A%{uR9HUx<_}C9I?D+Siapv1l
+z^3b?>_!VMi{<O*^UtK^OUQ~w8dkf*G0?QZ>`EL+T)NR*+)P1%X>$0n?Y}8HY?iV|Q
+zCF+W3%rJ|wf?x`pbC8-Nz9Lf_fZn02_KVChKL}Gj{X_Qf*TK_OCBqaCSOI~6gNNsT
+zvjYAW`bq%##?}n5KI{zuM8f|DlV>Z>$RPtn9McXH1DpK2LjC3d&3t)dN&<1ou%d9t
+zdPHQH@U4=|5*Q8Fv8$Aq+TO9u?_RgS;bg;&eo41euGNB8mK@Gona@2Q*Xwp$4<j@5
+z+uu-bCwmc&U@<Iz*XJ4i_75R#PUA{Z$*@)!iHK1N`AK^^s-H=ilFO$*J8rvah*2&+
+z;<?COqq&8x&`ims>0s5*i;$!IPEiIHI%g(+oeetY@&qEs72V+FO~j4Zh9_jW>_Ag%
+z4ZYn8(W>Fl9kO~OyxB6DK`Yab2VGi|(T$d4=h42EED7UDyP+`O?tLhp1vQT*J77&L
+zwHg1a!?ho>7!l!vo|mXgi1;D23=J`|^|@80ZPld4(_kr3{-Xfv_IX0hOPDj6uy`2*
+zA?5u2bts`DXyfY}X2_Gt0HT0Wc*7%o#T5VA5k6^aNAOCC;&9LUgXI!*xh?DFqOAn3
+zB*9N(V7dAlqrhDcy%>{St<D%b&K{V9@<krJc^`y|{X$T(I8$+*<Ec7_0gDdBDq6Gw
+zclu@wyr*A~85rx1SbYXBA?8@7Z`plJJc5CuduTiwu-cGPod#>^#ul0gdTpRz(r_aX
+z)gV-(O5*Xk<{<Xi`|?gAcfz53grW}mrS?D5o`5=@5H+p6Zm%~xQg{Lx^RtPkwN{-D
+za|mmidj!2E=n&}<Jo6SUymS8u^@=f0j>H}AryU}X-b<joqNsY1ku)vYVj(JSk(3A~
+z{Ad%xBX_JE-J$zEK@{qBU{Q`sloK8Ht4KP^+A;qI_l@Y2j$!5O^^w^|zf>cELN;_N
+zAt_Upft6KZSEhkGA@MPVc@x|jYPeiK=8lmY?zS-v+6K?am>C6M5UB8ghahr+U{fDR
+zF7EXo{8oR(`Ux@Yofse~l>)^3e@L?aVYdhD>@GF{>OO$TZ1P`Q{ol6u<oGE`5Jr?>
+zxi{v*<`zvG>a+f<CYA5Y$pK*j3~hDA@6K2y@#(@$%x6~ZRBbmv-V}@yQmC{68XE^W
+z8}FOQcYki*z;|G#kf2tW4Aw<9MFM*{j{{110^aid<nYVU6%ai?l^qaWV?#iLr8rGN
+zRdS(SGlz&vz@1SnijOAzMTIKb#*PgMvu}cS22-gX1Vu&=?*qcTQki1PF|bF2p&HY|
+zAI>=S;VDxKq;`gBB+Sjre`zB$rMkbDz>rDuroS%PGv;X&NIVv!f)@8oD)-j3->$z+
+ztds*KDFhh_2It+!sv%zZPW_q?9ye-f6NdKqgf>0op9IC#$$oUsneUvxk`~at_>71l
+ztz>gKgj0PiXRMri%P8icFw$X$sbn(SJi+wn?!277MQP8i<JoMoGx*-v05+LDFj*b}
+zYvnNSy3G48`34`l`PT?QHw*<#jrd>fKvK4Vp%8!DhW?g;{KFx<scz+ta)|2t%Q#Vk
+z3?wA@+fUWfj5uQ_c%aDHCc=WE5PodwsHQaoH)(Ko=JoVd(2F5St;<c_SvFO#dWbd8
+zpOQ#|T?@K(1&>Pwa$ip#Z`?j_+qu;|W~Q!<nVWUteDBAZ_u1DQJx=e_S3_Spen9*`
+zwvy|?+-mYj2@8>pkfbpQ)uSZt?mTp@b#ZjHOXMUl;Ee?P5iyr{%3#3U7$1Tedenc?
+z?@mZNw@UB*>R<OF@m3l3^yZ23GO-@;Ve0v5cQ@8*?2Wx`(0?6r%QL*8_w#!Hd)J42
+zf9%T(2R<LcJ_cUWjS;3xUH=QDAGwDIMO5zHvjJx8j+ylPJ=6#Av(yV|rH68VEkI6|
+zuPU-qKk~Q2J_-v;3|dVM&bO(xICGT~bi&z0G{0=Th+jg~iX?wnQtvmvtREg`Vcs%J
+zd-I)gb?zj~^b6&0uNBxio2Yx^7S=(`6hqU$RUT}_2rr&=U{y=Ck7)Bj2FD<rRoqyj
+z@nmz+mMVHlN%jeCcBp1O#0p>H9dJ0c9`a{2w6q;3>tltEaeI3YGL2~hf4(wwxGLLS
+zXwvy})B`5nJ<kB!Dzzi%<8Wspn%{OD`NPv=+8P4|;!)k<ZV6R-E*I-Z(fao$A;^B=
+zx2m)hj0Nk!XCS7*EhKffL<^a;9u>~t8@e0*{Z$8At4y7j@e66T9l)Ju_XCS{8_JMY
+zm>%)o4#1Tw&l#6b=VIE5w6m(etZ^$vo!w%OCbe`mx9uz4F!!X%oS!7qQyYLuMWcJy
+zs=6**T(q2Mr>meQa2GFq1Td*2=$lS$bQ=yuct;T+W1;zXw!h#{HL^N3rFIjDZMvH7
+z=lUklbh$iM$9?o64Jq_N0Jo*5>=;=`=Xd6s9Oh6@d1`&IZSnc!pi7gX4eKq<g&Srs
+zC(BT-`C@&l)@t^+t`sZbv6Lr*tpNfskSuhzN?eJq_~EAlFRh>>Q;=M0pQ_bMi(D?2
+z8*{jeP1=i#R|_gr%JZ1pf}ak&`_H&sRU@Mf+dC3$*OXv#`<OqoH%lsFNjD2I*<1vj
+z7K&`5u^o77whUG+tq~V#kz}bk0=KE!z}TtX(S)F;4aNJDdRq$UwyikeOp<dsoe%T;
+zlu-v8r{+nTx8DdtsM7j4AseBljb!_r+(rBEp>%sAp?pXBPS!Fd+rSqsMLP;*Pg;76
+zU+H(Bk^bcE#9jpQ?Fz<Rf8HtFFm-;;xQq0ObWzp$5)RcQ#fP1<J+6Qhc2w-Jegvm3
+zgRvDYV#Z)CC$``b=MFBK5_y8uin}ZIY0-Sxe5mwqgDw~*SL`5dA+|k%JX!vXA#I7l
+zDOm)wpPD!m0G64sAb2Q2r}z2UvDeLH&a$v(L0f8#F<&-sM}H%Vd!eQ7@?eeX?pXoV
+zZAZhMpGkaGR$7^=o4SD+GONkm<Nu>NL^m6PM|3khh&A3L_M|=q#*7{P)dYFqS7~n_
+zDF^Y_t!@Pfb(6ZZTUN%?G@IorkJM5!<~JyJ$KB#PU0f{aF^kjEhZf)%`aeyF(O{80
+zy~;f?4(O*FT`b^CF@|gyQBCo0As_j!Mr38Dyve8=b%;?259WsqX3=Qz-ZUmdWk)v~
+zLg1NOW;Q-TzKRZ`d$+H<B@x!`yygPNpK+#{x;jTpW`>F3&#E!cPoyxUKQRU@H|3Z%
+z2s5uo0$Wq0&&Y~>o%;Ih<4rq^fIbUQIpy$OtDPG)lzLGdwG-SR@#aP`+1FI5IF0Rx
+zYNl_${HM3H(gO+5wD22;nd@u2v&81g*&&jB6I|!ywj71siwG$Cm4cs(`}*JKtap7Z
+zuJT^5Jp-ibIvWx~QDYl}%+R@BNiOk(DGmHf%=b|w3k<=Fe{%+fn8~vR-<i*&6q(<n
+z^#4AaMNt*5grv^BCD{@_PmVJm<Ob5<j-a~5V2em>lgtvVcE^d{gM2`gAs<)geKN$~
+z5wLa(|6YGsj5pX4${kisPkjEguY`$B8r#Fi6&(>;X8|{EZ)|enQH4bpofFJr52rSn
+zcQ-U_Q6-Bnb{7jtXO}gUfdmtu*Idfnx-yD~ASZw%m-tv(uaPB?>W<dESLGJy((^P4
+z`*v#q6K4bb-QG!mA3;NIpUqN2${kB3vCPz`QJtJ2JlRQ|Z*qFmo=feKs;5W4;$D8p
+zDTiwa9i<GJn-pA<i@P|_{6#Wna+K1n%bhZkFKhP~sZEi)KaPYfn#ske#Da;&iC1+;
+z-m>b=9~`zfP4>rEYy5)WE?D?a{xiX{MRvX>T)=9mF}*aK$X=PIw}`4*BE5?NrnOdY
+z*qNmYPG_HfuZEWNd4YKePAlA@T#_Si;sY!NG&We#@nra>f&nE0U9^9CT+nPZpxBB~
+zo1X7w!fN&x-oHrXbKv`3P{6~W)roaWs=CGN{ZLyYml+6kM;va!$%ZoB)w_Zd_iVJ0
+zQg3qHzkeZKE7JVA;_Qmt@XK;^O=~DXdDcg^9TG_R!~@%9)(!azq#7EDzYpwn{*CdX
+zu>r0CSs_LXQ7_X#0%zD%U*688tiuN4U@DM?f7^6*d&;CyzJsvXdXuLvZveF?5KK86
+z2&H5ns%8Kat-o;oJ*0G(f%lA5gR^B9qb4{icK#We@DKI{hKUcPZ7Ds~fV$jv?awcZ
+zA0Z=xcmGIx`zvq5u|lh#0_1G#fGVB+e_x~gYju*WVk0*%kK${){9Azw!%pc2Oc(~+
+z&cvSp1~JPJ4V@vK@YV=(isn>v&UG+%7k)QVuUFjg<sz0SXPwQdPI6bsYli2TbEf^d
+ztI4m%_Y+*cHztbZ$oSz-4gQFfW)z{G!U%E#Nmo)mK7Q{VMOQ+7|HcJU1QHubm)Y3{
+zBW2fyiNx{M2fW@G{|v?lbzsgdGa6*`wF)<_2(xU3b!uZ7C-7RR_{4`*J7jXJ-fTs6
+z%ofKg=4cfzP_cz(lQKQy{47YlVntS``o~&+c_r(-JmmUpl@Q)h;!#@%vqxg#D8b?f
+zF4$XKXE4DH%`owu$zGFBdoKgx^=ttBoDMelGgcXn1$l<0rK(P~XN<vO<j-gVrFORc
+zt-g5O`-p5TU#Q*newT{bVOlUqWw;mTdJSq6k43U;VB?b-EElQ!4DQ0@FWlx+%#ycS
+z80=e(H4@8qOZM!H9;2I<QP-f{;{_<D6SW&~Eu<Dq)$0``ft2-3YHXXG4<)26DvDiP
+zm%}MRM(d#v8jBj;7VS+(*cp!BKa66B2vDMScm~|HmpE*b^6jtN+g$7O9AShMiVM+V
+z?Vzc2be;nUSjs-zy|u8FUA7WhH%RpjFl=M(GMr2N=>!4=EM`;+E`GzRO^QViHUEY>
+zu2D*)H~QIQ*UiH1^WcI)c#~4N`R!6!)1oFWi#PNp5ELlz;c8FPHJC6V`J2B1H)t+D
+zmBPtK_Gm&=&14p#1JEt>53xJ)4m!fiY1gu)A?Tu)9xq#A?m+Lgh^0tSbViEVY|y^g
+z4jhJ1h4u%C*w4hO9Y~3dd(IrgDDTn}!+nzQbQ`YC#v5n+F~Kfzxf$&Ovy>cWiqd#B
+z9C-g~eG6#>&ii7Cgdms~jNn15CMbhxb?4~@pgfT@l75_3<k9yRi^-RB8oXI90S{><
+z%7&y>^d_Q2qG(CJ28B0)a`mATy?@s14h$E`cL6KJ7LZ5t{cl!?imlcEkVSW^Oeg~C
+zcpjcH5(6fF2!z|<Fp4n*h~0dmFrwmO6%@_j2K{9crTr7*kPPW0y&FAkanx8UbYK6k
+zo#EyFXl(Y5x-On{C`3V0hux#CtM%us9-phJgU{>M>u(1RS^_ZpP+SbZ1uC-`68jH^
+z`jP@HCWReXBdlN?SNC)9hH!*F5Zxv^I>~@x&Op|eHccW^Cp^;)42K+|vv%(aijSdE
+z(zRSANo~>9q_t}IM9+5aVF<6VV8)WoKEP%)HrO1ka;(<CafhHo)kAg*Cwb-SV{!@N
+z!RFbzMZkG{vg$bnyoSt{F#9KD<0H<|C@YiaO0Ia1GE?Yu4^Y~gr*)Jr0`*tCEEB{*
+z<Svd|?&o~l4%1^kQ?qE3?2*!PwoOj9d~|gkqa`I;c@){RSM%zOltRv{&(^mR;=Gu$
+zEn4LwjPU2SEb?sEqZoDfi5&q~`_7Dp>=?Z_XM8Mm9<Ez<4NW|h(z<Ds1|^uHnn3dt
+zOIZ<Gv)AbbpXElJ$a~RLp1;W_yCQ5!lphGn1qD(g3}8g-^Y+Nl3fqPlo@eI!7#301
+zzb(uYq}YfVzwNT2M;NedS~7=Zzyb-8)1zJ6deP|}s|G)PMh`awE!I;r3gh>~y{U)9
+zp}^*=C^n5gFOc3LiWm5>)PFWn|E81f(KGrU*Hq6F)O3N@zxIN6fXfvZN0b>L&HM+E
+z=^ZrKN0j|NfcFWt^hCN6N&lPKH$PH3<3Ezxl&{nZ(qRQ=4s>l?Qo6<xyUWd9L`3~P
+zfYCaSEITF~v3=jtq2n4_Vn;KHcdlLZ+rfMI$Cdk>4vG_d`Mm8bGUUDDqay!AreR$B
+zo5nj1qC(oFF06@|<10Ac5f&1uugDFq)^;Qysi>Zb)6;#|#x5c_jZ9-p!R7n5&Z)Tg
+z9iLBWs$2ziAesLdLlh+2Nc^2EQf2r$Du^+cHd6L(043ZA%~JitXnK!D#Uq>>$<W%=
+zfv4)@Un)={&oRvefc}*ZaITR3kE`czRp;OJUR5opc~yizNf;CLB1kZUyLbftM#vjz
+zz)3~&5Uu>;{zVc(c_Q^HV#@K_8b@>Q-Jj5157mdo@J&knfEJdwK_Rm@@;9M1UolnV
+z)ds1O#PI2y#hgt$w_iMW_<mn+*#4=vHaI^RNR7B+*rZ+be{7xf!k7j>l(<il+JoFf
+zZVb}ix=RhOLvDmn83~B;#!R1;2gI=ub`uvBxYG>hjo6D(Y)AJYRFFC>p}<RtN(_4;
+z8CM>hq-dnfvigd3R~}Kt*dCOyn5henB<ZrKlp0zgJuUshEw_bTq&X_V(PEDrAombd
+zxHL48V9q}MPKvjNP>033;FwO9iRD6!>A<8gJMN+7)+a6=vZ<soE7_8w7CcsEnYkbt
+zc5d3!z@NP$&JNLGu9ZAjbwwk|u>rBx5ZPW(jRr%T%KorX*4$K-5$v$JK(;w*i}V{2
+zV4Y1wQat?@#VFRe2quJ$mlltJ*$kCIfhi}eoPx&UrP+ntTis<jS=K`Ll*44{VbOg0
+z=?kPSU!yeAfXTW?b9T|6gKkt+n;$DBDCc9}(hD+66N`pBS+lCTK&ZQrHKqb=BMu)#
+z(NwFjOk{1SK%4v2Mr=TVOElf9dFIINEE{JfBlbRT#iRtxk?u%-&xcKNRkG-PUXI<|
+z>^P)vswHSQqwHLm2MO*x=a$`Acv@G>nlFvCWHC^81y<iu`kez$>r+h)LYy8`vzMfY
+z%Rp10-;}-eW{`40uWV{XzHPuNqrtf2CryBy*!<T(s?;E5rQvb&eMg>`+~`@{O~np@
+z^;{F$Zh@w*F$&m^dMQzjpMl*_Phn!B=2TEudpS|>P<Z;%eeW;)f^J4~#@=N+#NLx|
+zOWLvLCM`b}3)Z2Y41NX3-IND_2)@DOMqZ*nFzQ(eZtLUIH)}!7Vd(E3Te;!7=ou>a
+zsl90Su@kv&M^dSTdOPmMq_}A-PFC%?>P@P1dEuw$bb7|{K<R-Y8Fsi?)X%zf!)u$4
+z)urTO-FXRi&Xgg}>zsuaLxqPfFDv+CEC%EmaamJC;HpTGP8Id(&s$jV*eVDyM+Wp&
+z^`!+}p8o!7h~ZRKAtgeC!XbonimNV6F+fPnD}tU_N~!9^a=pLr4BURBNC+^|FKn|a
+z?2$p3+J3&z&9XlP*&45Ll7XUobJg%2CPngyyCbyp75hP?O>dGTIL<A!zM<5_CqQz~
+zyu>5WR1)7v9VXG{Xb*;qglC8y+%|Y09zIDQ22;atF>q1n_vbBqYb}1?3Et5As^|-)
+zV>S}+s3B85B>a%Om{GG!I1+|7B!1^Q{gXTWC{xWo?IjFKi~+Q5P8Nss&L|1BMrF!@
+zuU3sRJ1^BzmGdfSiVNtn-YU*1k|ODSBTt3=yz83^Iq^bwNMcT+l{OdzXCi8{`^7P;
+z+ad^emV?ft@|1T~!*V*7YX0eSeU9Tm*K{d_QxulLeEe$Ipk-bQf1VI`4z&K&4X^~q
+z=EB&UsVrRQO9m%rpu)^pu5SMtvvb3#&VH5dvlE3zJ)O}2&GLa$QRBqQ3+~?PRgZ~v
+z#uOQQq+375DbyI=4BI0@cXUg4%@|Y5!nYg((mvJUl|i~I&(%;Jnpt00!#GSlgPdB#
+zBaJ^g!<^dW9!K`^zXa*Q#%nzwhwLL=kF|lbM!@KsmHKpDLo1m3bY)vkiqoieFNj_>
+zU0nOAUD=(Y9A$e#aXf;=-(z8gGocnb*K41Pk9=2J@ikx4ZO)Dz?++645026|rqIT4
+zZxW>5rLpe#$I?fUiv*`_=hLxziQnCaeel3a=~p>?G!sujYFKb}+HdQ&9G%HGyo~3Z
+z3OrCHAj!MhTJ9{73{An-DVA!=WNUhn=<yR5>w#4yUsn{jhP1HF^2grxy_4ry)jIyr
+z|8q{1Wvx9^3Q&7X{@t1SpYJjMKaygyqRwB=RGvnSMpqe`ri?weC`wUETNFJKB6EI}
+z0H}EG7dDBI%TZHRQ*zR;!e2#l!MraZZ-o(VY(R+67Or^H*`3EZ6FhEzK0ZHTb`bQu
+zjq6SahDt&cLTy4W%9ZD`7>z5uY`|L)pFxFsD3bv_3_k?7?`4J4hfFsP6*8?XuJ?<q
+zdd7kbcAv&Z)i)ioAvT#dW@|T^6$ROea!3LwMyAw51<E|=kp$Qi1c<Mm+s{^c3p>Vt
+z#B&XJS5Yh+iNZ{^!|^0x9&J68t2~oQ{X%^-644Cokq_A|So1#E_CRnz1*a`6hB{ZG
+zo(}ETzCBP$p7a*SRyb55iMpv9_!hExW_&r&u^Gf%#i;xzR3=*UmfvltxJin#XCG$;
+z(kTrvpDuXU{7r=cMOUZek~@M9_SFR|6=OV6%z#3MsGZcapY9?x*vO1Xji&=F$e7Xe
+z$*=EK;%DG$lCjU%Pk5ALQP7tch_)s+nxeKaIZ8SM&Y^-SbQ&iU8ehSasG-$gLy^S&
+z;@r`y^(iUUr5~`C@Z%;Y)&|p$@#HiJzGT7%PyZtI6SIWKQvs6UHiZ9pr2m(0Z2S*`
+z|KIg}wZA)3*TVn_*KmV~VHJmd5KSS6jOKSlO~AY=#vPKP;T4-Xpy(m_e8NIRMvKH6
+ziPR#g1Y6nXWIEf-hw{q~-wto9+&>|{=c#`pI<C8!k&v(~-+s0O{1xl(IZiWSejmrN
+ze&F^nzZT;L8zN#YAq?6<G?G-R%)>l0BcQZ|HrA_L_dGbV%lc7cGa^_~>CI1u8$#%`
+zPY1bhQ0ZOwj9%Pv=*!(T3RlTlF8at-yd{O8CLFvqt8&Bl8x4I#%)6*)_?E+G1`yZj
+zA-?M=-)iF2T4D62a^0GEi=23?aBs=qmIT;(EjC|BJ`TQBovSA!$(5u;vl8n$RXh5w
+zsnb%Nq%}*T4peiN1T<FLjda<pmL=Wg1okIgCf$*aP^3(K7_N@<S#YQ{y3grqFj5Tx
+z4zip?MCkp8jpnm7mBu|!vBjmG#uBOIcP%+!U`eqf)MZApEJd5(s}pm##MLAf)Ew{@
+z9GiVAHd7TEH|@S2>BN4_W#_2i1`Q0}S^~#8x(p(Xg7orgnzU)=z3hO&q;B)18SEI+
+zr#}XvVvIr%!7XV}f=m7ZTO}9949l)BvU<r69-x$?7fCvMbv~IwS~dYq#8(L_u(LMz
+zaypAOsg>+ugkWQ;SW9Z>$~f?|_?=#!1vJ5VmKUR{$~0GNkAJSFV7{XY`1P1}9tjt}
+z1ld3q1V-W;V^+T9sK}K;U0GdOPN~FMGIJ<2j*BQIsWw-X(w0in9u|~YBXsq`;jY))
+z>i6JEi8gP^c`;vN4NQubP79lK*QAWIxExD#YO|q}whK0QTBnvwvNmqC4UXxXfUWkT
+zujg@N;V@$y57AaF<X?PrJS0g!FQgDAl(kCUV{mS`w!!-Ah}Ki^<gkykI$_tWX8vZq
+z_WAyJ9>j;8=k=`n#kX@7({5Os{^%ZP6G+<o!)ej<GNaKvr)AJawxt~(QR3Vk!!CYS
+zCV?#a42choD~4eCDL_a^3=f`SrSa9U-yzDSuR7-YEgq`g{H=?(&=9+eH?*2dSF|0q
+z_%^Kxnw445$qQUh<(}7vt#z@^(6h_OH$G+iS$wa;(>_bO&9^>8Guq)}w3O9au4zNb
+zk=Pp}U)h#)(5$carkLEFQXEhruIU{}T)@;|mk$_hD&Ly@K#tmd^cT_*r}^&VU<%Ab
+zPw>(jnhf5fPrQ<cS$!7@o%&7Z-(Av0Lx>7#V5q<59AL4ze50Ycd;_5`g<I;22(l0l
+z<(g)2r&TAuwCjmAuSDm~Xny;S1C0_g3*i;JZS9DQ*lK=n5+l(u@5+ltoS#P;eJ`%7
+zJj^qhIWj`vjE^;2%WlmDHAU#O{y`1y!;NJBgZ|TwJW~(a$Yrq#h5cCTyld@`6QW)d
+zb&Ub!gBJ(`1h7{iIN8rsP~6bKr~rM}W?A+%Cx-CB$f0n@bf<A_+$0BlKU1<-5RRyz
+zwsiukD?yCi9JP*mzG0qg2cs_pmKyl|?xgMS6rT@ycL#?TG8C)p5L4U2FI+?@g(ybL
+z`HE3W7j1BtqqNRcY15klH9J((iYvuCwI><v(Y9w7c+oiBKXbIiDKMf-3VL)k#T6Z9
+z%xT`egca+R570aZ($?GVXQF@n@=_z>oIZx&dX**&=>E{i5ypQqh?{xd$CKXERp;<W
+zpN&O#K%gg#7AxbC07dir6<gqsVagc9$UW}&jV#<dD+Tcns(U>-261TV!FpV86fy^-
+z_$gx+kyt6^xpsHr2zHf>;-2$PVwOX+M7Fb`-GiL?bZFyX(bizk>T4JRE8!oY_wD!=
+z;N((1g2u;>($5t_#?mg$oo#I+?cAPdl(CD<m?*EHSW!@&gz?az10_tJ8@49xy&UW|
+zH@Z{~f>h-u3v|5gw)^J|*oR+@!P_uj#8@FOYNW)S<RfsHgnk~558r;{5f6W7oKlLv
+z<!Bt=L3jph$k<V0z(7oA!|=vpPUz#Ho!ONj`h9XtnG>3+j;h%RtD2iX2zlP<8A4t_
+z#j{GxZf`FuFZpnaAZD5^DnrFR?mTQ_C^3^4FAN{4o%aLGsck3m4NWcnj3Ik-d7;zi
+zach$~(PRd%Bf|V(Z8+O6xR$j|5~=#6hWE%dtPNbfoUnmF(CoA+7Bbv_54;##hjl~T
+z4CB6SWlm-9KoR6Cl;YNDf4_E4O8q1Zy5IO3p0WMvbYr{jiw*n;IS_HxN=(>nb8z?9
+z0oyt?A>#Bcly)BX3<>=h$$ZX0Nf5VhhkN?q5QKs++RUr;A*mC;a?{PymQPK&TVan7
+zJfIzprEaIteX_QIE(>8u9>VF`mU4&4t8PV^zdJr}+6@e|5MusW{T6y<yMH3;BsMFH
+z6*GjRBi$|)RA;Y)<XEIz^I<k@p582&h?EgsaAAv<60s%K;&RA$Lu{V5Q$Z9P?pu@K
+zy(Dtpm1v&rsqRe&iA~i%HUa%5&_)WdT6+UhEoeZh#r5w6G+>UsrHPR<;OXy!?f>E6
+z{TCZ!c7l{#KR-(F3>c`eH=q1K!9_197P8Aeu|gDe0SU&l(2o>Gn@|`K$S+AXGP)0-
+zKNR~Y6^tvw`!rXlS)AJst|fNY^tIof>b3aMusy7g>XXGNLoab$Ay$zQp?pNe)vVlt
+zq?J0d>Nb!Ff8l}a)Yxh)vrlVEaZUa*k`%sQnLNqCK#0*)^k^wfJ9k>Y4c=6}`}t!{
+zJeQjGC66-DKiIa(N-2cc$k9bw{qe=j+<SgmFeE72vih-Cbn;2#WEHns_$2*gI`)Kg
+zS^8yzGzobLJO=4DCO8I%DpW7L?68~faVd<8f+&>x=UR}VpX6fn6C^rrP4!BI^PTCr
+zE|t`C+afO1c5?}=y2{oKmTEU{RN;mN10JK_s1<B~pC4SbJx5@++jq_SZ4PAyvnxI<
+zO!)_clIhHJo201eOP;`-Ng*gOrAA~YT<8+CQlP>}WN*j`M(x<$2hB4Fa9SUsdA$=!
+z;EWuRiSQFk;EZ$;YRIxzH}dkwe=!CzS*x{30whIHfG{HZ@BisP{DptF0SXy7nE-~a
+znAkd5I0I%_|7V9#vC`jcs?6RrJBINsFB(G;DfFGiZ-xZXl7@mLmV)!oK;T)Xt2VBw
+zfFWgmJ42}%FZ$k3Vwl%7*wWD8$U<pe$J6b{(>!iZ$F+9bKrA=hARux~;-{oPdAgHe
+zm7Uux^K5s@fBJ+NOL0<h7=|TNlf&G${78bq);Sz?o0rh@94W9<BH4EN-p`AeGxtt`
+z0nba7yDOme(y;$BcdL>&Z9;#O#BAG{$h;fg`v@Sl?u*yjKyRle-E^FL8d+V0=hIgI
+ztfuLg4PstU;e(h-)wO^%N$kT2`q440+wMg*9c%(^W<3=@btqme#CfHWr(K%=t^rIF
+z17F^lj}?ufehl^g{-+!Vbm}n7^f(ue4q43Xt;nF)kYBvD<yBN^rr?2|Kg3xs8W&Nz
+z8L9f0jtdsW`WvyHRr@<}!T7^QIeVO45}vI=`9_Z{Q+yvQ@^|wz4p7SUPDv9(WG(O<
+z#;%WTMm@t^_QAU53gVE>M@vR)(b%Jv%P8FC#17tpr-<)G-!pXcFeA=SB#;7m*~bgu
+z8Q^MM3bG}BMAE?Gho7n4&>z?vTgaRd$n9~x9^v@I9^~gjN??%2Lg12T)-KW`{8)R9
+z8l0AXzg-QWtVQGwCXpi^U}k8?Y*0N;N348mQGlR6bV%fubz^XVZbh8vF34~z$go2!
+z#E+|9@+D9x{Q^s9Oh%`l{uzm+u`$$LCye&v;1)+b+)(%<fF?FczcQI(5(v5<6p^>+
+z9>Z1WgE&d>9fQ4}mt#y<DCWvHm&UPt`=5(F3P>FlWu$N4$^jgu|5?KOTeSXN!qb5C
+zR$grX>X~#jv!z2I0s_|{iZmwmM<TEe35!Vh2Hpn|mU=*jnKl`e4v7#<C0VVRT7e37
+zu3OwvLjlPc(d<&Y)UtNzQtwkc^Q>#L?R9B&eopr3cf6H8DNRTAG!pAIodvLqc%OfH
+zA0JG`=Khcsc6ym2xXk-Xoyk4CM}PfLDf|U?di_u@%gdEN4@Z`rk;XbbFOj-bnD|rR
+zsX?yf6Uz$g`yJ<KhioCIUMVme3tqkwV(jFxf_B_YVY@tUsX4c3DRvu0uaQee?>-A&
+z?YuD@n0vqnuL>`6uwjC%+U>zNx%ha)*DNw(B@k{{#k+@ZGqW$w*;HvJ$LUz9C(1)O
+zJBk()2TF9*R0m3wFs6{(RIih0oQoZtuiU9KadJP0&CZ&FjxDsS=b3V9Z-JxH&ziEV
+zoGT7R1e?_NNx8C#Rn;rzJ(wDUQZ2kwWYHl8G<k`8Cx)n8n4DbwUB~ID51eAAkMBI@
+zw90Q^Uz>91A#SLm&x_Xyv})jPu;RUJ{OOanqp@n|Pnit75z)o%y4wo0JrA+$AZ~^V
+z)DmT@y~7{az}*wo%^Igu@6fX8jhK72M37zzHIC6*fH$ZTZLnII5fkf~u$uQ=5Sioa
+zkfe>&+{gy%&5fAwVp<l5xVWa;(xZl0;h1I0nUR;q&HE$B`p0f$sZ+zsdv&whZL#NH
+zA`8|F>va^o9HTMi)NhB2(wkVeVsPm>#<YVhnkMYOD=GMJ#P=>eS=)5U$OxpaEfxKr
+z&b|Vws-}Bix~033?oLs<5$Oi$Zlt@ryBq25?vm~nkZwdu;(z_rpT6kl_pbk0>#TEO
+z-FcpwIp@yI*?Z5kQR{?}v4j(Q-$mMVo(fb}m{5J(qtB*!Q@&&z+EW5pBk34{OdT<9
+zD9p5`N?a?0h`>IZRFTLp)~GVy-1DP>tNBb-TU?-CXWrurCy^<?_&!x%UXc-}AV}40
+z=BSWGA4x_Kogp-6zLWO&)hR|Sueybu7wH^^d2rG|DLb=TBzM!?Jtjl8nLMkvV3GD|
+zZDDQwJW@qr(z7*6;X3)XcX}{Qh7=BAtj{9nN^efgi+UK)ku`zgrX1qh=w;`$-}aX1
+z%U%OF@i@$lt#IKK$?#*ZYr%SdrkEs&SvTIDU-M~T(e7Bk?^!csZ-^O?m1#^HP(?SX
+z5Ks=79-FS14k|<DGp(VVF%_CgJ}tks18*6)pzlt&fohyji#!ycu;w5da06@bmS}yY
+z+{xUgyYYr9Zp%FPs!rDw^6B+3$jgcf80?IXLCeDmlmuEeU?iAwRD^+s?9GR;B;^})
+zc})J*z3061Ahd2&3tl0fO^QU-+5jz;p{4*jqq2Dcn{w8zgF^;iehmjsM(Srou`l{>
+z1b5d=SrF}08-g0@rzIWLX>8A2X2uE)sJL0V3LCj(BR99;;&Y;6lvzv{v>a^)dBA}^
+zQ$)n3gdonWoCXMl%z?_Ngo+|pO1j|m*;qB0@cg-25UGOnZEa{xU94|7#-g600fq8X
+zBhBy37?M<c2sw!C>FT0uk)_|x@|g!G^JC<eU7QbutgC_!wCJuxaFU>2(e9BI)eR3)
+z@~BhT44M+*^;0V9go>Q1THXUUJz##OJ~w3`7;Sak(rF%C8R^)F6(?U&ngg0q<kQcS
+z!jHSh-mh=<${2(BS(T5UWh-Q{=gg$mk$zH~3GeJlYFhS~Xg^v*!J6Is`qDJE^V5%w
+zBTY1DLOwLK14^3c!2-qln^tuZc0g44VNh1qq){a+jc^j6ms7e#he1o+AA)>hX?1T^
+zn^aVL$TlF%s?~=3?Mh@`=%ycoz@o<oY7Z^3L=9+BelB3*Obu$BUos^@n%o{v8)nYd
+zHAEm61d6D0zGxo=t2_%?E5?zl&QYR9LAxFa=ManW?J{70R}V=I-l8tD6IxN~z+}wc
+zaa!T6^d1Qud|A{U)7ImNeh0?3h*vX*D}gk}q3lS^&W=P&cIcqIZj4=P?2^N1jPR(_
+zA1`8b`AIhr*eDb7;cFza*5DAVV`c~RW7Zu)r<ekVchPSU40OwTm%%kh6ax^PKUT#T
+zIQ1is*5t%ar;lHWd6%ubVriP4ur#lJ7(J`;s9!2)ys~k@<;$p?_^^Kso;OIyHcVZw
+zS2nr<`mT7%VK-`c6MVIQ7SjcJ)%1ks7R=jXbJ0VOWC$tuX-|~09{B2rCQ23;?2C4L
+z;Iipvi6LrS6!%Roo!Df9Si)ya5zO+2r2&09R^G=*nSF4t<}7mrtrIh6d0*(BEZ>rN
+zA0zTF4b@?~;ICSofVkv$z)viLzwFkWxzh5+M>KDEiW6f9j=xowqfLn2NMhR>yZPa*
+z)sUBW;udU`9d^BF;9LCIQAN0Wte0^UlO3OS?21Tm<3ITiJiolxKiRkyh@-4It)HjK
+z_wAJ;qNfaky8*kK_>kZ2A@vE-JAI9e*=;5x{Y2W^**Y#C9>Lq0WWAXQi789j)1a%W
+zqwh+^`^y!FDI>pQ0lsGpIc*#m_)9uW_8Hs&7B}9V@az`@<fBij&GbRvnkzz#?ApSG
+zRSqe%IBbP<zhAe^nhPPgR&5McwY(QDiBl%(3D({!!@iBu<(Evw4DF5T(H9rDqSh%1
+ztQnsYsgjHqNjlX%Ew!v{anRp<uMEB{QD=Ay=iN3yXL1{)+wGPY+VxQhCs?R4I9X>r
+z2Q!RsY{ZTU`tADK*7}y6Lop^{9FNPOM&Uf8%?ufM@u5qoCd(BIqOSHpo}M%7TMcP!
+zpw$-a$(BKy<RLLQx71Y+Y5x$CC72PcD8v4EZ(n{u`mkr6mg~!Rfu2T3`E7h~5J6IB
+z&lxNnEID^-wCk@^zUX(zof;j9c6EF?xC}dso@~m|*m9gq6;Z+UUO_mBb{OXoOt%qQ
+zRJ_J<;1k_uLk5<S*)+vb`x5(<c2iha3kBm{7G6qkd`w#LbJ)}zcGSe)hSfcWDp!o2
+zk+IpH%;P4TDRW=%T%KVRyVA|}G3w8ZrTf0#!a(hZ`dJ+dsdC}0@8DXbKkG<{7N~lv
+zk7?Oi#9})=Pi$mBi>;3-jqk_q4x?p?>L(OwfB~g~P(Dnr3-s%%Z%|LcmasLGWY1KU
+ztDLA=!Xq3{&FmzhrMzWgGo7tVh#b+^*8NP%<cy(spOOzpgJV`<H?+J86RQvuuGm<V
+zM@228JW#zf%#v<*?6PesrbfV~(^f!R>w&1aLPjx^^G>RF;_?%c;<#|FvS<t&$ojsW
+z5lRJU?JXkJLY%3h7BtAmzAU&3!$D85AjaHY=*ZDYQj)n{^NMY>Im|bi#%%CU%|T^V
+zpU+G;5K@0Z)93SkZX&WYjKldU6>^w2ZYuNL*6my|E7CRS6>sCtYw|mGdQPgoL*cl{
+zc}PR-b5p8uz=lhWbI#2~ZO>pyKO>R{yCT&@gOBaHEfh1SqCA~+K%cd<41wp|TJFNu
+zg=e4Qe<9KRfJ(pw>gVzK{cKdAc_KH0Y3q!LBCt%TRTb&0_gcNBpTNscWCxOPr%HDq
+z<M#_gB<3<>r8f=k4hcd{tlskDzmfBwC`Y_97ECUo#-1PAKNJjBW1r2x3LX4F>W&Va
+zSFIFixnwK~h@uB-q|an|rZx?CiyXDGNr!KXb(ld)bT$cE5H&s&jm^ohoOe^V@sf7G
+z(4D8o*E*hz5`!+D?-mbCMQ!->4#|y%kj@E%W}i%R67lRZYDU~MAJyCWWO^KlCOgs=
+zZ8<niD|*t^_GP5@XOAvpWF@G>?n(`4uhf+(@oV7$@6vI(74c_bNbn~#pe*CoF6dsW
+zxT#_WRQEb&cu(DTmqp>V{aw!yTrq8G#~gzwl@#1Ugf7P3<xiO2i8W7S7JC^f@H!>n
+zb=+#53+|VFc;G)Lcl0UPesWEYZ`yn(H#Q}eojjOEB8892_<4e&g*mS^Jt%3AvOd0-
+zHRf`hUCpYQ&;mcyfV1C1l&<^yZPM$FBG_xEohk2Ihkix&3V%}E951(|C1UY>W}Gc&
+zdbK6~eB2zU4A^U)=QaL$(^vfWcu7yaxCs(6A@zM-z{H()&W+n7l|h3N`HFn25!@W<
+zWKG1&chsmU<%3_zR%@j5L)Q|fzm#O#gp9?_B6=O~eS@%hDGP=pe@ztU@vfK7*#Fj*
+znF=0=Nx|Vd6*t!QJguuqNH!*kzoD!$y|CTTZY>2biK^Sic?Z@ge;Sm}6OZ!~0jeJ`
+z#alw?WrD6xST55YSs4k%H@qrON>0Sjla#X!s-|$`oRT)1{qA^QxU6q>Rl`<()C<~w
+zkDrIhKR_bTXgz=H*M&b?dXNc*iX?@HDkc05cr}z6Z;d;YRhC9wY<m(-ML0e((0$Q}
+z>a8r3x+sn9Gv)qr1p#GjZt=r&B;Q@G>QFc6!b=K1d})Z(4D#>{jPUGNX#!mJ3F~TN
+zqG?j<OCns3&konkriN2(IgWFwuD}<%!pAh+VB5kcUa0MsttlG4Y~!Cj^|$4I2s2-Q
+zIYx7<*ckgVZ}AiH7m^F-h&Rjqeq|H0CoSH2V>;*TPVmp>btSxY{kUP2O*!G3By-7j
+zL?<{rW89&sydsQ?lHlH~W=vA$&h8qG8AWtxV0-Ad`PZa%AFH^9rSXmmZ{E^UTgl0A
+zk0uZDpX2$t)H9!0M5y*f<W642PYI89Y~4`=NXv~H=oN)p(q*`(XxQ=?;0Y0L)G*T3
+zQeZy;#;!Z^LV#eh6c^u^0kTJP^j2B|LAz`$pYzvsAJFg65GjQMg*HE*=)5`e8{C-I
+zkg6%`SN!OTK%x9GS#_gKWK%&BZ%REz82jQ2Lfgx-o$MY7xLDSNv3fBG@i@p%x%07!
+zF0vQo*Z~6t<*Yyhz~#fbb9$@`#tvFEx8*=?t)OmAia^!~pM1j<Z3WKQ$_GKn=`t<6
+zdd0Jiz;8bR7TPdD@w=!YG?}7<26#P$zNyJO^1i7+0{12-ZW;@+7ya0S0TvT=roj#h
+z-uPoNt4H~I!1o3~FHC@nhLSzJ-nQ7<@#|q}elY}-7?;{^x80s`po(QN_RtFBUWrQ6
+zL1-J^dahN4WQu}Bv@t5h(C|b;fv}1tS)3llw!Sz%4P?C0L!{=?EeQ*{UP}Uh+IwCr
+ziIJY$>f}67n9sA*Pp2BIiN}Yf^Fn@5u^B#6p&kun<u!fI<+v|iW_qYcgm;#-E!yra
+z60BI`z=TcCWRQ!O)O4SrdJX&<p*Ss8a}HCBZi`YTV7}Qj{v=BUO?T1CBPj`;A-%_X
+zF(yP_T~3rcO8QO)bZk-0p`av&F1UGM-?AD#tsYUUesk9rQX{M#DFTYflV4;_MuZI=
+zsu^5Mi^wcnWKvy3cA)YL!L*gnN*h7Dn;-qnleIHdpD|4YX8cLj;>ksiZVMZrmM(({
+z`zz`j+S&2T`p}h4^>e&czLy^qcZ6>_?-Evl<58M%d3sLbJW$oa-o!<~X&(#knw`v)
+ze>pribAnjA29kuB;|`o(C8};KQYiK;7DhO7D<s6ua+zCv{UQHUHx^A8DAdg3%kj7~
+zhAK>$v4j_AEZUB1x|>G?{Mpbs{|#akLHFoHIH9Ni*4c8zg~AzM75WYt<uI|)h=9q^
+z^<;I*OOSU9&UZLEtl?}E&sT(1_RhQxre3!3z;Nu`x;4U%Fz>gB4{1JgUt5sZbFF5n
+zqR+&9r6seGY#ZQ(%Kj;tO|D;SmWUfZV$=VmnB@s=6|tEho(Pe1Sa)gmuHut$cZe~U
+zCmGjLa$XO<gNL)#UN7WUl%S0$Uz^`i-C^6pWFC9G2piPY!Yx>VC@*R6vA%&n=?Af2
+zvk@lUp}Nt`uF1UT_c%bj2?eP<EDtesZEkK|zmk!vsq5$3<z0}M{+Oz|A=|%aV;uSV
+zWeqE8EeF&GljlN*Ehs|1&qP~kSlR%NX-L6tMqF+b?vG>L)<zf3Ky$N~lToA;+|C76
+zt$dzRq;68B68V*i1DhoxgzaBYLHfj5LfbFHnf>lTMIHjs#?rNt+s1m%*-#MO^SKk6
+zu!I^C6Y+FXFb*=et)_A^Tw%pRp6w+J^MgZHZ)dhC@-{)(wW{$pp+j^+qRwih_)SiZ
+zxjlzF?87x|!@Q48>8FAukiB2zz%3dJGU)DH>9gKD*bA{47k+pKTXE&SYfl@@-5}Wb
+zWqq~jD21&#^&$NJLuG=01=GRjzVqC7D#Hkp?7nvAuW^))xFs}3ndB4_*o6iR$j_<^
+z3BiMWj6e3foZsiz-9ReSU~mLATB;*=jPN&ME7qD<$7idDT|iemj~#)9k7l&UTw6gL
+ze%iBTSuml0fqCdwoi6B1vlTq%_Vn<rVcF%@IGo{2_#5o;70|}dI63xr9qx}d7;D16
+zn8*fLQ7HhvXr_N-Mdj58Z0Y|NiD2{1NL3R1pRnb=hdS*29dK;&fKeDP9+;TStN;dS
+z7svqtWZS@I2743S=~5PZ!P93~>Mn$VVp)Os?eKcf>x!}~BfS_Toklq>msUBpS8Nv3
+z+gk6QyzUJGN1eo~OxPt8Rb(h440VJfMU#t>r)K=P=T<eqU9|4N+U3xL4p&83zqz2l
+z{PsPWTD7Uk+f@T!LYtw}ln<<3A8jkYNW>Dh?5Tp%iFDoARp|%kH*ZDh)vwPssBU&f
+zI_XM4sJ;p&bl=u{6WnJ3+;^GNxaC-@^wzORFWML{1Sc4il#q0NpJHD-x~*&;8wj0u
+zv7eq%-LYrYdU8{vYYEb4gGE7~6;noyS=U-U8WyA#o&Q~ZC;e31qO=iX1{SMxgmbqT
+zZB{VN<!boZ==DnD@m&Gwr6Rb!^K={z9iC{9JUD$Z?pi|hz-BpWOe)wlC6fe>9+Y?O
+znniHqU3+8+!@?#LUGV#7{>?7xL)rLAK_q^g0yj*@HQQ~UoKjZiv}753-=eaeDfLSF
+zHRyaM=sK{fP1icTTIOYAcT~j8YkYNH{)v+0n!#mfdjBC)YrW*EY}c+Q7yCWU{{1Tg
+zhuEgY3qpKPO0n~v_k6Vv<p&f|HyQmeo((-Qf)|xFe7|c7A7t*rYaA~J=6#MQ5Tr0O
+z*0(p7;0ru2w0K0m4vHX#G_=DJ7zx=ZkbN#AgU?kA`;i2Y6guW9KjBb81cP4{;s#<#
+z#tylQ@J&OeyO5av+~w|*a!g=xv)QNR2tc{EVZ^>4Kh<Mo9t*LUL>apX3a#cFTl+!j
+zDpSQ3&JdcISxck6z&kyP3=c^k59Kaj2El9%&`a30WUNOqPmUp_$JDpwP~#9J1KY8E
+zMF|TVIctP9nzIQ%)((ax&YYEy>z?7sVc7O4oKkpP{~!wR%%=c62mk7s|Ms|la~OON
+z#E?CF^)&!_623O3Mtv}zJjqLbfkuyFoh+ai3;7ukGA#H5+@VsOseSTt&rbFg=zXjJ
+z!FV^sNoI(B9u?mr=#|a(3YX0h_x8y9<CibpfZnao6O?Aekm}?`@+$k;P{>Ur_~&X7
+z!oleo6;4p+St_QfPgrVpf%vgsCc`$=aNkF&KDAGt(cf7#w@K7$H}S9Cj;hjbva27Y
+zS3TgKO{OqoAU4+Er`Me|RV+TPv-5d~J7(vzJKI~DUvH(^AWwv}KlI>TeGSK@NA9xO
+z*jdK$91`?U#UyRDI_ZT4duJh6t^6kynj==-V74WAA5Hd9GN8mfNX<Fk#kKTV$Kaa~
+zH1Rv1Jif9G6NmmMezWKkjxW*+lLQYYy_n^V&@iFVI~ZV3ozy{jGaIXUPE<~#_P#(%
+zS~z`iQ*W-`9P4wYd@mjlriH<2jS;yO8Ac7Otx;g;P^^PV1&h3#n|{3bivNl;?TvgN
+zoCHI8P}qLL#7Ru1HN_rmFCg%g%Q*{=@qNlmCZ{1m4)g3}+})>qNB$jLTuXWw`!)@^
+zm*<0yO*Bj3<A?ScWT-}Y1zV#Ve$VgfVee)zBx8C-HD0|+oXHss9ZSZ}HB8Q8FH!!4
+zVO8Z4;KN}LX_t|q109!f$>9S!$<Y6feCSQe+4WOc<a%&&sambU=uqvClV$>DFWzA&
+zF|<946vxy00F&p&xA;Ox%+EW<pc;qp4mJ9L)o;Yqg=>wOz@$Q}hyQpg)PepQB`XcB
+z#G1|skM|fnJRO*f>kWU<u<!@CDB;e`#LWhs?x&3(lDv{rpOG<*(c=#DbcG~&o||WS
+z)JJxjE$wOvtv4nb86-#+O)$KtRPD}bjKWwx;#L#HVl(oMyn*?ryTO5UUG5Daqaqf}
+zlP6ri59>eVTK<j4vqVAF9!nnO{wb^kW8#)qCJSkaC@d;4TuH4F4YSzf)SCgpf<PlG
+zI}fNt6n#tm0D%YZ<I+uM&3za%HF3rCJKX!HZ__;qbjx#<JJ;1N<_(T5+`pu_UTu_V
+zx<goky%b^hUnGhnN$J5|DHf>@mLe%88qQBY9p{F^EEZMj>qTHay+&x|iDSEjILQTt
+zuLUpX_OWv5A>(RxBv>b0eGuuMC9;OS&&e~nK=Nk8nb$^$3(Xp&j~cgq+oCW~wB<^o
+zNh(U9gA#KVr)})Af&_h$rq7@@ilI-T!5FKp9Ev`u@;tWARF+~cIZs+%QdPD@FIz_X
+zoQSQ-bO(Z1ZWy#nNt9cGbLrheQYKS~|FcBbO`gDb)E1P{g}l6Yk++?>PQo>)CB<l%
+zc}~U3V6rC4IMf(7r3!_Kpd2VKplU%D^0ZZaf|1wCICcEyXZNFP$E`n89+EOnputE&
+zW0*IMv6BYlHX%te8rLd>l~GI!eC$qPRAeECqLvhO%EB|J*i34aDN8EU<A?xmnL9VM
+z>9+MRU?vf$fWr%!gYDfz48_LvmNPR*#7~Ld8L`7p>DoJ8YnUlXvhA`JkE?Hsb>cN6
+zLOF%gV=Ica?Xj!;vVr|+K7X;FqNDTzu7AEEa#az=j%XcCdT=k^(I%HG`*3sJUA<F7
+zk<PKu66c~yXqft)Jxf}rp*y;(=VH_;D=CJM)I#hjZJyryH!9san8*Bxk@3<z(!JE0
+z(iK!$-HI0ihKv`d0s_iHV2zOcLa3{Q^c`jGG?=W$un|@s$GTHi{mI9eBep$M&%7Kt
+zJ@YA5Q7*9Q4`+_X#1eB=1g8%#0`(Kz)N3-WvE6n?Uge|%Hgs<EO)IX*7V9Vp?5fq%
+zb#+x26@8@jdmsxa-S3Pz=&Lo+T<q$(XD%ooD_WP6T_;31Dt>}Fysl_oui8nUQBz1B
+z+foXLJI(STPG*4Qer6gF1=t0@qcxo>dMP{Cx|fxQK7G?m%U_O;YIILLW%wnu+}S?8
+zM}MsFlwb0~fqd6?l#B!8hy-1K=b?w=BpkBWg1hE;jQSP#vgFlPy7wI)2s~-QXRc0y
+zy!PXgY>!X%PauKm;9k9)+%s^L;yl(W)vFd;(Ac9Ba&7CV+DNr%PhLiRhg=DFHKPr8
+zHLJ~xij6UMKWp*?xF#CZHmG$QktiIe!*)^y*^>!+JUns*Qa*$JP`}wB0`2mi%<)n-
+zJ=nSp4wjVwS1Um4ZURx)FTI@4n+cX~t${)U(sK=52+fsubrd6b-1Zz&N5k}G5Akp_
+zuO^5m6yXjs9@~k6$?h?Fg~7*;{ft(g7_T`<L}ZxmPXBKHpp!#{N@1U1;c|fhG=yA>
+zkTG9N)ObVMH?WuFVDYI})`wTt=N6wp{6FI;H;J99n{0cEqlsFl_5zEVe|YBKmYhv-
+z7Mp>%{U(;$I(fo{`2uMJ4mADqd$VZef<tA#%1z}?8ouS-zR9z5h8I>hQ@^Bw{Tite
+zo!X4r449h<0CO|-?*rFwago1ncnFnM{g1jwZ5_=aQLY*aFFAT9&0r9E^Xno|2129m
+z9B^+7elBIduahzjqC4~`Y3o%+pjd=}E5Lt0dO(|tBI=Tu%JBu@4_)P8YI|^b0D6N+
+zMWOrpwKO1Li4XpUK0RyGFDO}*Iw!&-t(S(H)JoOu_+33!+vUf~ob}cq2xuhd_oh~g
+zym^&F7YQq8J_U+C`!rNL1<+mE8bfQ)`i*Y!UR49s{AEsI<sqAlxx`|fNE*t#%$jp@
+z2&y&vF-wYwXzt_2rZ(HCi>wq;C37tL=8VGqHW(p}TwXCBscLn0{JQo?XHD|PG#UFg
+zKg&0bzfn+^F=OV|QkA1Mvb2!JdQG1|ml7|4_X<HEh1=6MDTN!oxm_h`dY>w6+}LtR
+zmOkcXcvM()G2FntxRkYjL#DRzI5t>8;j*>yZ9@buMpOHqm+l0;j}{n6zOf>X|DpH*
+z)=lKJC2kco>8qmBWKy;S<<ALyvnw<8qk;h*%!+jl$yKIwbzK(@Vai`P9vG?n`D7{a
+zj2%Fuo?~^2I+l(za*s1Rde}m#bm}xdUw*|Bb1Kj!OJR8N(Cg@@r{f$y`_4apB+Tz9
+zfNBM-MKwRxk4m^=h2w@G)>hc)jk-7V!$50Mr@9Gqi>t&$^1zsPmgfNNguTZrL|CF%
+z&c+-i@f0#bF?Kw84v@JHA^kIiS(=Dn4zkO}C|3!|p9yh1s|KXmE!Cdd#_y_$D8jU+
+zL2V;+^H|X#uC3f7jCvWYiNM7NkLil<Crh@rgE)bB>vd6}Zk537Wn3Vaoqp9<z=wy7
+zI~~6;-A93UTC{H)^{^iGIfi--BA+X2L(6(B0;h+R0ae982+>F}n)s9OPUwfX_EcLD
+zq#Vy$U*lt+4J<S3yI|TH@b}7)Q(>Qfi1Gq?R{^hks}tXQ{WNsGwu1vd_Tka=UE5x6
+zlK}V?6aqGs{wv9eZ$ATGdo63dZ}9`aNKTZ<1J<h22;6mm$Y;9>)J(Sz5ZZ{1D9|kZ
+z`OruV#BfPd%pLA^hbriGO<PAZ;lig-w;S-10-?k&JmB?GRO3`8k_6Y&M@HT!+T_`9
+z9o^r4zJu^^EGCQShJ)j*JTv0UPEW=nWymFj;P0shM`fbaXCbD~*VYh>BviIZmOPpg
+zkJDiciB}sZX9g`>)X&sc_3cx0(0Ba=uOCae^|G${Kn>p(y;Pl?*lF0B`hm8qtH9Es
+z-leoN!?f|OF)IlOSBd^Kij>22UjOTX604?8Uy?h5cl~yljNuwLar>stTSTv^zAWW8
+zw;r<R%~dySC;F&9J!D)=54<;N99UJ5Jo9l6(85ThJUmrweq)m_P5!0R8mp)wA6A+c
+zt8y)kIJEn%o!WK)fn)Lfm%E)#t`{qL3U;bl`sT`K4vgG8$^{wEe5=E%l*SkWm^jUK
+z<a)BgNT`dH#w&tY{Cr<;h8na|)KafqZz`~eFu`8Jh}UqzGLdaOe~yopuyQE&bfKn4
+zb|ixEfzF^{9S;P9v`dkTYgJ>peiIkYj@on<6Wp=o{zE98gYP2EC%PfI-P}Ft{KQWx
+z!{^NhojB@Cfyiot4LNl8L$Tbu^QM>YQqxSH<K%~oW6R{*8-R9M_juZ>&~giAy*3Q@
+zGpyY1r$QtWV>OdF_QpJ*A`)`LAD7~#c^7v^4Ies8(4)`5R{^{E&hJ1l<BphxsM`@L
+z8|V}CH4-XQUK`K#*jg}eseDB++00tt8e{3}v^C0J;52U7YH7g@rYr##o;X+j16)Rk
+z*Y>$&OjC}x+%ga%2jHa_71;%%;I#qls(TYOcDBKu=Ag5SEF1MaGX$H&u9_oMh@3+>
+zr4(mW(fnx$P?ccoErMvfR~G+Vv66v`z+wVI^bEclBYq$Fe+lP$6p<GyEh*l`gWx(j
+z(>qmGNH$8u3@ub9Ng*PQ0t^kcQn%Y^D#}*59CObKfB(cird~1=G@1`RF4eK>xJ7Gg
+z`*I(<oqGh=7B>Ycg;*A*6fScWCf~H<HilxY4Wo3PeUlf;8CS|t8@LP_ku!YA#~mxN
+zpuwBT3tKcZVSt5fX&MS%Oi8y|jtB$X3di9BDa~0c&zFulIcG^qX19%jdpla1HJO10
+zDtDowY9BX;wY4<0*B?c2Q4v);P{wel-I?qh+^Ws^d2y;t%qHiW6l2W|AQF4r2}*6X
+zRLN)Pa3s0R=g1wVbJ%X(8|^xTs%l;?naA+W+awx3WSZo|`C`3ORvc`Wa!t9VB(Xk)
+zr<O|HCLbaDdYsQ7{@K6$<7iuZfbd5bz#GB8Qj+7-)3>nJ6Ed>4v6X$R{k{Lcz5Vtm
+zn8^ZiZ@8IPT3S^ZionIz&WU*QXh8B7@gTq;Mj!>6#jwuRNh(cF>(0)b7P@D?%zWq^
+zsrHU5xKK5?$$iLvnKfx+uLDV1-eHxec{J1j*tgy=n&y0Q|M}R0?n#c7X0P)5)GU1s
+zAq*QFOiUy+J?alCPsHm-P6HFDZHgi1;4m2#IA*}hN33Lf!C%BO1W1OZgdo(ipW)PD
+z-W(o(cCz);qBc;8mFtnQFH$K~o0e6sQjiT@PBAyElP@Y&#^j^h^E0PoD3)^S(iCRj
+zT4q(#H%{gqOlrdF!ql2Go)SxXD@-FlfHat>SJPOc(wM*&8kI4GpfP@w99NsC`nG9|
+zoW+%q9NRBbdA?Ak%mg&~6EWuDUcf6Xa(teqfJsL*Ki*05xk9~d{P{*BOP3M)k73J7
+z)rQe!sRK(OpCMS}<wL~^->5c957?^YH5b@lkv?^sE`;3WydAG&!hIh2@#zv+(iXg=
+zYzw$K2cB^><!XqP8f!xWtgt5#Ec~h%rDN4AuH7wX#%D>@hWeOUEeARgF#27TvPl6r
+zI7jUgFb$|FT>)NN%|llHgpNd*JzGuCwWnZx@z6nYS^*BC?>^wQYA0NV*v>i_CWMF5
+z4mcdWBLPFFCslGCLU_s9UMX)h#oVRgDl?Ome$O|lmy?J#K)FU_J|alkyN^5x+u?ot
+zJ|53dFL{Ftj8cq9J8`XWJCZe=ea!L_Y%PATE0(PYq6NX4pZ28!%^`heHk!VaTgR@3
+zWBz_c;D#3lt1~5Eiw31KO?-_LHzyl^{JsqQrQ=}ebopoFy|^0@lu>?gN?p`p{rb6A
+zlfyBJ&Wn-|uv=i>ry3XsmJw;5{CoFvlCgEKofb@N%aXt~4fs$~WUBI_s6VMYtZ-=*
+zDAYW)pQl>C`vk5xw=w(S4*sgGTQa4ais(E8dXg&y%sZ=jvL8PE-NpH(Q@B1Gz{#!=
+z*yHX?hbDE<@xV0f>X5!LsU51$kFUz-q233fi=D^PsT1SUg(+P_g54!tKX-n^20kX-
+zQVU;zAyv+OZr0=Gd5n33Jlf%U1p)#y5pYg6QF=Wk1$oF%+iQdsfT-cv7~Y}1Q+>`g
+zf^s*|$pm^ye{PMRnKc)Q6RAPC>bQ{QjF+;bAGik>QYjx&!9qO8$!O}m63pR$uNSWr
+z-0BA<fn>&zlobgNbU@$-it8HlQB)gC27y?)(Xsw{iO7_VFpXV?LYrk5S}HvQ`UG?r
+zgZLhkf$hM!cnIx=&bG6fm5W-B|5RCooxv`LOB%KGULVP+ng&mbMi0dvB94axtpOok
+z7fiiiJ^kl&(HAa~cWhC&`2QS3qMvXjehs6(1&q-gzmL(fjyAS>X8*>fkQy~4*2RP3
+zH#%2jR#Q7;JT17y!iOx-?Ta3PhAu<*de<!pZ!(e?nRJqGMNH8P2CzK?iOdM0fVW#Y
+zh3V7i!*EJNvwL$ZP&<%mJOO+tkts^1vd=KEDQbowf&1Wd(orbgg_{VT+Mzy?j0FR{
+z6^UiUAZJeN7@1?6U`~EYCFWP%#VO?;?b7Kmi`8JbT!t!7nIN<X##@k=gb6Xh)sGsd
+zu!V!|8rWosf{=k(u=TW|EnElcg);zIsKRZ9B>kOgIU>9qYb$Hrl$^;aY%C?-u<6m3
+zgNiFq!(GWKISgb4eQt}<7XXvXcp?a#Bb<TL{kl&P#d8Bl%&gSVt+J#SpP7UA(Ac4*
+zX1pA(WYVU~5TN{GFqN2Pj=+A~$5ODUo<S?*i82+{W>XHq@%e-F5OCl~)_NsYA|-OH
+z%@;bJG<gFkG0H8Sil=(0R5sp&R1B@q)1XJhmU*q`)gG*EnTd3^G+@KjSzHB%fGcg5
+z3UuKMlLM6p(0|@i8dO6s2*B-Z0vL-Jf4`-_OuOIKmBha-FJom_Ehb*0+`pngfw5^{
+zl4C|@!=Y#0b78`eBu+|*FoV*EcW&b8YK&2}S){pndA%M?`r-=W3h>5dHm~aqYBZ6C
+zf0+V^=15swb$7c5wtUhjgtf@ZI5(1Iyn$&)Jw?L|nW&g{o;B+u*J8y-&($$TQf$Y)
+zi>DFtrSyjU=7qD^@*9F%<jm)0QYrejTfRO^6|XakoFW6}5+4Y1i#S^$`QzbLmw7@{
+zB9Zu4--5Sp+j^ZU^=Fnwe3Z|hSoG;sa@lP%E!f$S{RkFSu5p|eEWUQd7nY)t^PIz&
+z?G=<VT{E;O6w3s)!8#<BX9{0cxi~rL4ctn;P0)LarutM&)2#@Yk6Hv}{jI69qZ2mJ
+zALaVFII72pJzf{l`EeTVn_;J?BNsj(OO`u#_+r%`bGKZDCMLw0lf%O(d&#>avtFo5
+z!Z<q~WE*A*&Z*{cA04fFgxzc(5fC*ixt;lx^b9YP$C-LNV+0#o=FwT|A$lpVwNZiG
+zDbb%pIzZXaSu33hMXcNbZD3P@o8IeJM-TQ_q)7oQl>(D8@iKr@R!HzHr05y$=u>>g
+z-I`UUPiA;8gcQ}@y?}M(iD8Kgul>QFoL@6cc=jNvV))ohpG)>VxhJ(@|FGz~cwBEz
+zN#e&dl=O3!bmp`Sq<rqsjXKMCJxq!h1zJ7T9NB(fsPU@=2){g1mlmppyyOO~HU^>o
+zXn*|uvHFi&>Ax&C_GKntBiz4Ih0FmG1MB9}*2|!&216`&ppd7PAy*O{*Uaq3B8Q3w
+zKSgzUvI=5g`#RC;b~_||ouB<k6dFZ5xs!e)y~^3{(#62Os)?iR-sQ_v0zW~-;Q;0d
+zB-C-Q0Fg>wIzLPC_HvI!H6}{F_5=?u;9fxoD=D9VFTi+^BJ@+q7E^o#gJY=^p=!hi
+z{Y8!>QNu-%Ijt3hCPftTvS_;585mZTc#163&3*LK`=<A0z9bqn6~O@6XNRbp!p^Zy
+zuurPkR6(b58UxYY=@V7fZlbJmt#r`bOX_~L-6paOr1IHs^lKG@B48&%@+gED>CmB}
+zl|$KYFxa2^ub=C~(}askIugT5HpVgNbxBwx6_!GYFjg-#yP{G^b~?=`t3<C3Mm863
+z5@Alhu2E}No7g^Z#ALnx5EqIgrG|;;%CTHYmM_L9j;=S|+G2)`ei8u$yKiu|mf97p
+z+_UC{z9}9;=MC$rGQtpm={nR;8BJN15XP7cl!gc8mJ<DezsN%viIjoljY=mh9+NGH
+zp10Qf@koP(#yks?z8D?@l2{+{`uDiW*$Z!*-_!!T2$Kl9hqCC+!oHQ=jcZ~Vjc4vU
+zDOf0sOE|zrUaZW-2`z}yKKba%w|S%{C?DL;n#CDirJVa3GDN6A%-`5B<V6!xodgSh
+zVl><J6gyGI(-8_%eyQCEk+Nb6Wt#`n0+Dv$(86b#EicWRQ+T=JMiNz$?Q8R-6{!}E
+zWnt6yP&I~|*+1Va?sby!3Zma_s_t;NyS#WY7GTrWvyDBx&$=KvxgseC?f0S!71q~&
+z?OwzgeZk0Vi?cR>^8!>Oju&EpQ$+ZJJv`W>XIz&EvkSFxSm@3J+#!I}EB(U_u+$aR
+zp4ye?&Gmiy$uY0e)5tu+e!KDdDhR8@#lwy!9O!6~y;VilL!A2cZI1&Em3f%zDm~CS
+zs-e^j*KtoSC^ccWhK>g8?gsK5a^QNXy726CG<6AC!`qxUJ@23Dly3Xa^Fh^HKB3JB
+z|B%oFR`QMmoo{Z?xXqWr14e+19Ax->eUErRK5O<lkyAkDEDxDB29UdP4+2?B{EqsG
+zunH_P9=d*D-t+ZGDm)YOxkq2O$_M~Xe8Bl#i65}r{Qp~pzlxDX@pl#e&3|a`0|BFe
+z0J2C!LOwYGSoi?E|0g^T7#+SJ2u}`qzkZYyl;foleI*3gEC0`8&XP|fzkWjjaH4$u
+z=JzAV^XuE<{}q$ueI+U+C@V)RDfAfOYXQJa_n!kW+kHO}p4{=K06u@!zyDhaz-!Yl
+zCE5X>e^Jc;TS0(o==b9*)&4&Veoun%8?&L8u6{P)tJ8q<+4tgKFV&uSfc4ie%s&8r
+zWG?z4cK*0V;i~6hXn@vR0$Tp{_WwAlJ%IuL{TtxpRUKe`=itcu*47XpKWn7(Q(O5l
+z<Mx4)O(B405pWXypaWd1J)Hn`_yeQpk2ZXJ$$X3lTHv&-2B@nvpft@t@N@yT;y>Vh
+zOHD2hP=FV)Fw>K;urPUR`DbXHb@jy_0LTsCDgEjY{&7@$!a)8J8X&uC`ql=piA>1I
+zRF79jN6*GaQp;S+;7789$92~!^K5(rs5=6{p7+nX6F&VTfugmRC15Wiz|^5{WbhWC
+zU=2`n|8w1?U2%;z0bPO#s5||SiUY3Ip6>zD0)Ob1$M;hNkgvh?zg2w1dOrvi5E^0*
+zsOHygOFxck&j-{$qW>e8+MjEDwY(8{0>Dcp0GRoI00OSno=UiX!~|^Gv(+*+{WIEf
+zyF_3&p#8CcvE-j!>j&^3{Gt7P78bT&lT}!L%~lUElm1Lm@%XNF2oenP1G=>a?OURO
+zA9bzvj0LDO{{i~@T@!TB(|P-Un&XdA!#ZP5hybX*0948!kpF2u9>6a12h?xR@ptU6
+zmHu-_JWiqd1G?HX05InN0rz{i{<jh1apJt6c<T~>#QVps|8HsZ9{0xMq-;M~4qp9{
+z<?n;U<6JX8;dB8L$M^Z}`<VI1Iq%o{ef38@&K2_$@G}7Lzh#bjjPkV<;OGCJ<7={&
+zZ^zg9;70Kut^6wd^0@Hh)GI%VS9?+@{Z{ygXaAQK_9J`gWBAAEG=9QYtNaH43+(sz
+zL5AO-#;^VMIB~^K)C|>sf%=y;7LV)yI6=TqrYwzr!Sriv51@6HzorX#O!Ziw{U=qJ
+z*59c9i(30*_{T!yKjDdW{s#a3PW(-F{4v#I#nPWtLMH!$>RYG%ukLy*`uLN?(EMMJ
+z{9OX_af=>n<ozVev-%s^uMXtLn2!~jeqy@V{|)o|4fzKB?T=slagSLZO9B04adiBR
+z<v(b@3j;mId@OkI6LZ_+cg%k;fAE;+@h1GAJWXD|@%%n`{Hrbbk2xQ2rT)oj<omxl
+z|2$kh4uk!P36$`^F^PW<ihW$^$1#UL2|g$N3xZ!qsXw>iam3e8g1OY+2!6~G|HfAP
+zxFwGxG=36AX8lI=+vEDTpW9=v_fO>b+~1IYf0({O|JeurxDk)NjX$Y^-u;d0f6S$i
+zooqj0_X_?7`+dOpi_7hC10I{=e=^aQ{>Jop$^T2={f`DcHV^-#0V@BE<`>xS4f=NZ
+z%h>nWPWTgFsq$ao|97k5<NkVV`uIt7RP%oe!~bRoc`XhGcyassentPJ3-DHDRr~d?
+F{|60<n1lcT
+
+literal 0
+HcmV?d00001
+
+diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
+new file mode 100644
+index 0000000..6b29cc3
+--- /dev/null
++++ b/gradle/wrapper/gradle-wrapper.properties
+@@ -0,0 +1,6 @@
++#Sun Jan 11 15:40:46 CST 2015
++distributionBase=GRADLE_USER_HOME
++distributionPath=wrapper/dists
++zipStoreBase=GRADLE_USER_HOME
++zipStorePath=wrapper/dists
++distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
+diff --git a/gradlew b/gradlew
+new file mode 100644
+index 0000000..91a7e26
+--- /dev/null
++++ b/gradlew
+@@ -0,0 +1,164 @@
++#!/usr/bin/env bash
++
++##############################################################################
++##
++##  Gradle start up script for UN*X
++##
++##############################################################################
++
++# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
++DEFAULT_JVM_OPTS=""
++
++APP_NAME="Gradle"
++APP_BASE_NAME=`basename "$0"`
++
++# Use the maximum available, or set MAX_FD != -1 to use that value.
++MAX_FD="maximum"
++
++warn ( ) {
++    echo "$*"
++}
++
++die ( ) {
++    echo
++    echo "$*"
++    echo
++    exit 1
++}
++
++# OS specific support (must be 'true' or 'false').
++cygwin=false
++msys=false
++darwin=false
++case "`uname`" in
++  CYGWIN* )
++    cygwin=true
++    ;;
++  Darwin* )
++    darwin=true
++    ;;
++  MINGW* )
++    msys=true
++    ;;
++esac
++
++# For Cygwin, ensure paths are in UNIX format before anything is touched.
++if $cygwin ; then
++    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
++fi
++
++# Attempt to set APP_HOME
++# Resolve links: $0 may be a link
++PRG="$0"
++# Need this for relative symlinks.
++while [ -h "$PRG" ] ; do
++    ls=`ls -ld "$PRG"`
++    link=`expr "$ls" : '.*-> \(.*\)$'`
++    if expr "$link" : '/.*' > /dev/null; then
++        PRG="$link"
++    else
++        PRG=`dirname "$PRG"`"/$link"
++    fi
++done
++SAVED="`pwd`"
++cd "`dirname \"$PRG\"`/" >&-
++APP_HOME="`pwd -P`"
++cd "$SAVED" >&-
++
++CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
++
++# Determine the Java command to use to start the JVM.
++if [ -n "$JAVA_HOME" ] ; then
++    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
++        # IBM's JDK on AIX uses strange locations for the executables
++        JAVACMD="$JAVA_HOME/jre/sh/java"
++    else
++        JAVACMD="$JAVA_HOME/bin/java"
++    fi
++    if [ ! -x "$JAVACMD" ] ; then
++        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
++
++Please set the JAVA_HOME variable in your environment to match the
++location of your Java installation."
++    fi
++else
++    JAVACMD="java"
++    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
++
++Please set the JAVA_HOME variable in your environment to match the
++location of your Java installation."
++fi
++
++# Increase the maximum file descriptors if we can.
++if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
++    MAX_FD_LIMIT=`ulimit -H -n`
++    if [ $? -eq 0 ] ; then
++        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
++            MAX_FD="$MAX_FD_LIMIT"
++        fi
++        ulimit -n $MAX_FD
++        if [ $? -ne 0 ] ; then
++            warn "Could not set maximum file descriptor limit: $MAX_FD"
++        fi
++    else
++        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
++    fi
++fi
++
++# For Darwin, add options to specify how the application appears in the dock
++if $darwin; then
++    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
++fi
++
++# For Cygwin, switch paths to Windows format before running java
++if $cygwin ; then
++    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
++    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
++
++    # We build the pattern for arguments to be converted via cygpath
++    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
++    SEP=""
++    for dir in $ROOTDIRSRAW ; do
++        ROOTDIRS="$ROOTDIRS$SEP$dir"
++        SEP="|"
++    done
++    OURCYGPATTERN="(^($ROOTDIRS))"
++    # Add a user-defined pattern to the cygpath arguments
++    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
++        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
++    fi
++    # Now convert the arguments - kludge to limit ourselves to /bin/sh
++    i=0
++    for arg in "$@" ; do
++        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
++        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
++
++        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
++            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
++        else
++            eval `echo args$i`="\"$arg\""
++        fi
++        i=$((i+1))
++    done
++    case $i in
++        (0) set -- ;;
++        (1) set -- "$args0" ;;
++        (2) set -- "$args0" "$args1" ;;
++        (3) set -- "$args0" "$args1" "$args2" ;;
++        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
++        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
++        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
++        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
++        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
++        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
++    esac
++fi
++
++# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
++function splitJvmOpts() {
++    JVM_OPTS=("$@")
++}
++eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
++JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
++
++exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+diff --git a/gradlew.bat b/gradlew.bat
+new file mode 100644
+index 0000000..8a0b282
+--- /dev/null
++++ b/gradlew.bat
+@@ -0,0 +1,90 @@
++@if "%DEBUG%" == "" @echo off
++@rem ##########################################################################
++@rem
++@rem  Gradle startup script for Windows
++@rem
++@rem ##########################################################################
++
++@rem Set local scope for the variables with windows NT shell
++if "%OS%"=="Windows_NT" setlocal
++
++@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
++set DEFAULT_JVM_OPTS=
++
++set DIRNAME=%~dp0
++if "%DIRNAME%" == "" set DIRNAME=.
++set APP_BASE_NAME=%~n0
++set APP_HOME=%DIRNAME%
++
++@rem Find java.exe
++if defined JAVA_HOME goto findJavaFromJavaHome
++
++set JAVA_EXE=java.exe
++%JAVA_EXE% -version >NUL 2>&1
++if "%ERRORLEVEL%" == "0" goto init
++
++echo.
++echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
++echo.
++echo Please set the JAVA_HOME variable in your environment to match the
++echo location of your Java installation.
++
++goto fail
++
++:findJavaFromJavaHome
++set JAVA_HOME=%JAVA_HOME:"=%
++set JAVA_EXE=%JAVA_HOME%/bin/java.exe
++
++if exist "%JAVA_EXE%" goto init
++
++echo.
++echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
++echo.
++echo Please set the JAVA_HOME variable in your environment to match the
++echo location of your Java installation.
++
++goto fail
++
++:init
++@rem Get command-line arguments, handling Windowz variants
++
++if not "%OS%" == "Windows_NT" goto win9xME_args
++if "%@eval[2+2]" == "4" goto 4NT_args
++
++:win9xME_args
++@rem Slurp the command line arguments.
++set CMD_LINE_ARGS=
++set _SKIP=2
++
++:win9xME_args_slurp
++if "x%~1" == "x" goto execute
++
++set CMD_LINE_ARGS=%*
++goto execute
++
++:4NT_args
++@rem Get arguments from the 4NT Shell from JP Software
++set CMD_LINE_ARGS=%$
++
++:execute
++@rem Setup the command line
++
++set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
++
++@rem Execute Gradle
++"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
++
++:end
++@rem End local scope for the variables with windows NT shell
++if "%ERRORLEVEL%"=="0" goto mainEnd
++
++:fail
++rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
++rem the _cmd.exe /c_ return code!
++if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
++exit /b 1
++
++:mainEnd
++if "%OS%"=="Windows_NT" endlocal
++
++:omega
+diff --git a/settings.gradle b/settings.gradle
+new file mode 100644
+index 0000000..7dfd6c3
+--- /dev/null
++++ b/settings.gradle
+@@ -0,0 +1 @@
++rootProject.name = "fernflower"
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0002-Output-generic-parametrs-for-anonymous-classes.patch b/FernFlower-Patches/0002-Output-generic-parametrs-for-anonymous-classes.patch
new file mode 100644
index 0000000..0492e45
--- /dev/null
+++ b/FernFlower-Patches/0002-Output-generic-parametrs-for-anonymous-classes.patch
@@ -0,0 +1,48 @@
+From 87ede1c33768fd77ab480c2b60cea3b23de9f754 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sat, 1 Aug 2015 13:45:25 -0700
+Subject: [PATCH 002/122] Output generic parametrs for anonymous classes.
+
+---
+ .../modules/decompiler/exps/NewExprent.java     | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+index b5ecd9e..24facc9 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+@@ -26,7 +26,10 @@ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+ import org.jetbrains.java.decompiler.struct.StructClass;
++import org.jetbrains.java.decompiler.struct.attr.StructGenericSignatureAttribute;
+ import org.jetbrains.java.decompiler.struct.gen.VarType;
++import org.jetbrains.java.decompiler.struct.gen.generics.GenericClassDescriptor;
++import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ import org.jetbrains.java.decompiler.util.ListStack;
+ 
+@@ -234,6 +237,20 @@ public class NewExprent extends Exprent {
+             typename = typename.substring(typename.lastIndexOf('.') + 1);
+           }
+         }
++
++        if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
++          StructGenericSignatureAttribute attr = (StructGenericSignatureAttribute)child.getWrapper().getClassStruct().getAttributes().getWithKey("Signature");
++          if (attr != null) {
++              GenericClassDescriptor descriptor = GenericMain.parseClassSignature(attr.getSignature());
++              // Anon classes can only be a child to one type. So either the first interface or the super class
++              if (descriptor.superinterfaces.size() > 0) {
++                  typename = GenericMain.getGenericCastTypeName(descriptor.superinterfaces.get(0));
++              }
++              else {
++                  typename = GenericMain.getGenericCastTypeName(descriptor.superclass);
++              }
++          }
++        }
+         buf.prepend("new " + typename);
+ 
+         if (enclosing != null) {
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0002-Test-Framework-upgrades.patch b/FernFlower-Patches/0002-Test-Framework-upgrades.patch
deleted file mode 100644
index b22363a..0000000
--- a/FernFlower-Patches/0002-Test-Framework-upgrades.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Tue, 11 Apr 2017 23:18:58 -0700
-Subject: [PATCH] Test Framework upgrades
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-index bb303e84f33161a4b4fd40a73aa48d29981d9ef2..cc1f537e71af0748b7b97d7d8489198e2a677cc9 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-@@ -110,6 +110,10 @@ public class Exprent implements IMatchable {
-     throw new RuntimeException("not implemented");
-   }
- 
-+  public TextBuffer toJava() {
-+    return toJava(0, BytecodeMappingTracer.DUMMY);
-+  }
-+
-   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
-     throw new RuntimeException("not implemented");
-   }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
-index 18a820c7d4723b35f09fa4c841e8399a547acdc7..224d3636f7c9d502cc65c122f542324c1ba7028a 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
-@@ -430,6 +430,10 @@ public abstract class Statement implements IMatchable {
-     return false;
-   }
- 
-+  public TextBuffer toJava() {
-+    return toJava(0, BytecodeMappingTracer.DUMMY);
-+  }
-+
-   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
-     throw new RuntimeException("not implemented");
-   }
-diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
-index f8c2afde883ffe8c681d4e63821991ae82fccdaa..49cbf8407df5952f3da980e6a10f284ff2f27817 100644
---- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
-+++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
-@@ -28,6 +28,7 @@ public class DecompilerTestFixture {
-   private Path tempDir;
-   private Path targetDir;
-   private TestConsoleDecompiler decompiler;
-+  private boolean cleanup = true;
- 
-   public void setUp(Map<String, String> customOptions) throws IOException {
-     testDataDir = Path.of("testData");
-@@ -56,7 +57,7 @@ public class DecompilerTestFixture {
- 
-   public void tearDown() throws IOException {
-     try {
--      if (tempDir != null) {
-+      if (tempDir != null && cleanup) {
-         deleteRecursively(tempDir);
-       }
-     }
-@@ -81,6 +82,14 @@ public class DecompilerTestFixture {
-     return decompiler;
-   }
- 
-+  public void setCleanup(boolean value) {
-+    this.cleanup = value;
-+  }
-+
-+  public boolean getCleanup() {
-+    return cleanup;
-+  }
-+
-   private static boolean isTestDataDir(Path dir) {
-     return Files.isDirectory(dir) && Files.isDirectory(dir.resolve("classes")) && Files.isDirectory(dir.resolve("results"));
-   }
-diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
-index fc6a4427e586f51fa0bbe43cbb206809e32dfa57..89adb4e6fca7186ae849e62b98a9253de2dd29ef 100644
---- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
-+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
-@@ -4,28 +4,13 @@ package org.jetbrains.java.decompiler;
- import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.main.extern.ClassFormatException;
- import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
--import org.junit.After;
--import org.junit.Before;
- import org.junit.Rule;
- import org.junit.Test;
- import org.junit.rules.Timeout;
- 
--import java.io.IOException;
--import java.io.UncheckedIOException;
--import java.nio.file.DirectoryStream;
--import java.nio.file.Files;
--import java.nio.file.Path;
--import java.util.ArrayList;
--import java.util.List;
- import java.util.Map;
- 
--import static org.assertj.core.api.Assertions.assertThat;
--import static org.jetbrains.java.decompiler.DecompilerTestFixture.assertFilesEqual;
--import static org.junit.Assert.assertTrue;
--
--public class SingleClassesTest {
--  private DecompilerTestFixture fixture;
--
-+public class SingleClassesTest extends SingleClassesTestBase {
-   /*
-    * Set individual test duration time limit to 60 seconds.
-    * This will help us to test bugs hanging decompiler.
-@@ -33,19 +18,12 @@ public class SingleClassesTest {
-   @Rule
-   public Timeout globalTimeout = Timeout.seconds(60);
- 
--  @Before
--  public void setUp() throws IOException {
--    fixture = new DecompilerTestFixture();
--    fixture.setUp(Map.of(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING, "1",
-+  @Override
-+  protected Map<String, String> getDecompilerOptions() {
-+    return Map.of(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING, "1",
-                          IFernflowerPreferences.DUMP_ORIGINAL_LINES, "1",
-                          IFernflowerPreferences.IGNORE_INVALID_BYTECODE, "1",
--                         IFernflowerPreferences.VERIFY_ANONYMOUS_CLASSES, "1"));
--  }
--
--  @After
--  public void tearDown() throws IOException {
--    fixture.tearDown();
--    fixture = null;
-+                         IFernflowerPreferences.VERIFY_ANONYMOUS_CLASSES, "1");
-   }
- 
-   @Test public void testPrimitiveNarrowing() { doTest("pkg/TestPrimitiveNarrowing"); }
-@@ -229,49 +207,4 @@ public class SingleClassesTest {
- 
-   @Test(expected = ClassFormatException.class)
-   public void testUnsupportedConstantPoolEntry() { doTest("java11/TestUnsupportedConstantPoolEntry"); }
--
--  private void doTest(String testFile, String... companionFiles) {
--    var decompiler = fixture.getDecompiler();
--
--    var classFile = fixture.getTestDataDir().resolve("classes/" + testFile + ".class");
--    assertThat(classFile).isRegularFile();
--    for (var file : collectClasses(classFile)) {
--      decompiler.addSource(file.toFile());
--    }
--
--    for (String companionFile : companionFiles) {
--      var companionClassFile = fixture.getTestDataDir().resolve("classes/" + companionFile + ".class");
--      assertThat(companionClassFile).isRegularFile();
--      for (var file : collectClasses(companionClassFile)) {
--        decompiler.addSource(file.toFile());
--      }
--    }
--
--    decompiler.decompileContext();
--
--    var decompiledFile = fixture.getTargetDir().resolve(classFile.getFileName().toString().replace(".class", ".java"));
--    assertThat(decompiledFile).isRegularFile();
--    assertTrue(Files.isRegularFile(decompiledFile));
--    var referenceFile = fixture.getTestDataDir().resolve("results/" + classFile.getFileName().toString().replace(".class", ".dec"));
--    assertThat(referenceFile).isRegularFile();
--    assertFilesEqual(referenceFile, decompiledFile);
--  }
--
--  private static List<Path> collectClasses(Path classFile) {
--    var files = new ArrayList<Path>();
--    files.add(classFile);
--
--    var parent = classFile.getParent();
--    if (parent != null) {
--      var glob = classFile.getFileName().toString().replace(".class", "$*.class");
--      try (DirectoryStream<Path> inner = Files.newDirectoryStream(parent, glob)) {
--        inner.forEach(files::add);
--      }
--      catch (IOException e) {
--        throw new UncheckedIOException(e);
--      }
--    }
--
--    return files;
--  }
- }
-diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java b/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..05df2e2f7842eb444a1015c69894efc69416f55a
---- /dev/null
-+++ b/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
-@@ -0,0 +1,96 @@
-+/*
-+ * Copyright 2000-2017 JetBrains s.r.o.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+package org.jetbrains.java.decompiler;
-+
-+import org.junit.After;
-+import org.junit.Before;
-+import java.io.IOException;
-+import java.io.UncheckedIOException;
-+import java.nio.file.DirectoryStream;
-+import java.nio.file.Files;
-+import java.nio.file.Path;
-+import java.util.ArrayList;
-+import java.util.List;
-+import java.util.Map;
-+
-+import static org.assertj.core.api.Assertions.assertThat;
-+import static org.jetbrains.java.decompiler.DecompilerTestFixture.assertFilesEqual;
-+import static org.junit.Assert.assertTrue;
-+
-+public class SingleClassesTestBase {
-+  protected DecompilerTestFixture fixture;
-+  
-+  protected Map<String, String> getDecompilerOptions() {
-+    return Map.of();
-+  }
-+
-+  @Before
-+  public void setUp() throws IOException {
-+    fixture = new DecompilerTestFixture();
-+    fixture.setUp(getDecompilerOptions());
-+  }
-+
-+  @After
-+  public void tearDown() throws IOException {
-+    fixture.tearDown();
-+    fixture = null;
-+  }
-+
-+  protected void doTest(String testFile, String... companionFiles) {
-+    var decompiler = fixture.getDecompiler();
-+
-+    var classFile = fixture.getTestDataDir().resolve("classes/" + testFile + ".class");
-+    assertThat(classFile).isRegularFile();
-+    for (var file : collectClasses(classFile)) {
-+      decompiler.addSource(file.toFile());
-+    }
-+
-+    for (String companionFile : companionFiles) {
-+      var companionClassFile = fixture.getTestDataDir().resolve("classes/" + companionFile + ".class");
-+      assertThat(companionClassFile).isRegularFile();
-+      for (var file : collectClasses(companionClassFile)) {
-+        decompiler.addSource(file.toFile());
-+      }
-+    }
-+
-+    decompiler.decompileContext();
-+
-+    var decompiledFile = fixture.getTargetDir().resolve(classFile.getFileName().toString().replace(".class", ".java"));
-+    assertThat(decompiledFile).isRegularFile();
-+    assertTrue(Files.isRegularFile(decompiledFile));
-+    var referenceFile = fixture.getTestDataDir().resolve("results/" + classFile.getFileName().toString().replace(".class", ".dec"));
-+    assertThat(referenceFile).isRegularFile();
-+    assertFilesEqual(referenceFile, decompiledFile);
-+  }
-+
-+  private static List<Path> collectClasses(Path classFile) {
-+    var files = new ArrayList<Path>();
-+    files.add(classFile);
-+
-+    var parent = classFile.getParent();
-+    if (parent != null) {
-+      var glob = classFile.getFileName().toString().replace(".class", "$*.class");
-+      try (DirectoryStream<Path> inner = Files.newDirectoryStream(parent, glob)) {
-+        inner.forEach(files::add);
-+      }
-+      catch (IOException e) {
-+        throw new UncheckedIOException(e);
-+      }
-+    }
-+
-+    return files;
-+  }
-+}
-\ No newline at end of file
diff --git a/FernFlower-Patches/0003-Fix-initializers-for-anon-and-synthetic-classes.patch b/FernFlower-Patches/0003-Fix-initializers-for-anon-and-synthetic-classes.patch
deleted file mode 100644
index 29e15fd..0000000
--- a/FernFlower-Patches/0003-Fix-initializers-for-anon-and-synthetic-classes.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Wed, 12 Apr 2017 13:21:00 -0700
-Subject: [PATCH] Fix initializers for anon and synthetic classes
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index 31f14c60939faaf73e8b971cb64c81b49decda81..9b4e9fb3ab0a2f54c124c8a4c3943e6d7a5d01d2 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-@@ -46,6 +46,7 @@ public class ClassWriter {
-     StructClass cl = wrapper.getClassStruct();
- 
-     InitializerProcessor.extractInitializers(wrapper);
-+    InitializerProcessor.hideInitalizers(wrapper);
- 
-     if (node.type == ClassNode.CLASS_ROOT &&
-         !cl.isVersion5() &&
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index b09304aac7771bda2dcec3ef535f9035904f3c94..8dc45a1de093a5e81ef74e034faf2041618ced99 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-@@ -88,6 +88,31 @@ public class ClassesProcessor implements CodeConstants {
-               rec.type = entry.simpleNameIdx == 0 ? ClassNode.CLASS_ANONYMOUS : entry.outerNameIdx == 0 ? ClassNode.CLASS_LOCAL : ClassNode.CLASS_MEMBER;
-               rec.accessFlags = entry.accessFlags;
- 
-+              // nested class type
-+              if (entry.innerName != null) {
-+                if (entry.simpleName == null) {
-+                  rec.type = ClassNode.CLASS_ANONYMOUS;
-+                }
-+                else {
-+                  StructClass in = context.getClass(entry.innerName);
-+                  if (in == null) { // A referenced library that was not added to the context, make assumptions
-+                      rec.type = ClassNode.CLASS_MEMBER;
-+                  }
-+                  else {
-+                    StructEnclosingMethodAttribute attr = in.getAttribute(StructGeneralAttribute.ATTRIBUTE_ENCLOSING_METHOD);
-+                    if (attr != null && attr.getMethodName() != null) {
-+                      rec.type = ClassNode.CLASS_LOCAL;
-+                    }
-+                    else {
-+                      rec.type = ClassNode.CLASS_MEMBER;
-+                    }
-+                  }
-+                }
-+              }
-+              else { // This should never happen as inner_class and outer_class are NOT optional, make assumptions
-+                rec.type = ClassNode.CLASS_MEMBER;
-+              }
-+
-               // enclosing class
-               String enclClassName = entry.outerNameIdx != 0 ? entry.enclosingName : cl.qualifiedName;
-               if (enclClassName == null || innerName.equals(enclClassName)) {
-diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
-index 7abfd011cee7c1c14a1418f826a39403f75a62db..b44a78019f0717213822ef5572c5d7ecde6d4ee3 100644
---- a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
-@@ -13,6 +13,9 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statements;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
- import org.jetbrains.java.decompiler.struct.StructClass;
- import org.jetbrains.java.decompiler.struct.StructField;
-+import org.jetbrains.java.decompiler.struct.StructMethod;
-+import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
-+import org.jetbrains.java.decompiler.struct.gen.VarType;
- import org.jetbrains.java.decompiler.util.InterpreterUtil;
- 
- import java.util.ArrayList;
-@@ -90,8 +93,52 @@ public final class InitializerProcessor {
-         Exprent exprent = firstData.getExprents().get(0);
-         if (exprent.type == Exprent.EXPRENT_INVOCATION) {
-           InvocationExprent invExpr = (InvocationExprent)exprent;
--          if (Statements.isInvocationInitConstructor(invExpr, method, wrapper, false) && invExpr.getParameters().isEmpty()) {
--            firstData.getExprents().remove(0);
-+          if (Statements.isInvocationInitConstructor(invExpr, method, wrapper, false)) {
-+            List<VarVersionPair> mask = ExprUtil.getSyntheticParametersMask(invExpr.getClassName(), invExpr.getStringDescriptor(), invExpr.getParameters().size());
-+            boolean hideSuper = true;
-+
-+            //searching for non-synthetic params
-+            for (int i = 0; i < invExpr.getDescriptor().params.length; ++i) {
-+              if (mask != null && mask.get(i) != null) {
-+                continue;
-+              }
-+              VarType type = invExpr.getDescriptor().params[i];
-+              if (type.getType() == CodeConstants.TYPE_OBJECT) {
-+                ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(type.getValue());
-+                if (node != null && (node.type == ClassNode.CLASS_ANONYMOUS || (node.access & CodeConstants.ACC_SYNTHETIC) != 0)) {
-+                  break; // Should be last
-+                }
-+              }
-+              hideSuper = false; // found non-synthetic param so we keep the call
-+              break;
-+            }
-+
-+            if (hideSuper) {
-+              firstData.getExprents().remove(0);
-+            }
-+          }
-+        }
-+      }
-+    }
-+  }
-+
-+  public static void hideInitalizers(ClassWrapper wrapper) {
-+    // hide initializers with anon class arguments
-+    for (MethodWrapper method : wrapper.getMethods()) {
-+      StructMethod mt = method.methodStruct;
-+      String name = mt.getName();
-+      String desc = mt.getDescriptor();
-+
-+      if (mt.isSynthetic() && CodeConstants.INIT_NAME.equals(name)) {
-+        MethodDescriptor md = MethodDescriptor.parseDescriptor(desc);
-+        if (md.params.length > 0) {
-+          VarType type = md.params[md.params.length - 1];
-+          if (type.getType() == CodeConstants.TYPE_OBJECT) {
-+            ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(type.getValue());
-+            if (node != null && (node.type == ClassNode.CLASS_ANONYMOUS) || (node.access & CodeConstants.ACC_SYNTHETIC) != 0) {
-+              //TODO: Verify that the body is JUST a this([args]) call?
-+              wrapper.getHiddenMembers().add(InterpreterUtil.makeUniqueKey(name, desc));
-+            }
-           }
-         }
-       }
diff --git a/FernFlower-Patches/0003-Loosen-up-restrictions-on-field-initalizers-allowing.patch b/FernFlower-Patches/0003-Loosen-up-restrictions-on-field-initalizers-allowing.patch
new file mode 100644
index 0000000..33d30c6
--- /dev/null
+++ b/FernFlower-Patches/0003-Loosen-up-restrictions-on-field-initalizers-allowing.patch
@@ -0,0 +1,116 @@
+From be53afc282317c377cf92433cf40b01dce77af77 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sat, 1 Aug 2015 15:10:28 -0700
+Subject: [PATCH 003/122] Loosen up restrictions on field initalizers allowing
+ for some to be moved out of the <ini> and <cinit> functions.
+
+---
+ .../decompiler/main/InitializerProcessor.java | 37 ++++++++++++-------
+ 1 file changed, 23 insertions(+), 14 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
+index d9a0a3d..d916b19 100644
+--- a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
+@@ -29,7 +29,10 @@ import org.jetbrains.java.decompiler.struct.StructField;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ 
+ import java.util.ArrayList;
++import java.util.HashSet;
++import java.util.Iterator;
+ import java.util.List;
++import java.util.Set;
+ 
+ 
+ public class InitializerProcessor {
+@@ -124,13 +127,13 @@ public class InitializerProcessor {
+ 
+     RootStatement root = meth.root;
+     StructClass cl = wrapper.getClassStruct();
++    Set<String> whitelist = new HashSet<String>();
+ 
+     Statement firstdata = findFirstData(root);
+     if (firstdata != null) {
+-      while (!firstdata.getExprents().isEmpty()) {
+-        Exprent exprent = firstdata.getExprents().get(0);
+-
+-        boolean found = false;
++      Iterator<Exprent> itr = firstdata.getExprents().iterator();
++      while (itr.hasNext()) {
++        Exprent exprent = itr.next();
+ 
+         if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
+           AssignmentExprent asexpr = (AssignmentExprent)exprent;
+@@ -139,22 +142,18 @@ public class InitializerProcessor {
+             if (fexpr.isStatic() && fexpr.getClassname().equals(cl.qualifiedName) &&
+                 cl.hasField(fexpr.getName(), fexpr.getDescriptor().descriptorString)) {
+ 
+-              if (isExprentIndependent(asexpr.getRight(), meth)) {
++              if (isExprentIndependent(asexpr.getRight(), meth, cl, whitelist)) {
+ 
+                 String keyField = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
+                 if (!wrapper.getStaticFieldInitializers().containsKey(keyField)) {
+                   wrapper.getStaticFieldInitializers().addWithKey(asexpr.getRight(), keyField);
+-                  firstdata.getExprents().remove(0);
+-                  found = true;
++                  whitelist.add(keyField);
++                  itr.remove();
+                 }
+               }
+             }
+           }
+         }
+-
+-        if (!found) {
+-          break;
+-        }
+       }
+     }
+   }
+@@ -191,6 +190,8 @@ public class InitializerProcessor {
+       return;
+     }
+ 
++    Set<String> whitelist = new HashSet<String>();
++
+     while (true) {
+ 
+       String fieldWithDescr = null;
+@@ -216,7 +217,7 @@ public class InitializerProcessor {
+                 cl.hasField(fexpr.getName(), fexpr
+                   .getDescriptor().descriptorString)) { // check for the physical existence of the field. Could be defined in a superclass.
+ 
+-              if (isExprentIndependent(asexpr.getRight(), lstMethWrappers.get(i))) {
++              if (isExprentIndependent(asexpr.getRight(), lstMethWrappers.get(i), cl, whitelist)) {
+                 String fieldKey = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
+                 if (fieldWithDescr == null) {
+                   fieldWithDescr = fieldKey;
+@@ -252,7 +253,7 @@ public class InitializerProcessor {
+     }
+   }
+ 
+-  private static boolean isExprentIndependent(Exprent exprent, MethodWrapper meth) {
++  private static boolean isExprentIndependent(Exprent exprent, MethodWrapper meth, StructClass cl, Set<String> whitelist) {
+ 
+     List<Exprent> lst = exprent.getAllExprents(true);
+     lst.add(exprent);
+@@ -270,7 +271,15 @@ public class InitializerProcessor {
+           }
+           break;
+         case Exprent.EXPRENT_FIELD:
+-          return false;
++          FieldExprent fexpr = (FieldExprent)expr;
++          if (cl.qualifiedName.equals(fexpr.getClassname())) {
++            if (!whitelist.contains(InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString))) {
++              return false;
++            }
++          }
++          else if (!fexpr.isStatic()) {
++            return false;
++          }
+       }
+     }
+ 
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0004-Fix-output-discrepancies-to-produce-stable-output.patch b/FernFlower-Patches/0004-Fix-output-discrepancies-to-produce-stable-output.patch
deleted file mode 100644
index 73c6a48..0000000
--- a/FernFlower-Patches/0004-Fix-output-discrepancies-to-produce-stable-output.patch
+++ /dev/null
@@ -1,1373 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Wed, 12 Apr 2017 10:08:10 -0700
-Subject: [PATCH] Fix output discrepancies to produce stable output
-
-Running JVM and timestamp result in output varying between
-environments and runs.
-
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index 8dc45a1de093a5e81ef74e034faf2041618ced99..8173ecd04da97e5e9a8f5f9a2e309726439697e0 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-@@ -249,6 +249,7 @@ public class ClassesProcessor implements CodeConstants {
-                 stack.add(nestedClass);
-               }
-             }
-+            Collections.sort(superNode.nested);
-           }
-         }
-       }
-@@ -451,7 +452,7 @@ public class ClassesProcessor implements CodeConstants {
-   }
- 
- 
--  public static class ClassNode {
-+  public static class ClassNode implements Comparable<ClassNode> {
-     public static final int CLASS_ROOT = 0;
-     public static final int CLASS_MEMBER = 1;
-     public static final int CLASS_ANONYMOUS = 2;
-@@ -542,6 +543,12 @@ public class ClassesProcessor implements CodeConstants {
-       isNonSealed = nonSealed;
-     }
- 
-+    @Override
-+    public int compareTo(ClassNode o) {
-+      //TODO: Take line numbers into account?
-+      return this.classStruct.qualifiedName.compareTo(o.classStruct.qualifiedName);
-+    }
-+
-     public static class LambdaInformation {
-       public String method_name;
-       public String method_descriptor;
-diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
-index 75d4d0937f1e39fe630b1318a4ad531de7fbd644..d0ae9a7c3b20de44cb202390cc0dfd4d690fee64 100644
---- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
-+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
-@@ -11,7 +11,7 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil;
- import java.io.*;
- import java.nio.charset.StandardCharsets;
- import java.util.*;
--import java.util.jar.JarOutputStream;
-+import java.util.jar.JarFile;
- import java.util.jar.Manifest;
- import java.util.zip.ZipEntry;
- import java.util.zip.ZipFile;
-@@ -189,7 +189,14 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
-       }
- 
-       FileOutputStream fileStream = new FileOutputStream(file);
--      ZipOutputStream zipStream = manifest != null ? new JarOutputStream(fileStream, manifest) : new ZipOutputStream(fileStream);
-+      ZipOutputStream zipStream = new ZipOutputStream(fileStream);
-+      if (manifest != null) {
-+        final ZipEntry manifestEntry = new ZipEntry(JarFile.MANIFEST_NAME);
-+        manifestEntry.setTime(STABLE_ZIP_TIMESTAMP);
-+        zipStream.putNextEntry(manifestEntry);
-+        manifest.write(zipStream);
-+        zipStream.closeEntry();
-+      }
-       mapArchiveStreams.put(file.getPath(), zipStream);
-     }
-     catch (IOException ex) {
-@@ -215,7 +222,9 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
-       if (entry != null) {
-         try (InputStream in = srcArchive.getInputStream(entry)) {
-           ZipOutputStream out = mapArchiveStreams.get(file);
--          out.putNextEntry(new ZipEntry(entryName));
-+          final ZipEntry newEntry = new ZipEntry(entryName);
-+          newEntry.setTime(entry.getTime());
-+          out.putNextEntry(newEntry);
-           InterpreterUtil.copyStream(in, out);
-         }
-       }
-@@ -236,7 +245,9 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
- 
-     try {
-       ZipOutputStream out = mapArchiveStreams.get(file);
--      out.putNextEntry(new ZipEntry(entryName));
-+      ZipEntry entry = new ZipEntry(entryName);
-+      entry.setTime(STABLE_ZIP_TIMESTAMP);
-+      out.putNextEntry(entry);
-       if (content != null) {
-         out.write(content.getBytes(StandardCharsets.UTF_8));
-       }
-diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-index 5448e7900953da79b2bc01f99fd7e8f3080148e7..b509376a6dbc3780f7c14c631bf51b7fc24aa50d 100644
---- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-@@ -35,6 +35,8 @@ public interface IFernflowerPreferences {
-   String IGNORE_INVALID_BYTECODE = "iib";
-   String VERIFY_ANONYMOUS_CLASSES = "vac";
- 
-+  String STANDARDIZE_FLOATING_POINT_NUMBERS = "sfn";
-+
-   String LOG_LEVEL = "log";
-   String MAX_PROCESSING_METHOD = "mpm";
-   String RENAME_ENTITIES = "ren";
-@@ -81,6 +83,8 @@ public interface IFernflowerPreferences {
-     defaults.put(IGNORE_INVALID_BYTECODE, "0");
-     defaults.put(VERIFY_ANONYMOUS_CLASSES, "0");
- 
-+    defaults.put(STANDARDIZE_FLOATING_POINT_NUMBERS, "1");
-+
-     defaults.put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name());
-     defaults.put(MAX_PROCESSING_METHOD, "0");
-     defaults.put(RENAME_ENTITIES, "0");
-diff --git a/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java b/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java
-index fad1ddcfb9d2e43720b4cd3acaa165ba86e94892..cf03900654e427bd435ba6dc2d5a0cec8c8708e4 100644
---- a/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java
-+++ b/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java
-@@ -4,6 +4,8 @@ package org.jetbrains.java.decompiler.main.extern;
- import java.util.jar.Manifest;
- 
- public interface IResultSaver {
-+  long STABLE_ZIP_TIMESTAMP = 0x386D4380; // 01/01/2000 00:00:00 java 8 breaks when using 0.
-+
-   void saveFolder(String path);
- 
-   void copyFile(String source, String path, String entryName);
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
-index 05e6e2d720aa5812ef12c4741eab06b8ea477e0f..f9c8c6a0334512699c545c881207194745427c96 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
-@@ -19,6 +19,7 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil;
- 
- import java.io.IOException;
- import java.util.BitSet;
-+import java.util.Collections;
- import java.util.HashMap;
- import java.util.List;
- import java.util.Map;
-@@ -110,6 +111,8 @@ public class LambdaProcessor {
-       mt.releaseResources();
-     }
- 
-+    Collections.sort(node.nested);
-+
-     // build class hierarchy on lambda
-     for (ClassNode nd : node.nested) {
-       if (nd.type == ClassNode.CLASS_LAMBDA) {
-@@ -119,6 +122,7 @@ public class LambdaProcessor {
- 
-           parent_class.nested.add(nd);
-           nd.parent = parent_class;
-+          Collections.sort(parent_class.nested);
-         }
-       }
-     }
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index da1fc15420faf03e1afbf74c39f888a6cb9c9ce8..6e5fe5474d6878d789758a5e7791b03e5da6685e 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-@@ -218,6 +218,7 @@ public class NestedClassProcessor {
-       if (setEnclosing.contains(node.classStruct.qualifiedName)) {
-         node.nested.add(child);
-         child.parent = node;
-+        Collections.sort(node.nested);
- 
-         return true;
-       }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
-index 868955437f5c05d8b011671089de24aa7d5ab8cc..277e792a2856334970bafe0661582a8c8d09ad5a 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
-@@ -194,7 +194,7 @@ public final class DomHelper {
- 
-     RootStatement root = graphToStatement(graph);
- 
--    if (!processStatement(root, new HashMap<>())) {
-+    if (!processStatement(root, new LinkedHashMap<>())) {
- 
-       //			try {
-       //				DotExporter.toDotFile(root.getFirst().getStats().get(13), new File("c:\\Temp\\stat1.dot"));
-@@ -204,7 +204,7 @@ public final class DomHelper {
-       throw new RuntimeException("parsing failure!");
-     }
- 
--    LabelHelper.lowContinueLabels(root, new HashSet<>());
-+    LabelHelper.lowContinueLabels(root, new LinkedHashSet<>());
- 
-     SequenceHelper.condenseSequences(root);
-     root.buildMonitorFlags();
-@@ -452,11 +452,11 @@ public final class DomHelper {
- 
-         boolean same = (post == head);
- 
--        HashSet<Statement> setNodes = new HashSet<>();
-+        HashSet<Statement> setNodes = new LinkedHashSet<>();
-         HashSet<Statement> setPreds = new HashSet<>();
- 
-         // collect statement nodes
--        HashSet<Statement> setHandlers = new HashSet<>();
-+        HashSet<Statement> setHandlers = new LinkedHashSet<>();
-         setHandlers.add(head);
-         while (true) {
- 
-@@ -601,7 +601,7 @@ public final class DomHelper {
-               set.removeAll(setOldNodes);
- 
-               if (setOldNodes.contains(key)) {
--                mapExtPost.computeIfAbsent(newid, k -> new HashSet<>()).addAll(set);
-+                mapExtPost.computeIfAbsent(newid, k -> new LinkedHashSet<>()).addAll(set);
-                 mapExtPost.remove(key);
-               }
-               else {
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-index cf3ce3d5c4d304c8f1ee121a9781d3238f794b91..6783382a1c199ba33df1af3477d3cf5e13230b09 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-@@ -928,6 +928,7 @@ public class ExprProcessor implements CodeConstants {
-     }
- 
-     TextBuffer buf = new TextBuffer();
-+    lst = Exprent.sortIndexed(lst);
- 
-     for (Exprent expr : lst) {
-       if (buf.length() > 0 && expr.type == Exprent.EXPRENT_VAR && ((VarExprent)expr).isClassDef()) {
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
-index 2770c678a4572cd95bbb0d7f98fadb4bb62fcbd8..878c12b061975d4060b8a44abffa3d60d35d17a3 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
-@@ -453,9 +453,16 @@ public class FinallyProcessor {
-     // `throw` in the `try` body will point directly to the dummy exit, so remove it
-     startBlocks.remove(graph.getLast());
-     startBlocks.removeAll(tryBlocks);
-+    List<BasicBlock> starts = new ArrayList<>(startBlocks);
-+    Collections.sort(starts, new Comparator<BasicBlock>() {
-+      @Override
-+      public int compare(BasicBlock o1, BasicBlock o2) {
-+        return o2.id - o1.id;
-+      }
-+    });
- 
-     List<Area> areas = new ArrayList<>();
--    for (BasicBlock start : startBlocks) {
-+    for (BasicBlock start : starts) {
-       Area arr = compareSubGraphsEx(graph, start, catchBlocks, first, finallyType, mapLast, skippedFirst);
-       if (arr == null) {
-         return false;
-@@ -468,8 +475,12 @@ public class FinallyProcessor {
-       deleteArea(graph, area);
-     }
- 
-+    List<Entry<BasicBlock, Boolean>> lasts = new ArrayList<>(mapLast.entrySet());
-+    // We must sort here to prevent decompile differences deriving from hash maps.
-+    lasts.sort(Comparator.comparingInt(o -> o.getKey().id));
-+
-     // INFO: Empty basic blocks may remain in the graph!
--    for (Entry<BasicBlock, Boolean> entry : mapLast.entrySet()) {
-+    for (Entry<BasicBlock, Boolean> entry : lasts) {
-       BasicBlock last = entry.getKey();
- 
-       if (entry.getValue()) {
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
-index df41b33643bd48f0f5549efe0931eb489dac21c9..1416640aedb91596be42c94697c3f74a25c1229d 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
-@@ -23,7 +23,7 @@ public final class LabelHelper {
- 
-     liftClosures(root);
- 
--    lowContinueLabels(root, new HashSet<>());
-+    lowContinueLabels(root, new LinkedHashSet<>());
- 
-     lowClosures(root);
-   }
-@@ -120,7 +120,7 @@ public final class LabelHelper {
-         lowContinueLabels(st, edges);
-       }
-       else {
--        lowContinueLabels(st, new HashSet<>());
-+        lowContinueLabels(st, new LinkedHashSet<>());
-       }
-     }
-   }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
-index 09e36dc4686d5e445a48325295ace392a79182f7..da65e74c53d2dc8f0e5f5ab538fe7b9defc5b135 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
-@@ -14,10 +14,10 @@ public class DominatorTreeExceptionFilter {
-   private final Statement statement;
- 
-   // idom, nodes
--  private final Map<Integer, Set<Integer>> mapTreeBranches = new HashMap<>();
-+  private final Map<Integer, Set<Integer>> mapTreeBranches = new LinkedHashMap<>();
- 
-   // handler, range nodes
--  private final Map<Integer, Set<Integer>> mapExceptionRanges = new HashMap<>();
-+  private final Map<Integer, Set<Integer>> mapExceptionRanges = new LinkedHashMap<>();
- 
-   // handler, head dom
-   private Map<Integer, Integer> mapExceptionDoms = new HashMap<>();
-@@ -67,7 +67,7 @@ public class DominatorTreeExceptionFilter {
-     for (int index = lstKeys.size() - 1; index >= 0; index--) {
-       Integer key = lstKeys.get(index);
-       Integer idom = orderedIDoms.get(index);
--      mapTreeBranches.computeIfAbsent(idom, k -> new HashSet<>()).add(key);
-+      mapTreeBranches.computeIfAbsent(idom, k -> new LinkedHashSet<>()).add(key);
-     }
- 
-     Integer firstid = statement.getFirst().id;
-@@ -79,7 +79,7 @@ public class DominatorTreeExceptionFilter {
-       List<Statement> lstPreds = stat.getNeighbours(EdgeType.EXCEPTION, EdgeDirection.BACKWARD);
-       if (!lstPreds.isEmpty()) {
- 
--        Set<Integer> set = new HashSet<>();
-+        Set<Integer> set = new LinkedHashSet<>();
- 
-         for (Statement st : lstPreds) {
-           set.add(st.id);
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
-index 82ae0a25a20d2727f611d359e699d6666d1e0ae4..a86f0d2887c6c19cb1d911ec43830eb69f8aaada 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
-@@ -14,9 +14,9 @@ public class FastExtendedPostdominanceHelper {
- 
-   private List<Statement> lstReversePostOrderList;
- 
--  private HashMap<Integer, FastFixedSet<Integer>> mapSupportPoints = new HashMap<>();
-+  private HashMap<Integer, FastFixedSet<Integer>> mapSupportPoints = new LinkedHashMap<>();
- 
--  private final HashMap<Integer, FastFixedSet<Integer>> mapExtPostdominators = new HashMap<>();
-+  private final HashMap<Integer, FastFixedSet<Integer>> mapExtPostdominators = new LinkedHashMap<>();
- 
-   private Statement statement;
- 
-@@ -26,7 +26,7 @@ public class FastExtendedPostdominanceHelper {
- 
-     this.statement = statement;
- 
--    HashSet<Integer> set = new HashSet<>();
-+    HashSet<Integer> set = new LinkedHashSet<>();
-     for (Statement st : statement.getStats()) {
-       set.add(st.id);
-     }
-@@ -54,7 +54,9 @@ public class FastExtendedPostdominanceHelper {
-     Set<Entry<Integer, FastFixedSet<Integer>>> entries = mapExtPostdominators.entrySet();
-     HashMap<Integer, Set<Integer>> res = new HashMap<>(entries.size());
-     for (Entry<Integer, FastFixedSet<Integer>> entry : entries) {
--      res.put(entry.getKey(), entry.getValue().toPlainSet());
-+      List<Integer> lst = new ArrayList<>(entry.getValue().toPlainSet());
-+      Collections.sort(lst); // Order Matters!
-+      res.put(entry.getKey(), new LinkedHashSet<>(lst));
-     }
- 
-     return res;
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-index 743074d1b43f6b331cef74c94bb11a49fefbfb61..623d59228cc526cca3bbd52e95e4d493c689f133 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-@@ -216,7 +216,7 @@ public class ConstExprent extends Exprent {
-         else if (floatVal == Float.NEGATIVE_INFINITY) {
-           yield new TextBuffer("-1.0F / 0.0F");
-         }
--        yield new TextBuffer(value.toString()).append('F');
-+        yield new TextBuffer(trimFloat(Float.toString(floatVal), floatVal)).append('F');
-       }
-       case CodeConstants.TYPE_DOUBLE -> {
-         double doubleVal = (Double)value;
-@@ -247,15 +247,15 @@ public class ConstExprent extends Exprent {
-           }
-         }
-         else if (Double.isNaN(doubleVal)) {
--          yield new TextBuffer("0.0 / 0.0");
-+          yield new TextBuffer("0.0D / 0.0D");
-         }
-         else if (doubleVal == Double.POSITIVE_INFINITY) {
--          yield new TextBuffer("1.0 / 0.0");
-+          yield new TextBuffer("1.0D / 0.0D");
-         }
-         else if (doubleVal == Double.NEGATIVE_INFINITY) {
--          yield new TextBuffer("-1.0 / 0.0");
-+          yield new TextBuffer("-1.0D / 0.0D");
-         }
--        yield new TextBuffer(value.toString());
-+        yield new TextBuffer(trimDouble(Double.toString(doubleVal), doubleVal)).append('D');
-       }
-       case CodeConstants.TYPE_NULL -> new TextBuffer("null");
-       case CodeConstants.TYPE_OBJECT -> {
-@@ -273,6 +273,92 @@ public class ConstExprent extends Exprent {
-     };
-   }
- 
-+  // Different JVM implementations/version display Floats and Doubles with different String representations
-+  // for the same thing. This trims them all down to only the necessary amount.
-+  private static String trimFloat(String value, float start) {
-+    // Includes NaN and simple numbers
-+    if (value.length() <= 3 || !DecompilerContext.getOption(IFernflowerPreferences.STANDARDIZE_FLOATING_POINT_NUMBERS))
-+      return value;
-+
-+    String exp = "";
-+    int eIdx = value.indexOf('E');
-+    if (eIdx != -1) {
-+      exp = value.substring(eIdx);
-+      value = value.substring(0, eIdx);
-+    }
-+
-+    // Cut off digits that don't affect the value
-+    String temp = value;
-+    int dotIdx = value.indexOf('.');
-+    do {
-+      value = temp;
-+      temp = value.substring(0, value.length() - 1);
-+    } while (!temp.isEmpty() && !"-".equals(temp) && Float.parseFloat(temp + exp) == start);
-+
-+    if (dotIdx != -1 && value.indexOf('.') == -1) {
-+      value += ".0";
-+    } else if (dotIdx != -1) {
-+      String integer = value.substring(0, dotIdx);
-+      String decimal = value.substring(dotIdx + 1);
-+
-+      String rounded = (Integer.parseInt(integer) + 1) + ".0" + exp;
-+      if (Float.parseFloat(rounded) == start)
-+        return rounded;
-+
-+      long decimalVal = 1;
-+      for (int i = 0; i < decimal.length() - 1; i++) {
-+        decimalVal = (decimalVal - 1) * 10 + decimal.charAt(i) - '0' + 1;
-+        rounded = integer + '.' + decimalVal + exp;
-+        if (Float.parseFloat(rounded) == start)
-+          return rounded;
-+      }
-+    }
-+
-+    return value + exp;
-+  }
-+
-+  private static String trimDouble(String value, double start) {
-+    // Includes NaN and simple numbers
-+    if (value.length() <= 3 || !DecompilerContext.getOption(IFernflowerPreferences.STANDARDIZE_FLOATING_POINT_NUMBERS))
-+      return value;
-+
-+    String exp = "";
-+    int eIdx = value.indexOf('E');
-+    if (eIdx != -1) {
-+      exp = value.substring(eIdx);
-+      value = value.substring(0, eIdx);
-+    }
-+
-+    // Cut off digits that don't affect the value
-+    String temp = value;
-+    int dotIdx = value.indexOf('.');
-+    do {
-+      value = temp;
-+      temp = value.substring(0, value.length() - 1);
-+    } while (!temp.isEmpty() && !"-".equals(temp) && Double.parseDouble(temp + exp) == start);
-+
-+    if (dotIdx != -1 && value.indexOf('.') == -1) {
-+      value += ".0";
-+    } else if (dotIdx != -1) {
-+      String integer = value.substring(0, dotIdx);
-+      String decimal = value.substring(dotIdx + 1);
-+
-+      String rounded = (Long.parseLong(integer) + 1) + ".0" + exp;
-+      if (Double.parseDouble(rounded) == start)
-+        return rounded;
-+
-+      long decimalVal = 1;
-+      for (int i = 0; i < decimal.length() - 1; i++) {
-+        decimalVal = (decimalVal - 1) * 10 + decimal.charAt(i) - '0' + 1;
-+        rounded = integer + '.' + decimalVal + exp;
-+        if (Double.parseDouble(rounded) == start)
-+          return rounded;
-+      }
-+    }
-+
-+    return value + exp;
-+  }
-+
-   private boolean inConstantVariable(String classSignature, String variableName) {
-     ClassesProcessor.ClassNode node = (ClassesProcessor.ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE);
-     return node.classStruct.qualifiedName.equals(classSignature) &&
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-index cc1f537e71af0748b7b97d7d8489198e2a677cc9..9b1b3de632a63bbba1f5f7a99d5f75bf537bd171 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-@@ -15,7 +15,10 @@ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
- import org.jetbrains.java.decompiler.struct.match.MatchNode;
- import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
- 
-+import java.util.ArrayList;
- import java.util.Collection;
-+import java.util.Collections;
-+import java.util.Comparator;
- import java.util.HashSet;
- import java.util.List;
- import java.util.Map.Entry;
-@@ -131,6 +134,39 @@ public class Exprent implements IMatchable {
-     }
-   }
- 
-+  public static List<? extends Exprent> sortIndexed(List<? extends Exprent> lst) {
-+      List<Exprent> ret = new ArrayList<>();
-+      List<VarExprent> defs = new ArrayList<>();
-+
-+      Comparator<VarExprent> comp = new Comparator<>() {
-+        @Override
-+        public int compare(VarExprent o1, VarExprent o2) {
-+          return o1.getIndex() - o2.getIndex();
-+        }
-+      };
-+
-+      for (Exprent exp : lst) {
-+        boolean isDef = exp instanceof VarExprent && ((VarExprent)exp).isDefinition();
-+        if (!isDef) {
-+          if (defs.size() > 0) {
-+            Collections.sort(defs, comp);
-+            ret.addAll(defs);
-+            defs.clear();
-+          }
-+          ret.add(exp);
-+        }
-+        else {
-+          defs.add((VarExprent)exp);
-+        }
-+      }
-+
-+      if (defs.size() > 0) {
-+        Collections.sort(defs, comp);
-+        ret.addAll(defs);
-+      }
-+      return ret;
-+    }
-+
-   // *****************************************************************************
-   // IMatchable implementation
-   // *****************************************************************************
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
-index 3991c5131e1b49cd7ee25626aa64ad3999766ce5..70b053d4138127c772f72eca7a54a1b8b3098cbf 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
-@@ -22,6 +22,7 @@ import org.jetbrains.java.decompiler.util.SFormsFastMapDirect;
- import java.util.HashMap;
- import java.util.HashSet;
- import java.util.List;
-+import java.util.ArrayList;
- import java.util.Map.Entry;
- import java.util.Objects;
- 
-@@ -57,7 +58,7 @@ public class SSAConstructorSparseEx {
-     // DotExporter.toDotFile(dgraph, new File("c:\\Temp\\gr12_my.dot"));
-     // } catch(Exception ex) {ex.printStackTrace();}
- 
--    HashSet<Integer> setInit = new HashSet<>();
-+    List<Integer> setInit = new ArrayList<>();
-     for (int i = 0; i < 64; i++) {
-       setInit.add(i);
-     }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
-index 4d76ee298513f0989eadc2866d7a9d1f229612ef..8cd9f1de252412494f36a847167a9b74a7dd7625 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
-@@ -68,7 +68,7 @@ public class SSAUConstructorSparseEx {
-     FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
-     DirectGraph dgraph = flatthelper.buildDirectGraph(root);
- 
--    HashSet<Integer> setInit = new HashSet<>();
-+    List<Integer> setInit = new ArrayList<>();
-     for (int i = 0; i < 64; i++) {
-       setInit.add(i);
-     }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
-index 58f94462caa7a8212c3e9e36e343e2f4c55582f5..d355e63f8a3252bf58f0cdf18f42e6732132efef 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
-@@ -5,7 +5,8 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
- import org.jetbrains.java.decompiler.util.TextBuffer;
- 
- import java.util.Collection;
--import java.util.HashSet;
-+import java.util.LinkedHashSet;
-+import java.util.Set;
- 
- 
- public class GeneralStatement extends Statement {
-@@ -25,7 +26,7 @@ public class GeneralStatement extends Statement {
-     first = head;
-     stats.addWithKey(head, head.id);
- 
--    HashSet<Statement> set = new HashSet<>(statements);
-+    Set<Statement> set = new LinkedHashSet<>(statements);
-     set.remove(head);
- 
-     for (Statement st : set) {
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
-index 133d87f45ab3b057e78589a53529821e5a6a6dea..119949c8bd35082b95cbfde2b185aa2d23034224 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
-@@ -46,7 +46,16 @@ public final class SwitchStatement extends Statement {
-       regularSuccessors.remove(post);
-     }
-     defaultEdge = head.getSuccessorEdges(EdgeType.DIRECT_ALL).get(0);
--    for (Statement successor : regularSuccessors) {
-+
-+    //We need to use set above in case we have multiple edges to the same node. But HashSets iterator is not ordered, so sort
-+    List<Statement> sorted = new ArrayList<>(regularSuccessors);
-+    Collections.sort(sorted, new Comparator<Statement>() {
-+      @Override
-+      public int compare(Statement o1, Statement o2) {
-+        return o1.id - o2.id;
-+      }
-+    });
-+    for (Statement successor : sorted) {
-       stats.addWithKey(successor, successor.id);
-     }
-   }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-index 244898d5845029fb28126bd0c0365eec1c06f657..472faf9ad843f4d4bafdc2cf7753b67d8c34bddc 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-@@ -245,7 +245,10 @@ public class VarVersionsProcessor {
-     Map<Integer, Integer> mapOriginalVarIndices = new HashMap<>();
- 
-     // map var-version pairs on new var indexes
--    for (VarVersionPair pair : new ArrayList<>(mapExprentMinTypes.keySet())) {
-+    List<VarVersionPair> vvps = new ArrayList<>(mapExprentMinTypes.keySet());
-+    Collections.sort(vvps, (o1, o2) -> o1.var != o2.var ?  o1.var - o2.var : o1.version - o2.version);
-+
-+    for (VarVersionPair pair : vvps) {
- 
-       if (pair.version >= 0) {
-         int newIndex = pair.version == 1 ? pair.var : counters.getCounterAndIncrement(CounterContainer.VAR_COUNTER);
-diff --git a/testData/results/MoreAnnotations.dec b/testData/results/MoreAnnotations.dec
-index 7ea22e010e25dae99314be45985743c85da03b33..8a16a352f46a45a57f5dd2cbb8fbd14161178022 100644
---- a/testData/results/MoreAnnotations.dec
-+++ b/testData/results/MoreAnnotations.dec
-@@ -35,7 +35,7 @@ public @interface MoreAnnotations {
-       intArray = {1, 0, 2147483647, -2147483648},
-       byteArray = {1, 0, 127, -128, -1},
-       floatArray = {1.0F, 0.0F, 3.4028235E38F, 1.4E-45F, 0.0F / 0.0F, 1.0F / 0.0F, -1.0F / 0.0F},
--      doubleArray = {1.0, 0.0, 1.7976931348623157E308, 4.9E-324, 0.0 / 0.0, 1.0 / 0.0, -1.0 / 0.0},
-+      doubleArray = {1.0D, 0.0D, 1.7976931348623157E308D, 4.9E-324D, 0.0D / 0.0D, 1.0D / 0.0D, -1.0D / 0.0D},
-       booleanArray = {true, false},
-       shortArray = {1, 0, 32767, -32768, -1},
-       longArray = {1L, 0L, 9223372036854775807L, -9223372036854775808L},
-@@ -53,7 +53,7 @@ public @interface MoreAnnotations {
- 
-    float floatValue() default 1.0F / 0.0F;
- 
--   double doubleValue() default 0.0 / 0.0;
-+   double doubleValue() default 0.0D / 0.0D;
- 
-    boolean booleanValue() default true;
- 
-@@ -77,7 +77,7 @@ public @interface MoreAnnotations {
- 
-    float[] floatArray() default {1.0F, 0.0F, 3.4028235E38F, 1.4E-45F, 0.0F / 0.0F, 1.0F / 0.0F, -1.0F / 0.0F};
- 
--   double[] doubleArray() default {1.0, 0.0, 1.7976931348623157E308, 4.9E-324, 0.0 / 0.0, 1.0 / 0.0, -1.0 / 0.0};
-+   double[] doubleArray() default {1.0D, 0.0D, 1.7976931348623157E308D, 4.9E-324D, 0.0D / 0.0D, 1.0D / 0.0D, -1.0D / 0.0D};
- 
-    boolean[] booleanArray() default {true, false};
- 
-@@ -95,13 +95,13 @@ public @interface MoreAnnotations {
- 
-    Class<? extends CharSequence>[] classArray() default {CharSequence.class, String.class, StringBuilder.class};
- 
-+   public @interface NestedAnnotation {
-+      String value() default "MyString";
-+   }
-+
-    public static enum TestEnum {
-       FirstValue,
-       SecondValue;
-    }
--
--   public @interface NestedAnnotation {
--      String value() default "MyString";
--   }
- }
- 
-diff --git a/testData/results/TestAnonymousClass.dec b/testData/results/TestAnonymousClass.dec
-index 9cd9f538a6a53faa511ceac028001ccef418c3aa..3ea3c7058eadc696e538c72e018bd4076b07a397 100644
---- a/testData/results/TestAnonymousClass.dec
-+++ b/testData/results/TestAnonymousClass.dec
-@@ -67,15 +67,8 @@ public abstract class TestAnonymousClass {
-       boolean var1 = true;// 39
-    }// 40
- 
--   static class InnerRecursive {
--      InnerRecursive r;
--
--      public InnerRecursive(InnerRecursive var1) {
--         this.r = var1;// 105
--      }// 106
--
--      void foo() {
--      }// 110
-+   interface I {
-+      void foo() throws Exception;
-    }
- 
-    private static class Inner {
-@@ -87,8 +80,15 @@ public abstract class TestAnonymousClass {
-       };
-    }
- 
--   interface I {
--      void foo() throws Exception;
-+   static class InnerRecursive {
-+      TestAnonymousClass.InnerRecursive r;
-+
-+      public InnerRecursive(TestAnonymousClass.InnerRecursive var1) {
-+         this.r = var1;// 105
-+      }// 106
-+
-+      void foo() {
-+      }// 110
-    }
- }
- 
-@@ -180,24 +180,24 @@ class 'pkg/TestAnonymousClass' {
-    }
- }
- 
-+class 'pkg/TestAnonymousClass$Inner$1' {
-+   method 'run ()V' {
-+      0      76
-+      1      76
-+      2      77
-+      3      77
-+      4      78
-+   }
-+}
-+
- class 'pkg/TestAnonymousClass$InnerRecursive' {
-    method '<init> (Lpkg/TestAnonymousClass$InnerRecursive;)V' {
--      6      73
--      9      74
-+      6      86
-+      9      87
-    }
- 
-    method 'foo ()V' {
--      0      77
--   }
--}
--
--class 'pkg/TestAnonymousClass$Inner$1' {
--   method 'run ()V' {
--      0      83
--      1      83
--      2      84
--      3      84
--      4      85
-+      0      90
-    }
- }
- 
-@@ -223,9 +223,9 @@ Lines mapping:
- 53 <-> 18
- 54 <-> 19
- 55 <-> 20
--66 <-> 84
--67 <-> 85
--68 <-> 86
-+66 <-> 77
-+67 <-> 78
-+68 <-> 79
- 75 <-> 24
- 76 <-> 25
- 77 <-> 26
-@@ -234,9 +234,9 @@ Lines mapping:
- 91 <-> 37
- 92 <-> 38
- 93 <-> 39
--105 <-> 74
--106 <-> 75
--110 <-> 78
-+105 <-> 87
-+106 <-> 88
-+110 <-> 91
- Not mapped:
- 18
- 104
-diff --git a/testData/results/TestAnonymousClassConstructor.dec b/testData/results/TestAnonymousClassConstructor.dec
-index e4d02ffde3166e0b22f82550fa73bdea4c6d02ac..e48e5bc934ccd1ed1aedd0fcde645026bbb4e3fe 100644
---- a/testData/results/TestAnonymousClassConstructor.dec
-+++ b/testData/results/TestAnonymousClassConstructor.dec
-@@ -65,16 +65,16 @@ class TestAnonymousClassConstructor {
-       System.out.println("n(): " + s);// 53
-    }// 54
- 
--   static class InnerStaticPublic {
--      public InnerStaticPublic(long a, int b) {
--         TestAnonymousClassConstructor.n(a + "+" + b);// 100
--      }// 101
-+   class InnerPrivate {
-+      private InnerPrivate(long a, int b) {
-+         TestAnonymousClassConstructor.n(a + "+" + b);// 64
-+      }// 65
-    }
- 
--   static class InnerStaticPublicString {
--      public InnerStaticPublicString(String s) {
--         TestAnonymousClassConstructor.n(s);// 94
--      }// 95
-+   class InnerPrivateString {
-+      private InnerPrivateString(String s) {
-+         TestAnonymousClassConstructor.n(s);// 58
-+      }// 59
-    }
- 
-    class InnerPublic {
-@@ -101,16 +101,16 @@ class TestAnonymousClassConstructor {
-       }// 71
-    }
- 
--   class InnerPrivate {
--      private InnerPrivate(long a, int b) {
--         TestAnonymousClassConstructor.n(a + "+" + b);// 64
--      }// 65
-+   static class InnerStaticPublic {
-+      public InnerStaticPublic(long a, int b) {
-+         TestAnonymousClassConstructor.n(a + "+" + b);// 100
-+      }// 101
-    }
- 
--   class InnerPrivateString {
--      private InnerPrivateString(String s) {
--         TestAnonymousClassConstructor.n(s);// 58
--      }// 59
-+   static class InnerStaticPublicString {
-+      public InnerStaticPublicString(String s) {
-+         TestAnonymousClassConstructor.n(s);// 94
-+      }// 95
-    }
- }
- 
-@@ -190,19 +190,19 @@ class 'pkg/TestAnonymousClassConstructor' {
-    }
- }
- 
--class 'pkg/TestAnonymousClassConstructor$InnerStaticPublic' {
--   method '<init> (JI)V' {
--      f      69
--      18      69
--      1b      69
--      1e      70
-+class 'pkg/TestAnonymousClassConstructor$InnerPrivate' {
-+   method '<init> (Lpkg/TestAnonymousClassConstructor;JI)V' {
-+      14      69
-+      1e      69
-+      21      69
-+      24      70
-    }
- }
- 
--class 'pkg/TestAnonymousClassConstructor$InnerStaticPublicString' {
--   method '<init> (Ljava/lang/String;)V' {
--      5      75
--      8      76
-+class 'pkg/TestAnonymousClassConstructor$InnerPrivateString' {
-+   method '<init> (Lpkg/TestAnonymousClassConstructor;Ljava/lang/String;)V' {
-+      a      75
-+      d      76
-    }
- }
- 
-@@ -238,19 +238,19 @@ class 'pkg/TestAnonymousClassConstructor$InnerStaticPrivateString' {
-    }
- }
- 
--class 'pkg/TestAnonymousClassConstructor$InnerPrivate' {
--   method '<init> (Lpkg/TestAnonymousClassConstructor;JI)V' {
--      14      105
--      1e      105
--      21      105
--      24      106
-+class 'pkg/TestAnonymousClassConstructor$InnerStaticPublic' {
-+   method '<init> (JI)V' {
-+      f      105
-+      18      105
-+      1b      105
-+      1e      106
-    }
- }
- 
--class 'pkg/TestAnonymousClassConstructor$InnerPrivateString' {
--   method '<init> (Lpkg/TestAnonymousClassConstructor;Ljava/lang/String;)V' {
--      a      111
--      d      112
-+class 'pkg/TestAnonymousClassConstructor$InnerStaticPublicString' {
-+   method '<init> (Ljava/lang/String;)V' {
-+      5      111
-+      8      112
-    }
- }
- 
-@@ -281,10 +281,10 @@ Lines mapping:
- 50 <-> 62
- 53 <-> 65
- 54 <-> 66
--58 <-> 112
--59 <-> 113
--64 <-> 106
--65 <-> 107
-+58 <-> 76
-+59 <-> 77
-+64 <-> 70
-+65 <-> 71
- 70 <-> 100
- 71 <-> 101
- 76 <-> 94
-@@ -293,10 +293,10 @@ Lines mapping:
- 83 <-> 89
- 88 <-> 82
- 89 <-> 83
--94 <-> 76
--95 <-> 77
--100 <-> 70
--101 <-> 71
-+94 <-> 112
-+95 <-> 113
-+100 <-> 106
-+101 <-> 107
- Not mapped:
- 57
- 63
-diff --git a/testData/results/TestClassSimpleBytecodeMapping.dec b/testData/results/TestClassSimpleBytecodeMapping.dec
-index 5b26ef8b403a0cc1c2b9858ed3c9ce84108c7562..7c03120a91f0fc0a5cecbbff4cd7b2c0d0da2c94 100644
---- a/testData/results/TestClassSimpleBytecodeMapping.dec
-+++ b/testData/results/TestClassSimpleBytecodeMapping.dec
-@@ -33,17 +33,17 @@ public class TestClassSimpleBytecodeMapping {
-       var1.run();// 49
-    }// 50
- 
--   public class InnerClass2 {
--      public void print() {
--         System.out.println("Inner2");// 54
--      }// 55
--   }
--
-    public class InnerClass {
-       public void print() {
-          System.out.println("Inner");// 44
-       }// 45
-    }
-+
-+   public class InnerClass2 {
-+      public void print() {
-+         System.out.println("Inner2");// 54
-+      }// 55
-+   }
- }
- 
- class 'pkg/TestClassSimpleBytecodeMapping$1' {
-@@ -96,7 +96,7 @@ class 'pkg/TestClassSimpleBytecodeMapping' {
-    }
- }
- 
--class 'pkg/TestClassSimpleBytecodeMapping$InnerClass2' {
-+class 'pkg/TestClassSimpleBytecodeMapping$InnerClass' {
-    method 'print ()V' {
-       0      37
-       3      37
-@@ -105,7 +105,7 @@ class 'pkg/TestClassSimpleBytecodeMapping$InnerClass2' {
-    }
- }
- 
--class 'pkg/TestClassSimpleBytecodeMapping$InnerClass' {
-+class 'pkg/TestClassSimpleBytecodeMapping$InnerClass2' {
-    method 'print ()V' {
-       0      43
-       3      43
-@@ -130,11 +130,11 @@ Lines mapping:
- 36 <-> 25
- 38 <-> 27
- 40 <-> 30
--44 <-> 44
--45 <-> 45
-+44 <-> 38
-+45 <-> 39
- 49 <-> 33
- 50 <-> 34
--54 <-> 38
--55 <-> 39
-+54 <-> 44
-+55 <-> 45
- Not mapped:
- 39
-diff --git a/testData/results/TestExtendingSubclass.dec b/testData/results/TestExtendingSubclass.dec
-index f7be1b46d3058aba92f7a21ffc9558068dd26226..6bab8435926e1c10171fc97b61075ec58dba2572 100644
---- a/testData/results/TestExtendingSubclass.dec
-+++ b/testData/results/TestExtendingSubclass.dec
-@@ -1,35 +1,35 @@
- package pkg;
- 
- public class TestExtendingSubclass {
-+   class Subclass1 {
-+      Subclass1(String name) {
-+      }// 9
-+   }
-+
-    class Subclass2 extends Subclass1 {
-       Subclass2(String name) {
-          super(name);// 14
-       }// 15
-    }
--
--   class Subclass1 {
--      Subclass1(String name) {
--      }// 9
--   }
- }
- 
--class 'pkg/TestExtendingSubclass$Subclass2' {
-+class 'pkg/TestExtendingSubclass$Subclass1' {
-    method '<init> (Lpkg/TestExtendingSubclass;Ljava/lang/String;)V' {
--      8      5
--      b      6
-+      9      5
-    }
- }
- 
--class 'pkg/TestExtendingSubclass$Subclass1' {
-+class 'pkg/TestExtendingSubclass$Subclass2' {
-    method '<init> (Lpkg/TestExtendingSubclass;Ljava/lang/String;)V' {
--      9      11
-+      8      10
-+      b      11
-    }
- }
- 
- Lines mapping:
--9 <-> 12
--14 <-> 6
--15 <-> 7
-+9 <-> 6
-+14 <-> 11
-+15 <-> 12
- Not mapped:
- 8
- 13
-diff --git a/testData/results/TestInnerLocal.dec b/testData/results/TestInnerLocal.dec
-index b270e4eea9caf36d5c66b64d18e33ca8d8fcae10..9009b85453ba2aae2ac4e32f94fb082dcd6d3c81 100644
---- a/testData/results/TestInnerLocal.dec
-+++ b/testData/results/TestInnerLocal.dec
-@@ -30,6 +30,14 @@ public class TestInnerLocal {
-       new Inner1Static.Inner2Static("test");// 26
-    }// 27
- 
-+   class Inner1 {
-+      final String x;
-+
-+      public Inner1(String var2) {
-+         this.x = var2;// 46
-+      }// 47
-+   }
-+
-    static class Inner1Static {
-       final String x;
- 
-@@ -45,14 +53,6 @@ public class TestInnerLocal {
-          }// 46
-       }
-    }
--
--   class Inner1 {
--      final String x;
--
--      public Inner1(@Deprecated String x) {
--         this.x = x;// 32
--      }// 33
--   }
- }
- 
- class 'pkg/TestInnerLocal$1Inner' {
-@@ -86,47 +86,47 @@ class 'pkg/TestInnerLocal$2Inner' {
-    }
- }
- 
--class 'pkg/TestInnerLocal$Inner1Static' {
--   method '<init> (Ljava/lang/String;)V' {
--      6      36
--      9      37
-+class 'TestInnerLocal$Inner1' {
-+   method '<init> (LTestInnerLocal;Ljava/lang/String;)V' {
-+      b      34
-+      e      35
-    }
- }
- 
--class 'pkg/TestInnerLocal$Inner1Static$Inner2Static' {
-+class 'TestInnerLocal$Inner1Static' {
-    method '<init> (Ljava/lang/String;)V' {
--      6      43
--      9      44
-+      6      42
-+      9      43
-    }
- }
- 
--class 'pkg/TestInnerLocal$Inner1' {
--   method '<init> (Lpkg/TestInnerLocal;Ljava/lang/String;)V' {
--      b      52
--      e      53
-+class 'pkg/TestInnerLocal$Inner1Static$Inner2Static' {
-+   method '<init> (Ljava/lang/String;)V' {
-+      6      49
-+      9      50
-    }
- }
- 
- Lines mapping:
--8 <-> 9
--9 <-> 10
--11 <-> 13
--12 <-> 14
--13 <-> 15
--14 <-> 16
--20 <-> 23
--21 <-> 24
--23 <-> 27
--24 <-> 28
--25 <-> 29
--26 <-> 30
--27 <-> 31
--32 <-> 53
--33 <-> 54
--39 <-> 37
--40 <-> 38
--45 <-> 44
--46 <-> 45
-+22 <-> 7
-+23 <-> 8
-+25 <-> 11
-+26 <-> 12
-+27 <-> 13
-+28 <-> 14
-+34 <-> 21
-+35 <-> 22
-+37 <-> 25
-+38 <-> 26
-+39 <-> 27
-+40 <-> 28
-+41 <-> 29
-+46 <-> 35
-+47 <-> 36
-+53 <-> 43
-+54 <-> 44
-+59 <-> 50
-+60 <-> 51
- Not mapped:
- 7
- 19
-diff --git a/testData/results/TestInnerSignature.dec b/testData/results/TestInnerSignature.dec
-index b2e4d0f757e55cd9ab6bd77aa9ed0afb33989e7d..8aab3c2b9f56368f1350f1ac98262c761bf6ed19 100644
---- a/testData/results/TestInnerSignature.dec
-+++ b/testData/results/TestInnerSignature.dec
-@@ -11,18 +11,6 @@ public class TestInnerSignature<A, B, C> {
-       this.c = c;// 11
-    }// 12
- 
--   public static class InnerStatic<A, B, C> {
--      A a;
--      B b;
--      C c;
--
--      public InnerStatic(A a, @Deprecated B b, C c) {
--         this.a = a;// 32
--         this.b = b;// 33
--         this.c = c;// 34
--      }// 35
--   }
--
-    public class Inner {
-       A a;
-       B b;
-@@ -34,6 +22,18 @@ public class TestInnerSignature<A, B, C> {
-          this.c = c;// 22
-       }// 23
-    }
-+
-+   public static class InnerStatic<A, B, C> {
-+      A a;
-+      B b;
-+      C c;
-+
-+      public InnerStatic(A var1, B var2, C var3) {
-+         this.a = var1;// 46
-+         this.b = var2;// 47
-+         this.c = var3;// 48
-+      }// 49
-+   }
- }
- 
- class 'pkg/TestInnerSignature' {
-@@ -45,37 +45,37 @@ class 'pkg/TestInnerSignature' {
-    }
- }
- 
--class 'pkg/TestInnerSignature$InnerStatic' {
--   method '<init> (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
--      6      19
--      b      20
--      10      21
--      13      22
-+class 'TestInnerSignature$Inner' {
-+   method '<init> (LTestInnerSignature;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
-+      b      17
-+      10      18
-+      16      19
-+      19      20
-    }
- }
- 
--class 'pkg/TestInnerSignature$Inner' {
--   method '<init> (Lpkg/TestInnerSignature;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
--      b      31
--      10      32
--      16      33
--      19      34
-+class 'TestInnerSignature$InnerStatic' {
-+   method '<init> (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
-+      6      29
-+      b      30
-+      10      31
-+      13      32
-    }
- }
- 
- Lines mapping:
--9 <-> 9
--10 <-> 10
--11 <-> 11
--12 <-> 12
--20 <-> 32
--21 <-> 33
--22 <-> 34
--23 <-> 35
--32 <-> 20
--33 <-> 21
--34 <-> 22
--35 <-> 23
-+23 <-> 7
-+24 <-> 8
-+25 <-> 9
-+26 <-> 10
-+34 <-> 18
-+35 <-> 19
-+36 <-> 20
-+37 <-> 21
-+46 <-> 30
-+47 <-> 31
-+48 <-> 32
-+49 <-> 33
- Not mapped:
- 8
- 19
-diff --git a/testData/results/TestMethodParameters.dec b/testData/results/TestMethodParameters.dec
-index 21f0f129d1bc260e2dbc7ce77f07ece57711bf75..af7ce865f5d946980010ee02c3e5be384a041064 100644
---- a/testData/results/TestMethodParameters.dec
-+++ b/testData/results/TestMethodParameters.dec
-@@ -21,6 +21,14 @@ public class TestMethodParameters {
- 
-    }// 39
- 
-+   class C1 {
-+      C1(@Deprecated int var2) {
-+      }// 24
-+
-+      void m(@Deprecated int var1) {
-+      }// 25
-+   }
-+
-    static class C2 {
-       C2(@Deprecated int var1) {
-       }// 29
-@@ -31,14 +39,6 @@ public class TestMethodParameters {
-       static void m2(@Deprecated int var0) {
-       }// 31
-    }
--
--   class C1 {
--      C1(@Deprecated int var2) {
--      }// 24
--
--      void m(@Deprecated int var1) {
--      }// 25
--   }
- }
- 
- class 'pkg/TestMethodParameters' {
-@@ -69,26 +69,26 @@ class 'pkg/TestMethodParameters$1Local' {
-    }
- }
- 
--class 'pkg/TestMethodParameters$C2' {
--   method '<init> (I)V' {
--      4      25
-+class 'pkg/TestMethodParameters$C1' {
-+   method '<init> (Lpkg/TestMethodParameters;I)V' {
-+      9      25
-    }
- 
--   method 'm1 (I)V' {
-+   method 'm (I)V' {
-       0      28
-    }
-+}
- 
--   method 'm2 (I)V' {
--      0      31
-+class 'pkg/TestMethodParameters$C2' {
-+   method '<init> (I)V' {
-+      4      33
-    }
--}
- 
--class 'pkg/TestMethodParameters$C1' {
--   method '<init> (Lpkg/TestMethodParameters;I)V' {
--      9      36
-+   method 'm1 (I)V' {
-+      0      36
-    }
- 
--   method 'm (I)V' {
-+   method 'm2 (I)V' {
-       0      39
-    }
- }
-@@ -97,11 +97,11 @@ Lines mapping:
- 19 <-> 5
- 20 <-> 8
- 21 <-> 11
--24 <-> 37
--25 <-> 40
--29 <-> 26
--30 <-> 29
--31 <-> 32
-+24 <-> 26
-+25 <-> 29
-+29 <-> 34
-+30 <-> 37
-+31 <-> 40
- 36 <-> 16
- 37 <-> 19
- 39 <-> 22
-diff --git a/testData/results/TestSwitchOnEnum.dec b/testData/results/TestSwitchOnEnum.dec
-index e63cfe50c3d0c9fddd4f3051d7bda5df33523cbb..6e1f77fa247005cb8bb012a91aff96ed78103204 100644
---- a/testData/results/TestSwitchOnEnum.dec
-+++ b/testData/results/TestSwitchOnEnum.dec
-@@ -36,15 +36,15 @@ public class TestSwitchOnEnum {
- 
-       }// 46
- 
--      static enum B {
--         B1,
--         B2;
--      }
--
-       static enum A {
-          A1,
-          A2;
-       }
-+
-+      static enum B {
-+         B1,
-+         B2;
-+      }
-    }
- }
- 
diff --git a/FernFlower-Patches/0004-Fixed-this-calls-not-having-arguments.patch b/FernFlower-Patches/0004-Fixed-this-calls-not-having-arguments.patch
new file mode 100644
index 0000000..53bbdb6
--- /dev/null
+++ b/FernFlower-Patches/0004-Fixed-this-calls-not-having-arguments.patch
@@ -0,0 +1,57 @@
+From 723017cb1251c8f0ff9b09e97a8800109bc5375f Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sat, 1 Aug 2015 15:52:57 -0700
+Subject: [PATCH 004/122] Fixed this calls not having arguments.
+
+---
+ .../modules/decompiler/exps/InvocationExprent.java   | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+index 294a115..4e73f06 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+@@ -321,7 +321,7 @@ public class InvocationExprent extends Exprent {
+     boolean firstParameter = true;
+     int start = isEnum ? 2 : 0;
+     for (int i = start; i < lstParameters.size(); i++) {
+-      if (sigFields == null) {
++      if (sigFields == null || sigFields.get(i) == null) {
+         if (!firstParameter) {
+           buf.append(", ");
+         }
+@@ -495,16 +495,16 @@ public class InvocationExprent extends Exprent {
+   // *****************************************************************************
+   // IMatchable implementation
+   // *****************************************************************************
+-  
++
+   public boolean match(MatchNode matchNode, MatchEngine engine) {
+ 
+     if(!super.match(matchNode, engine)) {
+       return false;
+     }
+-    
++
+     for(Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
+       RuleValue value = rule.getValue();
+-      
++
+       switch(rule.getKey()) {
+       case EXPRENT_INVOCATION_PARAMETER:
+         if(value.isVariable()) {
+@@ -528,9 +528,9 @@ public class InvocationExprent extends Exprent {
+         }
+         break;
+       }
+-      
++
+     }
+-    
++
+     return true;
+   }
+ 
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0005-Convert-Exprent.bytecode-to-a-BitMap.patch b/FernFlower-Patches/0005-Convert-Exprent.bytecode-to-a-BitMap.patch
deleted file mode 100644
index 2b12c8a..0000000
--- a/FernFlower-Patches/0005-Convert-Exprent.bytecode-to-a-BitMap.patch
+++ /dev/null
@@ -1,4516 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Wed, 12 Apr 2017 15:18:38 -0700
-Subject: [PATCH] Convert Exprent.bytecode to a BitMap.
-
-It gives better speed and functionality. Added method to gather bytecode markers for every expression. Allows us to get the bytecode offsets for an entire block of code. Also more aggressively capture bytecode ranges to better understand how much of the code we are processing/outputting
-
-diff --git a/src/org/jetbrains/java/decompiler/code/Instruction.java b/src/org/jetbrains/java/decompiler/code/Instruction.java
-index 1a260f2bbd2c593351eb45f345b334045c93ad4c..91e64861d2b61ad952a713b308614c6c4e35ea14 100644
---- a/src/org/jetbrains/java/decompiler/code/Instruction.java
-+++ b/src/org/jetbrains/java/decompiler/code/Instruction.java
-@@ -4,18 +4,18 @@ package org.jetbrains.java.decompiler.code;
- import org.jetbrains.java.decompiler.util.TextUtil;
- 
- public class Instruction implements CodeConstants {
--  public static Instruction create(int opcode, boolean wide, int group, int bytecodeVersion, int[] operands) {
-+  public static Instruction create(int opcode, boolean wide, int group, int bytecodeVersion, int[] operands, int length) {
-     if (opcode >= opc_ifeq && opcode <= opc_if_acmpne ||
-         opcode == opc_ifnull || opcode == opc_ifnonnull ||
-         opcode == opc_jsr || opcode == opc_jsr_w ||
-         opcode == opc_goto || opcode == opc_goto_w) {
--      return new JumpInstruction(opcode, group, wide, bytecodeVersion, operands);
-+      return new JumpInstruction(opcode, group, wide, bytecodeVersion, operands, length);
-     }
-     else if (opcode == opc_tableswitch || opcode == opc_lookupswitch) {
--      return new SwitchInstruction(opcode, group, wide, bytecodeVersion, operands);
-+      return new SwitchInstruction(opcode, group, wide, bytecodeVersion, operands, length);
-     }
-     else {
--      return new Instruction(opcode, group, wide, bytecodeVersion, operands);
-+      return new Instruction(opcode, group, wide, bytecodeVersion, operands, length);
-     }
-   }
- 
-@@ -31,15 +31,17 @@ public class Instruction implements CodeConstants {
-   public final int group;
-   public final boolean wide;
-   public final int bytecodeVersion;
-+  public final int length;
- 
-   protected final int[] operands;
- 
--  public Instruction(int opcode, int group, boolean wide, int bytecodeVersion, int[] operands) {
-+  public Instruction(int opcode, int group, boolean wide, int bytecodeVersion, int[] operands, int length) {
-     this.opcode = opcode;
-     this.group = group;
-     this.wide = wide;
-     this.bytecodeVersion = bytecodeVersion;
-     this.operands = operands;
-+    this.length = length;
-   }
- 
-   public void initInstruction(InstructionSequence seq) { }
-@@ -82,6 +84,6 @@ public class Instruction implements CodeConstants {
-   @Override
-   @SuppressWarnings("MethodDoesntCallSuperMethod")
-   public Instruction clone() {
--    return create(opcode, wide, group, bytecodeVersion, operands == null ? null : operands.clone());
-+    return create(opcode, wide, group, bytecodeVersion, operands == null ? null : operands.clone(), length);
-   }
--}
-\ No newline at end of file
-+}
-diff --git a/src/org/jetbrains/java/decompiler/code/JumpInstruction.java b/src/org/jetbrains/java/decompiler/code/JumpInstruction.java
-index 129df62e7295cbd4145880d2c215d5c1e717ffe6..1597df01326479fd8992af4b6e754dd6223a50e6 100644
---- a/src/org/jetbrains/java/decompiler/code/JumpInstruction.java
-+++ b/src/org/jetbrains/java/decompiler/code/JumpInstruction.java
-@@ -4,8 +4,8 @@ package org.jetbrains.java.decompiler.code;
- public class JumpInstruction extends Instruction {
-   public int destination;
- 
--  public JumpInstruction(int opcode, int group, boolean wide, int bytecodeVersion, int[] operands) {
--    super(opcode, group, wide, bytecodeVersion, operands);
-+  public JumpInstruction(int opcode, int group, boolean wide, int bytecodeVersion, int[] operands, int length) {
-+    super(opcode, group, wide, bytecodeVersion, operands, length);
-   }
- 
-   @Override
-diff --git a/src/org/jetbrains/java/decompiler/code/SwitchInstruction.java b/src/org/jetbrains/java/decompiler/code/SwitchInstruction.java
-index 61810d96bea8e35006df80630e9caf029b33b41c..6379ccadaf4d0b7bf2a4001481b408dd33b3f7bd 100644
---- a/src/org/jetbrains/java/decompiler/code/SwitchInstruction.java
-+++ b/src/org/jetbrains/java/decompiler/code/SwitchInstruction.java
-@@ -6,8 +6,8 @@ public class SwitchInstruction extends Instruction {
-   private int[] values;
-   private int defaultDestination;
- 
--  public SwitchInstruction(int opcode, int group, boolean wide, int bytecodeVersion, int[] operands) {
--    super(opcode, group, wide, bytecodeVersion, operands);
-+  public SwitchInstruction(int opcode, int group, boolean wide, int bytecodeVersion, int[] operands, int length) {
-+    super(opcode, group, wide, bytecodeVersion, operands, length);
-   }
- 
-   @Override
-@@ -58,4 +58,4 @@ public class SwitchInstruction extends Instruction {
-     copy.values = values.clone();
-     return copy;
-   }
--}
-\ No newline at end of file
-+}
-diff --git a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
-index 28c4f50ec90546100a5f16e9c6d60aa931a00e0d..9eb4fbab0ede1b19bfaa9a433c182e00b4f07a0b 100644
---- a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
-+++ b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
-@@ -149,4 +149,19 @@ public class BasicBlock implements IGraphNode {
-   public String toString() {
-     return id + ":" + DecompilerContext.getNewLineSeparator() + seq.toString(0);
-   }
-+
-+  public int getStartInstruction() {
-+      if (seq.isEmpty()) {
-+          return 0;
-+      }
-+      return originalOffsets.get(0);
-+  }
-+
-+  public int getEndInstruction() {
-+      if (seq.isEmpty()) {
-+          return 0;
-+      }
-+      int end = seq.getLastInstr().length;
-+      return end + originalOffsets.get(size() -1);
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
-index c6a23b3277c3a93be621d6686b1554d51be01c9b..32ca965883f26cd8944bfb5e838d5cf584142f68 100644
---- a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
-+++ b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
-@@ -31,10 +31,10 @@ public class BytecodeMappingTracer {
-     mapping.putIfAbsent(bytecode_offset, currentSourceLine);
-   }
- 
--  public void addMapping(Set<Integer> bytecode_offsets) {
-+  public void addMapping(BitSet bytecode_offsets) {
-     if (bytecode_offsets != null) {
--      for (Integer bytecode_offset : bytecode_offsets) {
--        addMapping(bytecode_offset);
-+      for (int i = bytecode_offsets.nextSetBit(0); i >= 0; i = bytecode_offsets.nextSetBit(i+1)) {
-+        addMapping(i);
-       }
-     }
-   }
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 6e5fe5474d6878d789758a5e7791b03e5da6685e..327a6e64f06d7ef60dc1bb3139aab490a2f7c2df 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-@@ -533,7 +533,7 @@ public class NestedClassProcessor {
-               if (mapParamsToNewVars.containsKey(varIndex)) {
-                 VarVersionPair newVar = mapParamsToNewVars.get(varIndex);
-                 method.varproc.getExternalVars().add(newVar);
--                return new VarExprent(newVar.var, method.varproc.getVarType(newVar), method.varproc);
-+                return new VarExprent(newVar.var, method.varproc.getVarType(newVar), method.varproc, exprent.bytecode);
-               }
-             }
-             else if (exprent.type == Exprent.EXPRENT_FIELD) {
-@@ -544,7 +544,7 @@ public class NestedClassProcessor {
-                 //		mapFieldsToNewVars.containsKey(key)) {
-                 VarVersionPair newVar = mapFieldsToNewVars.get(key);
-                 method.varproc.getExternalVars().add(newVar);
--                return new VarExprent(newVar.var, method.varproc.getVarType(newVar), method.varproc);
-+                return new VarExprent(newVar.var, method.varproc.getVarType(newVar), method.varproc, exprent.bytecode);
-               }
-             }
- 
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
-index f4cb77bea6031ddfe1197fb9d684f95ef39cda5a..5d47c847133cf0413365eddd5f1a2104b2f6ac6b 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
-@@ -11,8 +11,8 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
- 
- import java.util.ArrayList;
- import java.util.Arrays;
-+import java.util.BitSet;
- import java.util.List;
--import java.util.Set;
- 
- public final class ConcatenationHelper {
- 
-@@ -125,7 +125,7 @@ public final class ConcatenationHelper {
-     return createConcatExprent(lstOperands, expr.bytecode);
-   }
- 
--  private static Exprent createConcatExprent(List<Exprent> lstOperands, Set<Integer> bytecode) {
-+  private static Exprent createConcatExprent(List<Exprent> lstOperands, BitSet bytecode) {
-     // build exprent to return
-     Exprent func = lstOperands.get(0);
- 
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-index 6783382a1c199ba33df1af3477d3cf5e13230b09..3b10e5b29ff9e344815592e533b6b04891fe294c 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-@@ -266,7 +266,15 @@ public class ExprProcessor implements CodeConstants {
-     for (int i = 0; i < seq.length(); i++) {
-       Instruction instr = seq.getInstr(i);
-       Integer offset = block.getOriginalOffset(i);
--      Set<Integer> offsets = offset >= 0 ? Set.of(offset) : null;
-+      BitSet offsets = null;
-+      if (offset >= 0) {
-+        offsets = new BitSet();
-+        offsets.set(offset);
-+        int end_offset = block.getOriginalOffset(i+1);
-+        if (end_offset > offset) {
-+          offsets.set(offset, end_offset);
-+        }
-+      }
- 
-       switch (instr.opcode) {
-         case opc_aconst_null:
-@@ -307,7 +315,7 @@ public class ExprProcessor implements CodeConstants {
-         case opc_fload:
-         case opc_dload:
-         case opc_aload:
--          pushEx(stack, exprList, new VarExprent(instr.operand(0), varTypes[instr.opcode - opc_iload], varProcessor, offset));
-+          pushEx(stack, exprList, new VarExprent(instr.operand(0), varTypes[instr.opcode - opc_iload], varProcessor, offsets));
-           break;
-         case opc_iaload:
-         case opc_laload:
-@@ -330,7 +338,10 @@ public class ExprProcessor implements CodeConstants {
-         case opc_astore: {
-           Exprent value = stack.pop();
-           int varIndex = instr.operand(0);
--          VarExprent left = new VarExprent(varIndex, varTypes[instr.opcode - opc_istore], varProcessor, nextMeaningfulOffset(block, i));
-+          if (offsets != null) { //TODO: Figure out why this nulls in some cases
-+            offsets.set(offset, offset + instr.length);
-+          }
-+          VarExprent left = new VarExprent(varIndex, varTypes[instr.opcode - opc_istore], varProcessor, offsets);
-           exprList.add(new AssignmentExprent(left, value, offsets));
-           break;
-         }
-@@ -392,7 +403,7 @@ public class ExprProcessor implements CodeConstants {
-           pushEx(stack, exprList, new FunctionExprent(FunctionExprent.FUNCTION_NEG, stack, offsets));
-           break;
-         case opc_iinc: {
--          VarExprent varExpr = new VarExprent(instr.operand(0), VarType.VARTYPE_INT, varProcessor);
-+          VarExprent varExpr = new VarExprent(instr.operand(0), VarType.VARTYPE_INT, varProcessor, offsets);
-           int type = instr.operand(1) < 0 ? FunctionExprent.FUNCTION_SUB : FunctionExprent.FUNCTION_ADD;
-           List<Exprent> operands = Arrays.asList(varExpr.copy(), new ConstExprent(VarType.VARTYPE_INT, Math.abs(instr.operand(1)), null));
-           exprList.add(new AssignmentExprent(varExpr, new FunctionExprent(type, operands, offsets), offsets));
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
-index 878c12b061975d4060b8a44abffa3d60d35d17a3..b240e83853cff82f917a7fc9f80dab661dd7ceb9 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
-@@ -304,6 +304,7 @@ public class FinallyProcessor {
-       }
-     }
- 
-+    final int storeLength = var <= 3 ? 1 : var <= 128 ? 2 : 4;
-     // disable semaphore at statement exit points
-     for (BasicBlock block : setTry) {
-       for (BasicBlock dest : block.getSuccessors()) {
-@@ -311,8 +312,8 @@ public class FinallyProcessor {
-         if (dest != graph.getLast() && !setCopy.contains(dest)) {
-           // disable semaphore
-           SimpleInstructionSequence seq = new SimpleInstructionSequence();
--          seq.addInstruction(Instruction.create(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecodeVersion, new int[]{0}), -1);
--          seq.addInstruction(Instruction.create(CodeConstants.opc_istore, false, CodeConstants.GROUP_GENERAL, bytecodeVersion, new int[]{var}), -1);
-+          seq.addInstruction(Instruction.create(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecodeVersion, new int[]{0}, 1), -1);
-+          seq.addInstruction(Instruction.create(CodeConstants.opc_istore, false, CodeConstants.GROUP_GENERAL, bytecodeVersion, new int[]{var}, storeLength), -1);
- 
-           // build a separate block
-           BasicBlock newBlock = new BasicBlock(++graph.last_id, seq);
-@@ -331,11 +332,11 @@ public class FinallyProcessor {
-     }
- 
-     // enable semaphore at the statement entrance
--    BasicBlock newHead = createHeadBlock(graph, 1, var, bytecodeVersion);
-+    BasicBlock newHead = createHeadBlock(graph, 1, var, bytecodeVersion, storeLength);
-     insertBlockBefore(graph, head, newHead);
- 
-     // initialize semaphore with false
--    BasicBlock newHeadInit = createHeadBlock(graph, 0, var, bytecodeVersion);
-+    BasicBlock newHeadInit = createHeadBlock(graph, 0, var, bytecodeVersion, storeLength);
-     insertBlockBefore(graph, newHead, newHeadInit);
- 
-     setCopy.add(newHead);
-@@ -352,10 +353,10 @@ public class FinallyProcessor {
-   }
- 
-   @NotNull
--  private static BasicBlock createHeadBlock(ControlFlowGraph graph, int value, int var, int bytecodeVersion) {
-+  private static BasicBlock createHeadBlock(ControlFlowGraph graph, int value, int var, int bytecodeVersion, int storeLength) {
-     SimpleInstructionSequence seq = new SimpleInstructionSequence();
--    seq.addInstruction(Instruction.create(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecodeVersion, new int[]{value}), -1);
--    seq.addInstruction(Instruction.create(CodeConstants.opc_istore, false, CodeConstants.GROUP_GENERAL, bytecodeVersion, new int[]{var}), -1);
-+    seq.addInstruction(Instruction.create(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecodeVersion, new int[]{value}, 1), -1);
-+    seq.addInstruction(Instruction.create(CodeConstants.opc_istore, false, CodeConstants.GROUP_GENERAL, bytecodeVersion, new int[]{var}, storeLength), -1);
-     return new BasicBlock(++graph.last_id, seq);
-   }
- 
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-index a5e7ccf98c61f2fb585054c48fd967eeb4e70a49..bbd7bd0cb42057638e765c5bb675b8d30b9b6796 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-@@ -92,6 +92,12 @@ public final class MergeHelper {
-           if (ifedge.getType() == EdgeType.BREAK) {
-             ifexpr.negateIf();
-           }
-+
-+          if (stat.getConditionExprent() != null) {
-+            ifexpr.getCondition().addBytecodeOffsets(stat.getConditionExprent().bytecode);
-+          }
-+          ifexpr.getCondition().addBytecodeOffsets(lastif.getHeadexprent().bytecode);
-+
-           stat.setConditionExprent(ifexpr.getCondition());
-           lastif.getFirst().removeSuccessor(ifedge);
-           lastif.removeSuccessor(elseedge);
-@@ -146,6 +152,12 @@ public final class MergeHelper {
-               // negate condition (while header)
-               IfExprent ifexpr = (IfExprent)firstif.getHeadexprent().copy();
-               ifexpr.negateIf();
-+
-+              if (stat.getConditionExprent() != null) {
-+                ifexpr.getCondition().addBytecodeOffsets(stat.getConditionExprent().bytecode);
-+              }
-+              ifexpr.getCondition().addBytecodeOffsets(firstif.getHeadexprent().bytecode);
-+
-               stat.setConditionExprent(ifexpr.getCondition());
- 
-               // remove edges
-@@ -184,7 +196,12 @@ public final class MergeHelper {
-               stat.setLoopType(LoopType.WHILE);
- 
-               // no need to negate the while condition
--              stat.setConditionExprent(((IfExprent)firstif.getHeadexprent().copy()).getCondition());
-+              IfExprent ifexpr = (IfExprent)firstif.getHeadexprent().copy();
-+              if (stat.getConditionExprent() != null) {
-+                ifexpr.getCondition().addBytecodeOffsets(stat.getConditionExprent().bytecode);
-+              }
-+              ifexpr.getCondition().addBytecodeOffsets(firstif.getHeadexprent().bytecode);
-+              stat.setConditionExprent(ifexpr.getCondition());
- 
-               // remove edges
-               StatEdge ifedge = firstif.getIfEdge();
-@@ -336,9 +353,17 @@ public final class MergeHelper {
- 
-       stat.setLoopType(LoopType.FOR);
-       if (hasinit) {
--        stat.setInitExprent(preData.getExprents().remove(preData.getExprents().size() - 1));
-+        Exprent exp = preData.getExprents().remove(preData.getExprents().size() - 1);
-+        if (stat.getInitExprent() != null) {
-+          exp.addBytecodeOffsets(stat.getInitExprent().bytecode);
-+        }
-+        stat.setInitExprent(exp);
-+      }
-+      Exprent exp = lastData.getExprents().remove(lastData.getExprents().size() - 1);
-+      if (stat.getIncExprent() != null) {
-+        exp.addBytecodeOffsets(stat.getIncExprent().bytecode);
-       }
--      stat.setIncExprent(lastData.getExprents().remove(lastData.getExprents().size() - 1));
-+      stat.setIncExprent(exp);
-     }
- 
-     if (lastData.getExprents().isEmpty()) {
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
-index 7a2376d0c0a2d4c18ca3ce8a4f35c0ae75bed962..eb96762fa2174047a3f9dcecfb8c57bf4721c11f 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
-@@ -641,7 +641,7 @@ public class SimplifyExprentsHelper {
-     if (stat.type == StatementType.IF && stat.getExprents() == null) {
-       IfStatement statement = (IfStatement)stat;
-       Exprent ifHeadExpr = statement.getHeadexprent();
--      Set<Integer> ifHeadExprBytecode = (ifHeadExpr == null ? null : ifHeadExpr.bytecode);
-+      BitSet ifHeadExprBytecode = (ifHeadExpr == null ? null : ifHeadExpr.bytecode);
- 
-       if (statement.iftype == IfStatement.IFTYPE_IFELSE) {
-         Statement ifStatement = statement.getIfstat();
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
-index ae166cc9ea414d5a0b698d8d06c7a24836c21316..478a3aef4cbc9d555abd82e38200a62ba7aa9a23 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
-@@ -404,8 +404,8 @@ public final class ExceptionDeobfuscator {
-       for (ExceptionRangeCFG range : ranges) {
-         // add some dummy instructions to prevent optimizing away the empty block
-         SimpleInstructionSequence seq = new SimpleInstructionSequence();
--        seq.addInstruction(Instruction.create(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{0}), -1);
--        seq.addInstruction(Instruction.create(CodeConstants.opc_pop, false, CodeConstants.GROUP_GENERAL, bytecode_version, null), -1);
-+        seq.addInstruction(Instruction.create(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{0}, 1), -1);
-+        seq.addInstruction(Instruction.create(CodeConstants.opc_pop, false, CodeConstants.GROUP_GENERAL, bytecode_version, null, 1), -1);
- 
-         BasicBlock dummyBlock = new BasicBlock(++graph.last_id, seq);
- 
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
-index 05849823262a46b66561164a0f0257123ce5307a..4beaf1ee874de373d956177ece541f0ecce64dc4 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
-@@ -6,6 +6,7 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
- import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
- import org.jetbrains.java.decompiler.util.TextBuffer;
- 
-+import java.util.BitSet;
- import java.util.List;
- import java.util.Objects;
- 
-@@ -97,4 +98,10 @@ public class AnnotationExprent extends Exprent {
-            parNames.equals(ann.parNames) &&
-            parValues.equals(ann.parValues);
-   }
-+  
-+  @Override
-+  public void getBytecodeRange(BitSet values) {
-+    measureBytecode(values, parValues);
-+    measureBytecode(values);
-+  }
- }
-\ No newline at end of file
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
-index e2b79d56e9f7c2ca22713e83dbd2aeddce5f9885..406848324e427a2b18d3666e321172f0f130ec4c 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
-@@ -14,7 +14,7 @@ public class ArrayExprent extends Exprent {
-   private Exprent index;
-   private final VarType hardType;
- 
--  public ArrayExprent(Exprent array, Exprent index, VarType hardType, Set<Integer> bytecodeOffsets) {
-+  public ArrayExprent(Exprent array, Exprent index, VarType hardType, BitSet bytecodeOffsets) {
-     super(EXPRENT_ARRAY);
-     this.array = array;
-     this.index = index;
-@@ -105,4 +105,11 @@ public class ArrayExprent extends Exprent {
-   public Exprent getIndex() {
-     return index;
-   }
-+
-+  @Override
-+  public void getBytecodeRange(BitSet values) {
-+    measureBytecode(values, array);
-+    measureBytecode(values, index);
-+    measureBytecode(values);
-+  }
- }
-\ No newline at end of file
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
-index 0dcb63d34c036a9cd21e21d77c2ea01f6f5b9266..097c10a32ed819368c48efa51866420c01584395 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
-@@ -6,6 +6,7 @@ package org.jetbrains.java.decompiler.modules.decompiler.exps;
- import org.jetbrains.java.decompiler.util.TextBuffer;
- import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
- 
-+import java.util.BitSet;
- import java.util.List;
- 
- public class AssertExprent extends Exprent {
-@@ -39,4 +40,10 @@ public class AssertExprent extends Exprent {
- 
-     return buffer;
-   }
-+
-+  @Override
-+  public void getBytecodeRange(BitSet values) {
-+    measureBytecode(values, parameters);
-+    measureBytecode(values);
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
-index b8678cdc0f0e778c3d1c8834ae764bbaa2e77ae1..06567749310f70d0f3263a9b2bad4588237bdda9 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
-@@ -36,7 +36,7 @@ public class AssignmentExprent extends Exprent {
-   private Exprent right;
-   private int condType = CONDITION_NONE;
- 
--  public AssignmentExprent(Exprent left, Exprent right, Set<Integer> bytecodeOffsets) {
-+  public AssignmentExprent(Exprent left, Exprent right, BitSet bytecodeOffsets) {
-     super(EXPRENT_ASSIGNMENT);
-     this.left = left;
-     this.right = right;
-@@ -165,6 +165,13 @@ public class AssignmentExprent extends Exprent {
-            condType == as.getCondType();
-   }
- 
-+  @Override
-+  public void getBytecodeRange(BitSet values) {
-+    measureBytecode(values, left);
-+    measureBytecode(values, right);
-+    measureBytecode(values);
-+  }
-+
-   // *****************************************************************************
-   // getter and setter methods
-   // *****************************************************************************
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-index 623d59228cc526cca3bbd52e95e4d493c689f133..b0bda600031b4cc52b6b083d5afd07a92ccef1af 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-@@ -52,20 +52,20 @@ public class ConstExprent extends Exprent {
-   private final Object value;
-   private final boolean boolPermitted;
- 
--  public ConstExprent(int val, boolean boolPermitted, Set<Integer> bytecodeOffsets) {
-+  public ConstExprent(int val, boolean boolPermitted, BitSet bytecodeOffsets) {
-     this(guessType(val, boolPermitted), val, boolPermitted, bytecodeOffsets);
-   }
- 
--  public ConstExprent(VarType constType, Object value, Set<Integer> bytecodeOffsets) {
-+  public ConstExprent(VarType constType, Object value, BitSet bytecodeOffsets) {
-     this(constType, value, false, bytecodeOffsets);
-   }
- 
--  public ConstExprent(VarType constType, Object value, Set<Integer> bytecodeOffsets, StructMember parent) {
-+  public ConstExprent(VarType constType, Object value, BitSet bytecodeOffsets, StructMember parent) {
-     this(constType, value, bytecodeOffsets);
-     this.parent = parent;
-   }
- 
--  private ConstExprent(VarType constType, Object value, boolean boolPermitted, Set<Integer> bytecodeOffsets) {
-+  private ConstExprent(VarType constType, Object value, boolean boolPermitted, BitSet bytecodeOffsets) {
-     super(EXPRENT_CONST);
-     this.constType = constType;
-     this.value = value;
-@@ -496,6 +496,11 @@ public class ConstExprent extends Exprent {
-     return boolPermitted;
-   }
- 
-+  @Override
-+  public void getBytecodeRange(BitSet values) {
-+    measureBytecode(values);
-+  }
-+  
-   // *****************************************************************************
-   // IMatchable implementation
-   // *****************************************************************************
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
-index 655e56241cf1d4eaa8bad524851f682c7af2bfb9..54f6a306cd28f68879d25a536a1dea7a496a4aa3 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
-@@ -16,9 +16,9 @@ import org.jetbrains.java.decompiler.struct.match.MatchNode;
- import org.jetbrains.java.decompiler.util.TextBuffer;
- 
- import java.util.ArrayList;
-+import java.util.BitSet;
- import java.util.List;
- import java.util.Objects;
--import java.util.Set;
- 
- public class ExitExprent extends Exprent {
- 
-@@ -29,7 +29,7 @@ public class ExitExprent extends Exprent {
-   private Exprent value;
-   private final VarType retType;
- 
--  public ExitExprent(int exitType, Exprent value, VarType retType, Set<Integer> bytecodeOffsets) {
-+  public ExitExprent(int exitType, Exprent value, VarType retType, BitSet bytecodeOffsets) {
-     super(EXPRENT_EXIT);
-     this.exitType = exitType;
-     this.value = value;
-@@ -140,6 +140,13 @@ public class ExitExprent extends Exprent {
-     return retType;
-   }
- 
-+  @Override
-+  public void getBytecodeRange(BitSet values) {
-+    measureBytecode(values, value);
-+    measureBytecode(values);
-+  }
-+
-+  
-   // *****************************************************************************
-   // IMatchable implementation
-   // *****************************************************************************
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-index 9b1b3de632a63bbba1f5f7a99d5f75bf537bd171..67fc1f2beab815f0ca07ecf8a34b98fa23344749 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-@@ -16,7 +16,7 @@ import org.jetbrains.java.decompiler.struct.match.MatchNode;
- import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
- 
- import java.util.ArrayList;
--import java.util.Collection;
-+import java.util.BitSet;
- import java.util.Collections;
- import java.util.Comparator;
- import java.util.HashSet;
-@@ -24,7 +24,7 @@ import java.util.List;
- import java.util.Map.Entry;
- import java.util.Set;
- 
--public class Exprent implements IMatchable {
-+public abstract class Exprent implements IMatchable {
-   public static final int MULTIPLE_USES = 1;
-   public static final int SIDE_EFFECTS_FREE = 2;
-   public static final int BOTH_FLAGS = 3;
-@@ -46,7 +46,7 @@ public class Exprent implements IMatchable {
- 
-   public final int type;
-   public final int id;
--  public Set<Integer> bytecode = null;  // offsets of bytecode instructions decompiled to this exprent
-+  public BitSet bytecode = null;  // offsets of bytecode instructions decompiled to this exprent
- 
-   public Exprent(int type) {
-     this.type = type;
-@@ -123,14 +123,31 @@ public class Exprent implements IMatchable {
- 
-   public void replaceExprent(Exprent oldExpr, Exprent newExpr) { }
- 
--  public void addBytecodeOffsets(Collection<Integer> bytecodeOffsets) {
--    if (bytecodeOffsets != null && !bytecodeOffsets.isEmpty()) {
-+  public void addBytecodeOffsets(BitSet bytecodeOffsets) {
-+    if (bytecodeOffsets != null) {
-       if (bytecode == null) {
--        bytecode = new HashSet<>(bytecodeOffsets);
--      }
--      else {
--        bytecode.addAll(bytecodeOffsets);
-+        bytecode = new BitSet();
-       }
-+      bytecode.or(bytecodeOffsets);
-+    }
-+  }
-+
-+  public abstract void getBytecodeRange(BitSet values);
-+
-+  protected void measureBytecode(BitSet values) {
-+    if (bytecode != null)
-+      values.or(bytecode);
-+  }
-+
-+  protected static void measureBytecode(BitSet values, Exprent exprent) {
-+    if (exprent != null)
-+      exprent.getBytecodeRange(values);
-+  }
-+
-+  protected static void measureBytecode(BitSet values, List<? extends Exprent> list) {
-+    if (list != null && !list.isEmpty()) {
-+      for (Exprent e : list)
-+        e.getBytecodeRange(values);
-     }
-   }
- 
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-index 4cd97c42682b27f96414ddf5302fc81db2561e56..379242393a83c6b3502a88c8d745a5b0bc1b5476 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-@@ -19,9 +19,9 @@ import org.jetbrains.java.decompiler.util.TextBuffer;
- import org.jetbrains.java.decompiler.util.TextUtil;
- 
- import java.util.ArrayList;
-+import java.util.BitSet;
- import java.util.List;
- import java.util.Objects;
--import java.util.Set;
- 
- public class FieldExprent extends Exprent {
-   private final String name;
-@@ -30,11 +30,11 @@ public class FieldExprent extends Exprent {
-   private Exprent instance;
-   private final FieldDescriptor descriptor;
- 
--  public FieldExprent(LinkConstant cn, Exprent instance, Set<Integer> bytecodeOffsets) {
-+  public FieldExprent(LinkConstant cn, Exprent instance, BitSet bytecodeOffsets) {
-     this(cn.elementname, cn.classname, instance == null, instance, FieldDescriptor.parseDescriptor(cn.descriptor), bytecodeOffsets);
-   }
- 
--  public FieldExprent(String name, String classname, boolean isStatic, Exprent instance, FieldDescriptor descriptor, Set<Integer> bytecodeOffsets) {
-+  public FieldExprent(String name, String classname, boolean isStatic, Exprent instance, FieldDescriptor descriptor, BitSet bytecodeOffsets) {
-     super(EXPRENT_FIELD);
-     this.name = name;
-     this.classname = classname;
-@@ -182,6 +182,12 @@ public class FieldExprent extends Exprent {
-     return name;
-   }
- 
-+  @Override
-+  public void getBytecodeRange(BitSet values) {
-+    measureBytecode(values, instance);
-+    measureBytecode(values);
-+  }
-+
-   // *****************************************************************************
-   // IMatchable implementation
-   // *****************************************************************************
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-index 4290039f07249ef112eb357ba0c9914ef5c08b40..b2b26fb3f8b075182caee14d57b4cc351ffb120a 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-@@ -183,7 +183,7 @@ public class FunctionExprent extends Exprent {
-   private VarType implicitType;
-   private final List<Exprent> lstOperands;
- 
--  public FunctionExprent(int funcType, ListStack<Exprent> stack, Set<Integer> bytecodeOffsets) {
-+  public FunctionExprent(int funcType, ListStack<Exprent> stack, BitSet bytecodeOffsets) {
-     this(funcType, new ArrayList<>(), bytecodeOffsets);
- 
-     if (funcType >= FUNCTION_BIT_NOT && funcType <= FUNCTION_PPI && funcType != FUNCTION_CAST && funcType != FUNCTION_INSTANCEOF) {
-@@ -199,7 +199,7 @@ public class FunctionExprent extends Exprent {
-     }
-   }
- 
--  public FunctionExprent(int funcType, List<Exprent> operands, Set<Integer> bytecodeOffsets) {
-+  public FunctionExprent(int funcType, List<Exprent> operands, BitSet bytecodeOffsets) {
-     super(EXPRENT_FUNCTION);
-     this.funcType = funcType;
-     this.lstOperands = operands;
-@@ -207,7 +207,7 @@ public class FunctionExprent extends Exprent {
-     addBytecodeOffsets(bytecodeOffsets);
-   }
- 
--  public FunctionExprent(int funcType, Exprent operand, Set<Integer> bytecodeOffsets) {
-+  public FunctionExprent(int funcType, Exprent operand, BitSet bytecodeOffsets) {
-     this(funcType, new ArrayList<>(1), bytecodeOffsets);
-     lstOperands.add(operand);
-   }
-@@ -565,6 +565,12 @@ public class FunctionExprent extends Exprent {
-     this.implicitType = implicitType;
-   }
- 
-+  @Override
-+  public void getBytecodeRange(BitSet values) {
-+    measureBytecode(values, lstOperands);
-+    measureBytecode(values);
-+  }
-+  
-   // *****************************************************************************
-   // IMatchable implementation
-   // *****************************************************************************
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
-index fda309fdc9d9fcaba4d089778122a56d1524e083..7c9ee0a57cd291ae20b466d70f57a8f11bf4abaa 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
-@@ -9,9 +9,9 @@ import org.jetbrains.java.decompiler.util.ListStack;
- import org.jetbrains.java.decompiler.util.TextBuffer;
- 
- import java.util.ArrayList;
-+import java.util.BitSet;
- import java.util.List;
- import java.util.Objects;
--import java.util.Set;
- 
- public class IfExprent extends Exprent {
- 
-@@ -64,7 +64,7 @@ public class IfExprent extends Exprent {
- 
-   private Exprent condition;
- 
--  public IfExprent(int ifType, ListStack<Exprent> stack, Set<Integer> bytecodeOffsets) {
-+  public IfExprent(int ifType, ListStack<Exprent> stack, BitSet bytecodeOffsets) {
-     this(null, bytecodeOffsets);
- 
-     if (ifType <= IF_LE) {
-@@ -82,7 +82,7 @@ public class IfExprent extends Exprent {
-     }
-   }
- 
--  private IfExprent(Exprent condition, Set<Integer> bytecodeOffsets) {
-+  private IfExprent(Exprent condition, BitSet bytecodeOffsets) {
-     super(EXPRENT_IF);
-     this.condition = condition;
- 
-@@ -134,4 +134,10 @@ public class IfExprent extends Exprent {
-   public void setCondition(Exprent condition) {
-     this.condition = condition;
-   }
--}
-\ No newline at end of file
-+
-+  @Override
-+  public void getBytecodeRange(BitSet values) {
-+    measureBytecode(values, condition);
-+    measureBytecode(values);
-+  }
-+}
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index dc9c2a593185c2f5de7289b0c7676071bf50f5a4..3cedf46af2faa91029231205455a1df1db7be3de 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-@@ -65,7 +65,7 @@ public class InvocationExprent extends Exprent {
-                            LinkConstant cn,
-                            List<PooledConstant> bootstrapArguments,
-                            ListStack<? extends Exprent> stack,
--                           Set<Integer> bytecodeOffsets) {
-+                           BitSet bytecodeOffsets) {
-     this();
- 
-     name = cn.elementname;
-@@ -602,6 +602,13 @@ public class InvocationExprent extends Exprent {
-     return bootstrapArguments;
-   }
- 
-+  @Override
-+  public void getBytecodeRange(BitSet values) {
-+    measureBytecode(values, parameters);
-+    measureBytecode(values, instance);
-+    measureBytecode(values);
-+  }
-+
-   // *****************************************************************************
-   // IMatchable implementation
-   // *****************************************************************************
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
-index 7259ce4ee91540cabf7a76105a5f18b2ab0390fa..cd465813bc3e9076d3bbafd1c7b10c9bed0a1407 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
-@@ -7,9 +7,9 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
- import org.jetbrains.java.decompiler.util.TextBuffer;
- 
- import java.util.ArrayList;
-+import java.util.BitSet;
- import java.util.List;
- import java.util.Objects;
--import java.util.Set;
- 
- public class MonitorExprent extends Exprent {
- 
-@@ -19,7 +19,7 @@ public class MonitorExprent extends Exprent {
-   private final int monType;
-   private Exprent value;
- 
--  public MonitorExprent(int monType, Exprent value, Set<Integer> bytecodeOffsets) {
-+  public MonitorExprent(int monType, Exprent value, BitSet bytecodeOffsets) {
-     super(EXPRENT_MONITOR);
-     this.monType = monType;
-     this.value = value;
-@@ -74,4 +74,10 @@ public class MonitorExprent extends Exprent {
-   public Exprent getValue() {
-     return value;
-   }
-+
-+  @Override
-+  public void getBytecodeRange(BitSet values) {
-+    measureBytecode(values, value);
-+    measureBytecode(values);
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-index 2f8da49a36ee84e09ff6192aea5d0904c4f06255..c47ae33d7d62a5049a89bb586032fc18bdc80173 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-@@ -31,11 +31,11 @@ public class NewExprent extends Exprent {
-   private boolean lambda;
-   private boolean enumConst;
- 
--  public NewExprent(VarType newType, ListStack<Exprent> stack, int arrayDim, Set<Integer> bytecodeOffsets) {
-+  public NewExprent(VarType newType, ListStack<Exprent> stack, int arrayDim, BitSet bytecodeOffsets) {
-     this(newType, getDimensions(arrayDim, stack), bytecodeOffsets);
-   }
- 
--  public NewExprent(VarType newType, List<Exprent> lstDims, Set<Integer> bytecodeOffsets) {
-+  public NewExprent(VarType newType, List<Exprent> lstDims, BitSet bytecodeOffsets) {
-     super(EXPRENT_NEW);
-     this.newType = newType;
-     this.lstDims = lstDims;
-@@ -435,6 +435,14 @@ public class NewExprent extends Exprent {
-            Objects.equals(lstArrayElements, ne.lstArrayElements);
-   }
- 
-+  @Override
-+  public void getBytecodeRange(BitSet values) {
-+    measureBytecode(values, lstArrayElements);
-+    measureBytecode(values, lstDims);
-+    measureBytecode(values, constructor);
-+    measureBytecode(values);
-+  }
-+
-   public InvocationExprent getConstructor() {
-     return constructor;
-   }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
-index f475db7b7441d47661340b366116dbae7b1d9e5e..11000d30cbdc93e360cb1bc96b53987bc692e3bd 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
-@@ -9,16 +9,16 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
- import org.jetbrains.java.decompiler.util.TextBuffer;
- 
- import java.util.ArrayList;
-+import java.util.BitSet;
- import java.util.List;
- import java.util.Objects;
--import java.util.Set;
- 
- public class SwitchExprent extends Exprent {
- 
-   private Exprent value;
-   private List<List<Exprent>> caseValues = new ArrayList<>();
- 
--  public SwitchExprent(Exprent value, Set<Integer> bytecodeOffsets) {
-+  public SwitchExprent(Exprent value, BitSet bytecodeOffsets) {
-     super(EXPRENT_SWITCH);
-     this.value = value;
- 
-@@ -99,6 +99,22 @@ public class SwitchExprent extends Exprent {
-     return Objects.equals(value, sw.getValue());
-   }
- 
-+  @Override
-+  public void getBytecodeRange(BitSet values) {
-+    if (caseValues != null && !caseValues.isEmpty()) {
-+      for (List<Exprent> l : caseValues) {
-+        if (l != null && !l.isEmpty()) {
-+          for (Exprent e : l) {
-+            if (e != null)
-+              e.getBytecodeRange(values);
-+          }
-+        }
-+      }
-+    }
-+    measureBytecode(values, value);
-+    measureBytecode(values);
-+  }
-+
-   public Exprent getValue() {
-     return value;
-   }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index e488a34ea11ab46cd1bd6383cd332f05d45df2af..2b508a172340285dff5afa73cd4d7fcbf0dfeaff 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-@@ -26,6 +26,7 @@ import org.jetbrains.java.decompiler.util.TextUtil;
- 
- import java.util.ArrayList;
- import java.util.Collections;
-+import java.util.BitSet;
- import java.util.List;
- import java.util.Objects;
- 
-@@ -37,21 +38,20 @@ public class VarExprent extends Exprent {
-   private VarType varType;
-   private boolean definition = false;
-   private final VarProcessor processor;
--  private final int visibleOffset;
-   private int version = 0;
-   private boolean classDef = false;
-   private boolean stack = false;
- 
-   public VarExprent(int index, VarType varType, VarProcessor processor) {
--    this(index, varType, processor, -1);
-+    this(index, varType, processor, null);
-   }
- 
--  public VarExprent(int index, VarType varType, VarProcessor processor, int visibleOffset) {
-+  public VarExprent(int index, VarType varType, VarProcessor processor, BitSet bytecode) {
-     super(EXPRENT_VAR);
-     this.index = index;
-     this.varType = varType;
-     this.processor = processor;
--    this.visibleOffset = visibleOffset;
-+    this.addBytecodeOffsets(bytecode);
-   }
- 
-   @Override
-@@ -71,7 +71,7 @@ public class VarExprent extends Exprent {
- 
-   @Override
-   public Exprent copy() {
--    VarExprent var = new VarExprent(index, getVarType(), processor, visibleOffset);
-+    VarExprent var = new VarExprent(index, getVarType(), processor, bytecode);
-     var.setDefinition(definition);
-     var.setVersion(version);
-     var.setClassDef(classDef);
-@@ -120,7 +120,7 @@ public class VarExprent extends Exprent {
-     if (attr != null && processor != null) {
-       Integer origIndex = processor.getVarOriginalIndex(index);
-       if (origIndex != null) {
--        String name = attr.getName(origIndex, visibleOffset);
-+        String name = attr.getName(origIndex, bytecode == null ? -1 : bytecode.nextSetBit(0));
-         if (name != null && TextUtil.isValidIdentifier(name, method.getBytecodeVersion())) {
-           return name;
-         }
-@@ -137,6 +137,7 @@ public class VarExprent extends Exprent {
-         if (processor != null) {
-           originalIndex = processor.getVarOriginalIndex(index);
-         }
-+        int visibleOffset = bytecode == null ? -1 : bytecode.length();
-         if (originalIndex != null) {
-           // first try from signature
-           if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
-@@ -180,6 +181,11 @@ public class VarExprent extends Exprent {
-            Objects.equals(getVarType(), ve.getVarType()); // FIXME: varType comparison redundant?
-   }
- 
-+  @Override
-+  public void getBytecodeRange(BitSet values) {
-+    measureBytecode(values);
-+  }
-+
-   public int getIndex() {
-     return index;
-   }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
-index 6510e1dca6733eb28ceb0a774a658f893b3a8935..98e1c189d302ac71e01949511dc9f9c035b85e5a 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
-@@ -10,6 +10,7 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
- import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
- import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
- import org.jetbrains.java.decompiler.util.TextBuffer;
-+import org.jetbrains.java.decompiler.util.StartEndPair;
- 
- public class BasicBlockStatement extends Statement {
-   private final BasicBlock block;
-@@ -58,4 +59,13 @@ public class BasicBlockStatement extends Statement {
-   public BasicBlock getBlock() {
-     return block;
-   }
-+
-+  @Override
-+  public StartEndPair getStartEndRange() {
-+    if (block.size() > 0) {
-+      return new StartEndPair(block.getStartInstruction(), block.getEndInstruction());
-+    } else {
-+      return new StartEndPair(0, 0);
-+    }
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java
-index b0cca026cbe68b2741a6ca01a50c6a46be128bc8..b1c9165f9a4a2135128d22a3971303cc4d763a94 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java
-@@ -1,25 +1,21 @@
- // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- package org.jetbrains.java.decompiler.modules.decompiler.stats;
- 
--import java.util.Collection;
--import java.util.HashSet;
--import java.util.Set;
-+import java.util.BitSet;
- 
- public class DummyExitStatement extends Statement {
--  public Set<Integer> bytecode = null;  // offsets of bytecode instructions mapped to dummy exit
-+  public BitSet bytecode = null;  // offsets of bytecode instructions mapped to dummy exit
- 
-   public DummyExitStatement() {
-     super(StatementType.DUMMY_EXIT);
-   }
- 
--  public void addBytecodeOffsets(Collection<Integer> bytecodeOffsets) {
-+  public void addBytecodeOffsets(BitSet bytecodeOffsets) {
-     if (bytecodeOffsets != null && !bytecodeOffsets.isEmpty()) {
-       if (bytecode == null) {
--        bytecode = new HashSet<>(bytecodeOffsets);
--      }
--      else {
--        bytecode.addAll(bytecodeOffsets);
-+        bytecode = new BitSet();
-       }
-+      bytecode.or(bytecodeOffsets);
-     }
-   }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
-index 300314e0197e3914f8365c4acab064fec4e78445..611f501b4c94d15d557edf991eb84cd9eb7d4173 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
-@@ -12,6 +12,7 @@ import org.jetbrains.java.decompiler.struct.match.IMatchable;
- import org.jetbrains.java.decompiler.struct.match.MatchEngine;
- import org.jetbrains.java.decompiler.struct.match.MatchNode;
- import org.jetbrains.java.decompiler.util.TextBuffer;
-+import org.jetbrains.java.decompiler.util.StartEndPair;
- import org.jetbrains.java.decompiler.util.TextUtil;
- 
- import java.util.ArrayList;
-@@ -409,6 +410,13 @@ public final class IfStatement extends Statement {
-     return elseedge;
-   }
- 
-+  @Override
-+  public StartEndPair getStartEndRange() {
-+    return StartEndPair.join(super.getStartEndRange(), 
-+      ifstat != null ? ifstat.getStartEndRange() : null, 
-+      elsestat != null ? elsestat.getStartEndRange(): null);
-+  }
-+
-   // *****************************************************************************
-   // IMatchable implementation
-   // *****************************************************************************
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
-index 0946904c8610c2d21de597361e0adf377e88a675..163efe83fdfd94ccb945509fe4593f8495f467bb 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
-@@ -4,6 +4,7 @@ package org.jetbrains.java.decompiler.modules.decompiler.stats;
- import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
- import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
- import org.jetbrains.java.decompiler.util.TextBuffer;
-+import org.jetbrains.java.decompiler.util.StartEndPair;
- 
- public class RootStatement extends Statement {
-   private final DummyExitStatement dummyExit;
-@@ -26,4 +27,9 @@ public class RootStatement extends Statement {
-   public DummyExitStatement getDummyExit() {
-     return dummyExit;
-   }
--}
-\ No newline at end of file
-+
-+  @Override
-+  public StartEndPair getStartEndRange() {
-+    return StartEndPair.join(first.getStartEndRange(), dummyExit != null ? dummyExit.getStartEndRange() : null);
-+  }
-+}
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
-index 224d3636f7c9d502cc65c122f542324c1ba7028a..9498f3c548d18ead3bcbc076222bd5ace82b8275 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
-@@ -19,6 +19,7 @@ import org.jetbrains.java.decompiler.struct.match.IMatchable;
- import org.jetbrains.java.decompiler.struct.match.MatchEngine;
- import org.jetbrains.java.decompiler.struct.match.MatchNode;
- import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
-+import org.jetbrains.java.decompiler.util.StartEndPair;
- import org.jetbrains.java.decompiler.util.TextBuffer;
- import org.jetbrains.java.decompiler.util.VBStyleCollection;
- 
-@@ -796,6 +797,40 @@ public abstract class Statement implements IMatchable {
-     return Integer.toString(id);
-   }
- 
-+  //TODO: Cleanup/cache?
-+  public void getOffset(BitSet values) {
-+    if (this instanceof DummyExitStatement && ((DummyExitStatement)this).bytecode != null)
-+      values.or(((DummyExitStatement)this).bytecode);
-+    if (this.getExprents() != null) {
-+      for (Exprent e : this.getExprents()) {
-+        e.getBytecodeRange(values);
-+      }
-+    } else {
-+      for (Object obj : this.getSequentialObjects()) {
-+        if (obj == null) {
-+          //Humm? Skip it
-+        } else if (obj instanceof Statement) {
-+          ((Statement)obj).getOffset(values);
-+        } else if (obj instanceof Exprent) {
-+          ((Exprent)obj).getBytecodeRange(values);
-+        } else {
-+          System.out.println("WTF?" + obj.getClass());
-+        }
-+      }
-+    }
-+  }
-+
-+  private StartEndPair endpoints;
-+  public StartEndPair getStartEndRange() {
-+    if (endpoints == null) {
-+      BitSet set = new BitSet();
-+      getOffset(set);
-+      endpoints = new StartEndPair(set.nextSetBit(0), set.length() - 1);
-+    }
-+    return endpoints;
-+  }
-+
-+
-   // *****************************************************************************
-   // IMatchable implementation
-   // *****************************************************************************
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
-index 119949c8bd35082b95cbfde2b185aa2d23034224..18e40f99948e63d8e1d6136b4d1d5eadefd97330 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
-@@ -19,6 +19,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.FieldExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.SwitchExprent;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
-+import org.jetbrains.java.decompiler.util.StartEndPair;
- import org.jetbrains.java.decompiler.util.TextBuffer;
- 
- import java.util.*;
-@@ -170,6 +171,17 @@ public final class SwitchStatement extends Statement {
-     sortEdgesAndNodes();
-   }
- 
-+  @Override
-+  public StartEndPair getStartEndRange() {
-+    StartEndPair[] sepairs = new StartEndPair[caseStatements.size() + 1];
-+    int i = 0;
-+    sepairs[i++] = super.getStartEndRange();
-+    for (Statement st : caseStatements) {
-+      sepairs[i++] = st.getStartEndRange();
-+    }
-+    return StartEndPair.join(sepairs);
-+  }
-+
-   public void sortEdgesAndNodes() {
-     Map<StatEdge, Integer> edgeIndicesMapping = new HashMap<>();
-     List<StatEdge> firstSuccessors = first.getSuccessorEdges(EdgeType.DIRECT_ALL);
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-index b908ed26c27a60dd01f056b736490ebdf25dc125..470965603db2b5ffda4c2776549fcfbba5e7ee72 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-@@ -253,11 +253,11 @@ public class StructMethod extends StructMember {
-         }
-       }
- 
--      Instruction instr = Instruction.create(opcode, wide, group, bytecodeVersion, ops);
-+      i++;
- 
--      instructions.addWithKey(instr, offset);
-+      Instruction instr = Instruction.create(opcode, wide, group, bytecodeVersion, ops, i - offset);
- 
--      i++;
-+      instructions.addWithKey(instr, offset);
-     }
- 
-     // initialize exception table
-diff --git a/src/org/jetbrains/java/decompiler/util/StartEndPair.java b/src/org/jetbrains/java/decompiler/util/StartEndPair.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..ded36aadd72242ba74e3392e0891c6c82ac6b920
---- /dev/null
-+++ b/src/org/jetbrains/java/decompiler/util/StartEndPair.java
-@@ -0,0 +1,51 @@
-+/*
-+ * Copyright 2000-2017 JetBrains s.r.o.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+package org.jetbrains.java.decompiler.util;
-+
-+public class StartEndPair {
-+  public final int start;
-+  public final int end;
-+  public StartEndPair(int start, int end) {
-+    this.start = start;
-+    this.end = end;
-+  }
-+
-+  @Override
-+  public boolean equals(Object obj) {
-+    return ((StartEndPair)obj).start == start && ((StartEndPair)obj).end == end;
-+  }
-+
-+  @Override
-+  public int hashCode() {
-+    return start * 31 + end;
-+  }
-+
-+  @Override
-+  public String toString() {
-+    return String.format("%d->%d",start,end);
-+  }
-+
-+  public static StartEndPair join(StartEndPair... pairs) {
-+    int start = Integer.MAX_VALUE;
-+    int end = Integer.MIN_VALUE;
-+    for (StartEndPair pair : pairs) {
-+        if (pair == null) continue;
-+        start = Math.min(start, pair.start);
-+        end = Math.max(end, pair.end);
-+    }
-+    return new StartEndPair(start, end);
-+  }
-+}
-diff --git a/testData/results/InvalidMethodSignature.dec b/testData/results/InvalidMethodSignature.dec
-index e4b567c433b4a80e0c01119a8f115611dffe93be..ce8afaba80cd2197e1831af1af6be13da86962cb 100644
---- a/testData/results/InvalidMethodSignature.dec
-+++ b/testData/results/InvalidMethodSignature.dec
-@@ -26,19 +26,51 @@ class i implements bg {
- 
- class 'a/a/a/a/e/f/i' {
-    method '<init> (La/a/a/a/e/f/b;La/a/a/a/c/j;)V' {
-+      0      13
-+      1      13
-       2      13
-+      3      13
-+      4      13
-+      5      14
-+      6      14
-       7      14
-+      8      14
-+      9      14
-       e      15
-    }
- 
-    method 'a (La/a/a/a/c/c;La/a/a/a/a/k;Z)V' {
-+      0      18
-       1      18
-+      2      18
-+      3      18
-       4      18
-+      5      18
-+      6      18
-+      7      18
-+      8      18
-+      9      18
-       a      18
-+      b      18
-+      c      18
-+      d      18
-+      e      18
-       f      18
-+      10      18
-+      11      19
-       12      19
-+      13      19
-+      14      19
-       15      19
-+      16      19
-+      17      19
-+      18      19
-+      19      19
-       1a      19
-+      1b      19
-+      1c      19
-+      1d      19
-+      1e      19
-       20      20
-    }
- 
-diff --git a/testData/results/TestAbstractMethods.dec b/testData/results/TestAbstractMethods.dec
-index 781cbfcf0bf85491e31f60dc3087d3106436ed1b..c0e60eb5262ee228d5eb57719bd4caddc8c90651 100644
---- a/testData/results/TestAbstractMethods.dec
-+++ b/testData/results/TestAbstractMethods.dec
-@@ -16,12 +16,18 @@ public abstract class TestAbstractMethods {
- 
- class 'pkg/TestAbstractMethods' {
-    method 'test (I)I' {
-+      0      6
-       1      6
-    }
- 
-    method 'test2 (Ljava/lang/String;)V' {
-       0      12
-+      1      12
-+      2      12
-+      3      12
-       4      12
-+      5      12
-+      6      12
-       7      13
-    }
- }
-diff --git a/testData/results/TestAccessReplace.dec b/testData/results/TestAccessReplace.dec
-index f365126e79b21d9cc1d59591a00f219bf0755424..83d1eb2fac3378e5d556aeeebc70bb83a4e5cba8 100644
---- a/testData/results/TestAccessReplace.dec
-+++ b/testData/results/TestAccessReplace.dec
-@@ -15,7 +15,7 @@ public class TestAccessReplace {
- 
-    public class Inner {
-       public Inner(String b) {
--         TestAccessReplace.fooS();// 26
-+         TestAccessReplace.fooS();// 25
-          TestAccessReplace.this.foo();// 27
-          TestAccessReplace.fooSParams(1L, 2L);// 28
-          TestAccessReplace.this.fooParams(1L, 2L);// 29
-@@ -43,14 +43,22 @@ class 'pkg/TestAccessReplace' {
- 
- class 'pkg/TestAccessReplace$Inner' {
-    method '<init> (Lpkg/TestAccessReplace;Ljava/lang/String;)V' {
--      9      17
--      d      18
-+      0      17
-+      1      17
-+      2      17
-+      3      18
-+      4      19
-+      5      20
-+      c      18
-       10      19
-       11      19
--      14      19
-+      12      19
-+      13      19
-+      17      20
-       18      20
-       19      20
--      1c      20
-+      1a      20
-+      1b      20
-       1f      21
-    }
- }
-@@ -60,10 +68,10 @@ Lines mapping:
- 20 <-> 8
- 21 <-> 11
- 22 <-> 14
--26 <-> 18
-+25 <-> 18
- 27 <-> 19
- 28 <-> 20
- 29 <-> 21
- 30 <-> 22
- Not mapped:
--25
-+26
-diff --git a/testData/results/TestAmbiguousCall.dec b/testData/results/TestAmbiguousCall.dec
-index a48730dcfb207c76a0959c5c34d59c5d3d503897..dec7ba0f20eecdc5a3c7d0774a0fdd4f3b68e6f6 100644
---- a/testData/results/TestAmbiguousCall.dec
-+++ b/testData/results/TestAmbiguousCall.dec
-@@ -28,16 +28,38 @@ class 'pkg/TestAmbiguousCall' {
- 
-    method 'test ()V' {
-       7      10
-+      8      11
-+      9      11
-       a      11
-+      b      11
-       c      11
-+      d      11
-+      e      11
-+      f      12
-+      10      12
-       11      12
-+      12      12
-       13      12
-+      14      12
-+      15      12
-       1d      13
-+      1e      14
-+      1f      14
-       20      14
-+      21      14
-       22      14
-+      23      14
-+      24      14
-+      25      15
-+      26      15
-       27      15
-+      28      15
-+      29      15
-       2a      15
-+      2b      15
-       2c      15
-+      2d      15
-+      2e      15
-       2f      16
-    }
- }
-diff --git a/testData/results/TestAmbiguousCallWithDebugInfo.dec b/testData/results/TestAmbiguousCallWithDebugInfo.dec
-index b697e795761f0f254e341663f4934e06ae3af8ef..e873e7e3cc488b036a46c332bd724e3fac30f720 100644
---- a/testData/results/TestAmbiguousCallWithDebugInfo.dec
-+++ b/testData/results/TestAmbiguousCallWithDebugInfo.dec
-@@ -28,16 +28,38 @@ class 'pkg/TestAmbiguousCall' {
- 
-    method 'test ()V' {
-       7      10
-+      8      11
-+      9      11
-       a      11
-+      b      11
-       c      11
-+      d      11
-+      e      11
-+      f      12
-+      10      12
-       11      12
-+      12      12
-       13      12
-+      14      12
-+      15      12
-       1d      13
-+      1e      14
-+      1f      14
-       20      14
-+      21      14
-       22      14
-+      23      14
-+      24      14
-+      25      15
-+      26      15
-       27      15
-+      28      15
-+      29      15
-       2a      15
-+      2b      15
-       2c      15
-+      2d      15
-+      2e      15
-       2f      16
-    }
- }
-diff --git a/testData/results/TestAnonymousClass.dec b/testData/results/TestAnonymousClass.dec
-index 3ea3c7058eadc696e538c72e018bd4076b07a397..044b1f23b7027c7317fba97b760993a45c70115d 100644
---- a/testData/results/TestAnonymousClass.dec
-+++ b/testData/results/TestAnonymousClass.dec
-@@ -46,12 +46,12 @@ public abstract class TestAnonymousClass {
- 
-    void foo(int var1) throws Exception {
-       if (var1 > 0) {// 10
--         I var2 = new I() {
-+         I var2 = new I() {// 11
-             public void foo() throws Exception {
-                boolean var1 = true;// 13
-                boolean var2 = true;// 14
-             }// 15
--         };// 11
-+         };
-          var2.foo();// 17
-       } else {
-          System.out.println(5);// 21
-@@ -158,10 +158,18 @@ class 'pkg/TestAnonymousClass$1' {
- 
- class 'pkg/TestAnonymousClass' {
-    method 'foo (I)V' {
-+      0      47
-       1      47
--      c      53
-+      c      48
-+      d      54
-       e      54
-+      f      54
-+      10      54
-+      11      54
-+      12      54
-       16      56
-+      17      56
-+      18      56
-       19      56
-       1a      56
-       1d      59
-@@ -192,7 +200,11 @@ class 'pkg/TestAnonymousClass$Inner$1' {
- 
- class 'pkg/TestAnonymousClass$InnerRecursive' {
-    method '<init> (Lpkg/TestAnonymousClass$InnerRecursive;)V' {
-+      4      86
-+      5      86
-       6      86
-+      7      86
-+      8      86
-       9      87
-    }
- 
-@@ -203,7 +215,7 @@ class 'pkg/TestAnonymousClass$InnerRecursive' {
- 
- Lines mapping:
- 10 <-> 48
--11 <-> 54
-+11 <-> 49
- 13 <-> 51
- 14 <-> 52
- 15 <-> 53
-diff --git a/testData/results/TestAnonymousClassConstructor.dec b/testData/results/TestAnonymousClassConstructor.dec
-index e48e5bc934ccd1ed1aedd0fcde645026bbb4e3fe..08e25fc143aae82531a9e493c328a5606aef9f02 100644
---- a/testData/results/TestAnonymousClassConstructor.dec
-+++ b/testData/results/TestAnonymousClassConstructor.dec
-@@ -117,139 +117,207 @@ class TestAnonymousClassConstructor {
- class 'pkg/TestAnonymousClassConstructor' {
-    method 'innerPrivateString ()V' {
-       5      4
-+      6      4
-       b      6
-    }
- 
-    method 'innerPrivate ()V' {
-       5      9
-+      6      9
-+      7      9
-       8      9
-       d      11
-    }
- 
-    method 'innerStaticPrivateString ()V' {
-       5      14
-+      6      14
-       b      16
-    }
- 
-    method 'innerStaticPrivate ()V' {
-       5      19
-+      6      19
-+      7      19
-       8      19
-       d      21
-    }
- 
-    method 'innerStaticPrivateStringStatic ()V' {
-       4      24
-+      5      24
-       a      26
-    }
- 
-    method 'innerStaticPrivateStatic ()V' {
-       4      29
-+      5      29
-+      6      29
-       7      29
-       c      31
-    }
- 
-    method 'innerPublicString ()V' {
-       5      34
-+      6      34
-       b      36
-    }
- 
-    method 'innerPublic ()V' {
-       5      39
-+      6      39
-+      7      39
-       8      39
-       d      41
-    }
- 
-    method 'innerStaticPublicString ()V' {
-       5      44
-+      6      44
-       b      46
-    }
- 
-    method 'innerStaticPublic ()V' {
-       5      49
-+      6      49
-+      7      49
-       8      49
-       d      51
-    }
- 
-    method 'innerStaticPublicStringStatic ()V' {
-       4      54
-+      5      54
-       a      56
-    }
- 
-    method 'innerStaticPublicStatic ()V' {
-       4      59
-+      5      59
-+      6      59
-       7      59
-       c      61
-    }
- 
-    method 'n (Ljava/lang/String;)V' {
-       0      64
-+      1      64
-+      2      64
-       a      64
-+      b      64
-+      f      64
-       13      64
-+      14      64
-+      15      64
-       16      64
-+      17      64
-+      18      64
-       19      65
-    }
- }
- 
- class 'pkg/TestAnonymousClassConstructor$InnerPrivate' {
-    method '<init> (Lpkg/TestAnonymousClassConstructor;JI)V' {
-+      10      69
-       14      69
-+      15      69
-+      19      69
-+      1a      69
-       1e      69
-+      1f      69
-+      20      69
-       21      69
-+      22      69
-+      23      69
-       24      70
-    }
- }
- 
- class 'pkg/TestAnonymousClassConstructor$InnerPrivateString' {
-    method '<init> (Lpkg/TestAnonymousClassConstructor;Ljava/lang/String;)V' {
-+      9      75
-       a      75
-+      b      75
-+      c      75
-       d      76
-    }
- }
- 
- class 'pkg/TestAnonymousClassConstructor$InnerPublic' {
-    method '<init> (Lpkg/TestAnonymousClassConstructor;JI)V' {
-+      10      81
-       14      81
-+      15      81
-+      19      81
-+      1a      81
-       1e      81
-+      1f      81
-+      20      81
-       21      81
-+      22      81
-+      23      81
-       24      82
-    }
- }
- 
- class 'pkg/TestAnonymousClassConstructor$InnerPublicString' {
-    method '<init> (Lpkg/TestAnonymousClassConstructor;Ljava/lang/String;)V' {
-+      9      87
-       a      87
-+      b      87
-+      c      87
-       d      88
-    }
- }
- 
- class 'pkg/TestAnonymousClassConstructor$InnerStaticPrivate' {
-    method '<init> (JI)V' {
-+      b      93
-       f      93
-+      10      93
-+      14      93
-       18      93
-+      19      93
-+      1a      93
-       1b      93
-+      1c      93
-+      1d      93
-       1e      94
-    }
- }
- 
- class 'pkg/TestAnonymousClassConstructor$InnerStaticPrivateString' {
-    method '<init> (Ljava/lang/String;)V' {
-+      4      99
-       5      99
-+      6      99
-+      7      99
-       8      100
-    }
- }
- 
- class 'pkg/TestAnonymousClassConstructor$InnerStaticPublic' {
-    method '<init> (JI)V' {
-+      b      105
-       f      105
-+      10      105
-+      14      105
-       18      105
-+      19      105
-+      1a      105
-       1b      105
-+      1c      105
-+      1d      105
-       1e      106
-    }
- }
- 
- class 'pkg/TestAnonymousClassConstructor$InnerStaticPublicString' {
-    method '<init> (Ljava/lang/String;)V' {
-+      4      111
-       5      111
-+      6      111
-+      7      111
-       8      112
-    }
- }
-diff --git a/testData/results/TestAnonymousParams.dec b/testData/results/TestAnonymousParams.dec
-index c48794179eeaa512f49f552cdc691ee62c61adec..b963effed064e192a69c16c927a234a6708f68b2 100644
---- a/testData/results/TestAnonymousParams.dec
-+++ b/testData/results/TestAnonymousParams.dec
-@@ -6,31 +6,38 @@ import java.io.InputStream;
- 
- public class TestAnonymousParams {
-    void foo(InputStream in, final int a) throws IOException {
--      FilterInputStream filterInputStream = new FilterInputStream(in) {
-+      FilterInputStream filterInputStream = new FilterInputStream(in) {// 24
-          public int read() throws IOException {
-             return a;// 27
-          }
--      };// 24
-+      };
-       filterInputStream.read();// 30
-    }// 31
- }
- 
- class 'pkg/TestAnonymousParams$1' {
-    method 'read ()I' {
-+      1      10
-+      2      10
-+      3      10
-       4      10
-    }
- }
- 
- class 'pkg/TestAnonymousParams' {
-    method 'foo (Ljava/io/InputStream;I)V' {
--      a      12
-+      5      8
-+      a      8
-+      b      13
-       c      13
-+      d      13
-+      e      13
-       10      14
-    }
- }
- 
- Lines mapping:
--24 <-> 13
-+24 <-> 9
- 27 <-> 11
- 30 <-> 14
- 31 <-> 15
-diff --git a/testData/results/TestAnonymousSignature.dec b/testData/results/TestAnonymousSignature.dec
-index 95ad203e3412f03b51eb06a9f926586f653042de..0c183ba28589c504aafed9631bea09e6524ae19d 100644
---- a/testData/results/TestAnonymousSignature.dec
-+++ b/testData/results/TestAnonymousSignature.dec
-@@ -21,6 +21,8 @@ public class TestAnonymousSignature {
- class 'pkg/TestAnonymousSignature$1' {
-    method 'size ()I' {
-       1      9
-+      2      9
-+      3      9
-       4      9
-    }
- }
-@@ -35,9 +37,17 @@ class 'pkg/TestAnonymousSignature$2' {
- class 'pkg/TestAnonymousSignature' {
-    method 'main ([Ljava/lang/String;)V' {
-       0      7
-+      1      7
-+      2      7
-       a      7
-+      b      7
-+      c      7
-       d      12
-+      e      12
-+      f      12
-       17      12
-+      18      12
-+      19      12
-       1a      17
-    }
- }
-diff --git a/testData/results/TestAsserts.dec b/testData/results/TestAsserts.dec
-index f260d9efcbc1332056ce9b534d56a3305fbd4bf1..c9e51a54a63c5615a5e6b03ef1e256b8067233e9 100644
---- a/testData/results/TestAsserts.dec
-+++ b/testData/results/TestAsserts.dec
-@@ -16,10 +16,13 @@ class 'pkg/TestAsserts' {
-    method 'foo ()I' {
-       0      4
-       1      4
-+      8      6
-       9      6
-       a      6
-+      1b      8
-       1c      8
-       1d      8
-+      20      8
-       21      8
-       22      8
-       2d      10
-diff --git a/testData/results/TestClashName.dec b/testData/results/TestClashName.dec
-index 2a9a731549e4bee8fe6ff812211e5a7930252017..9adf65e9646db3f5243ab2ead6806f502cfea1bb 100644
---- a/testData/results/TestClashName.dec
-+++ b/testData/results/TestClashName.dec
-@@ -63,19 +63,39 @@ class 'pkg/TestClashName' {
-    }
- 
-    method 'm ()I' {
--      1      31
--      4      31
--      6      32
--      9      32
--      c      33
--      f      33
--      11      34
--      14      34
--      17      35
--      1a      35
--      1d      36
--      1f      36
--      20      36
-+      0      20
-+      1      20
-+      2      20
-+      3      20
-+      4      20
-+      5      21
-+      6      21
-+      7      21
-+      8      21
-+      9      21
-+      a      21
-+      b      21
-+      c      22
-+      d      22
-+      e      22
-+      f      22
-+      10      23
-+      11      23
-+      12      23
-+      13      23
-+      14      23
-+      15      23
-+      16      23
-+      17      24
-+      18      24
-+      19      24
-+      1a      24
-+      1b      25
-+      1c      25
-+      1d      25
-+      1e      25
-+      1f      25
-+      20      25
-    }
- 
-    method 'f ()V' {
-diff --git a/testData/results/TestClassCast.dec b/testData/results/TestClassCast.dec
-index e807294b770fefe3a7ea25c77e7b962b65e345f9..f602eea1b4bd4eb097a41992cd3271020a15c2c5 100644
---- a/testData/results/TestClassCast.dec
-+++ b/testData/results/TestClassCast.dec
-@@ -16,14 +16,29 @@ public class TestClassCast {
- 
- class 'pkg/TestClassCast' {
-    method 'test (Ljava/util/List;)V' {
-+      0      7
-       1      7
-       3      8
-       f      9
-       10      9
-+      11      9
-       12      9
-+      13      9
-+      14      9
-+      15      9
-+      16      9
-       18      12
-+      19      12
-+      1a      12
-+      1b      12
-       1c      12
-+      1d      12
-+      1e      12
-+      1f      12
-+      20      12
-       21      12
-+      22      12
-+      23      12
-       24      13
-    }
- }
-diff --git a/testData/results/TestClassFields.dec b/testData/results/TestClassFields.dec
-index ea272ead5c52deca629cb12876748960044559e0..4c37124913d759059ccf151547cfd163d6342412 100644
---- a/testData/results/TestClassFields.dec
-+++ b/testData/results/TestClassFields.dec
-@@ -19,12 +19,13 @@ public class TestClassFields {
- class 'pkg/TestClassFields' {
-    method '<clinit> ()V' {
-       11      8
-+      12      8
-+      13      8
-       14      8
-       17      8
--      1b      9
--      1f      10
--      22      10
--      25      11
-+      18      8
-+      19      8
-+      20      9
-    }
- }
- 
-diff --git a/testData/results/TestClassLambda.dec b/testData/results/TestClassLambda.dec
-index cae1518889f1af8977a574de616e37574b3b2c16..9bb7d48e1531f3ac1e467ba8eac25de08b4da3da 100644
---- a/testData/results/TestClassLambda.dec
-+++ b/testData/results/TestClassLambda.dec
-@@ -22,12 +22,12 @@ public class TestClassLambda {
- 
-    public void testLambda1() {
-       int var1 = (int)Math.random();// 39
--      Runnable var2 = () -> {
-+      Runnable var2 = () -> {// 40
-          System.out.println("hello1" + var1);
--      };// 40
--      Runnable var3 = () -> {
-+      };
-+      Runnable var3 = () -> {// 41
-          System.out.println("hello2" + var1);
--      };// 41
-+      };
-    }// 42
- 
-    public void testLambda2() {
-@@ -76,51 +76,88 @@ public class TestClassLambda {
- 
-    public void nestedLambdas() {
-       byte var1 = 5;// 85
--      Runnable var2 = () -> {
--         Runnable var1x = () -> {
-+      Runnable var2 = () -> {// 86
-+         Runnable var1x = () -> {// 87
-             System.out.println("hello2" + var1);
--         };// 87
-+         };
-          System.out.println("hello1" + var1);// 88
--      };// 86 89
-+      };// 89
-    }// 90
- }
- 
- class 'pkg/TestClassLambda' {
-    method 'lambda$testLambda$0 (ILjava/lang/Integer;)V' {
--      0      17
--      2      17
--      5      17
--      6      17
--      7      18
--      c      18
--      e      18
--      11      18
--      12      18
--      15      19
-+      0      20
-+      1      20
-+      2      20
-+      3      20
-+      4      20
-+      5      20
-+      6      20
-+      7      21
-+      8      21
-+      9      21
-+      a      21
-+      b      21
-+      c      21
-+      d      21
-+      e      21
-+      f      21
-+      10      21
-+      11      21
-+      12      21
-+      13      21
-+      14      21
-+      15      22
-    }
- 
-    method 'testLambda ()V' {
--      7      14
--      8      14
--      e      14
--      f      14
--      15      14
--      16      14
--      1c      14
--      1d      14
--      23      14
--      24      14
--      2a      14
--      2c      14
--      33      14
--      35      14
--      39      14
--      3c      14
--      3d      15
--      40      15
--      41      15
--      4a      16
--      4f      20
-+      7      17
-+      8      17
-+      9      17
-+      a      17
-+      e      17
-+      f      17
-+      10      17
-+      11      17
-+      15      17
-+      16      17
-+      17      17
-+      18      17
-+      1c      17
-+      1d      17
-+      1e      17
-+      1f      17
-+      23      17
-+      24      17
-+      25      17
-+      26      17
-+      2a      17
-+      2b      17
-+      2c      17
-+      2d      17
-+      2e      17
-+      33      17
-+      34      17
-+      35      17
-+      36      17
-+      37      17
-+      39      17
-+      3a      17
-+      3b      17
-+      3c      17
-+      3d      18
-+      3e      18
-+      3f      18
-+      40      18
-+      41      18
-+      42      19
-+      4a      19
-+      4b      19
-+      4c      19
-+      4d      19
-+      4e      19
-+      4f      23
-    }
- 
-    method 'lambda$testLambda1$1 (I)V' {
-@@ -133,74 +170,143 @@ class 'pkg/TestClassLambda' {
- 
-    method 'lambda$testLambda1$2 (I)V' {
-       0      28
-+      1      28
-+      2      28
-       a      28
-+      b      28
-+      f      28
-       13      28
-+      14      28
-+      15      28
-       16      28
-+      17      28
-+      18      28
-       19      29
-    }
- 
-+   method 'lambda$testLambda1$2 (I)V' {
-+      0      31
-+      1      31
-+      2      31
-+      a      31
-+      b      31
-+      f      31
-+      13      31
-+      14      31
-+      15      31
-+      16      31
-+      17      31
-+      18      31
-+      19      32
-+   }
-+
-    method 'testLambda1 ()V' {
--      0      23
--      3      23
--      4      23
--      b      26
--      12      29
--      13      30
-+      0      26
-+      1      26
-+      2      26
-+      3      26
-+      4      26
-+      b      27
-+      12      30
-+      13      33
-    }
- 
-    method 'lambda$testLambda2$3 (II)I' {
--      2      34
--      5      34
-+      0      37
-+      1      37
-+      2      37
-+      3      37
-+      4      37
-+      5      37
-    }
- 
-    method 'testLambda2 ()V' {
--      5      33
--      9      36
-+      5      36
-+      6      36
-+      7      36
-+      9      39
-    }
- 
-    method 'testLambda3 ()V' {
--      5      39
--      9      40
-+      5      42
-+      6      42
-+      7      42
-+      9      43
-    }
- 
-    method 'testLambda4 ()V' {
--      5      43
--      9      44
-+      5      46
-+      6      46
-+      7      46
-+      9      47
-    }
- 
-    method 'testLambda5 ()V' {
--      0      47
--      2      47
--      e      48
--      12      49
-+      0      50
-+      1      50
-+      2      50
-+      e      51
-+      f      51
-+      10      51
-+      12      52
-    }
- 
-    method 'lambda$testLambda6$4 (IILjava/lang/String;)Z' {
--      2      56
--      5      56
--      9      56
--      d      56
--      15      56
-+      0      59
-+      1      59
-+      2      59
-+      3      59
-+      4      59
-+      5      59
-+      8      59
-+      9      59
-+      a      59
-+      b      59
-+      c      59
-+      d      59
-+      15      59
-    }
- 
-    method 'testLambda6 ()V' {
--      7      52
--      9      53
--      e      53
--      f      53
--      10      53
--      12      54
--      17      54
--      18      54
--      19      54
--      22      55
--      28      58
-+      7      55
-+      8      56
-+      9      56
-+      a      56
-+      b      56
-+      c      56
-+      d      56
-+      e      56
-+      f      56
-+      10      56
-+      11      57
-+      12      57
-+      13      57
-+      14      57
-+      15      57
-+      16      57
-+      17      57
-+      18      57
-+      19      57
-+      1a      58
-+      22      58
-+      23      58
-+      24      58
-+      25      58
-+      26      58
-+      28      61
-    }
- 
-    method 'testLambda7 ([Ljava/lang/annotation/Annotation;)V' {
--      1      61
--      9      61
--      f      62
-+      0      64
-+      1      64
-+      2      64
-+      3      64
-+      9      64
-+      a      64
-+      b      64
-+      c      64
-+      d      64
-+      f      65
-    }
- 
-    method 'reduce (Ljava/util/function/IntBinaryOperator;)Ljava/util/OptionalInt;' {
-@@ -209,9 +315,16 @@ class 'pkg/TestClassLambda' {
-    }
- 
-    method 'function (Ljava/util/function/Supplier;)Ljava/lang/String;' {
--      1      69
--      6      69
--      9      69
-+      0      72
-+      1      72
-+      2      72
-+      3      72
-+      4      72
-+      5      72
-+      6      72
-+      7      72
-+      8      72
-+      9      72
-    }
- 
-    method 'localMax (II)I' {
-@@ -220,64 +333,80 @@ class 'pkg/TestClassLambda' {
-    }
- 
-    method 'lambda$null$5 (I)V' {
--      0      80
--      a      80
--      13      80
--      16      80
--      19      81
-+      0      83
-+      1      83
-+      2      83
-+      a      83
-+      b      83
-+      f      83
-+      13      83
-+      14      83
-+      15      83
-+      16      83
-+      17      83
-+      18      83
-+      19      84
-    }
- 
-    method 'lambda$nestedLambdas$6 (I)V' {
--      6      81
--      7      82
--      11      82
--      1a      82
--      1d      82
--      20      83
-+      6      82
-+      7      85
-+      8      85
-+      9      85
-+      11      85
-+      12      85
-+      16      85
-+      1a      85
-+      1b      85
-+      1c      85
-+      1d      85
-+      1e      85
-+      1f      85
-+      20      86
-    }
- 
-    method 'nestedLambdas ()V' {
--      0      77
--      1      77
--      8      83
--      9      84
-+      0      80
-+      1      80
-+      8      81
-+      9      87
-    }
- }
- 
- Lines mapping:
--29 <-> 15
--30 <-> 16
--32 <-> 17
--33 <-> 18
--34 <-> 19
--35 <-> 20
--36 <-> 21
--39 <-> 24
--40 <-> 27
--41 <-> 30
--42 <-> 31
--45 <-> 34
--46 <-> 37
--49 <-> 40
--50 <-> 41
--53 <-> 44
--54 <-> 45
--57 <-> 48
--58 <-> 49
--59 <-> 50
--62 <-> 53
--63 <-> 54
--64 <-> 55
--65 <-> 56
--66 <-> 59
--69 <-> 62
--70 <-> 63
--73 <-> 66
--77 <-> 70
--81 <-> 74
--85 <-> 78
--86 <-> 84
--87 <-> 82
--88 <-> 83
--89 <-> 84
--90 <-> 85
-+29 <-> 18
-+30 <-> 19
-+32 <-> 20
-+33 <-> 21
-+34 <-> 22
-+35 <-> 23
-+36 <-> 24
-+39 <-> 27
-+40 <-> 28
-+41 <-> 31
-+42 <-> 34
-+45 <-> 37
-+46 <-> 40
-+49 <-> 43
-+50 <-> 44
-+53 <-> 47
-+54 <-> 48
-+57 <-> 51
-+58 <-> 52
-+59 <-> 53
-+62 <-> 56
-+63 <-> 57
-+64 <-> 58
-+65 <-> 59
-+66 <-> 62
-+69 <-> 65
-+70 <-> 66
-+73 <-> 69
-+77 <-> 73
-+81 <-> 77
-+85 <-> 81
-+86 <-> 82
-+87 <-> 83
-+88 <-> 86
-+89 <-> 87
-+90 <-> 88
-diff --git a/testData/results/TestClassLoop.dec b/testData/results/TestClassLoop.dec
-index 4c2e9ff65a838ba16edbb9a178d11a0c3f85841a..137a4edd73da81f3150da42957bbaa266321a69f 100644
---- a/testData/results/TestClassLoop.dec
-+++ b/testData/results/TestClassLoop.dec
-@@ -78,41 +78,68 @@ public class TestClassLoop {
- class 'pkg/TestClassLoop' {
-    method 'testSimpleInfinite ()V' {
-       0      5
-+      1      5
-+      2      5
-       3      5
-+      4      5
-+      5      5
-    }
- 
-    method 'testFinally ()V' {
-       0      10
-+      1      10
-+      2      10
-       3      10
-       4      10
-       d      10
-+      e      14
-       f      14
-       1a      15
-       26      18
-       27      18
-+      28      18
-+      29      18
-       2a      18
-+      2b      18
-    }
- 
-    method 'testFinallyContinue ()V' {
-       0      24
-+      1      24
-+      2      24
-       3      24
-       4      24
-       d      24
-       e      29
-+      f      29
-+      10      29
-       11      29
-+      12      29
-       13      29
-+      25      32
-       26      32
-       2a      33
-+      2b      33
-+      2c      33
-       2d      33
-+      2e      33
-       2f      33
-+      30      33
-+      31      33
-       32      34
-       37      39
-+      38      39
-+      39      39
-       3a      39
-+      3b      39
-       3c      39
-    }
- 
-    method 'testWhileCombined (Ljava/lang/String;)I' {
-+      0      44
-       1      44
-+      2      44
-+      3      44
-       4      44
-       5      45
-       6      45
-@@ -120,29 +147,58 @@ class 'pkg/TestClassLoop' {
-       8      46
-       9      47
-       a      47
-+      b      47
-       c      48
-       d      48
-+      e      48
-       f      49
-       10      49
-+      11      49
-       12      51
-       13      51
-+      14      51
-+      15      51
-+      16      51
-       17      51
-+      1a      52
-+      1b      52
-       1c      52
-+      1d      52
-+      1e      52
-       1f      52
-+      20      52
-+      21      53
-+      22      53
-       23      53
-+      24      53
-       25      53
-       28      54
-+      29      54
-+      2a      54
-+      2e      56
-+      2f      56
-       30      56
-+      31      56
-       32      56
-+      35      60
-       36      60
-       3d      61
-+      3e      61
-       42      61
-+      43      64
-       44      64
-+      45      64
-+      46      65
-+      47      65
-       48      65
-       4b      66
-       4e      69
-       4f      69
-       50      51
-+      51      51
-+      52      51
-+      56      73
-+      57      73
-       58      73
-    }
- }
-diff --git a/testData/results/TestClassNestedInitializer.dec b/testData/results/TestClassNestedInitializer.dec
-index 0576e74a1d8f22a9dee2d72ba7dc984e269abe9d..f2617df3c17a6b9caa908148f7d612a498ed9eee 100644
---- a/testData/results/TestClassNestedInitializer.dec
-+++ b/testData/results/TestClassNestedInitializer.dec
-@@ -4,34 +4,45 @@ public class TestClassNestedInitializer {
-    public String secret;
- 
-    public void test() {
--      TestClassNestedInitializer var1 = new TestClassNestedInitializer() {
-+      TestClassNestedInitializer var1 = new TestClassNestedInitializer() {// 22
-          {
-             this.secret = "one";
-          }
--      };// 22
-+      };
-       System.out.println(var1.secret);// 23
-    }// 24
- }
- 
- class 'pkg/TestClassNestedInitializer$1' {
-    method '<init> (Lpkg/TestClassNestedInitializer;)V' {
-+      9      8
-       a      8
-+      b      8
-       c      8
-+      d      8
-+      e      8
-       f      9
-    }
- }
- 
- class 'pkg/TestClassNestedInitializer' {
-    method 'test ()V' {
--      8      10
-+      8      6
-       9      11
-+      a      11
-+      b      11
-+      c      11
-       d      11
-+      e      11
-+      f      11
-       10      11
-+      11      11
-+      12      11
-       13      12
-    }
- }
- 
- Lines mapping:
--22 <-> 11
-+22 <-> 7
- 23 <-> 12
- 24 <-> 13
-diff --git a/testData/results/TestClassSimpleBytecodeMapping.dec b/testData/results/TestClassSimpleBytecodeMapping.dec
-index 7c03120a91f0fc0a5cecbbff4cd7b2c0d0da2c94..706965c11a037c3dd1726371d6b9bd9224269ddb 100644
---- a/testData/results/TestClassSimpleBytecodeMapping.dec
-+++ b/testData/results/TestClassSimpleBytecodeMapping.dec
-@@ -49,8 +49,13 @@ public class TestClassSimpleBytecodeMapping {
- class 'pkg/TestClassSimpleBytecodeMapping$1' {
-    method 'run ()V' {
-       0      7
-+      1      7
-+      2      7
-       3      7
-+      4      7
-       5      7
-+      6      7
-+      7      7
-       8      8
-    }
- }
-@@ -58,40 +63,77 @@ class 'pkg/TestClassSimpleBytecodeMapping$1' {
- class 'pkg/TestClassSimpleBytecodeMapping' {
-    method 'test ()I' {
-       0      4
-+      1      4
-+      2      4
-       3      4
-+      4      4
-       5      4
-+      6      4
-+      7      4
-+      8      5
-       11      5
-+      12      5
-+      13      5
-+      14      10
-       15      10
-+      16      10
-       17      10
-+      18      10
-+      19      10
-       1a      11
-+      1b      11
-+      1c      11
-       1d      11
-       1e      11
-       1f      11
-       22      12
-+      23      12
-+      24      12
-       25      12
-+      26      12
-       27      12
-+      28      12
-+      29      12
-       2a      13
-       2b      13
-       2c      15
-+      2d      15
-+      2e      15
-       2f      15
-+      30      15
-       31      15
-+      32      15
-+      33      15
-       34      16
-       35      16
-    }
- 
-    method 'test2 (Ljava/lang/String;)V' {
-+      0      22
-       1      22
-+      2      22
-+      3      22
-       10      23
-       11      24
-+      12      24
-+      13      24
-       15      24
-       23      26
-       24      26
-+      25      26
-+      26      26
-       27      26
-+      28      26
-       2e      29
-    }
- 
-    method 'run (Ljava/lang/Runnable;)V' {
-+      0      32
-       1      32
-+      2      32
-+      3      32
-+      4      32
-+      5      32
-       6      33
-    }
- }
-@@ -99,8 +141,13 @@ class 'pkg/TestClassSimpleBytecodeMapping' {
- class 'pkg/TestClassSimpleBytecodeMapping$InnerClass' {
-    method 'print ()V' {
-       0      37
-+      1      37
-+      2      37
-       3      37
-+      4      37
-       5      37
-+      6      37
-+      7      37
-       8      38
-    }
- }
-@@ -108,8 +155,13 @@ class 'pkg/TestClassSimpleBytecodeMapping$InnerClass' {
- class 'pkg/TestClassSimpleBytecodeMapping$InnerClass2' {
-    method 'print ()V' {
-       0      43
-+      1      43
-+      2      43
-       3      43
-+      4      43
-       5      43
-+      6      43
-+      7      43
-       8      44
-    }
- }
-diff --git a/testData/results/TestClassSwitch.dec b/testData/results/TestClassSwitch.dec
-index 3f42b35767b44c7cb2b0eaf31dbbf61d9c3b315a..6a2b156f9ad0e29aad668542ee090d63130d2182 100644
---- a/testData/results/TestClassSwitch.dec
-+++ b/testData/results/TestClassSwitch.dec
-@@ -15,12 +15,20 @@ public class TestClassSwitch {
- 
- class 'pkg/TestClassSwitch' {
-    method 'testCaseOrder (I)V' {
-+      0      4
-       1      4
-       1c      10
-+      1d      10
-+      1e      10
-       1f      10
-+      20      10
-       21      10
-+      22      10
-+      23      10
-       24      12
-       25      6
-+      26      6
-+      27      6
-       28      6
-       29      6
-       2c      8
-diff --git a/testData/results/TestClassTypes.dec b/testData/results/TestClassTypes.dec
-index 07980cc103b3434bdefc78de045120dd6babaa51..a90e113aaabede0b4df7e1e8bcd9f06699a8e061 100644
---- a/testData/results/TestClassTypes.dec
-+++ b/testData/results/TestClassTypes.dec
-@@ -53,29 +53,41 @@ class 'pkg/TestClassTypes' {
-       0      7
-       1      7
-       2      8
-+      3      8
-+      4      8
-       5      8
-+      6      9
-       7      9
-+      8      9
-+      9      9
-       a      9
-       b      9
-       c      9
-       d      9
-       10      10
-       11      10
-+      15      11
-       16      11
-+      17      11
-+      18      11
-       19      11
-       1a      11
-       1b      11
-       1c      11
-       1f      12
-       20      12
-+      21      15
-       22      15
-       23      15
-       26      16
-+      27      16
-+      28      16
-       29      16
-       2c      19
-    }
- 
-    method 'testBit (I)Z' {
-+      0      22
-       1      22
-       2      22
-       3      22
-@@ -84,30 +96,59 @@ class 'pkg/TestClassTypes' {
-    }
- 
-    method 'testSwitchConsts (I)V' {
-+      0      26
-       1      26
-       2c      28
-+      2d      28
-+      2e      28
-       2f      28
-+      30      28
-       31      28
-+      32      28
-+      33      28
-       34      29
-       37      31
-+      38      31
-+      39      31
-       3a      31
-+      3b      31
-       3c      31
-+      3d      31
-+      3e      31
-       3f      32
-       42      35
-+      43      35
-+      44      35
-       45      35
-+      46      35
-       47      35
-       4a      38
-    }
- 
-    method 'testAssignmentType (Ljava/util/List;)V' {
-+      0      41
-       1      41
-       3      42
-       f      43
-       10      43
-+      11      43
-       12      43
-+      13      43
-+      14      43
-+      15      43
-+      16      43
-       18      46
-+      19      46
-+      1a      46
-+      1b      46
-       1c      46
-+      1d      46
-+      1e      46
-+      1f      46
-+      20      46
-       21      46
-+      22      46
-+      23      46
-       24      47
-    }
- }
-diff --git a/testData/results/TestClassVar.dec b/testData/results/TestClassVar.dec
-index 9beaab18d63a04c8da209347ef10ffdd32dd6800..6de2af6b7b05a4e6c53c7fd9103e0baf839548d2 100644
---- a/testData/results/TestClassVar.dec
-+++ b/testData/results/TestClassVar.dec
-@@ -42,20 +42,32 @@ class 'pkg/TestClassVar' {
-    method 'testFieldSSAU ()V' {
-       0      7
-       1      7
-+      2      7
-       3      7
-+      4      7
-       5      7
-       8      9
-+      9      9
-+      a      9
-       b      9
-+      1e      11
-       1f      11
-       20      11
-+      21      11
-+      22      11
-       26      12
-+      27      12
-+      28      12
-       29      12
-       2e      7
-       34      18
-    }
- 
-    method 'testFieldSSAU1 ()Ljava/lang/Long;' {
-+      4      21
-       6      21
-+      7      21
-+      8      21
-       b      21
-       f      21
-       13      21
-@@ -64,17 +76,29 @@ class 'pkg/TestClassVar' {
-    method 'testComplexPropagation ()V' {
-       0      25
-       1      25
-+      2      27
-       3      27
-+      4      27
-       5      27
-+      8      29
-       9      29
-+      a      29
-       b      29
-+      c      29
-       d      29
-+      10      29
-       11      29
-       14      29
--      1c      32
--      1f      33
--      22      33
--      28      37
-+      15      29
-+      16      29
-+      1a      33
-+      1b      33
-+      1c      33
-+      1f      34
-+      20      34
-+      21      34
-+      22      34
-+      28      38
-    }
- }
- 
-diff --git a/testData/results/TestCodeConstructs.dec b/testData/results/TestCodeConstructs.dec
-index fefd4212a729bcafc87860b0ed02969149e019f7..2e422b84f097ceb4f923d2cafe9a0c84c1302881 100644
---- a/testData/results/TestCodeConstructs.dec
-+++ b/testData/results/TestCodeConstructs.dec
-@@ -15,11 +15,16 @@ class TestCodeConstructs {
- class 'pkg/TestCodeConstructs' {
-    method 'expressions ()V' {
-       7      6
-+      8      6
-+      9      6
-       b      7
-    }
- 
-    method 'fieldIncrement ()Ljava/lang/Integer;' {
-+      4      10
-       6      10
-+      7      10
-+      8      10
-       b      10
-       12      10
-    }
-diff --git a/testData/results/TestDebugSymbols.dec b/testData/results/TestDebugSymbols.dec
-index 1010becabda4cb15ee6daeba50f2c4935aefa56d..a405885e6b5a53c8cefbfe9db0f045d562e43d42 100644
---- a/testData/results/TestDebugSymbols.dec
-+++ b/testData/results/TestDebugSymbols.dec
-@@ -23,22 +23,44 @@ class TestDebugSymbols {
- class 'pkg/TestDebugSymbols' {
-    method 'm ()I' {
-       0      4
-+      1      4
-       2      4
-       3      5
-+      4      5
-+      5      5
-       6      5
-+      7      6
-       8      6
-       9      6
-+      a      6
-       b      6
-       c      6
-+      d      6
-       e      7
-+      f      7
-+      10      7
-       11      7
-       12      7
-       13      7
-+      14      7
-+      1c      8
-       20      8
-+      21      8
-+      25      8
-       29      8
-+      2a      8
-+      2e      8
-+      2f      8
-       33      8
-+      34      8
-+      38      8
-+      39      8
-       3d      8
-+      3e      8
-+      3f      8
-       40      8
-+      41      8
-+      42      8
-       43      8
-    }
- 
-diff --git a/testData/results/TestEnum.dec b/testData/results/TestEnum.dec
-index 40f54d7f0c4ce8b4984d26fac0b13aa1d1dfb145..5248b0236ee49381488c6c5fd3ca8efd4571ba0e 100644
---- a/testData/results/TestEnum.dec
-+++ b/testData/results/TestEnum.dec
-@@ -50,13 +50,20 @@ class 'pkg/TestEnum' {
- 
-    method '<init> (Ljava/lang/String;I)V' {
-       3      20
-+      4      20
-       5      20
-       6      20
-+      7      20
-+      8      20
-       9      21
-    }
- 
-    method '<init> (Ljava/lang/String;ILjava/lang/String;Lpkg/TestEnum$Type;)V' {
-+      6      24
-+      7      24
-       8      24
-+      9      24
-+      a      24
-       b      25
-    }
- }
-diff --git a/testData/results/TestExtendingSubclass.dec b/testData/results/TestExtendingSubclass.dec
-index 6bab8435926e1c10171fc97b61075ec58dba2572..b9e66bb809b5c7c37a5c04dd08e074e5e3c607b2 100644
---- a/testData/results/TestExtendingSubclass.dec
-+++ b/testData/results/TestExtendingSubclass.dec
-@@ -21,7 +21,10 @@ class 'pkg/TestExtendingSubclass$Subclass1' {
- 
- class 'pkg/TestExtendingSubclass$Subclass2' {
-    method '<init> (Lpkg/TestExtendingSubclass;Ljava/lang/String;)V' {
-+      7      10
-       8      10
-+      9      10
-+      a      10
-       b      11
-    }
- }
-diff --git a/testData/results/TestIffSimplification.dec b/testData/results/TestIffSimplification.dec
-index 0c3a1c421353fe2b9c3f652d999a2c26633511e4..1598c234401e462f4a189cf17bcf3e13c5fbda1b 100644
---- a/testData/results/TestIffSimplification.dec
-+++ b/testData/results/TestIffSimplification.dec
-@@ -32,54 +32,91 @@ public class TestIffSimplification {
- 
- class 'pkg/TestIffSimplification' {
-    method 'simpleIff (Z[I)I' {
-+      0      4
-       1      4
-+      4      4
-       5      4
-       6      4
-+      a      4
-       b      4
-       c      4
-       d      4
-    }
- 
-    method 'simpleIf (Z[I)I' {
-+      0      8
-       1      8
-+      4      8
-       5      8
-       6      8
-+      8      8
-       9      8
-       a      8
-    }
- 
-    method 'nestedIf (ZZ[I)I' {
-+      0      12
-       1      12
-+      4      13
-       5      13
-+      8      13
-       9      13
-       a      13
-+      c      13
-       d      13
-       e      13
-+      10      15
-       11      15
-       12      15
-       13      15
-    }
- 
-    method 'compareTo (IIBBDDII)I' {
-+      0      20
-+      1      20
-       2      20
-+      5      21
-+      6      21
-       7      21
-       a      21
-       e      21
-       f      21
-+      10      22
-+      11      22
-+      12      22
-       13      22
-+      16      23
-+      17      23
-+      18      23
-       19      23
-       1c      23
-       20      23
-       21      23
-+      22      24
-+      23      24
-+      24      24
-+      25      24
-       26      24
-       27      24
-+      28      24
-+      29      24
-       2a      24
-+      2b      24
-+      2c      24
-       2d      24
-       2e      24
-+      31      25
-+      32      25
-+      33      25
-+      34      25
-       35      25
-       38      25
-       3c      25
-       3d      25
-+      3e      27
-+      3f      27
-+      40      27
-+      41      27
-       42      27
-       43      27
-       46      27
-diff --git a/testData/results/TestIllegalVarName.dec b/testData/results/TestIllegalVarName.dec
-index 3eb1ea54a6080827d3022ea409fdbdc84febf881..5178d8421eb80d2f354cf156bb0ada67c8093d19 100644
---- a/testData/results/TestIllegalVarName.dec
-+++ b/testData/results/TestIllegalVarName.dec
-@@ -21,10 +21,19 @@ public final class TestIllegalVarName {
- 
- class 'pkg/TestIllegalVarName' {
-    method 'm (Ljava/lang/String;I)Ljava/lang/String;' {
-+      0      16
-       1      16
-+      2      16
-       3      16
-+      4      16
-+      5      16
-+      d      17
-       11      17
-+      12      17
-+      16      17
-       1a      17
-+      1b      17
-+      1c      17
-       1d      17
-    }
- }
-diff --git a/testData/results/TestInnerClassConstructor.dec b/testData/results/TestInnerClassConstructor.dec
-index e37f5014eb173ea82ba61f3a863cc7b5c2ff936b..99ab820bb84ed0fb45bcc7a92dd6c371de0eaa91 100644
---- a/testData/results/TestInnerClassConstructor.dec
-+++ b/testData/results/TestInnerClassConstructor.dec
-@@ -29,6 +29,7 @@ class TestInnerClassConstructor {
- class 'pkg/TestInnerClassConstructor' {
-    method 'l ()V' {
-       5      4
-+      6      4
-       c      5
-    }
- 
-@@ -40,25 +41,45 @@ class 'pkg/TestInnerClassConstructor' {
- 
-    method 'n (Ljava/lang/String;)V' {
-       0      12
-+      1      12
-+      2      12
-       a      12
-+      b      12
-+      f      12
-       13      12
-+      14      12
-+      15      12
-       16      12
-+      17      12
-+      18      12
-       19      13
-    }
- }
- 
- class 'pkg/TestInnerClassConstructor$Another' {
-    method '<init> (Lpkg/TestInnerClassConstructor;II)V' {
-+      9      17
-+      11      17
-       15      17
-+      16      17
-+      1a      17
-       1e      17
-+      1f      17
-+      20      17
-       21      17
-+      22      17
-+      23      17
-       24      18
-    }
- }
- 
- class 'pkg/TestInnerClassConstructor$Inner' {
-    method '<init> (Lpkg/TestInnerClassConstructor;Ljava/lang/String;)V' {
-+      9      23
-+      a      23
-       b      23
-+      c      23
-+      d      23
-       e      24
-    }
- }
-diff --git a/testData/results/TestInnerLocal.dec b/testData/results/TestInnerLocal.dec
-index 9009b85453ba2aae2ac4e32f94fb082dcd6d3c81..cf53952d828695bf661720d580e84c4d07273299 100644
---- a/testData/results/TestInnerLocal.dec
-+++ b/testData/results/TestInnerLocal.dec
-@@ -57,52 +57,79 @@ public class TestInnerLocal {
- 
- class 'pkg/TestInnerLocal$1Inner' {
-    method '<init> (Ljava/lang/String;)V' {
--      6      8
--      9      9
-+      4      6
-+      5      6
-+      6      6
-+      7      6
-+      8      6
-+      9      7
-    }
- }
- 
- class 'pkg/TestInnerLocal' {
-    method 'testStaticMethod ()V' {
--      4      12
--      e      13
--      18      14
--      1e      15
-+      4      10
-+      5      10
-+      e      11
-+      f      11
-+      18      12
-+      19      12
-+      1e      13
-    }
- 
-    method 'testMethod ()V' {
--      5      26
--      f      27
--      1a      28
--      24      29
--      2a      30
-+      5      24
-+      6      24
-+      f      25
-+      10      25
-+      1a      26
-+      1b      26
-+      24      27
-+      25      27
-+      2a      28
-    }
- }
- 
--class 'pkg/TestInnerLocal$2Inner' {
--   method '<init> (Lpkg/TestInnerLocal;Ljava/lang/String;)V' {
--      b      22
--      e      23
-+class 'TestInnerLocal$2Inner' {
-+   method '<init> (LTestInnerLocal;Ljava/lang/String;)V' {
-+      9      20
-+      a      20
-+      b      20
-+      c      20
-+      d      20
-+      e      21
-    }
- }
- 
- class 'TestInnerLocal$Inner1' {
-    method '<init> (LTestInnerLocal;Ljava/lang/String;)V' {
-+      9      34
-+      a      34
-       b      34
-+      c      34
-+      d      34
-       e      35
-    }
- }
- 
- class 'TestInnerLocal$Inner1Static' {
-    method '<init> (Ljava/lang/String;)V' {
-+      4      42
-+      5      42
-       6      42
-+      7      42
-+      8      42
-       9      43
-    }
- }
- 
- class 'pkg/TestInnerLocal$Inner1Static$Inner2Static' {
-    method '<init> (Ljava/lang/String;)V' {
-+      4      49
-+      5      49
-       6      49
-+      7      49
-+      8      49
-       9      50
-    }
- }
-diff --git a/testData/results/TestInnerSignature.dec b/testData/results/TestInnerSignature.dec
-index 8aab3c2b9f56368f1350f1ac98262c761bf6ed19..37b216917552fc933ebc5fa3239002fa2b52d575 100644
---- a/testData/results/TestInnerSignature.dec
-+++ b/testData/results/TestInnerSignature.dec
-@@ -38,27 +38,64 @@ public class TestInnerSignature<A, B, C> {
- 
- class 'pkg/TestInnerSignature' {
-    method '<init> (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
--      6      8
--      b      9
--      10      10
--      13      11
-+      4      6
-+      5      6
-+      6      6
-+      7      6
-+      8      6
-+      9      7
-+      a      7
-+      b      7
-+      c      7
-+      d      7
-+      e      8
-+      f      8
-+      10      8
-+      11      8
-+      12      8
-+      13      9
-    }
- }
- 
- class 'TestInnerSignature$Inner' {
-    method '<init> (LTestInnerSignature;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
-+      9      17
-+      a      17
-       b      17
-+      c      17
-+      d      17
-+      e      18
-+      f      18
-       10      18
-+      11      18
-+      12      18
-+      13      19
-+      14      19
-+      15      19
-       16      19
-+      17      19
-+      18      19
-       19      20
-    }
- }
- 
- class 'TestInnerSignature$InnerStatic' {
-    method '<init> (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
-+      4      29
-+      5      29
-       6      29
-+      7      29
-+      8      29
-+      9      30
-+      a      30
-       b      30
-+      c      30
-+      d      30
-+      e      31
-+      f      31
-       10      31
-+      11      31
-+      12      31
-       13      32
-    }
- }
-diff --git a/testData/results/TestJava9StringConcat.dec b/testData/results/TestJava9StringConcat.dec
-index 389bb85905dd216819edf881e0f7fd187a703d64..29890ed8d641519f957d34981fc41e678a7caf2f 100644
---- a/testData/results/TestJava9StringConcat.dec
-+++ b/testData/results/TestJava9StringConcat.dec
-@@ -12,12 +12,25 @@ public class TestJava9StringConcat {
- 
- class 'java9/TestJava9StringConcat' {
-    method 'test1 (Ljava/lang/String;I)Ljava/lang/String;' {
-+      0      4
-+      1      4
-       2      4
-+      3      4
-+      4      4
-+      5      4
-+      6      4
-       7      4
-    }
- 
-    method 'test2 (Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;' {
-+      0      8
-+      1      8
-+      2      8
-       3      8
-+      4      8
-+      5      8
-+      6      8
-+      7      8
-       8      8
-    }
- }
-diff --git a/testData/results/TestKotlinConstructorKt.dec b/testData/results/TestKotlinConstructorKt.dec
-index d1e3f7b3570c456d37db7afb8bb2c9ae8096c9d6..0e941450d0dabcbec609f869f674d9cc5bdace33 100644
---- a/testData/results/TestKotlinConstructorKt.dec
-+++ b/testData/results/TestKotlinConstructorKt.dec
-@@ -16,12 +16,12 @@ import kotlin.collections.CollectionsKt;
- public final class TestKotlinConstructorKt {
-    private static final List<Mapping> foo(Collection<String> list) {
-       Iterable $receiver$iv = (Iterable)list;// 2
--      Collection destination$iv$iv = (Collection)(new ArrayList(CollectionsKt.collectionSizeOrDefault($receiver$iv, 10)));// 10
--      Iterator var4 = $receiver$iv.iterator();// 11
-+      Collection destination$iv$iv = (Collection)(new ArrayList(CollectionsKt.collectionSizeOrDefault($receiver$iv, 10)));
-+      Iterator var4 = $receiver$iv.iterator();// 10 11
- 
-       while(var4.hasNext()) {
-          Object item$iv$iv = var4.next();
--         String it = (String)item$iv$iv;// 12
-+         String it = (String)item$iv$iv;
-          Mapping var10000 = new Mapping;
-          if (it == null) {// 3
-             throw new TypeCastException("null cannot be cast to non-null type kotlin.String");
-@@ -29,7 +29,7 @@ public final class TestKotlinConstructorKt {
- 
-          var10000.<init>((String)it);
-          Mapping var11 = var10000;
--         destination$iv$iv.add(var11);
-+         destination$iv$iv.add(var11);// 12
-       }
- 
-       return CollectionsKt.toList((Iterable)((List)destination$iv$iv));// 4 13
-@@ -38,29 +38,84 @@ public final class TestKotlinConstructorKt {
- 
- class 'TestKotlinConstructorKt' {
-    method 'foo (Ljava/util/Collection;)Ljava/util/List;' {
-+      0      17
-       1      17
-+      2      17
-+      3      17
-       4      17
-+      6      19
-+      c      18
-       d      18
-+      e      18
-       f      18
-+      10      18
-+      11      18
-       15      18
-+      16      18
-+      17      18
-       18      18
-       1b      19
-+      1c      19
-+      1d      19
-+      1e      19
-+      1f      19
-       20      19
-+      21      19
-+      22      21
-+      23      21
-       24      21
-+      25      21
-+      26      21
-+      27      21
-+      28      21
-+      2c      22
-+      2d      22
-       2e      22
-+      2f      22
-+      30      22
-+      31      22
-+      32      22
-       33      22
-+      34      22
-+      35      31
-+      36      23
-+      37      23
-       38      23
-+      39      23
-+      3a      23
-       3b      23
-+      3c      23
-+      43      25
-+      44      25
-       46      25
-       4d      26
-+      4e      26
-       52      26
-       53      29
-+      54      29
-+      55      29
-       56      29
-+      57      29
-+      58      29
-       59      30
-+      5a      30
-+      5d      31
-+      5e      31
-       5f      31
-+      60      31
-+      61      31
-+      62      31
-+      63      31
-+      68      34
-       69      34
-+      6a      34
-+      6b      34
-       6c      34
-+      6d      34
-+      6e      34
-       6f      34
-+      70      34
-+      71      34
-       72      34
-    }
- }
-@@ -69,7 +124,7 @@ Lines mapping:
- 2 <-> 18
- 3 <-> 26
- 4 <-> 35
--10 <-> 19
-+10 <-> 20
- 11 <-> 20
--12 <-> 24
-+12 <-> 32
- 13 <-> 35
-diff --git a/testData/results/TestLocalsNames.dec b/testData/results/TestLocalsNames.dec
-index fe6fe796965768533ba3cde2a2a79ddc37ee7b3e..59563ddeb1c2cb82405b31d9f0073a1df450c9e8 100644
---- a/testData/results/TestLocalsNames.dec
-+++ b/testData/results/TestLocalsNames.dec
-@@ -26,40 +26,104 @@ public class TestLocalsNames {
- 
- class 'pkg/TestLocalsNames' {
-    method 'rename (Ljava/io/File;Z)V' {
-+      0      6
-       1      6
-+      2      6
-+      3      6
-       4      6
-       7      7
-+      8      7
-+      9      7
-       a      7
-+      b      8
-       c      8
-+      d      8
-+      e      8
-       f      8
-+      10      8
-+      11      9
-+      12      9
-       13      9
-+      14      9
-       17      10
-       18      10
-+      19      10
-       1a      12
-       1b      12
-+      1c      12
-+      1d      12
-+      1e      12
-+      1f      12
-+      20      12
-       21      12
-+      24      13
-+      25      13
-+      26      13
-+      27      13
-       28      13
-       29      13
-+      2a      13
-+      36      14
-+      37      14
-       38      14
-+      39      14
-+      3a      14
-       3e      14
-+      3f      14
-       43      14
-+      44      14
-+      45      14
-       49      14
-+      4a      14
-+      51      16
-+      52      16
-+      53      16
-+      54      16
-       55      16
-+      56      16
-+      57      16
-       66      16
-+      67      16
-+      6b      16
-+      6c      16
-       70      16
-+      71      16
-+      75      16
-+      76      16
-       7a      16
-+      7b      16
-+      7c      16
-       81      12
-+      82      12
-+      83      12
-       87      19
-+      88      19
-+      89      19
-+      8a      19
-       8b      19
-       8c      19
-+      8d      19
-       8e      20
-+      8f      20
-+      90      20
-       98      20
-+      99      20
-+      9d      20
-+      9e      20
-       a2      20
-+      a3      20
-+      a7      20
-+      a8      20
-+      a9      20
-+      aa      20
-       ab      20
-       ac      20
-       ad      20
-       b1      20
-+      b2      20
-       b6      20
-+      b7      20
-+      b8      20
-       b9      20
-       bc      23
-    }
-diff --git a/testData/results/TestLocalsSignature.dec b/testData/results/TestLocalsSignature.dec
-index 2948bfdb98eaac6f172a7abf518ef795304bc56a..3da716bb86c538148347d67c29354a66dc416c17 100644
---- a/testData/results/TestLocalsSignature.dec
-+++ b/testData/results/TestLocalsSignature.dec
-@@ -13,8 +13,14 @@ public class TestLocalsSignature {
- class 'pkg/TestLocalsSignature' {
-    method 'main ([Ljava/lang/String;)V' {
-       7      7
-+      8      8
-       9      8
-+      a      8
-       b      8
-+      c      8
-+      d      8
-+      e      8
-+      f      8
-       11      9
-    }
- }
-diff --git a/testData/results/TestMemberAnnotations.dec b/testData/results/TestMemberAnnotations.dec
-index 1e3a41c0f8acf669d79049228dc72f63fc387528..72d29afee0f95f9b75898720f39cb0519a48863f 100644
---- a/testData/results/TestMemberAnnotations.dec
-+++ b/testData/results/TestMemberAnnotations.dec
-@@ -22,9 +22,14 @@ class TestMemberAnnotations {
- 
- class 'pkg/TestMemberAnnotations' {
-    method 'f (I)I' {
-+      0      13
-+      1      13
-       2      13
-+      3      13
-+      4      13
-       5      13
-       6      13
-+      7      13
-       8      13
-       9      13
-    }
-diff --git a/testData/results/TestMethodReferenceSameName.dec b/testData/results/TestMethodReferenceSameName.dec
-index 0dfbeebf93f70504be97a4d5c5487f7b631d5b61..22e9d9213fbd9f82adfe184c960591209f633155 100644
---- a/testData/results/TestMethodReferenceSameName.dec
-+++ b/testData/results/TestMethodReferenceSameName.dec
-@@ -14,9 +14,19 @@ public class TestMethodReferenceSameName {
- 
- class 'TestMethodReferenceSameName' {
-    method 'foo ()V' {
-+      0      4
-       1      4
--      e      5
--      13      6
-+      2      4
-+      3      4
-+      5      5
-+      6      5
-+      7      5
-+      e      6
-+      f      6
-+      10      6
-+      11      6
-+      12      6
-+      13      7
-    }
- }
- 
-diff --git a/testData/results/TestPrimitives.dec b/testData/results/TestPrimitives.dec
-index 701f2bb3c5f0ba5c2bc18d2f3ee89bc7e901eced..dcbf031b69cc65b108a2cba8f894d02027372032 100644
---- a/testData/results/TestPrimitives.dec
-+++ b/testData/results/TestPrimitives.dec
-@@ -172,143 +172,178 @@ public class TestPrimitives {
- 
- class 'pkg/TestPrimitives' {
-    method 'printAll ()V' {
--      1      6
--      2      6
--      6      7
--      8      7
--      c      8
--      f      8
--      13      9
--      15      9
--      19      10
--      1c      10
--      20      11
--      22      11
--      26      12
--      29      12
--      2d      13
--      2f      13
--      33      14
--      37      14
--      3b      15
--      40      15
--      44      16
--      4a      16
--      4e      17
--      52      17
--      56      18
--      5b      18
--      5f      19
--      65      19
--      69      20
--      6e      20
--      72      21
--      78      21
--      7c      22
--      81      22
--      85      23
--      87      23
--      8a      23
--      8d      23
--      91      24
--      93      24
--      96      24
--      99      24
--      9d      25
--      9f      25
--      a2      25
--      a5      25
--      a9      26
--      ab      26
--      ae      26
--      b1      26
--      b5      27
--      b7      27
--      ba      27
--      bd      27
--      c1      28
--      c3      28
--      c6      28
--      c9      28
--      cd      29
--      cf      29
--      d2      29
--      d5      29
--      dd      30
--      e2      30
--      e5      30
--      ea      31
--      ed      31
--      f0      31
--      f5      32
--      f8      32
--      fb      32
--      fe      33
--      101      33
--      10a      33
--      10b      33
--      111      33
--      112      33
--      118      33
--      11b      33
--      121      33
--      123      33
--      129      33
--      12b      33
--      131      33
--      134      33
--      138      33
--      13c      34
--      13f      34
--      148      34
--      14b      34
--      152      34
--      155      34
--      15c      34
--      15f      34
--      166      34
--      169      34
--      16d      34
--      175      35
--      176      35
--      178      35
--      17b      35
--      17d      35
--      180      35
--      182      35
--      185      35
--      18f      36
--      194      36
--      19a      36
--      19f      36
--      1a5      36
--      1aa      36
--      1b0      36
--      1b5      36
--      1c1      37
--      1c3      37
--      1c6      37
--      1c9      37
--      1cb      37
--      1ce      37
--      1d1      37
--      1d3      37
--      1d6      37
--      1d9      37
--      1db      37
--      1de      37
--      1e1      37
--      1e3      37
--      1e6      37
--      1e9      37
--      1eb      37
--      1ee      37
--      1f1      37
--      1f3      37
--      1f6      37
--      1fd      37
--      202      37
--      209      38
-+      0      4
-+      1      4
-+      2      4
-+      3      4
-+      4      4
-+      5      5
-+      6      5
-+      7      5
-+      8      5
-+      9      5
-+      a      5
-+      b      6
-+      c      6
-+      d      6
-+      e      6
-+      f      6
-+      10      6
-+      11      6
-+      12      7
-+      13      7
-+      14      7
-+      15      7
-+      16      7
-+      17      7
-+      18      8
-+      19      8
-+      1a      8
-+      1b      8
-+      1c      8
-+      1d      8
-+      1e      8
-+      1f      9
-+      20      9
-+      21      9
-+      22      9
-+      23      9
-+      24      9
-+      25      10
-+      26      10
-+      27      10
-+      28      10
-+      29      10
-+      2a      10
-+      2b      10
-+      2c      11
-+      2d      11
-+      2e      11
-+      2f      11
-+      30      11
-+      31      11
-+      32      12
-+      33      12
-+      37      12
-+      3b      13
-+      40      13
-+      44      14
-+      4a      14
-+      4e      15
-+      52      15
-+      56      16
-+      5b      16
-+      5f      17
-+      65      17
-+      69      18
-+      6e      18
-+      72      19
-+      78      19
-+      7c      20
-+      81      20
-+      85      21
-+      87      21
-+      8a      21
-+      8d      21
-+      91      22
-+      93      22
-+      96      22
-+      99      22
-+      9d      23
-+      9f      23
-+      a2      23
-+      a5      23
-+      a9      24
-+      ab      24
-+      ae      24
-+      b1      24
-+      b5      25
-+      b7      25
-+      ba      25
-+      bd      25
-+      c1      26
-+      c3      26
-+      c6      26
-+      c9      26
-+      cd      27
-+      cf      27
-+      d2      27
-+      d5      27
-+      dd      28
-+      e2      28
-+      e5      28
-+      ea      29
-+      ed      29
-+      f0      29
-+      f5      30
-+      f8      30
-+      fb      30
-+      fe      31
-+      101      31
-+      10a      31
-+      10b      31
-+      111      31
-+      112      31
-+      118      31
-+      11b      31
-+      121      31
-+      123      31
-+      129      31
-+      12b      31
-+      131      31
-+      134      31
-+      138      31
-+      13c      32
-+      13f      32
-+      148      32
-+      14b      32
-+      152      32
-+      155      32
-+      15c      32
-+      15f      32
-+      166      32
-+      169      32
-+      16d      32
-+      175      33
-+      176      33
-+      178      33
-+      17b      33
-+      17d      33
-+      180      33
-+      182      33
-+      185      33
-+      18f      34
-+      194      34
-+      19a      34
-+      19f      34
-+      1a5      34
-+      1aa      34
-+      1b0      34
-+      1b5      34
-+      1c1      35
-+      1c3      35
-+      1c6      35
-+      1c9      35
-+      1cb      35
-+      1ce      35
-+      1d1      35
-+      1d3      35
-+      1d6      35
-+      1d9      35
-+      1db      35
-+      1de      35
-+      1e1      35
-+      1e3      35
-+      1e6      35
-+      1e9      35
-+      1eb      35
-+      1ee      35
-+      1f1      35
-+      1f3      35
-+      1f6      35
-+      1fd      35
-+      202      35
-+      209      36
-    }
- 
-    method '<init> (ZBSIJFDC)V' {
-diff --git a/testData/results/TestStaticNameClash.dec b/testData/results/TestStaticNameClash.dec
-index 1c0f21a81b83a0ca7e8a43ba1d86f7f0f6fe7b8d..f36d336afcae4bd24201a7e0818d10362d098c90 100644
---- a/testData/results/TestStaticNameClash.dec
-+++ b/testData/results/TestStaticNameClash.dec
-@@ -10,7 +10,10 @@ public class TestStaticNameClash {
- 
- class 'pkg/TestStaticNameClash' {
-    method 'setProperty (Ljava/lang/String;)V' {
-+      0      6
-       1      6
-+      2      6
-+      3      6
-       4      7
-    }
- }
-diff --git a/testData/results/TestStringConcat.dec b/testData/results/TestStringConcat.dec
-index b3fc99579d32896fffb309beba1d89a9f14b84ce..951a761c030b7d6e62e309019b361722ebdd40d9 100644
---- a/testData/results/TestStringConcat.dec
-+++ b/testData/results/TestStringConcat.dec
-@@ -12,16 +12,29 @@ public class TestStringConcat {
- 
- class 'pkg/TestStringConcat' {
-    method 'test1 (Ljava/lang/String;I)Ljava/lang/String;' {
-+      7      4
-+      b      4
-       f      4
-+      10      4
-+      11      4
-       12      4
-    }
- 
-    method 'test2 (Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;' {
-       7      8
-+      8      8
-+      c      8
-       10      8
-+      11      8
-+      15      8
-       19      8
-+      1a      8
-+      1e      8
-       22      8
-+      23      8
-       27      8
-+      28      8
-+      29      8
-       2a      8
-    }
- }
-diff --git a/testData/results/TestStringLiterals.dec b/testData/results/TestStringLiterals.dec
-index c5afe1865540afe457073567009b4b96132d0a07..644701c21beb2a80ed07fc6ed7b2873f13d4e2db 100644
---- a/testData/results/TestStringLiterals.dec
-+++ b/testData/results/TestStringLiterals.dec
-@@ -12,20 +12,39 @@ public class TestStringLiterals {
- class 'pkg/TestStringLiterals' {
-    method 'main ([Ljava/lang/String;)V' {
-       0      4
-+      1      4
-       2      4
-       9      5
-+      a      5
-       e      5
-+      f      5
-       13      5
-+      14      5
-       18      5
-+      19      5
-       1d      5
-+      1e      5
-       22      5
-+      23      5
-       28      5
-+      29      5
-       2e      5
-+      2f      5
-       31      5
-       32      6
-+      33      6
-+      34      6
-+      35      6
-       36      6
-+      37      6
-+      38      6
-       39      7
-+      3a      7
-+      3b      7
-+      3c      7
-       3d      7
-+      3e      7
-+      3f      7
-       40      8
-    }
- }
-diff --git a/testData/results/TestSwitchOnEnum.dec b/testData/results/TestSwitchOnEnum.dec
-index 6e1f77fa247005cb8bb012a91aff96ed78103204..43c9a50f4312736e64116221bfe9140270a81929 100644
---- a/testData/results/TestSwitchOnEnum.dec
-+++ b/testData/results/TestSwitchOnEnum.dec
-@@ -50,6 +50,7 @@ public class TestSwitchOnEnum {
- 
- class 'pkg/TestSwitchOnEnum' {
-    method 'testSOE (Ljava/util/concurrent/TimeUnit;)I' {
-+      3      8
-       8      8
-       24      10
-       25      10
-diff --git a/testData/results/TestSynchronizedMapping.dec b/testData/results/TestSynchronizedMapping.dec
-index 84ad48a1e66013579286702e7fee9e562a8369e8..6778aa19b6d347f20cac678bd6414c2e1eac369d 100644
---- a/testData/results/TestSynchronizedMapping.dec
-+++ b/testData/results/TestSynchronizedMapping.dec
-@@ -16,16 +16,26 @@ public class TestSynchronizedMapping {
- 
- class 'pkg/TestSynchronizedMapping' {
-    method 'test (I)I' {
-+      0      4
-       3      4
-       4      5
-+      5      5
-+      6      5
-       8      6
-       12      8
-+      13      8
-+      14      8
-       15      8
-    }
- 
-    method 'test2 (Ljava/lang/String;)V' {
-       0      12
-+      1      12
-+      2      12
-+      3      12
-       4      12
-+      5      12
-+      6      12
-       7      13
-    }
- }
-diff --git a/testData/results/TestSyntheticAccess.dec b/testData/results/TestSyntheticAccess.dec
-index d5016a28f9ecd2cd30317c4c595b8c30b21b63ea..290e7a3cd313d5b54036e0ce2b5eaed572524cb6 100644
---- a/testData/results/TestSyntheticAccess.dec
-+++ b/testData/results/TestSyntheticAccess.dec
-@@ -39,43 +39,66 @@ class TestSyntheticAccess {
- 
- class 'pkg/TestSyntheticAccess$Assigner' {
-    method 'assignI (I)V' {
-+      1      8
-+      2      8
-+      3      8
-+      4      8
-       5      8
-       9      9
-    }
- 
-    method 'assignS (I)V' {
--      1      12
-+      0      12
-+      2      12
-+      3      12
-+      4      12
-       5      13
-    }
- }
- 
- class 'pkg/TestSyntheticAccess$Incrementer' {
-    method 'orI ()V' {
--      8      18
-+      1      18
-+      2      18
-+      3      18
-+      4      18
-+      5      18
-+      6      18
-+      7      18
-       b      18
-       d      18
-       11      19
-    }
- 
-    method 'incrementI ()V' {
-+      1      22
-       2      22
-+      3      22
-       4      22
-+      7      22
-       8      23
-    }
- 
-    method 'decrementI ()V' {
-+      1      26
-       2      26
-+      3      26
-       4      26
-+      6      26
-       8      27
-    }
- 
-    method 'incrementS ()V' {
-       0      30
--      4      31
-+      1      30
-+      2      30
-+      4      30
-    }
- 
-    method 'decrementS ()V' {
-       0      34
-+      1      34
-+      2      34
-       4      35
-    }
- }
-diff --git a/testData/results/TestThrowException.dec b/testData/results/TestThrowException.dec
-index 7c52234203a98704f4631c8e7d3b6edd27f18c4f..1344ac4d312e381ad98e3c1ef2a33a36d6f6952e 100644
---- a/testData/results/TestThrowException.dec
-+++ b/testData/results/TestThrowException.dec
-@@ -26,10 +26,15 @@ class 'pkg/TestThrowException$1' {
- 
- class 'pkg/TestThrowException' {
-    method '<init> (I)V' {
-+      4      6
-       5      6
-       c      7
-+      d      7
-       11      7
-+      12      9
-       1b      9
-+      1c      9
-+      1d      9
-       1e      15
-    }
- }
-diff --git a/testData/results/TestTryCatchFinally.dec b/testData/results/TestTryCatchFinally.dec
-index 2af717c0764a39b168d490d00d0933185ad11fde..20e9afb72b2d2dabc76d29f6bb1f4ef2bfbc5a20 100644
---- a/testData/results/TestTryCatchFinally.dec
-+++ b/testData/results/TestTryCatchFinally.dec
-@@ -42,42 +42,74 @@ public class TestTryCatchFinally {
- class 'pkg/TestTryCatchFinally' {
-    method 'test1 (Ljava/lang/String;)V' {
-       0      5
-+      1      5
-+      2      5
-       3      5
-+      4      5
-       5      5
-       14      8
-+      15      8
-+      16      8
-       17      8
-+      18      8
-       19      8
-       1f      9
--      2b      12
--      2d      12
--      30      12
--      38      15
-+      2b      13
-+      2c      13
-+      2d      13
-+      2e      13
-+      2f      13
-+      30      13
-+      31      13
-+      38      16
-    }
- 
-    method 'foo (I)I' {
--      1      18
--      2      18
--      c      19
--      e      20
--      f      20
--      13      21
--      1b      23
-+      0      19
-+      1      19
-+      2      19
-+      c      20
-+      d      21
-+      e      21
-+      f      21
-+      12      22
-+      13      22
-+      1b      24
-    }
- 
-    method 'test (Ljava/lang/String;)I' {
--      1      29
--      4      29
--      e      30
--      f      31
--      10      32
--      1a      32
--      23      32
--      26      32
--      31      37
--      34      34
--      35      34
--      38      34
--      3f      37
-+      0      30
-+      1      30
-+      2      30
-+      3      30
-+      4      30
-+      d      31
-+      e      31
-+      f      32
-+      10      33
-+      11      33
-+      12      33
-+      1a      33
-+      1b      33
-+      23      33
-+      24      33
-+      25      33
-+      26      33
-+      31      38
-+      32      38
-+      33      38
-+      34      35
-+      35      35
-+      36      35
-+      37      35
-+      38      35
-+      39      35
-+      3a      38
-+      3b      38
-+      3c      38
-+      3d      38
-+      3e      38
-+      3f      38
-    }
- }
- 
-diff --git a/testData/results/TestVarArgCalls.dec b/testData/results/TestVarArgCalls.dec
-index 6cdcd8fc638ceeec823172b2859ee8f970f61327..db4cb49cc7816f05dd2e3d82a6b79a7405001e4d 100644
---- a/testData/results/TestVarArgCalls.dec
-+++ b/testData/results/TestVarArgCalls.dec
-@@ -27,58 +27,135 @@ public class TestVarArgCalls {
- 
- class 'pkg/TestVarArgCalls' {
-    method 'doSmth ()V' {
-+      0      4
-       1      4
-+      2      4
-       7      4
-+      8      4
-+      9      4
-+      a      5
-       b      5
-+      c      5
-       13      5
-+      14      5
-       16      5
-+      17      5
-+      18      5
-+      19      6
-       1a      6
-+      1b      6
-       22      6
-+      23      6
-       27      6
-+      28      6
-       2a      6
-+      2b      6
-+      2c      6
-+      2d      7
-       2e      7
-+      2f      7
-       34      7
-+      35      7
-+      36      7
-+      37      8
-       38      8
-+      39      8
-       46      8
-+      47      8
-       4a      8
-+      4b      8
-+      4c      8
-+      4d      9
-       4e      9
-+      4f      9
-       5c      9
-+      5d      9
-       68      9
-+      69      9
-       6c      9
-+      6d      9
-+      6e      9
-       6f      10
-+      70      10
-       75      10
-+      76      10
-+      77      10
-       79      11
-+      7a      11
-       81      11
-+      82      11
-       83      11
-+      84      11
-+      85      11
-       87      11
-+      88      11
-+      89      11
-       8b      12
-+      8c      12
-       93      12
-+      94      12
-       95      12
-+      96      12
-+      97      12
-       9b      12
-+      9c      12
-       9e      12
-+      9f      12
-+      a0      12
-       a8      13
-+      a9      13
-       ab      13
-       ac      14
-+      ad      14
-+      b4      14
-       b6      14
-+      b7      14
-+      b8      14
-       ba      15
-+      bb      15
-+      bc      15
-       bd      15
-+      be      15
-+      bf      15
-       c0      15
-+      c1      15
-+      c2      15
-       c4      16
-    }
- 
-    method 'printAll (Ljava/lang/String;[Ljava/lang/String;)V' {
-       0      19
-+      1      19
-+      2      19
-+      3      19
-+      4      19
-       5      19
-+      6      19
-+      7      19
-       8      19
-+      9      19
-+      a      19
-       b      19
-+      c      19
-+      d      19
-       e      20
-    }
- 
-    method 'printComplex (Ljava/lang/String;[[Ljava/lang/String;)V' {
-       0      23
-+      1      23
-+      2      23
-+      3      23
-+      4      23
-       5      23
-+      6      23
-+      7      23
-       8      23
-+      9      23
-+      a      23
-       b      23
-+      c      23
-+      d      23
-       e      24
-    }
- }
diff --git a/FernFlower-Patches/0005-NUll-constructor-synthetic-classes-can-have-content-.patch b/FernFlower-Patches/0005-NUll-constructor-synthetic-classes-can-have-content-.patch
new file mode 100644
index 0000000..0bdc67b
--- /dev/null
+++ b/FernFlower-Patches/0005-NUll-constructor-synthetic-classes-can-have-content-.patch
@@ -0,0 +1,27 @@
+From 211a6f999cc0fc746ba73d6a9e4fd91be19a69e8 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sat, 1 Aug 2015 17:52:35 -0700
+Subject: [PATCH 005/122] NUll constructor synthetic classes can have content
+ as well so don't rely on it being a stub, just being anonymous. You can't
+ legitimatly have a anonymous argument.
+
+---
+ .../java/decompiler/modules/decompiler/exps/NewExprent.java     | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+index 24facc9..6dad7c9 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+@@ -327,7 +327,7 @@ public class NewExprent extends Exprent {
+ 
+                 if (i == lstParameters.size() - 1 && expr.getExprType() == VarType.VARTYPE_NULL) {
+                   ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(leftType.value);
+-                  if (node != null && node.namelessConstructorStub) {
++                  if (node != null && node.type == ClassNode.CLASS_ANONYMOUS) {
+                     break;  // skip last parameter of synthetic constructor call
+                   }
+                 }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0006-Sort-inner-class-lists-to-produce-a-consistant-decom.patch b/FernFlower-Patches/0006-Sort-inner-class-lists-to-produce-a-consistant-decom.patch
new file mode 100644
index 0000000..0afb25e
--- /dev/null
+++ b/FernFlower-Patches/0006-Sort-inner-class-lists-to-produce-a-consistant-decom.patch
@@ -0,0 +1,81 @@
+From fdff6cfcb291cf7dcba48ce13e2aefcb7dae0d5b Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sat, 1 Aug 2015 18:40:43 -0700
+Subject: [PATCH 006/122] Sort inner class lists to produce a consistant
+ decompile. Different JVMs sort HashSets differently causing inner classes to
+ get shuffled.
+
+---
+ .../jetbrains/java/decompiler/main/ClassesProcessor.java | 9 ++++++++-
+ .../java/decompiler/main/rels/LambdaProcessor.java       | 2 ++
+ .../java/decompiler/main/rels/NestedClassProcessor.java  | 1 +
+ 3 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+index 5a56641..b3e9d81 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+@@ -228,6 +228,7 @@ public class ClassesProcessor {
+                 stack.add(nestedClass);
+               }
+             }
++            Collections.sort(superNode.nested);
+           }
+         }
+       }
+@@ -342,7 +343,7 @@ public class ClassesProcessor {
+   }
+ 
+ 
+-  public static class ClassNode {
++  public static class ClassNode implements Comparable<ClassNode> {
+ 
+     public static final int CLASS_ROOT = 0;
+     public static final int CLASS_MEMBER = 1;
+@@ -441,5 +442,11 @@ public class ClassesProcessor {
+       public boolean is_method_reference;
+       public boolean is_content_method_static;
+     }
++
++    @Override
++    public int compareTo(ClassNode o)
++    {
++        return this.classStruct.qualifiedName.compareTo(o.classStruct.qualifiedName);
++    }
+   }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
+index 0704efd..809af6d 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
+@@ -119,6 +119,7 @@ public class LambdaProcessor {
+             }
+           }
+         }
++        Collections.sort(node.nested);
+       }
+ 
+       mt.releaseResources();
+@@ -133,6 +134,7 @@ public class LambdaProcessor {
+ 
+           parent_class.nested.add(nd);
+           nd.parent = parent_class;
++          Collections.sort(parent_class.nested);
+         }
+       }
+     }
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+index 798010e..9aedf22 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+@@ -248,6 +248,7 @@ public class NestedClassProcessor {
+       if (setEnclosing.contains(node.classStruct.qualifiedName)) {
+         node.nested.add(child);
+         child.parent = node;
++        Collections.sort(node.nested);
+ 
+         return true;
+       }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0007-Add-an-LVT-test-so-we-can-quickly-iterate-LVT-hackin.patch b/FernFlower-Patches/0007-Add-an-LVT-test-so-we-can-quickly-iterate-LVT-hackin.patch
new file mode 100644
index 0000000..6fa1081
--- /dev/null
+++ b/FernFlower-Patches/0007-Add-an-LVT-test-so-we-can-quickly-iterate-LVT-hackin.patch
@@ -0,0 +1,153 @@
+From 213752acb3080ed6bff297f5a4e54b09998cf10a Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sun, 2 Aug 2015 10:43:54 -0400
+Subject: [PATCH 007/122] Add an LVT test so we can quickly iterate LVT hacking
+
+---
+ .../jetbrains/java/decompiler/LVTTest.java    |  33 ++++++++++++++++++
+ testData/classes/pkg/TestLVT.class            | Bin 0 -> 1672 bytes
+ testData/results/TestLVT.dec                  |  29 +++++++++++++++
+ testData/src/pkg/TestLVT.java                 |  27 ++++++++++++++
+ 4 files changed, 89 insertions(+)
+ create mode 100644 test/org/jetbrains/java/decompiler/LVTTest.java
+ create mode 100644 testData/classes/pkg/TestLVT.class
+ create mode 100644 testData/results/TestLVT.dec
+ create mode 100644 testData/src/pkg/TestLVT.java
+
+diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
+new file mode 100644
+index 0000000..2d39827
+--- /dev/null
++++ b/test/org/jetbrains/java/decompiler/LVTTest.java
+@@ -0,0 +1,33 @@
++/*
++ * Copyright 2000-2014 JetBrains s.r.o.
++ *
++ * Licensed under the Apache License, Version 2.0 (the "License");
++ * you may not use this file except in compliance with the License.
++ * You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++package org.jetbrains.java.decompiler;
++
++import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
++import org.junit.Test;
++
++import java.util.HashMap;
++import java.util.Map;
++
++public class LVTTest extends SingleClassesTestBase {
++  @Override
++  protected Map<String, Object> getDecompilerOptions() {
++    return new HashMap<String, Object>() {{
++      put(IFernflowerPreferences.USE_DEBUG_LINE_NUMBERS, "1");
++    }};
++  }
++
++  @Test public void testMatch1() { doTest("pkg/TestLVT"); }
++}
+diff --git a/testData/classes/pkg/TestLVT.class b/testData/classes/pkg/TestLVT.class
+new file mode 100644
+index 0000000000000000000000000000000000000000..d8a5829d4f6504567ecf46bf65167047e41cd291
+GIT binary patch
+literal 1672
+zcmZ`(T~k|C6kR9W<bH6mAta&cmsOD_Ei@8su?bQE#ex^8f>CsQID{))ny*Q2I>Woq
+zJUPDjqT^Vf^&vRc=@0N1_+OkUu9KS#fglskJs)eYz4ktPpTA%J`2s)=U+D-54A-CR
+zWw+d>?-aLmXadm#`BY}hvbvYu*g0@ZzCdKot9t&tz)(6<6wsDxyRL;Hm^Q+Q2wZZ!
+zs=MB*?6{3Bxl?upVot3j%SGAn)VjN=`TJf|V8rQjSs;7G_4jML0=Lr6sqam{;Z^qv
+zgFBg`fl*pDOSQT?V_-}`59ZQ9qIZxpFy1@JNgXMHu?~65_sZFYMnfJtUemX58K#bF
+z0^{dhFSfk$uG_G112=WNdL}V}I2*6wbvk(}%Pn`~8-dCG0D|NdGJ_FVxQYptx;F(9
+z{U+U*Gew2CWh0FY<B|2cTV;BtFM<xRcV!n8#T`X4C2%dhGAN@Tcvk_l=Un`60R5IT
+zHY@3E0mH8a>ILHIL1zUM_b{vD{@FAhHhs5Z<6S&pZPi*VwL}n*SIa);{rlu}Wre{M
+z@Scvj-X)$rwlS|#sn?Z7xoY5j>gkk3?hXrNQNZl2SP35pjGk7)BiY<vlXVMAFjdMv
+zQki(9Qnor6MKAC$`$zp*0wFo0s{MTNu&hHeCm=ljuLy*zHLuCOhz7_`5vuwlPHWa>
+zg{W24N2kIliigRweRNpw_0mKiR1wYfN$6hOJnirG!N_<4>SDW*O<$It(4yPA)@H5M
+zD7nj?YHqvxT-;S^*#o@0PC7!I@jc+EbDiZ^@Eg8;4C6OWLa;chW5B>LM>_!UJHnNT
+zS8$0tG#39r>!6>-qHD3(`p|vtS1iTi`EV?mk37fa?PFZY>(6m@d+HBdKgJuWa2u1U
+z2#18$#_g2e#&jER<&EF*PReK_|E(qxTGaaK<S%oUWXrLK`ABR*aV(MS!@Qx$rn_W{
+zM^Q{BNw%!)J7lIJGf9@zEIF$swK!J3`{CqRMHlE@#wh3NZ5(E#b|<nZ<BBt~>xg23
+z=PTUZ#2B`@`!y1fNa6tFIO1FMJ@<dXl}>h!Xa_vQ$8h*nvo+3CvVSIv!+b{YBk_)U
+ziLr`xY*0lM56J28BI0bhan2(2JcY;jgqdAn=0D}0fg;iC)S*#BU=g8`z(S`UWwAxv
+zQP;x6XVj3S*MO}^wgB}x5nu3Z0@_R1I&SbM9-c7DaIgqQ4fq#})W1z^2w(mOPXBh_
+
+literal 0
+HcmV?d00001
+
+diff --git a/testData/results/TestLVT.dec b/testData/results/TestLVT.dec
+new file mode 100644
+index 0000000..b1b7e2e
+--- /dev/null
++++ b/testData/results/TestLVT.dec
+@@ -0,0 +1,29 @@
++package pkg;
++
++import java.util.ArrayList;
++import java.util.HashMap;
++
++public class TestLVT {
++
++
++   public static void method(String a1, String a2) {
++      String scope1 = "scope1";
++      String scope1a = "scope1a";
++      for(int i = 0; i < 10; ++i) {
++         String scope2 = "scope2";
++         String scope2a = "scope2a";
++         ArrayList noise = new ArrayList();
++         String spam = scope1 + scope2 + scope2a + i + noise;
++         System.out.println(spam);
++      }
++      for (long i = 0L; i < 10L; ++i) {
++         String scope2 = "scope2+1";
++         String scope2a = "scope2+1a";
++         HashMap noise = new HashMap();
++         String spam = scope1a + scope2 + scope2a + i + noise;
++         System.out.println(spam);
++      }
++        
++   }
++}
++
+diff --git a/testData/src/pkg/TestLVT.java b/testData/src/pkg/TestLVT.java
+new file mode 100644
+index 0000000..05b5228
+--- /dev/null
++++ b/testData/src/pkg/TestLVT.java
+@@ -0,0 +1,27 @@
++package pkg;
++
++import java.util.ArrayList;
++import java.util.HashMap;
++import java.util.List;
++import java.util.Map;
++
++public class TestLVT {
++    public static void method(String a1, String a2) {
++        String scope1 = "scope1";
++        String scope1a = "scope1a";
++        for (int i=0; i<10; i++) {
++            String scope2 = "scope2";
++            String scope2a = "scope2a";
++            List<Object> noise = new ArrayList<Object>();
++            String spam = scope1 + scope2 + scope2a + i + noise;
++            System.out.println(spam);
++        }
++        for (long i=0; i<10; i++) {
++            String scope2 = "scope2+1";
++            String scope2a = "scope2+1a";
++            Map<Object,Object> noise = new HashMap<Object,Object>();
++            String spam = scope1a + scope2 + scope2a + i + noise;
++            System.out.println(spam);
++        }
++    }
++}
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0007-Reintroduce-DotExporter-for-debugging-purposes.patch b/FernFlower-Patches/0007-Reintroduce-DotExporter-for-debugging-purposes.patch
deleted file mode 100644
index 0d3d6de..0000000
--- a/FernFlower-Patches/0007-Reintroduce-DotExporter-for-debugging-purposes.patch
+++ /dev/null
@@ -1,393 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Wed, 12 Apr 2017 18:37:18 -0700
-Subject: [PATCH] Reintroduce DotExporter for debugging purposes
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 327a6e64f06d7ef60dc1bb3139aab490a2f7c2df..7d41769adee0974a02e0ef5a0518f9f9e53c8b58 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-@@ -24,6 +24,7 @@ import org.jetbrains.java.decompiler.struct.attr.StructEnclosingMethodAttribute;
- import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
- import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
-+import org.jetbrains.java.decompiler.util.DotExporter;
- import org.jetbrains.java.decompiler.util.InterpreterUtil;
- 
- import java.util.*;
-@@ -261,6 +262,7 @@ public class NestedClassProcessor {
-       // iterate enclosing class
-       for (MethodWrapper method : node.getWrapper().getMethods()) {
-         if (method.root != null) { // neither abstract, nor native
-+          DotExporter.toDotFile(method.getOrBuildGraph(), method.methodStruct, "computeLocalVars");
-           method.getOrBuildGraph().iterateExprents(exprent -> {
-             List<Exprent> lst = exprent.getAllExprents(true);
-             lst.add(exprent);
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
-index 70b053d4138127c772f72eca7a54a1b8b3098cbf..82e8870671180ade3be93bbb54920b0321a9912b 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
-@@ -15,6 +15,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement.Statemen
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
- import org.jetbrains.java.decompiler.struct.StructMethod;
- import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
-+import org.jetbrains.java.decompiler.util.DotExporter;
- import org.jetbrains.java.decompiler.util.FastSparseSetFactory;
- import org.jetbrains.java.decompiler.util.FastSparseSetFactory.FastSparseSet;
- import org.jetbrains.java.decompiler.util.SFormsFastMapDirect;
-@@ -54,9 +55,7 @@ public class SSAConstructorSparseEx {
-     FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
-     DirectGraph dgraph = flatthelper.buildDirectGraph(root);
- 
--    // try {
--    // DotExporter.toDotFile(dgraph, new File("c:\\Temp\\gr12_my.dot"));
--    // } catch(Exception ex) {ex.printStackTrace();}
-+    DotExporter.toDotFile(dgraph, mt, "ssaSplitVariables");
- 
-     List<Integer> setInit = new ArrayList<>();
-     for (int i = 0; i < 64; i++) {
-@@ -69,20 +68,19 @@ public class SSAConstructorSparseEx {
- 
-     setCatchMaps(root, dgraph, flatthelper);
- 
-+    int itteration = 1;
-     HashSet<String> updated = new HashSet<>();
-     do {
-       // System.out.println("~~~~~~~~~~~~~ \r\n"+root.toJava());
--      ssaStatements(dgraph, updated);
-+      ssaStatements(dgraph, updated, mt, itteration++);
-       // System.out.println("~~~~~~~~~~~~~ \r\n"+root.toJava());
-     }
-     while (!updated.isEmpty());
-   }
- 
--  private void ssaStatements(DirectGraph dgraph, HashSet<String> updated) {
-+  private void ssaStatements(DirectGraph dgraph, HashSet<String> updated, StructMethod mt, int itteration) {
- 
--    // try {
--    // DotExporter.toDotFile(dgraph, new File("c:\\Temp\\gr1_my.dot"));
--    // } catch(Exception ex) {ex.printStackTrace();}
-+    DotExporter.toDotFile(dgraph, mt, "ssaStatements_" + itteration, outVarVersions);
- 
-     for (DirectNode node : dgraph.nodes) {
- 
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
-index 8cd9f1de252412494f36a847167a9b74a7dd7625..5e1e323a6e2043d776c513e800056be200ab2971 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
-@@ -12,6 +12,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionsGraph;
- import org.jetbrains.java.decompiler.struct.StructMethod;
- import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
-+import org.jetbrains.java.decompiler.util.DotExporter;
- import org.jetbrains.java.decompiler.util.FastSparseSetFactory;
- import org.jetbrains.java.decompiler.util.FastSparseSetFactory.FastSparseSet;
- import org.jetbrains.java.decompiler.util.SFormsFastMapDirect;
-@@ -68,6 +69,8 @@ public class SSAUConstructorSparseEx {
-     FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
-     DirectGraph dgraph = flatthelper.buildDirectGraph(root);
- 
-+    DotExporter.toDotFile(dgraph, mt, "ssauSplitVariables");
-+    
-     List<Integer> setInit = new ArrayList<>();
-     for (int i = 0; i < 64; i++) {
-       setInit.add(i);
-@@ -78,25 +81,24 @@ public class SSAUConstructorSparseEx {
- 
-     setCatchMaps(root, dgraph, flatthelper);
- 
--    //		try {
--    //			DotExporter.toDotFile(dgraph, new File("c:\\Temp\\gr12_my.dot"));
--    //		} catch(Exception ex) {ex.printStackTrace();}
--
-+    int itteration = 1;
-     HashSet<String> updated = new HashSet<>();
-     do {
-       //			System.out.println("~~~~~~~~~~~~~ \r\n"+root.toJava());
--      ssaStatements(dgraph, updated, false);
-+      ssaStatements(dgraph, updated, false, mt, itteration++);
-       //			System.out.println("~~~~~~~~~~~~~ \r\n"+root.toJava());
-     }
-     while (!updated.isEmpty());
- 
- 
--    ssaStatements(dgraph, updated, true);
-+    ssaStatements(dgraph, updated, true, mt, itteration++);
- 
-     ssuversions.initDominators();
-   }
- 
--  private void ssaStatements(DirectGraph dgraph, HashSet<String> updated, boolean calcLiveVars) {
-+  private void ssaStatements(DirectGraph dgraph, HashSet<String> updated, boolean calcLiveVars, StructMethod mt, int itteration) {
-+
-+    DotExporter.toDotFile(dgraph, mt, "ssauStatements_" + itteration);
- 
-     for (DirectNode node : dgraph.nodes) {
- 
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-index 472faf9ad843f4d4bafdc2cf7753b67d8c34bddc..d6a9c2a29c73d778eb383d718094b7548d14d2f3 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-@@ -14,6 +14,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
- import org.jetbrains.java.decompiler.struct.StructMethod;
- import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
-+import org.jetbrains.java.decompiler.util.DotExporter;
- import org.jetbrains.java.decompiler.util.FastSparseSetFactory.FastSparseSet;
- 
- import java.util.*;
-@@ -36,6 +37,8 @@ public class VarVersionsProcessor {
-     FlattenStatementsHelper flattenHelper = new FlattenStatementsHelper();
-     DirectGraph graph = flattenHelper.buildDirectGraph(root);
- 
-+    DotExporter.toDotFile(graph, method, "setVarVersions");
-+
-     mergePhiVersions(ssa, graph);
- 
-     typeProcessor.calculateVarTypes(root, graph);
-diff --git a/src/org/jetbrains/java/decompiler/util/DotExporter.java b/src/org/jetbrains/java/decompiler/util/DotExporter.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..f9ce78507cb70255e090088fbf1e1834dfdf902f
---- /dev/null
-+++ b/src/org/jetbrains/java/decompiler/util/DotExporter.java
-@@ -0,0 +1,238 @@
-+package org.jetbrains.java.decompiler.util;
-+
-+import java.io.BufferedOutputStream;
-+import java.io.File;
-+import java.io.FileOutputStream;
-+import java.util.Collections;
-+import java.util.HashSet;
-+import java.util.List;
-+import java.util.Map;
-+import java.util.Set;
-+import java.util.Map.Entry;
-+
-+import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
-+import org.jetbrains.java.decompiler.code.cfg.ControlFlowGraph;
-+import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
-+import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph;
-+import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectNode;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
-+import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionEdge;
-+import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionNode;
-+import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionsGraph;
-+import org.jetbrains.java.decompiler.struct.StructMethod;
-+import org.jetbrains.java.decompiler.util.FastSparseSetFactory.FastSparseSet;
-+
-+public class DotExporter {
-+  private static final String DOTS_FOLDER = System.getProperty("DOT_EXPORT_DIR", null);
-+  private static final boolean DUMP_DOTS = DOTS_FOLDER != null;
-+  // http://graphs.grevian.org/graph is a nice visualizer for the outputed dots.
-+
-+  private static String toDotFormat(Statement stat) {
-+
-+    StringBuffer buffer = new StringBuffer();
-+
-+    buffer.append("digraph G {\r\n");
-+
-+    for(Statement st : stat.getStats()) {
-+
-+      String sourceid = st.id + (st.getSuccessorEdges(StatEdge.EdgeType.EXCEPTION).isEmpty()?"":"000000");
-+
-+      buffer.append(sourceid+" [shape=box,label=\""+sourceid+"\"];\r\n");
-+
-+      for(StatEdge edge : st.getSuccessorEdges(StatEdge.EdgeType.DIRECT_ALL)) {
-+        String destid = edge.getDestination().id + (edge.getDestination().getSuccessorEdges(StatEdge.EdgeType.EXCEPTION).isEmpty()?"":"000000");
-+
-+        buffer.append(sourceid+"->"+destid+";\r\n");
-+
-+        if(!stat.getStats().contains(edge.getDestination())) {
-+          buffer.append(destid+" [label=\""+destid+"\"];\r\n");
-+        }
-+      }
-+
-+      for(StatEdge edge : st.getSuccessorEdges(StatEdge.EdgeType.EXCEPTION)) {
-+        String destid = edge.getDestination().id + (edge.getDestination().getSuccessorEdges(StatEdge.EdgeType.EXCEPTION).isEmpty()?"":"000000");
-+
-+        buffer.append(sourceid+" -> "+destid+" [style=dotted];\r\n");
-+
-+        if(!stat.getStats().contains(edge.getDestination())) {
-+          buffer.append(destid+" [label=\""+destid+"\"];\r\n");
-+        }
-+      }
-+    }
-+
-+    buffer.append("}");
-+
-+    return buffer.toString();
-+  }
-+
-+
-+  private static String toDotFormat(ControlFlowGraph graph, boolean showMultipleEdges) {
-+
-+    StringBuffer buffer = new StringBuffer();
-+
-+    buffer.append("digraph G {\r\n");
-+
-+    List<BasicBlock> blocks = graph.getBlocks();
-+    for(int i=0;i<blocks.size();i++) {
-+      BasicBlock block = blocks.get(i);
-+
-+      buffer.append(block.id+" [shape=box,label=\""+block.id+"\"];\r\n");
-+
-+
-+      List<BasicBlock> suc = block.getSuccessors();
-+      if(!showMultipleEdges) {
-+        HashSet<BasicBlock> set = new HashSet<>();
-+        set.addAll(suc);
-+        suc = Collections.list(Collections.enumeration(set));
-+      }
-+      for(int j=0;j<suc.size();j++) {
-+        buffer.append(block.id+"->"+suc.get(j).id+";\r\n");
-+      }
-+
-+
-+      suc = block.getSuccessorExceptions();
-+      if(!showMultipleEdges) {
-+        HashSet<BasicBlock> set = new HashSet<>();
-+        set.addAll(suc);
-+        suc = Collections.list(Collections.enumeration(set));
-+      }
-+      for(int j=0;j<suc.size();j++) {
-+        buffer.append(block.id+" -> "+suc.get(j).id+" [style=dotted];\r\n");
-+      }
-+    }
-+
-+    buffer.append("}");
-+
-+    return buffer.toString();
-+  }
-+
-+  private static String toDotFormat(VarVersionsGraph graph) {
-+
-+    StringBuffer buffer = new StringBuffer();
-+
-+    buffer.append("digraph G {\r\n");
-+
-+    List<VarVersionNode> blocks = graph.nodes;
-+    for(int i=0;i<blocks.size();i++) {
-+      VarVersionNode block = blocks.get(i);
-+
-+      buffer.append((block.var*1000+block.version)+" [shape=box,label=\""+block.var+"_"+block.version+"\"];\r\n");
-+
-+      for(VarVersionEdge edge: block.successors) {
-+        VarVersionNode dest = edge.dest;
-+        buffer.append((block.var*1000+block.version)+"->"+(dest.var*1000+dest.version)+(edge.type==VarVersionEdge.EDGE_PHANTOM?" [style=dotted]":"")+";\r\n");
-+      }
-+    }
-+
-+    buffer.append("}");
-+
-+    return buffer.toString();
-+  }
-+
-+  private static String toDotFormat(DirectGraph graph, Map<String, SFormsFastMapDirect> vars) {
-+
-+    StringBuffer buffer = new StringBuffer();
-+
-+    buffer.append("digraph G {\r\n");
-+
-+    List<DirectNode> blocks = graph.nodes;
-+    for(int i=0;i<blocks.size();i++) {
-+      DirectNode block = blocks.get(i);
-+
-+      StringBuilder label = new StringBuilder(block.id);
-+      if (vars != null && vars.containsKey(block.id)) {
-+        SFormsFastMapDirect map = vars.get(block.id);
-+
-+        List<Entry<Integer, FastSparseSet<Integer>>> lst = map.entryList();
-+        if (lst != null) {
-+          for (Entry<Integer, FastSparseSet<Integer>> entry : lst) {
-+             label.append("\\n").append(entry.getKey());
-+            Set<Integer> set = entry.getValue().toPlainSet();
-+            label.append("=").append(set.toString());
-+          }
-+        }
-+      }
-+
-+      buffer.append(directBlockIdToDot(block.id)+" [shape=box,label=\""+label+"\"];\r\n");
-+
-+      for(DirectNode dest: block.successors) {
-+        buffer.append(directBlockIdToDot(block.id)+"->"+directBlockIdToDot(dest.id)+";\r\n");
-+      }
-+    }
-+
-+    buffer.append("}");
-+
-+    return buffer.toString();
-+  }
-+
-+  private static String directBlockIdToDot(String id) {
-+    id = id.replaceAll("_try", "999");
-+    id = id.replaceAll("_tail", "888");
-+
-+    id = id.replaceAll("_init", "111");
-+    id = id.replaceAll("_cond", "222");
-+    id = id.replaceAll("_inc", "333");
-+    return id;
-+  }
-+
-+  private static File getFile(StructMethod mt, String suffix) {
-+    File root = new File(DOTS_FOLDER + mt.getClassQualifiedName());
-+    if (!root.isDirectory())
-+      root.mkdirs();
-+    return new File(root,
-+      mt.getName().replace('<', '.').replace('>', '_') +
-+      mt.getDescriptor().replace('/', '.') +
-+      '_' + suffix + ".dot");
-+  }
-+
-+  public static void toDotFile(DirectGraph dgraph, StructMethod mt, String suffix) {
-+    toDotFile(dgraph, mt, suffix, null);
-+  }
-+  public static void toDotFile(DirectGraph dgraph, StructMethod mt, String suffix, Map<String, SFormsFastMapDirect> vars) {
-+    if (!DUMP_DOTS)
-+      return;
-+    try{
-+      BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(getFile(mt, suffix)));
-+      out.write(toDotFormat(dgraph, vars).getBytes());
-+      out.close();
-+    } catch (Exception e) {
-+      e.printStackTrace();
-+    }
-+  }
-+
-+  public static void toDotFile(Statement stat, StructMethod mt, String suffix) {
-+    if (!DUMP_DOTS)
-+      return;
-+    try{
-+      BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(getFile(mt, suffix)));
-+      out.write(toDotFormat(stat).getBytes());
-+      out.close();
-+    } catch (Exception e) {
-+      e.printStackTrace();
-+    }
-+  }
-+
-+  public static void toDotFile(VarVersionsGraph graph, StructMethod mt, String suffix) {
-+    if (!DUMP_DOTS)
-+      return;
-+    try{
-+      BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(getFile(mt, suffix)));
-+      out.write(toDotFormat(graph).getBytes());
-+      out.close();
-+    } catch (Exception e) {
-+      e.printStackTrace();
-+    }
-+  }
-+
-+  public static void toDotFile(ControlFlowGraph graph, StructMethod mt, String suffix, boolean showMultipleEdges) {
-+    if (!DUMP_DOTS)
-+      return;
-+    try{
-+      BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(getFile(mt, suffix)));
-+      out.write(toDotFormat(graph, showMultipleEdges).getBytes());
-+      out.close();
-+    } catch (Exception e) {
-+      e.printStackTrace();
-+    }
-+  }
-+}
-\ No newline at end of file
diff --git a/FernFlower-Patches/0008-Capture-the-LVT-and-LVTT-properly-into-some-structur.patch b/FernFlower-Patches/0008-Capture-the-LVT-and-LVTT-properly-into-some-structur.patch
new file mode 100644
index 0000000..53068a6
--- /dev/null
+++ b/FernFlower-Patches/0008-Capture-the-LVT-and-LVTT-properly-into-some-structur.patch
@@ -0,0 +1,172 @@
+From f83b43ba0aaf6e5fb17d17a9fcaa2420ab8aa0ff Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sun, 2 Aug 2015 14:07:52 -0400
+Subject: [PATCH 008/122] Capture the LVT and LVTT properly, into some
+ structured data. Ends seem to be the way to index the variable table. Next
+ up, we need to capture the block ends in the var parsing code, so we can then
+ match up later.
+
+---
+ .../java/decompiler/struct/StructMember.java  |  4 +-
+ .../struct/attr/StructGeneralAttribute.java   |  3 +-
+ .../StructLocalVariableTableAttribute.java    | 77 ++++++++++++++++++-
+ 3 files changed, 79 insertions(+), 5 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/struct/StructMember.java b/src/org/jetbrains/java/decompiler/struct/StructMember.java
+index f681e19..724c0db 100644
+--- a/src/org/jetbrains/java/decompiler/struct/StructMember.java
++++ b/src/org/jetbrains/java/decompiler/struct/StructMember.java
+@@ -57,9 +57,9 @@ public class StructMember {
+       StructGeneralAttribute attribute = readAttribute(in, pool, name);
+ 
+       if (attribute != null) {
+-        if (StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name) && attributes.containsKey(name)) {
++        if ((StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name) || StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE.equals(name)) && attributes.containsKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE)) {
+           // merge all variable tables
+-          StructLocalVariableTableAttribute table = (StructLocalVariableTableAttribute)attributes.getWithKey(name);
++          StructLocalVariableTableAttribute table = (StructLocalVariableTableAttribute)attributes.getWithKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
+           table.addLocalVariableTable((StructLocalVariableTableAttribute)attribute);
+         }
+         else {
+diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
+index dc0ebc6..87f5741 100644
+--- a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
++++ b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
+@@ -42,6 +42,7 @@ public class StructGeneralAttribute {
+   public static final String ATTRIBUTE_RUNTIME_VISIBLE_TYPE_ANNOTATIONS = "RuntimeVisibleTypeAnnotations";
+   public static final String ATTRIBUTE_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS = "RuntimeInvisibleTypeAnnotations";
+   public static final String ATTRIBUTE_LOCAL_VARIABLE_TABLE = "LocalVariableTable";
++  public static final String ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE = "LocalVariableTypeTable";
+   public static final String ATTRIBUTE_CONSTANT_VALUE = "ConstantValue";
+   public static final String ATTRIBUTE_BOOTSTRAP_METHODS = "BootstrapMethods";
+   public static final String ATTRIBUTE_SYNTHETIC = "Synthetic";
+@@ -85,7 +86,7 @@ public class StructGeneralAttribute {
+              ATTRIBUTE_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS.equals(name)) {
+       attr = new StructAnnotationTypeAttribute();
+     }
+-    else if (ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name)) {
++    else if (ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name) || ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE.equals(name)) {
+       attr = new StructLocalVariableTableAttribute();
+     }
+     else if (ATTRIBUTE_BOOTSTRAP_METHODS.equals(name)) {
+diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+index fceae35..04f534e 100644
+--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
++++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+@@ -19,9 +19,14 @@ import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+ import org.jetbrains.java.decompiler.util.DataInputFullStream;
+ 
+ import java.io.IOException;
++import java.util.ArrayList;
+ import java.util.Collections;
+ import java.util.HashMap;
++import java.util.HashSet;
++import java.util.List;
+ import java.util.Map;
++import java.util.Map.Entry;
++import java.util.Set;
+ 
+ /*
+   u2 local_variable_table_length;
+@@ -35,21 +40,80 @@ import java.util.Map;
+ */
+ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
+ 
++  public static class LVTVariable implements Comparable<LVTVariable> {
++      public final String name;
++      public final int start;
++      public final int end;
++      public final int index;
++      private String desc;
++      private String sig;
++      private boolean isLVTT;
++      LVTVariable(String name, String desc, int start, int end, int index, boolean isLVTT) {
++          this.name = name;
++          this.desc = desc;
++          this.start = start;
++          this.end = end;
++          this.index = index;
++          this.isLVTT = isLVTT;
++      }
++
++    void merge(LVTVariable other) {
++        if (other.isLVTT && this.sig == null) {
++            this.sig = other.desc;
++        }
++    }
++    @Override
++    public boolean equals(Object obj) {
++        return ((LVTVariable) obj).index == index && ((LVTVariable) obj).end == end;
++    }
++    @Override
++    public int hashCode() {
++        return index * 31 + end;
++    }
++
++    public void addTo(Map<Integer, Set<LVTVariable>> endpoints) {
++        Set<LVTVariable> ends = endpoints.get(this.end);
++        if (ends == null) {
++            ends = new HashSet<LVTVariable>();
++            endpoints.put(this.end, ends);
++        }
++        ends.add(this);
++    }
++
++    @Override
++    public int compareTo(LVTVariable o) {
++        if (o.end > end) return -1;
++        if (o.end < end) return 1;
++        if (o.index > index) return -1;
++        if (o.index < index) return 1;
++        return 0;
++    }
++  }
+   private Map<Integer, String> mapVarNames = Collections.emptyMap();
+ 
++  private Map<Integer, Set<LVTVariable>> endpoints = Collections.emptyMap();
++  private ArrayList<LVTVariable> allLVT;
++
+   @Override
+   public void initContent(ConstantPool pool) throws IOException {
+     DataInputFullStream data = stream();
+ 
+     int len = data.readUnsignedShort();
++    boolean isLVTT = this.getName().equals(ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
+     if (len > 0) {
+       mapVarNames = new HashMap<Integer, String>(len);
++      endpoints = new HashMap<Integer,Set<LVTVariable>>(len);
++      allLVT = new ArrayList<LVTVariable>(len);
+       for (int i = 0; i < len; i++) {
+-        data.discard(4);
++        int start = data.readUnsignedShort();
++        int vlen = data.readUnsignedShort();
+         int nameIndex = data.readUnsignedShort();
+-        data.discard(2);
++        int descIndex = data.readUnsignedShort(); // either descriptor or signature
+         int varIndex = data.readUnsignedShort();
++        LVTVariable v = new LVTVariable(pool.getPrimitiveConstant(nameIndex).getString(), pool.getPrimitiveConstant(descIndex).getString(),start,start+vlen,varIndex,isLVTT);
+         mapVarNames.put(varIndex, pool.getPrimitiveConstant(nameIndex).getString());
++        allLVT.add(v);
++        v.addTo(endpoints);
+       }
+     }
+     else {
+@@ -59,6 +123,15 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
+ 
+   public void addLocalVariableTable(StructLocalVariableTableAttribute attr) {
+     mapVarNames.putAll(attr.getMapVarNames());
++    for (LVTVariable other : attr.allLVT) {
++        int idx = allLVT.indexOf(other);
++        if (idx < 0) {
++            allLVT.add(other);
++        } else {
++            LVTVariable mine = allLVT.get(idx);
++            mine.merge(other);
++        }
++    }
+   }
+ 
+   public Map<Integer, String> getMapVarNames() {
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0008-LVT-Fixes-and-Support-for-Enhanced-For-loop-detectio.patch b/FernFlower-Patches/0008-LVT-Fixes-and-Support-for-Enhanced-For-loop-detectio.patch
deleted file mode 100644
index bf8867f..0000000
--- a/FernFlower-Patches/0008-LVT-Fixes-and-Support-for-Enhanced-For-loop-detectio.patch
+++ /dev/null
@@ -1,4949 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Tue, 11 Apr 2017 22:54:20 -0700
-Subject: [PATCH] LVT Fixes and Support for Enhanced For loop detection.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
-index ec59ac3c399dd1609663bc9444a098285b5dc48a..33906d3a433e4421bbf41c6aed5ff566a69a904a 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
-@@ -8,7 +8,6 @@ import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
- import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
- import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
--import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
-@@ -39,6 +38,7 @@ public class ClassWrapper {
-   public void init() {
-     DecompilerContext.setProperty(DecompilerContext.CURRENT_CLASS, classStruct);
-     DecompilerContext.setProperty(DecompilerContext.CURRENT_CLASS_WRAPPER, this);
-+    DecompilerContext.setProperty(DecompilerContext.CURRENT_CLASS_NODE, DecompilerContext.getClassProcessor().getMapRootClasses().get(classStruct.qualifiedName));
-     DecompilerContext.getLogger().startClass(classStruct.qualifiedName);
- 
-     int maxSec = Integer.parseInt(DecompilerContext.getProperty(IFernflowerPreferences.MAX_PROCESSING_METHOD).toString());
-@@ -162,8 +162,9 @@ public class ClassWrapper {
-       StructLocalVariableTableAttribute attr = mt.getLocalVariableAttr();
-       if (attr != null) {
-         // only param names here
--        varProc.setDebugVarNames(attr.getMapParamNames());
-+        varProc.setDebugVarNames(attr.getMapNames());
- 
-+        /*
-         // the rest is here
-         methodWrapper.getOrBuildGraph().iterateExprents(exprent -> {
-           List<Exprent> lst = exprent.getAllExprents(true);
-@@ -179,6 +180,7 @@ public class ClassWrapper {
-             });
-           return 0;
-         });
-+        */
-       }
-     }
-   }
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index 80f024eb8e069cc4d208a9b79dbc7edf67161ec7..fa4b5ed56fa58f2d864ea3acd758a36fa8e23e7a 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-@@ -11,7 +11,13 @@ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
- import org.jetbrains.java.decompiler.modules.code.DeadCodeHelper;
- import org.jetbrains.java.decompiler.modules.decompiler.*;
- import org.jetbrains.java.decompiler.modules.decompiler.deobfuscator.ExceptionDeobfuscator;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.MonitorExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.SynchronizedStatement;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
- import org.jetbrains.java.decompiler.struct.StructClass;
- import org.jetbrains.java.decompiler.struct.StructMethod;
-@@ -125,11 +131,11 @@ public class MethodProcessorRunnable implements Runnable {
-       ExceptionDeobfuscator.insertDummyExceptionHandlerBlocks(graph, mt.getBytecodeVersion());
-     }
- 
--    RootStatement root = DomHelper.parseGraph(graph);
-+    RootStatement root = DomHelper.parseGraph(graph, mt);
- 
-     FinallyProcessor fProc = new FinallyProcessor(md, varProc);
-     while (fProc.iterateGraph(cl, mt, root, graph)) {
--      root = DomHelper.parseGraph(graph);
-+      root = DomHelper.parseGraph(graph, mt);
-     }
- 
-     // remove synchronized exception handler
-@@ -153,15 +159,26 @@ public class MethodProcessorRunnable implements Runnable {
-       stackProc.simplifyStackVars(root, mt, cl);
-       varProc.setVarVersions(root);
-     }
--    while (new PPandMMHelper().findPPandMM(root));
-+    while (new PPandMMHelper(varProc).findPPandMM(root));
- 
-     while (true) {
-       LabelHelper.cleanUpEdges(root);
- 
--      do {
-+      while (true) {
-+        if (EliminateLoopsHelper.eliminateLoops(root, cl)) {
-+          continue;
-+        }
-+
-         MergeHelper.enhanceLoops(root);
-+
-+        if (LoopExtractHelper.extractLoops(root)) {
-+          continue;
-+        }
-+
-+        if (!IfHelper.mergeAllIfs(root)) {
-+          break;
-+        }
-       }
--      while (LoopExtractHelper.extractLoops(root) || IfHelper.mergeAllIfs(root));
- 
-       if (DecompilerContext.getOption(IFernflowerPreferences.IDEA_NOT_NULL_ANNOTATION)) {
-         if (IdeaNotNullHelper.removeHardcodedChecks(root, mt)) {
-@@ -177,6 +194,12 @@ public class MethodProcessorRunnable implements Runnable {
-         continue;
-       }
- 
-+      // this has to be done last so it does not screw up the formation of for loops
-+      if (MergeHelper.makeDoWhileLoops(root)) {
-+        LabelHelper.cleanUpEdges(root);
-+        LabelHelper.identifyLabels(root);
-+      }
-+
-       // initializer may have at most one return point, so no transformation of method exits permitted
-       if (isInitializer || !ExitHelper.condenseExits(root)) {
-         break;
-@@ -192,6 +215,8 @@ public class MethodProcessorRunnable implements Runnable {
- 
-     SecondaryFunctionsHelper.identifySecondaryFunctions(root, varProc);
- 
-+    cleanSynchronizedVar(root);
-+
-     varProc.setVarDefinitions(root);
- 
-     // must be the last invocation, because it makes the statement structure inconsistent
-@@ -215,4 +240,29 @@ public class MethodProcessorRunnable implements Runnable {
-   public boolean isFinished() {
-     return finished;
-   }
-+
-+  public static void cleanSynchronizedVar(Statement stat) {
-+    for (Statement st : stat.getStats()) {
-+      cleanSynchronizedVar(st);
-+    }
-+
-+    if (stat.type == Statement.StatementType.SYNCHRONIZED) {
-+      SynchronizedStatement sync = (SynchronizedStatement)stat;
-+      if (sync.getHeadexprentList().get(0).type == Exprent.EXPRENT_MONITOR) {
-+        MonitorExprent mon = (MonitorExprent)sync.getHeadexprentList().get(0);
-+        for (Exprent e : sync.getFirst().getExprents()) {
-+          if (e.type == Exprent.EXPRENT_ASSIGNMENT) {
-+            AssignmentExprent ass = (AssignmentExprent)e;
-+            if (ass.getLeft().type == Exprent.EXPRENT_VAR) {
-+              VarExprent var = (VarExprent)ass.getLeft();
-+              if (ass.getRight().equals(mon.getValue()) && !var.isVarReferenced(stat.getParent())) {
-+                sync.getFirst().getExprents().remove(e);
-+                break;
-+              }
-+            }
-+          }
-+        }
-+      }
-+    }
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 7d41769adee0974a02e0ef5a0518f9f9e53c8b58..bb2d0f0eb067a92472dcd8d69a0029d15c34c520 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-@@ -22,6 +22,7 @@ import org.jetbrains.java.decompiler.struct.StructField;
- import org.jetbrains.java.decompiler.struct.StructMethod;
- import org.jetbrains.java.decompiler.struct.attr.StructEnclosingMethodAttribute;
- import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
-+import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute.LocalVariable;
- import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
- import org.jetbrains.java.decompiler.util.DotExporter;
-@@ -114,6 +115,7 @@ public class NestedClassProcessor {
-     }
- 
-     Map<VarVersionPair, String> mapNewNames = new HashMap<>();
-+    Map<VarVersionPair, LocalVariable> lvts = new HashMap<>();
- 
-     enclosingMethod.getOrBuildGraph().iterateExprents(exprent -> {
-       List<Exprent> lst = exprent.getAllExprents(true);
-@@ -138,6 +140,7 @@ public class NestedClassProcessor {
- 
-                 if (param.type == Exprent.EXPRENT_VAR) {
-                   mapNewNames.put(varVersion, enclosingMethod.varproc.getVarName(new VarVersionPair((VarExprent)param)));
-+                  lvts.put(varVersion, ((VarExprent)param).getLVT());
-                 }
-               }
-               else {
-@@ -161,8 +164,26 @@ public class NestedClassProcessor {
-     method.setOuterVarNames.addAll(setNewOuterNames);
- 
-     for (Entry<VarVersionPair, String> entry : mapNewNames.entrySet()) {
--      method.varproc.setVarName(entry.getKey(), entry.getValue());
-+      VarVersionPair pair = entry.getKey();
-+      LocalVariable lvt = lvts.get(pair);
-+
-+      method.varproc.setVarName(pair, entry.getValue());
-+      if (lvt != null) {
-+        method.varproc.setVarLVT(pair, lvt);
-+      }
-     }
-+
-+    method.getOrBuildGraph().iterateExprentsDeep(exp -> {
-+      if (exp.type == Exprent.EXPRENT_VAR) {
-+        VarExprent var = (VarExprent)exp;
-+        LocalVariable lv = lvts.get(var.getVarVersionPair());
-+        if (lv != null)
-+          var.setLVT(lv);
-+        else if (mapNewNames.containsKey(var.getVarVersionPair()))
-+          var.setLVT(null);
-+      }
-+      return 0;
-+    });
-   }
- 
-   private static void checkNotFoundClasses(ClassNode root, ClassNode node) {
-@@ -400,6 +421,7 @@ public class NestedClassProcessor {
-       if (method.root != null) { // neither abstract nor native
-         Map<VarVersionPair, String> mapNewNames = new HashMap<>();  // local var names
-         Map<VarVersionPair, VarType> mapNewTypes = new HashMap<>();  // local var types
-+        Map<VarVersionPair, LocalVariable> mapNewLVTs = new HashMap<>(); // local var table entries
- 
-         Map<Integer, VarVersionPair> mapParamsToNewVars = new HashMap<>();
-         if (method.synthParameters != null) {
-@@ -414,15 +436,17 @@ public class NestedClassProcessor {
- 
-               String varName = null;
-               VarType varType = null;
-+              LocalVariable varLVT = null;
- 
-               if (child.type != ClassNode.CLASS_MEMBER) {
-                 varName = enclosingMethod.varproc.getVarName(pair);
-                 varType = enclosingMethod.varproc.getVarType(pair);
-+                varLVT = enclosingMethod.varproc.getVarLVT(pair);
- 
-                 enclosingMethod.varproc.setVarFinal(pair, VarProcessor.VAR_EXPLICIT_FINAL);
-               }
- 
--              if (pair.var == -1 || "this".equals(varName)) {
-+              if (pair.var == -1 || "this".equals(varName) || (varLVT != null && "this".equals(varLVT.getName()))) {
-                 if (parent.simpleName == null) {
-                   // anonymous enclosing class, no access to this
-                   varName = VarExprent.VAR_NAMELESS_ENCLOSURE;
-@@ -430,11 +454,15 @@ public class NestedClassProcessor {
-                 else {
-                   varName = parent.simpleName + ".this";
-                 }
-+                if (varLVT != null) {
-+                  varLVT = varLVT.rename(varName);
-+                }
-                 method.varproc.getThisVars().put(newVar, parent.classStruct.qualifiedName);
-               }
- 
-               mapNewNames.put(newVar, varName);
-               mapNewTypes.put(newVar, varType);
-+              mapNewLVTs.put(newVar, varLVT);
-             }
- 
-             varIndex += md.params[index++].getStackSize();
-@@ -450,17 +478,19 @@ public class NestedClassProcessor {
- 
-             String varName = null;
-             VarType varType = null;
-+            LocalVariable varLVT = null;
- 
-             if (classNode.type != ClassNode.CLASS_MEMBER) {
-               MethodWrapper enclosing_method = classNode.parent.getWrapper().getMethods().getWithKey(classNode.enclosingMethod);
- 
-               varName = enclosing_method.varproc.getVarName(entry.getValue());
-               varType = enclosing_method.varproc.getVarType(entry.getValue());
-+              varLVT = enclosing_method.varproc.getVarLVT(entry.getValue());
- 
-               enclosing_method.varproc.setVarFinal(entry.getValue(), VarProcessor.VAR_EXPLICIT_FINAL);
-             }
- 
--            if (entry.getValue().var == -1 || "this".equals(varName)) {
-+            if (entry.getValue().var == -1 || "this".equals(varName) || (varLVT != null && "this".equals(varLVT.getName()))) {
-               if (classNode.parent.simpleName == null) {
-                 // anonymous enclosing class, no access to this
-                 varName = VarExprent.VAR_NAMELESS_ENCLOSURE;
-@@ -468,11 +498,15 @@ public class NestedClassProcessor {
-               else {
-                 varName = classNode.parent.simpleName + ".this";
-               }
-+              if (varLVT != null) {
-+                varLVT = varLVT.rename(varName);
-+              }
-               method.varproc.getThisVars().put(newVar, classNode.parent.classStruct.qualifiedName);
-             }
- 
-             mapNewNames.put(newVar, varName);
-             mapNewTypes.put(newVar, varType);
-+            mapNewLVTs.put(newVar, varLVT);
- 
-             // hide synthetic field
-             if (classNode == child) { // fields higher up the chain were already handled with their classes
-@@ -491,16 +525,20 @@ public class NestedClassProcessor {
-         for (Entry<VarVersionPair, String> entry : mapNewNames.entrySet()) {
-           VarVersionPair pair = entry.getKey();
-           VarType type = mapNewTypes.get(pair);
-+          LocalVariable lvt = mapNewLVTs.get(pair);
- 
-           method.varproc.setVarName(pair, entry.getValue());
-           if (type != null) {
-             method.varproc.setVarType(pair, type);
-           }
-+          if (lvt != null) {
-+            method.varproc.setVarLVT(pair, lvt);
-+          }
-         }
- 
--        method.getOrBuildGraph().iterateExprents(new DirectGraph.ExprentIterator() {
-+        iterateExprents(method.getOrBuildGraph(), new ExprentIteratorWithReplace() {
-           @Override
--          public int processExprent(Exprent exprent) {
-+          public Exprent processExprent(Exprent exprent) {
-             if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
-               AssignmentExprent assignExpr = (AssignmentExprent)exprent;
-               if (assignExpr.getLeft().type == Exprent.EXPRENT_FIELD) {
-@@ -508,7 +546,7 @@ public class NestedClassProcessor {
-                 String qName = child.classStruct.qualifiedName;
-                 if (fExpr.getClassname().equals(qName) &&  // process this class only
-                     mapFieldsToNewVars.containsKey(InterpreterUtil.makeUniqueKey(qName, fExpr.getName(), fExpr.getDescriptor().descriptorString))) {
--                  return 2;
-+                  return null;
-                 }
-               }
-             }
-@@ -520,13 +558,13 @@ public class NestedClassProcessor {
-               if (invokeExpr.getFuncType() == InvocationExprent.TYPE_INIT) {
-                 // invocation of the super constructor in an anonymous class
-                 child.superInvocation = invokeExpr; // FIXME: save original names of parameters
--                return 2;
-+                return null;
-               }
-             }
- 
--            replaceExprent(exprent);
-+            Exprent ret = replaceExprent(exprent);
- 
--            return 0;
-+            return ret == null ? exprent : ret;
-           }
- 
-           private Exprent replaceExprent(Exprent exprent) {
-@@ -535,7 +573,12 @@ public class NestedClassProcessor {
-               if (mapParamsToNewVars.containsKey(varIndex)) {
-                 VarVersionPair newVar = mapParamsToNewVars.get(varIndex);
-                 method.varproc.getExternalVars().add(newVar);
--                return new VarExprent(newVar.var, method.varproc.getVarType(newVar), method.varproc, exprent.bytecode);
-+                VarExprent ret = new VarExprent(newVar.var, method.varproc.getVarType(newVar), method.varproc, exprent.bytecode);
-+                LocalVariable lvt = method.varproc.getVarLVT(newVar);
-+                if (lvt != null) {
-+                  ret.setLVT(lvt);
-+                }
-+                return ret;
-               }
-             }
-             else if (exprent.type == Exprent.EXPRENT_FIELD) {
-@@ -543,10 +586,15 @@ public class NestedClassProcessor {
-               String key = InterpreterUtil.makeUniqueKey(fExpr.getClassname(), fExpr.getName(), fExpr.getDescriptor().descriptorString);
-               if (mapFieldsToNewVars.containsKey(key)) {
-                 //if(fExpr.getClassname().equals(child.classStruct.qualifiedName) &&
--                //		mapFieldsToNewVars.containsKey(key)) {
-+                //        mapFieldsToNewVars.containsKey(key)) {
-                 VarVersionPair newVar = mapFieldsToNewVars.get(key);
-                 method.varproc.getExternalVars().add(newVar);
--                return new VarExprent(newVar.var, method.varproc.getVarType(newVar), method.varproc, exprent.bytecode);
-+                VarExprent ret = new VarExprent(newVar.var, method.varproc.getVarType(newVar), method.varproc, exprent.bytecode);
-+                LocalVariable lvt = method.varproc.getVarLVT(newVar);
-+                if (lvt != null) {
-+                  ret.setLVT(lvt);
-+                }
-+                return ret;
-               }
-             }
- 
-@@ -911,4 +959,41 @@ public class NestedClassProcessor {
-       return fieldKey.hashCode() + varPair.hashCode();
-     }
-   }
--}
-\ No newline at end of file
-+
-+  private static interface ExprentIteratorWithReplace {
-+    // null - remove exprent
-+    // ret != exprent - replace exprent with ret
-+    Exprent processExprent(Exprent exprent);
-+  }
-+
-+  private static void iterateExprents(DirectGraph graph, ExprentIteratorWithReplace iter) {
-+    LinkedList<DirectNode> stack = new LinkedList<>();
-+    stack.add(graph.first);
-+
-+    HashSet<DirectNode> setVisited = new HashSet<>();
-+
-+    while (!stack.isEmpty()) {
-+
-+      DirectNode node = stack.removeFirst();
-+
-+      if (setVisited.contains(node)) {
-+        continue;
-+      }
-+      setVisited.add(node);
-+
-+      for (int i = 0; i < node.exprents.size(); i++) {
-+        Exprent res = iter.processExprent(node.exprents.get(i));
-+
-+        if (res == null) {
-+          node.exprents.remove(i);
-+          i--;
-+        }
-+        else if (res != node.exprents.get(i)) {
-+          node.exprents.set(i, res);
-+        }
-+      }
-+
-+      stack.addAll(node.successors);
-+    }
-+  }
-+}
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
-index 277e792a2856334970bafe0661582a8c8d09ad5a..ceffabcd6434f5504e7aaf89878abe7012cfcaa5 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
-@@ -12,6 +12,8 @@ import org.jetbrains.java.decompiler.modules.decompiler.decompose.FastExtendedPo
- import org.jetbrains.java.decompiler.modules.decompiler.deobfuscator.IrreducibleCFGDeobfuscator;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.*;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement.StatementType;
-+import org.jetbrains.java.decompiler.struct.StructMethod;
-+import org.jetbrains.java.decompiler.util.DotExporter;
- import org.jetbrains.java.decompiler.util.FastFixedSetFactory;
- import org.jetbrains.java.decompiler.util.FastFixedSetFactory.FastFixedSet;
- import org.jetbrains.java.decompiler.util.VBStyleCollection;
-@@ -190,17 +192,12 @@ public final class DomHelper {
-     return ret;
-   }
- 
--  public static RootStatement parseGraph(ControlFlowGraph graph) {
-+  public static RootStatement parseGraph(ControlFlowGraph graph, StructMethod mt) {
- 
-     RootStatement root = graphToStatement(graph);
- 
-     if (!processStatement(root, new LinkedHashMap<>())) {
--
--      //			try {
--      //				DotExporter.toDotFile(root.getFirst().getStats().get(13), new File("c:\\Temp\\stat1.dot"));
--      //			} catch (Exception ex) {
--      //				ex.printStackTrace();
--      //			}
-+      DotExporter.toDotFile(graph, mt, "parseGraphFail", true);
-       throw new RuntimeException("parsing failure!");
-     }
- 
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..82c960ee29c4babfe77381df3a4a46716c68e401
---- /dev/null
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
-@@ -0,0 +1,199 @@
-+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-+package org.jetbrains.java.decompiler.modules.decompiler;
-+
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
-+import org.jetbrains.java.decompiler.struct.StructClass;
-+
-+import java.util.ArrayList;
-+import java.util.HashMap;
-+import java.util.HashSet;
-+import java.util.List;
-+import java.util.Set;
-+
-+
-+public class EliminateLoopsHelper {
-+
-+  public static boolean eliminateLoops(Statement root, StructClass cl) {
-+
-+    boolean ret = eliminateLoopsRec(root);
-+
-+    if(ret) {
-+      SequenceHelper.condenseSequences(root);
-+
-+      Set<Integer> setReorderedIfs = new HashSet<>();
-+
-+      SimplifyExprentsHelper sehelper = new SimplifyExprentsHelper(false);
-+      while(sehelper.simplifyStackVarsStatement(root, setReorderedIfs, null, cl)) {
-+        SequenceHelper.condenseSequences(root);
-+      }
-+    }
-+
-+    return ret;
-+  }
-+
-+  private static boolean eliminateLoopsRec(Statement stat) {
-+
-+    for (Statement st : stat.getStats()) {
-+      if (eliminateLoopsRec(st)) {
-+        return true;
-+      }
-+    }
-+
-+    if (stat.type == Statement.StatementType.DO && isLoopRedundant((DoStatement)stat)) {
-+      return true;
-+    }
-+
-+    return false;
-+  }
-+
-+  private static boolean isLoopRedundant(DoStatement loop) {
-+
-+    if (loop.getLoopType() != DoStatement.LoopType.DO) {
-+      return false;
-+    }
-+
-+    // get parent loop if exists
-+    Statement parentloop = loop.getParent();
-+    while (parentloop != null && parentloop.type != Statement.StatementType.DO) {
-+      parentloop = parentloop.getParent();
-+    }
-+
-+    if (parentloop == null || parentloop.getBasichead() != loop.getBasichead()) {
-+      return false;
-+    }
-+
-+    // collect relevant break edges
-+    List<StatEdge> lstBreakEdges = new ArrayList<>();
-+    for (StatEdge edge : loop.getLabelEdges()) {
-+      if (edge.getType() == StatEdge.EdgeType.BREAK) { // all break edges are explicit because of LOOP_DO type
-+        lstBreakEdges.add(edge);
-+      }
-+    }
-+
-+
-+    Statement loopcontent = loop.getFirst();
-+
-+    boolean firstok = loopcontent.getAllSuccessorEdges().isEmpty();
-+    if (!firstok) {
-+      StatEdge edge = loopcontent.getAllSuccessorEdges().get(0);
-+      firstok = (edge.closure == loop && edge.getType() == StatEdge.EdgeType.BREAK);
-+      if (firstok) {
-+        lstBreakEdges.remove(edge);
-+      }
-+    }
-+
-+
-+    if (!lstBreakEdges.isEmpty()) {
-+      if (firstok) {
-+
-+        HashMap<Integer, Boolean> statLabeled = new HashMap<>();
-+        List<Statement> lstEdgeClosures = new ArrayList<>();
-+
-+        for (StatEdge edge : lstBreakEdges) {
-+          Statement minclosure = LowBreakHelper.getMinClosure(loopcontent, edge.getSource());
-+          lstEdgeClosures.add(minclosure);
-+        }
-+
-+        int precount = loop.isLabeled() ? 1 : 0;
-+        for (Statement st : lstEdgeClosures) {
-+          if (!statLabeled.containsKey(st.id)) {
-+            boolean btemp = st.isLabeled();
-+            precount += btemp ? 1 : 0;
-+            statLabeled.put(st.id, btemp);
-+          }
-+        }
-+
-+        for (int i = 0; i < lstBreakEdges.size(); i++) {
-+          Statement st = lstEdgeClosures.get(i);
-+          statLabeled.put(st.id, LowBreakHelper.isBreakEdgeLabeled(lstBreakEdges.get(i).getSource(), st) | statLabeled.get(st.id));
-+        }
-+
-+        for (int i = 0; i < lstBreakEdges.size(); i++) {
-+          lstEdgeClosures.set(i, getMaxBreakLift(lstEdgeClosures.get(i), lstBreakEdges.get(i), statLabeled, loop));
-+        }
-+
-+        statLabeled.clear();
-+        for (Statement st : lstEdgeClosures) {
-+          statLabeled.put(st.id, st.isLabeled());
-+        }
-+
-+        for (int i = 0; i < lstBreakEdges.size(); i++) {
-+          Statement st = lstEdgeClosures.get(i);
-+          statLabeled.put(st.id, LowBreakHelper.isBreakEdgeLabeled(lstBreakEdges.get(i).getSource(), st) | statLabeled.get(st.id));
-+        }
-+
-+        long postcount = statLabeled.values().stream().filter(Boolean::booleanValue).count();
-+
-+        if (precount <= postcount) {
-+          return false;
-+        }
-+        else {
-+          for (int i = 0; i < lstBreakEdges.size(); i++) {
-+            lstEdgeClosures.get(i).addLabeledEdge(lstBreakEdges.get(i));
-+          }
-+        }
-+      }
-+      else {
-+        return false;
-+      }
-+    }
-+
-+    eliminateLoop(loop, parentloop);
-+
-+    return true;
-+  }
-+
-+  private static Statement getMaxBreakLift(Statement stat, StatEdge edge, HashMap<Integer, Boolean> statLabeled, Statement max) {
-+
-+    Statement closure = stat;
-+    Statement newclosure = stat;
-+
-+    while ((newclosure = getNextBreakLift(newclosure, edge, statLabeled, max)) != null) {
-+      closure = newclosure;
-+    }
-+
-+    return closure;
-+  }
-+
-+  private static Statement getNextBreakLift(Statement stat, StatEdge edge, HashMap<Integer, Boolean> statLabeled, Statement max) {
-+
-+    Statement closure = stat.getParent();
-+
-+    while (closure != null && closure != max && !closure.containsStatementStrict(edge.getDestination())) {
-+
-+      boolean edge_labeled = LowBreakHelper.isBreakEdgeLabeled(edge.getSource(), closure);
-+      boolean stat_labeled = statLabeled.containsKey(closure.id) ? statLabeled.get(closure.id) : closure.isLabeled();
-+
-+      if (stat_labeled || !edge_labeled) {
-+        return closure;
-+      }
-+
-+      closure = closure.getParent();
-+    }
-+
-+    return null;
-+  }
-+
-+  private static void eliminateLoop(Statement loop, Statement parentloop) {
-+
-+    // remove the last break edge, if exists
-+    Statement loopcontent = loop.getFirst();
-+    if (!loopcontent.getSuccessorEdges(StatEdge.EdgeType.BREAK).isEmpty()) {
-+      loopcontent.removeSuccessor(loopcontent.getSuccessorEdges(StatEdge.EdgeType.BREAK).get(0));
-+    }
-+
-+    // move continue edges to the parent loop
-+    List<StatEdge> lst = new ArrayList<>(loop.getLabelEdges());
-+    for (StatEdge edge : lst) {
-+      loop.removePredecessor(edge);
-+      edge.getSource().changeEdgeNode(StatEdge.EdgeDirection.FORWARD, edge, parentloop);
-+      parentloop.addPredecessor(edge);
-+
-+      parentloop.addLabeledEdge(edge);
-+    }
-+
-+    // replace loop with its content
-+    loop.getParent().replaceStatement(loop, loopcontent);
-+  }
-+}
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
-index c5ccfd1a659461646494c3796528767d0ba089c8..ef96a3f610c7fe1af746aa1d8663ba7adb530d8b 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
-@@ -175,7 +175,7 @@ public final class ExitHelper {
-   private static Statement isExitEdge(StatEdge edge) {
-     Statement dest = edge.getDestination();
- 
--    if (edge.getType() == EdgeType.BREAK && dest.type == StatementType.BASIC_BLOCK && edge.explicit && (edge.labeled || isOnlyEdge(edge))) {
-+    if (edge.getType() == EdgeType.BREAK && dest.type == StatementType.BASIC_BLOCK && edge.explicit && (edge.labeled || isOnlyEdge(edge)) && edge.canInline) {
-       List<Exprent> data = dest.getExprents();
- 
-       if (data != null && data.size() == 1) {
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-index 3b10e5b29ff9e344815592e533b6b04891fe294c..a242aa9e74698b14e20e27d655a3c8ae141ee2f5 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-@@ -315,7 +315,9 @@ public class ExprProcessor implements CodeConstants {
-         case opc_fload:
-         case opc_dload:
-         case opc_aload:
--          pushEx(stack, exprList, new VarExprent(instr.operand(0), varTypes[instr.opcode - opc_iload], varProcessor, offsets));
-+          VarExprent varExprent = new VarExprent(instr.operand(0), varTypes[instr.opcode - opc_iload], varProcessor, offsets);
-+          varProcessor.findLVT(varExprent, offset + instr.length);
-+          pushEx(stack, exprList, varExprent);
-           break;
-         case opc_iaload:
-         case opc_laload:
-@@ -342,6 +344,7 @@ public class ExprProcessor implements CodeConstants {
-             offsets.set(offset, offset + instr.length);
-           }
-           VarExprent left = new VarExprent(varIndex, varTypes[instr.opcode - opc_istore], varProcessor, offsets);
-+          varProcessor.findLVT(left, offset + instr.length);
-           exprList.add(new AssignmentExprent(left, value, offsets));
-           break;
-         }
-@@ -404,6 +407,7 @@ public class ExprProcessor implements CodeConstants {
-           break;
-         case opc_iinc: {
-           VarExprent varExpr = new VarExprent(instr.operand(0), VarType.VARTYPE_INT, varProcessor, offsets);
-+          varProcessor.findLVT(varExpr, offset + instr.length);
-           int type = instr.operand(1) < 0 ? FunctionExprent.FUNCTION_SUB : FunctionExprent.FUNCTION_ADD;
-           List<Exprent> operands = Arrays.asList(varExpr.copy(), new ConstExprent(VarType.VARTYPE_INT, Math.abs(instr.operand(1)), null));
-           exprList.add(new AssignmentExprent(varExpr, new FunctionExprent(type, operands, offsets), offsets));
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
-index 271ab6a217c507d2fae72fb8aa2f38ebd054c80a..1f648ba330f9728c807c04f79d22894b03334f66 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
-@@ -121,6 +121,9 @@ public final class InlineSingleBlockHelper {
-       StatEdge edge = lst.get(0);
- 
-       if (sameCatchRanges(edge)) {
-+        if (!edge.canInline) {
-+          return false; //Dirty hack, but lets do it!
-+        }
-         if (!edge.explicit) {
-           for (int i = index; i < seq.getStats().size(); i++) {
-             if (!noExitLabels(seq.getStats().get(i), seq)) {
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
-index c4fd9dd28fa7b587cf696187312f2988588ba02b..1743e96a47775011c65a10cddf5a7226ef656473 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
-@@ -12,6 +12,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement.Statemen
- 
- import java.util.ArrayList;
- import java.util.Arrays;
-+import java.util.List;
- import java.util.Set;
- 
- 
-@@ -67,16 +68,33 @@ public final class LoopExtractHelper {
-       return false;
-     }
- 
-+    List<Statement> stats = new ArrayList<>();
-     for (StatEdge edge : stat.getLabelEdges()) {
-       if (edge.getType() != EdgeType.CONTINUE && edge.getDestination().type != StatementType.DUMMY_EXIT) {
-+        if (edge.getType() == EdgeType.BREAK && isExternStatement(stat, edge.getSource(), edge.getSource())) {
-+          stats.add(edge.getSource());
-+        }
-+        else {
-+          return false;
-+        }
-+      }
-+    }
-+
-+    if (stats.size() > 0) { // In this case prioritize first to help the Loop enhancer
-+      if (stat.getParent().getStats().getLast() != stat) {
-         return false;
-       }
-     }
- 
--    return extractLastIf(stat) || extractFirstIf(stat);
-+    if (!extractFirstIf(stat, stats)) {
-+      return extractLastIf(stat, stats);
-+    }
-+    else {
-+      return true;
-+    }
-   }
- 
--  private static boolean extractLastIf(DoStatement stat) {
-+  private static boolean extractLastIf(DoStatement stat, List<Statement> stats) {
- 
-     // search for an if condition at the end of the loop
-     Statement last = stat.getFirst();
-@@ -97,6 +115,19 @@ public final class LoopExtractHelper {
- 
-           if (set.isEmpty()) { // no direct continues in a do{}while loop
-             if (isExternStatement(stat, ifstat, ifstat)) {
-+              Statement first = stat.getFirst();
-+              while (first.type == Statement.StatementType.SEQUENCE) {
-+                first = first.getFirst();
-+              }
-+              if (first.type == Statement.StatementType.DO && ((DoStatement)first).getLoopType() == DoStatement.LoopType.DO) {
-+                return false;
-+              }
-+
-+              for (Statement s : stats) {
-+                if (!ifstat.containsStatement(s)) {
-+                  return false;
-+                }
-+              }
-               extractIfBlock(stat, lastif);
-               return true;
-             }
-@@ -107,7 +138,7 @@ public final class LoopExtractHelper {
-     return false;
-   }
- 
--  private static boolean extractFirstIf(DoStatement stat) {
-+  private static boolean extractFirstIf(DoStatement stat, List<Statement> stats) {
- 
-     // search for an if condition at the entrance of the loop
-     Statement first = stat.getFirst();
-@@ -125,6 +156,11 @@ public final class LoopExtractHelper {
-           Statement ifstat = firstif.getIfstat();
- 
-           if (isExternStatement(stat, ifstat, ifstat)) {
-+            for (Statement s : stats) {
-+              if (!ifstat.containsStatement(s)) {
-+                return false;
-+              }
-+            }
-             extractIfBlock(stat, firstif);
-             return true;
-           }
-@@ -185,5 +221,10 @@ public final class LoopExtractHelper {
-         loop.addPredecessor(edge);
-       }
-     }
-+
-+    List<StatEdge> link = target.getPredecessorEdges(StatEdge.EdgeType.BREAK);
-+    if (link.size() == 1) {
-+      link.get(0).canInline = false;
-+    }
-   }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LowBreakHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LowBreakHelper.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..04f0a2768d2a943475df28a17389407b3dad7a48
---- /dev/null
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LowBreakHelper.java
-@@ -0,0 +1,194 @@
-+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-+package org.jetbrains.java.decompiler.modules.decompiler;
-+
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.SynchronizedStatement;
-+
-+import java.util.List;
-+
-+public class LowBreakHelper {
-+
-+  public static void lowBreakLabels(Statement root) {
-+
-+    lowBreakLabelsRec(root);
-+
-+    liftBreakLabels(root);
-+  }
-+
-+  private static void lowBreakLabelsRec(Statement stat) {
-+
-+    while (true) {
-+
-+      boolean found = false;
-+
-+      for (StatEdge edge : stat.getLabelEdges()) {
-+        if (edge.getType() == StatEdge.EdgeType.BREAK) {
-+          Statement minclosure = getMinClosure(stat, edge.getSource());
-+          if (minclosure != stat) {
-+            minclosure.addLabeledEdge(edge);
-+            edge.labeled = isBreakEdgeLabeled(edge.getSource(), minclosure);
-+            found = true;
-+            break;
-+          }
-+        }
-+      }
-+
-+      if (!found) {
-+        break;
-+      }
-+    }
-+
-+    for (Statement st : stat.getStats()) {
-+      lowBreakLabelsRec(st);
-+    }
-+  }
-+
-+  public static boolean isBreakEdgeLabeled(Statement source, Statement closure) {
-+
-+    if (closure.type == Statement.StatementType.DO || closure.type == Statement.StatementType.SWITCH) {
-+
-+      Statement parent = source.getParent();
-+
-+      if (parent == closure) {
-+        return false;
-+      }
-+      else {
-+        return isBreakEdgeLabeled(parent, closure) ||
-+               (parent.type == Statement.StatementType.DO || parent.type == Statement.StatementType.SWITCH);
-+      }
-+    }
-+    else {
-+      return true;
-+    }
-+  }
-+
-+  public static Statement getMinClosure(Statement closure, Statement source) {
-+
-+    while (true) {
-+
-+      Statement newclosure = null;
-+
-+      switch (closure.type) {
-+        case SEQUENCE:
-+          Statement last = closure.getStats().getLast();
-+
-+          if (isOkClosure(closure, source, last)) {
-+            newclosure = last;
-+          }
-+          break;
-+        case IF:
-+          IfStatement ifclosure = (IfStatement)closure;
-+          if (isOkClosure(closure, source, ifclosure.getIfstat())) {
-+            newclosure = ifclosure.getIfstat();
-+          }
-+          else if (isOkClosure(closure, source, ifclosure.getElsestat())) {
-+            newclosure = ifclosure.getElsestat();
-+          }
-+          break;
-+        case TRY_CATCH:
-+          for (Statement st : closure.getStats()) {
-+            if (isOkClosure(closure, source, st)) {
-+              newclosure = st;
-+              break;
-+            }
-+          }
-+          break;
-+        case SYNCHRONIZED:
-+          Statement body = ((SynchronizedStatement)closure).getBody();
-+
-+          if (isOkClosure(closure, source, body)) {
-+            newclosure = body;
-+          }
-+      }
-+
-+      if (newclosure == null) {
-+        break;
-+      }
-+
-+      closure = newclosure;
-+    }
-+
-+    return closure;
-+  }
-+
-+  private static boolean isOkClosure(Statement closure, Statement source, Statement stat) {
-+
-+    boolean ok = false;
-+
-+    if (stat != null && stat.containsStatementStrict(source)) {
-+
-+      List<StatEdge> lst = stat.getAllSuccessorEdges();
-+
-+      ok = lst.isEmpty();
-+      if (!ok) {
-+        StatEdge edge = lst.get(0);
-+        ok = (edge.closure == closure && edge.getType() == StatEdge.EdgeType.BREAK);
-+      }
-+    }
-+
-+    return ok;
-+  }
-+
-+
-+  private static void liftBreakLabels(Statement stat) {
-+
-+    for (Statement st : stat.getStats()) {
-+      liftBreakLabels(st);
-+    }
-+
-+
-+    while (true) {
-+
-+      boolean found = false;
-+
-+      for (StatEdge edge : stat.getLabelEdges()) {
-+        if (edge.explicit && edge.labeled && edge.getType() == StatEdge.EdgeType.BREAK) {
-+
-+          Statement newclosure = getMaxBreakLift(stat, edge);
-+
-+          if (newclosure != null) {
-+            newclosure.addLabeledEdge(edge);
-+            edge.labeled = isBreakEdgeLabeled(edge.getSource(), newclosure);
-+
-+            found = true;
-+            break;
-+          }
-+        }
-+      }
-+
-+      if (!found) {
-+        break;
-+      }
-+    }
-+  }
-+
-+  private static Statement getMaxBreakLift(Statement stat, StatEdge edge) {
-+
-+    Statement closure = null;
-+    Statement newclosure = stat;
-+
-+    while ((newclosure = getNextBreakLift(newclosure, edge)) != null) {
-+      closure = newclosure;
-+    }
-+
-+    return closure;
-+  }
-+
-+  private static Statement getNextBreakLift(Statement stat, StatEdge edge) {
-+
-+    Statement closure = stat.getParent();
-+
-+    while (closure != null && !closure.containsStatementStrict(edge.getDestination())) {
-+
-+      boolean labeled = isBreakEdgeLabeled(edge.getSource(), closure);
-+      if (closure.isLabeled() || !labeled) {
-+        return closure;
-+      }
-+
-+      closure = closure.getParent();
-+    }
-+
-+    return null;
-+  }
-+}
-\ No newline at end of file
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-index bbd7bd0cb42057638e765c5bb675b8d30b9b6796..9909e894e22fc8c19e05fae82b69db065b3be72d 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-@@ -5,8 +5,13 @@ import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
- import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
- import org.jetbrains.java.decompiler.modules.decompiler.StatEdge.EdgeType;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.ArrayExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.IfExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.*;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement.LoopType;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement.StatementType;
-@@ -47,15 +52,20 @@ public final class MergeHelper {
- 
-         // identify a while loop
-         if (matchWhile(stat)) {
--          // identify a for loop - subtype of while
--          matchFor(stat);
-+          if (!matchForEach(stat)) {
-+            matchFor(stat);
-+          }
-         }
-         else {
-           // identify a do{}while loop
--          matchDoWhile(stat);
-+          //matchDoWhile(stat);
-+        }
-+      }
-+      case WHILE -> {
-+        if (!matchForEach(stat)) {
-+          matchFor(stat);
-         }
-       }
--      case WHILE -> matchFor(stat);
-     }
- 
-     return (stat.getLoopType() != oldLoop);
-@@ -145,13 +155,14 @@ public final class MergeHelper {
-         if (firstif.iftype == IfStatement.IFTYPE_IF) {
-           if (firstif.getIfstat() == null) {
-             StatEdge ifedge = firstif.getIfEdge();
--            if (isDirectPath(stat, ifedge.getDestination())) {
-+
-+            if (isDirectPath(stat, ifedge.getDestination()) || addContinueOrBreak(stat, ifedge)) {
-               // exit condition identified
-               stat.setLoopType(LoopType.WHILE);
- 
-               // negate condition (while header)
-               IfExprent ifexpr = (IfExprent)firstif.getHeadexprent().copy();
--              ifexpr.negateIf();
-+                ifexpr.negateIf();
- 
-               if (stat.getConditionExprent() != null) {
-                 ifexpr.getCondition().addBytecodeOffsets(stat.getConditionExprent().bytecode);
-@@ -189,7 +200,7 @@ public final class MergeHelper {
-               return true;
-             }
-           }
--          else {
-+          //else { // fix infinite loops
-             StatEdge elseedge = firstif.getAllSuccessorEdges().get(0);
-             if (isDirectPath(stat, elseedge.getDestination())) {
-               // exit condition identified
-@@ -243,7 +254,7 @@ public final class MergeHelper {
- 
-               return true;
-             }
--          }
-+          //}
-         }
-       }
-     }
-@@ -328,6 +339,8 @@ public final class MergeHelper {
-         }
-         else {
-           preData = current.getNeighbours(EdgeType.REGULAR, EdgeDirection.BACKWARD).get(0);
-+          // we're not a basic block, so we can't dive inside for exprents
-+          if (preData.type != Statement.StatementType.BASIC_BLOCK) break;
-           preData = getLastDirectData(preData);
-           if (preData != null && !preData.getExprents().isEmpty()) {
-             initDoExprent = preData.getExprents().get(preData.getExprents().size() - 1);
-@@ -366,12 +379,16 @@ public final class MergeHelper {
-       stat.setIncExprent(exp);
-     }
- 
--    if (lastData.getExprents().isEmpty()) {
--      List<StatEdge> lst = lastData.getAllSuccessorEdges();
-+    cleanEmptyStatements(stat, lastData);
-+  }
-+
-+  private static void cleanEmptyStatements(DoStatement dostat, Statement stat) {
-+    if (stat != null && stat.getExprents().isEmpty()) {
-+      List<StatEdge> lst = stat.getAllSuccessorEdges();
-       if (!lst.isEmpty()) {
--        lastData.removeSuccessor(lst.get(0));
-+        stat.removeSuccessor(lst.get(0));
-       }
--      removeLastEmptyStatement(stat, lastData);
-+      removeLastEmptyStatement(dostat, stat);
-     }
-   }
- 
-@@ -404,14 +421,346 @@ public final class MergeHelper {
-       return stat;
-     }
- 
--    if (stat.type == StatementType.SEQUENCE) {
--      for (int i = stat.getStats().size() - 1; i >= 0; i--) {
--        Statement tmp = getLastDirectData(stat.getStats().get(i));
--        if (tmp == null || !tmp.getExprents().isEmpty()) {
--          return tmp;
-+    for (int i = stat.getStats().size() - 1; i >= 0; i--) {
-+      Statement tmp = getLastDirectData(stat.getStats().get(i));
-+      if (tmp == null || !tmp.getExprents().isEmpty()) {
-+        return tmp;
-+      }
-+    }
-+    return null;
-+  }
-+
-+  private static boolean matchForEach(DoStatement stat) {
-+    AssignmentExprent firstDoExprent = null;
-+    AssignmentExprent[] initExprents = new AssignmentExprent[3];
-+    Statement firstData = null, preData = null, lastData = null;
-+    Exprent lastExprent = null;
-+
-+    // search for an initializing exprent
-+    Statement current = stat;
-+    while (true) {
-+      Statement parent = current.getParent();
-+      if (parent == null) {
-+        break;
-+      }
-+
-+      if (parent.type == Statement.StatementType.SEQUENCE) {
-+        if (current == parent.getFirst()) {
-+          current = parent;
-+        }
-+        else {
-+          preData = current.getNeighbours(StatEdge.EdgeType.REGULAR, StatEdge.EdgeDirection.BACKWARD).get(0);
-+          preData = getLastDirectData(preData);
-+          if (preData != null && !preData.getExprents().isEmpty()) {
-+            int size = preData.getExprents().size();
-+            for (int x = 0; x < initExprents.length; x++) {
-+              if (size > x) {
-+                 Exprent exprent = preData.getExprents().get(size - 1 - x);
-+                 if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
-+                   initExprents[x] = (AssignmentExprent)exprent;
-+                 }
-+              }
-+            }
-+          }
-+          break;
-         }
-       }
-+      else {
-+        break;
-+      }
-+    }
-+
-+    firstData = getFirstDirectData(stat.getFirst());
-+    if (firstData != null && firstData.getExprents().get(0).type == Exprent.EXPRENT_ASSIGNMENT) {
-+      firstDoExprent = (AssignmentExprent)firstData.getExprents().get(0);
-+    }
-+    lastData = getLastDirectData(stat.getFirst());
-+    if (lastData != null && !lastData.getExprents().isEmpty()) {
-+      lastExprent = lastData.getExprents().get(lastData.getExprents().size() - 1);
-+    }
-+
-+    if (stat.getLoopType() == DoStatement.LoopType.WHILE && initExprents[0] != null && firstDoExprent != null) {
-+      if (isIteratorCall(initExprents[0].getRight())) {
-+
-+        //Streams mimic Iterable but arnt.. so explicitly disallow their enhancements
-+        //TODO: Check inheritance for Iterable instead of just names?
-+        InvocationExprent invc = (InvocationExprent)getUncast((initExprents[0]).getRight());
-+        if (invc.getClassName().contains("java/util/stream")) {
-+          return false;
-+        }
-+
-+        if (!isHasNextCall(drillNots(stat.getConditionExprent())) ||
-+            firstDoExprent.type != Exprent.EXPRENT_ASSIGNMENT) {
-+          return false;
-+        }
-+
-+        AssignmentExprent ass = firstDoExprent;
-+        if ((!isNextCall(ass.getRight()) && !isNextUnboxing(ass.getRight())) || ass.getLeft().type != Exprent.EXPRENT_VAR) {
-+          return false;
-+        }
-+
-+        InvocationExprent next = (InvocationExprent)getUncast(ass.getRight());
-+        if (isNextUnboxing(next))
-+          next = (InvocationExprent)getUncast(next.getInstance());
-+        InvocationExprent hnext = (InvocationExprent)getUncast(drillNots(stat.getConditionExprent()));
-+        if (next.getInstance().type != Exprent.EXPRENT_VAR ||
-+            hnext.getInstance().type != Exprent.EXPRENT_VAR ||
-+          ((VarExprent)initExprents[0].getLeft()).isVarReferenced(stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
-+          return false;
-+        }
-+
-+        InvocationExprent holder = (InvocationExprent)(initExprents[0]).getRight();
-+
-+        initExprents[0].getBytecodeRange(holder.getInstance().bytecode);
-+        holder.getBytecodeRange(holder.getInstance().bytecode);
-+        firstDoExprent.getBytecodeRange(ass.getLeft().bytecode);
-+        ass.getRight().getBytecodeRange(ass.getLeft().bytecode);
-+        if (stat.getIncExprent() != null) {
-+          stat.getIncExprent().getBytecodeRange(holder.getInstance().bytecode);
-+        }
-+        if (stat.getInitExprent() != null) {
-+          stat.getInitExprent().getBytecodeRange(ass.getLeft().bytecode);
-+        }
-+
-+        stat.setLoopType(DoStatement.LoopType.FOREACH);
-+        stat.setInitExprent(ass.getLeft());
-+        stat.setIncExprent(holder.getInstance());
-+        preData.getExprents().remove(initExprents[0]);
-+        firstData.getExprents().remove(firstDoExprent);
-+
-+        if (initExprents[1] != null && initExprents[1].getLeft().type == Exprent.EXPRENT_VAR &&
-+            holder.getInstance().type == Exprent.EXPRENT_VAR) {
-+          VarExprent copy = (VarExprent)initExprents[1].getLeft();
-+          VarExprent inc = (VarExprent)holder.getInstance();
-+          if (copy.getIndex() == inc.getIndex() && copy.getVersion() == inc.getVersion() &&
-+              !inc.isVarReferenced(stat.getTopParent(), copy) && !isNextCall(initExprents[1].getRight())) {
-+            preData.getExprents().remove(initExprents[1]);
-+            initExprents[1].getBytecodeRange(initExprents[1].getRight().bytecode);
-+            stat.getIncExprent().getBytecodeRange(initExprents[1].getRight().bytecode);
-+            stat.setIncExprent(initExprents[1].getRight());
-+          }
-+        }
-+
-+        return true;
-+      }
-+      else if (initExprents[1] != null) {
-+        if (firstDoExprent.getRight().type != Exprent.EXPRENT_ARRAY || firstDoExprent.getLeft().type != Exprent.EXPRENT_VAR) {
-+          return false;
-+        }
-+
-+        if (lastExprent == null || lastExprent.type != Exprent.EXPRENT_FUNCTION) {
-+          return false;
-+        }
-+
-+        if (initExprents[0].getRight().type != Exprent.EXPRENT_CONST ||
-+            initExprents[1].getRight().type != Exprent.EXPRENT_FUNCTION ||
-+            stat.getConditionExprent().type != Exprent.EXPRENT_FUNCTION) {
-+          return false;
-+        }
-+
-+        //FunctionExprent funcCond  = (FunctionExprent)drillNots(stat.getConditionExprent()); //TODO: Verify this is counter < copy.length
-+        FunctionExprent funcRight = (FunctionExprent)initExprents[1].getRight();
-+        FunctionExprent funcInc   = (FunctionExprent)lastExprent;
-+        ArrayExprent    arr       = (ArrayExprent)firstDoExprent.getRight();
-+        int incType = funcInc.getFuncType();
-+
-+        if (funcRight.getFuncType() != FunctionExprent.FUNCTION_ARRAY_LENGTH ||
-+            (incType != FunctionExprent.FUNCTION_PPI && incType != FunctionExprent.FUNCTION_IPP) ||
-+            arr.getIndex().type != Exprent.EXPRENT_VAR ||
-+            arr.getArray().type != Exprent.EXPRENT_VAR) {
-+            return false;
-+        }
-+
-+        VarExprent index = (VarExprent)arr.getIndex();
-+        VarExprent array = (VarExprent)arr.getArray();
-+        VarExprent counter = (VarExprent)funcInc.getLstOperands().get(0);
-+
-+        if (counter.getIndex() != index.getIndex() ||
-+            counter.getVersion() != index.getVersion()) {
-+          return false;
-+        }
-+
-+        if (counter.isVarReferenced(stat.getFirst(), index)) {
-+          return false;
-+        }
-+
-+        funcRight.getLstOperands().get(0).addBytecodeOffsets(initExprents[0].bytecode);
-+        funcRight.getLstOperands().get(0).addBytecodeOffsets(initExprents[1].bytecode);
-+        funcRight.getLstOperands().get(0).addBytecodeOffsets(lastExprent.bytecode);
-+        firstDoExprent.getLeft().addBytecodeOffsets(firstDoExprent.bytecode);
-+        firstDoExprent.getLeft().addBytecodeOffsets(initExprents[0].bytecode);
-+
-+        stat.setLoopType(DoStatement.LoopType.FOREACH);
-+        stat.setInitExprent(firstDoExprent.getLeft());
-+        stat.setIncExprent(funcRight.getLstOperands().get(0));
-+        preData.getExprents().remove(initExprents[0]);
-+        preData.getExprents().remove(initExprents[1]);
-+        firstData.getExprents().remove(firstDoExprent);
-+        lastData.getExprents().remove(lastExprent);
-+
-+        if (initExprents[2] != null && initExprents[2].getLeft().type == Exprent.EXPRENT_VAR) {
-+          VarExprent copy = (VarExprent)initExprents[2].getLeft();
-+          if (copy.getIndex() == array.getIndex() && copy.getVersion() == array.getVersion()) {
-+            preData.getExprents().remove(initExprents[2]);
-+            initExprents[2].getRight().addBytecodeOffsets(initExprents[2].bytecode);
-+            initExprents[2].getRight().addBytecodeOffsets(stat.getIncExprent().bytecode);
-+            stat.setIncExprent(initExprents[2].getRight());
-+          }
-+        }
-+
-+        return true;
-+      }
-+    }
-+
-+    //cleanEmptyStatements(stat, firstData); //TODO: Look into this and see what it does...
-+
-+    return false;
-+  }
-+
-+  private static Exprent drillNots(Exprent exp) {
-+    while (true) {
-+      if (exp.type == Exprent.EXPRENT_FUNCTION) {
-+        FunctionExprent fun = (FunctionExprent)exp;
-+        if (fun.getFuncType() == FunctionExprent.FUNCTION_BOOL_NOT) {
-+          exp = fun.getLstOperands().get(0);
-+        }
-+        else if (fun.getFuncType() == FunctionExprent.FUNCTION_EQ ||
-+                 fun.getFuncType() == FunctionExprent.FUNCTION_NE) {
-+          return fun.getLstOperands().get(0);
-+        }
-+        else {
-+          return exp;
-+        }
-+      }
-+      else {
-+        return exp;
-+      }
-+    }
-+  }
-+
-+  private static Statement getFirstDirectData(Statement stat) {
-+    if (stat.getExprents() != null && !stat.getExprents().isEmpty()) {
-+      return stat;
-+    }
-+
-+    for (Statement tmp : stat.getStats()) {
-+      Statement ret = getFirstDirectData(tmp);
-+      if (ret != null) {
-+        return ret;
-+      }
-+    }
-+    return null;
-+  }
-+
-+  private static Exprent getUncast(Exprent exp) {
-+    if (exp.type == Exprent.EXPRENT_FUNCTION) {
-+      FunctionExprent func = (FunctionExprent)exp;
-+      if (func.getFuncType() == FunctionExprent.FUNCTION_CAST) {
-+        return getUncast(func.getLstOperands().get(0));
-+      }
-+    }
-+    return exp;
-+  }
-+
-+  private static InvocationExprent asInvocationExprent(Exprent exp) {
-+    exp = getUncast(exp);
-+    if (exp.type == Exprent.EXPRENT_INVOCATION) {
-+      return (InvocationExprent) exp;
-     }
-     return null;
-   }
--}
-\ No newline at end of file
-+
-+  private static boolean isIteratorCall(Exprent exp) {
-+    final InvocationExprent iexp = asInvocationExprent(exp);
-+    if (iexp == null) {
-+      return false;
-+    }
-+    final org.jetbrains.java.decompiler.struct.gen.MethodDescriptor descriptor = iexp.getDescriptor();
-+    if (!DecompilerContext.getStructContext().instanceOf(descriptor.ret.getValue(), "java/util/Iterator")) {
-+      return false;
-+    }
-+    final String name = iexp.getName();
-+    return "iterator".equals(name) ||
-+           "listIterator".equals(name);
-+  }
-+
-+  private static boolean isHasNextCall(Exprent exp) {
-+    final InvocationExprent iexp = asInvocationExprent(exp);
-+    if (iexp == null) {
-+      return false;
-+    }
-+    if (!DecompilerContext.getStructContext().instanceOf(iexp.getClassName(), "java/util/Iterator")) {
-+      return false;
-+    }
-+    return "hasNext".equals(iexp.getName()) && "()Z".equals(iexp.getStringDescriptor());
-+  }
-+
-+  private static boolean isNextCall(Exprent exp) {
-+    final InvocationExprent iexp = asInvocationExprent(exp);
-+    if (iexp == null) {
-+      return false;
-+    }
-+    if (!DecompilerContext.getStructContext().instanceOf(iexp.getClassName(), "java/util/Iterator")) {
-+      return false;
-+    }
-+    return "next".equals(iexp.getName()) && "()Ljava/lang/Object;".equals(iexp.getStringDescriptor());
-+  }
-+
-+  private static boolean isNextUnboxing(Exprent exprent) {
-+    Exprent exp = getUncast(exprent);
-+    if (exp.type != Exprent.EXPRENT_INVOCATION)
-+      return false;
-+    InvocationExprent inv = (InvocationExprent)exp;
-+    return inv.isUnboxingCall() && isNextCall(inv.getInstance());
-+  }
-+
-+  public static boolean makeDoWhileLoops(RootStatement root) {
-+    if (makeDoWhileRec(root)) {
-+      SequenceHelper.condenseSequences(root);
-+      return true;
-+    }
-+    return false;
-+  }
-+
-+  private static boolean makeDoWhileRec(Statement stat) {
-+    boolean ret = false;
-+
-+    for (Statement st : stat.getStats()) {
-+      ret |= makeDoWhileRec(st);
-+    }
-+
-+    if (stat.type == Statement.StatementType.DO) {
-+      DoStatement dostat = (DoStatement)stat;
-+      if (dostat.getLoopType() == DoStatement.LoopType.DO) {
-+        matchDoWhile(dostat);
-+        ret |= dostat.getLoopType() != DoStatement.LoopType.DO;
-+      }
-+    }
-+
-+    return ret;
-+  }
-+
-+  private static boolean addContinueOrBreak(DoStatement stat, StatEdge ifedge) {
-+    Statement outer = stat.getParent();
-+    while (outer != null && outer.type != Statement.StatementType.SWITCH && outer.type != Statement.StatementType.DO) {
-+      outer = outer.getParent();
-+    }
-+
-+    if (outer != null && (outer.type == Statement.StatementType.SWITCH || ((DoStatement)outer).getLoopType() != DoStatement.LoopType.DO)) {
-+      Statement parent = stat.getParent();
-+      if (parent.type != Statement.StatementType.SEQUENCE || parent.getStats().getLast().equals(stat)) {
-+        // need to insert a break or continue after the loop
-+        if (ifedge.getDestination().equals(outer)) {
-+          stat.addSuccessor(new StatEdge(StatEdge.EdgeType.CONTINUE, stat, ifedge.getDestination(), outer));
-+          return true;
-+        }
-+        else if (MergeHelper.isDirectPath(outer, ifedge.getDestination())) {
-+          stat.addSuccessor(new StatEdge(StatEdge.EdgeType.BREAK, stat, ifedge.getDestination(), outer));
-+          return true;
-+        }
-+      }
-+    }
-+
-+    return false;
-+  }
-+}
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
-index 9d0ec7c864030386838efd4952da1e999ccd967e..81b4c480810a2f74388a4626a4dc0c2bfc523365 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
-@@ -5,19 +5,31 @@ import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph;
- import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectNode;
- import org.jetbrains.java.decompiler.modules.decompiler.sforms.FlattenStatementsHelper;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
-+import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
-+import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
- 
-+import java.util.HashMap;
- import java.util.HashSet;
- import java.util.LinkedList;
- import java.util.List;
-+import java.util.Map;
-+import java.util.Objects;
- 
- public class PPandMMHelper {
- 
-   private boolean exprentReplaced;
-+  private VarProcessor varProc;
-+  private Map<VarVersionPair, VarVersionPair> remaps = new HashMap<>();
-+
-+  public PPandMMHelper(VarProcessor varProc) {
-+    this.varProc = varProc;
-+  }
- 
-   public boolean findPPandMM(RootStatement root) {
- 
-@@ -45,6 +57,8 @@ public class PPandMMHelper {
-       stack.addAll(node.successors);
-     }
- 
-+    updateVersions(dgraph);
-+
-     return res;
-   }
- 
-@@ -120,13 +134,18 @@ public class PPandMMHelper {
-             Exprent left = as.getLeft();
- 
-             VarType condtype = econd.getExprType();
--            if (left.equals(econd) && (midlayer == null || midlayer.equals(condtype))) {
-+            if (exprsEqual(left, econd) && (midlayer == null || midlayer.equals(condtype))) {
-               FunctionExprent ret = new FunctionExprent(
-                 func.getFuncType() == FunctionExprent.FUNCTION_ADD ? FunctionExprent.FUNCTION_PPI : FunctionExprent.FUNCTION_MMI,
-                 econd, func.bytecode);
-               ret.setImplicitType(condtype);
- 
-               exprentReplaced = true;
-+
-+              if (!left.equals(econd)) {
-+                remaps.put(new VarVersionPair((VarExprent)left), new VarVersionPair((VarExprent)econd));
-+              }
-+
-               return ret;
-             }
-           }
-@@ -136,4 +155,48 @@ public class PPandMMHelper {
- 
-     return null;
-   }
-+
-+  private boolean exprsEqual(Exprent e1, Exprent e2) {
-+    if (e1 == e2) return true;
-+    if (e1 == null || e2 == null) return false;
-+    if (e1.type == Exprent.EXPRENT_VAR) {
-+      return varsEqual(e1, e2);
-+    }
-+    return e1.equals(e2);
-+  }
-+
-+  private boolean varsEqual(Exprent e1, Exprent e2) {
-+    if (!(e1 instanceof VarExprent)) return false;
-+    if (!(e2 instanceof VarExprent)) return false;
-+
-+    VarExprent v1 = (VarExprent)e1;
-+    VarExprent v2 = (VarExprent)e2;
-+    return varProc.getVarOriginalIndex(v1.getIndex()) == varProc.getVarOriginalIndex(v2.getIndex())
-+            && Objects.equals(v1.getVarType(), v2.getVarType());
-+  }
-+
-+
-+  private void updateVersions(DirectGraph graph) {
-+    if (remaps.isEmpty()) return;
-+    graph.iterateExprents(new DirectGraph.ExprentIterator() {
-+      @Override
-+      public int processExprent(Exprent exprent) {
-+        List<Exprent> lst = exprent.getAllExprents(true);
-+        lst.add(exprent);
-+
-+        for (Exprent expr : lst) {
-+          if (expr.type == Exprent.EXPRENT_VAR) {
-+            VarExprent var = (VarExprent)expr;
-+            VarVersionPair nvar = remaps.get(new VarVersionPair(var));
-+            if (nvar != null) {
-+              var.setIndex(nvar.var);
-+              var.setVersion(nvar.version);
-+            }
-+          }
-+        }
-+
-+        return 0;
-+      }
-+    });
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
-index c3263800aba7cb93e7b879d0bd46888fb696e861..d7c81a5f8538cdb6c99c752a9dd0fba5cb767121 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
-@@ -15,6 +15,7 @@ public class StatEdge {
-   public Statement closure;
-   public boolean labeled = true;
-   public boolean explicit = true;
-+  public boolean canInline = true;
- 
-   public StatEdge(@NotNull EdgeType type, Statement source, Statement destination, Statement closure) {
-     this(type, source, destination);
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
-index a86f0d2887c6c19cb1d911ec43830eb69f8aaada..bce06b032577f4e6e5a891b06435fdd62ee5ea3f 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
-@@ -3,6 +3,7 @@ package org.jetbrains.java.decompiler.modules.decompiler.decompose;
- 
- import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
- import org.jetbrains.java.decompiler.modules.decompiler.StatEdge.EdgeType;
-+import org.jetbrains.java.decompiler.modules.decompiler.StrongConnectivityHelper;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
- import org.jetbrains.java.decompiler.util.FastFixedSetFactory;
- import org.jetbrains.java.decompiler.util.FastFixedSetFactory.FastFixedSet;
-@@ -51,6 +52,8 @@ public class FastExtendedPostdominanceHelper {
- 
-     filterOnDominance(filter);
- 
-+    addSupportedComponents(filter);
-+
-     Set<Entry<Integer, FastFixedSet<Integer>>> entries = mapExtPostdominators.entrySet();
-     HashMap<Integer, Set<Integer>> res = new HashMap<>(entries.size());
-     for (Entry<Integer, FastFixedSet<Integer>> entry : entries) {
-@@ -119,6 +122,23 @@ public class FastExtendedPostdominanceHelper {
-     }
-   }
- 
-+  private void addSupportedComponents(DominatorTreeExceptionFilter filter) {
-+    StrongConnectivityHelper schelp = new StrongConnectivityHelper(this.statement);
-+
-+    for (List<Statement> comp : schelp.getComponents()) {
-+      SupportComponent supcomp = SupportComponent.identify(comp, this.mapSupportPoints, filter.getDomEngine());
-+
-+      if (supcomp != null) {
-+        // If the identified support component is not null, then add additional postdom info
-+        for (Statement st : supcomp.stats) {
-+          if (st != supcomp.supportedPoint) {
-+            this.mapExtPostdominators.computeIfAbsent(st.id, i -> this.factory.spawnEmptySet()).add(supcomp.supportedPoint.id);
-+          }
-+        }
-+      }
-+    }
-+  }
-+
-   private void filterOnExceptionRanges(DominatorTreeExceptionFilter filter) {
-     for (Integer head : new HashSet<>(mapExtPostdominators.keySet())) {
-       FastFixedSet<Integer> set = mapExtPostdominators.get(head);
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/SupportComponent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/SupportComponent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..9123d92be14259e0117a0bb7b06a3d09958f7459
---- /dev/null
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/SupportComponent.java
-@@ -0,0 +1,92 @@
-+package org.jetbrains.java.decompiler.modules.decompiler.decompose;
-+
-+import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
-+import org.jetbrains.java.decompiler.util.FastFixedSetFactory;
-+
-+import java.util.*;
-+
-+// Model of a strongly connected component, the entrypoint (header), and the backedges to the entrypoint.
-+// This allows us to find endpoint cycles to better calculate postdominance
-+public final class SupportComponent {
-+  // Statements in this component
-+  public final List<Statement> stats;
-+  // Backedges to loop header
-+  public final Map<Integer, FastFixedSetFactory.FastFixedSet<Integer>> selfSupportPoints;
-+  // Loop header
-+  public final Statement supportedPoint;
-+
-+  public SupportComponent(List<Statement> stats, Map<Integer, FastFixedSetFactory.FastFixedSet<Integer>> selfSupportPoints, Statement supportedPoint) {
-+    this.stats = stats;
-+    this.selfSupportPoints = selfSupportPoints;
-+    this.supportedPoint = supportedPoint;
-+  }
-+
-+
-+  public static SupportComponent identify(List<Statement> component, Map<Integer, FastFixedSetFactory.FastFixedSet<Integer>> mapSupportPoints, DominatorEngine dom) {
-+    Map<Integer, FastFixedSetFactory.FastFixedSet<Integer>> selfSupportPoints = new HashMap<>();
-+    Set<Statement> supportedAll = new HashSet<>();
-+    for (Statement st : component) {
-+      FastFixedSetFactory.FastFixedSet<Integer> supReach = mapSupportPoints.get(st.id);
-+
-+      if (supReach != null) {
-+        for (StatEdge edge : st.getSuccessorEdges(StatEdge.EdgeType.REGULAR)) {
-+          Statement dest = edge.getDestination();
-+
-+          if (!component.contains(dest)) {
-+            // Support point supports statement outside of component, invalid
-+            return null;
-+          } else {
-+            // If the successor is a dominator of the current statement, then we know that it must be an earlier statement, so the successor is supported point
-+            if (dom.isDominator(st.id, dest.id)) {
-+              supportedAll.add(dest);
-+            }
-+          }
-+        }
-+
-+        // no filter needed as this is coming from the component itself
-+        selfSupportPoints.put(st.id, supReach);
-+      }
-+    }
-+
-+    // There should only be a single component that is supported: if there's more, then we know that there is a nested loop
-+    // TODO: The algorithm isn't able to decompose nested loops, so we simply quit processing for now
-+    if (supportedAll.size() != 1) {
-+      return null;
-+    }
-+
-+    // Somehow got no support points- should be impossible!
-+    if (selfSupportPoints.isEmpty()) {
-+      return null;
-+    }
-+
-+    // Find all edges leaving this component. There should only be one, and that is the edge leading into the header!
-+    List<Statement> outgoing = new ArrayList<>();
-+    for (Statement st : component) {
-+      for (StatEdge edge : st.getPredecessorEdges(StatEdge.EdgeType.REGULAR)) {
-+        if (!component.contains(edge.getSource())) {
-+          outgoing.add(st);
-+        }
-+      }
-+    }
-+
-+    if (outgoing.size() != 1) {
-+      return null;
-+    }
-+
-+    // Ensure that the header is the dominator of every node in the component
-+    Statement head = outgoing.get(0);
-+    for (Statement st : component) {
-+      if (!dom.isDominator(st.id, head.id)) {
-+        return null;
-+      }
-+    }
-+
-+    return new SupportComponent(component, selfSupportPoints, head);
-+  }
-+
-+  @Override
-+  public String toString() {
-+    return "SupportComponent[" + stats + ", selfSupportPoints=" + selfSupportPoints + ", header=" + supportedPoint + ']';
-+  }
-+}
-\ No newline at end of file
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 3cedf46af2faa91029231205455a1df1db7be3de..6776219b98b6b244bb9deda8cffc7b8fc63e4ac6 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-@@ -443,7 +443,7 @@ public class InvocationExprent extends Exprent {
-     "charValue", "java/lang/Character"
-   );
- 
--  private boolean isUnboxingCall() {
-+  public boolean isUnboxingCall() {
-     return !isStatic && parameters.size() == 0 && className.equals(UNBOXING_METHODS.get(name));
-   }
- 
-@@ -643,4 +643,4 @@ public class InvocationExprent extends Exprent {
- 
-     return true;
-   }
--}
-\ No newline at end of file
-+}
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index 2b508a172340285dff5afa73cd4d7fcbf0dfeaff..8abfd33115391d24d08d349af9a5b64b1d75c1bf 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-@@ -9,11 +9,13 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
- import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
- import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
- import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
-+import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
--import org.jetbrains.java.decompiler.struct.StructMethod;
- import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
- import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute;
-+import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute.LocalVariable;
- import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTypeTableAttribute;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
- import org.jetbrains.java.decompiler.struct.gen.generics.GenericFieldDescriptor;
-@@ -22,13 +24,13 @@ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
- import org.jetbrains.java.decompiler.struct.match.MatchNode;
- import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
- import org.jetbrains.java.decompiler.util.TextBuffer;
--import org.jetbrains.java.decompiler.util.TextUtil;
- 
- import java.util.ArrayList;
--import java.util.Collections;
- import java.util.BitSet;
-+import java.util.Collections;
- import java.util.List;
- import java.util.Objects;
-+import java.util.stream.Collectors;
- 
- public class VarExprent extends Exprent {
-   public static final int STACK_BASE = 10000;
-@@ -41,6 +43,7 @@ public class VarExprent extends Exprent {
-   private int version = 0;
-   private boolean classDef = false;
-   private boolean stack = false;
-+  private LocalVariable lvt = null;
- 
-   public VarExprent(int index, VarType varType, VarProcessor processor) {
-     this(index, varType, processor, null);
-@@ -76,6 +79,7 @@ public class VarExprent extends Exprent {
-     var.setVersion(version);
-     var.setClassDef(classDef);
-     var.setStack(stack);
-+    var.setLVT(lvt);
-     return var;
-   }
- 
-@@ -92,10 +96,6 @@ public class VarExprent extends Exprent {
-     }
-     else {
-       VarVersionPair varVersion = getVarVersionPair();
--      String name = null;
--      if (processor != null) {
--        name = processor.getVarName(varVersion);
--      }
- 
-       if (definition) {
-         if (processor != null && processor.getVarFinal(varVersion) == VarProcessor.VAR_EXPLICIT_FINAL) {
-@@ -105,7 +105,7 @@ public class VarExprent extends Exprent {
-         buffer.append(" ");
-       }
- 
--      buffer.append(name == null ? ("var" + index + (this.version == 0 ? "" : "_" + this.version)) : name);
-+      buffer.append(getName());
-     }
- 
-     return buffer;
-@@ -115,6 +115,7 @@ public class VarExprent extends Exprent {
-     return new VarVersionPair(index, version);
-   }
- 
-+  /*
-   public String getDebugName(StructMethod method) {
-     StructLocalVariableTableAttribute attr = method.getLocalVariableAttr();
-     if (attr != null && processor != null) {
-@@ -128,9 +129,25 @@ public class VarExprent extends Exprent {
-     }
-     return null;
-   }
-+  */
- 
-   private void appendDefinitionType(TextBuffer buffer) {
-     if (DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_VAR_NAMES)) {
-+
-+      if (lvt != null) {
-+        if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
-+          if (lvt.getSignature() != null) {
-+            GenericFieldDescriptor descriptor = GenericMain.parseFieldSignature(lvt.getSignature());
-+            if (descriptor != null) {
-+              buffer.append(GenericMain.getGenericCastTypeName(descriptor.type, Collections.emptyList()));
-+              return;
-+            }
-+          }
-+        }
-+        buffer.append(ExprProcessor.getCastTypeName(getVarType(), Collections.emptyList()));
-+        return;
-+      }
-+
-       MethodWrapper method = (MethodWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_WRAPPER);
-       if (method != null) {
-         Integer originalIndex = null;
-@@ -195,6 +212,10 @@ public class VarExprent extends Exprent {
-   }
- 
-   public VarType getVarType() {
-+    if (DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_VAR_NAMES) && lvt != null) {
-+      return new VarType(lvt.getDescriptor());
-+    }
-+
-     VarType vt = null;
-     if (processor != null) {
-       vt = processor.getVarType(getVarVersionPair());
-@@ -247,6 +268,93 @@ public class VarExprent extends Exprent {
-     this.stack = stack;
-   }
- 
-+  public void setLVT(LocalVariable var) {
-+    this.lvt = var;
-+    if (processor != null && lvt != null) {
-+      processor.setVarType(getVarVersionPair(), lvt.getVarType());
-+    }
-+  }
-+
-+  public LocalVariable getLVT() {
-+    return lvt;
-+  }
-+
-+  public String getName() {
-+    VarVersionPair pair = getVarVersionPair();
-+    if (lvt != null)
-+      return lvt.getName();
-+
-+    if (processor != null) {
-+      String ret = processor.getVarName(pair);
-+      if (ret != null)
-+        return ret;
-+    }
-+
-+    return pair.version == 0 ? "var" + pair.var : "var" + pair.var + "_" + version;
-+  }
-+
-+  @Override
-+  public CheckTypesResult checkExprTypeBounds() {
-+    if (lvt != null) {
-+      CheckTypesResult ret = new CheckTypesResult();
-+      ret.addMinTypeExprent(this, lvt.getVarType());
-+      return ret;
-+    }
-+    return null;
-+  }
-+
-+  public boolean isVarReferenced(Statement stat, VarExprent... whitelist) {
-+    if (stat.getExprents() == null) {
-+      for (Object obj : stat.getSequentialObjects()) {
-+        if (obj instanceof Statement) {
-+          if (isVarReferenced((Statement)obj, whitelist)) {
-+            return true;
-+          }
-+        }
-+        else if (obj instanceof Exprent) {
-+          if (isVarReferenced((Exprent)obj, whitelist)) {
-+            return true;
-+          }
-+        }
-+      }
-+    }
-+    else {
-+      for (Exprent exp : stat.getExprents()) {
-+        if (isVarReferenced(exp, whitelist)) {
-+          return true;
-+        }
-+      }
-+    }
-+    return false;
-+  }
-+
-+  public boolean isVarReferenced(Exprent exp, VarExprent... whitelist) {
-+    List<Exprent> lst = exp.getAllExprents(true);
-+    lst.add(exp);
-+    lst = lst.stream().filter(e -> e != this && e.type == Exprent.EXPRENT_VAR &&
-+      getVarVersionPair().equals(((VarExprent)e).getVarVersionPair()))
-+        .collect(Collectors.toList());
-+
-+    for (Exprent var : lst) {
-+      boolean allowed = false;
-+      for (VarExprent white : whitelist) {
-+        if (var == white) {
-+          allowed = true;
-+          break;
-+        }
-+      }
-+      if (!allowed) {
-+        return true;
-+      }
-+    }
-+    return false;
-+  }
-+
-+  @Override
-+  public String toString() {
-+    return "VarExprent[" + index + ',' + version +"]";
-+  }
-+
-   // *****************************************************************************
-   // IMatchable implementation
-   // *****************************************************************************
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
-index a20acdff7d3ef1415fe6c90d05b92a90cfaf0073..6f21cd6df597613099861d874bb320effd0a366a 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
-@@ -113,6 +113,21 @@ public class DirectGraph {
-     return true;
-   }
- 
-+  public boolean iterateExprentsDeep(ExprentIterator itr) {
-+    return iterateExprents(exprent -> {
-+      List<Exprent> lst = exprent.getAllExprents(true);
-+      lst.add(exprent);
-+
-+      for (Exprent expr : lst) {
-+        int res = itr.processExprent(expr);
-+        if (res == 1 || res == 2) {
-+          return res;
-+        }
-+      }
-+      return 0;
-+    });
-+  }
-+
-   public interface ExprentIterator {
-     // 0 - success, do nothing
-     // 1 - cancel iteration
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
-index 552ae9594a64c737095bc5ec095e134926c1315c..234a42e3a73426204cf3debdb9b77c28f4afbb10 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
-@@ -201,7 +201,7 @@ public class FlattenStatementsHelper {
-                 }
-                 sourcenode = node;
-               }
--              case FOR -> {
-+              case FOR, FOREACH -> {
-                 DirectNode nodeinit = new DirectNode(DirectNodeType.INIT, stat, stat.id + "_init");
-                 if (dostat.getInitExprent() != null) {
-                   nodeinit.exprents = dostat.getInitExprentList();
-@@ -209,7 +209,9 @@ public class FlattenStatementsHelper {
-                 graph.nodes.putWithKey(nodeinit, nodeinit.id);
- 
-                 DirectNode nodecond = new DirectNode(DirectNodeType.CONDITION, stat, stat.id + "_cond");
--                nodecond.exprents = dostat.getConditionExprentList();
-+                if (loopType != DoStatement.LoopType.FOREACH) {
-+                  nodecond.exprents = dostat.getConditionExprentList();
-+                }
-                 graph.nodes.putWithKey(nodecond, nodecond.id);
- 
-                 DirectNode nodeinc = new DirectNode(DirectNodeType.INCREMENT, stat, stat.id + "_inc");
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
-index 56f429ac8433cd5db3e5ea22ab4c3b0e8c7927f5..018d3fbdf53036db90b6c64e872098542133b630 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
-@@ -105,6 +105,14 @@ public final class DoStatement extends Statement {
-         buf.appendIndent(indent).append("}").appendLineSeparator();
-         tracer.incrementCurrentSourceLine();
-       }
-+      case FOREACH -> {
-+        buf.appendIndent(indent).append("for(").append(initExprent.get(0).toJava(indent, tracer));
-+        buf.append(" : ").append(incExprent.get(0).toJava(indent, tracer)).append(") {").appendLineSeparator();
-+        tracer.incrementCurrentSourceLine();
-+        buf.append(ExprProcessor.jmpWrapper(first, indent + 1, true, tracer));
-+        buf.appendIndent(indent).append("}").appendLineSeparator();
-+        tracer.incrementCurrentSourceLine();
-+      }
-     }
-     return buf;
-   }
-@@ -119,6 +127,10 @@ public final class DoStatement extends Statement {
-         }
-       case WHILE:
-         lst.add(getConditionExprent());
-+        break;
-+      case FOREACH:
-+        lst.add(getInitExprent());
-+        lst.add(getIncExprent());
-     }
-     lst.add(first);
-     switch (loopType) {
-@@ -194,6 +206,7 @@ public final class DoStatement extends Statement {
-     DO,
-     DO_WHILE,
-     WHILE,
--    FOR
-+    FOR,
-+    FOREACH
-   }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
-index 9498f3c548d18ead3bcbc076222bd5ace82b8275..e65af740228e237d3159cf4dd3398a9fe1d21199 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
-@@ -768,6 +768,14 @@ public abstract class Statement implements IMatchable {
-     this.parent = parent;
-   }
- 
-+  public Statement getTopParent() {
-+    Statement ret = this;
-+    while (ret.getParent() != null) {
-+      ret = ret.getParent();
-+    }
-+    return ret;
-+  }
-+
-   public HashSet<StatEdge> getLabelEdges() {  // FIXME: why HashSet?
-     return labelEdges;
-   }
-@@ -794,7 +802,7 @@ public abstract class Statement implements IMatchable {
- 
-   // helper methods
-   public String toString() {
--    return Integer.toString(id);
-+    return String.format("{%d}:%d", type, id);
-   }
- 
-   //TODO: Cleanup/cache?
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 0113b76b89a886a96d8f1668142b008cb85ab637..f2c0589344ed69685dd3103d060109c700c7ee41 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-@@ -4,18 +4,28 @@ package org.jetbrains.java.decompiler.modules.decompiler.vars;
- import org.jetbrains.java.decompiler.code.CodeConstants;
- import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
-+import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.ExitExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.FieldExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchAllStatement;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchStatement;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement.LoopType;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement.StatementType;
- import org.jetbrains.java.decompiler.struct.StructClass;
- import org.jetbrains.java.decompiler.struct.StructMethod;
-+import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute.LocalVariable;
- import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
-+import org.jetbrains.java.decompiler.struct.gen.VarType;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
- 
- import java.util.*;
- import java.util.Map.Entry;
-@@ -31,6 +41,9 @@ public class VarDefinitionHelper {
- 
-   private final VarProcessor varproc;
- 
-+  private final Statement root;
-+  private final StructMethod mt;
-+
-   public VarDefinitionHelper(Statement root, StructMethod mt, VarProcessor varproc) {
- 
-     mapVarDefStatements = new HashMap<>();
-@@ -38,6 +51,8 @@ public class VarDefinitionHelper {
-     implDefVars = new HashSet<>();
- 
-     this.varproc = varproc;
-+    this.root = root;
-+    this.mt = mt;
- 
-     VarNamesCollector vc = varproc.getVarNamesCollector();
- 
-@@ -51,12 +66,12 @@ public class VarDefinitionHelper {
-     }
-     paramcount += md.params.length;
- 
--
-     // method parameters are implicitly defined
-     int varindex = 0;
-     for (int i = 0; i < paramcount; i++) {
-       implDefVars.add(varindex);
--      varproc.setVarName(new VarVersionPair(varindex, 0), vc.getFreeName(varindex));
-+      VarVersionPair vpp = new VarVersionPair(varindex, 0);
-+      varproc.setVarName(vpp, vc.getFreeName(varindex));
- 
-       if (thisvar) {
-         if (i == 0) {
-@@ -79,6 +94,8 @@ public class VarDefinitionHelper {
-       vc.addName("this");
-     }
- 
-+    mergeVars(root);
-+
-     // catch variables are implicitly defined
-     LinkedList<Statement> stack = new LinkedList<>();
-     stack.add(root);
-@@ -108,7 +125,6 @@ public class VarDefinitionHelper {
-     initStatement(root);
-   }
- 
--
-   public void setVarDefinitions() {
-     VarNamesCollector vc = varproc.getVarNamesCollector();
- 
-@@ -141,9 +157,17 @@ public class VarDefinitionHelper {
-             }
-           }
-         }
-+        else if (dstat.getLoopType() == DoStatement.LoopType.FOREACH) {
-+          if (dstat.getInitExprent() != null && dstat.getInitExprent().type == Exprent.EXPRENT_VAR) {
-+            VarExprent var = (VarExprent)dstat.getInitExprent();
-+            if (var.getIndex() == index.intValue()) {
-+              var.setDefinition(true);
-+              continue;
-+            }
-+          }
-+        }
-       }
- 
--
-       Statement first = findFirstBlock(stat, index);
- 
-       List<Exprent> lst;
-@@ -157,7 +181,6 @@ public class VarDefinitionHelper {
-         lst = first.getExprents();
-       }
- 
--
-       boolean defset = false;
- 
-       // search for the first assignment to var [index]
-@@ -186,9 +209,17 @@ public class VarDefinitionHelper {
-         VarExprent var = new VarExprent(index, varproc.getVarType(new VarVersionPair(index.intValue(), 0)), varproc);
-         var.setDefinition(true);
- 
-+        LocalVariable lvt = findLVT(index.intValue(), stat);
-+        if (lvt != null) {
-+          var.setLVT(lvt);
-+        }
-+
-         lst.add(addindex, var);
-       }
-     }
-+
-+    mergeVars(root);
-+    propogateLVTs(root);
-   }
- 
- 
-@@ -196,6 +227,50 @@ public class VarDefinitionHelper {
-   // private methods
-   // *****************************************************************************
- 
-+  private LocalVariable findLVT(int index, Statement stat) {
-+    if (stat.getExprents() == null) {
-+      for (Object obj : stat.getSequentialObjects()) {
-+        if (obj instanceof Statement) {
-+          LocalVariable lvt = findLVT(index, (Statement)obj);
-+          if (lvt != null) {
-+            return lvt;
-+          }
-+        }
-+        else if (obj instanceof Exprent) {
-+          LocalVariable lvt = findLVT(index, (Exprent)obj);
-+          if (lvt != null) {
-+            return lvt;
-+          }
-+        }
-+      }
-+    }
-+    else {
-+      for (Exprent exp : stat.getExprents()) {
-+        LocalVariable lvt = findLVT(index, exp);
-+        if (lvt != null) {
-+          return lvt;
-+        }
-+      }
-+    }
-+    return null;
-+  }
-+
-+  private LocalVariable findLVT(int index, Exprent exp) {
-+    for (Exprent e: exp.getAllExprents(false)) {
-+      LocalVariable lvt = findLVT(index, e);
-+      if (lvt != null) {
-+        return lvt;
-+      }
-+    }
-+
-+    if (exp.type != Exprent.EXPRENT_VAR) {
-+      return null;
-+    }
-+
-+    VarExprent var = (VarExprent)exp;
-+    return var.getIndex() == index ? var.getLVT() : null;
-+  }
-+
-   private Statement findFirstBlock(Statement stat, Integer varindex) {
- 
-     LinkedList<Statement> stack = new LinkedList<>();
-@@ -249,6 +324,7 @@ public class VarDefinitionHelper {
-           if (st.type == StatementType.DO) {
-             DoStatement dost = (DoStatement)st;
-             if (dost.getLoopType() != LoopType.FOR &&
-+                dost.getLoopType() != LoopType.FOREACH &&
-                 dost.getLoopType() != LoopType.DO) {
-               currVars.add(dost.getConditionExprent());
-             }
-@@ -319,7 +395,7 @@ public class VarDefinitionHelper {
-     return res;
-   }
- 
--  private static boolean setDefinition(Exprent expr, Integer index) {
-+  private boolean setDefinition(Exprent expr, Integer index) {
-     if (expr.type == Exprent.EXPRENT_ASSIGNMENT) {
-       Exprent left = ((AssignmentExprent)expr).getLeft();
-       if (left.type == Exprent.EXPRENT_VAR) {
-@@ -332,4 +408,660 @@ public class VarDefinitionHelper {
-     }
-     return false;
-   }
-+
-+  private void populateTypeBounds(VarProcessor proc, Statement stat) {
-+    Map<VarVersionPair, VarType> mapExprentMinTypes = varproc.getVarVersions().getTypeProcessor().getMinExprentTypes();
-+    Map<VarVersionPair, VarType> mapExprentMaxTypes = varproc.getVarVersions().getTypeProcessor().getMaxExprentTypes();
-+    LinkedList<Statement> stack = new LinkedList<>();
-+    stack.add(root);
-+
-+    while (!stack.isEmpty()) {
-+      Statement st = stack.removeFirst();
-+
-+      if (st.getExprents() != null) {
-+        LinkedList<Exprent> exps = new LinkedList<>();
-+        exps.addAll(st.getExprents());
-+        while (!exps.isEmpty()) {
-+          Exprent exp = exps.removeFirst();
-+
-+          switch (exp.type) {
-+            case Exprent.EXPRENT_INVOCATION:
-+            case Exprent.EXPRENT_FIELD:
-+            case Exprent.EXPRENT_EXIT:
-+              Exprent instance = null;
-+              String target = null;
-+              if (exp.type == Exprent.EXPRENT_INVOCATION) {
-+                instance = ((InvocationExprent)exp).getInstance();
-+                target = ((InvocationExprent)exp).getClassName();
-+              } else if (exp.type == Exprent.EXPRENT_FIELD) {
-+                instance = ((FieldExprent)exp).getInstance();
-+                target = ((FieldExprent)exp).getClassname();
-+              } else if (exp.type == Exprent.EXPRENT_EXIT) {
-+                ExitExprent exit = (ExitExprent)exp;
-+                if (exit.getExitType() == ExitExprent.EXIT_RETURN) {
-+                  instance = exit.getValue();
-+                  target = exit.getRetType().getValue();
-+                }
-+              }
-+
-+              if ("java/lang/Object".equals(target))
-+                  continue; //This is dirty, but if we don't then too many things become object...
-+
-+              if (instance != null && instance.type == Exprent.EXPRENT_VAR) {
-+                VarVersionPair key = ((VarExprent)instance).getVarVersionPair();
-+                VarType newType = new VarType(CodeConstants.TYPE_OBJECT, 0, target);
-+                VarType oldMin = mapExprentMinTypes.get(key);
-+                VarType oldMax = mapExprentMaxTypes.get(key);
-+
-+                /* Everything goes to Object with this... Need a better filter?
-+                if (!newType.equals(oldMin)) {
-+                  if (oldMin != null && oldMin.type == CodeConstants.TYPE_OBJECT) {
-+                    // If the old min is an instanceof the new target, EXA: ArrayList -> List
-+                    if (DecompilerContext.getStructContext().instanceOf(oldMin.value, newType.value))
-+                      mapExprentMinTypes.put(key, newType);
-+                  } else
-+                    mapExprentMinTypes.put(key, newType);
-+                }
-+                */
-+
-+                if (!newType.equals(oldMax)) {
-+                  if (oldMax != null && oldMax.getType() == CodeConstants.TYPE_OBJECT) {
-+                    // If the old min is an instanceof the new target, EXA: List -> ArrayList
-+                    if (DecompilerContext.getStructContext().instanceOf(newType.getValue(), oldMax.getValue()))
-+                      mapExprentMaxTypes.put(key, newType);
-+                  } else
-+                    mapExprentMaxTypes.put(key, newType);
-+                }
-+              }
-+
-+              break;
-+            default:
-+              exps.addAll(exp.getAllExprents());
-+          }
-+        }
-+      }
-+
-+      stack.addAll(st.getStats());
-+    }
-+  }
-+
-+  private VPPEntry mergeVars(Statement stat) {
-+    Map<Integer, VarVersionPair> parent = new HashMap<>(); // Always empty dua!
-+    MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
-+
-+    int index = 0;
-+    if (!mt.hasModifier(CodeConstants.ACC_STATIC)) {
-+      parent.put(index, new VarVersionPair(index++, 0));
-+    }
-+
-+    for (VarType var : md.params) {
-+      parent.put(index, new VarVersionPair(index, 0));
-+      index += var.getStackSize();
-+    }
-+
-+    populateTypeBounds(varproc, stat);
-+
-+    Map<VarVersionPair, VarVersionPair> blacklist = new HashMap<>();
-+    VPPEntry remap = mergeVars(stat, parent, new HashMap<Integer, VarVersionPair>(), blacklist);
-+    while (remap != null) {
-+      //System.out.println("Remapping: " + remap.getKey() + " -> " + remap.getValue());
-+      if (!remapVar(stat, remap.getKey(), remap.getValue())) {
-+        blacklist.put(remap.getKey(), remap.getValue());
-+      }
-+      remap = mergeVars(stat, parent, new HashMap<Integer, VarVersionPair>(), blacklist);
-+    }
-+    return null;
-+  }
-+
-+
-+  private VPPEntry mergeVars(Statement stat, Map<Integer, VarVersionPair> parent, Map<Integer, VarVersionPair> leaked, Map<VarVersionPair, VarVersionPair> blacklist) {
-+    Map<Integer, VarVersionPair> this_vars = new HashMap<>();
-+    if (parent.size() > 0)
-+      this_vars.putAll(parent);
-+
-+    if (stat.getVarDefinitions().size() > 0) {
-+      for (int x = 0; x < stat.getVarDefinitions().size(); x++) {
-+        Exprent exp = stat.getVarDefinitions().get(x);
-+        if (exp.type == Exprent.EXPRENT_VAR) {
-+          VarExprent var = (VarExprent)exp;
-+          int index = varproc.getVarOriginalIndex(var.getIndex());
-+          if (this_vars.containsKey(index)) {
-+            stat.getVarDefinitions().remove(x);
-+            return new VPPEntry(var, this_vars.get(index));
-+          }
-+          this_vars.put(index, new VarVersionPair(var));
-+          leaked.put(index, new VarVersionPair(var));
-+        }
-+      }
-+    }
-+
-+    Map<Integer, VarVersionPair> scoped = null;
-+    switch (stat.type) { // These are the type of statements that leak vars
-+      case BASIC_BLOCK:
-+      case GENERAL:
-+      case ROOT:
-+      case SEQUENCE:
-+        scoped = leaked;
-+    }
-+
-+    if (stat.getExprents() == null) {
-+      List<Object> objs = stat.getSequentialObjects();
-+      for (int i = 0; i < objs.size(); i++) {
-+        Object obj = objs.get(i);
-+        if (obj instanceof Statement) {
-+          Statement st = (Statement)obj;
-+
-+          //Map<VarVersionPair, VarVersionPair> blacklist_n = new HashMap<VarVersionPair, VarVersionPair>();
-+          Map<Integer, VarVersionPair> leaked_n = new HashMap<>();
-+          VPPEntry remap = mergeVars(st, this_vars, leaked_n, blacklist);
-+
-+          if (remap != null) {
-+            return remap;
-+          }
-+          /* TODO: See if we can optimize and only go up till needed.
-+          while (remap != null) {
-+            System.out.println("Remapping: " + remap.getKey() + " -> " + remap.getValue());
-+            VarVersionPair var = parent.get(varproc.getRemapped(remap.getValue().var));
-+            if (remap.getValue().equals(var)) { //Drill up to original declaration.
-+              return remap;
-+            }
-+            if (!remapVar(stat, remap.getKey(), remap.getValue())) {
-+              blacklist_n.put(remap.getKey(), remap.getValue());
-+            }
-+            leaked_n.clear();
-+            remap = mergeVars(st, this_vars, leaked_n, blacklist_n);
-+          }
-+          */
-+
-+          if (leaked_n.size() > 0) {
-+            if (stat.type == Statement.StatementType.IF) {
-+              IfStatement ifst = (IfStatement)stat;
-+              if (obj == ifst.getIfstat() || obj == ifst.getElsestat()) {
-+                leaked_n.clear(); // Force no leaking at the end of if blocks
-+                // We may need to do this for Switches as well.. But havent run into that issue yet...
-+              }
-+              else if (obj == ifst.getFirst()) {
-+                leaked.putAll(leaked_n); //First is outside the scope so leak!
-+              }
-+            } else if (stat.type == Statement.StatementType.SWITCH ||
-+                       stat.type == Statement.StatementType.SYNCHRONIZED) {
-+              if (obj == stat.getFirst()) {
-+                leaked.putAll(leaked_n); //First is outside the scope so leak!
-+              }
-+              else {
-+                leaked_n.clear();
-+              }
-+            }
-+            else if (stat.type == Statement.StatementType.TRY_CATCH ||
-+              stat.type == Statement.StatementType.CATCH_ALL) {
-+              leaked_n.clear(); // Catches can't leak anything mwhahahahah!
-+            }
-+            this_vars.putAll(leaked_n);
-+          }
-+        }
-+        else if (obj instanceof Exprent) {
-+          VPPEntry ret = processExprent((Exprent)obj, this_vars, scoped, blacklist);
-+          if (ret != null && isVarReadFirst(ret.getValue(), stat, i + 1)) {
-+            return ret;
-+          }
-+        }
-+      }
-+    }
-+    else {
-+      List<Exprent> exps = stat.getExprents();
-+      for (int i = 0; i < exps.size(); i++) {
-+        VPPEntry ret = processExprent(exps.get(i), this_vars, scoped, blacklist);
-+        if (ret != null && !isVarReadFirst(ret.getValue(), stat, i + 1)) {
-+          return ret;
-+        }
-+      }
-+    }
-+    return null; // We made it with no remaps!!!!!!!
-+  }
-+
-+  private VPPEntry processExprent(Exprent exp, Map<Integer, VarVersionPair> this_vars, Map<Integer, VarVersionPair> leaked, Map<VarVersionPair, VarVersionPair> blacklist) {
-+    VarExprent var = null;
-+
-+    if (exp.type == Exprent.EXPRENT_ASSIGNMENT) {
-+      AssignmentExprent ass = (AssignmentExprent)exp;
-+      if (ass.getLeft().type != Exprent.EXPRENT_VAR) {
-+        return null;
-+      }
-+
-+      var = (VarExprent)ass.getLeft();
-+    }
-+    else if (exp.type == Exprent.EXPRENT_VAR) {
-+      var = (VarExprent)exp;
-+    }
-+
-+    if (var == null) {
-+      return null;
-+    }
-+
-+    if (!var.isDefinition()) {
-+      return null;
-+    }
-+
-+    int index = varproc.getVarOriginalIndex(var.getIndex());
-+    VarVersionPair new_ = this_vars.get(index);
-+    if (new_ != null) {
-+      VarVersionPair old = new VarVersionPair(var);
-+      VarVersionPair black = blacklist.get(old);
-+      if (black == null || !black.equals(new_)) {
-+        return new VPPEntry(var, this_vars.get(index));
-+      }
-+    }
-+    this_vars.put(index, new VarVersionPair(var));
-+
-+    if (leaked != null) {
-+      leaked.put(index, new VarVersionPair(var));
-+    }
-+
-+    return null;
-+  }
-+
-+  private boolean remapVar(Statement stat, VarVersionPair from, VarVersionPair to) {
-+    if (from.equals(to))
-+      throw new IllegalArgumentException("Shit went wrong: " + from);
-+    boolean success = false;
-+    if (stat.getExprents() == null) {
-+      for (Object obj : stat.getSequentialObjects()) {
-+        if (obj instanceof Statement) {
-+          success |= remapVar((Statement)obj, from, to);
-+        }
-+        else if (obj instanceof Exprent) {
-+          if (remapVar((Exprent)obj, from, to)) {
-+            success = true;
-+          }
-+        }
-+      }
-+    }
-+    else {
-+      boolean remapped = false;
-+      for (int x = 0; x < stat.getExprents().size(); x++) {
-+        Exprent exp = stat.getExprents().get(x);
-+        if (remapVar(exp, from, to)) {
-+          remapped = true;
-+          if (exp.type == Exprent.EXPRENT_VAR) {
-+            if (!((VarExprent)exp).isDefinition()) {
-+              stat.getExprents().remove(x);
-+              x--;
-+            }
-+          }
-+        }
-+      }
-+      success |= remapped;
-+    }
-+
-+    if (success) {
-+      Iterator<Exprent> itr = stat.getVarDefinitions().iterator();
-+      while (itr.hasNext()) {
-+        Exprent exp = itr.next();
-+        if (exp.type == Exprent.EXPRENT_VAR) {
-+          VarExprent var = (VarExprent)exp;
-+          if (from.equals(var.getVarVersionPair())) {
-+            itr.remove();
-+          }
-+          else if (to.var == var.getIndex() && to.version == var.getVersion()) {
-+            VarType merged = getMergedType(from, to);
-+
-+            if (merged == null) { // Something went wrong.. This SHOULD be non-null
-+              continue;
-+            }
-+
-+            var.setVarType(merged);
-+          }
-+        }
-+      }
-+    }
-+
-+    return success;
-+  }
-+
-+  private boolean remapVar(Exprent exprent, VarVersionPair from, VarVersionPair to) {
-+    if (exprent == null) { // Sometimes there are null exprents?
-+      return false;
-+    }
-+    List<Exprent> lst = exprent.getAllExprents(true);
-+    lst.add(exprent);
-+
-+    boolean remapped = false;
-+
-+    for (Exprent expr : lst) {
-+      if (expr.type == Exprent.EXPRENT_ASSIGNMENT) {
-+        AssignmentExprent ass = (AssignmentExprent)expr;
-+        if (ass.getLeft().type == Exprent.EXPRENT_VAR && ass.getRight().type == Exprent.EXPRENT_CONST) {
-+          VarVersionPair left = new VarVersionPair((VarExprent)ass.getLeft());
-+          if (!left.equals(from) && !left.equals(to)) {
-+            continue;
-+          }
-+
-+          ConstExprent right = (ConstExprent)ass.getRight();
-+          if (right.getConstType() == VarType.VARTYPE_NULL) {
-+            continue;
-+          }
-+          VarType merged = getMergedType(from, to);
-+          if (merged == null) { // Types incompatible, do not merge
-+            continue;
-+          }
-+
-+          right.setConstType(merged);
-+        }
-+      }
-+      else if (expr.type == Exprent.EXPRENT_VAR) {
-+        VarExprent var = (VarExprent)expr;
-+        VarVersionPair old = new VarVersionPair(var);
-+        if (!old.equals(from)) {
-+          continue;
-+        }
-+        VarType merged = getMergedType(from, to);
-+        if (merged == null) { // Types incompatible, do not merge
-+          continue;
-+        }
-+
-+        var.setIndex(to.var);
-+        var.setVersion(to.version);
-+        var.setVarType(merged);
-+        if (var.isDefinition()) {
-+          var.setDefinition(false);
-+        }
-+        varproc.setVarType(to, merged);
-+        remapped = true;
-+      }
-+    }
-+    return remapped;
-+  }
-+
-+  private VarType getMergedType(VarVersionPair from, VarVersionPair to) {
-+    Map<VarVersionPair, VarType> minTypes = varproc.getVarVersions().getTypeProcessor().getMinExprentTypes();
-+    Map<VarVersionPair, VarType> maxTypes = varproc.getVarVersions().getTypeProcessor().getMaxExprentTypes();
-+    return getMergedType(minTypes.get(from), minTypes.get(to), maxTypes.get(from), maxTypes.get(to));
-+  }
-+
-+  private VarType getMergedType(VarType fromMin, VarType toMin, VarType fromMax, VarType toMax) {
-+    if (fromMin != null && fromMin.equals(toMin)) {
-+      return fromMin; // Short circuit this for simplicities sake
-+    }
-+    VarType type = fromMin == null ? toMin : (toMin == null ? fromMin : VarType.getCommonSupertype(fromMin, toMin));
-+    if (type == null || fromMin == null || toMin == null) {
-+      return null; // no common supertype, skip the remapping
-+    }
-+    if (type.getType() == CodeConstants.TYPE_OBJECT) {
-+      if (toMax != null) { // The target var is used in direct invocations
-+        if (fromMax != null) {
-+          // Max types are the highest class that this variable is used as a direct instance of without any casts.
-+          // This will pull up the to var type if the from requires a higher class type.
-+          // EXA: Collection -> List
-+          if (DecompilerContext.getStructContext().instanceOf(fromMax.getValue(), toMax.getValue()))
-+            return fromMax;
-+        } else if (fromMin != null) {
-+          // Pull to up to from: List -> ArrayList
-+          if (DecompilerContext.getStructContext().instanceOf(fromMin.getValue(), toMax.getValue()))
-+            return fromMin;
-+        }
-+      } else if (toMin != null) {
-+        if (fromMax != null) {
-+          if (DecompilerContext.getStructContext().instanceOf(fromMax.getValue(), toMin.getValue()))
-+            return fromMax;
-+        } else if (fromMin != null) {
-+          if (DecompilerContext.getStructContext().instanceOf(toMin.getValue(), fromMin.getValue()))
-+            return toMin;
-+        }
-+      }
-+      return null;
-+    } else {
-+      return type;
-+    }
-+  }
-+
-+  private void propogateLVTs(Statement stat) {
-+    MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
-+    Map<VarVersionPair, VarInfo> types = new LinkedHashMap<>();
-+
-+    if (varproc.hasLVT()) {
-+      int index = 0;
-+      if (!mt.hasModifier(CodeConstants.ACC_STATIC)) {
-+        List<LocalVariable> lvt = varproc.getCandidates(index); // Some enums give incomplete lvts?
-+        if (lvt != null && lvt.size() > 0) {
-+          types.put(new VarVersionPair(index, 0), new VarInfo(lvt.get(0), null));
-+        }
-+        index++;
-+      }
-+
-+      for (VarType var : md.params) {
-+        List<LocalVariable> lvt = varproc.getCandidates(index); // Some enums give incomplete lvts?
-+        if (lvt != null && lvt.size() > 0) {
-+          types.put(new VarVersionPair(index, 0), new VarInfo(lvt.get(0), null));
-+        }
-+        index += var.getStackSize();
-+      }
-+    }
-+
-+    findTypes(stat, types);
-+
-+    Map<VarVersionPair,String> typeNames = new LinkedHashMap<>();
-+    for (Entry<VarVersionPair, VarInfo> e : types.entrySet()) {
-+      typeNames.put(e.getKey(), e.getValue().getCast());
-+    }
-+    Map<VarVersionPair, LocalVariable> lvts = new HashMap<>();
-+
-+    for (Entry<VarVersionPair, VarInfo> e : types.entrySet()) {
-+      VarVersionPair idx = e.getKey();
-+      // skip this. we can't rename it
-+      if (idx.var == 0 && !mt.hasModifier(CodeConstants.ACC_STATIC)) {
-+        continue;
-+      }
-+      LocalVariable lvt = e.getValue().getLVT();
-+      if (lvt != null) {
-+        varproc.setVarLVT(idx, lvt);
-+        lvts.put(idx, lvt);
-+      }
-+    }
-+
-+
-+    applyTypes(stat, lvts);
-+  }
-+
-+  private void findTypes(Statement stat, Map<VarVersionPair, VarInfo> types) {
-+    if (stat == null) {
-+      return;
-+    }
-+
-+    for (Exprent exp : stat.getVarDefinitions()) {
-+      findTypes(exp, types);
-+    }
-+
-+    if (stat.getExprents() == null) {
-+      for (Object obj : stat.getSequentialObjects()) {
-+        if (obj instanceof Statement) {
-+          findTypes((Statement)obj, types);
-+        }
-+        else if (obj instanceof Exprent) {
-+          findTypes((Exprent)obj, types);
-+        }
-+      }
-+    }
-+    else {
-+      for (Exprent exp : stat.getExprents()) {
-+        findTypes(exp, types);
-+      }
-+    }
-+  }
-+
-+  private void findTypes(Exprent exp, Map<VarVersionPair, VarInfo> types) {
-+    List<Exprent> lst = exp.getAllExprents(true);
-+    lst.add(exp);
-+
-+    for (Exprent exprent : lst) {
-+      if (exprent.type == Exprent.EXPRENT_VAR) {
-+        VarExprent var = (VarExprent)exprent;
-+        VarVersionPair ver = new VarVersionPair(var);
-+        if (var.isDefinition()) {
-+          types.put(ver, new VarInfo(var.getLVT(), var.getVarType()));
-+        } else {
-+          VarInfo existing = types.get(ver);
-+          if (existing == null)
-+            existing = new VarInfo(var.getLVT(), var.getVarType());
-+          else if (existing.getLVT() == null && var.getLVT() != null)
-+            existing = new VarInfo(var.getLVT(), existing.getType());
-+          types.put(ver, existing);
-+        }
-+      }
-+    }
-+  }
-+
-+  private void applyTypes(Statement stat, Map<VarVersionPair, LocalVariable> types) {
-+    if (stat == null || types.size() == 0) {
-+      return;
-+    }
-+
-+    for (Exprent exp : stat.getVarDefinitions()) {
-+      applyTypes(exp, types);
-+    }
-+
-+    if (stat.getExprents() == null) {
-+      for (Object obj : stat.getSequentialObjects()) {
-+        if (obj instanceof Statement) {
-+          applyTypes((Statement)obj, types);
-+        }
-+        else if (obj instanceof Exprent) {
-+          applyTypes((Exprent)obj, types);
-+        }
-+      }
-+    }
-+    else {
-+      for (Exprent exp : stat.getExprents()) {
-+        applyTypes(exp, types);
-+      }
-+    }
-+  }
-+
-+  private void applyTypes(Exprent exprent, Map<VarVersionPair, LocalVariable> types) {
-+    if (exprent == null) {
-+      return;
-+    }
-+    List<Exprent> lst = exprent.getAllExprents(true);
-+    lst.add(exprent);
-+
-+    for (Exprent expr : lst) {
-+      if (expr.type == Exprent.EXPRENT_VAR) {
-+        VarExprent var = (VarExprent)expr;
-+        LocalVariable lvt = types.get(new VarVersionPair(var));
-+        if (lvt != null) {
-+          var.setLVT(lvt);
-+        } else {
-+          System.currentTimeMillis();
-+        }
-+      }
-+    }
-+  }
-+
-+  //Helper classes because Java is dumb and doesn't have a Pair<K,V> class
-+  private static class SimpleEntry<K, V> implements Entry<K, V> {
-+    private K key;
-+    private V value;
-+    public SimpleEntry(K key, V value) {
-+      this.key = key;
-+      this.value = value;
-+    }
-+    @Override public K getKey() { return key; }
-+    @Override public V getValue() { return value; }
-+    @Override
-+    public V setValue(V value) {
-+      V tmp = this.value;
-+      this.value = value;
-+      return tmp;
-+    }
-+  }
-+  private static class VPPEntry extends SimpleEntry<VarVersionPair, VarVersionPair> {
-+    public VPPEntry(VarExprent key, VarVersionPair value) {
-+        super(new VarVersionPair(key), value);
-+    }
-+  }
-+
-+  private static class VarInfo {
-+    private LocalVariable lvt;
-+    private String cast;
-+    private VarType type;
-+
-+    private VarInfo(LocalVariable lvt, VarType type) {
-+      if (lvt != null && lvt.getSignature() != null)
-+        this.cast = GenericMain.getGenericCastTypeName(new GenericType(lvt.getSignature()), Collections.emptyList());
-+      else if (lvt != null)
-+        this.cast = ExprProcessor.getCastTypeName(lvt.getVarType(), false, Collections.emptyList());
-+      else if (type != null)
-+        this.cast = ExprProcessor.getCastTypeName(type, false, Collections.emptyList());
-+      else
-+        this.cast = "this";
-+      this.lvt = lvt;
-+      this.type = type;
-+    }
-+
-+    public LocalVariable getLVT() {
-+      return this.lvt;
-+    }
-+
-+    public String getCast() {
-+      return this.cast;
-+    }
-+
-+    public VarType getType() {
-+      return this.type;
-+    }
-+  }
-+
-+  private static boolean isVarReadFirst(VarVersionPair var, Statement stat, int index, VarExprent... whitelist) {
-+    if (stat.getExprents() == null) {
-+      List<Object> objs = stat.getSequentialObjects();
-+      for (int x = index; x < objs.size(); x++) {
-+        Object obj = objs.get(x);
-+        if (obj instanceof Statement) {
-+          if (isVarReadFirst(var, (Statement)obj, 0, whitelist)) {
-+            return true;
-+          }
-+        }
-+        else if (obj instanceof Exprent) {
-+          if (isVarReadFirst(var, (Exprent)obj, whitelist)) {
-+            return true;
-+          }
-+        }
-+      }
-+    }
-+    else {
-+      for (int x = index; x < stat.getExprents().size(); x++) {
-+        if (isVarReadFirst(var, stat.getExprents().get(x), whitelist)) {
-+          return true;
-+        }
-+      }
-+    }
-+    return false;
-+  }
-+
-+  private static boolean isVarReadFirst(VarVersionPair target, Exprent exp, VarExprent... whitelist) {
-+    AssignmentExprent ass = exp.type == Exprent.EXPRENT_ASSIGNMENT ? (AssignmentExprent)exp : null;
-+    List<Exprent> lst = exp.getAllExprents(true);
-+    lst.add(exp);
-+    for (Exprent ex : lst) {
-+      if (ex.type == Exprent.EXPRENT_VAR) {
-+        VarExprent var = (VarExprent)ex;
-+        if (var.getIndex() == target.var && var.getVersion() == target.version) {
-+          boolean allowed = false;
-+          if (ass != null) {
-+            if (var == ass.getLeft()) {
-+              allowed = true;
-+            }
-+          }
-+          for (VarExprent white : whitelist) {
-+            if (var == white) {
-+              allowed = true;
-+            }
-+          }
-+          if (!allowed) {
-+            return true;
-+          }
-+        }
-+      }
-+    }
-+    return false;
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-index 33c4c3efcf7d9b26737717a2445bffad0db5c4c0..559c96b54667b5b9a051039fdbb3643f8c8601b5 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-@@ -5,16 +5,20 @@ import org.jetbrains.java.decompiler.code.CodeConstants;
- import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
- import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
- import org.jetbrains.java.decompiler.struct.StructClass;
- import org.jetbrains.java.decompiler.struct.StructMethod;
-+import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute.LocalVariable;
- import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
-+import org.jetbrains.java.decompiler.util.StartEndPair;
- import org.jetbrains.java.decompiler.util.TextUtil;
- 
- import java.util.*;
- import java.util.Map.Entry;
-+import java.util.stream.Collectors;
- 
- public class VarProcessor {
-   public static final int VAR_NON_FINAL = 1;
-@@ -25,6 +29,7 @@ public class VarProcessor {
-   private final StructMethod method;
-   private final MethodDescriptor methodDescriptor;
-   private Map<VarVersionPair, String> mapVarNames = new HashMap<>();
-+  private Map<VarVersionPair, LocalVariable> mapVarLVTs = new HashMap<>();
-   private VarVersionsProcessor varVersions;
-   private final Map<VarVersionPair, String> thisVars = new HashMap<>();
-   private final Set<VarVersionPair> externalVars = new HashSet<>();
-@@ -52,12 +57,12 @@ public class VarProcessor {
-     new VarDefinitionHelper(root, method, this).setVarDefinitions();
-   }
- 
--  public void setDebugVarNames(Map<Integer, String> mapDebugVarNames) {
-+  public void setDebugVarNames(Map<VarVersionPair, String> mapDebugVarNames) {
-     if (varVersions == null) {
-       return;
-     }
- 
--    Map<Integer, Integer> mapOriginalVarIndices = varVersions.getMapOriginalVarIndices();
-+    Map<Integer, VarVersionPair> mapOriginalVarIndices = varVersions.getMapOriginalVarIndices();
- 
-     List<VarVersionPair> listVars = new ArrayList<>(mapVarNames.keySet());
-     listVars.sort(Comparator.comparingInt(o -> o.var));
-@@ -67,18 +72,20 @@ public class VarProcessor {
-     for (VarVersionPair pair : listVars) {
-       String name = mapVarNames.get(pair);
- 
--      Integer index = mapOriginalVarIndices.get(pair.var);
--      if (index != null) {
--        String debugName = mapDebugVarNames.get(index);
-+      boolean lvtName = false;
-+      VarVersionPair key = mapOriginalVarIndices.get(pair.var);
-+      if (key != null) {
-+        String debugName = mapDebugVarNames.get(key);
-         if (debugName != null && TextUtil.isValidIdentifier(debugName, method.getBytecodeVersion())) {
-           name = debugName;
-+          lvtName = true;
-         }
-       }
- 
-       Integer counter = mapNames.get(name);
-       mapNames.put(name, counter == null ? counter = 0 : ++counter);
- 
--      if (counter > 0) {
-+      if (counter > 0 && !lvtName) {
-         name += String.valueOf(counter);
-       }
- 
-@@ -87,7 +94,11 @@ public class VarProcessor {
-   }
- 
-   public Integer getVarOriginalIndex(int index) {
--    return varVersions == null ? null : varVersions.getMapOriginalVarIndices().get(index);
-+    if (varVersions == null) {
-+      return null;
-+    }
-+    final VarVersionPair pair = varVersions.getMapOriginalVarIndices().get(index);
-+    return pair == null ? null : pair.var;
-   }
- 
-   public void refreshVarNames(VarNamesCollector vc) {
-@@ -106,7 +117,9 @@ public class VarProcessor {
-   }
- 
-   public void setVarType(VarVersionPair pair, VarType type) {
--    varVersions.setVarType(pair, type);
-+    if (varVersions != null) {
-+      varVersions.setVarType(pair, type);
-+    }
-   }
- 
-   public String getVarName(VarVersionPair pair) {
-@@ -152,4 +165,68 @@ public class VarProcessor {
-   public int getFirstParameterPosition() {
-     return firstParameterPosition;
-   }
-+
-+  public List<LocalVariable> getCandidates(int origindex) {
-+    if (!hasLVT())
-+        return null;
-+    return method.getLocalVariableAttr().matchingVars(origindex).collect(Collectors.toList());
-+  }
-+
-+  public void findLVT(VarExprent exprent, int start) {
-+    if (!hasLVT())
-+      return;
-+
-+    LocalVariable lvt = method.getLocalVariableAttr().getVariables()
-+      .filter(v -> v.getVersion().var == exprent.getIndex() && v.getStart() == start).findFirst().orElse(null);
-+
-+    if (lvt != null) {
-+      exprent.setLVT(lvt);
-+    }
-+  }
-+
-+  public void copyVarInfo(VarVersionPair from, VarVersionPair to) {
-+    setVarName(to, getVarName(from));
-+    setVarFinal(to, getVarFinal(from));
-+    setVarType(to, getVarType(from));
-+    varVersions.getMapOriginalVarIndices().put(to.var, varVersions.getMapOriginalVarIndices().get(from.var));
-+  }
-+
-+  public boolean hasLVT() {
-+    return method.getLocalVariableAttr() != null;
-+  }
-+  
-+
-+  public Map<Integer, LocalVariable> getLocalVariables(Statement stat) {
-+    if (!hasLVT() || stat == null)
-+      return new HashMap<>();
-+
-+    final StartEndPair sep = stat.getStartEndRange(); 
-+    final Set<Integer> blacklist = new HashSet<>();
-+    Map<Integer, LocalVariable> ret = method.getLocalVariableAttr().getVariables().filter(lv -> lv.getEnd() > sep.start && lv.getStart() <= sep.end)
-+      .collect(Collectors.toMap(lv -> lv.getVersion().var, lv -> lv,
-+        (lv1, lv2) -> 
-+        {
-+          //System.out.println("DUPLICATE INDEX FOR SCOPE: (" +sep +") " + lv1.toString() + " " + lv2.toString());
-+          blacklist.add(lv1.getVersion().var);
-+          return lv1;
-+        }
-+      ));
-+
-+    for (Integer b : blacklist)
-+      ret.remove(b);
-+
-+    return ret;
-+  }
-+
-+  public VarVersionsProcessor getVarVersions() {
-+    return varVersions;
-+  }
-+
-+  public void setVarLVT(VarVersionPair var, LocalVariable lvt) {
-+    mapVarLVTs.put(var, lvt);
-+  }
-+
-+  public LocalVariable getVarLVT(VarVersionPair var) {
-+    return mapVarLVTs.get(var);
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
-index ac06d30f079427a287b62f6851f008eac39b402c..293fdc6cba46ed47259c786c940488bb1d74fba9 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
-@@ -193,7 +193,12 @@ public class VarTypeProcessor {
-       allExprents.add(currExprent);
-       for (Exprent exprent : allExprents) {
-         if (exprent.type == Exprent.EXPRENT_VAR) {
--          ((VarExprent)exprent).setVarType(VarType.VARTYPE_UNKNOWN);
-+          VarExprent ve = (VarExprent)exprent;
-+          if (ve.getLVT() != null) {
-+            ve.setVarType(ve.getLVT().getVarType());
-+          } else {
-+            ve.setVarType(VarType.VARTYPE_UNKNOWN);
-+          }
-         }
-         else if (exprent.type == Exprent.EXPRENT_CONST) {
-           ConstExprent constExprent = (ConstExprent)exprent;
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-index d6a9c2a29c73d778eb383d718094b7548d14d2f3..b11ff686109fd466c3b07e853fd433e5677fbf9e 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-@@ -22,7 +22,7 @@ import java.util.Map.Entry;
- 
- public class VarVersionsProcessor {
-   private final StructMethod method;
--  private Map<Integer, Integer> mapOriginalVarIndices = Collections.emptyMap();
-+  private Map<Integer, VarVersionPair> mapOriginalVarIndices = Collections.emptyMap();
-   private final VarTypeProcessor typeProcessor;
- 
-   public VarVersionsProcessor(StructMethod mt, MethodDescriptor md) {
-@@ -43,7 +43,7 @@ public class VarVersionsProcessor {
- 
-     typeProcessor.calculateVarTypes(root, graph);
- 
--    simpleMerge(typeProcessor, graph, method);
-+    //simpleMerge(typeProcessor, graph, method);
- 
-     // FIXME: advanced merging
- 
-@@ -245,7 +245,8 @@ public class VarVersionsProcessor {
-     CounterContainer counters = DecompilerContext.getCounterContainer();
- 
-     final Map<VarVersionPair, Integer> mapVarPaar = new HashMap<>();
--    Map<Integer, Integer> mapOriginalVarIndices = new HashMap<>();
-+    Map<Integer, VarVersionPair> mapOriginalVarIndices = new HashMap<>();
-+    mapOriginalVarIndices.putAll(this.mapOriginalVarIndices);
- 
-     // map var-version pairs on new var indexes
-     List<VarVersionPair> vvps = new ArrayList<>(mapExprentMinTypes.keySet());
-@@ -266,7 +267,7 @@ public class VarVersionsProcessor {
-         }
- 
-         mapVarPaar.put(pair, newIndex);
--        mapOriginalVarIndices.put(newIndex, pair.var);
-+        mapOriginalVarIndices.put(newIndex, pair);
-       }
-     }
- 
-@@ -296,11 +297,11 @@ public class VarVersionsProcessor {
-     });
- 
-     if (previousVersionsProcessor != null) {
--      Map<Integer, Integer> oldIndices = previousVersionsProcessor.getMapOriginalVarIndices();
-+      Map<Integer, VarVersionPair> oldIndices = previousVersionsProcessor.getMapOriginalVarIndices();
-       this.mapOriginalVarIndices = new HashMap<>(mapOriginalVarIndices.size());
--      for (Entry<Integer, Integer> entry : mapOriginalVarIndices.entrySet()) {
--        Integer value = entry.getValue();
--        Integer oldValue = oldIndices.get(value);
-+      for (Entry<Integer, VarVersionPair> entry : mapOriginalVarIndices.entrySet()) {
-+        VarVersionPair value = entry.getValue();
-+        VarVersionPair oldValue = oldIndices.get(value.var);
-         value = oldValue != null ? oldValue : value;
-         this.mapOriginalVarIndices.put(entry.getKey(), value);
-       }
-@@ -327,7 +328,11 @@ public class VarVersionsProcessor {
-     typeProcessor.getFinalVariables().put(pair, finalType);
-   }
- 
--  public Map<Integer, Integer> getMapOriginalVarIndices() {
-+  public Map<Integer, VarVersionPair> getMapOriginalVarIndices() {
-     return mapOriginalVarIndices;
-   }
-+
-+  public VarTypeProcessor getTypeProcessor() {
-+    return typeProcessor;
-+  }
- }
-\ No newline at end of file
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructContext.java b/src/org/jetbrains/java/decompiler/struct/StructContext.java
-index a929aca1f633a76660111010256dae0ef014f6fd..2f55882afdd1dd1b9960aa0c2a007069204797e9 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructContext.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructContext.java
-@@ -164,4 +164,30 @@ public class StructContext {
-   public Map<String, StructClass> getClasses() {
-     return classes;
-   }
-+
-+  public boolean instanceOf(String valclass, String refclass) {
-+    if (valclass.equals(refclass)) {
-+      return true;
-+    }
-+
-+    StructClass cl = this.getClass(valclass);
-+    if (cl == null) {
-+      return false;
-+    }
-+
-+    if (cl.superClass != null && this.instanceOf(cl.superClass.getString(), refclass)) {
-+      return true;
-+    }
-+
-+    int[] interfaces = cl.getInterfaces();
-+    for (int i = 0; i < interfaces.length; i++) {
-+      String intfc = cl.getPool().getPrimitiveConstant(interfaces[i]).getString();
-+
-+      if (this.instanceOf(intfc, refclass)) {
-+        return true;
-+      }
-+    }
-+
-+    return false;
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructMember.java b/src/org/jetbrains/java/decompiler/struct/StructMember.java
-index 2802eeb66f3144e8b552bd0f14674f768de51219..fb981815b90be8e4ac95bca68d3a8faebdf96b7d 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructMember.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructMember.java
-@@ -18,9 +18,11 @@ import java.util.*;
- import java.util.stream.Collectors;
- import java.util.stream.Stream;
- 
-+import static org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute.*;
-+
- public abstract class StructMember {
--  private final int accessFlags;
--  private final Map<String, StructGeneralAttribute> attributes;
-+  protected int accessFlags;
-+  protected Map<String, StructGeneralAttribute> attributes;
- 
-   protected StructMember(int accessFlags, Map<String, StructGeneralAttribute> attributes) {
-     this.accessFlags = accessFlags;
-@@ -111,6 +113,20 @@ public abstract class StructMember {
-       }
-     }
- 
-+    if (attributes.containsKey(ATTRIBUTE_LOCAL_VARIABLE_TABLE.name) && attributes.containsKey(ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE.name))
-+      ((StructLocalVariableTableAttribute)attributes.get(ATTRIBUTE_LOCAL_VARIABLE_TABLE.name)).mergeSignatures((StructLocalVariableTypeTableAttribute)attributes.get(ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE.name));
-     return attributes;
-   }
-+
-+  protected StructGeneralAttribute readAttribute(DataInputFullStream in, ConstantPool pool, String name) throws IOException {
-+    StructGeneralAttribute attribute = StructGeneralAttribute.createAttribute(name);
-+    int length = in.readInt();
-+    if (attribute == null) {
-+      in.discard(length);
-+    }
-+    else {
-+      attribute.initContent(in, pool);
-+    }
-+    return attribute;
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-index 465687e365cc32acac0d5aef20e96b5af209f7d6..ebc0b97de43fcd3f7e629031fb5da58f24b798ea 100644
---- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-@@ -1,7 +1,10 @@
- // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- package org.jetbrains.java.decompiler.struct.attr;
- 
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
-+import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
- import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
-+import org.jetbrains.java.decompiler.struct.gen.VarType;
- import org.jetbrains.java.decompiler.util.DataInputFullStream;
- 
- import java.io.IOException;
-@@ -21,12 +24,14 @@ import java.util.stream.Stream;
- */
- public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
-   private List<LocalVariable> localVariables = Collections.emptyList();
-+  private Map<Integer, Integer> indexVersion = new HashMap<>();
- 
-   @Override
-   public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
-     int len = data.readUnsignedShort();
-     if (len > 0) {
-       localVariables = new ArrayList<>(len);
-+      indexVersion = new HashMap<>();
- 
-       for (int i = 0; i < len; i++) {
-         int start_pc = data.readUnsignedShort();
-@@ -40,6 +45,8 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
-                                              pool.getPrimitiveConstant(descriptorIndex).getString(),
-                                              varIndex));
-       }
-+      Collections.sort(localVariables);
-+      versionVariables(localVariables);
-     }
-     else {
-       localVariables = Collections.emptyList();
-@@ -48,6 +55,7 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
- 
-   public void add(StructLocalVariableTableAttribute attr) {
-     localVariables.addAll(attr.localVariables);
-+    versionVariables(localVariables);
-   }
- 
-   public String getName(int index, int visibleOffset) {
-@@ -58,24 +66,57 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
-     return matchingVars(index, visibleOffset).map(v -> v.descriptor).findFirst().orElse(null);
-   }
- 
--  private Stream<LocalVariable> matchingVars(int index, int visibleOffset) {
-+  public Stream<LocalVariable> matchingVars(int index, int visibleOffset) {
-     return localVariables.stream().filter(v -> v.index == index && (visibleOffset >= v.start_pc && visibleOffset < v.start_pc + v.length));
-   }
- 
-+  public Stream<LocalVariable> matchingVars(int index) {
-+    return localVariables.stream().filter(v -> v.index == index);
-+  }
-+
-+  public Stream<LocalVariable> matchingVars(Statement stat) {
-+    BitSet values = new BitSet();
-+    stat.getOffset(values);
-+    return getRange(values.nextSetBit(0), values.length() - 1);
-+  }
-+
-+  public Stream<LocalVariable> getRange(int start, int end) {
-+    return localVariables.stream().filter(v -> v.getStart() >= start && v.getEnd() <= end);
-+  }
-+
-   public boolean containsName(String name) {
-     return localVariables.stream().anyMatch(v -> Objects.equals(v.name, name));
-   }
- 
--  public Map<Integer, String> getMapParamNames() {
--    return localVariables.stream().filter(v -> v.start_pc == 0).collect(Collectors.toMap(v -> v.index, v -> v.name, (n1, n2) -> n2));
-+  public Map<VarVersionPair, String> getMapNames() {
-+    return localVariables.stream().collect(Collectors.toMap(v -> v.version, v -> v.name, (n1, n2) -> n2));
-   }
- 
--  private static final class LocalVariable {
-+  public Stream<LocalVariable> getVariables() {
-+    return localVariables.stream();
-+  }
-+  
-+  private void versionVariables(List<LocalVariable> vars) {
-+    for (LocalVariable var : vars) {
-+      Integer version = indexVersion.get(var.index);
-+      version = version == null ? 1 : version++;
-+      indexVersion.put(var.index, version);
-+      var.version = new VarVersionPair(var.index, version.intValue());
-+    }
-+  }
-+
-+  public void mergeSignatures(StructLocalVariableTypeTableAttribute lvtt) {
-+      lvtt.backingAttribute.localVariables.stream().forEach(type -> localVariables.stream().filter(t -> t.compareTo(type) == 0).findFirst().ifPresent(lv -> lv.signature = type.descriptor));
-+  }
-+
-+  public static class LocalVariable implements Comparable<LocalVariable> {
-     final int start_pc;
-     final int length;
-     final String name;
-     final String descriptor;
-     final int index;
-+    private String signature;
-+    private VarVersionPair version;
- 
-     private LocalVariable(int start_pc, int length, String name, String descriptor, int index) {
-       this.start_pc = start_pc;
-@@ -83,6 +124,53 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
-       this.name = name;
-       this.descriptor = descriptor;
-       this.index = index;
-+      this.version = new VarVersionPair(index, 0);
-+    }
-+
-+    @Override
-+    public int compareTo(LocalVariable o) {
-+      if (this.index != o.index) return this.index - o.index;
-+      if (this.start_pc != o.start_pc) return this.start_pc - o.start_pc;
-+      return this.length - o.length;
-+    }
-+    
-+    public String getName() {
-+      return name;
-+    }
-+
-+    public String getDescriptor() {
-+      return descriptor;
-+    }
-+
-+    public String getSignature() {
-+      return signature;
-+    }
-+    
-+    public int getStart() {
-+      return start_pc;
-+    }
-+
-+    public int getEnd() {
-+      return start_pc + length;
-+    }
-+
-+    public VarVersionPair getVersion() {
-+      return version;
-+    }
-+
-+    public VarType getVarType() {
-+      return new VarType(descriptor);
-+    }
-+    
-+    @Override
-+    public String toString() {
-+      return "\'("+index+","+start_pc+'-'+getEnd()+")"+descriptor+(signature!=null ? "<"+signature+"> ":" ")+name+"\'";
-+    }
-+
-+    public LocalVariable rename(String newName) {
-+      LocalVariable ret = new LocalVariable(start_pc, length, newName, descriptor, index);
-+      ret.signature = signature;
-+      return ret;
-     }
-   }
- }
-diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java
-index 829c78e8a1361bb88cb700696c22af4f7d36349d..cfdda0f2830307d34dfcc3c0a0714f6e0693f3eb 100644
---- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java
-+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java
-@@ -17,7 +17,7 @@ import java.io.IOException;
- */
- public class StructLocalVariableTypeTableAttribute extends StructGeneralAttribute {
-   // store signature instead of descriptor
--  private final StructLocalVariableTableAttribute backingAttribute = new StructLocalVariableTableAttribute();
-+  final StructLocalVariableTableAttribute backingAttribute = new StructLocalVariableTableAttribute();
- 
-   @Override
-   public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
-diff --git a/src/org/jetbrains/java/decompiler/util/DebugPrinter.java b/src/org/jetbrains/java/decompiler/util/DebugPrinter.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..311db9ff7f0c543b3d131f588baed0d92394d93c
---- /dev/null
-+++ b/src/org/jetbrains/java/decompiler/util/DebugPrinter.java
-@@ -0,0 +1,92 @@
-+package org.jetbrains.java.decompiler.util;
-+
-+import java.util.BitSet;
-+
-+import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
-+import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.*;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.*;
-+import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
-+
-+//Debug printer useful for visualizing objects, no real functional value
-+public class DebugPrinter {
-+  public static void printMethod(Statement root, String name, VarProcessor varProc) {
-+    System.out.println(name + "{");
-+    if (root == null || root.getSequentialObjects() == null) {
-+      System.out.println("}");
-+      return;
-+    }
-+
-+    for (Object obj : root.getSequentialObjects()) {
-+      if (obj instanceof Statement) {
-+        printStatement((Statement)obj, "  ", varProc);
-+      } else if (obj == null) {
-+        System.out.println("  null");
-+      } else {
-+        System.out.println("  " + obj.getClass().getSimpleName());
-+      }
-+    }
-+
-+    if (root.type == Statement.StatementType.ROOT) {
-+      printStatement(((RootStatement)root).getDummyExit(), "  ", varProc);
-+    }
-+    System.out.println("}");
-+  }
-+
-+  public static void printStatement(Statement statement, String indent, VarProcessor varProc) {
-+    BitSet values = new BitSet();
-+    statement.getOffset(values);
-+    int start = values.nextSetBit(0);
-+    int end = values.length()-1;
-+
-+    System.out.println(indent + '{' + statement.getClass().getSimpleName() + "}:" + statement.id + "  (" + start + ", " + end + ")");
-+
-+    for (StatEdge edge : statement.getAllSuccessorEdges()) {
-+      System.out.println(indent + " Dest: " + edge.getDestination());
-+    }
-+
-+    if (statement.getExprents() != null) {
-+      for(Exprent exp : statement.getExprents()) {
-+        System.out.println(printExprent(indent + "  ", exp, varProc));
-+      }
-+    }
-+
-+    indent += "  ";
-+    for (Object obj : statement.getSequentialObjects()) {
-+      if (obj == null) {
-+        System.out.println(indent + " Null");
-+      } else if (obj instanceof Statement) {
-+        printStatement((Statement)obj, indent, varProc);
-+      } else if (obj instanceof Exprent) {
-+          System.out.println(printExprent(indent, (Exprent) obj, varProc));
-+      } else {
-+        System.out.println(indent + obj.getClass().getSimpleName());
-+      }
-+    }
-+  }
-+
-+  private static String printExprent(String indent, Exprent exp, VarProcessor varProc) {
-+      StringBuffer sb = new StringBuffer();
-+      sb.append(indent);
-+      BitSet values = new BitSet();
-+      exp.getBytecodeRange(values);
-+      sb.append("(").append(values.nextSetBit(0)).append(", ").append(values.length()-1).append(") ");
-+      sb.append(exp.getClass().getSimpleName());
-+      sb.append(" ").append(exp.id).append(" ");
-+      if (exp instanceof VarExprent) {
-+        VarExprent varExprent = (VarExprent)exp;
-+        int currindex = varExprent.getIndex();
-+        int origindex = varProc == null ? -2 : varProc.getVarOriginalIndex(currindex);
-+        sb.append("[").append(currindex).append(":").append(origindex).append(", ").append(varExprent.isStack()).append("]");
-+        if (varProc != null) {
-+          sb.append(varProc.getCandidates(origindex));
-+        }
-+      } else if (exp instanceof AssignmentExprent) {
-+        AssignmentExprent assignmentExprent = (AssignmentExprent)exp;
-+        sb.append("{").append(printExprent(" ",assignmentExprent.getLeft(),varProc)).append(" =").append(printExprent(" ",assignmentExprent.getRight(),varProc)).append("}");
-+      } else if (exp instanceof IfExprent) {
-+        sb.append(' ').append(exp.toJava(0, new BytecodeMappingTracer()));
-+      }
-+      return sb.toString();
-+  }
-+}
-diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..388e1facddbac3286eaed3dbccc3b23197daf5d6
---- /dev/null
-+++ b/test/org/jetbrains/java/decompiler/LVTTest.java
-@@ -0,0 +1,49 @@
-+/*
-+ * Copyright 2000-2014 JetBrains s.r.o.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+package org.jetbrains.java.decompiler;
-+
-+import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
-+import org.junit.Test;
-+
-+import java.io.IOException;
-+import java.util.Map;
-+
-+public class LVTTest extends SingleClassesTestBase {
-+  @Override
-+  protected Map<String, String> getDecompilerOptions() {
-+    return Map.of(
-+      IFernflowerPreferences.DECOMPILE_INNER,"1",
-+      IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES,"1",
-+      IFernflowerPreferences.ASCII_STRING_CHARACTERS,"1",
-+      IFernflowerPreferences.LOG_LEVEL, "TRACE",
-+      IFernflowerPreferences.REMOVE_SYNTHETIC, "1",
-+      IFernflowerPreferences.REMOVE_BRIDGE, "1",
-+      IFernflowerPreferences.USE_DEBUG_VAR_NAMES, "1"
-+    );
-+  }
-+
-+  @Override
-+  public void setUp() throws IOException {
-+      super.setUp();
-+      fixture.setCleanup(false);
-+  }
-+
-+  @Test public void testLVT() { doTest("pkg/TestLVT"); }
-+  @Test public void testScoping() { doTest("pkg/TestLVTScoping"); }
-+  @Test public void testLVTComplex() { doTest("pkg/TestLVTComplex"); }
-+  @Test public void testVarType() { doTest("pkg/TestVarType"); }
-+  @Test public void testLoopMerging() { doTest("pkg/TestLoopMerging"); }
-+}
-diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
-index 89adb4e6fca7186ae849e62b98a9253de2dd29ef..dd0e178cc1df1c6edc9e77e3149c2b0e9bffe884 100644
---- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
-+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
-@@ -26,6 +26,7 @@ public class SingleClassesTest extends SingleClassesTestBase {
-                          IFernflowerPreferences.VERIFY_ANONYMOUS_CLASSES, "1");
-   }
- 
-+  @Test public void testEnhancedForLoops() { doTest("pkg/TestEnhancedForLoops"); }
-   @Test public void testPrimitiveNarrowing() { doTest("pkg/TestPrimitiveNarrowing"); }
-   @Test public void testClassFields() { doTest("pkg/TestClassFields"); }
-   @Test public void testInterfaceFields() { doTest("pkg/TestInterfaceFields"); }
-diff --git a/testData/bulk/pkg/res/Loader.java b/testData/bulk/pkg/res/Loader.java
-index cdb1db5b9d381f4766555df788d5e6fefc09d059..5e4c220660b40e5ba8a7f13b5516b01724c9d2d6 100644
---- a/testData/bulk/pkg/res/Loader.java
-+++ b/testData/bulk/pkg/res/Loader.java
-@@ -17,8 +17,8 @@ public class Loader {
-             stream.read(bytes);
-             stream.close();
-             return new String(bytes, "UTF-8");
--         } catch (Exception var5) {
--            throw new RuntimeException("Resource load failed", var5);
-+         } catch (Exception e) {
-+            throw new RuntimeException("Resource load failed", e);
-          }
-       }
-    }
-diff --git a/testData/classes/pkg/TestEnhancedForLoops.class b/testData/classes/pkg/TestEnhancedForLoops.class
-new file mode 100644
-index 0000000000000000000000000000000000000000..bdb8a786b1c9e708620e423c250c63925ac12493
-GIT binary patch
-literal 1725
-zcmaKsUsD@Z7{;HIY;w}D{3(#oR-uT61_;E)ib^mx)S}Tqs!%koH%nMy+pwG2Y@BlM
-zm+(?=dgF~=q(kd;y!Os7;f&wF=}g7v>?S~<EyJ8W=RNOv-{13`1AqSa<QahL_%@DV
-zWY6JUT#w^DEJ(Z`hlXqqX7E7|X7QmK7A10Odr9J>IC_wm_&APUWMjCYz6CWbtKp`^
-zCla>=qDz)-d3k|wYI;*ZyXkD30{tb+HrJYaTc*2VY}FVUEIC!9wrRMQTDOCmw`(;7
-zE|uyJb}}1g!@Fhg8g|v(UUA%#<J22Df!KGBTX0=tpS^6qqJSt0$Y8<ap?h5Ru6suH
-z!KzXBOG}Ik=sa2UJkvEi$K~mU=UVoTLb-2zZ)9qQy^~q@V{9XXU6vaNwws<+%ap8!
-z$IWCn{C>S7;L54orL(2;If)gCPX&fg^4zhvoQFP+uxOiQdu%=VnsP<kGj~ikmnTnr
-z-D$d2bH!55UVNEx^Gc$Q1d<Y;=_ulJi7#}NuqrU*%lGy9#ww9I)=<`Q8(-@93hQ*?
-zv`6ajhQRsbc$-Ma9q{HyjyD2Rmz!2?+obVw)2KDg#c>^9;~O<pblk-~feWv?_OABj
-zt@~!x6X-j}R>Zu=<3RD~mQQl;H#~EXFVkr<I}vzmIhosh1|AtrV~<`2ZghvqTvtgo
-zn^%)6s)rr3j#?yB(<kn!)0(B^uF+UCAF>($81C|@?JtHq`TmOw<S;vtI{R3HPPXSe
-z=9l5qjvDp4X>SY6z3jx9B5mK<;Z35yW;^CN!A<dLb|D7Q9NxkZ|7)lp4dg|V;|Nz7
-zeg(ggna2>nauUJ?j!{3Dz(vmWAOV-~23JHmI{XWZMHwp$M1PN0!dkhaMaq>(v|NeG
-zaz)0<mDoVET$)`?Kg)*~w1hVLGe*)0ZGIv08$yXl3*jF$@#yd$)i~@oP9nnj2*$X|
-zvi%~zH`rK#j58;T7)H6PvI=daF}#h-+!a)*&V~*#g^0wE!~}l@_5I5Nf@vMuKT)T~
-z<hiHNDvuE<%^n~su$n%A6!?*p2Z#y$fpcploogZf=<shvshyx4Bg<t>u=6xKr#b6T
-zPC()cCdtbdZORzeQ@Bcu6r;-2ATr(N?nCGW`Xy#0W}nk!!HOMR8s+0IzXCVi!R={5
-z&y)BmdMT@Ku)l?Y(H73PFz9Re>$HYRQcRKTD)QtiP)SF_BxiGUT4`85(y)m6QyNr6
-Sy&~m(w}xwszQbq;*Zv0xhj@4Z
-
-literal 0
-HcmV?d00001
-
-diff --git a/testData/classes/pkg/TestLVT.class b/testData/classes/pkg/TestLVT.class
-new file mode 100644
-index 0000000000000000000000000000000000000000..0477af41e18fb06d5d18e3f5b693bfbb59f4ee06
-GIT binary patch
-literal 1780
-zcmaJ?-%}e^6#j0w*<U0OLJ~?vidrRUOCxP5HXzWJB8dU2!D#(em#_odh9r}0oZ;PP
-zpLo&fgQH{ntmC9pJL4bF|Hjvj)B4?PFhQ8!$(}uX?m6H2alh<7d-3OA0ItBc@H&<Z
-zTsCmUz@&kcj_VdQEa|vm!N8IdH<egc;+7ICCO*Kbg)DMGqNrsV_|QOJ$C`zhAGEF<
-zHnhbjKdAMiw)nTN=(w%pBLQvRt+?KTKwmOd6p%No+m66s-mN(6&AlzBzG-ijX^G~m
-zCA(a->#ln47^S!CHUz@?+WnpMrql59#mzZl?m6CWbz5LEnZIX$Yp2V0WhY(m>TYFc
-z?zlze)f%O0&AFuV9E%Xp{asriSgE=VmJ{*anx0!u=iP?Ktg=zF_XLE?E2~;)1GPQY
-z>>3?JP9R`UE5Ss5Mn3uA(*#c(?Qy?$*yq_EER}7(r^t=1drrxlTVR5j9yg{u!RzF>
-zaKW=n_ZiV1tB#LZls`fiCDgUdYfHc?RGamZv*M}~33Ud3QS}+ZIL-(RcYD5GuiN{o
-zSb>rMkMu^<EpI#Z5DM5-;u9r`A$*F@bleHyb9|xW%MiZ8*8+w={PP@@d8o3cp>C>G
-zyRpma706u`^o>A&4<mS5-2(h^9WnXD;EC9^no}WdrcR(us%Lb5K&J`LeJq)M)%Fp%
-z&T+lU-|(u3CB>4*9htDFpTd5_b4a_sYLk<W`&GKt^lg&eBaCD3F~C2Uqh=m*O*xe-
-zj611g{w>Cmx#I<N8<)xDR1t4rjIR&1`XCe!C@1)o=3Vd}JogylH!1<Tf^QXNH1H;6
-z$alb7ILjv!Z{r<WCIIma5*BR_qk*+(-+JFw8J7|3XRJhJCKwH7w5QPSJcgdppTeMG
-zUTDD@4Jx5g#AOTpqk0RW7Qz|hcMOagEew7q#iN%`%vqU`F+>g?ARCQlwCJ!xi4i59
-zF*<Nlhe!&<N)Rrg5ZZ92f-?!1kd{3wAHDoTbtl{1tzd|{#ZmOL(-0yE^Hn&2QyAoa
-z1h=@qMtcFnxXYaq;@Cj~HH_eZUJq#h6{p+N`JQnxT*D-i2y$-*DQX&VF5n!_LnoR+
-zJxOUIhbdfS6{SvuMqEEaC%TGA)9;`YVWNl)M!d@iP8rigQR^WtQ6r!53ocU&FyBx7
-zL?mgM;eMihiVE#2^ZU57#C)&4CttwSag9Im9NB*mkk7GBw9J2`XtERaxi~YhI+)`e
-zCsU;sMq)U%8pG+Xp-Y!>rUCgCAhRT4!lcI#M-b<T#z`DSqX`yA$PSGH^q#{!(@MOC
-O_o*pfF3=-@#eV^Z#ekpy
-
-literal 0
-HcmV?d00001
-
-diff --git a/testData/classes/pkg/TestLVTComplex$1.class b/testData/classes/pkg/TestLVTComplex$1.class
-new file mode 100644
-index 0000000000000000000000000000000000000000..bac7e3274fc9774ff69494f7bffe31bae9dec986
-GIT binary patch
-literal 665
-zcmZ`%O>fgc5PfUA*(A8sq+e+Yv;`9q4n#=YKnM}FqQYqoiNc|$jk8KN-FhS2Df}bO
-zfP@f2{Q>+a#H>L=RYCIX%$uEg<9)k7etx?I@Dz`#*ur)N9Q6uCI~F!Lb}hKgaff4%
-z;UFBmQ+Yh=iAA_Ln}$P~<<V%^HRlU0--oZvn87(cW+*?8wMta}g28RIM+{!qOeDiv
-zq!M|uJRi$+D8`yHwaCOmk3_00{*zoC<RU(!DFvp#V5knvGL7YtvQ6t(2S1*R3qj<E
-zNvut#l4(!oGc)1X=Q!|jAEA#5sy-f|>Ej_<3=P}T(IT04PRw8#&yJMTlfyJMsgE|A
-z3>$R7&eb{L69)e{No3m9BFkjP5d7uokLNPZ=|tBX8Mdw`f6L_-qLnU$URu80R{J#i
-zckMIM_BCl+|NlNW=|m+$7phaK6ZM0Ay3#UTF$?Ne1RD{)0iXOTp*dWNfYw*A%kS0C
-za6Z}3{Q}SHe}MO<fF*(}1^ftycs8(&71T-FCV3Y(iJ?^R>|l*zhb$oT;l1U!g`Qog
-du2$@=Q$OHglh(UrHLB<25tQk<ZQ|a`#xFA~koEuo
-
-literal 0
-HcmV?d00001
-
-diff --git a/testData/classes/pkg/TestLVTComplex$Bob.class b/testData/classes/pkg/TestLVTComplex$Bob.class
-new file mode 100644
-index 0000000000000000000000000000000000000000..549a629af942d8ddc3bc26f3f378c0413e0f5685
-GIT binary patch
-literal 1465
-zcmaJ>+fEZv6kVq??U_!8i^UNO^@gZzRVuftrQ8K2Rxv3yQKNAvBMwZbq@5a#kMiP^
-zPx=AG=&NF)MkC?bzwj@7689OZv=MC6bI$C&*1oKLrr&>k*#IzrnIL2&Rh&aFM>|Kq
-zidGDWWl+IBm7IeDky4<G{k*VT2;w5r3Wii<Fw8N+;JY%zAWf9!8MGP4G0T&-QK^^}
-zhJ)Fa<;CQjS#h)Zxye#-#Wo*z6L5$~*;xkOogdHMoXRmo?(7W>JTmO62-g{l{|6>d
-zmKIEgmaOHN*Q>>Ovpi?a+hpM$fA#^xnOJtocw{7P!&yw`+_L2?4#oFQ9L|;shMhOc
-zmIzdfCObxvf`<Q%#1P0>j^&ah2X;v`6VEfq?n8?@3FfRt$8f7<iX_E^L&+5E8ksFH
-zumb%^(59Sg6qc_UD_(XQ5ksOb^ORF9X7*}egk)B8rE0lgPFq5Vw#G^H2rV=m5TkF`
-zFp4pbajJdynQ4e(Lc=k1Y1oJT8g#K7M1*5f!zD~nbK{kT2OQHHF5?PA^N!Y{P6mI$
-zE;&@k{#d-OhuQfhv*1##;eQh|4Av{@U96!x?%x?UrlMf2JC@v&ifdAOsZ@0t^liFT
-zO5ULPyA;7RibQDh2#sdCJ1YWYJH)Fm<WJuG*g1M9TIp?)#v(!%fOb*_XzdWnl1D~R
-z$OMKCdg`KGeAIQYkMM0mdPh%mw`mP{zJ9_-aj1qLfX}n4VL9;`{!PdN?`yyxCX2R>
-z!Vw(x{4^&*iHyCF=nL?~>F6f}-h1x)bUSp8<DztQdzceYa1tlB3t{)E5smDxzCykg
-z=F%r99}x5&RM~q7`M;4%TBqB6OI}AP_W|rPw5y4Yj5HkWT*KW&wC_4u(sD%JNcp8y
-zKo98tHH=1NJ<ylt!lgu%jZ{!dsk*8M*KjzZ=xSd&bT-1@AheFAaPvpBtg7to){oTy
-zt(&VpT3?H<Bu|tcgy=j#t@q<BQgp4)<2Ej!O8;9=k;XGRKPTG@^1Z|eME6IDTSYTY
-zQTHK2ClR9)C+-cz=_DaRsC(eQkm8US+oBnB@5FK1+kq`g8EUZY_&T@X--Y0ZR3rZ+
-Zzf{xx4Am`0+=DjSRnlKZAHriDzX8G5C+h$J
-
-literal 0
-HcmV?d00001
-
-diff --git a/testData/classes/pkg/TestLVTComplex.class b/testData/classes/pkg/TestLVTComplex.class
-new file mode 100644
-index 0000000000000000000000000000000000000000..b9b82623317a50adbbcf6d09eab00e5969c3d091
-GIT binary patch
-literal 1736
-zcmZ`)T~ixX7=BK^&StZO5C{bdQkvBA5s0*yDs8a^t;L293sT#9vxF6vhAfjT3O8Q$
-zFL<GM_ChYa=*R_(TDfz^@sD_+GdiP=j8nnqYyuL&OwQT&^Stl-JZF<1_P^c*FogGX
-z#4!}c%gAcDqT?03Dlx1hh#|FIjo=!tt8FBVM!XhA0ylJSH#LlE7}M~&hBqW`NxUg>
-zTfi7E7Om1)!7P`pvc$N6f7F>52wk&_wmU+#yJt=yFy<^+0`)n&XicuI%v+^dbG|@J
-zJm=)i!kk&Mm0mRl+$Fm#(3D$!w3wN-%5H9McFb8>Em-SUdDe<)7X`!y7wh>pE^%8|
-z+e51H+_L$BnJJjX#mv<FvXyt4;xp+!?wN5*c5#s&v96K_1rn9KHP<d=Zk9^sM$Rs)
-z)aKd-H&zdu>^Uvr+R5r8Jfv>MHS>=q%vEndi6k+Xc*_Ivj(|Sntd;WCEn6YdSUd25
-z8ppsHv`FL(Okk1-nB|4{C8i8a<85Ym6W4Zb;4WrZ!oV!vF))XF2Hr)|z$oq;cz}l-
-z`?f+aH$@OkE|L~MiMK%Pzj%_ElW{3R*nEoFyA1Jv8yt77lIc37nsX~`)S5QRuC>DJ
-z<E*(y<k(JTn!LG;x6BpdTA94oEFf1^P=R+O(S3}MD(C7tYW7hZ&E3a|JZz6=%O$fs
-zX|1z5ukZtcUi6fv!}!`8)|Hz1(021n<TynbQne(eJQ!L|xzEa@iaDhPyJ!}?V&mvS
-z17B11@j)o=xwlfw@G1BV_U=G@>ABmuhbl&#rEFB?c63k+<AuXy-)B5542Ub*GyP6)
-zu5b6cf25=R38H-+1KGf1zt}wZ?U=dQGjG8c_iv-({^=V8@9!X#>)VE$NPh)Q;1kqQ
-z2n$SZ9{gHk&sXg+{h2--XblVpTZ6mVkUuLEG7)-$SZgpL2eR5@$;!W+^tV*~M=hwh
-z9}l(7gHN}hZy~Y`W8e#piheF1mjXzkqT~xIypH{EBBI17MdtAPIl}S!iA{v!v5Eh;
-zgc!rTG}9E^0q@|C&`DWR(+IhaG$Q<E)iI1ZzFtw>Lp|TH7#y;=Mjk&#6Q1%nbcfGx
-z$>w*Y<a_e@GqZn3JN_g|2j~(S&Wi|=B8rq~z(vu9ZgCF1B8jv}qhDl@5m^j+G~Z?I
-zG*>6iv5%*ex+rO^H;wa1(&q4`??eiI(E&d$;6(xw5SMY0Ua-$U(2X7lp59dT_R_Ad
-zPsP_qDNV~VnhrQ%K%$>tL3H;}zmJfo?BUGcFeC;fGJhfdT!m#g3p6iWnI&F2p4zyN
-rNHz8B9`vLxqrT{K_#_4+?C=sR`f!;&fynvzAH+{gBYF*JzR~s%!6|RH
-
-literal 0
-HcmV?d00001
-
-diff --git a/testData/classes/pkg/TestLVTScoping.class b/testData/classes/pkg/TestLVTScoping.class
-new file mode 100644
-index 0000000000000000000000000000000000000000..b13a2da2070ddc93780406d9b74262fec5610576
-GIT binary patch
-literal 1024
-zcma)4U2hUW6g>l5mZeZWODkY&>ldIFZPgcyNn>I{N?Q{M34L4WNVkPu0!yR+#<xD}
-z0~#Ov0sbaqJhKpxRHK<>=H8h*=bU?HzW@CC4Ztp*>+lIA`WKy2T@Kx9qh4z}ear6X
-z&;(-V=A~Kcns%pj+&Y(SS0M1hvMu+efInYo2xzaIQyGFEMi@&72t=!vEssXMmK@a0
-zR#y_d>a@*n!yH&DpKfaInKcwhRj)IbNz#+<nR6OK3<(`^f%sfV#dc*!4#G$xC7@rL
-z-H|+gE0E4t3e{_6WrdLrV-4#9LCba<s@_vy2_nOwx!(*T$KYtcX<!4lbZjnkUVA@u
-zWiN~^Y_rN4(S+3rk>!-$42W5C2h!}3>JIMdxGRwKbSxf+aUXdK?yDPJn;`k$<Pw6W
-zmzAZ$RG!T{nH~v5YOdM7I5hj7hdLfD%JdLOF!6487VRlrPZT}(wET(3aUu|^Iio>a
-zzP8jOB^O_RN71umHq37VXpH#0oONa;u7c}Q@iT%S8Tb(5td3RbGUxE5fNO-AftA_i
-zA*)qgPSd_1I>zb;7>OGPR|q7s2cK}WIL2*->Gv=*ya$plBS;JbaqgywnkBB{NfT{_
-zwFMNJrC2qI9xyZDi~oR6$3uoY{}vGWyMP$U;v`CN=D*{}lKTGy7!v`dnSggw2e#)9
-zM71(o&y4Z-3V)Qb;TgY9$_zWtQb3M>dV|>}pJ{6*CBnJ__Sk*Ki<B$M3k|+CgT6my
-H?8CEPwhyta
-
-literal 0
-HcmV?d00001
-
-diff --git a/testData/classes/pkg/TestLoopMerging.class b/testData/classes/pkg/TestLoopMerging.class
-new file mode 100644
-index 0000000000000000000000000000000000000000..022bd6098959508759665aea103c6d360ba4fb0a
-GIT binary patch
-literal 1481
-zcmb_cOHUI~6#njXrbEl{DpYwCC{Lk0s({3(ffy4KlA;nSiD5N`p$?R`DT9fL8x3*e
-zS~qG;+`z(^Xh0Jsgv6ac!-Y%N#2E3rV{NOjKx5i_&$;KEd(U^ibJ~yJ-|Yez!LT3Y
-z==8ylF1dB9A4UN6@|N7Bb}0<_a0)$s^dh38Pe;FiFu5kU5(3_fcG`Bv1Ux;xvx3($
-z3zk4t%uZWZ)>aZ$E^a1Lv;<<Ac{4R@=4^S+8&&6~y($olWtWrDxV7rUGMVg@l}p;`
-z<OM$F(B!_%WEC@xIlnw*X7hJ7=^PSp<uJi4a!m>-CSO$MCS9;CdH;xje<rh*o3|!x
-ziKgz4WP?lQEz>|1stp*ZFi?pK9Rmgi5!G?pz!@-A?GZ2qs^#5i%1kGtR})LtJQ0_e
-zW^S)K)(VTrtkDsSxxscOdM#(Cof#)*nJcWc_6W0po|QqVG@0m`=$%CyTU5@zDG(AR
-zH6ejgYSajxdks%fN+GS0w-B$WC<t)(x<(IbsT)57P=_E-0w-{iyS#h{9@jS>*@D95
-zSq!L;o}eajgL*()+=gf4;B(RGefYTGOcb3j`IN^^TS*D%Xhs>%bDE0j$Mfmy>DL$)
-z3Ndp-0m-vGlIckKwhKiG=tR=^8f7y58~7w9#b8!t<KWXVqj;l;t%bNG8C7JlfwG(0
-zS@Jke86)~4*69+gUZ`4F4HInRFR;Q#uwK4(-?QV7^-cBfj(JAapxXQ#f&QR6II68{
-zVqFy*2VaWR{WY)0<KedoBb*tqy(*E`^V3AxM%-i6<`BXX`{GdEMXOtFn03^1HPNQY
-zdh&IvxW~vA)-1c#1n&Xq(sZ=y2=gmAZ~LeVg<M+N3be%YwCo+C<wb#(|3yf=WH879
-zpZ%BFEg7jzw_$OKuQ)P8tQ%-2p&g{6lT>u!90%t*|0WmEgEapsA0UEFp0^qE9s?!B
-lJ}nTtS0Hw$gxF5_4-@+hm4eLHhC*Lq?7Khqc4AP_@dGu?5$FH_
-
-literal 0
-HcmV?d00001
-
-diff --git a/testData/classes/pkg/TestVarType.class b/testData/classes/pkg/TestVarType.class
-new file mode 100644
-index 0000000000000000000000000000000000000000..28473768df1fca50e12184e05997281a94d1519e
-GIT binary patch
-literal 375
-zcmZ9Hy-veG5QJy_3&tUifl$){1#akwXpoQ)0Scn@wmF3h#*Q2ZDScju3W<V>iszw5
-zjGYJ&C*AGM?(DaBA78I;0FJTc!9?Jq<02F|J)P_7RABBO3<cI%ai;|BzRuP4>@iX0
-zAWkx7!hVs)*)T43tyf8_y4O=dr$2cZMFTahSRc$M>O|ls^GfNw5{Tx$5O}x6tW4Fp
-zu5rO1_t7|hihWqHIrtxm&bk_9aXyM}lCerF?7`p<>Scg0hRxHViWr5_K74^ZH)WTn
-z(<DQz@$N4TScgX?*!XF_qB59k1(&^r*zXI7eEvd0&H=VLcZa|(LAwpGyKGtkO=5kt
-Lh!SklZ=n4R+Z#Vr
-
-literal 0
-HcmV?d00001
-
-diff --git a/testData/results/TestAmbiguousCallWithDebugInfo.dec b/testData/results/TestAmbiguousCallWithDebugInfo.dec
-index e873e7e3cc488b036a46c332bd724e3fac30f720..18beb9a51b1010c58bf8058c999c1a5dc5457f57 100644
---- a/testData/results/TestAmbiguousCallWithDebugInfo.dec
-+++ b/testData/results/TestAmbiguousCallWithDebugInfo.dec
-@@ -12,7 +12,7 @@ class TestAmbiguousCall {
-       this.m1((RuntimeException)iae, "RE");// 9
-       this.m1(iae, "IAE");// 10
-       RuntimeException re = new IllegalArgumentException();// 12
--      this.m1((RuntimeException)re, "RE");// 13
-+      this.m1(re, "RE");// 13
-       this.m1((IllegalArgumentException)re, "IAE");// 14
-    }// 15
- }
-diff --git a/testData/results/TestEnhancedForLoops.dec b/testData/results/TestEnhancedForLoops.dec
-new file mode 100644
-index 0000000000000000000000000000000000000000..a83751cd36645d1c820183d0892972544d015dbe
---- /dev/null
-+++ b/testData/results/TestEnhancedForLoops.dec
-@@ -0,0 +1,127 @@
-+package pkg;
-+
-+import java.util.ArrayList;
-+
-+public class TestEnhancedForLoops {
-+   public void forArray() {
-+      int[] numbers = new int[]{1, 2, 3, 4, 5, 6};// 23
-+
-+      for(int number : numbers) {// 24
-+         System.out.println(number);// 25
-+      }
-+// 27
-+   }
-+
-+   public void forItterator() {// 31
-+      for(String string : new ArrayList()) {// 32
-+         System.out.println(string);
-+      }// 34
-+
-+   }
-+// 38
-+   public void forItteratorUnboxing() {// 39
-+      for(int i : new ArrayList()) {
-+         System.out.println("Value: " + i);// 41
-+      }
-+
-+   }
-+}
-+
-+class 'pkg/TestEnhancedForLoops' {
-+   method 'forArray ()V' {
-+      6      6
-+      a      6
-+      e      6
-+      12      6
-+      16      6
-+      1a      6
-+      1b      6
-+      1d      6
-+      1e      8
-+      1f      8
-+      22      8
-+      24      8
-+      25      8
-+      30      8
-+      31      8
-+      32      9
-+      33      9
-+      34      9
-+      35      9
-+      36      9
-+      37      9
-+      38      9
-+      39      9
-+      3a      8
-+      3b      8
-+      3c      8
-+      40      11
-+   }
-+
-+   method 'forItterator ()V' {
-+      18      14
-+      19      14
-+      1a      14
-+      1b      14
-+      1c      14
-+      1d      14
-+      1e      14
-+      1f      14
-+      20      14
-+      21      14
-+      22      15
-+      23      15
-+      24      15
-+      25      15
-+      26      15
-+      27      15
-+      28      15
-+      2c      17
-+   }
-+
-+   method 'forItteratorUnboxing ()V' {
-+      18      20
-+      19      20
-+      1a      20
-+      1b      20
-+      1c      20
-+      1d      20
-+      1e      20
-+      1f      20
-+      20      20
-+      21      20
-+      22      20
-+      23      20
-+      24      20
-+      25      21
-+      26      21
-+      27      21
-+      2f      21
-+      30      21
-+      34      21
-+      38      21
-+      39      21
-+      3a      21
-+      3b      21
-+      3c      21
-+      3d      21
-+      41      23
-+   }
-+}
-+
-+Lines mapping:
-+23 <-> 7
-+24 <-> 9
-+25 <-> 10
-+27 <-> 12
-+31 <-> 15
-+32 <-> 16
-+34 <-> 18
-+38 <-> 21
-+39 <-> 22
-+41 <-> 24
-+Not mapped:
-+30
-+33
-+37
-+40
-diff --git a/testData/results/TestKotlinConstructorKt.dec b/testData/results/TestKotlinConstructorKt.dec
-index 0e941450d0dabcbec609f869f674d9cc5bdace33..e57e91a4d0f967a12d306f22b295608a08a872f1 100644
---- a/testData/results/TestKotlinConstructorKt.dec
-+++ b/testData/results/TestKotlinConstructorKt.dec
-@@ -1,6 +1,5 @@
- import java.util.ArrayList;
- import java.util.Collection;
--import java.util.Iterator;
- import java.util.List;
- import kotlin.Metadata;
- import kotlin.TypeCastException;
-@@ -17,10 +16,8 @@ public final class TestKotlinConstructorKt {
-    private static final List<Mapping> foo(Collection<String> list) {
-       Iterable $receiver$iv = (Iterable)list;// 2
-       Collection destination$iv$iv = (Collection)(new ArrayList(CollectionsKt.collectionSizeOrDefault($receiver$iv, 10)));
--      Iterator var4 = $receiver$iv.iterator();// 10 11
- 
--      while(var4.hasNext()) {
--         Object item$iv$iv = var4.next();
-+      for(Object item$iv$iv : $receiver$iv) {// 10 11
-          String it = (String)item$iv$iv;
-          Mapping var10000 = new Mapping;
-          if (it == null) {// 3
-@@ -31,100 +28,81 @@ public final class TestKotlinConstructorKt {
-          Mapping var11 = var10000;
-          destination$iv$iv.add(var11);// 12
-       }
--
--      return CollectionsKt.toList((Iterable)((List)destination$iv$iv));// 4 13
-+// 4 13
-+      return CollectionsKt.toList((Iterable)((List)destination$iv$iv));
-    }
- }
- 
- class 'TestKotlinConstructorKt' {
-    method 'foo (Ljava/util/Collection;)Ljava/util/List;' {
--      0      17
--      1      17
--      2      17
--      3      17
--      4      17
-+      0      16
-+      1      16
-+      2      16
-+      3      16
-+      4      16
-       6      19
--      c      18
--      d      18
--      e      18
--      f      18
--      10      18
--      11      18
--      15      18
--      16      18
--      17      18
--      18      18
--      1b      19
--      1c      19
--      1d      19
--      1e      19
--      1f      19
-+      c      17
-+      d      17
-+      e      17
-+      f      17
-+      10      17
-+      11      17
-+      15      17
-+      16      17
-+      17      17
-+      18      17
-       20      19
-       21      19
--      22      21
--      23      21
--      24      21
--      25      21
--      26      21
--      27      21
--      28      21
--      2c      22
--      2d      22
--      2e      22
--      2f      22
--      30      22
--      31      22
--      32      22
--      33      22
--      34      22
--      35      31
--      36      23
--      37      23
--      38      23
--      39      23
--      3a      23
--      3b      23
--      3c      23
--      43      25
--      44      25
--      46      25
--      4d      26
--      4e      26
--      52      26
--      53      29
--      54      29
--      55      29
--      56      29
--      57      29
--      58      29
--      59      30
--      5a      30
--      5d      31
--      5e      31
--      5f      31
--      60      31
--      61      31
--      62      31
--      63      31
--      68      34
--      69      34
--      6a      34
--      6b      34
--      6c      34
--      6d      34
--      6e      34
--      6f      34
--      70      34
--      71      34
--      72      34
-+      33      19
-+      34      19
-+      35      28
-+      36      20
-+      37      20
-+      38      20
-+      39      20
-+      3a      20
-+      3b      20
-+      3c      20
-+      43      22
-+      44      22
-+      46      22
-+      4d      23
-+      4e      23
-+      52      23
-+      53      26
-+      54      26
-+      55      26
-+      56      26
-+      57      26
-+      58      26
-+      59      27
-+      5a      27
-+      5d      28
-+      5e      28
-+      5f      28
-+      60      28
-+      61      28
-+      62      28
-+      63      28
-+      68      30
-+      69      30
-+      6a      30
-+      6b      30
-+      6c      30
-+      6d      30
-+      6e      30
-+      6f      30
-+      70      30
-+      71      30
-+      72      30
-    }
- }
- 
- Lines mapping:
--2 <-> 18
--3 <-> 26
--4 <-> 35
-+2 <-> 17
-+3 <-> 23
-+4 <-> 31
- 10 <-> 20
- 11 <-> 20
--12 <-> 32
--13 <-> 35
-+12 <-> 29
-+13 <-> 31
-diff --git a/testData/results/TestLVT.dec b/testData/results/TestLVT.dec
-new file mode 100644
-index 0000000000000000000000000000000000000000..a78cf6ee711a1115ed42c227a630086dd8bcff8b
---- /dev/null
-+++ b/testData/results/TestLVT.dec
-@@ -0,0 +1,39 @@
-+package pkg;
-+
-+import java.util.ArrayList;
-+import java.util.HashMap;
-+import java.util.List;
-+import java.util.Map;
-+
-+public class TestLVT {
-+   public static void method(String a1, String a2) {
-+      String scope1 = "scope1";
-+      String scope1a = "scope1a";
-+
-+      for(int i = 0; i < 10; ++i) {
-+         String scope2 = "scope2";
-+         String scope2a = "scope2a";
-+         List<Object> noise = new ArrayList();
-+         String spam = scope1 + scope2 + scope2a + i + noise;
-+         System.out.println(spam);
-+      }
-+
-+      for(long i = 0L; i < 10L; ++i) {
-+         String scope2 = "scope2+1";
-+         String scope2a = "scope2+1a";
-+         Map<Object, Object> noise = new HashMap();
-+         String spam = scope1a + scope2 + scope2a + i + noise;
-+         System.out.println(spam);
-+      }
-+
-+   }
-+
-+   public void methoda() {
-+      double a = 0.0D;
-+      double b = 1.0D;
-+      System.out.println(a + b);
-+      a = 0.1D;
-+      b = 1.1D;
-+      System.out.println(a + b);
-+   }
-+}
-diff --git a/testData/results/TestLVTComplex.dec b/testData/results/TestLVTComplex.dec
-new file mode 100644
-index 0000000000000000000000000000000000000000..7d492ca4a8dcba8dae51f5d2d8f4a086022aef2a
---- /dev/null
-+++ b/testData/results/TestLVTComplex.dec
-@@ -0,0 +1,84 @@
-+package pkg;
-+
-+import java.util.ArrayList;
-+
-+public class TestLVTComplex {
-+   public static void main() {
-+      int[] x = new int[5];
-+
-+      for(int y : x) {
-+         ;
-+      }
-+
-+      for(int y : x) {
-+         System.out.println("asdf");
-+      }
-+
-+      ArrayList<Object> x1 = new ArrayList();
-+
-+      for(Object y : x1) {
-+         ;
-+      }
-+
-+      for(Object y : x1) {
-+         int[] x2 = new int[10];
-+
-+         for(int y2 : x2) {
-+            ;
-+
-+         }
-+
-+         for(int y2 : x2) {
-+            System.out.println("asdf");
-+
-+         }
-+
-+         System.out.println("asdf");
-+      }
-+
-+      switch(Bob.HI) {
-+      case HI:
-+         System.out.println("HI");
-+         break;
-+      case LO:
-+         System.out.println("LO");
-+      }
-+
-+      if (TestLVTComplex.Bob.HI == TestLVTComplex.Bob.HI) {
-+         String a = "a";
-+      } else {
-+         String b = "b";
-+      }
-+
-+      String a2;
-+      if (TestLVTComplex.Bob.HI == TestLVTComplex.Bob.HI) {
-+         a2 = "a";
-+      } else {
-+         a2 = "b";
-+      }
-+
-+      if (TestLVTComplex.Bob.HI == TestLVTComplex.Bob.HI) {
-+         a2 = "a";
-+      }
-+
-+      System.out.println(a2);
-+   }
-+
-+   private static enum Bob {
-+      HI,
-+      LO;
-+
-+      static {
-+         for(TestLVTComplex.Bob b : values()) {
-+            for(TestLVTComplex.Bob c : values()) {
-+               for(TestLVTComplex.Bob d : values()) {
-+                  if (b == c) {
-+                     System.out.println("Asdf");
-+                  }
-+               }
-+            }
-+         }
-+
-+      }
-+   }
-+}
-diff --git a/testData/results/TestLVTScoping.dec b/testData/results/TestLVTScoping.dec
-new file mode 100644
-index 0000000000000000000000000000000000000000..74941fbba151492665389134b3d925e57f4801a7
---- /dev/null
-+++ b/testData/results/TestLVTScoping.dec
-@@ -0,0 +1,35 @@
-+package pkg;
-+
-+public class TestLVTScoping {
-+   public static void method() {
-+      String a;
-+      if (1 == Integer.valueOf(1).intValue()) {
-+         a = "YAY";
-+      } else {
-+         a = "NAY";
-+      }
-+
-+      System.out.println(a);
-+   }
-+
-+   public static void method2() {
-+      if (1 == Integer.valueOf(1).intValue()) {
-+         String a = "YAY";
-+      } else {
-+         String a = "NAY";
-+         System.out.println(a);
-+      }
-+
-+   }
-+
-+   public static void method3() {
-+      if (1 == Integer.valueOf(1).intValue()) {
-+         boolean a = true;
-+         System.out.println(a);
-+      } else {
-+         String a = "NAY";
-+         System.out.println(a);
-+      }
-+
-+   }
-+}
-diff --git a/testData/results/TestLocalsNames.dec b/testData/results/TestLocalsNames.dec
-index 59563ddeb1c2cb82405b31d9f0073a1df450c9e8..1041a5490d33ee05ccb669d924c3fac80f6e134f 100644
---- a/testData/results/TestLocalsNames.dec
-+++ b/testData/results/TestLocalsNames.dec
-@@ -7,21 +7,18 @@ public class TestLocalsNames {
-       if (file.isDirectory()) {// 22
-          long start = System.currentTimeMillis();// 23
-          File[] files = file.listFiles();// 25
--         File[] var5 = files;
--         int var6 = files.length;
- 
--         for(int var7 = 0; var7 < var6; ++var7) {// 26
--            File s = var5[var7];
-+         for(File s : files) {// 26
-             File dest = new File(s.getAbsolutePath() + ".tmp");// 27
- 
-             assert s.renameTo(dest) : "unable to rename " + s + " to " + dest;// 28
-          }
--
--         long elapsed = System.currentTimeMillis() - start;// 31
--         System.out.println("took " + elapsed + "ms (" + elapsed / (long)files.length + "ms per dir)");// 32
-+// 31
-+         long elapsed = System.currentTimeMillis() - start;// 32
-+         System.out.println("took " + elapsed + "ms (" + elapsed / (long)files.length + "ms per dir)");
-       }
--
--   }// 34
-+// 34
-+   }
- }
- 
- class 'pkg/TestLocalsNames' {
-@@ -41,91 +38,79 @@ class 'pkg/TestLocalsNames' {
-       e      8
-       f      8
-       10      8
--      11      9
--      12      9
--      13      9
--      14      9
--      17      10
-+      11      10
-+      12      10
-+      13      10
-+      14      10
-       18      10
-       19      10
--      1a      12
--      1b      12
--      1c      12
--      1d      12
--      1e      12
--      1f      12
--      20      12
--      21      12
--      24      13
--      25      13
--      26      13
--      27      13
--      28      13
--      29      13
--      2a      13
--      36      14
--      37      14
--      38      14
--      39      14
--      3a      14
--      3e      14
--      3f      14
--      43      14
--      44      14
--      45      14
--      49      14
--      4a      14
--      51      16
--      52      16
--      53      16
--      54      16
--      55      16
--      56      16
--      57      16
--      66      16
--      67      16
--      6b      16
--      6c      16
--      70      16
--      71      16
--      75      16
--      76      16
--      7a      16
--      7b      16
--      7c      16
--      81      12
--      82      12
--      83      12
--      87      19
--      88      19
--      89      19
--      8a      19
--      8b      19
--      8c      19
--      8d      19
--      8e      20
--      8f      20
--      90      20
--      98      20
--      99      20
--      9d      20
--      9e      20
--      a2      20
--      a3      20
--      a7      20
--      a8      20
--      a9      20
--      aa      20
--      ab      20
--      ac      20
--      ad      20
--      b1      20
--      b2      20
--      b6      20
--      b7      20
--      b8      20
--      b9      20
--      bc      23
-+      1b      10
-+      1c      10
-+      29      10
-+      2a      10
-+      36      11
-+      37      11
-+      38      11
-+      39      11
-+      3a      11
-+      3e      11
-+      3f      11
-+      43      11
-+      44      11
-+      45      11
-+      49      11
-+      4a      11
-+      51      13
-+      52      13
-+      53      13
-+      54      13
-+      55      13
-+      56      13
-+      57      13
-+      66      13
-+      67      13
-+      6b      13
-+      6c      13
-+      70      13
-+      71      13
-+      75      13
-+      76      13
-+      7a      13
-+      7b      13
-+      7c      13
-+      81      10
-+      82      10
-+      83      10
-+      87      15
-+      88      15
-+      89      15
-+      8a      15
-+      8b      15
-+      8c      15
-+      8d      15
-+      8e      16
-+      8f      16
-+      90      16
-+      98      16
-+      99      16
-+      9d      16
-+      9e      16
-+      a2      16
-+      a3      16
-+      a7      16
-+      a8      16
-+      a9      16
-+      aa      16
-+      ab      16
-+      ac      16
-+      ad      16
-+      b1      16
-+      b2      16
-+      b6      16
-+      b7      16
-+      b8      16
-+      b9      16
-+      bc      19
-    }
- }
- 
-@@ -133,9 +118,9 @@ Lines mapping:
- 22 <-> 7
- 23 <-> 8
- 25 <-> 9
--26 <-> 13
--27 <-> 15
--28 <-> 17
--31 <-> 20
--32 <-> 21
--34 <-> 24
-+26 <-> 11
-+27 <-> 12
-+28 <-> 14
-+31 <-> 16
-+32 <-> 17
-+34 <-> 20
-diff --git a/testData/results/TestLoopMerging.dec b/testData/results/TestLoopMerging.dec
-new file mode 100644
-index 0000000000000000000000000000000000000000..703203a5dad69c818eac940996013864c2167da5
---- /dev/null
-+++ b/testData/results/TestLoopMerging.dec
-@@ -0,0 +1,82 @@
-+package pkg;
-+
-+public class TestLoopMerging {
-+   public float a;
-+   public float b;
-+
-+   public float test() {
-+      while(this.a - this.b < -180.0F) {
-+         this.b -= 360.0F;
-+      }
-+
-+      while(this.a - this.b >= 180.0F) {
-+         this.b += 360.0F;
-+      }
-+
-+      return this.a;
-+   }
-+
-+   public float test2() {
-+      for(this.a = 0.0F; this.a < 10.0F; ++this.a) {
-+         System.out.println(this.a);
-+      }
-+
-+      for(this.a = 0.0F; this.a < 10.0F; ++this.a) {
-+         System.out.println(this.a);
-+      }
-+
-+      return this.a;
-+   }
-+
-+   public float test3() {
-+      int[] as = new int[0];
-+
-+      for(int f : as) {
-+         ++f;
-+      }
-+
-+      while(this.a - this.b < -180.0F) {
-+         this.b -= 360.0F;
-+      }
-+
-+      while(this.a - this.b >= 180.0F) {
-+         this.b += 360.0F;
-+      }
-+
-+      for(this.a = 0.0F; this.a < 10.0F; ++this.a) {
-+         System.out.println(this.a);
-+      }
-+
-+      return this.a;
-+   }
-+
-+   public float test4() {
-+      int[] as = new int[0];
-+
-+      for(int f : as) {
-+         ++f;
-+
-+         while(this.a - this.b < -180.0F) {
-+            this.b -= 360.0F;
-+         }
-+
-+         while(this.a - this.b >= 180.0F) {
-+            this.b += 360.0F;
-+         }
-+
-+         for(this.a = 0.0F; this.a < 10.0F; ++this.a) {
-+            System.out.println(this.a);
-+
-+            while(this.a - this.b < -180.0F) {
-+               this.b -= 360.0F;
-+            }
-+
-+            while(this.a - this.b >= 180.0F) {
-+               this.b += 360.0F;
-+            }
-+         }
-+      }
-+
-+      return this.a;
-+   }
-+}
-diff --git a/testData/results/TestTryCatchFinally.dec b/testData/results/TestTryCatchFinally.dec
-index 20e9afb72b2d2dabc76d29f6bb1f4ef2bfbc5a20..0caaede304ce41149b60846857bba24468c99675 100644
---- a/testData/results/TestTryCatchFinally.dec
-+++ b/testData/results/TestTryCatchFinally.dec
-@@ -4,7 +4,7 @@ public class TestTryCatchFinally {
-    public void test1(String var1) {
-       try {
-          System.out.println("sout1");// 24
--      } catch (Exception var9) {
-+      } catch (Exception var2) {
-          try {
-             System.out.println("sout2");// 27
-          } catch (Exception var8) {// 28
-diff --git a/testData/results/TestVarType.dec b/testData/results/TestVarType.dec
-new file mode 100644
-index 0000000000000000000000000000000000000000..56fb422828fe9a4985f892122d46051d3cd1f73b
---- /dev/null
-+++ b/testData/results/TestVarType.dec
-@@ -0,0 +1,9 @@
-+package pkg;
-+
-+public class TestVarType {
-+   public void byteint() {
-+      int i = 75;
-+      i = i + 5;
-+      i = i + 500;
-+   }
-+}
-diff --git a/testData/src/pkg/TestEnhancedForLoops.java b/testData/src/pkg/TestEnhancedForLoops.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..d808218357900a716e43edca3b7146f1a01add13
---- /dev/null
-+++ b/testData/src/pkg/TestEnhancedForLoops.java
-@@ -0,0 +1,42 @@
-+/*
-+ * Copyright 2000-2017 JetBrains s.r.o.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+package pkg;
-+
-+import java.util.List;
-+import java.util.ArrayList;
-+
-+public class TestEnhancedForLoops {
-+  public void forArray() {
-+    int[] numbers = {1, 2, 3, 4, 5, 6};
-+    for (int number : numbers) {
-+      System.out.println(number);
-+    }
-+  }
-+
-+  public void forItterator() {
-+    List<String> strings = new ArrayList<>();
-+    for (String string : strings) {
-+      System.out.println(string);
-+    }
-+  }
-+
-+  public void forItteratorUnboxing() {
-+    List<Integer> ints = new ArrayList<>();
-+    for (int i : ints) {
-+      System.out.println("Value: " + i);
-+    }
-+  }
-+}
-diff --git a/testData/src/pkg/TestLVT.java b/testData/src/pkg/TestLVT.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..b9eed0dc1287fbabc4a400444b32b087831ffc66
---- /dev/null
-+++ b/testData/src/pkg/TestLVT.java
-@@ -0,0 +1,36 @@
-+package pkg;
-+
-+import java.util.ArrayList;
-+import java.util.HashMap;
-+import java.util.List;
-+import java.util.Map;
-+
-+public class TestLVT {
-+  public static void method(String a1, String a2) {
-+    String scope1 = "scope1";
-+    String scope1a = "scope1a";
-+    for (int i=0; i<10; i++) {
-+      String scope2 = "scope2";
-+      String scope2a = "scope2a";
-+      List<Object> noise = new ArrayList<Object>();
-+      String spam = scope1 + scope2 + scope2a + i + noise;
-+      System.out.println(spam);
-+    }
-+    for (long i=0; i<10; i++) {
-+      String scope2 = "scope2+1";
-+      String scope2a = "scope2+1a";
-+      Map<Object,Object> noise = new HashMap<Object,Object>();
-+      String spam = scope1a + scope2 + scope2a + i + noise;
-+      System.out.println(spam);
-+    }
-+  }
-+
-+  public void methoda() {
-+    double a = 0D;
-+    double b = 1D;
-+    System.out.println(a+b);
-+    a = 0.1D;
-+    b = 1.1D;
-+    System.out.println(a+b);
-+  }
-+}
-diff --git a/testData/src/pkg/TestLVTComplex.java b/testData/src/pkg/TestLVTComplex.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..548b9fd5883d6c9d2f706e8f97c93e42ace808f1
---- /dev/null
-+++ b/testData/src/pkg/TestLVTComplex.java
-@@ -0,0 +1,64 @@
-+package pkg;
-+
-+import java.util.ArrayList;
-+
-+public class TestLVTComplex {
-+    public static void main() {
-+        int[] x = new int[5];
-+        for (int y : x)
-+            ;
-+        for (int y : x) {
-+            System.out.println("asdf");
-+        }
-+        ArrayList<Object> x1 = new ArrayList<Object>();
-+        for (Object y : x1)
-+            ;
-+        for (Object y : x1) {
-+            int[] x2 = new int[10];
-+            for (int y2 : x2)
-+                ;
-+            for (int y2 : x2) {
-+                System.out.println("asdf");
-+            }
-+            System.out.println("asdf");
-+        }
-+        switch (Bob.HI) {
-+        case HI:
-+            System.out.println("HI");
-+            break;
-+        case LO:
-+            System.out.println("LO");
-+            break;
-+        }
-+        if (Bob.HI == Bob.HI) {
-+            String a = "a";
-+        } else {
-+            String b = "b";
-+        }
-+        String a2;
-+        if (Bob.HI == Bob.HI) {
-+            a2 = "a";
-+        } else {
-+            a2 = "b";
-+        }
-+        if (Bob.HI == Bob.HI) {
-+            a2 = "a";
-+        }
-+        System.out.println(a2);
-+
-+    }
-+
-+    private static enum Bob {
-+        HI, LO;
-+        static {
-+            for (Bob b : Bob.values()) {
-+                for (Bob c : values()) {
-+                    for (Bob d : values()) {
-+                        if (b == c)
-+                            System.out.println("Asdf");
-+                    }
-+                }
-+            }
-+        };
-+    }
-+}
-diff --git a/testData/src/pkg/TestLVTScoping.java b/testData/src/pkg/TestLVTScoping.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..ab57832c2f3df13a4ae9da2af193c2d6a79067ab
---- /dev/null
-+++ b/testData/src/pkg/TestLVTScoping.java
-@@ -0,0 +1,34 @@
-+package pkg;
-+
-+
-+public class TestLVTScoping {
-+    public static void method() {
-+        String a;
-+        if (1 == Integer.valueOf(1)) {
-+            a = "YAY";
-+        } else {
-+            a = "NAY";
-+        }
-+        System.out.println(a);
-+    }
-+    public static void method2() {
-+        String a;
-+        if (1 == Integer.valueOf(1)) {
-+            a = "YAY";
-+        } else {
-+            a = "NAY";
-+            System.out.println(a);
-+        }
-+    }
-+    public static void method3() {
-+        if (1 == Integer.valueOf(1)) {
-+            boolean a;
-+            a = true;
-+            System.out.println(a);
-+        } else {
-+            String a;
-+            a = "NAY";
-+            System.out.println(a);
-+        }
-+    }
-+}
-diff --git a/testData/src/pkg/TestLoopMerging.java b/testData/src/pkg/TestLoopMerging.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..1643c8137282657c42f090481a16d0ed5b34e93f
---- /dev/null
-+++ b/testData/src/pkg/TestLoopMerging.java
-@@ -0,0 +1,47 @@
-+package pkg;
-+
-+public class TestLoopMerging {
-+  public float a;
-+  public float b;
-+  public float test() {
-+    while(a - b < -180) b -= 360;
-+    while(a - b >= 180) b += 360;
-+    return a;
-+  }
-+  public float test2() {
-+     for (a = 0; a < 10; a++) {
-+      System.out.println(a);
-+    }
-+    for (a = 0; a < 10; a++) {
-+      System.out.println(a);
-+    }
-+    return a;
-+  }
-+
-+  public float test3() {
-+    int[] as = new int[0];
-+    for (int f: as) {
-+      f++;
-+    }
-+    while(this.a - this.b < -180) this.b -= 360;
-+    while(this.a - this.b >= 180) this.b += 360;
-+    for (a = 0; a < 10; a++) {
-+      System.out.println(a);
-+    }
-+    return this.a;
-+  }
-+  public float test4() {
-+    int[] as = new int[0];
-+    for (int f: as) {
-+      f++;
-+      while(this.a - this.b < -180) this.b -= 360;
-+      while(this.a - this.b >= 180) this.b += 360;
-+      for (a = 0; a < 10; a++) {
-+        System.out.println(a);
-+        while(this.a - this.b < -180) this.b -= 360;
-+        while(this.a - this.b >= 180) this.b += 360;
-+      }
-+    }
-+    return this.a;
-+  }
-+}
-diff --git a/testData/src/pkg/TestVarType.java b/testData/src/pkg/TestVarType.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..15e2171a235562128cdb80c64f1acdacaa05c387
---- /dev/null
-+++ b/testData/src/pkg/TestVarType.java
-@@ -0,0 +1,24 @@
-+/*
-+ * Copyright 2000-2017 JetBrains s.r.o.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+package pkg;
-+
-+public class TestVarType {
-+  public void byteint() {
-+    int i = 75;
-+    i+=5;
-+    i+=500;
-+  }
-+}
diff --git a/FernFlower-Patches/0009-Merge-any-LVTT-to-an-incoming-LVT-if-they-re-out-of-.patch b/FernFlower-Patches/0009-Merge-any-LVTT-to-an-incoming-LVT-if-they-re-out-of-.patch
new file mode 100644
index 0000000..ff0ca23
--- /dev/null
+++ b/FernFlower-Patches/0009-Merge-any-LVTT-to-an-incoming-LVT-if-they-re-out-of-.patch
@@ -0,0 +1,33 @@
+From 7d5770f2462f354c4663f77818ae718062689d7b Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sun, 2 Aug 2015 20:56:16 -0400
+Subject: [PATCH 009/122] Merge any LVTT to an incoming LVT (if they're out of
+ sequence), and merge LVTTs together if there's no LVT yet.
+
+---
+ .../jetbrains/java/decompiler/struct/StructMember.java   | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/org/jetbrains/java/decompiler/struct/StructMember.java b/src/org/jetbrains/java/decompiler/struct/StructMember.java
+index 724c0db..af1df05 100644
+--- a/src/org/jetbrains/java/decompiler/struct/StructMember.java
++++ b/src/org/jetbrains/java/decompiler/struct/StructMember.java
+@@ -62,6 +62,15 @@ public class StructMember {
+           StructLocalVariableTableAttribute table = (StructLocalVariableTableAttribute)attributes.getWithKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
+           table.addLocalVariableTable((StructLocalVariableTableAttribute)attribute);
+         }
++        else if (StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name) && attributes.containsKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE)) {
++            StructLocalVariableTableAttribute lvtt = (StructLocalVariableTableAttribute)attributes.getWithKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
++            ((StructLocalVariableTableAttribute)attribute).addLocalVariableTable(lvtt);
++            attributes.addWithKey(attribute, attribute.getName());
++        }
++        else if (StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE.equals(name) && attributes.containsKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE)) {
++            StructLocalVariableTableAttribute table = (StructLocalVariableTableAttribute)attributes.getWithKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
++            table.addLocalVariableTable((StructLocalVariableTableAttribute)attribute);
++        }
+         else {
+           attributes.addWithKey(attribute, attribute.getName());
+         }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0009-Rework-of-Generics-system-for-better-output.patch b/FernFlower-Patches/0009-Rework-of-Generics-system-for-better-output.patch
deleted file mode 100644
index 79bb0ea..0000000
--- a/FernFlower-Patches/0009-Rework-of-Generics-system-for-better-output.patch
+++ /dev/null
@@ -1,3116 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Fri, 14 Apr 2017 17:09:41 -0700
-Subject: [PATCH] Rework of Generics system for better output
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
-index 4c4916e4cc5ccdd06dd4138dae54c31fb7f3bd34..decfe747ba2ab3643209987294ef7bcbbfa15e1b 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
-@@ -34,7 +34,7 @@ public final class ClassReference14Processor {
-     invFor.setDescriptor(MethodDescriptor.parseDescriptor("(Ljava/lang/String;)Ljava/lang/Class;"));
-     invFor.setStatic(true);
-     invFor.setParameters(Collections.singletonList(new VarExprent(0, VarType.VARTYPE_STRING, null)));
--    BODY_EXPR = new ExitExprent(ExitExprent.EXIT_RETURN, invFor, VarType.VARTYPE_CLASS, null);
-+    BODY_EXPR = new ExitExprent(ExitExprent.EXIT_RETURN, invFor, VarType.VARTYPE_CLASS, null, null);
- 
-     InvocationExprent ctor = new InvocationExprent();
-     ctor.setName(CodeConstants.INIT_NAME);
-@@ -52,7 +52,7 @@ public final class ClassReference14Processor {
-     invCause.setInstance(newExpr);
-     invCause.setParameters(
-       Collections.singletonList(new VarExprent(2, new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/ClassNotFoundException"), null)));
--    HANDLER_EXPR = new ExitExprent(ExitExprent.EXIT_THROW, invCause, null, null);
-+    HANDLER_EXPR = new ExitExprent(ExitExprent.EXIT_THROW, invCause, null, null, null);
-   }
- 
-   public static void processClassReferences(ClassNode node) {
-@@ -235,4 +235,4 @@ public final class ClassReference14Processor {
- 
-     return null;
-   }
--}
-\ No newline at end of file
-+}
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index 9b4e9fb3ab0a2f54c124c8a4c3943e6d7a5d01d2..31236841f1b4bf4f452f30d6b95f21fcc99ec5b9 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-@@ -371,9 +371,14 @@ public class ClassWriter {
- 
-     List<TypeAnnotation> typeAnnotations = TypeAnnotation.listFrom(cl);
- 
--    GenericClassDescriptor descriptor = getGenericClassDescriptor(cl);
-+    GenericClassDescriptor descriptor = cl.getSignature();
-     if (descriptor != null && !descriptor.fparameters.isEmpty()) {
--      appendTypeParameters(buffer, descriptor.fparameters, descriptor.fbounds, typeAnnotations);
-+      DecompilerContext.setProperty(DecompilerContext.IN_CLASS_TYPE_PARAMS, "1");
-+      try {
-+        appendTypeParameters(buffer, descriptor.fparameters, descriptor.fbounds, typeAnnotations);
-+      } finally {
-+        DecompilerContext.setProperty(DecompilerContext.IN_CLASS_TYPE_PARAMS, "0");
-+      }
-     }
- 
-     if (components != null) {
-@@ -396,15 +401,7 @@ public class ClassWriter {
-       List<TypeAnnotation> extendsTypeAnnotations = TargetInfo.SupertypeTarget.extractExtends(typeAnnotations);
-       if (!VarType.VARTYPE_OBJECT.equals(supertype)) {
-         buffer.append("extends ");
--        if (descriptor != null) {
--          buffer.append(GenericMain.getGenericCastTypeName(
--            descriptor.superclass,
--            TypeAnnotationWriteHelper.create(extendsTypeAnnotations))
--          );
--        }
--        else {
--          buffer.append(ExprProcessor.getCastTypeName(supertype, TypeAnnotationWriteHelper.create(extendsTypeAnnotations)));
--        }
-+        buffer.append(ExprProcessor.getCastTypeName(descriptor == null ? supertype : descriptor.superclass, TypeAnnotationWriteHelper.create(extendsTypeAnnotations)));
-         buffer.append(' ');
-       }
-     }
-@@ -418,18 +415,7 @@ public class ClassWriter {
-             buffer.append(", ");
-           }
-           List<TypeAnnotation> superTypeAnnotations = TargetInfo.SupertypeTarget.extract(typeAnnotations, i);
--          if (descriptor != null) {
--            buffer.append(GenericMain.getGenericCastTypeName(
--              descriptor.superinterfaces.get(i),
--              TypeAnnotationWriteHelper.create(superTypeAnnotations))
--            );
--          }
--          else {
--            buffer.append(ExprProcessor.getCastTypeName(
--              new VarType(cl.getInterface(i), true),
--              TypeAnnotationWriteHelper.create(superTypeAnnotations))
--            );
--          }
-+          buffer.append(ExprProcessor.getCastTypeName(descriptor == null ? new VarType(cl.getInterface(i), true) : descriptor.superinterfaces.get(i), TypeAnnotationWriteHelper.create(superTypeAnnotations)));
-         }
-         buffer.append(' ');
-       }
-@@ -491,12 +477,7 @@ public class ClassWriter {
-     final List<TypeAnnotation> typeAnnotations = TypeAnnotation.listFrom(fd);
- 
-     if (!isEnum) {
--      if (descriptor != null) {
--        buffer.append(GenericMain.getGenericCastTypeName(descriptor.type, TypeAnnotationWriteHelper.create(typeAnnotations)));
--      }
--      else {
--        buffer.append(ExprProcessor.getCastTypeName(fieldType, TypeAnnotationWriteHelper.create(typeAnnotations)));
--      }
-+      buffer.append(ExprProcessor.getCastTypeName(descriptor == null ? fieldType : descriptor.type, TypeAnnotationWriteHelper.create(typeAnnotations)));
-       buffer.append(' ');
-     }
- 
-@@ -524,8 +505,8 @@ public class ClassWriter {
-           ((ConstExprent) initializer).adjustConstType(fieldType);
-         }
- 
--        // FIXME: special case field initializer. Can map to more than one method (constructor) and bytecode instruction
--        buffer.append(initializer.toJava(indent, tracer));
-+        // FIXME: special case field initializer. Can map to more than one method (constructor) and bytecode instruction.
-+        ExprProcessor.getCastedExprent(initializer, descriptor == null ? fieldType : descriptor.type, buffer, indent, false, tracer);
-       }
-     }
-     else if (fd.hasModifier(CodeConstants.ACC_FINAL) && fd.hasModifier(CodeConstants.ACC_STATIC)) {
-@@ -638,7 +619,7 @@ public class ClassWriter {
-       boolean isDeprecated = mt.hasAttribute(StructGeneralAttribute.ATTRIBUTE_DEPRECATED);
-       boolean clInit = false, dInit = false;
- 
--      MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
-+      MethodDescriptor md = MethodDescriptor.parseDescriptor(mt, node);
- 
-       int flags = mt.getAccessFlags();
-       if ((flags & CodeConstants.ACC_NATIVE) != 0) {
-@@ -666,25 +647,7 @@ public class ClassWriter {
-         appendComment(buffer, "bridge method", indent);
-       }
- 
--      GenericMethodDescriptor descriptor = null;
--      if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
--        StructGenericSignatureAttribute attr = mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_SIGNATURE);
--        if (attr != null) {
--          descriptor = GenericMain.parseMethodSignature(attr.getSignature());
--          if (descriptor != null) {
--            long actualParams = md.params.length;
--            List<VarVersionPair> mask = methodWrapper.synthParameters;
--            if (mask != null) {
--              actualParams = mask.stream().filter(Objects::isNull).count();
--            }
--            if (actualParams != descriptor.parameterTypes.size()) {
--              String message = "Inconsistent generic signature in method " + mt.getName() + " " + mt.getDescriptor() + " in " + cl.qualifiedName;
--              DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
--              descriptor = null;
--            }
--          }
--        }
--      }
-+      GenericMethodDescriptor descriptor = mt.getSignature();
-       appendAnnotations(buffer, indent, mt);
- 
-       buffer.appendIndent(indent);
-@@ -726,12 +689,7 @@ public class ClassWriter {
-         if (init) {
-           emptyTypeAnnotations.forEach(typeAnnotation -> typeAnnotation.writeTo(buffer));
-         } else {
--          if (descriptor != null) {
--            buffer.append(GenericMain.getGenericCastTypeName(descriptor.returnType, TypeAnnotationWriteHelper.create(emptyTypeAnnotations)));
--          }
--          else {
--            buffer.append(ExprProcessor.getCastTypeName(md.ret, TypeAnnotationWriteHelper.create(emptyTypeAnnotations)));
--          }
-+          buffer.append(ExprProcessor.getCastTypeName(descriptor == null ? md.ret : descriptor.returnType, TypeAnnotationWriteHelper.create(emptyTypeAnnotations)));
-           buffer.append(' ');
-         }
- 
-@@ -748,7 +706,12 @@ public class ClassWriter {
-         }
- 
-         int index = methodWrapper.varproc.getFirstParameterVarIndex();
-+        boolean hasDescriptor = descriptor != null;
-+        //mask should now have the Outer.this in it... so this *shouldn't* be nessasary.
-+        //if (init && !isEnum && ((node.access & CodeConstants.ACC_STATIC) == 0) && node.type == ClassNode.CLASS_MEMBER)
-+        //    index++;
-         for (int i = methodWrapper.varproc.getFirstParameterPosition(); i < md.params.length; i++) {
-+          VarType parameterType = hasDescriptor && !descriptor.parameterTypes.isEmpty() ? descriptor.parameterTypes.get(paramCount) : md.params[i];
-           if (mask == null || mask.get(i) == null) {
-             if (paramCount > 0) {
-               buffer.append(", ");
-@@ -765,23 +728,12 @@ public class ClassWriter {
-             }
- 
-             String typeName;
--            boolean isVarArg = i == lastVisibleParameterIndex && mt.hasModifier(CodeConstants.ACC_VARARGS);
-             List<TypeAnnotation> typeParamAnnotations = TargetInfo.FormalParameterTarget.extract(typeAnnotations, i);
--            if (paramType instanceof GenericType genParamType) {
--              isVarArg &= genParamType.getArrayDim() > 0;
--              if (isVarArg) {
--                genParamType = genParamType.decreaseArrayDim();
--              }
--              typeName = GenericMain.getGenericCastTypeName(genParamType, TypeAnnotationWriteHelper.create(typeParamAnnotations));
--            }
--            else {
--              VarType varParamType = (VarType) paramType;
--              isVarArg &= varParamType.getArrayDim() > 0;
--              if (isVarArg) {
--                varParamType = varParamType.decreaseArrayDim();
--              }
--              typeName = ExprProcessor.getCastTypeName(varParamType, TypeAnnotationWriteHelper.create(typeParamAnnotations));
-+            boolean isVarArg = i == lastVisibleParameterIndex && mt.hasModifier(CodeConstants.ACC_VARARGS) && parameterType.getArrayDim() > 0;
-+            if (isVarArg) {
-+                parameterType = parameterType.decreaseArrayDim();
-             }
-+            typeName = ExprProcessor.getCastTypeName(parameterType, TypeAnnotationWriteHelper.create(typeParamAnnotations));
- 
-             if (ExprProcessor.UNDEFINED_TYPE_STRING.equals(typeName) &&
-                 DecompilerContext.getOption(IFernflowerPreferences.UNDEFINED_PARAM_TYPE_OBJECT)) {
-@@ -800,7 +752,7 @@ public class ClassWriter {
-             paramCount++;
-           }
- 
--          index += md.params[i].getStackSize();
-+          index += parameterType.getStackSize();
-         }
- 
-         buffer.append(')');
-@@ -810,19 +762,14 @@ public class ClassWriter {
-           throwsExceptions = true;
-           buffer.append(" throws ");
- 
-+          boolean useDescriptor = hasDescriptor && !descriptor.exceptionTypes.isEmpty();
-           for (int i = 0; i < attr.getThrowsExceptions().size(); i++) {
-             if (i > 0) {
-               buffer.append(", ");
-             }
-             TargetInfo.ThrowsTarget.extract(typeAnnotations, i).forEach(typeAnnotation -> typeAnnotation.writeTo(buffer));
--            if (descriptor != null && !descriptor.exceptionTypes.isEmpty()) {
--              GenericType type = descriptor.exceptionTypes.get(i);
--              buffer.append(GenericMain.getGenericCastTypeName(type, Collections.emptyList()));
--            }
--            else {
--              VarType type = new VarType(attr.getExcClassname(i, cl.getPool()), true);
--              buffer.append(ExprProcessor.getCastTypeName(type, Collections.emptyList()));
--            }
-+            VarType type = useDescriptor ? descriptor.exceptionTypes.get(i) : new VarType(attr.getExcClassname(i, cl.getPool()), true);
-+            buffer.append(ExprProcessor.getCastTypeName(type, Collections.emptyList()));
-           }
-         }
-       }
-@@ -1050,7 +997,7 @@ public class ClassWriter {
- 
-     final List<TypeAnnotation> typeAnnotations = TypeAnnotation.listFrom(cd);
-     if (descriptor != null) {
--      buffer.append(GenericMain.getGenericCastTypeName(
-+      buffer.append(ExprProcessor.getCastTypeName(
-         varArgComponent ? descriptor.type.decreaseArrayDim() : descriptor.type,
-         TypeAnnotationWriteHelper.create(typeAnnotations)
-       ));
-@@ -1104,14 +1051,7 @@ public class ClassWriter {
-   private static Map.Entry<VarType, GenericFieldDescriptor> getFieldTypeData(StructField fd) {
-     VarType fieldType = new VarType(fd.getDescriptor(), false);
- 
--    GenericFieldDescriptor descriptor = null;
--    if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
--      StructGenericSignatureAttribute attr = fd.getAttribute(StructGeneralAttribute.ATTRIBUTE_SIGNATURE);
--      if (attr != null) {
--        descriptor = GenericMain.parseFieldSignature(attr.getSignature());
--      }
--    }
--
-+    GenericFieldDescriptor descriptor = fd.getSignature();
-     return new AbstractMap.SimpleImmutableEntry<>(fieldType, descriptor);
-   }
- 
-@@ -1248,22 +1188,11 @@ public class ClassWriter {
-     }
-   }
- 
--  public static GenericClassDescriptor getGenericClassDescriptor(StructClass cl) {
--    if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
--      StructGenericSignatureAttribute attr = cl.getAttribute(StructGeneralAttribute.ATTRIBUTE_SIGNATURE);
--      if (attr != null) {
--        return GenericMain.parseClassSignature(attr.getSignature());
--      }
--    }
--    return null;
--  }
--
-   public static void appendTypeParameters(
--    TextBuffer buffer,
--    List<String> parameters,
--    List<? extends List<GenericType>> bounds,
--    final List<TypeAnnotation> typeAnnotations
--  ) {
-+      TextBuffer buffer,
-+      List<String> parameters,
-+      List<List<VarType>> bounds,
-+      final List<TypeAnnotation> typeAnnotations) {
-     buffer.append('<');
-     for (int i = 0; i < parameters.size(); i++) {
-       if (i > 0) {
-@@ -1271,15 +1200,15 @@ public class ClassWriter {
-       }
-       TargetInfo.TypeParameterTarget.extract(typeAnnotations, i).forEach(typeAnnotation -> typeAnnotation.writeTo(buffer));
-       buffer.append(parameters.get(i));
--      List<GenericType> parameterBounds = bounds.get(i);
-+      List<VarType> parameterBounds = bounds.get(i);
-       if (parameterBounds.size() > 1 || !"java/lang/Object".equals(parameterBounds.get(0).getValue())) {
-         buffer.append(" extends ");
-         TargetInfo.TypeParameterBoundTarget.extract(typeAnnotations, i, 0).forEach(typeAnnotation -> typeAnnotation.writeTo(buffer));
--        buffer.append(GenericMain.getGenericCastTypeName(parameterBounds.get(0), Collections.emptyList()));
-+        buffer.append(ExprProcessor.getCastTypeName(parameterBounds.get(0), Collections.emptyList()));
-         for (int j = 1; j < parameterBounds.size(); j++) {
-           buffer.append(" & ");
-           TargetInfo.TypeParameterBoundTarget.extract(typeAnnotations, i, j).forEach(typeAnnotation -> typeAnnotation.writeTo(buffer));
--          buffer.append(GenericMain.getGenericCastTypeName(parameterBounds.get(j), Collections.emptyList()));
-+          buffer.append(ExprProcessor.getCastTypeName(parameterBounds.get(j), Collections.emptyList()));
-         }
-       }
-     }
-@@ -1296,4 +1225,4 @@ public class ClassWriter {
-       }
-     }
-   }
--}
-\ No newline at end of file
-+}
-diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-index e2936358fa03746e00e23d30f47351c28124e09f..654d0ddf34821ce4ea800cd5421f6268e2ca3236 100644
---- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-+++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-@@ -18,6 +18,8 @@ public class DecompilerContext {
-   public static final String CURRENT_CLASS_WRAPPER = "CURRENT_CLASS_WRAPPER";
-   public static final String CURRENT_CLASS_NODE = "CURRENT_CLASS_NODE";
-   public static final String CURRENT_METHOD_WRAPPER = "CURRENT_METHOD_WRAPPER";
-+  public static final String CURRENT_VAR_PROCESSOR = "CURRENT_VAR_PROCESSOR";
-+  public static final String IN_CLASS_TYPE_PARAMS = "IN_CLASS_TYPE_PARAMS";
- 
-   private final Map<String, Object> properties;
-   private final IFernflowerLogger logger;
-@@ -126,4 +128,4 @@ public class DecompilerContext {
-   public static BytecodeSourceMapper getBytecodeSourceMapper() {
-     return getCurrentContext().bytecodeSourceMapper;
-   }
--}
-\ No newline at end of file
-+}
-diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-index 692c1b622ef7e065c9c970cf0a5289f9ca8869f5..f8c413c7b7302b201a739310677d0103e2878d3e 100644
---- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
-+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-@@ -11,6 +11,7 @@ import org.jetbrains.java.decompiler.struct.StructClass;
- import org.jetbrains.java.decompiler.struct.StructContext;
- import org.jetbrains.java.decompiler.struct.lazy.LazyLoader;
- import org.jetbrains.java.decompiler.util.TextBuffer;
-+import org.jetbrains.java.decompiler.util.ClasspathScanner;
- 
- import java.io.File;
- import java.util.HashMap;
-@@ -53,6 +54,15 @@ public class Fernflower implements IDecompiledData {
- 
-     DecompilerContext context = new DecompilerContext(properties, logger, structContext, classProcessor, interceptor);
-     DecompilerContext.setCurrentContext(context);
-+
-+    String vendor = System.getProperty("java.vendor", "missing vendor");
-+    String javaVersion = System.getProperty("java.version", "missing java version");
-+    String jvmVersion = System.getProperty("java.vm.version", "missing jvm version");
-+    logger.writeMessage(String.format("JVM info: %s - %s - %s", vendor, javaVersion, jvmVersion), IFernflowerLogger.Severity.INFO);
-+
-+    if (DecompilerContext.getOption(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH)) {
-+      ClasspathScanner.addAllClasspath(structContext);
-+    }
-   }
- 
-   private static IIdentifierRenamer loadHelper(String className, IFernflowerLogger logger) {
-diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-index b509376a6dbc3780f7c14c631bf51b7fc24aa50d..79108dd8772dc9444d66e6ba0cdd7f56ca382fbd 100644
---- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-@@ -36,6 +36,7 @@ public interface IFernflowerPreferences {
-   String VERIFY_ANONYMOUS_CLASSES = "vac";
- 
-   String STANDARDIZE_FLOATING_POINT_NUMBERS = "sfn";
-+  String INCLUDE_ENTIRE_CLASSPATH = "iec";
- 
-   String LOG_LEVEL = "log";
-   String MAX_PROCESSING_METHOD = "mpm";
-@@ -84,6 +85,7 @@ public interface IFernflowerPreferences {
-     defaults.put(VERIFY_ANONYMOUS_CLASSES, "0");
- 
-     defaults.put(STANDARDIZE_FLOATING_POINT_NUMBERS, "1");
-+    defaults.put(INCLUDE_ENTIRE_CLASSPATH, "0");
- 
-     defaults.put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name());
-     defaults.put(MAX_PROCESSING_METHOD, "0");
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
-index 33906d3a433e4421bbf41c6aed5ff566a69a904a..c1126a2b7559e2f8a69a54ee0b7db2ceda3d9776 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
-@@ -47,7 +47,7 @@ public class ClassWrapper {
-     for (StructMethod mt : classStruct.getMethods()) {
-       DecompilerContext.getLogger().startMethod(mt.getName() + " " + mt.getDescriptor());
- 
--      MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
-+      MethodDescriptor md = MethodDescriptor.parseDescriptor(mt, null);
-       VarProcessor varProc = new VarProcessor(classStruct, mt, md);
-       DecompilerContext.startMethod(varProc);
- 
-@@ -218,4 +218,4 @@ public class ClassWrapper {
-   public String toString() {
-     return classStruct.qualifiedName;
-   }
--}
-\ No newline at end of file
-+}
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-index a242aa9e74698b14e20e27d655a3c8ae141ee2f5..e005b2941b4e76b736b8d00905726ac8500c3dc2 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-@@ -29,6 +29,7 @@ import org.jetbrains.java.decompiler.struct.consts.PrimitiveConstant;
- import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
- import org.jetbrains.java.decompiler.struct.gen.Type;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
- import org.jetbrains.java.decompiler.util.TextBuffer;
- 
- import java.util.*;
-@@ -473,7 +474,7 @@ public class ExprProcessor implements CodeConstants {
-           exprList.add(new ExitExprent(instr.opcode == opc_athrow ? ExitExprent.EXIT_THROW : ExitExprent.EXIT_RETURN,
-                                        instr.opcode == opc_return ? null : stack.pop(),
-                                        instr.opcode == opc_athrow ? null : methodDescriptor.ret,
--                                       offsets));
-+              offsets, methodDescriptor));
-           break;
-         case opc_monitorenter:
-         case opc_monitorexit:
-@@ -685,7 +686,15 @@ public class ExprProcessor implements CodeConstants {
-       sb.append("void");
-       return sb.toString();
-     }
-+    else if (tp == CodeConstants.TYPE_GENVAR && type.isGeneric()) {
-+      sb.append(type.getValue());
-+      return sb.toString();
-+    }
-     else if (tp == CodeConstants.TYPE_OBJECT) {
-+      if (type.isGeneric()) {
-+        ((GenericType)type).appendCastName(sb, typeAnnWriteHelpers);
-+        return sb.toString();
-+      }
-       String ret;
-       if (getShort) {
-         ret = DecompilerContext.getImportCollector().getNestedName(type.getValue());
-@@ -736,7 +745,9 @@ public class ExprProcessor implements CodeConstants {
-       boolean shouldWrite = true;
-       if (!enclosingClasses.isEmpty() && i != nestedTypes.size() - 1) {
-         String enclosingType = enclosingClasses.remove(0).simpleName;
--        shouldWrite = !nestedType.equals(enclosingType);
-+        shouldWrite = !nestedType.equals(enclosingType)
-+          // Also write out the enclosing class if we are the outermost, and we're in the type params
-+          || enclosingClasses.isEmpty() && DecompilerContext.getOption(DecompilerContext.IN_CLASS_TYPE_PARAMS);
-       }
-       if (i == 0) { // first annotation can be written already
-         if (!sb.toString().isEmpty()) shouldWrite = true; // write if annotation exists
-@@ -952,6 +963,8 @@ public class ExprProcessor implements CodeConstants {
-         tracer.incrementCurrentSourceLine();
-       }
- 
-+      expr.getInferredExprType(null);
-+
-       TextBuffer content = expr.toJava(indent, tracer);
- 
-       if (content.length() > 0) {
-@@ -1024,7 +1037,7 @@ public class ExprProcessor implements CodeConstants {
-       }
-     }
- 
--    VarType rightType = exprent.getExprType();
-+    VarType rightType = exprent.getInferredExprType(leftType);
- 
-     boolean cast =
-       castAlways ||
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
-index eb96762fa2174047a3f9dcecfb8c57bf4721c11f..dc3d20eed5ddcac36204fc9ed75d73c53a8c9805 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
-@@ -722,7 +722,7 @@ public class SimplifyExprentsHelper {
-                                                                                Arrays.asList(
-                                                                                  statement.getHeadexprent().getCondition(),
-                                                                                  ifExit.getValue(),
--                                                                                 elseExit.getValue()), ifHeadExprBytecode), ifExit.getRetType(), ifHeadExprBytecode));
-+                                                                                 elseExit.getValue()), ifHeadExprBytecode), ifExit.getRetType(), ifHeadExprBytecode, ifExit.getMethodDescriptor()));
-               statement.setExprents(data);
- 
-               StatEdge retEdge = ifStatement.getAllSuccessorEdges().get(0);
-@@ -768,4 +768,4 @@ public class SimplifyExprentsHelper {
- 
-     return ret;
-   }
--}
-\ No newline at end of file
-+}
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
-index 06567749310f70d0f3263a9b2bad4588237bdda9..ed470ffbbf57c7aea4e82174a99c8d31a097bc32 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
-@@ -5,7 +5,6 @@ import org.jetbrains.java.decompiler.code.CodeConstants;
- import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
- import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
--import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
- import org.jetbrains.java.decompiler.struct.StructField;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
-@@ -49,6 +48,11 @@ public class AssignmentExprent extends Exprent {
-     return left.getExprType();
-   }
- 
-+  @Override
-+  public VarType getInferredExprType(VarType upperBounds) {
-+    return left.getInferredExprType(upperBounds);
-+  }
-+
-   @Override
-   public CheckTypesResult checkExprTypeBounds() {
-     CheckTypesResult result = new CheckTypesResult();
-@@ -89,8 +93,8 @@ public class AssignmentExprent extends Exprent {
- 
-   @Override
-   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
--    VarType leftType = left.getExprType();
--    VarType rightType = right.getExprType();
-+    VarType leftType = left.getInferredExprType(null);
-+    VarType rightType = right.getInferredExprType(leftType);
- 
-     boolean fieldInClassInit = false, hiddenField = false;
-     if (left.type == Exprent.EXPRENT_FIELD) { // first assignment to a final field. Field name without "this" in front of it
-@@ -128,14 +132,8 @@ public class AssignmentExprent extends Exprent {
- 
-     TextBuffer res = right.toJava(indent, tracer);
- 
--    if (condType == CONDITION_NONE &&
--        !leftType.isSuperset(rightType) &&
--        (rightType.equals(VarType.VARTYPE_OBJECT) || leftType.getType() != CodeConstants.TYPE_OBJECT)) {
--      if (right.getPrecedence() >= FunctionExprent.getPrecedence(FunctionExprent.FUNCTION_CAST)) {
--        res.enclose("(", ")");
--      }
--
--      res.prepend("(" + ExprProcessor.getCastTypeName(leftType, Collections.emptyList()) + ")");
-+    if (condType == CONDITION_NONE) {
-+      this.wrapInCast(leftType, rightType, res, right.getPrecedence());
-     }
- 
-     buffer.append(condType == CONDITION_NONE ? " = " : OPERATORS[condType]).append(res);
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
-index 54f6a306cd28f68879d25a536a1dea7a496a4aa3..9b9a0b4198688968201783fb804130a3312aa522 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
-@@ -10,6 +10,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
- import org.jetbrains.java.decompiler.struct.attr.StructExceptionsAttribute;
- import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
-+import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
- import org.jetbrains.java.decompiler.struct.match.MatchEngine;
- import org.jetbrains.java.decompiler.struct.match.MatchNode;
-@@ -28,19 +29,21 @@ public class ExitExprent extends Exprent {
-   private final int exitType;
-   private Exprent value;
-   private final VarType retType;
-+  private final MethodDescriptor methodDescriptor;
- 
--  public ExitExprent(int exitType, Exprent value, VarType retType, BitSet bytecodeOffsets) {
-+  public ExitExprent(int exitType, Exprent value, VarType retType, BitSet bytecodeOffsets, MethodDescriptor methodDescriptor) {
-     super(EXPRENT_EXIT);
-     this.exitType = exitType;
-     this.value = value;
-     this.retType = retType;
-+    this.methodDescriptor = methodDescriptor;
- 
-     addBytecodeOffsets(bytecodeOffsets);
-   }
- 
-   @Override
-   public Exprent copy() {
--    return new ExitExprent(exitType, value == null ? null : value.copy(), retType, bytecode);
-+    return new ExitExprent(exitType, value == null ? null : value.copy(), retType, bytecode, methodDescriptor);
-   }
- 
-   @Override
-@@ -72,8 +75,12 @@ public class ExitExprent extends Exprent {
-       TextBuffer buffer = new TextBuffer("return");
- 
-       if (retType.getType() != CodeConstants.TYPE_VOID) {
-+        VarType ret = retType;
-+        if (methodDescriptor != null && methodDescriptor.genericInfo != null && methodDescriptor.genericInfo.returnType != null) {
-+          ret = methodDescriptor.genericInfo.returnType;
-+        }
-         buffer.append(' ');
--        ExprProcessor.getCastedExprent(value, retType, buffer, indent, false, tracer);
-+        ExprProcessor.getCastedExprent(value, ret, buffer, indent, false, false, false, false, tracer);
-       }
- 
-       return buffer;
-@@ -140,6 +147,10 @@ public class ExitExprent extends Exprent {
-     return retType;
-   }
- 
-+  public MethodDescriptor getMethodDescriptor() {
-+    return this.methodDescriptor;
-+  }
-+
-   @Override
-   public void getBytecodeRange(BitSet values) {
-     measureBytecode(values, value);
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-index 67fc1f2beab815f0ca07ecf8a34b98fa23344749..33150f76d649f124bc818036b0f7c6331d5e74be 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-@@ -3,13 +3,20 @@
-  */
- package org.jetbrains.java.decompiler.modules.decompiler.exps;
- 
-+import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
-+import org.jetbrains.java.decompiler.code.CodeConstants;
- import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.util.TextBuffer;
- import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
- import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
-+import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
-+import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericClassDescriptor;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericMethodDescriptor;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
- import org.jetbrains.java.decompiler.struct.match.IMatchable;
- import org.jetbrains.java.decompiler.struct.match.MatchEngine;
- import org.jetbrains.java.decompiler.struct.match.MatchNode;
-@@ -19,8 +26,10 @@ import java.util.ArrayList;
- import java.util.BitSet;
- import java.util.Collections;
- import java.util.Comparator;
-+import java.util.HashMap;
- import java.util.HashSet;
- import java.util.List;
-+import java.util.Map;
- import java.util.Map.Entry;
- import java.util.Set;
- 
-@@ -61,6 +70,11 @@ public abstract class Exprent implements IMatchable {
-     return VarType.VARTYPE_VOID;
-   }
- 
-+  // TODO: This captures the state of upperBound, find a way to do it without modifying state?
-+  public VarType getInferredExprType(VarType upperBound) {
-+    return getExprType();
-+  }
-+
-   public int getExprentUse() {
-     return 0;
-   }
-@@ -184,6 +198,119 @@ public abstract class Exprent implements IMatchable {
-       return ret;
-     }
- 
-+  protected VarType gatherGenerics(VarType upperBound, VarType ret, List<String> fparams, List<VarType> genericArgs) {
-+    Map<VarType, VarType> map = new HashMap<>();
-+
-+    // List<T> -> List<String>
-+    if (upperBound != null && upperBound.isGeneric() && ret.isGeneric()) {
-+      List<VarType> leftArgs = ((GenericType)upperBound).getArguments();
-+      List<VarType> rightArgs = ((GenericType)ret).getArguments();
-+      if (leftArgs.size() == rightArgs.size() && rightArgs.size() == fparams.size()) {
-+        for (int i = 0; i < leftArgs.size(); i++) {
-+          VarType left = leftArgs.get(i);
-+          VarType right = rightArgs.get(i);
-+          if (left != null && right.getValue().equals(fparams.get(i))) {
-+            genericArgs.add(left);
-+            map.put(right, left);
-+          } else {
-+            genericArgs.clear();
-+            map.clear();
-+            break;
-+          }
-+        }
-+      }
-+    }
-+
-+    return map.isEmpty() ? ret : ret.remap(map);
-+  }
-+
-+  protected void appendParameters(TextBuffer buf, List<VarType> genericArgs) {
-+    if (genericArgs.isEmpty()) {
-+      return;
-+    }
-+    buf.append("<");
-+    //TODO: Check target output level and use <> operator?
-+    for (int i = 0; i < genericArgs.size(); i++) {
-+      buf.append(ExprProcessor.getCastTypeName(genericArgs.get(i), Collections.emptyList()));
-+      if(i + 1 < genericArgs.size()) {
-+        buf.append(", ");
-+      }
-+    }
-+    buf.append(">");
-+  }
-+
-+  protected Map<VarType, List<VarType>> getNamedGenerics() {
-+    Map<VarType, List<VarType>> ret = new HashMap<>();
-+    ClassNode class_ = (ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE);
-+    MethodWrapper method = (MethodWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_WRAPPER);
-+
-+    //TODO: Loop enclosing classes?
-+    GenericClassDescriptor cls = class_ == null ? null : class_.classStruct.getSignature();
-+    if (cls != null) {
-+      for (int x = 0; x < cls.fparameters.size(); x++) {
-+        ret.put(GenericType.parse("T" + cls.fparameters.get(x) + ";"), cls.fbounds.get(x));
-+      }
-+    }
-+
-+    //TODO: Loop enclosing method?
-+    GenericMethodDescriptor mtd = method == null ? null : method.methodStruct.getSignature();
-+    if (mtd != null) {
-+      for (int x = 0; x < mtd.typeParameters.size(); x++) {
-+        ret.put(GenericType.parse("T" + mtd.typeParameters.get(x) + ";"), mtd.typeParameterBounds.get(x));
-+      }
-+    }
-+
-+    return ret;
-+  }
-+
-+  protected void wrapInCast(VarType left, VarType right, TextBuffer buf, int precedence) {
-+    boolean needsCast = !left.isSuperset(right) && (right.equals(VarType.VARTYPE_OBJECT) || left.getType() != CodeConstants.TYPE_OBJECT);
-+
-+    if (left != null && left.isGeneric()) {
-+      Map<VarType, List<VarType>> names = this.getNamedGenerics();
-+      int arrayDim = 0;
-+
-+      if (left.getArrayDim() == right.getArrayDim()) {
-+        arrayDim = left.getArrayDim();
-+        left = left.resizeArrayDim(0);
-+        right = right.resizeArrayDim(0);
-+      }
-+
-+      List<? extends VarType> types = names.get(right);
-+      if (types == null) {
-+        types = names.get(left);
-+      }
-+
-+      if (types != null) {
-+        boolean anyMatch = false; //TODO: allMatch instead of anyMatch?
-+        for (VarType type : types) {
-+          if (type.equals(VarType.VARTYPE_OBJECT) && right.equals(VarType.VARTYPE_OBJECT)) {
-+            continue;
-+          }
-+          anyMatch |= right.getValue() == null /*null const doesn't need cast*/ || DecompilerContext.getStructContext().instanceOf(right.getValue(), type.getValue());
-+        }
-+
-+        if (anyMatch) {
-+          needsCast = false;
-+        }
-+      }
-+
-+      if (arrayDim != 0) {
-+        left = left.resizeArrayDim(arrayDim);
-+      }
-+    }
-+
-+    if (!needsCast) {
-+      return;
-+    }
-+
-+    if (precedence >= FunctionExprent.getPrecedence(FunctionExprent.FUNCTION_CAST)) {
-+      buf.enclose("(", ")");
-+    }
-+
-+    buf.prepend("(" + ExprProcessor.getCastTypeName(left, Collections.emptyList()) + ")");
-+  }
-+
-   // *****************************************************************************
-   // IMatchable implementation
-   // *****************************************************************************
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-index 379242393a83c6b3502a88c8d745a5b0bc1b5476..040e5d21985979a9686cb9fee6e3048fe87e5464 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-@@ -8,6 +8,8 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
- import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
- import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
-+import org.jetbrains.java.decompiler.struct.StructClass;
-+import org.jetbrains.java.decompiler.struct.StructField;
- import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute;
- import org.jetbrains.java.decompiler.struct.consts.LinkConstant;
- import org.jetbrains.java.decompiler.struct.gen.FieldDescriptor;
-@@ -20,7 +22,9 @@ import org.jetbrains.java.decompiler.util.TextUtil;
- 
- import java.util.ArrayList;
- import java.util.BitSet;
-+import java.util.Collections;
- import java.util.List;
-+import java.util.Map;
- import java.util.Objects;
- 
- public class FieldExprent extends Exprent {
-@@ -50,6 +54,26 @@ public class FieldExprent extends Exprent {
-     return descriptor.type;
-   }
- 
-+  @Override
-+  public VarType getInferredExprType(VarType upperBound) {
-+    StructClass cl = DecompilerContext.getStructContext().getClass(classname);
-+    Map<String, Map<VarType, VarType>> types = cl == null ? Collections.emptyMap() : cl.getAllGenerics();
-+
-+    StructField ft = null;
-+    while(cl != null) {
-+      ft = cl.getField(name, descriptor.descriptorString);
-+      if (ft != null)
-+        break;
-+      cl = cl.superClass == null ? null : DecompilerContext.getStructContext().getClass((String)cl.superClass.value);
-+    }
-+
-+    if (ft != null && ft.getSignature() != null) {
-+      return ft.getSignature().type.remap(types.getOrDefault(cl.qualifiedName, Collections.emptyMap()));
-+    }
-+
-+    return getExprType();
-+  }
-+
-   @Override
-   public int getExprentUse() {
-     return 0; // multiple references to a field considered dangerous in a multithreaded environment, thus no Exprent.MULTIPLE_USES set here
-@@ -210,4 +234,4 @@ public class FieldExprent extends Exprent {
- 
-     return true;
-   }
--}
-\ No newline at end of file
-+}
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-index b2b26fb3f8b075182caee14d57b4cc351ffb120a..f18ef04b350a5f6d4599282aef5ea3f6e3dce778 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-@@ -2,6 +2,8 @@
- package org.jetbrains.java.decompiler.modules.decompiler.exps;
- 
- import org.jetbrains.java.decompiler.code.CodeConstants;
-+import org.jetbrains.java.decompiler.util.TextBuffer;
-+import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
- import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
-@@ -9,7 +11,6 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
- import org.jetbrains.java.decompiler.struct.match.MatchEngine;
- import org.jetbrains.java.decompiler.struct.match.MatchNode;
- import org.jetbrains.java.decompiler.util.ListStack;
--import org.jetbrains.java.decompiler.util.TextBuffer;
- 
- import java.util.*;
- 
-@@ -182,6 +183,7 @@ public class FunctionExprent extends Exprent {
-   private int funcType;
-   private VarType implicitType;
-   private final List<Exprent> lstOperands;
-+  private boolean needsCast = true;
- 
-   public FunctionExprent(int funcType, ListStack<Exprent> stack, BitSet bytecodeOffsets) {
-     this(funcType, new ArrayList<>(), bytecodeOffsets);
-@@ -269,6 +271,46 @@ public class FunctionExprent extends Exprent {
-     return exprType;
-   }
- 
-+  @Override
-+  public VarType getInferredExprType(VarType upperBound) {
-+    if (funcType == FUNCTION_CAST) {
-+      this.needsCast = true;
-+      VarType right = lstOperands.get(0).getInferredExprType(upperBound);
-+      VarType cast = lstOperands.get(1).getExprType();
-+
-+      if (upperBound != null && upperBound.isGeneric()) {
-+        Map<VarType, List<VarType>> names = this.getNamedGenerics();
-+        int arrayDim = 0;
-+
-+        if (upperBound.getArrayDim() == right.getArrayDim()) {
-+          arrayDim = upperBound.getArrayDim();
-+          upperBound = upperBound.resizeArrayDim(0);
-+          right = right.resizeArrayDim(0);
-+        }
-+
-+        List<VarType> types = names.get(right);
-+        if (types == null) {
-+          types = names.get(upperBound);
-+        }
-+
-+        if (types != null) {
-+          boolean anyMatch = false; //TODO: allMatch instead of anyMatch?
-+          for (VarType type : types) {
-+            anyMatch |= DecompilerContext.getStructContext().instanceOf(type.getValue(), cast.getValue());
-+          }
-+          if (anyMatch) {
-+            this.needsCast = false;
-+          }
-+        }
-+      }
-+      else { //TODO: Capture generics to make cast better?
-+        this.needsCast = right.getType() == CodeConstants.TYPE_NULL || !DecompilerContext.getStructContext().instanceOf(right.getValue(), cast.getValue());
-+      }
-+    }
-+    return getExprType();
-+  }
-+
-+
-   @Override
-   public int getExprentUse() {
-     if (funcType >= FUNCTION_IMM && funcType <= FUNCTION_PPI) {
-@@ -438,8 +480,12 @@ public class FunctionExprent extends Exprent {
-       case FUNCTION_BIT_NOT -> wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("~");
-       case FUNCTION_BOOL_NOT -> wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("!");
-       case FUNCTION_NEG -> wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("-");
--      case FUNCTION_CAST -> lstOperands.get(1).toJava(indent, tracer).enclose("(", ")")
--        .append(wrapOperandString(lstOperands.get(0), true, indent, tracer));
-+      case FUNCTION_CAST -> {
-+        if (!needsCast) {
-+          yield lstOperands.get(0).toJava(indent, tracer);
-+        }
-+        yield lstOperands.get(1).toJava(indent, tracer).enclose("(", ")").append(wrapOperandString(lstOperands.get(0), true, indent, tracer));
-+      }
-       case FUNCTION_ARRAY_LENGTH -> {
-         Exprent arr = lstOperands.get(0);
-         TextBuffer res = wrapOperandString(arr, false, indent, tracer);
-@@ -570,7 +616,7 @@ public class FunctionExprent extends Exprent {
-     measureBytecode(values, lstOperands);
-     measureBytecode(values);
-   }
--  
-+
-   // *****************************************************************************
-   // IMatchable implementation
-   // *****************************************************************************
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 6776219b98b6b244bb9deda8cffc7b8fc63e4ac6..2d8abaec74b301f76fcd4149600c1da72cc9b6c4 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-@@ -19,6 +19,8 @@ import org.jetbrains.java.decompiler.struct.consts.LinkConstant;
- import org.jetbrains.java.decompiler.struct.consts.PooledConstant;
- import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericMethodDescriptor;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
- import org.jetbrains.java.decompiler.struct.match.MatchEngine;
- import org.jetbrains.java.decompiler.struct.match.MatchNode;
- import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
-@@ -56,6 +58,7 @@ public class InvocationExprent extends Exprent {
-   private int invocationType = INVOKE_VIRTUAL;
-   private List<Exprent> parameters = new ArrayList<>();
-   private List<PooledConstant> bootstrapArguments;
-+  private List<VarType> genericArgs = new ArrayList<>();
- 
-   public InvocationExprent() {
-     super(EXPRENT_INVOCATION);
-@@ -158,6 +161,55 @@ public class InvocationExprent extends Exprent {
-     return descriptor.ret;
-   }
- 
-+
-+  @Override
-+  public VarType getInferredExprType(VarType upperBound) {
-+    List<StructMethod> matches = getMatchedDescriptors();
-+    StructMethod desc = null;
-+    if(matches.size() == 1) {
-+      desc = matches.get(0);
-+    }
-+
-+    genericArgs.clear();
-+
-+    if (desc != null && desc.getSignature() != null) {
-+      VarType ret = desc.getSignature().returnType;
-+
-+      if (instance != null) {
-+        VarType instType = instance.getInferredExprType(upperBound);
-+
-+        if (instType.isGeneric()) {
-+          StructClass cls = DecompilerContext.getStructContext().getClass(instType.getValue());
-+
-+          if (cls != null && cls.getSignature() != null) {
-+            Map<VarType, VarType> map = new HashMap<>();
-+            GenericType ginstance = (GenericType)instType;
-+
-+            if (cls.getSignature().fparameters.size() == ginstance.getArguments().size()) {
-+              for (int x = 0; x < ginstance.getArguments().size(); x++) {
-+                if (ginstance.getArguments().get(x) != null) { //TODO: Wildcards are null arguments.. look into fixing things?
-+                  map.put(GenericType.parse("T" + cls.getSignature().fparameters.get(x) + ";"), ginstance.getArguments().get(x));
-+                }
-+              }
-+            }
-+
-+            if (!map.isEmpty()) {
-+              ret = ret.remap(map);
-+            }
-+          }
-+        }
-+      }
-+
-+      VarType _new = this.gatherGenerics(upperBound, ret, desc.getSignature().typeParameters, genericArgs);
-+      if (desc.getSignature().returnType != _new) {
-+        return _new;
-+      }
-+    }
-+
-+    return getExprType();
-+  }
-+
-+
-   @Override
-   public CheckTypesResult checkExprTypeBounds() {
-     CheckTypesResult result = new CheckTypesResult();
-@@ -290,6 +342,7 @@ public class InvocationExprent extends Exprent {
- 
-         if (buf.length() > 0) {
-           buf.append(".");
-+          this.appendParameters(buf, genericArgs);
-         }
- 
-         buf.append(name);
-@@ -324,8 +377,30 @@ public class InvocationExprent extends Exprent {
-         isEnum = newNode.classStruct.hasModifier(CodeConstants.ACC_ENUM) && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_ENUM);
-       }
-     }
-+    List<StructMethod> matches = getMatchedDescriptors();
-+    BitSet setAmbiguousParameters = getAmbiguousParameters(matches);
-+    StructMethod desc = null;
-+    if(matches.size() == 1) {
-+      desc = matches.get(0);
-+    }
- 
--    BitSet setAmbiguousParameters = getAmbiguousParameters();
-+    StructClass cl = DecompilerContext.getStructContext().getClass(className);
-+    Map<VarType, VarType> genArgs = new HashMap<>();
-+
-+    // building generic info from the instance
-+    VarType inferred = instance == null ? null : instance.getInferredExprType(null);
-+    if (cl != null && cl.getSignature() != null && instance != null && inferred.isGeneric()) {
-+      GenericType genType = (GenericType)inferred;
-+      if (genType.getArguments().size() == cl.getSignature().fparameters.size()) {
-+        for (int i = 0; i < cl.getSignature().fparameters.size(); i++) {
-+          VarType from = GenericType.parse("T" + cl.getSignature().fparameters.get(i) + ";");
-+          VarType to = genType.getArguments().get(i);
-+          if (from != null && to != null) {
-+            genArgs.put(from, to);
-+          }
-+        }
-+      }
-+    }
- 
-     // omit 'new Type[] {}' for the last parameter of a vararg method call
-     if (parameters.size() == descriptor.params.length && isVarArgCall()) {
-@@ -341,6 +416,34 @@ public class InvocationExprent extends Exprent {
-       if (mask == null || mask.get(i) == null) {
-         TextBuffer buff = new TextBuffer();
-         boolean ambiguous = setAmbiguousParameters.get(i);
-+        /*
-+        VarType type = descriptor.params[i];
-+
-+        // using info from the generic signature
-+        if (desc != null && desc.getSignature() != null && desc.getSignature().params.size() == lstParameters.size()) {
-+          type = desc.getSignature().params.get(i);
-+        }
-+
-+        // applying generic info from the signature
-+        VarType remappedType = type.remap(genArgs);
-+        if(type != remappedType) {
-+          type = remappedType;
-+        }
-+        else if (desc != null && desc.getSignature() != null && genericArgs.size() != 0) { // and from the inferred generic arguments
-+          Map<VarType, VarType> genMap = new HashMap<VarType, VarType>();
-+          for (int j = 0; j < genericArgs.size(); j++) {
-+            VarType from = GenericType.parse("T" + desc.getSignature().fparameters.get(j) + ";");
-+            VarType to = genericArgs.get(j);
-+            genMap.put(from, to);
-+          }
-+        }
-+
-+        // not passing it along if what we get back is more specific
-+        VarType exprType = lstParameters.get(i).getInferredExprType(type);
-+        if (exprType != null && type != null && type.type == CodeConstants.TYPE_GENVAR) {
-+          //type = exprType;
-+        }
-+        */
- 
-         // 'byte' and 'short' literals need an explicit narrowing type cast when used as a parameter
-         ExprProcessor.getCastedExprent(parameters.get(i), descriptor.params[i], buff, indent, true, ambiguous, true, true, tracer);
-@@ -447,12 +550,11 @@ public class InvocationExprent extends Exprent {
-     return !isStatic && parameters.size() == 0 && className.equals(UNBOXING_METHODS.get(name));
-   }
- 
--  private BitSet getAmbiguousParameters() {
-+  private List<StructMethod> getMatchedDescriptors() {
-+    List<StructMethod> matches = new ArrayList<>();
-     StructClass cl = DecompilerContext.getStructContext().getClass(className);
--    if (cl == null) return EMPTY_BIT_SET;
-+    if (cl == null) return matches;
- 
--    // check number of matches
--    List<MethodDescriptor> matches = new ArrayList<>();
-     nextMethod:
-     for (StructMethod mt : cl.getMethods()) {
-       if (name.equals(mt.getName())) {
-@@ -463,11 +565,19 @@ public class InvocationExprent extends Exprent {
-               continue nextMethod;
-             }
-           }
--          matches.add(md);
-+          matches.add(mt);
-         }
-       }
-     }
--    if (matches.size() == 1) return EMPTY_BIT_SET;
-+
-+    return matches;
-+  }
-+
-+  private BitSet getAmbiguousParameters(List<StructMethod> matches) {
-+    StructClass cl = DecompilerContext.getStructContext().getClass(className);
-+    if (cl == null || matches.size() == 1) {
-+      return EMPTY_BIT_SET;
-+    }
- 
-     // check if a call is unambiguous
-     StructMethod mt = cl.getMethod(InterpreterUtil.makeUniqueKey(name, stringDescriptor));
-@@ -489,7 +599,14 @@ public class InvocationExprent extends Exprent {
-     BitSet ambiguous = new BitSet(descriptor.params.length);
-     for (int i = 0; i < descriptor.params.length; i++) {
-       VarType paramType = descriptor.params[i];
--      for (MethodDescriptor md : matches) {
-+      for (StructMethod mtt : matches) {
-+
-+        GenericMethodDescriptor gen = mtt.getSignature(); //TODO: Find synthetic flags for params, as Enum generic signatures do no contain the String,int params
-+        if (gen != null && gen.parameterTypes.size() > i && gen.parameterTypes.get(i).isGeneric()) {
-+          break;
-+        }
-+
-+        MethodDescriptor md = MethodDescriptor.parseDescriptor(mtt.getDescriptor());
-         if (!paramType.equals(md.params[i])) {
-           ambiguous.set(i);
-           break;
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-index c47ae33d7d62a5049a89bb586032fc18bdc80173..2405fe08663102626f6ab007ccf5ee6c0e8922ea 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-@@ -14,7 +14,6 @@ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
- import org.jetbrains.java.decompiler.struct.StructClass;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
- import org.jetbrains.java.decompiler.struct.gen.generics.GenericClassDescriptor;
--import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
- import org.jetbrains.java.decompiler.util.ListStack;
- import org.jetbrains.java.decompiler.util.TextBuffer;
- 
-@@ -30,6 +29,7 @@ public class NewExprent extends Exprent {
-   private boolean anonymous;
-   private boolean lambda;
-   private boolean enumConst;
-+  private List<VarType> genericArgs = new ArrayList<>();
- 
-   public NewExprent(VarType newType, ListStack<Exprent> stack, int arrayDim, BitSet bytecodeOffsets) {
-     this(newType, getDimensions(arrayDim, stack), bytecodeOffsets);
-@@ -68,6 +68,24 @@ public class NewExprent extends Exprent {
-     return anonymous ? DecompilerContext.getClassProcessor().getMapRootClasses().get(newType.getValue()).anonymousClassType : newType;
-   }
- 
-+  @Override
-+  public VarType getInferredExprType(VarType upperBound) {
-+    genericArgs.clear();
-+    if (newType.getType() == CodeConstants.TYPE_OBJECT && newType.getArrayDim() == 0) {
-+      StructClass node = DecompilerContext.getStructContext().getClass(newType.getValue());
-+
-+      if (node != null && node.getSignature() != null) {
-+        GenericClassDescriptor sig = node.getSignature();
-+        VarType _new = this.gatherGenerics(upperBound, sig.genericType, sig.fparameters, genericArgs);
-+        if (sig.genericType != _new) {
-+          return _new;
-+        }
-+      }
-+    }
-+
-+    return getExprType();
-+  }
-+
-   @Override
-   public CheckTypesResult checkExprTypeBounds() {
-     CheckTypesResult result = new CheckTypesResult();
-@@ -169,17 +187,17 @@ public class NewExprent extends Exprent {
-             }
-           }
- 
--          GenericClassDescriptor descriptor = ClassWriter.getGenericClassDescriptor(child.classStruct);
-+          GenericClassDescriptor descriptor = child.getWrapper().getClassStruct().getSignature();
-           if (descriptor != null) {
-             if (descriptor.superinterfaces.isEmpty()) {
--              buf.append(GenericMain.getGenericCastTypeName(descriptor.superclass, Collections.emptyList()));
-+              buf.append(ExprProcessor.getCastTypeName(descriptor.superclass, Collections.emptyList()));
-             }
-             else {
-               if (descriptor.superinterfaces.size() > 1 && !lambda) {
-                 DecompilerContext.getLogger().writeMessage("Inconsistent anonymous class signature: " + child.classStruct.qualifiedName,
-                                                            IFernflowerLogger.Severity.WARN);
-               }
--              buf.append(GenericMain.getGenericCastTypeName(descriptor.superinterfaces.get(0), Collections.emptyList()));
-+              buf.append(ExprProcessor.getCastTypeName(descriptor.superinterfaces.get(0), Collections.emptyList()));
-             }
-           }
-           else {
-@@ -188,6 +206,7 @@ public class NewExprent extends Exprent {
-         }
-       }
- 
-+      appendParameters(buf, genericArgs);
-       buf.append('(');
- 
-       if (!lambda && constructor != null) {
-@@ -279,6 +298,7 @@ public class NewExprent extends Exprent {
- 
-         int start = enumConst ? 2 : 0;
-         if (!enumConst || start < parameters.size()) {
-+          appendParameters(buf, genericArgs);
-           buf.append('(');
- 
-           boolean firstParam = true;
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index 8abfd33115391d24d08d349af9a5b64b1d75c1bf..bbe17e0b2c4dcb7214e0c94cc34156e5c9f233a0 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-@@ -20,6 +20,7 @@ import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTypeTableAtt
- import org.jetbrains.java.decompiler.struct.gen.VarType;
- import org.jetbrains.java.decompiler.struct.gen.generics.GenericFieldDescriptor;
- import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
- import org.jetbrains.java.decompiler.struct.match.MatchEngine;
- import org.jetbrains.java.decompiler.struct.match.MatchNode;
- import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
-@@ -62,6 +63,22 @@ public class VarExprent extends Exprent {
-     return getVarType();
-   }
- 
-+  @Override
-+  public VarType getInferredExprType(VarType upperBound) {
-+    if (lvt != null && lvt.getSignature() != null) {
-+      // TODO; figure out why it's crashing, ugly fix for now
-+      try {
-+        return GenericType.parse(lvt.getSignature());
-+      } catch (StringIndexOutOfBoundsException ex) {
-+        ex.printStackTrace();
-+      }
-+    }
-+    else if (lvt != null) {
-+      return lvt.getVarType();
-+    }
-+    return getVarType();
-+  }
-+
-   @Override
-   public int getExprentUse() {
-     return Exprent.MULTIPLE_USES | Exprent.SIDE_EFFECTS_FREE;
-@@ -139,7 +156,7 @@ public class VarExprent extends Exprent {
-           if (lvt.getSignature() != null) {
-             GenericFieldDescriptor descriptor = GenericMain.parseFieldSignature(lvt.getSignature());
-             if (descriptor != null) {
--              buffer.append(GenericMain.getGenericCastTypeName(descriptor.type, Collections.emptyList()));
-+              buffer.append(ExprProcessor.getCastTypeName(descriptor.type, Collections.emptyList()));
-               return;
-             }
-           }
-@@ -165,7 +182,7 @@ public class VarExprent extends Exprent {
-               if (signature != null) {
-                 GenericFieldDescriptor descriptor = GenericMain.parseFieldSignature(signature);
-                 if (descriptor != null) {
--                  buffer.append(GenericMain.getGenericCastTypeName(descriptor.type, Collections.emptyList()));
-+                  buffer.append(ExprProcessor.getCastTypeName(descriptor.type, Collections.emptyList()));
-                   return;
-                 }
-               }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
-index 018d3fbdf53036db90b6c64e872098542133b630..d58218e0baa786456f15a14ef23a8d82d466ba18 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
-@@ -107,6 +107,7 @@ public final class DoStatement extends Statement {
-       }
-       case FOREACH -> {
-         buf.appendIndent(indent).append("for(").append(initExprent.get(0).toJava(indent, tracer));
-+        incExprent.get(0).getInferredExprType(null); //TODO: Find a better then null? For now just calls it to clear casts if needed
-         buf.append(" : ").append(incExprent.get(0).toJava(indent, tracer)).append(") {").appendLineSeparator();
-         tracer.incrementCurrentSourceLine();
-         buf.append(ExprProcessor.jmpWrapper(first, indent + 1, true, tracer));
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index f2c0589344ed69685dd3103d060109c700c7ee41..f9a7e55c108959b9696cb52cfd91aee341e40b06 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-@@ -24,7 +24,6 @@ import org.jetbrains.java.decompiler.struct.StructMethod;
- import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute.LocalVariable;
- import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
--import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
- import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
- 
- import java.util.*;
-@@ -986,7 +985,7 @@ public class VarDefinitionHelper {
- 
-     private VarInfo(LocalVariable lvt, VarType type) {
-       if (lvt != null && lvt.getSignature() != null)
--        this.cast = GenericMain.getGenericCastTypeName(new GenericType(lvt.getSignature()), Collections.emptyList());
-+        this.cast = ExprProcessor.getCastTypeName(GenericType.parse(lvt.getSignature()), true, Collections.emptyList());
-       else if (lvt != null)
-         this.cast = ExprProcessor.getCastTypeName(lvt.getVarType(), false, Collections.emptyList());
-       else if (type != null)
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
-index 0b4275f57e3092623c4e462b032b418cf2bdd84b..bead2d172e27075e63f6977562988041a96a4371 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructClass.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructClass.java
-@@ -2,20 +2,32 @@
- package org.jetbrains.java.decompiler.struct;
- 
- import org.jetbrains.java.decompiler.code.CodeConstants;
-+import org.jetbrains.java.decompiler.main.DecompilerContext;
-+import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
- import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
-+import org.jetbrains.java.decompiler.struct.attr.StructGenericSignatureAttribute;
- import org.jetbrains.java.decompiler.struct.attr.StructPermittedSubclassesAttribute;
- import org.jetbrains.java.decompiler.struct.attr.StructRecordAttribute;
- import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
- import org.jetbrains.java.decompiler.struct.consts.PrimitiveConstant;
- import org.jetbrains.java.decompiler.struct.gen.Type;
-+import org.jetbrains.java.decompiler.struct.gen.VarType;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericClassDescriptor;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
- import org.jetbrains.java.decompiler.struct.lazy.LazyLoader;
- import org.jetbrains.java.decompiler.util.DataInputFullStream;
- import org.jetbrains.java.decompiler.util.InterpreterUtil;
- import org.jetbrains.java.decompiler.util.VBStyleCollection;
- 
- import java.io.IOException;
-+import java.util.Collections;
-+import java.util.HashMap;
-+import java.util.HashSet;
- import java.util.List;
- import java.util.Map;
-+import java.util.Map.Entry;
-+import java.util.Set;
- 
- /*
-   class_file {
-@@ -76,8 +88,16 @@ public class StructClass extends StructMember {
- 
-     Map<String, StructGeneralAttribute> attributes = readAttributes(in, pool);
- 
-+    GenericClassDescriptor signature = null;
-+    if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
-+      StructGenericSignatureAttribute signatureAttr = (StructGenericSignatureAttribute)attributes.get(StructGeneralAttribute.ATTRIBUTE_SIGNATURE.name);
-+      if (signatureAttr != null) {
-+        signature = GenericMain.parseClassSignature(qualifiedName, signatureAttr.getSignature());
-+      }
-+    }
-+
-     StructClass cl = new StructClass(
--      accessFlags, attributes, qualifiedName, superClass, own, loader, minorVersion, majorVersion, interfaces, interfaceNames, fields, methods);
-+      accessFlags, attributes, qualifiedName, superClass, own, loader, minorVersion, majorVersion, interfaces, interfaceNames, fields, methods, signature);
-     if (loader == null) cl.pool = pool;
-     return cl;
-   }
-@@ -92,6 +112,7 @@ public class StructClass extends StructMember {
-   private final String[] interfaceNames;
-   private final VBStyleCollection<StructField, String> fields;
-   private final VBStyleCollection<StructMethod, String> methods;
-+  private final GenericClassDescriptor signature;
- 
-   private ConstantPool pool;
- 
-@@ -106,7 +127,8 @@ public class StructClass extends StructMember {
-                       int[] interfaces,
-                       String[] interfaceNames,
-                       VBStyleCollection<StructField, String> fields,
--                      VBStyleCollection<StructMethod, String> methods) {
-+                      VBStyleCollection<StructMethod, String> methods,
-+                      GenericClassDescriptor signature) {
-     super(accessFlags, attributes);
-     this.qualifiedName = qualifiedName;
-     this.superClass = superClass;
-@@ -118,6 +140,7 @@ public class StructClass extends StructMember {
-     this.interfaceNames = interfaceNames;
-     this.fields = fields;
-     this.methods = methods;
-+    this.signature = signature;
-   }
- 
-   public boolean hasField(String name, String descriptor) {
-@@ -242,4 +265,106 @@ public class StructClass extends StructMember {
-   protected Type getType() {
-     return null;
-   }
-+
-+  public GenericClassDescriptor getSignature() {
-+    return signature;
-+  }
-+
-+  private Map<VarType, VarType> getGenericMap(VarType type) {
-+    if (this.signature == null || type == null || !type.isGeneric()) {
-+      return Collections.emptyMap();
-+    }
-+    GenericType gtype = (GenericType)type;
-+    if (gtype.getArguments().size() != this.signature.fparameters.size()) { //Invalid instance type?
-+      return Collections.emptyMap();
-+    }
-+
-+    Map<VarType, VarType> ret = new HashMap<>();
-+    for (int x = 0; x < this.signature.fparameters.size(); x++) {
-+      VarType var = gtype.getArguments().get(x);
-+      if (var != null) {
-+        ret.put(GenericType.parse("T" + this.signature.fparameters.get(x) + ";"), var);
-+      }
-+    }
-+    return ret;
-+  }
-+
-+  private Map<String, Map<VarType, VarType>> genericHiarachy;
-+  public Map<String, Map<VarType, VarType>> getAllGenerics() {
-+    if (genericHiarachy != null) {
-+      return genericHiarachy;
-+    }
-+
-+    Map<String, Map<VarType, VarType>> ret = new HashMap<>();
-+    if (this.signature != null && !this.signature.fparameters.isEmpty()) {
-+      Map<VarType, VarType> mine = new HashMap<>();
-+      for (String par : this.signature.fparameters) {
-+        VarType type = GenericType.parse("T" + par + ";");
-+        mine.put(type, type);
-+      }
-+      ret.put(this.qualifiedName, mine);
-+    }
-+
-+    Set<String> visited = new HashSet<>(); //Is there a better way? Is the signature forced to contain all interfaces?
-+    if (this.signature != null) {
-+      for (VarType intf : this.signature.superinterfaces) {
-+        visited.add(intf.getValue());
-+
-+        StructClass cls = DecompilerContext.getStructContext().getClass(intf.getValue());
-+        if (cls != null) {
-+          Map<VarType, VarType> sig = cls.getGenericMap(intf);
-+
-+          for (Entry<String, Map<VarType, VarType>> e : cls.getAllGenerics().entrySet()) {
-+            if (e.getValue().isEmpty()) {
-+              ret.put(e.getKey(), e.getValue());
-+            }
-+            else {
-+              Map<VarType, VarType> sub = new HashMap<>();
-+              for (Entry<VarType, VarType> e2 : e.getValue().entrySet()) {
-+                sub.put(e2.getKey(), sig.getOrDefault(e2.getValue(), e2.getValue()));
-+              }
-+              ret.put(e.getKey(), sub);
-+            }
-+          }
-+        }
-+      }
-+    }
-+
-+    for (String intf : this.interfaceNames) {
-+      if (visited.contains(intf)) {
-+        continue;
-+      }
-+      StructClass cls = DecompilerContext.getStructContext().getClass(intf);
-+      if (cls != null) {
-+        ret.putAll(cls.getAllGenerics());
-+      }
-+    }
-+
-+    if (this.superClass != null) {
-+      StructClass cls = DecompilerContext.getStructContext().getClass((String)this.superClass.value);
-+      if (cls != null) {
-+        Map<VarType, VarType> sig = this.signature == null ? Collections.emptyMap() : cls.getGenericMap(this.signature.superclass);
-+        if (sig.isEmpty()) {
-+          ret.putAll(cls.getAllGenerics());
-+        }
-+        else {
-+          for (Entry<String, Map<VarType, VarType>> e : cls.getAllGenerics().entrySet()) {
-+            if (e.getValue().isEmpty()) {
-+              ret.put(e.getKey(), e.getValue());
-+            }
-+            else {
-+              Map<VarType, VarType> sub = new HashMap<>();
-+              for (Entry<VarType, VarType> e2 : e.getValue().entrySet()) {
-+                sub.put(e2.getKey(), sig.getOrDefault(e2.getValue(), e2.getValue()));
-+              }
-+              ret.put(e.getKey(), sub);
-+            }
-+          }
-+        }
-+      }
-+    }
-+
-+    this.genericHiarachy = ret.isEmpty() ? Collections.emptyMap() : ret;
-+    return this.genericHiarachy;
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructContext.java b/src/org/jetbrains/java/decompiler/struct/StructContext.java
-index 2f55882afdd1dd1b9960aa0c2a007069204797e9..85fc95d87bd7e672613f6c1beb75b2d56d1d759f 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructContext.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructContext.java
-@@ -161,6 +161,19 @@ public class StructContext {
-     }
-   }
- 
-+  public void addData(String path, String cls, byte[] data, boolean isOwn) throws IOException {
-+        ContextUnit unit = units.get(path);
-+        if (unit == null) {
-+          unit = new ContextUnit(ContextUnit.TYPE_FOLDER, path, cls, isOwn, saver, decompiledData);
-+          units.put(path, unit);
-+        }
-+
-+        StructClass cl = StructClass.create(new DataInputFullStream(data), isOwn, loader);
-+        classes.put(cl.qualifiedName, cl);
-+        unit.addClass(cl, cls);
-+        loader.addClassLink(cl.qualifiedName, new LazyLoader.Link(path, cls, data));
-+  }
-+
-   public Map<String, StructClass> getClasses() {
-     return classes;
-   }
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructField.java b/src/org/jetbrains/java/decompiler/struct/StructField.java
-index 0d6df7e05b9b385e743c85261b77215314167989..da073261717d3583fc91b6c9c30351ce439da80c 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructField.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructField.java
-@@ -1,10 +1,15 @@
- // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
- package org.jetbrains.java.decompiler.struct;
- 
-+import org.jetbrains.java.decompiler.main.DecompilerContext;
-+import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
- import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
-+import org.jetbrains.java.decompiler.struct.attr.StructGenericSignatureAttribute;
- import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
- import org.jetbrains.java.decompiler.struct.gen.Type;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericFieldDescriptor;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
- import org.jetbrains.java.decompiler.util.DataInputFullStream;
- 
- import java.io.IOException;
-@@ -28,17 +33,30 @@ public class StructField extends StructMember {
-     String[] values = pool.getClassElement(ConstantPool.FIELD, clQualifiedName, nameIndex, descriptorIndex);
- 
-     Map<String, StructGeneralAttribute> attributes = readAttributes(in, pool);
-+    GenericFieldDescriptor signature = null;
-+    if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
-+      StructGenericSignatureAttribute signatureAttr = (StructGenericSignatureAttribute)attributes.get(StructGeneralAttribute.ATTRIBUTE_SIGNATURE.name);
-+      if (signatureAttr != null) {
-+        signature = GenericMain.parseFieldSignature(signatureAttr.getSignature());
-+      }
-+    }
- 
--    return new StructField(accessFlags, attributes, values[0], values[1]);
-+    return new StructField(accessFlags, attributes, values[0], values[1], signature);
-   }
- 
-   private final String name;
-   private final String descriptor;
-+  private final GenericFieldDescriptor signature;
- 
-   protected StructField(int accessFlags, Map<String, StructGeneralAttribute> attributes, String name, String descriptor) {
-+    this(accessFlags, attributes, name, descriptor, null);
-+  }
-+
-+  protected StructField(int accessFlags, Map<String, StructGeneralAttribute> attributes, String name, String descriptor, GenericFieldDescriptor signature) {
-     super(accessFlags, attributes);
-     this.name = name;
-     this.descriptor = descriptor;
-+    this.signature = signature;
-   }
- 
-   public final String getName() {
-@@ -58,4 +76,8 @@ public class StructField extends StructMember {
-   protected Type getType() {
-     return new VarType(descriptor);
-   }
-+
-+  public GenericFieldDescriptor getSignature() {
-+    return signature;
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-index 0a7e5ba44d82f1923dadd9f79627d91f82b1014c..d48e950e7511d2a00ac9885d5dc7d4ff524bbb37 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-@@ -2,12 +2,17 @@
- package org.jetbrains.java.decompiler.struct;
- 
- import org.jetbrains.java.decompiler.code.*;
-+import org.jetbrains.java.decompiler.main.DecompilerContext;
-+import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
- import org.jetbrains.java.decompiler.struct.attr.StructCodeAttribute;
- import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
-+import org.jetbrains.java.decompiler.struct.attr.StructGenericSignatureAttribute;
- import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute;
- import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
- import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
- import org.jetbrains.java.decompiler.struct.gen.Type;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericMethodDescriptor;
- import org.jetbrains.java.decompiler.util.DataInputFullStream;
- import org.jetbrains.java.decompiler.util.VBStyleCollection;
- 
-@@ -41,7 +46,15 @@ public class StructMethod extends StructMember {
-       attributes.putAll(code.codeAttributes);
-     }
- 
--    return new StructMethod(accessFlags, attributes, values[0], values[1], bytecodeVersion, own ? code : null, clQualifiedName);
-+    GenericMethodDescriptor signature = null;
-+    if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
-+      StructGenericSignatureAttribute signatureAttr = (StructGenericSignatureAttribute)attributes.get(StructGeneralAttribute.ATTRIBUTE_SIGNATURE.name);
-+      if (signatureAttr != null) {
-+        signature = GenericMain.parseMethodSignature(signatureAttr.getSignature());
-+      }
-+    }
-+
-+    return new StructMethod(accessFlags, attributes, values[0], values[1], bytecodeVersion, own ? code : null, clQualifiedName, signature);
-   }
- 
-   private static final int[] opr_iconst = {-1, 0, 1, 2, 3, 4, 5};
-@@ -58,6 +71,7 @@ public class StructMethod extends StructMember {
-   private InstructionSequence seq = null;
-   private boolean expanded = false;
-   private final String classQualifiedName;
-+  private final GenericMethodDescriptor signature;
- 
-   private StructMethod(int accessFlags,
-                        Map<String, StructGeneralAttribute> attributes,
-@@ -65,7 +79,8 @@ public class StructMethod extends StructMember {
-                        String descriptor,
-                        int bytecodeVersion,
-                        StructCodeAttribute code,
--                       String classQualifiedName) {
-+                       String classQualifiedName,
-+                       GenericMethodDescriptor signature) {
-     super(accessFlags, attributes);
-     this.name = name;
-     this.descriptor = descriptor;
-@@ -79,6 +94,7 @@ public class StructMethod extends StructMember {
-       this.localVariables = this.codeLength = this.codeFullLength = -1;
-     }
-     this.classQualifiedName = classQualifiedName;
-+    this.signature = signature;
-   }
- 
-   public void expandData(StructClass classStruct) throws IOException {
-@@ -339,4 +355,8 @@ public class StructMethod extends StructMember {
-   public String getClassQualifiedName() {
-     return classQualifiedName;
-   }
-+
-+  public GenericMethodDescriptor getSignature() {
-+    return signature;
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructRecordComponent.java b/src/org/jetbrains/java/decompiler/struct/StructRecordComponent.java
-index e50983daf2a1bf6c93ec92c99221587d7c4f7c6a..11fa1a3e621221a09c0e611a7f912932f5890fc6 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructRecordComponent.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructRecordComponent.java
-@@ -1,9 +1,14 @@
- // Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- package org.jetbrains.java.decompiler.struct;
- 
-+import org.jetbrains.java.decompiler.main.DecompilerContext;
-+import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
- import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
-+import org.jetbrains.java.decompiler.struct.attr.StructGenericSignatureAttribute;
- import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
- import org.jetbrains.java.decompiler.struct.consts.PrimitiveConstant;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericFieldDescriptor;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
- import org.jetbrains.java.decompiler.util.DataInputFullStream;
- 
- import java.io.IOException;
-@@ -26,11 +31,18 @@ public class StructRecordComponent extends StructField {
-     String descriptor = ((PrimitiveConstant)pool.getConstant(descriptorIndex)).getString();
- 
-     Map<String, StructGeneralAttribute> attributes = readAttributes(in, pool);
-+    GenericFieldDescriptor signature = null;
-+    if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
-+      StructGenericSignatureAttribute signatureAttr = (StructGenericSignatureAttribute)attributes.get(StructGeneralAttribute.ATTRIBUTE_SIGNATURE.name);
-+      if (signatureAttr != null) {
-+        signature = GenericMain.parseFieldSignature(signatureAttr.getSignature());
-+      }
-+    }
- 
--    return new StructRecordComponent(0, attributes, name, descriptor);
-+    return new StructRecordComponent(0, attributes, name, descriptor, signature);
-   }
- 
--  private StructRecordComponent(int flags, Map<String, StructGeneralAttribute> attributes, String name, String descriptor) {
--    super(flags, attributes, name, descriptor);
-+  private StructRecordComponent(int flags, Map<String, StructGeneralAttribute> attributes, String name, String descriptor, GenericFieldDescriptor signature) {
-+    super(flags, attributes, name, descriptor, signature);
-   }
- }
-diff --git a/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
-index 267eb5067594bebb435f960b912754a5a2cff9e1..2096754661e845cfe3148d47c5c3ff914bcb0322 100644
---- a/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
-+++ b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
-@@ -2,14 +2,24 @@
- package org.jetbrains.java.decompiler.struct.gen;
- 
- import org.jetbrains.java.decompiler.code.CodeConstants;
-+import org.jetbrains.java.decompiler.main.DecompilerContext;
-+import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
-+import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
-+import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
-+import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
-+import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
-+import org.jetbrains.java.decompiler.struct.StructMethod;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericMethodDescriptor;
- 
- import java.util.ArrayList;
- import java.util.Arrays;
- import java.util.List;
-+import java.util.Objects;
- 
- public final class MethodDescriptor {
-   public final VarType[] params;
-   public final VarType ret;
-+  public GenericMethodDescriptor genericInfo;
- 
-   private MethodDescriptor(VarType[] params, VarType ret) {
-     this.params = params;
-@@ -64,6 +74,35 @@ public final class MethodDescriptor {
-     return new MethodDescriptor(params, ret);
-   }
- 
-+  public static MethodDescriptor parseDescriptor(StructMethod struct, ClassNode node) {
-+    MethodDescriptor md = MethodDescriptor.parseDescriptor(struct.getDescriptor());
-+
-+    GenericMethodDescriptor sig = struct.getSignature();
-+    if (sig != null) {
-+      if (node != null) {
-+        MethodWrapper methodWrapper = node.getWrapper().getMethodWrapper(struct.getName(), struct.getDescriptor());
-+        boolean init = CodeConstants.INIT_NAME.equals(struct.getName()) && node.type != ClassNode.CLASS_ANONYMOUS;
-+        long actualParams = md.params.length;
-+        List<VarVersionPair> sigFields = methodWrapper == null ? null : methodWrapper.synthParameters;
-+        if (sigFields != null) {
-+          actualParams = sigFields.stream().filter(Objects::isNull).count();
-+        }
-+        if (actualParams != sig.parameterTypes.size()) {
-+          String message = "Inconsistent generic signature in method " + struct.getName() + " " + struct.getDescriptor() + " in " + struct.getClassQualifiedName();
-+          DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
-+          sig = null;
-+        }
-+      }
-+      md.addGenericDescriptor(sig);
-+    }
-+
-+    return md;
-+  }
-+
-+  public void addGenericDescriptor(GenericMethodDescriptor desc) {
-+    this.genericInfo = desc;
-+  }
-+
-   public String buildNewDescriptor(NewClassNameBuilder builder) {
-     boolean updated = false;
- 
-@@ -125,4 +164,4 @@ public final class MethodDescriptor {
-     result = 31 * result + params.length;
-     return result;
-   }
--}
-\ No newline at end of file
-+}
-diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
-index 2d18843b486376752fa29c03cec82308e9440bf5..f4115448cfa13ba37fb1ee1795903ffb0c79a6af 100644
---- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
-+++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
-@@ -3,6 +3,7 @@ package org.jetbrains.java.decompiler.struct.gen;
- 
- import org.jetbrains.java.decompiler.code.CodeConstants;
- 
-+import java.util.Map;
- import java.util.Objects;
- 
- public class VarType implements Type {  // TODO: optimize switch
-@@ -50,7 +51,7 @@ public class VarType implements Type {  // TODO: optimize switch
-     this(type, arrayDim, value, getFamily(type, arrayDim), getStackSize(type, arrayDim), false);
-   }
- 
--  private VarType(int type, int arrayDim, String value, int typeFamily, int stackSize, boolean falseBoolean) {
-+  protected VarType(int type, int arrayDim, String value, int typeFamily, int stackSize, boolean falseBoolean) {
-     this.type = type;
-     this.arrayDim = arrayDim;
-     this.value = value;
-@@ -147,7 +148,7 @@ public class VarType implements Type {  // TODO: optimize switch
-     };
-   }
- 
--  private static int getStackSize(int type, int arrayDim) {
-+  protected static int getStackSize(int type, int arrayDim) {
-     if (arrayDim > 0) {
-       return 1;
-     }
-@@ -159,7 +160,7 @@ public class VarType implements Type {  // TODO: optimize switch
-     };
-   }
- 
--  private static int getFamily(int type, int arrayDim) {
-+  protected static int getFamily(int type, int arrayDim) {
-     if (arrayDim > 0) {
-       return CodeConstants.TYPE_FAMILY_OBJECT;
-     }
-@@ -248,6 +249,15 @@ public class VarType implements Type {  // TODO: optimize switch
-     return res;
-   }
- 
-+  @Override
-+  public int hashCode() {
-+    int result = 1;
-+    result = 37 * result + type;
-+    result = 37 * result + arrayDim;
-+    result = 37 * result + (value == null ? 0 : value.hashCode());
-+    return result;
-+  }
-+
-   @Override
-   public boolean equals(Object o) {
-     if (o == this) {
-@@ -373,4 +383,15 @@ public class VarType implements Type {  // TODO: optimize switch
-       default -> throw new IllegalArgumentException("Invalid type: " + c);
-     };
-   }
-+
-+  public boolean isGeneric() {
-+    return false;
-+  }
-+
-+  public VarType remap(Map<VarType, VarType> map) {
-+    if (map.containsKey(this)) {
-+      return map.get(this);
-+    }
-+    return this;
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java
-index ad623a2ab64debaf17974ae0a0757986f4cfbadf..ae2a3dd9085efea75979bbac66b1af29c52aa138 100644
---- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java
-+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java
-@@ -4,13 +4,17 @@ package org.jetbrains.java.decompiler.struct.gen.generics;
- import java.util.ArrayList;
- import java.util.List;
- 
-+import org.jetbrains.java.decompiler.struct.gen.VarType;
-+
- public class GenericClassDescriptor {
- 
--  public GenericType superclass;
-+  public VarType superclass;
-+
-+  public GenericType genericType;
- 
--  public final List<GenericType> superinterfaces = new ArrayList<>();
-+  public final List<VarType> superinterfaces = new ArrayList<>();
- 
-   public final List<String> fparameters = new ArrayList<>();
- 
--  public final List<List<GenericType>> fbounds = new ArrayList<>();
-+  public final List<List<VarType>> fbounds = new ArrayList<>();
- }
-diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java
-index a65181762765bfdc9d2ee5695f3ffa68b7768b74..2b0fdf1dad01ec62f3e21f372297c124d859e8ff 100644
---- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java
-+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java
-@@ -1,10 +1,12 @@
- // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- package org.jetbrains.java.decompiler.struct.gen.generics;
- 
-+import org.jetbrains.java.decompiler.struct.gen.VarType;
-+
- public class GenericFieldDescriptor {
--  public final GenericType type;
-+  public final VarType type;
- 
--  public GenericFieldDescriptor(GenericType type) {
-+  public GenericFieldDescriptor(VarType type) {
-     this.type = type;
-   }
- }
-\ No newline at end of file
-diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
-index 315786d5a56e2871a1d0829760b672398a17d972..16aa2ee5a55fa9ba832909cdd9f5043f5d3e7ba7 100644
---- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
-+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
-@@ -7,9 +7,9 @@ import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
- import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
- import org.jetbrains.java.decompiler.modules.decompiler.typeann.TypeAnnotationWriteHelper;
- import org.jetbrains.java.decompiler.struct.StructTypePathEntry;
-+import org.jetbrains.java.decompiler.struct.gen.VarType;
- 
- import java.util.ArrayList;
--import java.util.Arrays;
- import java.util.List;
- import java.util.stream.Collectors;
- 
-@@ -26,7 +26,7 @@ public final class GenericMain {
-     "boolean",
-   };
- 
--  public static GenericClassDescriptor parseClassSignature(String signature) {
-+  public static GenericClassDescriptor parseClassSignature(String qualifiedName, String signature) {
-     String original = signature;
-     try {
-       GenericClassDescriptor descriptor = new GenericClassDescriptor();
-@@ -34,15 +34,23 @@ public final class GenericMain {
-       signature = parseFormalParameters(signature, descriptor.fparameters, descriptor.fbounds);
- 
-       String superCl = GenericType.getNextType(signature);
--      descriptor.superclass = new GenericType(superCl);
-+      descriptor.superclass = GenericType.parse(superCl);
- 
-       signature = signature.substring(superCl.length());
-       while (signature.length() > 0) {
-         String superIf = GenericType.getNextType(signature);
--        descriptor.superinterfaces.add(new GenericType(superIf));
-+        descriptor.superinterfaces.add(GenericType.parse(superIf));
-         signature = signature.substring(superIf.length());
-       }
- 
-+      StringBuilder buf = new StringBuilder();
-+      buf.append('L').append(qualifiedName).append('<');
-+      for (String t : descriptor.fparameters) {
-+        buf.append('T').append(t).append(';');
-+      }
-+      buf.append(">;");
-+      descriptor.genericType = (GenericType)GenericType.parse(buf.toString());
-+
-       return descriptor;
-     }
-     catch (RuntimeException e) {
-@@ -53,7 +61,7 @@ public final class GenericMain {
- 
-   public static GenericFieldDescriptor parseFieldSignature(String signature) {
-     try {
--      return new GenericFieldDescriptor(new GenericType(signature));
-+      return new GenericFieldDescriptor(GenericType.parse(signature));
-     }
-     catch (RuntimeException e) {
-       DecompilerContext.getLogger().writeMessage("Invalid signature: " + signature, IFernflowerLogger.Severity.WARN);
-@@ -65,29 +73,29 @@ public final class GenericMain {
-     String original = signature;
-     try {
-       List<String> typeParameters = new ArrayList<>();
--      List<List<GenericType>> typeParameterBounds = new ArrayList<>();
-+      List<List<VarType>> typeParameterBounds = new ArrayList<>();
-       signature = parseFormalParameters(signature, typeParameters, typeParameterBounds);
- 
-       int to = signature.indexOf(")");
-       String parameters = signature.substring(1, to);
-       signature = signature.substring(to + 1);
- 
--      List<GenericType> parameterTypes = new ArrayList<>();
-+      List<VarType> parameterTypes = new ArrayList<>();
-       while (parameters.length() > 0) {
-         String par = GenericType.getNextType(parameters);
--        parameterTypes.add(new GenericType(par));
-+        parameterTypes.add(GenericType.parse(par));
-         parameters = parameters.substring(par.length());
-       }
- 
-       String ret = GenericType.getNextType(signature);
--      GenericType returnType = new GenericType(ret);
-+      VarType returnType = GenericType.parse(ret);
-       signature = signature.substring(ret.length());
- 
--      List<GenericType> exceptionTypes = new ArrayList<>();
-+      List<VarType> exceptionTypes = new ArrayList<>();
-       if (signature.length() > 0) {
-         String[] exceptions = signature.split("\\^");
-         for (int i = 1; i < exceptions.length; i++) {
--          exceptionTypes.add(new GenericType(exceptions[i]));
-+          exceptionTypes.add(GenericType.parse(exceptions[i]));
-         }
-       }
- 
-@@ -99,7 +107,7 @@ public final class GenericMain {
-     }
-   }
- 
--  private static String parseFormalParameters(String signature, List<? super String> parameters, List<? super List<GenericType>> bounds) {
-+  private static String parseFormalParameters(String signature, List<String> parameters, List<List<VarType>> bounds) {
-     if (signature.charAt(0) != '<') {
-       return signature;
-     }
-@@ -131,7 +139,7 @@ public final class GenericMain {
-       String param = value.substring(0, to);
-       value = value.substring(to + 1);
- 
--      List<GenericType> lstBounds = new ArrayList<>();
-+      List<VarType> lstBounds = new ArrayList<>();
- 
-       while (true) {
-         if (value.charAt(0) == ':') {
-@@ -140,7 +148,7 @@ public final class GenericMain {
-         }
- 
-         String bound = GenericType.getNextType(value);
--        lstBounds.add(new GenericType(bound));
-+        lstBounds.add(GenericType.parse(bound));
-         value = value.substring(bound.length());
- 
- 
-@@ -183,77 +191,14 @@ public final class GenericMain {
-     }
-     else if (tp == CodeConstants.TYPE_OBJECT) {
-       StringBuilder sb = new StringBuilder();
--      appendClassName(type, sb, typeAnnWriteHelpers);
-+      type.appendCastName(sb, typeAnnWriteHelpers);
-       return sb.toString();
-     }
- 
-     throw new RuntimeException("Invalid type: " + type);
-   }
- 
--  private static void appendClassName(GenericType type, StringBuilder sb, List<TypeAnnotationWriteHelper> typeAnnWriteHelpers) {
--    List<GenericType> enclosingTypes = type.getEnclosingClasses();
--    typeAnnWriteHelpers = ExprProcessor.writeTypeAnnotationBeforeType(type, sb, typeAnnWriteHelpers);
--    if (enclosingTypes.isEmpty()) {
--      List<String> nestedTypes = Arrays.asList(
--        DecompilerContext.getImportCollector().getNestedName(type.getValue().replace('/', '.')).split("\\.")
--      );
--      ExprProcessor.writeNestedClass(sb, type, nestedTypes, typeAnnWriteHelpers);
--      ExprProcessor.popNestedTypeAnnotation(typeAnnWriteHelpers);
--    }
--    else {
--      for (GenericType tp : enclosingTypes) {
--        List<String> nestedTypes = Arrays.asList(
--          DecompilerContext.getImportCollector().getNestedName(tp.getValue().replace('/', '.')).split("\\.")
--        );
--        typeAnnWriteHelpers = ExprProcessor.writeNestedClass(sb, type, nestedTypes, typeAnnWriteHelpers);
--        typeAnnWriteHelpers = appendTypeArguments(tp, sb, typeAnnWriteHelpers);
--        ExprProcessor.popNestedTypeAnnotation(typeAnnWriteHelpers);
--        sb.append('.');
--      }
--      typeAnnWriteHelpers = ExprProcessor.writeNestedTypeAnnotations(sb, typeAnnWriteHelpers);
--      ExprProcessor.popNestedTypeAnnotation(typeAnnWriteHelpers);
--      sb.append(type.getValue());
--    }
--    appendTypeArguments(type, sb, typeAnnWriteHelpers);
--  }
--
--  private static List<TypeAnnotationWriteHelper> appendTypeArguments(
--    GenericType type,
--    StringBuilder sb,
--    List<TypeAnnotationWriteHelper> typeAnnWriteHelpers
--  ) {
--    if (!type.getArguments().isEmpty()) {
--      sb.append('<');
--
--      for (int i = 0; i < type.getArguments().size(); i++) {
--        if (i > 0) {
--          sb.append(", ");
--        }
--
--        GenericType genPar = type.getArguments().get(i);
--        int wildcard = type.getWildcards().get(i);
--
--        // only take type paths that are in the generic
--        List<TypeAnnotationWriteHelper> locTypeAnnWriteHelpers = getGenericTypeAnnotations(i, typeAnnWriteHelpers);
--        typeAnnWriteHelpers.removeAll(locTypeAnnWriteHelpers);
--        locTypeAnnWriteHelpers = writeTypeAnnotationBeforeWildCard(sb, genPar, wildcard, locTypeAnnWriteHelpers);
--        switch (wildcard) {
--          case GenericType.WILDCARD_UNBOUND -> sb.append('?');
--          case GenericType.WILDCARD_EXTENDS -> sb.append("? extends ");
--          case GenericType.WILDCARD_SUPER -> sb.append("? super ");
--        }
--        locTypeAnnWriteHelpers = writeTypeAnnotationAfterWildCard(sb, genPar, locTypeAnnWriteHelpers);
--        if (genPar != null) {
--          sb.append(getGenericCastTypeName(genPar, locTypeAnnWriteHelpers));
--        }
--      }
--
--      sb.append(">");
--    }
--    return typeAnnWriteHelpers;
--  }
--
--  private static List<TypeAnnotationWriteHelper> getGenericTypeAnnotations(
-+  public static List<TypeAnnotationWriteHelper> getGenericTypeAnnotations(
-     int argIndex,
-     List<TypeAnnotationWriteHelper> typeAnnWriteHelpers
-   ) {
-@@ -266,9 +211,9 @@ public final class GenericMain {
-     }).collect(Collectors.toList());
-   }
- 
--  private static List<TypeAnnotationWriteHelper> writeTypeAnnotationBeforeWildCard(
-+  public static List<TypeAnnotationWriteHelper> writeTypeAnnotationBeforeWildCard(
-     StringBuilder sb,
--    GenericType type,
-+    VarType type,
-     int wildcard,
-     List<TypeAnnotationWriteHelper> typeAnnWriteHelpers
-   ) {
-@@ -278,7 +223,7 @@ public final class GenericMain {
-         typeAnnWriteHelper.writeTo(sb);
-         return false;
-       }
--      if (type.getArrayDim() == typeAnnWriteHelper.getPaths().size() && type.getArrayDim() == typeAnnWriteHelper.arrayPathCount()) {
-+      if (type != null && type.getArrayDim() == typeAnnWriteHelper.getPaths().size() && type.getArrayDim() == typeAnnWriteHelper.arrayPathCount()) {
-         typeAnnWriteHelper.writeTo(sb);
-         return false;
-       }
-@@ -286,9 +231,9 @@ public final class GenericMain {
-     }).collect(Collectors.toList());
-   }
- 
--  private static List<TypeAnnotationWriteHelper> writeTypeAnnotationAfterWildCard(
-+  public static List<TypeAnnotationWriteHelper> writeTypeAnnotationAfterWildCard(
-     StringBuilder sb,
--    GenericType type,
-+    VarType type,
-     List<TypeAnnotationWriteHelper> typeAnnWriteHelpers
-   ) {
-     typeAnnWriteHelpers.forEach(typeAnnWriteHelper -> { // remove all wild card path entries
-diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
-index eb8049193e952f7476a99188838b6c8907f49f8d..a93d250e2400a9680d7561d73cc1a69f7c0f8d79 100644
---- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
-+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
-@@ -4,18 +4,20 @@ package org.jetbrains.java.decompiler.struct.gen.generics;
- import java.util.Collections;
- import java.util.List;
- 
-+import org.jetbrains.java.decompiler.struct.gen.VarType;
-+
- public class GenericMethodDescriptor {
-   public final List<String> typeParameters;
--  public final List<List<GenericType>> typeParameterBounds;
--  public final List<GenericType> parameterTypes;
--  public final GenericType returnType;
--  public final List<GenericType> exceptionTypes;
-+  public final List<List<VarType>> typeParameterBounds;
-+  public final List<VarType> parameterTypes;
-+  public final VarType returnType;
-+  public final List<VarType> exceptionTypes;
- 
-   public GenericMethodDescriptor(List<String> typeParameters,
--                                 List<List<GenericType>> typeParameterBounds,
--                                 List<GenericType> parameterTypes,
--                                 GenericType returnType,
--                                 List<GenericType> exceptionTypes) {
-+                                 List<List<VarType>> typeParameterBounds,
-+                                 List<VarType> parameterTypes,
-+                                 VarType returnType,
-+                                 List<VarType> exceptionTypes) {
-     this.typeParameters = substitute(typeParameters);
-     this.typeParameterBounds = substitute(typeParameterBounds);
-     this.parameterTypes = substitute(parameterTypes);
-diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-index a042dd3a747f224a63a0987ff465f6259d783de4..e430a99b30757bb0ba5b8dda66e0790383ab8d75 100644
---- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-@@ -2,44 +2,49 @@
- package org.jetbrains.java.decompiler.struct.gen.generics;
- 
- import org.jetbrains.java.decompiler.code.CodeConstants;
-+import org.jetbrains.java.decompiler.main.DecompilerContext;
-+import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
-+import org.jetbrains.java.decompiler.modules.decompiler.typeann.TypeAnnotationWriteHelper;
- import org.jetbrains.java.decompiler.struct.gen.Type;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
- 
- import java.util.ArrayList;
-+import java.util.Arrays;
-+import java.util.Collections;
- import java.util.List;
-+import java.util.Map;
-+import java.util.regex.Pattern;
- 
--public class GenericType implements Type {
-+public class GenericType extends VarType implements Type {
- 
-   public static final int WILDCARD_EXTENDS = 1;
-   public static final int WILDCARD_SUPER = 2;
-   public static final int WILDCARD_UNBOUND = 3;
-   public static final int WILDCARD_NO = 4;
- 
--  private final int type;
--  private final int arrayDim;
--  private final String value;
-+  private static final Pattern DOT_SPLIT = Pattern.compile("\\.");
- 
--  private final List<GenericType> enclosingClasses = new ArrayList<>();
--  private final List<GenericType> arguments = new ArrayList<>();
--  private final List<Integer> wildcards = new ArrayList<>();
-+  private final VarType parent;
-+  private final List<VarType> arguments;
-+  private final int wildcard;
- 
--  public GenericType(int type, int arrayDim, String value) {
--    this.type = type;
--    this.arrayDim = arrayDim;
--    this.value = value;
-+  public GenericType(int type, int arrayDim, String value, VarType parent, List<VarType> arguments, int wildcard) {
-+    super(type, arrayDim, value, getFamily(type, arrayDim), getStackSize(type, arrayDim), false);
-+    this.parent = parent;
-+    this.arguments = arguments == null ? Collections.<VarType>emptyList() : arguments;
-+    this.wildcard = wildcard;
-   }
- 
--  private GenericType(GenericType other, int arrayDim) {
--    this(other.getType(), arrayDim, other.getValue());
--    enclosingClasses.addAll(other.enclosingClasses);
--    arguments.addAll(other.arguments);
--    wildcards.addAll(other.wildcards);
-+  public static VarType parse(String signature) {
-+    return parse(signature, WILDCARD_NO);
-   }
- 
--  public GenericType(String signature) {
-+  public static VarType parse(String signature, int wildcard) {
-     int type = 0;
-     int arrayDim = 0;
-     String value = null;
-+    List<VarType> params = null;
-+    VarType parent = null;
- 
-     int index = 0;
-     loop:
-@@ -57,32 +62,54 @@ public class GenericType implements Type {
-         case 'L':
-           type = CodeConstants.TYPE_OBJECT;
-           signature = signature.substring(index + 1, signature.length() - 1);
-+          String cl = getNextClassSignature(signature);
- 
--          while (true) {
--            String cl = getNextClassSignature(signature);
--
--            String name = cl;
--            String args = null;
--
--            int argStart = cl.indexOf("<");
-+          if (cl.length() == signature.length()) {
-+            int argStart = cl.indexOf('<');
-             if (argStart >= 0) {
--              name = cl.substring(0, argStart);
--              args = cl.substring(argStart + 1, cl.length() - 1);
--            }
--
--            if (cl.length() < signature.length()) {
--              signature = signature.substring(cl.length() + 1); // skip '.'
--              GenericType type11 = new GenericType(CodeConstants.TYPE_OBJECT, 0, name);
--              parseArgumentsList(args, type11);
--              enclosingClasses.add(type11);
-+              value = cl.substring(0, argStart);
-+              params = parseArgumentsList(cl.substring(argStart + 1, cl.length() - 1));
-             }
-             else {
--              value = name;
--              parseArgumentsList(args, this);
--              break;
-+              value = cl;
-+            }
-+          }
-+          else {
-+            StringBuilder name_buff = new StringBuilder();
-+            while (signature.length() > 0) {
-+              String name = cl;
-+              String args = null;
-+
-+              int argStart = cl.indexOf('<');
-+              if (argStart >= 0) {
-+                name = cl.substring(0, argStart);
-+                args = cl.substring(argStart + 1, cl.length() - 1);
-+              }
-+
-+              if (name_buff.length() > 0) {
-+                name_buff.append('$');
-+              }
-+              name_buff.append(name);
-+
-+              value = name_buff.toString();
-+              params = args == null ? null : parseArgumentsList(args);
-+
-+              if (cl.length() == signature.length()) {
-+                break;
-+              }
-+              else {
-+                if (parent == null && params == null) {
-+                  parent = GenericType.parse("L" + value + ";");
-+                }
-+                else {
-+                  parent = new GenericType(CodeConstants.TYPE_OBJECT, 0, value, parent, params, wildcard);
-+                }
-+
-+                signature = signature.substring(cl.length() + 1);
-+              }
-+              cl = getNextClassSignature(signature);
-             }
-           }
--
-           break loop;
- 
-         default:
-@@ -93,24 +120,20 @@ public class GenericType implements Type {
-       index++;
-     }
- 
--    this.type = type;
--    this.arrayDim = arrayDim;
--    this.value = value;
--  }
--
--  @Override
--  public int getType() {
--    return type;
--  }
--
--  @Override
--  public int getArrayDim() {
--    return arrayDim;
--  }
--
--  @Override
--  public String getValue() {
--    return value;
-+    if (type == CodeConstants.TYPE_GENVAR) {
-+      return new GenericType(type, arrayDim, value, null, null, wildcard);
-+    }
-+    else if (type == CodeConstants.TYPE_OBJECT) {
-+      if (parent == null && params == null && wildcard == WILDCARD_NO) {
-+        return new VarType(type, arrayDim, value);
-+      }
-+      else {
-+        return new GenericType(type, arrayDim, value, parent, params, wildcard);
-+      }
-+    }
-+    else {
-+      return new VarType(type, arrayDim, value);
-+    }
-   }
- 
-   private static String getNextClassSignature(String value) {
-@@ -135,11 +158,13 @@ public class GenericType implements Type {
-     return value.substring(0, index);
-   }
- 
--  private static void parseArgumentsList(String value, GenericType type) {
-+  private static List<VarType> parseArgumentsList(String value) {
-     if (value == null) {
--      return;
-+      return null;
-     }
- 
-+    List<VarType> args = new ArrayList<>();
-+
-     while (value.length() > 0) {
-       String typeStr = getNextType(value);
-       int len = typeStr.length();
-@@ -150,16 +175,16 @@ public class GenericType implements Type {
-         default -> WILDCARD_NO;
-       };
- 
--      type.getWildcards().add(wildcard);
--
-       if (wildcard != WILDCARD_NO) {
-         typeStr = typeStr.substring(1);
-       }
- 
--      type.getArguments().add(typeStr.length() == 0 ? null : new GenericType(typeStr));
-+      args.add(typeStr.length() == 0 ? null : GenericType.parse(typeStr, wildcard));
- 
-       value = value.substring(len);
-     }
-+
-+    return args;
-   }
- 
-   public static String getNextType(String value) {
-@@ -208,20 +233,134 @@ public class GenericType implements Type {
-     return value.substring(0, index + 1);
-   }
- 
-+  @Override
-   public GenericType decreaseArrayDim() {
-     assert getArrayDim() > 0 : this;
--    return new GenericType(this, getArrayDim() - 1);
-+    return new GenericType(getType(), getArrayDim() - 1, getValue(), parent, arguments, wildcard);
-+  }
-+
-+  @Override
-+  public VarType resizeArrayDim(int newArrayDim) {
-+    return new GenericType(getType(), newArrayDim, getValue(), parent, arguments, wildcard);
-+  }
-+
-+  public VarType getParent() {
-+    return parent;
-   }
- 
--  public List<GenericType> getArguments() {
-+  public List<VarType> getArguments() {
-     return arguments;
-   }
- 
--  public List<GenericType> getEnclosingClasses() {
--    return enclosingClasses;
-+  @Override
-+  public boolean isGeneric() {
-+    return true;
-+  }
-+
-+  public int getWildcard() {
-+    return wildcard;
-+  }
-+
-+  public List<TypeAnnotationWriteHelper> appendCastName(final StringBuilder clsName, List<TypeAnnotationWriteHelper> typeAnnWriteHelpers) {
-+    if (parent != null && parent.isGeneric()) {
-+      typeAnnWriteHelpers = ((GenericType) parent).appendCastName(clsName, typeAnnWriteHelpers);
-+      typeAnnWriteHelpers = ExprProcessor.writeNestedTypeAnnotations(clsName, typeAnnWriteHelpers);
-+      clsName.append(".").append(getValue().substring(parent.getValue().length() + 1));
-+    }
-+    else {
-+      List<String> nestedTypes = Arrays.asList(DOT_SPLIT.split(DecompilerContext.getImportCollector().getNestedName(getValue().replace('/', '.'))));
-+      ExprProcessor.writeNestedClass(clsName, this, nestedTypes, typeAnnWriteHelpers);
-+      ExprProcessor.popNestedTypeAnnotation(typeAnnWriteHelpers);
-+    }
-+    typeAnnWriteHelpers = appendTypeArguments(clsName, typeAnnWriteHelpers);
-+    return typeAnnWriteHelpers;
-+  }
-+
-+  private List<TypeAnnotationWriteHelper> appendTypeArguments(final StringBuilder buffer, List<TypeAnnotationWriteHelper> typeAnnWriteHelpers) {
-+    if (!arguments.isEmpty()) {
-+      buffer.append('<');
-+
-+      for (int i = 0; i < arguments.size(); i++) {
-+        if (i > 0) {
-+          buffer.append(", ");
-+        }
-+
-+        VarType par = arguments.get(i);
-+        // only take type paths that are in the generic
-+        List<TypeAnnotationWriteHelper> locTypeAnnWriteHelpers = GenericMain.getGenericTypeAnnotations(i, typeAnnWriteHelpers);
-+        typeAnnWriteHelpers.removeAll(locTypeAnnWriteHelpers);
-+        locTypeAnnWriteHelpers = GenericMain.writeTypeAnnotationBeforeWildCard(buffer, par, wildcard, locTypeAnnWriteHelpers);
-+        if (par == null) { // Wildcard unbound
-+          buffer.append('?');
-+        }
-+        else if (par.isGeneric()) {
-+          GenericType gen = (GenericType)par;
-+          switch (gen.getWildcard()) {
-+            case GenericType.WILDCARD_EXTENDS:
-+              buffer.append("? extends ");
-+              break;
-+            case GenericType.WILDCARD_SUPER:
-+              buffer.append("? super ");
-+              break;
-+          }
-+          locTypeAnnWriteHelpers = GenericMain.writeTypeAnnotationAfterWildCard(buffer, par, locTypeAnnWriteHelpers);
-+          buffer.append(GenericMain.getGenericCastTypeName(gen, locTypeAnnWriteHelpers));
-+        }
-+        else {
-+          buffer.append(ExprProcessor.getCastTypeName(par, locTypeAnnWriteHelpers));
-+        }
-+      }
-+
-+      buffer.append(">");
-+    }
-+    return typeAnnWriteHelpers;
-+  }
-+
-+  @Override
-+  public String toString() {
-+    StringBuilder buf = new StringBuilder();
-+    switch(getWildcard()) {
-+      case GenericType.WILDCARD_EXTENDS:
-+        buf.append("? extends ");
-+        break;
-+      case GenericType.WILDCARD_SUPER:
-+        buf.append("? super ");
-+      break;
-+    }
-+    buf.append(super.toString());
-+    appendTypeArguments(buf, Collections.emptyList());
-+    return buf.toString();
-   }
- 
--  public List<Integer> getWildcards() {
--    return wildcards;
-+
-+  @Override
-+  public VarType remap(Map<VarType, VarType> map) {
-+    VarType main = super.remap(map);
-+    if (main != this) {
-+      return main;
-+    }
-+    boolean changed = false;
-+    VarType parent = getParent();
-+    if (map.containsKey(parent)) {
-+      parent = map.get(parent);
-+      changed = true;
-+    }
-+    List<VarType> newArgs = new ArrayList<>();
-+    for (VarType arg : getArguments()) {
-+      VarType newArg = null;
-+      if (arg != null) {
-+        newArg = arg.remap(map);
-+      }
-+      if (newArg != arg) {
-+        newArgs.add(newArg);
-+        changed = true;
-+      } else {
-+        newArgs.add(arg);
-+      }
-+    }
-+    if (changed) {
-+      return new GenericType(main.getType(), main.getArrayDim(), main.getValue(), parent, newArgs, getWildcard());
-+    }
-+    return this;
-   }
- }
-diff --git a/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
-index 8b6105dbbfea358241702acbc691976d51f0d726..4261dce0b37505d22c6e9ee7c3e0bdb7e5331cfb 100644
---- a/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
-+++ b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
-@@ -119,7 +119,7 @@ public class LazyLoader {
- 
-   public DataInputFullStream getClassStream(String qualifiedClassName) throws IOException {
-     Link link = mapClassLinks.get(qualifiedClassName);
--    return link == null ? null : getClassStream(link.externalPath, link.internalPath);
-+    return link == null ? null : link.data != null ? new DataInputFullStream(link.data) : getClassStream(link.externalPath, link.internalPath);
-   }
- 
-   public static void skipAttributes(DataInputFullStream in) throws IOException {
-@@ -133,10 +133,16 @@ public class LazyLoader {
-   public static class Link {
-     public final String externalPath;
-     public final String internalPath;
-+    public final byte[] data;
- 
-     public Link(String externalPath, String internalPath) {
-+        this(externalPath, internalPath, null);
-+    }
-+
-+    public Link(String externalPath, String internalPath, byte[] data) {
-       this.externalPath = externalPath;
-       this.internalPath = internalPath;
-+      this.data = data;
-     }
-   }
- }
-diff --git a/src/org/jetbrains/java/decompiler/util/ClasspathScanner.java b/src/org/jetbrains/java/decompiler/util/ClasspathScanner.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..cc91edd842805b55a757c5794b4fb7dcc1da3f57
---- /dev/null
-+++ b/src/org/jetbrains/java/decompiler/util/ClasspathScanner.java
-@@ -0,0 +1,77 @@
-+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-+package org.jetbrains.java.decompiler.util;
-+
-+import java.lang.module.*;
-+import java.nio.ByteBuffer;
-+import java.io.File;
-+import java.io.IOException;
-+import java.util.HashSet;
-+import java.util.Optional;
-+import java.util.Set;
-+
-+import org.jetbrains.java.decompiler.main.DecompilerContext;
-+import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger.Severity;
-+import org.jetbrains.java.decompiler.struct.StructContext;
-+
-+public class ClasspathScanner {
-+
-+    public static void addAllClasspath(StructContext ctx) {
-+      Set<String> found = new HashSet<>();
-+      String[] props = { System.getProperty("java.class.path"), System.getProperty("sun.boot.class.path") };
-+      for (String prop : props) {
-+        if (prop == null)
-+          continue;
-+
-+        for (final String path : prop.split(File.pathSeparator)) {
-+          File file = new File(path);
-+          if (found.contains(file.getAbsolutePath()))
-+            continue;
-+
-+          if (file.exists() && (file.getName().endsWith(".class") || file.getName().endsWith(".jar"))) {
-+            DecompilerContext.getLogger().writeMessage("Adding File to context from classpath: " + file, Severity.INFO);
-+            ctx.addSpace(file, false);
-+            found.add(file.getAbsolutePath());
-+          }
-+        }
-+      }
-+
-+      addAllModulePath(ctx);
-+    }
-+
-+    private static void addAllModulePath(StructContext ctx) {
-+      for (ModuleReference module : ModuleFinder.ofSystem().findAll()) {
-+        String name = module.descriptor().name();
-+        try {
-+          ModuleReader reader = module.open();
-+          DecompilerContext.getLogger().writeMessage("Reading Module: " + name, Severity.INFO);
-+          reader.list().forEach(cls -> {
-+            if (!cls.endsWith(".class") || cls.contains("module-info.class"))
-+              return;
-+
-+            DecompilerContext.getLogger().writeMessage("  " + cls, Severity.INFO);
-+            try {
-+              Optional<ByteBuffer> bb = reader.read(cls);
-+              if (!bb.isPresent()) {
-+                DecompilerContext.getLogger().writeMessage("    Error Reading Class: " + cls, Severity.ERROR);
-+                return;
-+              }
-+
-+              byte[] data;
-+              if (bb.get().hasArray()) {
-+                data = bb.get().array();
-+              } else {
-+                data = new byte[bb.get().remaining()];
-+                bb.get().get(data);
-+              }
-+              ctx.addData(name, cls, data, false);
-+            } catch (IOException e) {
-+              DecompilerContext.getLogger().writeMessage("    Error Reading Class: " + cls, e);
-+            }
-+          });
-+          reader.close();
-+        } catch (IOException e) {
-+          DecompilerContext.getLogger().writeMessage("Error loading module " + name, e);
-+        }
-+      }
-+    }
-+}
-diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
-index dd0e178cc1df1c6edc9e77e3149c2b0e9bffe884..645d99f07322c311a20b5fd76a5235de6cdae74d 100644
---- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
-+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
-@@ -23,9 +23,12 @@ public class SingleClassesTest extends SingleClassesTestBase {
-     return Map.of(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING, "1",
-                          IFernflowerPreferences.DUMP_ORIGINAL_LINES, "1",
-                          IFernflowerPreferences.IGNORE_INVALID_BYTECODE, "1",
--                         IFernflowerPreferences.VERIFY_ANONYMOUS_CLASSES, "1");
-+                         IFernflowerPreferences.VERIFY_ANONYMOUS_CLASSES, "1",
-+                         IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH, "1"
-+);
-   }
- 
-+  @Test public void testGenerics() { doTest("pkg/TestGenerics"); }
-   @Test public void testEnhancedForLoops() { doTest("pkg/TestEnhancedForLoops"); }
-   @Test public void testPrimitiveNarrowing() { doTest("pkg/TestPrimitiveNarrowing"); }
-   @Test public void testClassFields() { doTest("pkg/TestClassFields"); }
-diff --git a/testData/classes/pkg/TestGenerics$Maps.class b/testData/classes/pkg/TestGenerics$Maps.class
-new file mode 100644
-index 0000000000000000000000000000000000000000..a4c3dcc2e336bb973e3eac43506e0b949eca8ea9
-GIT binary patch
-literal 544
-zcmZutO;5r=5Pb`U(u(q-h#wbCJb(v#@ni`HF`}XBfriB6Qa7+z3+adcEj^KF;t%jg
-z8E1<JqHMDBX5PG+ot>}m_fG()*f)_wO~<y0jKUoqyA1i33}oD9$Tpe-2CXxF5DX<p
-z2I4k(8j8^6L!X$cGxfMX;GtCUFR8_28Bx&<pAi(VgFu8GpGT3Pu<pzrN0uw1xGRX4
-zUUZ~%HiH?6mn$BPDP*WMn$Cnjb1R9ZZ~f9FGWv29@Hh$S@ouYkwh;L|7+H72iSS~3
-zu!3u^>eh05wmY!f>goP82|aNs)t@TM!=0!hipWE!#J_=b?9r$zKg3W@<x8Ux^;e2R
-zXtaNIGN83XCtIM%B4mWQ<2l${nl{MhQ}P@p`Nf3*YuKR3KnZ1PqKXd))hT=+b3aG+
-em3&$q*+u;YD&%KSrMsDWTUaMFNu{AqosA#bw0W)o
-
-literal 0
-HcmV?d00001
-
-diff --git a/testData/classes/pkg/TestGenerics.class b/testData/classes/pkg/TestGenerics.class
-new file mode 100644
-index 0000000000000000000000000000000000000000..bc719a03fc9f56c96a38ca60f2d503491de044a5
-GIT binary patch
-literal 3233
-zcmb7HSyvQC7`-(!(8ElFfCAzY_k>kY6OA&WKwO9eE`u1CEX~kDOVcx%=~2nP?}=HS
-z@{niWa!&9BLp;gxIsYU15jjcBt?Hhh9*8-|2fDkezPjK2?suzu`0byce+BR)zD^*5
-zNeve?^wePso=cz(7d2c;pca!!Y`|p=SL*OQUeNGj0!d89@shk7@-iha*#xFx%H3Br
-z%p@@jD~W5EOTxyyyf_+iayhTzWeGVa2L%m9IdC<U1Y%=Gz9^uNI*wTwv5jKU<gn(d
-zW!lpMYtq+@>qcM6wd_6y4hYm`tQp5}O9fM4fAwn08`_35)0c4zmNPRDni<aJY}0TC
-z1_=_k?V<`0XbfSbt)k1-Fsz*NaTSTsIGkrt!PZPIxRU+$6_{aS!wgZuwZ>4PU@Qo%
-zy&PhBdg_{)l_X-9Cx&>dO<9iR4hlp&Iwv_hlAC7XYtoiuj+f@A%)*2*Wpk!Eoy!{b
-zq*1Ws*q@BKvli(zr}J|&eG_KUJz-L0D_bORYxRbOe0kG`RnaLjnHW~2n`S(OA=_p?
-z*UC9m(4QN1u9^kY$&yWsGPtZPq{B(0IO}!r(CXQ+K&v}9>bT~NSx^L$elpny_EF~X
-z9>tVE+bZfirMp;dODLymp<hpwcY!kKh#^61OZlvNcx0ksi#7N}kLL=<jO?s{P@PbA
-z4m(GnKI0nMITBS}({P>5sos3Sa%VkmWz<Y5Zx+tyN!C#=kWH>Yd(L2CF<Z&By7~!<
-z$ulX?o|^E>RHXc!gUW32RMz(0cP=#)4)a|)eCQ#9hn16Z4-AIb1r|?aa-~AnJZ?z?
-zH--JVTh^juH~MI=N?qPg9o^{BaRWE$Ftw;oraDbBnT`d#!j`Wzz4C&FS9QFG*J+jt
-zu4lR7l4Vbu1%b%$AsuhvO?i1s$J=;E!@D}(!}~h6V+Xlbvii2x@PUpG@sWm)b$o(P
-z*+m_n;d32d;8s-)UM?Mv;|YO=3XsRVQ_hAe_WGgYOMJ!ol@+n;6@XFKEEsN%{1c9O
-z!{<dAIyyt%ubjf@j7hJzbd37Ts{KK0LKHF!Mc16?3n*8T8$2*8*LQ|5SeMn9#yp)?
-zYvl8$!#8$sN2t~QSq`VD(wZBq;{E*p7aw<X9)!TUa%t7)$@4@tLjf%>`PzJ6wfq-D
-zzFX@nTJkWmq&agTBSmT|=TSc66lsToRZQFp<ZrDCFSmtzv{|D#Zr&s!U*?y1Ivq8r
-zE+c3`)R?B6Rb<QZT*5YfM<e`>#}Jp6guqUYBG|<-ofV8bIHsq9aTlX_dV+B;Kl(zR
-zGhX|-c9s}|_olA95M7OlUl6&E=#Pl~z{x1~@G5^d0BuaY5qtThdmFHiKPrHys%G|c
-zByb>rAM@esyBgO$6#6kjZV5rxuY#5{61omg2hhiuNHVYa2{oryvfWO$I|9fU0}tX5
-zgUf8anE}N%6+nK+ildzCy@%S1ccG=bqsxd#a36JJi%8r<lCyeq{Sq2_mat|CjZ0{%
-zq;6(Xup4pezZM--y;D)x>Vf)I#o4pNszYn}n`jV6D3PR9iISCiQAbJKiyBfw4hK}P
-za7DHyzKG`g{O(p*c<t(ehF+Du)r<49Yuq<NDTK;dS(7=vwP&~{a4g7li~FT0J<PO>
-zbpp$15lDA0qgCKrwDF-$P@?rxBFfTq`@tWQO-z}`)1;sN-9tt8(u?~7R@<2II8G>j
-zJwCs3gP4yqlGRE6B@y`x4H`!O#3qt^HX!$nPp*Fv?d4u=SjNUjCAgnWIlz?CUIzn$
-zyFvu}R}qvmRRo&@f~N=*QRnM>-lZ%0%a&TiCdF^8#}{xtAC!Qb$Gdx%@mK^GZa?_F
-zqF^g(xIaZl9OjuHB*`O0KdMMd&+Oz%8e^(QWs-4fJ+3?^_4K-2rt7Vpri@bA21Ncw
-zlZG>j`)2>Ga+a9q0+9z)hk%VdX?M`<S8@mK!P6#5SEz<JC?f0mKSetlX>dtUzNj*o
-TQ1|n+f_$g&hdmGdR@D6qBizOe
-
-literal 0
-HcmV?d00001
-
-diff --git a/testData/results/TestAmbiguousCall.dec b/testData/results/TestAmbiguousCall.dec
-index dec7ba0f20eecdc5a3c7d0774a0fdd4f3b68e6f6..acf1120655937c0e227ab11a1f472c444b2857b9 100644
---- a/testData/results/TestAmbiguousCall.dec
-+++ b/testData/results/TestAmbiguousCall.dec
-@@ -13,7 +13,7 @@ class TestAmbiguousCall {
-       this.m1(var1, "IAE");// 10
-       IllegalArgumentException var2 = new IllegalArgumentException();// 12
-       this.m1((RuntimeException)var2, "RE");// 13
--      this.m1((IllegalArgumentException)var2, "IAE");// 14
-+      this.m1(var2, "IAE");// 14
-    }// 15
- }
- 
-diff --git a/testData/results/TestClassSwitch.dec b/testData/results/TestClassSwitch.dec
-index 6a2b156f9ad0e29aad668542ee090d63130d2182..f92c9169b960ab9f1f5ff7440ac4caef9aa62744 100644
---- a/testData/results/TestClassSwitch.dec
-+++ b/testData/results/TestClassSwitch.dec
-@@ -2,13 +2,13 @@ package pkg;
- 
- public class TestClassSwitch {
-    public void testCaseOrder(int var1) {
--      switch (var1) {// 22
-+      switch(var1) {// 22
-          case 5:
--            System.out.println(5);// 27
-+            System.out.println((int)5);// 27
-          default:
-             return;// 29
-          case 13:
--            System.out.println(13);// 24
-+            System.out.println((int)13);// 24
-       }
-    }// 25
- }
-diff --git a/testData/results/TestExtendsList.dec b/testData/results/TestExtendsList.dec
-index 6f116dbad41c3ce71fd5c79ee639ddbff3f1b39f..3f3dbea1836b9acaa8626c029bfe40dc0ee3c751 100644
---- a/testData/results/TestExtendsList.dec
-+++ b/testData/results/TestExtendsList.dec
-@@ -2,11 +2,11 @@ package pkg;
- 
- public class TestExtendsList {
-    static <T extends Comparable<? super T>> T m1(T var0) {
--      return null;// 20
-+      return (T)null;// 20
-    }
- 
-    static <T extends Object & Comparable<? super T>> T m2(T var0) {
--      return null;// 24
-+      return (T)null;// 24
-    }
- }
- 
-diff --git a/testData/results/TestGenerics.dec b/testData/results/TestGenerics.dec
-new file mode 100644
-index 0000000000000000000000000000000000000000..da090b301d5537352bad9fb01068cc37fa156cc0
---- /dev/null
-+++ b/testData/results/TestGenerics.dec
-@@ -0,0 +1,218 @@
-+package pkg;
-+
-+import java.util.ArrayList;
-+import java.util.HashMap;
-+import java.util.List;
-+import java.util.Map;
-+
-+public class TestGenerics<A, B extends TestGenerics.Maps & List> {
-+   static Map<String, Boolean> field = TestGenerics.Maps.<String, Boolean>newHashMap();
-+   static List<List<String>> llstring = new ArrayList<List<String>>();
-+   static List<Byte> bytes = new ArrayList<Byte>();
-+   A[] aArray = (A[])(new Object[10]);
-+
-+   public void genericAllocation() {
-+      this.aArray = (A[])(new Object[20]);// 30
-+   }// 31
-+
-+   public static void genericInference() {
-+      HashMap<String, Integer> test = TestGenerics.Maps.<String, Integer>newHashMap();// 34
-+   }// 35
-+
-+   public void genericList() {
-+      List<B> testList = new ArrayList<B>();// 38
-+      B b = testList.get(0);// 39
-+      System.out.println("B:" + b);// 40
-+   }// 41
-+
-+   public void genericCast() {
-+      HashMap<String, Boolean> upcast = (HashMap)field;// 44
-+   }// 45
-+
-+   public void genericForEach() {
-+      for(String s : field.keySet()) {// 48
-+         System.out.println(s);// 49
-+      }
-+// 51
-+   }
-+
-+   public void genericForEachWithCast() {// 54
-+      for(String s : llstring.get(0)) {// 55
-+         System.out.println(s);
-+      }// 57
-+
-+   }
-+// 60
-+   public <T extends Number> void genericSuperUp() {
-+      List<T> list = new ArrayList<T>();// 61
-+// 62
-+      for(Number number : bytes) {
-+         list.add(number);// 64
-+      }
-+
-+   }
-+// 68
-+   public static class Maps {
-+      public static <K, V> HashMap<K, V> newHashMap() {
-+         return new HashMap<K, V>();
-+      }
-+   }
-+}
-+
-+class 'pkg/TestGenerics' {
-+   method 'genericAllocation ()V' {
-+      0      14
-+      1      14
-+      2      14
-+      6      14
-+      7      14
-+      8      14
-+      9      14
-+      a      14
-+      b      14
-+      c      15
-+   }
-+
-+   method 'genericInference ()V' {
-+      0      18
-+      1      18
-+      2      18
-+      3      18
-+      4      19
-+   }
-+
-+   method 'genericList ()V' {
-+      7      22
-+      8      23
-+      9      23
-+      a      23
-+      b      23
-+      c      23
-+      d      23
-+      e      23
-+      f      23
-+      10      23
-+      11      23
-+      12      23
-+      13      24
-+      14      24
-+      15      24
-+      1d      24
-+      1e      24
-+      22      24
-+      26      24
-+      27      24
-+      28      24
-+      29      24
-+      2a      24
-+      2b      24
-+      2c      25
-+   }
-+
-+   method 'genericCast ()V' {
-+      0      28
-+      1      28
-+      2      28
-+      3      28
-+      4      28
-+      5      28
-+      6      28
-+      7      29
-+   }
-+
-+   method 'genericForEach ()V' {
-+      0      32
-+      1      32
-+      2      32
-+      3      32
-+      4      32
-+      5      32
-+      6      32
-+      7      32
-+      d      32
-+      20      32
-+      21      33
-+      22      33
-+      23      33
-+      24      33
-+      25      33
-+      26      33
-+      27      33
-+      2b      35
-+   }
-+
-+   method 'genericForEachWithCast ()V' {
-+      0      38
-+      1      38
-+      2      38
-+      3      38
-+      4      38
-+      5      38
-+      6      38
-+      7      38
-+      8      38
-+      9      38
-+      a      38
-+      b      38
-+      11      38
-+      24      38
-+      25      39
-+      26      39
-+      27      39
-+      28      39
-+      29      39
-+      2a      39
-+      2b      39
-+      2f      41
-+   }
-+
-+   method 'genericSuperUp ()V' {
-+      7      44
-+      8      46
-+      9      46
-+      a      46
-+      10      46
-+      23      46
-+      24      47
-+      25      47
-+      26      47
-+      27      47
-+      28      47
-+      29      47
-+      2a      47
-+      2f      49
-+   }
-+}
-+
-+class 'pkg/TestGenerics$Maps' {
-+   method 'newHashMap ()Ljava/util/HashMap;' {
-+      7      53
-+   }
-+}
-+
-+Lines mapping:
-+30 <-> 15
-+31 <-> 16
-+34 <-> 19
-+35 <-> 20
-+38 <-> 23
-+39 <-> 24
-+40 <-> 25
-+41 <-> 26
-+44 <-> 29
-+45 <-> 30
-+48 <-> 33
-+49 <-> 34
-+51 <-> 36
-+54 <-> 39
-+55 <-> 40
-+57 <-> 42
-+60 <-> 45
-+61 <-> 47
-+62 <-> 48
-+64 <-> 50
-+68 <-> 54
-+Not mapped:
-+50
-+56
-+63
-diff --git a/testData/results/TestKotlinConstructorKt.dec b/testData/results/TestKotlinConstructorKt.dec
-index e57e91a4d0f967a12d306f22b295608a08a872f1..624026a45ae5dd4b613fb8079a0ea0743281c9cc 100644
---- a/testData/results/TestKotlinConstructorKt.dec
-+++ b/testData/results/TestKotlinConstructorKt.dec
-@@ -14,8 +14,8 @@ import kotlin.collections.CollectionsKt;
- )
- public final class TestKotlinConstructorKt {
-    private static final List<Mapping> foo(Collection<String> list) {
--      Iterable $receiver$iv = (Iterable)list;// 2
--      Collection destination$iv$iv = (Collection)(new ArrayList(CollectionsKt.collectionSizeOrDefault($receiver$iv, 10)));
-+      Iterable $receiver$iv = list;// 2
-+      Collection destination$iv$iv = new ArrayList(CollectionsKt.collectionSizeOrDefault($receiver$iv, 10));
- 
-       for(Object item$iv$iv : $receiver$iv) {// 10 11
-          String it = (String)item$iv$iv;
-@@ -24,12 +24,12 @@ public final class TestKotlinConstructorKt {
-             throw new TypeCastException("null cannot be cast to non-null type kotlin.String");
-          }
- 
--         var10000.<init>((String)it);
-+         var10000.<init>(it);
-          Mapping var11 = var10000;
-          destination$iv$iv.add(var11);// 12
-       }
- // 4 13
--      return CollectionsKt.toList((Iterable)((List)destination$iv$iv));
-+      return CollectionsKt.toList((List)destination$iv$iv);
-    }
- }
- 
-diff --git a/testData/results/TestLocalsSignature.dec b/testData/results/TestLocalsSignature.dec
-index 3da716bb86c538148347d67c29354a66dc416c17..3bd9c84810baa9f0cec8a62492ddccf80747d2d2 100644
---- a/testData/results/TestLocalsSignature.dec
-+++ b/testData/results/TestLocalsSignature.dec
-@@ -5,7 +5,7 @@ import java.util.List;
- 
- public class TestLocalsSignature {
-    public static void main(String[] args) {
--      List<String> s = new ArrayList();// 24
-+      List<String> s = new ArrayList<String>();// 24
-       s.add("xxx");// 25
-    }// 26
- }
-diff --git a/testData/results/TestVarArgCalls.dec b/testData/results/TestVarArgCalls.dec
-index db4cb49cc7816f05dd2e3d82a6b79a7405001e4d..89cfc1980d0ff576c6f7676da8cb8c876db2c6ae 100644
---- a/testData/results/TestVarArgCalls.dec
-+++ b/testData/results/TestVarArgCalls.dec
-@@ -13,15 +13,15 @@ public class TestVarArgCalls {
-       String.format("Test: %d - %s", 123, "DEF");// 15
-       Object[] data = new Object[]{"Hello"};// 17
-       String.format("Test: %s", (Object)data);// 18
--      String.format("Test: %s", (Object[])data);// 19
-+      String.format("Test: %s", data);// 19
-    }// 20
- 
-    public void printAll(String fmt, String... params) {
--      System.out.println(String.format(fmt, (Object[])params));// 23
-+      System.out.println(String.format(fmt, params));// 23
-    }// 24
- 
-    public void printComplex(String fmt, String[]... params) {
--      System.out.println(String.format(fmt, (Object[])params));// 27
-+      System.out.println(String.format(fmt, params));// 27
-    }// 28
- }
- 
-diff --git a/testData/src/pkg/TestGenerics.java b/testData/src/pkg/TestGenerics.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..c45ac50962a7ebbf590404070a9fbd6a6a22aa6d
---- /dev/null
-+++ b/testData/src/pkg/TestGenerics.java
-@@ -0,0 +1,71 @@
-+/*
-+ * Copyright 2000-2017 JetBrains s.r.o.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+package pkg;
-+
-+import java.util.ArrayList;
-+import java.util.HashMap;
-+import java.util.List;
-+import java.util.Map;
-+
-+public class TestGenerics<A, B extends TestGenerics.Maps & List>  {
-+  static Map<String, Boolean> field = Maps.newHashMap();
-+  static List<List<String>> llstring = new ArrayList<>();
-+  static List<Byte> bytes = new ArrayList<>();
-+  A[] aArray = (A[])(new Object[10]);
-+
-+  public void genericAllocation() {
-+    aArray = (A[])(new Object[20]);
-+  }
-+  
-+  public static void genericInference() {
-+    HashMap<String, Integer> test = Maps.newHashMap();
-+  }
-+
-+  public void genericList() {
-+    List<B> testList = new ArrayList<B>();
-+    B b = testList.get(0);
-+    System.out.println("B:" + b);
-+  }
-+
-+  public void genericCast() {
-+    HashMap<String, Boolean> upcast = (HashMap<String, Boolean>)field;
-+  }
-+
-+  public void genericForEach() { 
-+    for (String s : field.keySet()) {
-+      System.out.println(s);
-+    }
-+  }
-+
-+  public void genericForEachWithCast() { 
-+    for (String s : llstring.get(0)) {
-+      System.out.println(s);
-+    }
-+  }
-+
-+  public <T extends Number> void genericSuperUp() {
-+    List<T> list = new ArrayList<>();
-+    for (Number number : bytes) {
-+      list.add((T)number);
-+    }
-+   }
-+
-+  public static class Maps {
-+    public static <K, V> HashMap<K, V> newHashMap() {
-+      return new HashMap<K, V>();
-+    }
-+  }
-+}
diff --git a/FernFlower-Patches/0010-Fix-tests-for-inner-class-sorting.patch b/FernFlower-Patches/0010-Fix-tests-for-inner-class-sorting.patch
new file mode 100644
index 0000000..4af74c8
--- /dev/null
+++ b/FernFlower-Patches/0010-Fix-tests-for-inner-class-sorting.patch
@@ -0,0 +1,486 @@
+From 4c12c7a453ab63d9b966d8247ed88e4873fe7d29 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sun, 2 Aug 2015 19:22:15 -0700
+Subject: [PATCH 010/122] Fix tests for inner class sorting.
+
+---
+ testData/results/TestAnonymousClass.dec   | 60 ++++++++++-----------
+ testData/results/TestInnerLocal.dec       | 50 +++++++++---------
+ testData/results/TestInnerLocalPkg.dec    | 50 +++++++++---------
+ testData/results/TestInnerSignature.dec   | 64 +++++++++++------------
+ testData/results/TestMethodParameters.dec | 48 ++++++++---------
+ 5 files changed, 136 insertions(+), 136 deletions(-)
+
+diff --git a/testData/results/TestAnonymousClass.dec b/testData/results/TestAnonymousClass.dec
+index 75d1df2..fdce110 100644
+--- a/testData/results/TestAnonymousClass.dec
++++ b/testData/results/TestAnonymousClass.dec
+@@ -67,15 +67,8 @@ public abstract class TestAnonymousClass {
+       boolean var1 = true;// 39
+    }// 40
+ 
+-   static class InnerRecursive {
+-      TestAnonymousClass.InnerRecursive r;
+-
+-      public InnerRecursive(TestAnonymousClass.InnerRecursive var1) {
+-         this.r = var1;// 105
+-      }// 106
+-
+-      void foo() {
+-      }// 110
++   interface I {
++      void foo() throws Exception;
+    }
+ 
+    private static class Inner {
+@@ -87,8 +80,15 @@ public abstract class TestAnonymousClass {
+       };
+    }
+ 
+-   interface I {
+-      void foo() throws Exception;
++   static class InnerRecursive {
++      TestAnonymousClass.InnerRecursive r;
++
++      public InnerRecursive(TestAnonymousClass.InnerRecursive var1) {
++         this.r = var1;// 105
++      }// 106
++
++      void foo() {
++      }// 110
+    }
+ }
+ 
+@@ -180,24 +180,24 @@ class 'pkg/TestAnonymousClass' {
+    }
+ }
+ 
++class 'pkg/TestAnonymousClass$Inner$1' {
++   method 'run ()V' {
++      0      76
++      1      76
++      2      77
++      3      77
++      4      78
++   }
++}
++
+ class 'pkg/TestAnonymousClass$InnerRecursive' {
+    method '<init> (Lpkg/TestAnonymousClass$InnerRecursive;)V' {
+-      6      73
+-      9      74
++      6      86
++      9      87
+    }
+ 
+    method 'foo ()V' {
+-      0      77
+-   }
+-}
+-
+-class 'pkg/TestAnonymousClass$Inner$1' {
+-   method 'run ()V' {
+-      0      83
+-      1      83
+-      2      84
+-      3      84
+-      4      85
++      0      90
+    }
+ }
+ 
+@@ -223,9 +223,9 @@ Lines mapping:
+ 53 <-> 18
+ 54 <-> 19
+ 55 <-> 20
+-66 <-> 84
+-67 <-> 85
+-68 <-> 86
++66 <-> 77
++67 <-> 78
++68 <-> 79
+ 75 <-> 24
+ 76 <-> 25
+ 77 <-> 26
+@@ -234,9 +234,9 @@ Lines mapping:
+ 91 <-> 37
+ 92 <-> 38
+ 93 <-> 39
+-105 <-> 74
+-106 <-> 75
+-110 <-> 78
++105 <-> 87
++106 <-> 88
++110 <-> 91
+ Not mapped:
+ 18
+ 104
+diff --git a/testData/results/TestInnerLocal.dec b/testData/results/TestInnerLocal.dec
+index 6ca3a7e..e5aba7d 100644
+--- a/testData/results/TestInnerLocal.dec
++++ b/testData/results/TestInnerLocal.dec
+@@ -28,6 +28,14 @@ public class TestInnerLocal {
+       new TestInnerLocal.Inner1Static.Inner2Static("test");// 40
+    }// 41
+ 
++   class Inner1 {
++      final String x;
++
++      public Inner1(String var2) {
++         this.x = var2;// 46
++      }// 47
++   }
++
+    static class Inner1Static {
+       final String x;
+ 
+@@ -43,14 +51,6 @@ public class TestInnerLocal {
+          }// 60
+       }
+    }
+-
+-   class Inner1 {
+-      final String x;
+-
+-      public Inner1(String var2) {
+-         this.x = var2;// 46
+-      }// 47
+-   }
+ }
+ 
+ class 'TestInnerLocal$1Inner' {
+@@ -84,24 +84,24 @@ class 'TestInnerLocal$2Inner' {
+    }
+ }
+ 
+-class 'TestInnerLocal$Inner1Static' {
+-   method '<init> (Ljava/lang/String;)V' {
+-      6      34
+-      9      35
++class 'TestInnerLocal$Inner1' {
++   method '<init> (LTestInnerLocal;Ljava/lang/String;)V' {
++      b      34
++      e      35
+    }
+ }
+ 
+-class 'TestInnerLocal$Inner1Static$Inner2Static' {
++class 'TestInnerLocal$Inner1Static' {
+    method '<init> (Ljava/lang/String;)V' {
+-      6      41
+-      9      42
++      6      42
++      9      43
+    }
+ }
+ 
+-class 'TestInnerLocal$Inner1' {
+-   method '<init> (LTestInnerLocal;Ljava/lang/String;)V' {
+-      b      50
+-      e      51
++class 'TestInnerLocal$Inner1Static$Inner2Static' {
++   method '<init> (Ljava/lang/String;)V' {
++      6      49
++      9      50
+    }
+ }
+ 
+@@ -119,12 +119,12 @@ Lines mapping:
+ 39 <-> 27
+ 40 <-> 28
+ 41 <-> 29
+-46 <-> 51
+-47 <-> 52
+-53 <-> 35
+-54 <-> 36
+-59 <-> 42
+-60 <-> 43
++46 <-> 35
++47 <-> 36
++53 <-> 43
++54 <-> 44
++59 <-> 50
++60 <-> 51
+ Not mapped:
+ 21
+ 33
+diff --git a/testData/results/TestInnerLocalPkg.dec b/testData/results/TestInnerLocalPkg.dec
+index 7cafa41..7ddb0ce 100644
+--- a/testData/results/TestInnerLocalPkg.dec
++++ b/testData/results/TestInnerLocalPkg.dec
+@@ -30,6 +30,14 @@ public class TestInnerLocalPkg {
+       new TestInnerLocalPkg.Inner1Static.Inner2Static("test");// 42
+    }// 43
+ 
++   class Inner1 {
++      final String x;
++
++      public Inner1(String var2) {
++         this.x = var2;// 48
++      }// 49
++   }
++
+    static class Inner1Static {
+       final String x;
+ 
+@@ -45,14 +53,6 @@ public class TestInnerLocalPkg {
+          }// 62
+       }
+    }
+-
+-   class Inner1 {
+-      final String x;
+-
+-      public Inner1(String var2) {
+-         this.x = var2;// 48
+-      }// 49
+-   }
+ }
+ 
+ class 'pkg/TestInnerLocalPkg$1Inner' {
+@@ -86,24 +86,24 @@ class 'pkg/TestInnerLocalPkg$2Inner' {
+    }
+ }
+ 
+-class 'pkg/TestInnerLocalPkg$Inner1Static' {
+-   method '<init> (Ljava/lang/String;)V' {
+-      6      36
+-      9      37
++class 'pkg/TestInnerLocalPkg$Inner1' {
++   method '<init> (Lpkg/TestInnerLocalPkg;Ljava/lang/String;)V' {
++      b      36
++      e      37
+    }
+ }
+ 
+-class 'pkg/TestInnerLocalPkg$Inner1Static$Inner2Static' {
++class 'pkg/TestInnerLocalPkg$Inner1Static' {
+    method '<init> (Ljava/lang/String;)V' {
+-      6      43
+-      9      44
++      6      44
++      9      45
+    }
+ }
+ 
+-class 'pkg/TestInnerLocalPkg$Inner1' {
+-   method '<init> (Lpkg/TestInnerLocalPkg;Ljava/lang/String;)V' {
+-      b      52
+-      e      53
++class 'pkg/TestInnerLocalPkg$Inner1Static$Inner2Static' {
++   method '<init> (Ljava/lang/String;)V' {
++      6      51
++      9      52
+    }
+ }
+ 
+@@ -121,12 +121,12 @@ Lines mapping:
+ 41 <-> 29
+ 42 <-> 30
+ 43 <-> 31
+-48 <-> 53
+-49 <-> 54
+-55 <-> 37
+-56 <-> 38
+-61 <-> 44
+-62 <-> 45
++48 <-> 37
++49 <-> 38
++55 <-> 45
++56 <-> 46
++61 <-> 52
++62 <-> 53
+ Not mapped:
+ 23
+ 35
+diff --git a/testData/results/TestInnerSignature.dec b/testData/results/TestInnerSignature.dec
+index 3087a40..406e1f4 100644
+--- a/testData/results/TestInnerSignature.dec
++++ b/testData/results/TestInnerSignature.dec
+@@ -9,18 +9,6 @@ public class TestInnerSignature<A, B, C> {
+       this.c = var3;// 25
+    }// 26
+ 
+-   public static class InnerStatic<A, B, C> {
+-      A a;
+-      B b;
+-      C c;
+-
+-      public InnerStatic(A var1, B var2, C var3) {
+-         this.a = var1;// 46
+-         this.b = var2;// 47
+-         this.c = var3;// 48
+-      }// 49
+-   }
+-
+    public class Inner {
+       A a;
+       B b;
+@@ -32,6 +20,18 @@ public class TestInnerSignature<A, B, C> {
+          this.c = var4;// 36
+       }// 37
+    }
++
++   public static class InnerStatic<A, B, C> {
++      A a;
++      B b;
++      C c;
++
++      public InnerStatic(A var1, B var2, C var3) {
++         this.a = var1;// 46
++         this.b = var2;// 47
++         this.c = var3;// 48
++      }// 49
++   }
+ }
+ 
+ class 'TestInnerSignature' {
+@@ -43,21 +43,21 @@ class 'TestInnerSignature' {
+    }
+ }
+ 
+-class 'TestInnerSignature$InnerStatic' {
+-   method '<init> (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
+-      6      17
+-      b      18
+-      10      19
+-      13      20
++class 'TestInnerSignature$Inner' {
++   method '<init> (LTestInnerSignature;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
++      b      17
++      10      18
++      16      19
++      19      20
+    }
+ }
+ 
+-class 'TestInnerSignature$Inner' {
+-   method '<init> (LTestInnerSignature;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
+-      b      29
+-      10      30
+-      16      31
+-      19      32
++class 'TestInnerSignature$InnerStatic' {
++   method '<init> (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
++      6      29
++      b      30
++      10      31
++      13      32
+    }
+ }
+ 
+@@ -66,14 +66,14 @@ Lines mapping:
+ 24 <-> 8
+ 25 <-> 9
+ 26 <-> 10
+-34 <-> 30
+-35 <-> 31
+-36 <-> 32
+-37 <-> 33
+-46 <-> 18
+-47 <-> 19
+-48 <-> 20
+-49 <-> 21
++34 <-> 18
++35 <-> 19
++36 <-> 20
++37 <-> 21
++46 <-> 30
++47 <-> 31
++48 <-> 32
++49 <-> 33
+ Not mapped:
+ 22
+ 33
+diff --git a/testData/results/TestMethodParameters.dec b/testData/results/TestMethodParameters.dec
+index 21f0f12..af7ce86 100644
+--- a/testData/results/TestMethodParameters.dec
++++ b/testData/results/TestMethodParameters.dec
+@@ -21,6 +21,14 @@ public class TestMethodParameters {
+ 
+    }// 39
+ 
++   class C1 {
++      C1(@Deprecated int var2) {
++      }// 24
++
++      void m(@Deprecated int var1) {
++      }// 25
++   }
++
+    static class C2 {
+       C2(@Deprecated int var1) {
+       }// 29
+@@ -31,14 +39,6 @@ public class TestMethodParameters {
+       static void m2(@Deprecated int var0) {
+       }// 31
+    }
+-
+-   class C1 {
+-      C1(@Deprecated int var2) {
+-      }// 24
+-
+-      void m(@Deprecated int var1) {
+-      }// 25
+-   }
+ }
+ 
+ class 'pkg/TestMethodParameters' {
+@@ -69,26 +69,26 @@ class 'pkg/TestMethodParameters$1Local' {
+    }
+ }
+ 
+-class 'pkg/TestMethodParameters$C2' {
+-   method '<init> (I)V' {
+-      4      25
++class 'pkg/TestMethodParameters$C1' {
++   method '<init> (Lpkg/TestMethodParameters;I)V' {
++      9      25
+    }
+ 
+-   method 'm1 (I)V' {
++   method 'm (I)V' {
+       0      28
+    }
++}
+ 
+-   method 'm2 (I)V' {
+-      0      31
++class 'pkg/TestMethodParameters$C2' {
++   method '<init> (I)V' {
++      4      33
+    }
+-}
+ 
+-class 'pkg/TestMethodParameters$C1' {
+-   method '<init> (Lpkg/TestMethodParameters;I)V' {
+-      9      36
++   method 'm1 (I)V' {
++      0      36
+    }
+ 
+-   method 'm (I)V' {
++   method 'm2 (I)V' {
+       0      39
+    }
+ }
+@@ -97,11 +97,11 @@ Lines mapping:
+ 19 <-> 5
+ 20 <-> 8
+ 21 <-> 11
+-24 <-> 37
+-25 <-> 40
+-29 <-> 26
+-30 <-> 29
+-31 <-> 32
++24 <-> 26
++25 <-> 29
++29 <-> 34
++30 <-> 37
++31 <-> 40
+ 36 <-> 16
+ 37 <-> 19
+ 39 <-> 22
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0010-Improvements-to-var-and-var.patch b/FernFlower-Patches/0010-Improvements-to-var-and-var.patch
deleted file mode 100644
index 040d37c..0000000
--- a/FernFlower-Patches/0010-Improvements-to-var-and-var.patch
+++ /dev/null
@@ -1,327 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Fri, 14 Apr 2017 10:13:01 -0700
-Subject: [PATCH] Improvements to var++ and var--
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index bb2d0f0eb067a92472dcd8d69a0029d15c34c520..fde1c3bca1b12454b6f9a692c5f870ba946a590e 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-@@ -915,7 +915,7 @@ public class NestedClassProcessor {
-         case Exprent.EXPRENT_FIELD -> res = classname.equals(((FieldExprent)expr).getClassname());
-         case Exprent.EXPRENT_INVOCATION -> res = classname.equals(((InvocationExprent)expr).getClassName());
-         case Exprent.EXPRENT_NEW -> {
--          VarType newType = expr.getExprType();
-+          VarType newType = ((NewExprent)expr).getNewType();
-           res = newType.getType() == CodeConstants.TYPE_OBJECT && classname.equals(newType.getValue());
-         }
-         case Exprent.EXPRENT_VAR -> {
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
-index 81b4c480810a2f74388a4626a4dc0c2bfc523365..f0f66146eb4ecad4ed1bbd41712cace8fe466ed5 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
-@@ -14,18 +14,15 @@ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
- 
--import java.util.HashMap;
- import java.util.HashSet;
- import java.util.LinkedList;
- import java.util.List;
--import java.util.Map;
--import java.util.Objects;
- 
- public class PPandMMHelper {
- 
-   private boolean exprentReplaced;
-   private VarProcessor varProc;
--  private Map<VarVersionPair, VarVersionPair> remaps = new HashMap<>();
-+  private DirectGraph dgraph;
- 
-   public PPandMMHelper(VarProcessor varProc) {
-     this.varProc = varProc;
-@@ -34,10 +31,10 @@ public class PPandMMHelper {
-   public boolean findPPandMM(RootStatement root) {
- 
-     FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
--    DirectGraph dgraph = flatthelper.buildDirectGraph(root);
-+    this.dgraph = flatthelper.buildDirectGraph(root);
- 
-     LinkedList<DirectNode> stack = new LinkedList<>();
--    stack.add(dgraph.first);
-+    stack.add(this.dgraph.first);
- 
-     HashSet<DirectNode> setVisited = new HashSet<>();
- 
-@@ -57,8 +54,6 @@ public class PPandMMHelper {
-       stack.addAll(node.successors);
-     }
- 
--    updateVersions(dgraph);
--
-     return res;
-   }
- 
-@@ -133,7 +128,7 @@ public class PPandMMHelper {
-           if (econst.type == Exprent.EXPRENT_CONST && ((ConstExprent)econst).hasValueOne()) {
-             Exprent left = as.getLeft();
- 
--            VarType condtype = econd.getExprType();
-+            VarType condtype = left.getExprType();
-             if (exprsEqual(left, econd) && (midlayer == null || midlayer.equals(condtype))) {
-               FunctionExprent ret = new FunctionExprent(
-                 func.getFuncType() == FunctionExprent.FUNCTION_ADD ? FunctionExprent.FUNCTION_PPI : FunctionExprent.FUNCTION_MMI,
-@@ -143,7 +138,7 @@ public class PPandMMHelper {
-               exprentReplaced = true;
- 
-               if (!left.equals(econd)) {
--                remaps.put(new VarVersionPair((VarExprent)left), new VarVersionPair((VarExprent)econd));
-+                updateVersions(this.dgraph, new VarVersionPair((VarExprent)left), new VarVersionPair((VarExprent)econd));
-               }
- 
-               return ret;
-@@ -171,13 +166,13 @@ public class PPandMMHelper {
- 
-     VarExprent v1 = (VarExprent)e1;
-     VarExprent v2 = (VarExprent)e2;
--    return varProc.getVarOriginalIndex(v1.getIndex()) == varProc.getVarOriginalIndex(v2.getIndex())
--            && Objects.equals(v1.getVarType(), v2.getVarType());
-+    return varProc.getVarOriginalIndex(v1.getIndex()) == varProc.getVarOriginalIndex(v2.getIndex());
-+    // TODO: Verify the types are in the same 'family' {byte->short->int}
-+    //        && Objects.equals(v1.getVarType(), v2.getVarType());
-   }
- 
- 
--  private void updateVersions(DirectGraph graph) {
--    if (remaps.isEmpty()) return;
-+  private void updateVersions(DirectGraph graph, final VarVersionPair oldVVP, final VarVersionPair newVVP) {
-     graph.iterateExprents(new DirectGraph.ExprentIterator() {
-       @Override
-       public int processExprent(Exprent exprent) {
-@@ -187,10 +182,9 @@ public class PPandMMHelper {
-         for (Exprent expr : lst) {
-           if (expr.type == Exprent.EXPRENT_VAR) {
-             VarExprent var = (VarExprent)expr;
--            VarVersionPair nvar = remaps.get(new VarVersionPair(var));
--            if (nvar != null) {
--              var.setIndex(nvar.var);
--              var.setVersion(nvar.version);
-+            if (var.getIndex() == oldVVP.var && var.getVersion() == oldVVP.version) {
-+              var.setIndex(newVVP.var);
-+              var.setVersion(newVVP.version);
-             }
-           }
-         }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-index b0bda600031b4cc52b6b083d5afd07a92ccef1af..401917e6947c0ae541c966777cf2deddf54ed644 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-@@ -500,7 +500,12 @@ public class ConstExprent extends Exprent {
-   public void getBytecodeRange(BitSet values) {
-     measureBytecode(values);
-   }
--  
-+
-+  @Override
-+  public String toString() {
-+    return "const(" + toJava(0, new BytecodeMappingTracer()) + ")";
-+  }
-+
-   // *****************************************************************************
-   // IMatchable implementation
-   // *****************************************************************************
-diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
-index 388e1facddbac3286eaed3dbccc3b23197daf5d6..6ffaa0f8581c48b4fd2f96d0c21368d63e69cf5f 100644
---- a/test/org/jetbrains/java/decompiler/LVTTest.java
-+++ b/test/org/jetbrains/java/decompiler/LVTTest.java
-@@ -46,4 +46,5 @@ public class LVTTest extends SingleClassesTestBase {
-   @Test public void testLVTComplex() { doTest("pkg/TestLVTComplex"); }
-   @Test public void testVarType() { doTest("pkg/TestVarType"); }
-   @Test public void testLoopMerging() { doTest("pkg/TestLoopMerging"); }
-+  @Test public void testPPMM() { doTest("pkg/TestPPMM"); }
- }
-diff --git a/testData/classes/pkg/TestPPMM.class b/testData/classes/pkg/TestPPMM.class
-new file mode 100644
-index 0000000000000000000000000000000000000000..8caf72506e9847d87715ffb7804ba9538aea668f
-GIT binary patch
-literal 1271
-zcmb8u+ins;9LMqBEVL+6ig>66Db{$PR*M()lwvhjYfz{pHuZYJ6}NH<rN#&73wfpS
-z!Uyo7tlt5|hHfOy?#_Q_X6OHz*~$F+{o|*kRb`_JD;-rxmm|tVv|uz{@LPUw-6)h>
-z+A#`mwBLJ1vn9XfZS6O!UU%EAHfTwf+BLVa<92;pA2x=2AN@U}c&YQLp5ONNdX-AK
-zyhbj+(=jqGPmx-u<J-1old{?5Jxu=x0v$HcV*_0T)8jQ)w39JkjG}Mb``wzi>Dx)n
-z{54i~-Op}JQ<{$HqUMZZM`vJ^u>JXl+p6c^RCm2vPm3%%%ukS_GIk(kgj$|xh*P(|
-z$$aI-(J4yXEhTlDGB)^tfoG^;jRwD?=Fm19DjXOyy8op~@u`@hqdCk=q@E{9N^zz8
-zscjF#hp8RSaK%Z=4xALpkZJ)W3vvZykwjM~Ac<h)@W2f3@s(Tyxejsz<R(ZCWN89&
-z_N2%%$Ze22AS)nwkh>F*<Orz`_aqxCq}h@0astEn%2q+|f!tR@57@1T{LDv3(ClcB
-zGNU~@7ldM_K?B1$x&~SRc?`M^`ULdp1oV6m$`TI;D?J{@(Py9=AkRTxfNp}moPb^k
-zLNNy`4G80C5%d+vYtRyC8FcHvXw)8T_R=2GWgdGTj~&oTKgHmH8qQa||KU8PqtqYe
-C6pbVR
-
-literal 0
-HcmV?d00001
-
-diff --git a/testData/results/TestPPMM.dec b/testData/results/TestPPMM.dec
-new file mode 100644
-index 0000000000000000000000000000000000000000..ba3a5fc1b4a29798078399358a7e560326aa2044
---- /dev/null
-+++ b/testData/results/TestPPMM.dec
-@@ -0,0 +1,70 @@
-+package pkg;
-+
-+public class TestPPMM {
-+   public void ipp() {
-+      int a = 0;
-+      ++a;
-+      ++a;
-+      ++a;
-+      ++a;
-+   }
-+
-+   public void ppi() {
-+      int a = 0;
-+      ++a;
-+      ++a;
-+      ++a;
-+      ++a;
-+   }
-+
-+   public void imm() {
-+      int a = 0;
-+      --a;
-+      --a;
-+      --a;
-+      --a;
-+   }
-+
-+   public void mmi() {
-+      int a = 0;
-+      --a;
-+      --a;
-+      --a;
-+      --a;
-+   }
-+
-+   public void ippf() {
-+      int a = 0;
-+      t(a++);
-+      t(a++);
-+      t(a++);
-+      t(a++);
-+   }
-+
-+   public void ppif() {
-+      int a = 0;
-+      t(++a);
-+      t(++a);
-+      t(++a);
-+      t(++a);
-+   }
-+
-+   public void immf() {
-+      int a = 0;
-+      t(a--);
-+      t(a--);
-+      t(a--);
-+      t(a--);
-+   }
-+
-+   public void mmif() {
-+      int a = 0;
-+      t(--a);
-+      t(--a);
-+      t(--a);
-+      t(--a);
-+   }
-+
-+   private static void t(int x) {
-+   }
-+}
-diff --git a/testData/src/pkg/TestPPMM.java b/testData/src/pkg/TestPPMM.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0a062be8c8cc93d9f398e786671223ac9a591492
---- /dev/null
-+++ b/testData/src/pkg/TestPPMM.java
-@@ -0,0 +1,81 @@
-+/*
-+ * Copyright 2000-2017 JetBrains s.r.o.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+package pkg;
-+
-+public class TestPPMM {
-+   // Bytecode wise ipp and ppi are identical when not using the intermediate value. 
-+   // We keep these seperate tests just to see the bytecode.
-+   public void ipp() {
-+      int a = 0;
-+      a++;
-+      a++;
-+      a++;
-+      a++;
-+   }
-+   public void ppi() {
-+      int a = 0;
-+      ++a;
-+      ++a;
-+      ++a;
-+      ++a;
-+   }
-+   public void imm() {
-+      int a = 0;
-+      a--;
-+      a--;
-+      a--;
-+      a--;
-+   }
-+   public void mmi() {
-+      int a = 0;
-+      --a;
-+      --a;
-+      --a;
-+      --a;
-+   }
-+   
-+   // These versions actually use the intermediate value
-+   public void ippf() {
-+      int a = 0;
-+      t(a++);
-+      t(a++);
-+      t(a++);
-+      t(a++);
-+   }
-+   public void ppif() {
-+      int a = 0;
-+      t(++a);
-+      t(++a);
-+      t(++a);
-+      t(++a);
-+   }
-+   public void immf() {
-+      int a = 0;
-+      t(a--);
-+      t(a--);
-+      t(a--);
-+      t(a--);
-+   }
-+   public void mmif() {
-+      int a = 0;
-+      t(--a);
-+      t(--a);
-+      t(--a);
-+      t(--a);
-+   }
-+   private static void t(int x){
-+   }
-+}
-\ No newline at end of file
diff --git a/FernFlower-Patches/0011-Fixed-issue-where-field-initalizers-would-incorrectl.patch b/FernFlower-Patches/0011-Fixed-issue-where-field-initalizers-would-incorrectl.patch
new file mode 100644
index 0000000..f0e621b
--- /dev/null
+++ b/FernFlower-Patches/0011-Fixed-issue-where-field-initalizers-would-incorrectl.patch
@@ -0,0 +1,62 @@
+From f8a4b88e87510d194781b14ed6c4dba40425422b Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sun, 2 Aug 2015 19:49:30 -0700
+Subject: [PATCH 011/122] Fixed issue where field initalizers would incorrectly
+ be inlined when they relied on fields initalized later.
+
+---
+ .../decompiler/main/InitializerProcessor.java     | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
+index d916b19..e64feea 100644
+--- a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
+@@ -142,9 +142,8 @@ public class InitializerProcessor {
+             if (fexpr.isStatic() && fexpr.getClassname().equals(cl.qualifiedName) &&
+                 cl.hasField(fexpr.getName(), fexpr.getDescriptor().descriptorString)) {
+ 
+-              if (isExprentIndependent(asexpr.getRight(), meth, cl, whitelist)) {
+-
+-                String keyField = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
++              String keyField = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
++              if (isExprentIndependent(asexpr.getRight(), meth, cl, whitelist, cl.getFields().getIndexByKey(keyField))) {
+                 if (!wrapper.getStaticFieldInitializers().containsKey(keyField)) {
+                   wrapper.getStaticFieldInitializers().addWithKey(asexpr.getRight(), keyField);
+                   whitelist.add(keyField);
+@@ -217,8 +216,8 @@ public class InitializerProcessor {
+                 cl.hasField(fexpr.getName(), fexpr
+                   .getDescriptor().descriptorString)) { // check for the physical existence of the field. Could be defined in a superclass.
+ 
+-              if (isExprentIndependent(asexpr.getRight(), lstMethWrappers.get(i), cl, whitelist)) {
+-                String fieldKey = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
++              String fieldKey = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
++              if (isExprentIndependent(asexpr.getRight(), lstMethWrappers.get(i), cl, whitelist, cl.getFields().getIndexByKey(fieldKey))) {
+                 if (fieldWithDescr == null) {
+                   fieldWithDescr = fieldKey;
+                   value = asexpr.getRight();
+@@ -253,7 +252,7 @@ public class InitializerProcessor {
+     }
+   }
+ 
+-  private static boolean isExprentIndependent(Exprent exprent, MethodWrapper meth, StructClass cl, Set<String> whitelist) {
++  private static boolean isExprentIndependent(Exprent exprent, MethodWrapper meth, StructClass cl, Set<String> whitelist, int fidx) {
+ 
+     List<Exprent> lst = exprent.getAllExprents(true);
+     lst.add(exprent);
+@@ -273,9 +272,11 @@ public class InitializerProcessor {
+         case Exprent.EXPRENT_FIELD:
+           FieldExprent fexpr = (FieldExprent)expr;
+           if (cl.qualifiedName.equals(fexpr.getClassname())) {
+-            if (!whitelist.contains(InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString))) {
++            String key = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
++            if (!whitelist.contains(key)) {
+               return false;
+             }
++            return cl.getFields().getIndexByKey(key) < fidx;
+           }
+           else if (!fexpr.isStatic()) {
+             return false;
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0011-JAD-Style-variable-naming.patch b/FernFlower-Patches/0011-JAD-Style-variable-naming.patch
deleted file mode 100644
index 1a30eab..0000000
--- a/FernFlower-Patches/0011-JAD-Style-variable-naming.patch
+++ /dev/null
@@ -1,981 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Tue, 11 Apr 2017 22:37:40 -0700
-Subject: [PATCH] JAD Style variable naming
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index 31236841f1b4bf4f452f30d6b95f21fcc99ec5b9..aa990406ef8d91838aa2d928bdfb183fe9e19333 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-@@ -117,15 +117,20 @@ public class ClassWriter {
-                 buffer.append(", ");
-               }
- 
-+              List<TypeAnnotation> iParameterTypeAnnotations = TargetInfo.FormalParameterTarget.extract(parameterTypeAnnotations, i);
-+              VarType type = md_content.params[i];
-+              String typeName = ExprProcessor.getCastTypeName(type, explicitlyTyped, TypeAnnotationWriteHelper.create(iParameterTypeAnnotations));
-               if (explicitlyTyped) {
--                List<TypeAnnotation> iParameterTypeAnnotations = TargetInfo.FormalParameterTarget.extract(parameterTypeAnnotations, i);
--                VarType type = md_content.params[i];
--                buffer.append(ExprProcessor.getCastTypeName(type, TypeAnnotationWriteHelper.create(iParameterTypeAnnotations)));
-+                buffer.append(typeName);
-                 buffer.append(' ');
-               }
- 
-               String parameterName = methodWrapper.varproc.getVarName(new VarVersionPair(index, 0));
--              buffer.append(parameterName == null ? "param" + index : parameterName); // null iff decompiled with errors
-+              if (parameterName == null) {
-+                parameterName = "param" + index; // null iff decompiled with errors
-+              }
-+              parameterName = methodWrapper.methodStruct.getVariableNamer().renameParameter(mt.getAccessFlags(), typeName, parameterName, index);
-+              buffer.append(parameterName);
- 
-               firstParameter = false;
-             }
-@@ -747,7 +752,11 @@ public class ClassWriter {
-             buffer.append(' ');
- 
-             String parameterName = methodWrapper.varproc.getVarName(pair);
--            buffer.append(parameterName == null ? "param" + index : parameterName); // null iff decompiled with errors
-+            if (parameterName == null) {
-+              parameterName = "param" + index; // null iff decompiled with errors
-+            }
-+            parameterName = methodWrapper.methodStruct.getVariableNamer().renameParameter(flags, typeName, parameterName, index);
-+            buffer.append(parameterName);
- 
-             paramCount++;
-           }
-@@ -919,7 +928,11 @@ public class ClassWriter {
-             buffer.append(" ");
- 
-             String parameterName = methodWrapper.varproc.getVarName(new VarVersionPair(index, 0));
--            buffer.append(parameterName == null ? "param" + index : parameterName); // null iff decompiled with errors
-+            if (parameterName == null) {
-+              parameterName = "param" + index; // null iff decompiled with errors
-+            }
-+            parameterName = methodWrapper.methodStruct.getVariableNamer().renameParameter(mt.getAccessFlags(), typeName, parameterName, index);
-+            buffer.append(parameterName);
- 
-             firstParameter = false;
-           }
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index 8173ecd04da97e5e9a8f5f9a2e309726439697e0..3398f884985021a324fc5ae6ac6a461f8e5b2f33 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-@@ -146,6 +146,7 @@ public class ClassesProcessor implements CodeConstants {
-         node.access = cl.getAccessFlags();
-         mapRootClasses.put(cl.qualifiedName, node);
-       }
-+      linkEnclosingMethods(cl);
-     }
- 
-     // set non-sealed if class extends or implements a sealed class and is not final or sealed itself
-@@ -256,6 +257,25 @@ public class ClassesProcessor implements CodeConstants {
-     }
-   }
- 
-+  private void linkEnclosingMethods(StructClass cl) {
-+      StructEnclosingMethodAttribute attr = cl.getAttribute(StructGeneralAttribute.ATTRIBUTE_ENCLOSING_METHOD);
-+      if (attr == null || attr.getMethodName() == null) {
-+        return;
-+      }
-+      StructClass parent = context.getClasses().get(attr.getClassName());
-+      if (parent == null) {
-+        return;
-+      }
-+      StructMethod method = parent.getMethod(attr.getMethodName(), attr.getMethodDescriptor());
-+      if (method == null) {
-+        return;
-+      }
-+      if (method.enclosedClasses == null) {
-+        method.enclosedClasses = new HashSet<>();
-+      }
-+      method.enclosedClasses.add(cl.qualifiedName);
-+  }
-+
-   private static boolean isAnonymous(StructClass cl, StructClass enclosingCl) {
-     // checking super class and interfaces
-     int[] interfaces = cl.getInterfaces();
-@@ -441,6 +461,7 @@ public class ClassesProcessor implements CodeConstants {
-   private static void destroyWrappers(ClassNode node) {
-     node.wrapper = null;
-     node.classStruct.releaseResources();
-+    node.classStruct.getMethods().forEach(m -> m.clearVariableNamer());
- 
-     for (ClassNode nd : node.nested) {
-       destroyWrappers(nd);
-@@ -563,4 +584,4 @@ public class ClassesProcessor implements CodeConstants {
-       public boolean is_content_method_static;
-     }
-   }
--}
-\ No newline at end of file
-+}
-diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-index 654d0ddf34821ce4ea800cd5421f6268e2ca3236..bb7b5b4e4a590219939a8f7e883b9c259c1adf73 100644
---- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-+++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-@@ -7,6 +7,7 @@ import org.jetbrains.java.decompiler.main.collectors.ImportCollector;
- import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
- import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
-+import org.jetbrains.java.decompiler.main.extern.IVariableNamingFactory;
- import org.jetbrains.java.decompiler.modules.renamer.PoolInterceptor;
- import org.jetbrains.java.decompiler.struct.StructContext;
- 
-@@ -20,12 +21,14 @@ public class DecompilerContext {
-   public static final String CURRENT_METHOD_WRAPPER = "CURRENT_METHOD_WRAPPER";
-   public static final String CURRENT_VAR_PROCESSOR = "CURRENT_VAR_PROCESSOR";
-   public static final String IN_CLASS_TYPE_PARAMS = "IN_CLASS_TYPE_PARAMS";
-+  public static final String RENAMER_FACTORY = "RENAMER_FACTORY";
- 
-   private final Map<String, Object> properties;
-   private final IFernflowerLogger logger;
-   private final StructContext structContext;
-   private final ClassesProcessor classProcessor;
-   private final PoolInterceptor poolInterceptor;
-+  private final IVariableNamingFactory renamerFactory;
-   private ImportCollector importCollector;
-   private VarProcessor varProcessor;
-   private CounterContainer counterContainer;
-@@ -35,7 +38,8 @@ public class DecompilerContext {
-                            IFernflowerLogger logger,
-                            StructContext structContext,
-                            ClassesProcessor classProcessor,
--                           PoolInterceptor interceptor) {
-+                           PoolInterceptor interceptor,
-+                           IVariableNamingFactory renamerFactory) {
-     Objects.requireNonNull(properties);
-     Objects.requireNonNull(logger);
-     Objects.requireNonNull(structContext);
-@@ -46,6 +50,7 @@ public class DecompilerContext {
-     this.structContext = structContext;
-     this.classProcessor = classProcessor;
-     this.poolInterceptor = interceptor;
-+    this.renamerFactory = renamerFactory;
-     this.counterContainer = new CounterContainer();
-   }
- 
-@@ -113,6 +118,10 @@ public class DecompilerContext {
-     return getCurrentContext().poolInterceptor;
-   }
- 
-+  public static IVariableNamingFactory getNamingFactory() {
-+    return getCurrentContext().renamerFactory;
-+  }
-+
-   public static ImportCollector getImportCollector() {
-     return getCurrentContext().importCollector;
-   }
-diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-index f8c413c7b7302b201a739310677d0103e2878d3e..aa8b1132b84fc44bf6decd96ebaf5c021c185ac1 100644
---- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
-+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-@@ -10,6 +10,7 @@ import org.jetbrains.java.decompiler.struct.IDecompiledData;
- import org.jetbrains.java.decompiler.struct.StructClass;
- import org.jetbrains.java.decompiler.struct.StructContext;
- import org.jetbrains.java.decompiler.struct.lazy.LazyLoader;
-+import org.jetbrains.java.decompiler.util.JADNameProvider;
- import org.jetbrains.java.decompiler.util.TextBuffer;
- import org.jetbrains.java.decompiler.util.ClasspathScanner;
- 
-@@ -52,7 +53,25 @@ public class Fernflower implements IDecompiledData {
-       converter = null;
-     }
- 
--    DecompilerContext context = new DecompilerContext(properties, logger, structContext, classProcessor, interceptor);
-+    IVariableNamingFactory renamerFactory = null;
-+    String factoryClazz = (String) properties.get(DecompilerContext.RENAMER_FACTORY);
-+    if (factoryClazz != null) {
-+      try {
-+        renamerFactory = Class.forName(factoryClazz).asSubclass(IVariableNamingFactory.class).getDeclaredConstructor().newInstance();
-+      } catch (Exception e) {
-+        logger.writeMessage("Error loading renamer factory class: " + factoryClazz, e);
-+      }
-+    }
-+    if (renamerFactory == null) {
-+      if("1".equals(properties.get(IFernflowerPreferences.USE_JAD_VARNAMING))) {
-+        boolean renameParams = "1".equals(properties.get(IFernflowerPreferences.USE_JAD_PARAMETER_RENAMING));
-+        renamerFactory = new JADNameProvider.JADNameProviderFactory(renameParams);
-+      } else {
-+        renamerFactory = new IdentityRenamerFactory();
-+      }
-+    }
-+
-+    DecompilerContext context = new DecompilerContext(properties, logger, structContext, classProcessor, interceptor, renamerFactory);
-     DecompilerContext.setCurrentContext(context);
- 
-     String vendor = System.getProperty("java.vendor", "missing vendor");
-diff --git a/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java b/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..872ec764f11131d384e59f08c4aac9551add771b
---- /dev/null
-+++ b/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java
-@@ -0,0 +1,39 @@
-+/*
-+ * Copyright 2000-2017 JetBrains s.r.o.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+package org.jetbrains.java.decompiler.main;
-+
-+import java.util.Map;
-+
-+import org.jetbrains.java.decompiler.main.extern.IVariableNameProvider;
-+import org.jetbrains.java.decompiler.main.extern.IVariableNamingFactory;
-+import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
-+import org.jetbrains.java.decompiler.struct.StructMethod;
-+
-+public class IdentityRenamerFactory implements IVariableNamingFactory, IVariableNameProvider {
-+  @Override
-+  public IVariableNameProvider createFactory(StructMethod method) {
-+    return this;
-+  }
-+
-+  @Override
-+  public Map<VarVersionPair, String> rename(Map<VarVersionPair, String> variables) {
-+    return null;
-+  }
-+
-+  @Override
-+  public void addParentContext(IVariableNameProvider renamer) {
-+  }
-+}
-diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-index 79108dd8772dc9444d66e6ba0cdd7f56ca382fbd..3cbbb19b4dd705f67d0b2450996f704a9e293168 100644
---- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-@@ -52,6 +52,9 @@ public interface IFernflowerPreferences {
-   String LINE_SEPARATOR_WIN = "\r\n";
-   String LINE_SEPARATOR_UNX = "\n";
- 
-+  String USE_JAD_VARNAMING = "jvn"; // Overwrites any Local Variable names with JAD style names
-+  String USE_JAD_PARAMETER_RENAMING = "jpr"; // Include parameter names in JAD naming
-+
-   Map<String, Object> DEFAULTS = getDefaults();
- 
-   static Map<String, Object> getDefaults() {
-@@ -95,7 +98,9 @@ public interface IFernflowerPreferences {
-     defaults.put(BANNER, "");
-     defaults.put(UNIT_TEST_MODE, "0");
-     defaults.put(DUMP_ORIGINAL_LINES, "0");
-+    defaults.put(USE_JAD_VARNAMING, "0");
-+    defaults.put(USE_JAD_PARAMETER_RENAMING, "0");
- 
-     return Collections.unmodifiableMap(defaults);
-   }
--}
-\ No newline at end of file
-+}
-diff --git a/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java b/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0c47d21eef640037a0c8ce69d9b4d5815be9ccd9
---- /dev/null
-+++ b/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java
-@@ -0,0 +1,37 @@
-+/*
-+ * Copyright 2000-2017 JetBrains s.r.o.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+package org.jetbrains.java.decompiler.main.extern;
-+
-+import java.util.Map;
-+
-+import org.jetbrains.java.decompiler.code.CodeConstants;
-+import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
-+
-+public interface IVariableNameProvider {
-+  public Map<VarVersionPair,String> rename(Map<VarVersionPair,String> variables);
-+
-+  default String renameAbstractParameter(String name, int index) {
-+     return name;
-+  }
-+
-+  default String renameParameter(int flags, String type, String name, int index) {
-+     if ((flags & (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_NATIVE)) != 0)
-+        return renameAbstractParameter(name, index);
-+     return name;
-+  }
-+
-+  public void addParentContext(IVariableNameProvider renamer);
-+}
-diff --git a/src/org/jetbrains/java/decompiler/main/extern/IVariableNamingFactory.java b/src/org/jetbrains/java/decompiler/main/extern/IVariableNamingFactory.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..fc1d7d67864ab12e894fcdf0ed8e1297ce057bee
---- /dev/null
-+++ b/src/org/jetbrains/java/decompiler/main/extern/IVariableNamingFactory.java
-@@ -0,0 +1,22 @@
-+/*
-+ * Copyright 2000-2017 JetBrains s.r.o.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+package org.jetbrains.java.decompiler.main.extern;
-+
-+import org.jetbrains.java.decompiler.struct.StructMethod;
-+
-+public interface IVariableNamingFactory {
-+  public IVariableNameProvider createFactory(StructMethod structMethod);
-+}
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
-index c1126a2b7559e2f8a69a54ee0b7db2ceda3d9776..964bff5a00b35969fa08e48ca355801fe2882ce8 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
-@@ -158,7 +158,8 @@ public class ClassWrapper {
-   }
- 
-   private static void applyDebugInfo(StructMethod mt, VarProcessor varProc, MethodWrapper methodWrapper) {
--    if (DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_VAR_NAMES)) {
-+    // Only rename parameters in the var processor if we aren't already renaming them with JAD naming
-+    if (DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_VAR_NAMES) && (!DecompilerContext.getOption(IFernflowerPreferences.USE_JAD_VARNAMING) || !DecompilerContext.getOption(IFernflowerPreferences.USE_JAD_PARAMETER_RENAMING))) {
-       StructLocalVariableTableAttribute attr = mt.getLocalVariableAttr();
-       if (attr != null) {
-         // only param names here
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index f9a7e55c108959b9696cb52cfd91aee341e40b06..b35985211d1f0488f76cbd6e87f18e3732b2d589 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-@@ -2,6 +2,7 @@
- package org.jetbrains.java.decompiler.modules.decompiler.vars;
- 
- import org.jetbrains.java.decompiler.code.CodeConstants;
-+import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
- import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
- import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
-@@ -11,6 +12,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.ExitExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.FieldExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.NewExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchAllStatement;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchStatement;
-@@ -25,6 +27,7 @@ import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribu
- import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
- import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
-+import org.jetbrains.java.decompiler.util.StatementIterator;
- 
- import java.util.*;
- import java.util.Map.Entry;
-@@ -842,6 +845,53 @@ public class VarDefinitionHelper {
-     for (Entry<VarVersionPair, VarInfo> e : types.entrySet()) {
-       typeNames.put(e.getKey(), e.getValue().getCast());
-     }
-+
-+    Map<VarVersionPair, String> renames = this.mt.getVariableNamer().rename(typeNames);
-+
-+    // Stuff the parent context into enclosed child methods
-+    StatementIterator.iterate(root, (exprent) -> {
-+      List<StructMethod> methods = new ArrayList<>();
-+      if (exprent.type == Exprent.EXPRENT_VAR) {
-+        VarExprent var = (VarExprent)exprent;
-+        if (var.isClassDef()) {
-+          ClassNode child = DecompilerContext.getClassProcessor().getMapRootClasses().get(var.getVarType().getValue());
-+          if (child != null)
-+            methods.addAll(child.classStruct.getMethods());
-+        }
-+      }
-+      else if (exprent.type == Exprent.EXPRENT_NEW) {
-+        NewExprent _new = (NewExprent)exprent;
-+        if (_new.isAnonymous()) { //TODO: Check for Lambda here?
-+          ClassNode child = DecompilerContext.getClassProcessor().getMapRootClasses().get(_new.getNewType().getValue());
-+          if (child != null) {
-+            if (_new.isLambda()) {
-+              if (child.lambdaInformation.is_method_reference) {
-+                //methods.add(child.getWrapper().getClassStruct().getMethod(child.lambdaInformation.content_method_key));
-+              } else {
-+                methods.add(child.classStruct.getMethod(child.lambdaInformation.content_method_name, child.lambdaInformation.content_method_descriptor));
-+              }
-+            } else {
-+              methods.addAll(child.classStruct.getMethods());
-+            }
-+          }
-+        }
-+      }
-+
-+      for (StructMethod meth : methods) {
-+        meth.getVariableNamer().addParentContext(VarDefinitionHelper.this.mt.getVariableNamer());
-+      }
-+      return 0;
-+    });
-+
-+    if (mt.enclosedClasses != null) {
-+      for (String cls : mt.enclosedClasses) {
-+        StructClass cl = DecompilerContext.getStructContext().getClass(cls);
-+        for (StructMethod meth : cl.getMethods()) {
-+          meth.getVariableNamer().addParentContext(this.mt.getVariableNamer());
-+        }
-+      }
-+    }
-+
-     Map<VarVersionPair, LocalVariable> lvts = new HashMap<>();
- 
-     for (Entry<VarVersionPair, VarInfo> e : types.entrySet()) {
-@@ -851,7 +901,16 @@ public class VarDefinitionHelper {
-         continue;
-       }
-       LocalVariable lvt = e.getValue().getLVT();
-+      String rename = renames == null ? null : renames.get(idx);
-+
-+      if (rename != null) {
-+        varproc.setVarName(idx, rename);
-+      }
-+
-       if (lvt != null) {
-+        if (rename != null) {
-+          lvt = lvt.rename(rename);
-+        }
-         varproc.setVarLVT(idx, lvt);
-         lvts.put(idx, lvt);
-       }
-@@ -985,7 +1044,7 @@ public class VarDefinitionHelper {
- 
-     private VarInfo(LocalVariable lvt, VarType type) {
-       if (lvt != null && lvt.getSignature() != null)
--        this.cast = ExprProcessor.getCastTypeName(GenericType.parse(lvt.getSignature()), true, Collections.emptyList());
-+        this.cast = ExprProcessor.getCastTypeName(GenericType.parse(lvt.getSignature()), false, Collections.emptyList());
-       else if (lvt != null)
-         this.cast = ExprProcessor.getCastTypeName(lvt.getVarType(), false, Collections.emptyList());
-       else if (type != null)
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-index d48e950e7511d2a00ac9885d5dc7d4ff524bbb37..08efdbaa173380dbbc0cd30c5ec5d43b0c2cf074 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-@@ -4,6 +4,7 @@ package org.jetbrains.java.decompiler.struct;
- import org.jetbrains.java.decompiler.code.*;
- import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
-+import org.jetbrains.java.decompiler.main.extern.IVariableNameProvider;
- import org.jetbrains.java.decompiler.struct.attr.StructCodeAttribute;
- import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
- import org.jetbrains.java.decompiler.struct.attr.StructGenericSignatureAttribute;
-@@ -20,6 +21,7 @@ import java.io.IOException;
- import java.util.ArrayList;
- import java.util.List;
- import java.util.Map;
-+import java.util.Set;
- 
- import static org.jetbrains.java.decompiler.code.CodeConstants.*;
- 
-@@ -72,6 +74,8 @@ public class StructMethod extends StructMember {
-   private boolean expanded = false;
-   private final String classQualifiedName;
-   private final GenericMethodDescriptor signature;
-+  private IVariableNameProvider renamer;
-+  public Set<String> enclosedClasses; // Dirty hack, but the management of nested classes is trash.
- 
-   private StructMethod(int accessFlags,
-                        Map<String, StructGeneralAttribute> attributes,
-@@ -338,6 +342,17 @@ public class StructMethod extends StructMember {
-     return seq;
-   }
- 
-+  public IVariableNameProvider getVariableNamer() {
-+    if (renamer == null) {
-+      this.renamer = DecompilerContext.getNamingFactory().createFactory(this);
-+    }
-+    return renamer;
-+  }
-+
-+  public void clearVariableNamer() {
-+    this.renamer = null;
-+  }
-+
-   public StructLocalVariableTableAttribute getLocalVariableAttr() {
-     return getAttribute(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
-   }
-diff --git a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..15d798679efb2b6a14d93e665a5e2a2e1bc64102
---- /dev/null
-+++ b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
-@@ -0,0 +1,228 @@
-+/*
-+ * Copyright 2000-2017 JetBrains s.r.o.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+package org.jetbrains.java.decompiler.util;
-+
-+import java.util.ArrayList;
-+import java.util.Collections;
-+import java.util.HashMap;
-+import java.util.LinkedHashMap;
-+import java.util.List;
-+import java.util.Locale;
-+import java.util.Map;
-+import java.util.Map.Entry;
-+import java.util.regex.Pattern;
-+import java.util.stream.Collectors;
-+
-+import org.jetbrains.java.decompiler.code.CodeConstants;
-+import org.jetbrains.java.decompiler.main.extern.IVariableNameProvider;
-+import org.jetbrains.java.decompiler.main.extern.IVariableNamingFactory;
-+import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
-+import org.jetbrains.java.decompiler.struct.StructMethod;
-+import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
-+import org.jetbrains.java.decompiler.struct.gen.VarType;
-+
-+public class JADNameProvider implements IVariableNameProvider {
-+  private HashMap<String, Holder> last = null;
-+  private HashMap<String, String> remap = null;
-+  private final HashMap<Integer, String> parameters = new HashMap<>();
-+  private final StructMethod method;
-+  private final boolean renameParameters;
-+  private static final Pattern CAPS_START = Pattern.compile("^[A-Z]");
-+  private static final Pattern ARRAY = Pattern.compile("(\\[|\\.\\.\\.)");
-+
-+  public JADNameProvider(boolean renameParameters, StructMethod wrapper) {
-+    last = new HashMap<>();
-+    last.put("int",     new Holder(0, true,  "i", "j", "k", "l"));
-+    last.put("byte",    new Holder(0, false, "b"       ));
-+    last.put("char",    new Holder(0, false, "c"       ));
-+    last.put("short",   new Holder(1, false, "short"   ));
-+    last.put("boolean", new Holder(0, true,  "flag"    ));
-+    last.put("double",  new Holder(0, false, "d"       ));
-+    last.put("float",   new Holder(0, true,  "f"       ));
-+    last.put("File",    new Holder(1, true,  "file"    ));
-+    last.put("String",  new Holder(0, true,  "s"       ));
-+    last.put("Class",   new Holder(0, true,  "oclass"  ));
-+    last.put("Long",    new Holder(0, true,  "olong"   ));
-+    last.put("Byte",    new Holder(0, true,  "obyte"   ));
-+    last.put("Short",   new Holder(0, true,  "oshort"  ));
-+    last.put("Boolean", new Holder(0, true,  "obool"   ));
-+    last.put("Package", new Holder(0, true,  "opackage"));
-+    last.put("Enum",    new Holder(0, true,  "oenum"   ));
-+
-+    remap = new HashMap<>();
-+    remap.put("long", "int");
-+
-+    this.method = wrapper;
-+    this.renameParameters = renameParameters;
-+  }
-+
-+  @Override
-+  public synchronized void addParentContext(IVariableNameProvider iparent) {
-+    JADNameProvider parent = (JADNameProvider) iparent;
-+    HashMap<String, Holder> temp = new HashMap<>();
-+    for (Entry<String, Holder> e : parent.last.entrySet()) {
-+      temp.put(e.getKey(), e.getValue().copy());
-+    }
-+    this.last = temp;
-+    this.remap = new HashMap<>(parent.remap);
-+  }
-+
-+  private static class Holder {
-+    public int id;
-+    public boolean skip_zero;
-+    public final List<String> names = new ArrayList<>();
-+
-+    public Holder(int t1, boolean skip_zero, String... names) {
-+      this.id = t1;
-+      this.skip_zero = skip_zero;
-+      Collections.addAll(this.names, names);
-+    }
-+
-+    public Holder(int t1, boolean skip_zero, List<String> names) {
-+      this.id = t1;
-+      this.skip_zero = skip_zero;
-+      this.names.addAll(names);
-+    }
-+
-+    @Override
-+    public String toString() {
-+      return "Holder[" + id + ", " + skip_zero + ", " + names.stream().collect(Collectors.joining(", ")) + "]";
-+    }
-+
-+    public Holder copy() {
-+        return new Holder(this.id, this.skip_zero, new ArrayList<>(this.names));
-+    }
-+  }
-+
-+  @Override
-+  public Map<VarVersionPair,String> rename(Map<VarVersionPair, String> entries) {
-+    int params = 0;
-+    if ((this.method.getAccessFlags() & CodeConstants.ACC_STATIC) != CodeConstants.ACC_STATIC) {
-+      params++;
-+    }
-+
-+    MethodDescriptor md = MethodDescriptor.parseDescriptor(this.method.getDescriptor());
-+    for (VarType param : md.params) {
-+      params += param.getStackSize();
-+    }
-+
-+    List<VarVersionPair> keys = new ArrayList<>(entries.keySet());
-+    Collections.sort(keys, (o1, o2) -> (o1.var != o2.var) ? o1.var - o2.var : o1.version - o2.version);
-+
-+    Map<VarVersionPair, String> result = new LinkedHashMap<>();
-+    for (VarVersionPair ver : keys) {
-+      String type = cleanType(entries.get(ver));
-+      if ("this".equals(type)) {
-+        continue;
-+      }
-+      if (ver.var >= params) {
-+        result.put(ver, getNewName(type));
-+      } else if (renameParameters) {
-+        result.put(ver, this.parameters.computeIfAbsent(ver.var, k -> getNewName(type)));
-+      }
-+    }
-+    return result;
-+  }
-+
-+  private String cleanType(String type) {
-+     if (type.indexOf('<') != -1) {
-+        type = type.substring(0, type.indexOf('<'));
-+     }
-+     if (type.indexOf('.') != -1) {
-+        type = type.substring(type.lastIndexOf('.') + 1);
-+     }
-+     return type;
-+  }
-+
-+  protected synchronized String getNewName(String type) {
-+    String index = null;
-+    String findtype = type;
-+
-+    while (findtype.contains("[][]")) {
-+      findtype = findtype.replaceAll("\\[\\]\\[\\]", "[]");
-+    }
-+    if (last.containsKey(findtype)) {
-+      index = findtype;
-+    }
-+    else if (last.containsKey(findtype.toLowerCase(Locale.ENGLISH))) {
-+      index = findtype.toLowerCase(Locale.ENGLISH);
-+    }
-+    else if (remap.containsKey(type)) {
-+      index = remap.get(type);
-+    }
-+
-+    if ((index == null || index.length() == 0) && (CAPS_START.matcher(type).find() || ARRAY.matcher(type).find())) { // replace multi things with arrays.
-+      type = type.replace("...", "[]");
-+
-+      while (type.contains("[][]")) {
-+        type = type.replaceAll("\\[\\]\\[\\]", "[]");
-+      }
-+
-+      String name = type.toLowerCase(Locale.ENGLISH);
-+      // Strip single dots that might happen because of inner class references
-+      name = name.replace(".", "");
-+      boolean skip_zero = true;
-+
-+      if (Pattern.compile("\\[").matcher(type).find()) {
-+        skip_zero = true;
-+        name = "a" + name.replace("[]", "").replace("...", "");
-+      }
-+
-+      last.put(type.toLowerCase(Locale.ENGLISH), new Holder(0, skip_zero, name));
-+      index = type.toLowerCase(Locale.ENGLISH);
-+    }
-+
-+    if (index == null || index.length() == 0) {
-+      return type.toLowerCase(Locale.ENGLISH);
-+    }
-+
-+    Holder holder = last.get(index);
-+    int id = holder.id;
-+    List<String> names = holder.names;
-+
-+    int ammount = names.size();
-+
-+    String name;
-+    if (ammount == 1) {
-+      name = names.get(0) + (id == 0 && holder.skip_zero ? "" : id);
-+    }
-+    else {
-+      int num = id / ammount;
-+      name = names.get(id % ammount) + (id < ammount && holder.skip_zero ? "" : num);
-+    }
-+
-+    holder.id++;
-+    return name;
-+  }
-+
-+  @Override
-+  public String renameParameter(int flags, String type, String name, int index) {
-+     if (!this.renameParameters)
-+         return IVariableNameProvider.super.renameParameter(flags, type, name, index);
-+     return this.parameters.computeIfAbsent(index, k -> getNewName(cleanType(type)));
-+  }
-+
-+  public static class JADNameProviderFactory implements IVariableNamingFactory {
-+    private final boolean renameParameters;
-+    public JADNameProviderFactory(boolean renameParameters) {
-+        this.renameParameters = renameParameters;
-+    }
-+    @Override
-+    public IVariableNameProvider createFactory(StructMethod method) {
-+      return new JADNameProvider(renameParameters, method);
-+    }
-+  }
-+}
-diff --git a/src/org/jetbrains/java/decompiler/util/StatementIterator.java b/src/org/jetbrains/java/decompiler/util/StatementIterator.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..a41c910e58c3c0e16e6b13a90fe9f34acea09662
---- /dev/null
-+++ b/src/org/jetbrains/java/decompiler/util/StatementIterator.java
-@@ -0,0 +1,58 @@
-+/*
-+ * Copyright 2000-2017 JetBrains s.r.o.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+package org.jetbrains.java.decompiler.util;
-+
-+import java.util.List;
-+
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph.ExprentIterator;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
-+
-+public class StatementIterator {
-+  public static void iterate(Statement stat, ExprentIterator itr) {
-+    if (stat == null) {
-+      return;
-+    }
-+
-+    for (Exprent exp : stat.getVarDefinitions()) {
-+      iterate(exp, itr);
-+    }
-+
-+    if (stat.getExprents() == null) {
-+      for (Object obj : stat.getSequentialObjects()) {
-+        if (obj instanceof Statement) {
-+          iterate((Statement)obj, itr);
-+        }
-+        else if (obj instanceof Exprent) {
-+          iterate((Exprent)obj, itr);
-+        }
-+      }
-+    }
-+    else {
-+      for (Exprent exp : stat.getExprents()) {
-+        iterate(exp, itr);
-+      }
-+    }
-+  }
-+
-+  private static void iterate(Exprent exp, ExprentIterator itr) {
-+    List<Exprent> lst = exp.getAllExprents(true);
-+    lst.add(exp);
-+    for (Exprent exprent : lst) {
-+      itr.processExprent(exprent);
-+    }
-+  }
-+}
-diff --git a/test/org/jetbrains/java/decompiler/JADTest.java b/test/org/jetbrains/java/decompiler/JADTest.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..5348637179299ad07934495be8216583da36897b
---- /dev/null
-+++ b/test/org/jetbrains/java/decompiler/JADTest.java
-@@ -0,0 +1,36 @@
-+/*
-+ * Copyright 2000-2017 JetBrains s.r.o.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+package org.jetbrains.java.decompiler;
-+
-+import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
-+import org.junit.Test;
-+
-+import java.util.Map;
-+
-+public class JADTest extends SingleClassesTestBase {
-+
-+    @Override
-+    protected Map<String, String> getDecompilerOptions() {
-+      return Map.of(
-+        IFernflowerPreferences.BYTECODE_SOURCE_MAPPING, "1",
-+        IFernflowerPreferences.DUMP_ORIGINAL_LINES, "1",
-+        IFernflowerPreferences.USE_JAD_VARNAMING, "1"
-+      );
-+    }
-+
-+    @Test public void testClassFields() { doTest("pkg/TestJADNaming"); }
-+
-+}
-diff --git a/testData/classes/pkg/TestJADNaming.class b/testData/classes/pkg/TestJADNaming.class
-new file mode 100644
-index 0000000000000000000000000000000000000000..ce5676d7c337af79875dd42852333b71b071644c
-GIT binary patch
-literal 379
-zcmY+8J5Iwu5QhJ?*Iqvo93vSCkrYq`3fv&mgh&XK0zoJe(XWkVIS(faHdo*n$rY$T
-z6dZtxV{i(>*g;54F^~VB{dPXS-`)Y7pkYBpU0_SVVbD8imgZdswS9QUz%OR^F@tlR
-zW^uomhVf!3!wD(8S7Z@GeUQs&d?V+TOb`ZZFe?^O+)K-~?P2_oU!7m}<uuKb<B@!n
-zHE?JQ?tGm1|6GPf>H8CzCH`$VilZF+Q0Tfc6ws&8DC;z}s4}YB(F@o!H4K8Xz7Z)K
-zf2&XQ)FkiJRlho}_&js%*RJcV0>0N=!fbhb1(gSy8t6O_YG8Ppr!Qf7!ZXMz;YtPH
-nAtb1C3Em`R8x{iC75o6onnX>&Vidp{yD)#JjY3D+6|43GV%Iy?
-
-literal 0
-HcmV?d00001
-
-diff --git a/testData/results/TestJADNaming.dec b/testData/results/TestJADNaming.dec
-new file mode 100644
-index 0000000000000000000000000000000000000000..b5d7ed54d77cc30c25688e1989a5a63eafaf863f
---- /dev/null
-+++ b/testData/results/TestJADNaming.dec
-@@ -0,0 +1,81 @@
-+package pkg;
-+
-+public class TestJADNaming {
-+   public void Func() {
-+      short short1 = 1000;// 7
-+      short short2 = 2000;
-+      short short3 = 3000;
-+      short short4 = 4000;
-+      if (short1 != short2 && short3 == short4) {// 8
-+         ;
-+      }
-+
-+      boolean flag = true;// 9
-+      boolean flag1 = false;
-+      boolean flag2 = true;
-+      boolean flag3 = false;
-+      if (flag != flag1 && flag2 == flag3) {// 10
-+         ;
-+      }
-+
-+   }// 11
-+}
-+
-+class 'pkg/TestJADNaming' {
-+   method 'Func ()V' {
-+      0      4
-+      1      4
-+      2      4
-+      3      4
-+      4      5
-+      5      5
-+      6      5
-+      7      5
-+      8      6
-+      9      6
-+      a      6
-+      b      6
-+      c      7
-+      d      7
-+      e      7
-+      f      7
-+      10      7
-+      11      8
-+      12      8
-+      13      8
-+      16      8
-+      17      8
-+      18      8
-+      19      8
-+      1c      12
-+      1d      12
-+      1e      12
-+      1f      13
-+      20      13
-+      21      13
-+      22      14
-+      23      14
-+      24      14
-+      25      15
-+      26      15
-+      27      15
-+      28      16
-+      29      16
-+      2a      16
-+      2b      16
-+      2c      16
-+      2f      16
-+      30      16
-+      31      16
-+      32      16
-+      33      16
-+      36      20
-+   }
-+}
-+
-+Lines mapping:
-+7 <-> 5
-+8 <-> 9
-+9 <-> 13
-+10 <-> 17
-+11 <-> 21
-diff --git a/testData/src/pkg/TestJADNaming.java b/testData/src/pkg/TestJADNaming.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..87e1c035ea3a6fd049bb95ba09935cc674afacd4
---- /dev/null
-+++ b/testData/src/pkg/TestJADNaming.java
-@@ -0,0 +1,12 @@
-+package pkg;
-+
-+import java.io.File;
-+
-+public class TestJADNaming {
-+    public void Func() {
-+        int a = 1000, b = 2000, c = 3000, d = 4000;
-+        if (a == b || c == d);
-+        boolean flag1 = true, flag2 = false, flag3 = true, flag4 = false;
-+        if (flag1 == flag2 || flag3 == flag4);
-+    }
-+}
-\ No newline at end of file
diff --git a/FernFlower-Patches/0012-Fix-primitive-un-boxing-issues.patch b/FernFlower-Patches/0012-Fix-primitive-un-boxing-issues.patch
deleted file mode 100644
index 80cad44..0000000
--- a/FernFlower-Patches/0012-Fix-primitive-un-boxing-issues.patch
+++ /dev/null
@@ -1,1035 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Thu, 11 May 2017 03:24:33 -0700
-Subject: [PATCH] Fix primitive un/boxing issues.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-index e005b2941b4e76b736b8d00905726ac8500c3dc2..bc8c421206b44539c2f2da859658102f2b71af73 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-@@ -1027,12 +1027,14 @@ public class ExprProcessor implements CodeConstants {
- 
-     if (unbox) {
-       // "unbox" invocation parameters, e.g. 'byteSet.add((byte)123)' or 'new ShortContainer((short)813)'
--      if (exprent.type == Exprent.EXPRENT_INVOCATION && ((InvocationExprent)exprent).isBoxingCall()) {
--        InvocationExprent invocationExprent = (InvocationExprent)exprent;
--        exprent = invocationExprent.getParameters().get(0);
--        int paramType = invocationExprent.getDescriptor().params[0].getType();
--        if (exprent.type == Exprent.EXPRENT_CONST && ((ConstExprent)exprent).getConstType().getType() != paramType) {
--          leftType = new VarType(paramType);
-+      if (exprent.type == Exprent.EXPRENT_INVOCATION) {
-+        InvocationExprent invocationExprent = (InvocationExprent) exprent;
-+        if (invocationExprent.isBoxingCall() && !invocationExprent.shouldForceBoxing()) {
-+          exprent = invocationExprent.getParameters().get(0);
-+          int paramType = invocationExprent.getDescriptor().params[0].getType();
-+          if (exprent.type == Exprent.EXPRENT_CONST && ((ConstExprent) exprent).getConstType().getType() != paramType) {
-+            leftType = new VarType(paramType);
-+          }
-         }
-       }
-     }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-index f18ef04b350a5f6d4599282aef5ea3f6e3dce778..ec2d6931c9426913680fd2ec180483389d96ac4b 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-@@ -533,6 +533,19 @@ public class FunctionExprent extends Exprent {
-           .append(")");
-       default -> {
-         assert funcType <= FUNCTION_I2S;
-+        // We can't directly cast some object types, so we need to make sure the unboxing happens.
-+        // The types seem to be inconsistant but there is no harm in forcing the unboxing when not strictly needed.
-+        // Type   | Works | Doesn't
-+        // Integer| LFD   | BCS
-+        // Long   | FD    | I
-+        // Float  | D     | IL
-+        // Double |       | ILF
-+        if (lstOperands.get(0).type == Exprent.EXPRENT_INVOCATION) {
-+          InvocationExprent inv = (InvocationExprent)lstOperands.get(0);
-+          if (inv.isUnboxingCall()) {
-+            inv.forceUnboxing(true);
-+          }
-+        }
-         yield wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("(" + ExprProcessor.getTypeName(
-           TYPES[funcType - FUNCTION_I2L], Collections.emptyList()) + ")");
-       }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 2d8abaec74b301f76fcd4149600c1da72cc9b6c4..d51f0eba4a80cad4159a5135b2d87b8d405c0ed9 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-@@ -59,6 +59,8 @@ public class InvocationExprent extends Exprent {
-   private List<Exprent> parameters = new ArrayList<>();
-   private List<PooledConstant> bootstrapArguments;
-   private List<VarType> genericArgs = new ArrayList<>();
-+  private boolean forceBoxing = false;
-+  private boolean forceUnboxing = false;
- 
-   public InvocationExprent() {
-     super(EXPRENT_INVOCATION);
-@@ -256,10 +258,10 @@ public class InvocationExprent extends Exprent {
-     }
- 
-     if (isStatic) {
--      if (isBoxingCall() && canIgnoreBoxing) {
-+      if (isBoxingCall() && canIgnoreBoxing && !forceBoxing) {
-         // process general "boxing" calls, e.g. 'Object[] data = { true }' or 'Byte b = 123'
-         // here 'byte' and 'short' values do not need an explicit narrowing type cast
--        ExprProcessor.getCastedExprent(parameters.get(0), descriptor.params[0], buf, indent, false, false, false, false, tracer);
-+        ExprProcessor.getCastedExprent(parameters.get(0), descriptor.params[0], buf, indent, false, false, true, false, tracer);
-         return buf;
-       }
- 
-@@ -305,16 +307,36 @@ public class InvocationExprent extends Exprent {
-           TextUtil.writeQualifiedSuper(buf, super_qualifier);
-         }
-         else if (instance != null) {
--          TextBuffer res = instance.toJava(indent, tracer);
--
--          if (isUnboxingCall()) {
-+          VarType leftType = new VarType(CodeConstants.TYPE_OBJECT, 0, className);
-+          if (isUnboxingCall() && !forceUnboxing) {
-             // we don't print the unboxing call - no need to bother with the instance wrapping / casting
--            buf.append(res);
-+            if (instance.type == Exprent.EXPRENT_FUNCTION) {
-+              FunctionExprent func = (FunctionExprent)instance;
-+              if (func.getFuncType() == FunctionExprent.FUNCTION_CAST && func.getLstOperands().get(1).type == Exprent.EXPRENT_CONST) {
-+                ConstExprent _const = (ConstExprent)func.getLstOperands().get(1);
-+                boolean skipCast = false;
-+
-+                if (func.getLstOperands().get(0).type == Exprent.EXPRENT_VAR) {
-+                  VarType inferred = func.getLstOperands().get(0).getInferredExprType(leftType);
-+                  skipCast = inferred.getType() != CodeConstants.TYPE_OBJECT ||
-+                    DecompilerContext.getStructContext().instanceOf(inferred.getValue(), this.className);
-+                } else if (this.className.equals(_const.getConstType().getValue())) {
-+                  skipCast = true;
-+                }
-+
-+                if (skipCast) {
-+                  buf.append(func.getLstOperands().get(0).toJava(indent, tracer));
-+                  return buf;
-+                }
-+              }
-+            }
-+            buf.append(instance.toJava(indent, tracer));
-             return buf;
-           }
- 
-+          TextBuffer res = instance.toJava(indent, tracer);
-+
-           VarType rightType = instance.getExprType();
--          VarType leftType = new VarType(CodeConstants.TYPE_OBJECT, 0, className);
- 
-           if (rightType.equals(VarType.VARTYPE_OBJECT) && !leftType.equals(rightType)) {
-             buf.append("((").append(ExprProcessor.getCastTypeName(leftType, Collections.emptyList())).append(")");
-@@ -410,9 +432,88 @@ public class InvocationExprent extends Exprent {
-       }
-     }
- 
--    boolean firstParameter = true;
-     int start = isEnum ? 2 : 0;
-+    List<Exprent> parameters = new ArrayList<>(this.parameters);
-+    VarType[] types = Arrays.copyOf(descriptor.params, descriptor.params.length);
-     for (int i = start; i < parameters.size(); i++) {
-+      Exprent par = parameters.get(i);
-+      if (par.type == Exprent.EXPRENT_INVOCATION) {
-+          InvocationExprent inv = (InvocationExprent)par;
-+        // "unbox" invocation parameters, e.g. 'byteSet.add((byte)123)' or 'new ShortContainer((short)813)'
-+        //However, we must make sure we don't accidentally make the call ambiguous.
-+        //An example being List<Integer>, remove(Integer.valueOf(1)) and remove(1) are different functions
-+        if (inv.isBoxingCall()) {
-+          Exprent value = inv.parameters.get(0);
-+          types[i] = value.getExprType(); //Infer?
-+          //Unboxing in this case is lossy, so we need to explicitly set the type
-+          if (types[i].getTypeFamily() == CodeConstants.TYPE_FAMILY_INTEGER) {
-+            types[i] =
-+              "java/lang/Short".equals(inv.className) ? VarType.VARTYPE_SHORT :
-+              "java/lang/Byte".equals(inv.className) ? VarType.VARTYPE_BYTE :
-+              "java/lang/Integer".equals(inv.className) ? VarType.VARTYPE_INT :
-+               VarType.VARTYPE_CHAR;
-+          }
-+
-+          int count = 0;
-+          StructClass stClass = DecompilerContext.getStructContext().getClass(className);
-+          if (stClass != null) {
-+            nextMethod:
-+            for (StructMethod mt : stClass.getMethods()) {
-+              if (name.equals(mt.getName())) {
-+                MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
-+                if (md.params.length == descriptor.params.length) {
-+                  for (int x = 0; x < md.params.length; x++) {
-+                    if (md.params[x].getTypeFamily() != descriptor.params[x].getTypeFamily() &&
-+                        md.params[x].getTypeFamily() != types[x].getTypeFamily()) {
-+                      continue nextMethod;
-+                    }
-+                  }
-+                  count++;
-+                }
-+              }
-+            }
-+          }
-+
-+          if (count != matches.size()) { //We become more ambiguous? Lets keep the explicit boxing
-+            types[i] = descriptor.params[i];
-+            inv.forceBoxing = true;
-+          } else {
-+            value.addBytecodeOffsets(inv.bytecode); //Keep the bytecode for matching/debug
-+            parameters.set(i, value);
-+          }
-+        }
-+        // We also need to care about when things are intentionally unboxed to call a different overloaded method,
-+        //and skipping unboxing causes us to call ourselves.
-+        //  EXA:
-+        //  int compare(Integer a, Integer b) { return this.compare(a.intValue(), b.intValue()); }
-+        //  int compare(int a, int b) { return a - b; }
-+        //  Allowing the first function to unbox would cause infinite recursion
-+        // Right now it just do a quick check, but a proper check would be to do compiler like inference of argument
-+        // types, and check unboxing as needed. Currently it causes some false forces
-+        else if (inv.isUnboxingCall() && !inv.shouldForceUnboxing()) {
-+          StructClass stClass = DecompilerContext.getStructContext().getClass(className);
-+          if (stClass != null) {
-+            for (StructMethod mt : stClass.getMethods()) {
-+              if (name.equals(mt.getName()) && !stringDescriptor.equals(mt.getDescriptor())) {
-+                MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
-+                if (md.params.length == descriptor.params.length) {
-+                  if (md.params[i].getType() == CodeConstants.TYPE_OBJECT) {
-+                    if (DecompilerContext.getStructContext().instanceOf(inv.getInstance().getExprType().getValue(), md.params[i].getValue())) {
-+                      inv.forceUnboxing(true);
-+                      break;
-+                    }
-+                  }
-+                }
-+              }
-+            }
-+          }
-+        }
-+      }
-+    }
-+
-+
-+    boolean firstParameter = true;
-+    for (int i = start; i < this.parameters.size(); i++) {
-       if (mask == null || mask.get(i) == null) {
-         TextBuffer buff = new TextBuffer();
-         boolean ambiguous = setAmbiguousParameters.get(i);
-@@ -446,7 +547,7 @@ public class InvocationExprent extends Exprent {
-         */
- 
-         // 'byte' and 'short' literals need an explicit narrowing type cast when used as a parameter
--        ExprProcessor.getCastedExprent(parameters.get(i), descriptor.params[i], buff, indent, true, ambiguous, true, true, tracer);
-+        ExprProcessor.getCastedExprent(this.parameters.get(i), types[i], buff, indent, true, ambiguous, true, true, tracer);
- 
-         // the last "new Object[0]" in the vararg call is not printed
-         if (buff.length() > 0) {
-@@ -499,7 +600,7 @@ public class InvocationExprent extends Exprent {
-         }
- 
-         if (paramType == CodeConstants.TYPE_BYTECHAR || paramType == CodeConstants.TYPE_SHORTCHAR) {
--          if (className.equals("java/lang/Character")) {
-+          if (className.equals("java/lang/Character") || className.equals("java/lang/Short")) {
-             return true;
-           }
-         }
-@@ -550,6 +651,18 @@ public class InvocationExprent extends Exprent {
-     return !isStatic && parameters.size() == 0 && className.equals(UNBOXING_METHODS.get(name));
-   }
- 
-+  public boolean shouldForceBoxing() {
-+    return forceBoxing;
-+  }
-+
-+  public void forceUnboxing(boolean value) {
-+    this.forceUnboxing = value;
-+  }
-+
-+  public boolean shouldForceUnboxing() {
-+    return this.forceUnboxing;
-+  }
-+
-   private List<StructMethod> getMatchedDescriptors() {
-     List<StructMethod> matches = new ArrayList<>();
-     StructClass cl = DecompilerContext.getStructContext().getClass(className);
-@@ -579,6 +692,8 @@ public class InvocationExprent extends Exprent {
-       return EMPTY_BIT_SET;
-     }
- 
-+    BitSet missed = new BitSet(parameters.size());
-+
-     // check if a call is unambiguous
-     StructMethod mt = cl.getMethod(InterpreterUtil.makeUniqueKey(name, stringDescriptor));
-     if (mt != null) {
-@@ -588,18 +703,50 @@ public class InvocationExprent extends Exprent {
-         for (int i = 0; i < md.params.length; i++) {
-           if (!md.params[i].equals(parameters.get(i).getExprType())) {
-             exact = false;
--            break;
-+            missed.set(i);
-           }
-         }
-         if (exact) return EMPTY_BIT_SET;
-       }
-     }
- 
-+    List<StructMethod> mtds = new ArrayList<>();
-+    for (StructMethod mtt : matches) {
-+      boolean failed = false;
-+      MethodDescriptor md = MethodDescriptor.parseDescriptor(mtt.getDescriptor());
-+      for (int i = 0; i < parameters.size(); i++) {
-+        VarType ptype = parameters.get(i).getExprType();
-+        if (!missed.get(i)) {
-+          if (!md.params[i].equals(ptype)) {
-+            failed = true;
-+            break;
-+          }
-+        }
-+        else {
-+          if (md.params[i].getType() == CodeConstants.TYPE_OBJECT) {
-+            if (ptype.getType() != CodeConstants.TYPE_NULL) {
-+              if (!DecompilerContext.getStructContext().instanceOf(ptype.getValue(), md.params[i].getValue())) {
-+                failed = true;
-+                break;
-+              }
-+            }
-+          }
-+        }
-+      }
-+      if (!failed) {
-+        mtds.add(mtt);
-+      }
-+    }
-+    //TODO: This still causes issues in the case of:
-+    //add(Object)
-+    //add(Object...)
-+    //Try and detect varargs/array?
-+
-     // mark parameters
-     BitSet ambiguous = new BitSet(descriptor.params.length);
-     for (int i = 0; i < descriptor.params.length; i++) {
-       VarType paramType = descriptor.params[i];
--      for (StructMethod mtt : matches) {
-+      for (StructMethod mtt : mtds) {
- 
-         GenericMethodDescriptor gen = mtt.getSignature(); //TODO: Find synthetic flags for params, as Enum generic signatures do no contain the String,int params
-         if (gen != null && gen.parameterTypes.size() > i && gen.parameterTypes.get(i).isGeneric()) {
-diff --git a/testData/results/TestPrimitives.dec b/testData/results/TestPrimitives.dec
-index dcbf031b69cc65b108a2cba8f894d02027372032..0f74573b4b8df58023a80b059dcf6930fd08fabf 100644
---- a/testData/results/TestPrimitives.dec
-+++ b/testData/results/TestPrimitives.dec
-@@ -3,6 +3,26 @@ package pkg;
- import java.util.HashMap;
- 
- public class TestPrimitives {
-+   private void testInvalidUnboxing() {
-+      List<Integer> lst = null;// 7
-+      lst.remove(Integer.valueOf(0));// 8
-+      this.genericBoxing((short)0);// 9
-+      int a = this.genericReturn(lst);// 10
-+      List<Byte> b = null;// 11
-+      this.genericParameter(b, (byte)0);// 12
-+      this.genericParameter(lst, 0);// 13
-+   }// 14
-+
-+   private <T> void genericBoxing(T value) {
-+   }// 16
-+
-+   private <T> T genericReturn(List<T> value) {
-+      return value.get(0);// 17
-+   }
-+
-+   private <T> void genericParameter(List<T> p, T v) {
-+   }// 18
-+
-    public void printAll() {
-       this.printBoolean(true);// 8
-       this.printByte((byte)123);// 9
-@@ -171,179 +191,498 @@ public class TestPrimitives {
- }
- 
- class 'pkg/TestPrimitives' {
--   method 'printAll ()V' {
--      0      4
--      1      4
--      2      4
--      3      4
--      4      4
--      5      5
--      6      5
--      7      5
--      8      5
--      9      5
--      a      5
--      b      6
--      c      6
--      d      6
--      e      6
--      f      6
--      10      6
--      11      6
--      12      7
--      13      7
--      14      7
--      15      7
--      16      7
--      17      7
--      18      8
--      19      8
--      1a      8
--      1b      8
--      1c      8
--      1d      8
--      1e      8
-+   method 'testInvalidUnboxing ()V' {
-+      0      6
-+      1      6
-+      2      7
-+      3      7
-+      4      7
-+      5      7
-+      6      7
-+      7      7
-+      8      7
-+      9      7
-+      a      7
-+      b      7
-+      d      8
-+      e      8
-+      f      8
-+      10      8
-+      11      8
-+      12      8
-+      13      8
-+      14      8
-+      15      9
-+      16      9
-+      17      9
-+      18      9
-+      19      9
-+      1d      9
-+      1e      9
-       1f      9
-       20      9
--      21      9
--      22      9
--      23      9
--      24      9
--      25      10
--      26      10
--      27      10
--      28      10
--      29      10
--      2a      10
--      2b      10
--      2c      11
--      2d      11
--      2e      11
--      2f      11
--      30      11
--      31      11
-+      21      10
-+      22      10
-+      23      11
-+      24      11
-+      25      11
-+      26      11
-+      27      11
-+      28      11
-+      29      11
-+      2a      11
-+      2b      11
-+      2c      12
-+      2d      12
-+      2e      12
-+      2f      12
-+      30      12
-+      31      12
-       32      12
-       33      12
--      37      12
--      3b      13
--      40      13
--      44      14
--      4a      14
--      4e      15
--      52      15
--      56      16
--      5b      16
--      5f      17
--      65      17
--      69      18
--      6e      18
--      72      19
--      78      19
--      7c      20
--      81      20
--      85      21
--      87      21
--      8a      21
--      8d      21
--      91      22
--      93      22
--      96      22
--      99      22
--      9d      23
--      9f      23
--      a2      23
--      a5      23
--      a9      24
--      ab      24
--      ae      24
--      b1      24
--      b5      25
--      b7      25
--      ba      25
--      bd      25
--      c1      26
--      c3      26
--      c6      26
--      c9      26
--      cd      27
--      cf      27
--      d2      27
--      d5      27
--      dd      28
--      e2      28
--      e5      28
--      ea      29
--      ed      29
--      f0      29
--      f5      30
--      f8      30
--      fb      30
--      fe      31
--      101      31
--      10a      31
--      10b      31
--      111      31
--      112      31
--      118      31
--      11b      31
--      121      31
--      123      31
--      129      31
--      12b      31
--      131      31
--      134      31
--      138      31
--      13c      32
--      13f      32
--      148      32
--      14b      32
--      152      32
--      155      32
--      15c      32
--      15f      32
--      166      32
--      169      32
--      16d      32
--      175      33
--      176      33
--      178      33
--      17b      33
--      17d      33
--      180      33
--      182      33
--      185      33
--      18f      34
--      194      34
--      19a      34
--      19f      34
--      1a5      34
--      1aa      34
--      1b0      34
--      1b5      34
--      1c1      35
--      1c3      35
--      1c6      35
--      1c9      35
--      1cb      35
--      1ce      35
--      1d1      35
--      1d3      35
--      1d6      35
--      1d9      35
--      1db      35
--      1de      35
--      1e1      35
--      1e3      35
--      1e6      35
--      1e9      35
--      1eb      35
--      1ee      35
--      1f1      35
--      1f3      35
--      1f6      35
--      1fd      35
--      202      35
--      209      36
-+      34      12
-+      35      13
-+   }
-+
-+   method 'genericBoxing (Ljava/lang/Object;)V' {
-+      0      16
-+   }
-+
-+   method 'genericReturn (Ljava/util/List;)Ljava/lang/Object;' {
-+      0      19
-+      1      19
-+      2      19
-+      3      19
-+      4      19
-+      5      19
-+      6      19
-+      7      19
-+   }
-+
-+   method 'genericParameter (Ljava/util/List;Ljava/lang/Object;)V' {
-+      0      23
-+   }
-+
-+   method 'printAll ()V' {
-+      0      26
-+      1      26
-+      2      26
-+      3      26
-+      4      26
-+      5      27
-+      6      27
-+      7      27
-+      8      27
-+      9      27
-+      a      27
-+      b      28
-+      c      28
-+      d      28
-+      e      28
-+      f      28
-+      10      28
-+      11      28
-+      12      29
-+      13      29
-+      14      29
-+      15      29
-+      16      29
-+      17      29
-+      18      30
-+      19      30
-+      1a      30
-+      1b      30
-+      1c      30
-+      1d      30
-+      1e      30
-+      1f      31
-+      20      31
-+      21      31
-+      22      31
-+      23      31
-+      24      31
-+      25      32
-+      26      32
-+      27      32
-+      28      32
-+      29      32
-+      2a      32
-+      2b      32
-+      2c      33
-+      2d      33
-+      2e      33
-+      2f      33
-+      30      33
-+      31      33
-+      32      34
-+      33      34
-+      34      34
-+      35      34
-+      36      34
-+      37      34
-+      38      34
-+      39      34
-+      3a      35
-+      3b      35
-+      3c      35
-+      3d      35
-+      3e      35
-+      3f      35
-+      40      35
-+      41      35
-+      42      35
-+      43      36
-+      44      36
-+      45      36
-+      46      36
-+      47      36
-+      48      36
-+      49      36
-+      4a      36
-+      4b      36
-+      4c      36
-+      4d      37
-+      4e      37
-+      4f      37
-+      50      37
-+      51      37
-+      52      37
-+      53      37
-+      54      37
-+      55      38
-+      56      38
-+      57      38
-+      58      38
-+      59      38
-+      5a      38
-+      5b      38
-+      5c      38
-+      5d      38
-+      5e      39
-+      5f      39
-+      60      39
-+      61      39
-+      62      39
-+      63      39
-+      64      39
-+      65      39
-+      66      39
-+      67      39
-+      68      40
-+      69      40
-+      6a      40
-+      6b      40
-+      6c      40
-+      6d      40
-+      6e      40
-+      6f      40
-+      70      40
-+      71      41
-+      72      41
-+      73      41
-+      74      41
-+      75      41
-+      76      41
-+      77      41
-+      78      41
-+      79      41
-+      7a      41
-+      7b      42
-+      7c      42
-+      7d      42
-+      7e      42
-+      7f      42
-+      80      42
-+      81      42
-+      82      42
-+      83      42
-+      84      43
-+      85      43
-+      86      43
-+      87      43
-+      88      43
-+      89      43
-+      8a      43
-+      8b      43
-+      8c      43
-+      8d      43
-+      8e      43
-+      8f      43
-+      90      44
-+      91      44
-+      92      44
-+      93      44
-+      94      44
-+      95      44
-+      96      44
-+      97      44
-+      98      44
-+      99      44
-+      9a      44
-+      9b      44
-+      9c      45
-+      9d      45
-+      9e      45
-+      9f      45
-+      a0      45
-+      a1      45
-+      a2      45
-+      a3      45
-+      a4      45
-+      a5      45
-+      a6      45
-+      a7      45
-+      a8      46
-+      a9      46
-+      aa      46
-+      ab      46
-+      ac      46
-+      ad      46
-+      ae      46
-+      af      46
-+      b0      46
-+      b1      46
-+      b2      46
-+      b3      46
-+      b4      47
-+      b5      47
-+      b6      47
-+      b7      47
-+      b8      47
-+      b9      47
-+      ba      47
-+      bb      47
-+      bc      47
-+      bd      47
-+      be      47
-+      bf      47
-+      c0      48
-+      c1      48
-+      c2      48
-+      c3      48
-+      c4      48
-+      c5      48
-+      c6      48
-+      c7      48
-+      c8      48
-+      c9      48
-+      ca      48
-+      cb      48
-+      cc      49
-+      cd      49
-+      ce      49
-+      cf      49
-+      d0      49
-+      d1      49
-+      d2      49
-+      d3      49
-+      d4      49
-+      d5      49
-+      d6      49
-+      d7      49
-+      d8      50
-+      dd      50
-+      de      50
-+      e2      50
-+      e3      50
-+      e4      50
-+      e5      50
-+      e6      50
-+      e7      50
-+      e8      51
-+      e9      51
-+      ea      51
-+      eb      51
-+      ec      51
-+      ed      51
-+      ee      51
-+      ef      51
-+      f0      51
-+      f1      51
-+      f2      51
-+      f3      52
-+      f4      52
-+      f5      52
-+      f6      52
-+      f7      52
-+      f8      52
-+      f9      52
-+      fa      52
-+      fb      52
-+      fc      52
-+      fd      52
-+      fe      53
-+      ff      53
-+      100      53
-+      101      53
-+      102      53
-+      10a      53
-+      10b      53
-+      10c      53
-+      10d      53
-+      111      53
-+      112      53
-+      113      53
-+      114      53
-+      118      53
-+      119      53
-+      11a      53
-+      11b      53
-+      11c      53
-+      11d      53
-+      121      53
-+      122      53
-+      123      53
-+      124      53
-+      125      53
-+      129      53
-+      12a      53
-+      12b      53
-+      12c      53
-+      12d      53
-+      131      53
-+      132      53
-+      133      53
-+      134      53
-+      135      53
-+      136      53
-+      138      53
-+      139      53
-+      13a      53
-+      13c      54
-+      13d      54
-+      13e      54
-+      13f      54
-+      140      54
-+      147      54
-+      148      54
-+      149      54
-+      14a      54
-+      14b      54
-+      14c      54
-+      14d      54
-+      151      54
-+      152      54
-+      153      54
-+      154      54
-+      155      54
-+      156      54
-+      157      54
-+      15b      54
-+      15c      54
-+      15d      54
-+      15e      54
-+      15f      54
-+      160      54
-+      161      54
-+      165      54
-+      166      54
-+      167      54
-+      168      54
-+      169      54
-+      16a      54
-+      16b      54
-+      16d      54
-+      16e      54
-+      16f      54
-+      175      55
-+      176      55
-+      177      55
-+      178      55
-+      179      55
-+      17a      55
-+      17b      55
-+      17c      55
-+      17d      55
-+      17e      55
-+      17f      55
-+      180      55
-+      181      55
-+      182      55
-+      183      55
-+      184      55
-+      185      55
-+      186      55
-+      18f      56
-+      190      56
-+      194      56
-+      195      56
-+      196      56
-+      19a      56
-+      19b      56
-+      19f      56
-+      1a0      56
-+      1a1      56
-+      1a5      56
-+      1a6      56
-+      1aa      56
-+      1ab      56
-+      1ac      56
-+      1b0      56
-+      1b1      56
-+      1b5      56
-+      1c1      57
-+      1c2      57
-+      1c3      57
-+      1c4      57
-+      1c5      57
-+      1c6      57
-+      1c7      57
-+      1c8      57
-+      1c9      57
-+      1ca      57
-+      1cb      57
-+      1cc      57
-+      1cd      57
-+      1ce      57
-+      1cf      57
-+      1d0      57
-+      1d1      57
-+      1d2      57
-+      1d3      57
-+      1d4      57
-+      1d5      57
-+      1d6      57
-+      1d7      57
-+      1d8      57
-+      1d9      57
-+      1da      57
-+      1db      57
-+      1dc      57
-+      1dd      57
-+      1de      57
-+      1df      57
-+      1e0      57
-+      1e1      57
-+      1e2      57
-+      1e3      57
-+      1e4      57
-+      1e5      57
-+      1e6      57
-+      1e7      57
-+      1e8      57
-+      1e9      57
-+      1ea      57
-+      1eb      57
-+      1ec      57
-+      1ed      57
-+      1ee      57
-+      1ef      57
-+      1f0      57
-+      1f1      57
-+      1f2      57
-+      1f3      57
-+      1f4      57
-+      1f5      57
-+      1f6      57
-+      1f7      57
-+      1f8      57
-+      1fd      57
-+      1fe      57
-+      202      57
-+      203      57
-+      204      57
-+      209      58
-    }
- 
-    method '<init> (ZBSIJFDC)V' {
-diff --git a/testData/src/pkg/TestPrimitives.java b/testData/src/pkg/TestPrimitives.java
-index 36302524a2ecfae64e25098eff1318b8b7d11d51..acfe886bf4578fe0cd0b1a58bf4073eb97436025 100644
---- a/testData/src/pkg/TestPrimitives.java
-+++ b/testData/src/pkg/TestPrimitives.java
-@@ -3,6 +3,19 @@ package pkg;
- import java.util.*;
- 
- public class TestPrimitives {
-+  private void testInvalidUnboxing() {
-+    List<Integer> lst = null;
-+    lst.remove(Integer.valueOf(0));
-+    this.<Short>genericBoxing((short)0);
-+    int a = genericReturn(lst);
-+    List<Byte> b = null;
-+    this.genericParameter(b, (byte)0);
-+    this.genericParameter(lst, 0);
-+  }
-+
-+  private <T> void genericBoxing(T value) {}
-+  private <T> T genericReturn(List<T> value) { return value.get(0); }
-+  private <T> void genericParameter(List<T> p, T v) {}
- 
-   public void printAll() {
-     printBoolean(true);
diff --git a/FernFlower-Patches/0012-Some-synthetic-anon-classes-are-being-detected-as-me.patch b/FernFlower-Patches/0012-Some-synthetic-anon-classes-are-being-detected-as-me.patch
new file mode 100644
index 0000000..def67bb
--- /dev/null
+++ b/FernFlower-Patches/0012-Some-synthetic-anon-classes-are-being-detected-as-me.patch
@@ -0,0 +1,26 @@
+From 4e2882cb40ea460cb1f4a22c85a017cd853b308c Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sun, 2 Aug 2015 21:14:56 -0700
+Subject: [PATCH 012/122] Some synthetic anon classes are being detected as
+ member classes. Unknown why, however this fixes the consturctor argument.
+
+---
+ .../java/decompiler/modules/decompiler/exps/NewExprent.java     | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+index 6dad7c9..0297a55 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+@@ -327,7 +327,7 @@ public class NewExprent extends Exprent {
+ 
+                 if (i == lstParameters.size() - 1 && expr.getExprType() == VarType.VARTYPE_NULL) {
+                   ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(leftType.value);
+-                  if (node != null && node.type == ClassNode.CLASS_ANONYMOUS) {
++                  if (node != null && (node.namelessConstructorStub || node.type == ClassNode.CLASS_ANONYMOUS)) {
+                     break;  // skip last parameter of synthetic constructor call
+                   }
+                 }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0013-Add-Minecraft-test-framework.patch b/FernFlower-Patches/0013-Add-Minecraft-test-framework.patch
deleted file mode 100644
index 1b26401..0000000
--- a/FernFlower-Patches/0013-Add-Minecraft-test-framework.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Wed, 19 Apr 2017 01:59:28 -0700
-Subject: [PATCH] Add Minecraft test framework
-
-
-diff --git a/test/org/jetbrains/java/decompiler/MinecraftTest.java b/test/org/jetbrains/java/decompiler/MinecraftTest.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..1f9a9dd03dab30cdb464bfc4901b9c592d558b8f
---- /dev/null
-+++ b/test/org/jetbrains/java/decompiler/MinecraftTest.java
-@@ -0,0 +1,136 @@
-+package org.jetbrains.java.decompiler;
-+
-+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-+
-+import java.io.File;
-+import java.io.IOException;
-+import java.nio.file.Files;
-+import java.util.HashMap;
-+import java.util.List;
-+import java.util.Map;
-+import java.util.Map.Entry;
-+
-+import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
-+import org.jetbrains.java.decompiler.main.decompiler.PrintStreamLogger;
-+import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
-+import org.junit.Test;
-+
-+import com.google.gson.Gson;
-+import com.google.gson.GsonBuilder;
-+
-+public class MinecraftTest extends SingleClassesTestBase {
-+  private static final String MC_PATH = "Z:\\Projects\\MCP\\BlueMining\\mcp_update\\new";
-+  private static final Map<String, String> RESULTS = new HashMap<>();
-+  private static final Gson GSON = new GsonBuilder().create();
-+
-+  @Override
-+  protected Map<String, String> getDecompilerOptions() {
-+    return Map.of(
-+      IFernflowerPreferences.DECOMPILE_INNER,"1",
-+      IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES,"1",
-+      IFernflowerPreferences.ASCII_STRING_CHARACTERS,"1",
-+      IFernflowerPreferences.LOG_LEVEL, "TRACE",
-+      IFernflowerPreferences.REMOVE_SYNTHETIC, "1",
-+      IFernflowerPreferences.REMOVE_BRIDGE, "1",
-+      IFernflowerPreferences.USE_DEBUG_VAR_NAMES, "1",
-+      IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH, "1"
-+    );
-+  }
-+
-+  @Override
-+  public void setUp() throws IOException {
-+    fixture = new DecompilerTestFixture() {
-+      private ConsoleDecompiler decompiler;
-+
-+      @Override
-+      public void setUp(Map<String, String> customOptions) throws IOException {
-+        File tempDir = File.createTempFile("decompiler_test_", "_dir");
-+        assertThat(tempDir.delete()).isTrue();
-+
-+        File targetDir = new File(tempDir, "decompiled");
-+        assertThat(targetDir.mkdirs()).isTrue();
-+
-+        Map<String, Object> options = new HashMap<>();
-+        options.put(IFernflowerPreferences.LOG_LEVEL, "warn");
-+        options.put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES, "1");
-+        options.put(IFernflowerPreferences.REMOVE_SYNTHETIC, "1");
-+        options.put(IFernflowerPreferences.REMOVE_BRIDGE, "1");
-+        options.put(IFernflowerPreferences.LITERALS_AS_IS, "1");
-+        options.put(IFernflowerPreferences.UNIT_TEST_MODE, "1");
-+        options.putAll(customOptions);
-+        decompiler = new ConsoleDecompiler(targetDir, options, new PrintStreamLogger(System.out)) {
-+          @Override
-+          public void saveClassFile(String path, String qualifiedName, String entryName, String content, int[] mapping) {
-+            RESULTS.put(path, content);
-+          }
-+
-+          @Override
-+          public void saveClassEntry(String path, String archiveName, String qualifiedName, String entryName, String content) {
-+            RESULTS.put(qualifiedName, content);
-+          }
-+        };
-+      }
-+
-+      @Override
-+      public ConsoleDecompiler getDecompiler() {
-+        return decompiler;
-+      }
-+    };
-+    fixture.setUp(getDecompilerOptions());
-+    fixture.setCleanup(false);
-+  }
-+
-+  @Override
-+  protected void doTest(String testFile, String... companionFiles) {
-+    File MC_JAR = new File(MC_PATH);
-+    if (!MC_JAR.exists()) {
-+      return;
-+    }
-+
-+    RESULTS.clear();
-+
-+    ConsoleDecompiler decompiler = fixture.getDecompiler();
-+    if (MC_JAR.isDirectory()) {
-+      //decompiler.addSpace(new File(MC_JAR, "jars\\libraries"), false);
-+      gatherLibraries(decompiler);
-+      decompiler.addSource(new File(MC_JAR, "temp\\minecraft_ff_in.jar"));
-+    }
-+    else {
-+      decompiler.addSource(MC_JAR);
-+    }
-+    decompiler.decompileContext();
-+
-+    for (Entry<String, String> entry : RESULTS.entrySet()) {
-+      if (!entry.getKey().startsWith(testFile)) {
-+        continue;
-+      }
-+      System.out.println(entry.getKey());
-+      System.out.println(entry.getValue());
-+    }
-+  }
-+
-+  @SuppressWarnings("unchecked")
-+  private void gatherLibraries(ConsoleDecompiler decompiler) {
-+    try {
-+      String version = null;
-+      for (String line : Files.readAllLines(new File(MC_PATH, "conf/version.cfg").toPath())) {
-+        if (line.startsWith("ClientVersion")) {
-+          version = line.split(" ")[2];
-+        }
-+      }
-+      String data = new String(Files.readAllBytes(new File(MC_PATH, "jars/versions/" + version + "/" + version + ".json").toPath()));
-+      List<Map<String, Object>> libs = (List<Map<String, Object>>)GSON.fromJson(data, Map.class).get("libraries");
-+
-+      for (Map<String, Object> e : libs) {
-+        String path = ((Map<String, Map<String, String>>)e.get("downloads")).get("artifact").get("path");
-+        File lib = new File(MC_PATH, "jars/libraries/" + path);
-+        decompiler.addLibrary(lib);
-+      }
-+    } catch (Exception e) {
-+      throw new RuntimeException(e);
-+    }
-+  }
-+
-+  @Test public void testWoodlandMansionPieces() { doTest("net/minecraft/world/gen/structure/WoodlandMansionPieces"); }
-+  @Test public void testEntityPlayer() { doTest("net/minecraft/command/impl/SeedCommand"); }
-+}
diff --git a/FernFlower-Patches/0013-Fixed-last-test-all-tests-pass.patch b/FernFlower-Patches/0013-Fixed-last-test-all-tests-pass.patch
new file mode 100644
index 0000000..bde73fa
--- /dev/null
+++ b/FernFlower-Patches/0013-Fixed-last-test-all-tests-pass.patch
@@ -0,0 +1,74 @@
+From 089ba9f7ecc59787de6f28b51cbfc8ee077caf6c Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sun, 2 Aug 2015 21:20:47 -0700
+Subject: [PATCH 013/122] Fixed last test, all tests pass.
+
+---
+ .../TestClassSimpleBytecodeMapping.dec        | 24 +++++++++----------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/testData/results/TestClassSimpleBytecodeMapping.dec b/testData/results/TestClassSimpleBytecodeMapping.dec
+index a48375a..1a2532f 100644
+--- a/testData/results/TestClassSimpleBytecodeMapping.dec
++++ b/testData/results/TestClassSimpleBytecodeMapping.dec
+@@ -33,17 +33,17 @@ public class TestClassSimpleBytecodeMapping {
+       var1.run();// 49
+    }// 50
+ 
+-   public class InnerClass2 {
+-      public void print() {
+-         System.out.println("Inner2");// 54
+-      }// 55
+-   }
+-
+    public class InnerClass {
+       public void print() {
+          System.out.println("Inner");// 44
+       }// 45
+    }
++
++   public class InnerClass2 {
++      public void print() {
++         System.out.println("Inner2");// 54
++      }// 55
++   }
+ }
+ 
+ class 'pkg/TestClassSimpleBytecodeMapping$1' {
+@@ -96,7 +96,7 @@ class 'pkg/TestClassSimpleBytecodeMapping' {
+    }
+ }
+ 
+-class 'pkg/TestClassSimpleBytecodeMapping$InnerClass2' {
++class 'pkg/TestClassSimpleBytecodeMapping$InnerClass' {
+    method 'print ()V' {
+       0      37
+       3      37
+@@ -105,7 +105,7 @@ class 'pkg/TestClassSimpleBytecodeMapping$InnerClass2' {
+    }
+ }
+ 
+-class 'pkg/TestClassSimpleBytecodeMapping$InnerClass' {
++class 'pkg/TestClassSimpleBytecodeMapping$InnerClass2' {
+    method 'print ()V' {
+       0      43
+       3      43
+@@ -130,11 +130,11 @@ Lines mapping:
+ 36 <-> 25
+ 38 <-> 27
+ 40 <-> 30
+-44 <-> 44
+-45 <-> 45
++44 <-> 38
++45 <-> 39
+ 49 <-> 33
+ 50 <-> 34
+-54 <-> 38
+-55 <-> 39
++54 <-> 44
++55 <-> 45
+ Not mapped:
+ 39
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0014-Fix-how-class-types-are-determined-was-detecting-ano.patch b/FernFlower-Patches/0014-Fix-how-class-types-are-determined-was-detecting-ano.patch
new file mode 100644
index 0000000..eb7efd6
--- /dev/null
+++ b/FernFlower-Patches/0014-Fix-how-class-types-are-determined-was-detecting-ano.patch
@@ -0,0 +1,197 @@
+From eeabc2fd9d388a3361b0ec89733add20e4ade8a6 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Mon, 3 Aug 2015 15:07:46 -0700
+Subject: [PATCH 014/122] Fix how class types are determined, was detecting
+ anon classes as member classes.
+
+---
+ .../decompiler/main/ClassesProcessor.java     | 48 ++++++++++----
+ .../attr/StructInnerClassesAttribute.java     | 62 +++++++++++--------
+ 2 files changed, 70 insertions(+), 40 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+index b3e9d81..7f75a0c 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+@@ -31,7 +31,10 @@ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+ import org.jetbrains.java.decompiler.struct.StructClass;
+ import org.jetbrains.java.decompiler.struct.StructContext;
+ import org.jetbrains.java.decompiler.struct.StructMethod;
++import org.jetbrains.java.decompiler.struct.attr.StructEnclosingMethodAttribute;
++import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
+ import org.jetbrains.java.decompiler.struct.attr.StructInnerClassesAttribute;
++import org.jetbrains.java.decompiler.struct.attr.StructInnerClassesAttribute.InnerClassInfo;
+ import org.jetbrains.java.decompiler.struct.gen.VarType;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ 
+@@ -62,18 +65,37 @@ public class ClassesProcessor {
+           StructInnerClassesAttribute inner = (StructInnerClassesAttribute)cl.getAttributes().getWithKey("InnerClasses");
+           if (inner != null) {
+ 
+-            for (int i = 0; i < inner.getClassEntries().size(); i++) {
+-
+-              int[] entry = inner.getClassEntries().get(i);
+-              String[] strEntry = inner.getStringEntries().get(i);
++            for (InnerClassInfo entry : inner.getEntries()) {
+               Object[] arr = new Object[4]; // arr[0] not used
+-              String innerName = strEntry[0];
++              String innerName = entry.inner_class;
+ 
+               // nested class type
+-              arr[2] = entry[1] == 0 ? (entry[2] == 0 ? ClassNode.CLASS_ANONYMOUS : ClassNode.CLASS_LOCAL) : ClassNode.CLASS_MEMBER;
++              if (entry.inner_class != null) {
++                if (entry.inner_name == null) {
++                  arr[2] = ClassNode.CLASS_ANONYMOUS;
++                }
++                else {
++                  StructClass in = context.getClass(entry.inner_class);
++                  if (in == null) { // A referenced library that was not added to the context, make assumptions
++                    arr[2] = ClassNode.CLASS_MEMBER;
++                  }
++                  else {
++                    StructEnclosingMethodAttribute attr = (StructEnclosingMethodAttribute)in.getAttributes().getWithKey("EnclosingMethod");
++                    if (attr != null && attr.getMethodName() != null) {
++                      arr[2] = ClassNode.CLASS_LOCAL;
++                    }
++                    else {
++                      arr[2] = ClassNode.CLASS_MEMBER;
++                    }
++                  }
++                }
++              }
++              else { // This should never happen as inner_class and outer_class are NOT optional, make assumptions
++                arr[2] = ClassNode.CLASS_MEMBER;
++              }
+ 
+               // original simple name
+-              String simpleName = strEntry[2];
++              String simpleName = entry.inner_name;
+               String savedName = mapNewSimpleNames.get(innerName);
+ 
+               if (savedName != null) {
+@@ -90,12 +112,12 @@ public class ClassesProcessor {
+               arr[1] = simpleName;
+ 
+               // original access flags
+-              arr[3] = entry[3];
++              arr[3] = entry.access;
+ 
+               // enclosing class
+               String enclClassName;
+-              if (entry[1] != 0) {
+-                enclClassName = strEntry[1];
++              if (entry.outer_class != null) {
++                enclClassName = entry.outer_class;
+               }
+               else {
+                 enclClassName = cl.qualifiedName;
+@@ -163,13 +185,13 @@ public class ClassesProcessor {
+               StructClass scl = superNode.classStruct;
+               StructInnerClassesAttribute inner = (StructInnerClassesAttribute)scl.getAttributes().getWithKey("InnerClasses");
+ 
+-              if (inner == null || inner.getStringEntries().isEmpty()) {
++              if (inner == null || inner.getEntries().isEmpty()) {
+                 DecompilerContext.getLogger().writeMessage(superClass + " does not contain inner classes!", IFernflowerLogger.Severity.WARN);
+                 continue;
+               }
+ 
+-              for (int i = 0; i < inner.getStringEntries().size(); i++) {
+-                String nestedClass = inner.getStringEntries().get(i)[0];
++              for (InnerClassInfo info : inner.getEntries()) {
++                String nestedClass = info.inner_class;
+                 if (!setNestedClasses.contains(nestedClass)) {
+                   continue;
+                 }
+diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
+index 5969487..ecef558 100644
+--- a/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
++++ b/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
+@@ -23,10 +23,21 @@ import java.util.ArrayList;
+ import java.util.Collections;
+ import java.util.List;
+ 
+-public class StructInnerClassesAttribute extends StructGeneralAttribute {
++/*
++ * InnerClasses_attribute {
++ *   u2 attribute_name_index;
++ *   u4 attribute_length;
++ *   u2 number_of_classes;
++ *   {   u2 inner_class_info_index;
++ *       u2 outer_class_info_index;
++ *       u2 inner_name_index;
++ *       u2 inner_class_access_flags;
++ *   } classes[number_of_classes];
++ * }
++ */
+ 
+-  private List<int[]> classEntries;
+-  private List<String[]> stringEntries;
++public class StructInnerClassesAttribute extends StructGeneralAttribute {
++  private List<InnerClassInfo> entries;
+ 
+   @Override
+   public void initContent(ConstantPool pool) throws IOException {
+@@ -34,39 +45,36 @@ public class StructInnerClassesAttribute extends StructGeneralAttribute {
+ 
+     int len = data.readUnsignedShort();
+     if (len > 0) {
+-      classEntries = new ArrayList<int[]>(len);
+-      stringEntries = new ArrayList<String[]>(len);
++      entries = new ArrayList<InnerClassInfo>();
+ 
+       for (int i = 0; i < len; i++) {
+-        int[] classEntry = new int[4];
+-        for (int j = 0; j < 4; j++) {
+-          classEntry[j] = data.readUnsignedShort();
+-        }
+-        classEntries.add(classEntry);
+-
+-        // inner name, enclosing class, original simple name
+-        String[] stringEntry = new String[3];
+-        stringEntry[0] = pool.getPrimitiveConstant(classEntry[0]).getString();
+-        if (classEntry[1] != 0) {
+-          stringEntry[1] = pool.getPrimitiveConstant(classEntry[1]).getString();
+-        }
+-        if (classEntry[2] != 0) {
+-          stringEntry[2] = pool.getPrimitiveConstant(classEntry[2]).getString();
+-        }
+-        stringEntries.add(stringEntry);
++        entries.add(new InnerClassInfo(data, pool));
+       }
+     }
+     else {
+-      classEntries = Collections.emptyList();
+-      stringEntries = Collections.emptyList();
++      entries = Collections.emptyList();
+     }
+   }
+ 
+-  public List<int[]> getClassEntries() {
+-    return classEntries;
++  public List<InnerClassInfo> getEntries() {
++    return entries;
+   }
+ 
+-  public List<String[]> getStringEntries() {
+-    return stringEntries;
++  public static class InnerClassInfo {
++    public String inner_class;
++    public String outer_class;
++    public String inner_name;
++    public int access;
++
++    private InnerClassInfo(DataInputStream data, ConstantPool pool) throws IOException {
++        this.inner_class = readString(pool, data.readUnsignedShort());
++        this.outer_class = readString(pool, data.readUnsignedShort());
++        this.inner_name  = readString(pool, data.readUnsignedShort());
++        this.access = data.readUnsignedShort();
++    }
++
++    private String readString(ConstantPool pool, int index) {
++        return index == 0 ? null : pool.getPrimitiveConstant(index).getString();
++    }
+   }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0015-Add-new-command-line-argument-sef-SkipExtraFiles-To-.patch b/FernFlower-Patches/0015-Add-new-command-line-argument-sef-SkipExtraFiles-To-.patch
deleted file mode 100644
index b9a9f3f..0000000
--- a/FernFlower-Patches/0015-Add-new-command-line-argument-sef-SkipExtraFiles-To-.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Tue, 12 Dec 2017 00:18:19 -0800
-Subject: [PATCH] Add new command line argument -sef SkipExtraFiles: To skip
- copying non-class files from the input jars to the output.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-index 3cbbb19b4dd705f67d0b2450996f704a9e293168..f5fb8fc913c71b38ab0bffb5479d1f49725469ff 100644
---- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-@@ -55,6 +55,8 @@ public interface IFernflowerPreferences {
-   String USE_JAD_VARNAMING = "jvn"; // Overwrites any Local Variable names with JAD style names
-   String USE_JAD_PARAMETER_RENAMING = "jpr"; // Include parameter names in JAD naming
- 
-+  String SKIP_EXTRA_FILES = "sef";
-+
-   Map<String, Object> DEFAULTS = getDefaults();
- 
-   static Map<String, Object> getDefaults() {
-@@ -100,6 +102,7 @@ public interface IFernflowerPreferences {
-     defaults.put(DUMP_ORIGINAL_LINES, "0");
-     defaults.put(USE_JAD_VARNAMING, "0");
-     defaults.put(USE_JAD_PARAMETER_RENAMING, "0");
-+    defaults.put(SKIP_EXTRA_FILES, "0");
- 
-     return Collections.unmodifiableMap(defaults);
-   }
-diff --git a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
-index 9482a192692ca6a05d2bb24f3dfca06c25580d80..2d68b9418fcde253948cfa7ffc9c43519884ddce 100644
---- a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
-+++ b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
-@@ -54,6 +54,8 @@ public class ContextUnit {
-   }
- 
-   public void addOtherEntry(String fullPath, String entry) {
-+    if (DecompilerContext.getOption(IFernflowerPreferences.SKIP_EXTRA_FILES))
-+        return;
-     otherEntries.add(new String[]{fullPath, entry});
-   }
- 
-@@ -151,4 +153,4 @@ public class ContextUnit {
-   public List<StructClass> getClasses() {
-     return classes;
-   }
--}
-\ No newline at end of file
-+}
diff --git a/FernFlower-Patches/0015-Force-hide-constructors-with-anon-class-as-last-argu.patch b/FernFlower-Patches/0015-Force-hide-constructors-with-anon-class-as-last-argu.patch
new file mode 100644
index 0000000..50aecaf
--- /dev/null
+++ b/FernFlower-Patches/0015-Force-hide-constructors-with-anon-class-as-last-argu.patch
@@ -0,0 +1,71 @@
+From 289fb0b9bab3589bef077b002eca23e33fcd1e16 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Mon, 3 Aug 2015 15:08:26 -0700
+Subject: [PATCH 015/122] Force hide constructors with anon class as last
+ argument. Java adds these for unknown resons.
+
+---
+ .../java/decompiler/main/ClassWriter.java     |  1 +
+ .../decompiler/main/InitializerProcessor.java | 28 +++++++++++++++++++
+ 2 files changed, 29 insertions(+)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+index afa2473..3e5789d 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+@@ -60,6 +60,7 @@ public class ClassWriter {
+     StructClass cl = wrapper.getClassStruct();
+ 
+     InitializerProcessor.extractInitializers(wrapper);
++    InitializerProcessor.hideInitalizers(wrapper);
+ 
+     if (node.type == ClassNode.CLASS_ROOT && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_CLASS_1_4)) {
+       ref14processor.processClassReferences(node);
+diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
+index e64feea..85d580d 100644
+--- a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
+@@ -25,7 +25,11 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+ import org.jetbrains.java.decompiler.struct.StructClass;
++import org.jetbrains.java.decompiler.struct.StructContext;
+ import org.jetbrains.java.decompiler.struct.StructField;
++import org.jetbrains.java.decompiler.struct.StructMethod;
++import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
++import org.jetbrains.java.decompiler.struct.gen.VarType;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ 
+ import java.util.ArrayList;
+@@ -330,4 +334,28 @@ public class InitializerProcessor {
+ 
+     return false;
+   }
++
++
++  public static void hideInitalizers(ClassWrapper wrapper) {
++    // hide initializers with anon class arguments
++    for (MethodWrapper method : wrapper.getMethods()) {
++      StructMethod mt = method.methodStruct;
++      String name = mt.getName();
++      String desc = mt.getDescriptor();
++
++      if (mt.isSynthetic() && CodeConstants.INIT_NAME.equals(name)) {
++        MethodDescriptor md = MethodDescriptor.parseDescriptor(desc);
++        if (md.params.length > 0) {
++          VarType type = md.params[md.params.length - 1];
++          if (type.type == CodeConstants.TYPE_OBJECT) {
++            ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(type.value);
++            if (node != null && (node.namelessConstructorStub || node.type == ClassNode.CLASS_ANONYMOUS)) {
++              //TODO: Verify that the body is JUST a this([args]) call?
++              wrapper.getHiddenMembers().add(InterpreterUtil.makeUniqueKey(name, desc));
++            }
++          }
++        }
++      }
++    }
++  }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0016-Bugfix-Fix-invalid-logic-in-ExprUtils.-https-github..patch b/FernFlower-Patches/0016-Bugfix-Fix-invalid-logic-in-ExprUtils.-https-github..patch
deleted file mode 100644
index bb011b0..0000000
--- a/FernFlower-Patches/0016-Bugfix-Fix-invalid-logic-in-ExprUtils.-https-github..patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Wed, 21 Feb 2018 18:27:17 -0800
-Subject: [PATCH] Bugfix: Fix invalid logic in ExprUtils.
- https://github.com/MinecraftForge/FernFlower/commit/b3171e60c99f1f1a4668b4219e7296139e77f438
- This guy's commit inverted the ACC_STATIC logic.
-
-The logic was also wrong in that it didn't take the inner class attributes into account either. As it appears that at least the Oracle jdk places the static modifier in in this attribute if the inner class is exposed.
-
-Example:
-public interface Test {
-    void foo();
-    public abstract class Inner {
-        abstract void bar();
-    }
-}
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
-index 58a653a79f3dd3215b65b75ccdee314e7e71f3ad..ed7182b90388ba221ca97b6ddd5c640dbc062746 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
-@@ -8,6 +8,9 @@ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
- import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
- import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
-+import org.jetbrains.java.decompiler.struct.StructClass;
-+import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
-+import org.jetbrains.java.decompiler.struct.attr.StructInnerClassesAttribute;
- 
- import java.util.ArrayList;
- import java.util.Collections;
-@@ -34,7 +37,7 @@ public final class ExprUtil {
-       }
-       mask = methodWrapper.synthParameters;
-     }
--    else if (parameters > 0 && node.type == ClassNode.CLASS_MEMBER && (node.access & CodeConstants.ACC_STATIC) == 0) {
-+    else if (parameters > 0 && node.type == ClassNode.CLASS_MEMBER && !isStatic(node.classStruct)) {
-       // non-static member class
-       mask = new ArrayList<>(Collections.nCopies(parameters, null));
-       mask.set(0, new VarVersionPair(-1, 0));
-@@ -42,4 +45,18 @@ public final class ExprUtil {
- 
-     return mask;
-   }
--}
-\ No newline at end of file
-+
-+  private static boolean isStatic(StructClass struct) {
-+    if (struct.hasModifier(CodeConstants.ACC_STATIC))
-+      return true;
-+    if (struct.hasAttribute(StructGeneralAttribute.ATTRIBUTE_INNER_CLASSES)) {
-+      StructInnerClassesAttribute attr = struct.getAttribute(StructGeneralAttribute.ATTRIBUTE_INNER_CLASSES);
-+      for (StructInnerClassesAttribute.Entry entry : attr.getEntries()) {
-+        if (entry.innerName != null && entry.innerName.equals(struct.qualifiedName)) {
-+          return (entry.accessFlags & CodeConstants.ACC_STATIC) == CodeConstants.ACC_STATIC;
-+        }
-+      }
-+    }
-+    return false;
-+  }
-+}
diff --git a/FernFlower-Patches/0016-Fix-JVM-differences-printing-floats-with-an-undefine.patch b/FernFlower-Patches/0016-Fix-JVM-differences-printing-floats-with-an-undefine.patch
new file mode 100644
index 0000000..1de4c1c
--- /dev/null
+++ b/FernFlower-Patches/0016-Fix-JVM-differences-printing-floats-with-an-undefine.patch
@@ -0,0 +1,93 @@
+From b44392c8602fca4597fc52d98955a3be4d32ee77 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Mon, 3 Aug 2015 15:43:39 -0700
+Subject: [PATCH 016/122] Fix JVM differences printing floats with an undefined
+ number of trailing zeros. (Some JVMs do 0.1F and some do 0.10F)
+
+---
+ .../modules/decompiler/exps/ConstExprent.java | 28 +++++++++++++------
+ 1 file changed, 19 insertions(+), 9 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+index 4b9b687..5a751f9 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+@@ -210,7 +210,7 @@ public class ConstExprent extends Exprent {
+             doublefield = "MIN_VALUE";
+           }
+           else {
+-            return new TextBuffer(value.toString()).append("D");
++            return new TextBuffer(trimZeros(value.toString())).append("D");
+           }
+           return new FieldExprent(doublefield, "java/lang/Double", true, null, FieldDescriptor.DOUBLE_DESCRIPTOR, bytecode).toJava(0, tracer);
+         case CodeConstants.TYPE_FLOAT:
+@@ -247,7 +247,7 @@ public class ConstExprent extends Exprent {
+             floatfield = "MIN_VALUE";
+           }
+           else {
+-            return new TextBuffer(value.toString()).append("F");
++            return new TextBuffer(trimZeros(value.toString())).append("F");
+           }
+           return new FieldExprent(floatfield, "java/lang/Float", true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
+         case CodeConstants.TYPE_NULL:
+@@ -275,6 +275,16 @@ public class ConstExprent extends Exprent {
+     throw new RuntimeException("invalid constant type");
+   }
+ 
++  private static String trimZeros(String value) {
++      int i = value.length() - 1;
++      while (i >= 0 && value.charAt(i) == '0') {
++          i--;
++      }
++      if (value.charAt(i) == '.')
++        i++;
++      return value.substring(0, i + 1);
++  }
++
+   private static String convertStringToJava(String value, boolean ascii) {
+     char[] arr = value.toCharArray();
+     StringBuilder buffer = new StringBuilder(arr.length);
+@@ -400,20 +410,20 @@ public class ConstExprent extends Exprent {
+   public boolean isBoolPermitted() {
+     return boolPermitted;
+   }
+-  
++
+   // *****************************************************************************
+   // IMatchable implementation
+   // *****************************************************************************
+-  
++
+   public boolean match(MatchNode matchNode, MatchEngine engine) {
+ 
+     if(!super.match(matchNode, engine)) {
+       return false;
+     }
+-    
++
+     for(Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
+       RuleValue rule_value = rule.getValue();
+-      
++
+       switch(rule.getKey()) {
+       case EXPRENT_CONSTTYPE:
+         if(!rule_value.value.equals(this.constType)) {
+@@ -425,12 +435,12 @@ public class ConstExprent extends Exprent {
+           if(!engine.checkAndSetVariableValue(rule_value.value.toString(), this.value)) {
+             return false;
+           }
+-        } 
++        }
+         break;
+       }
+     }
+-    
++
+     return true;
+   }
+-  
++
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0017-Enhance-Generic-Invocations-Temporarily.patch b/FernFlower-Patches/0017-Enhance-Generic-Invocations-Temporarily.patch
deleted file mode 100644
index dcd2dfe..0000000
--- a/FernFlower-Patches/0017-Enhance-Generic-Invocations-Temporarily.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Fri, 16 Feb 2018 22:04:00 -0800
-Subject: [PATCH] Enhance Generic Invocations Temporarily.
-
-This is a temp separate patch until I get some time to merge it to patch 10/13.
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-index 33150f76d649f124bc818036b0f7c6331d5e74be..e2f36231b51e547b4aae610c8450d83bc0952e44 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-@@ -266,11 +266,11 @@ public abstract class Exprent implements IMatchable {
-   protected void wrapInCast(VarType left, VarType right, TextBuffer buf, int precedence) {
-     boolean needsCast = !left.isSuperset(right) && (right.equals(VarType.VARTYPE_OBJECT) || left.getType() != CodeConstants.TYPE_OBJECT);
- 
--    if (left != null && left.isGeneric()) {
-+    if (left.isGeneric() || right.isGeneric()) {
-       Map<VarType, List<VarType>> names = this.getNamedGenerics();
-       int arrayDim = 0;
- 
--      if (left.getArrayDim() == right.getArrayDim()) {
-+      if (left.getArrayDim() == right.getArrayDim() && left.getArrayDim() > 0) {
-         arrayDim = left.getArrayDim();
-         left = left.resizeArrayDim(0);
-         right = right.resizeArrayDim(0);
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-index ec2d6931c9426913680fd2ec180483389d96ac4b..cb15c8bc3d924e99c0bf9db350e8fe102bc5f97a 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-@@ -278,11 +278,11 @@ public class FunctionExprent extends Exprent {
-       VarType right = lstOperands.get(0).getInferredExprType(upperBound);
-       VarType cast = lstOperands.get(1).getExprType();
- 
--      if (upperBound != null && upperBound.isGeneric()) {
-+      if (upperBound != null && (upperBound.isGeneric() || right.isGeneric())) {
-         Map<VarType, List<VarType>> names = this.getNamedGenerics();
-         int arrayDim = 0;
- 
--        if (upperBound.getArrayDim() == right.getArrayDim()) {
-+        if (upperBound.getArrayDim() == right.getArrayDim() && upperBound.getArrayDim() > 0) {
-           arrayDim = upperBound.getArrayDim();
-           upperBound = upperBound.resizeArrayDim(0);
-           right = right.resizeArrayDim(0);
-@@ -302,6 +302,15 @@ public class FunctionExprent extends Exprent {
-             this.needsCast = false;
-           }
-         }
-+        else {
-+            this.needsCast = right.getType() == CodeConstants.TYPE_NULL || !DecompilerContext.getStructContext().instanceOf(right.getValue(), upperBound.getValue());
-+        }
-+        if (!this.needsCast) {
-+          if (arrayDim > 0) {
-+            right = right.resizeArrayDim(arrayDim);
-+          }
-+          return right;
-+        }
-       }
-       else { //TODO: Capture generics to make cast better?
-         this.needsCast = right.getType() == CodeConstants.TYPE_NULL || !DecompilerContext.getStructContext().instanceOf(right.getValue(), cast.getValue());
-@@ -643,4 +652,4 @@ public class FunctionExprent extends Exprent {
-     Integer type = (Integer)matchNode.getRuleValue(MatchProperties.EXPRENT_FUNCTYPE);
-     return type == null || this.funcType == type;
-   }
--}
-\ No newline at end of file
-+}
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index d51f0eba4a80cad4159a5135b2d87b8d405c0ed9..f23110233f59728ab4b700bfc0fa2b625f0d7071 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-@@ -399,6 +399,7 @@ public class InvocationExprent extends Exprent {
-         isEnum = newNode.classStruct.hasModifier(CodeConstants.ACC_ENUM) && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_ENUM);
-       }
-     }
-+    ClassNode currCls = ((ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE));
-     List<StructMethod> matches = getMatchedDescriptors();
-     BitSet setAmbiguousParameters = getAmbiguousParameters(matches);
-     StructMethod desc = null;
-@@ -459,7 +460,7 @@ public class InvocationExprent extends Exprent {
-           if (stClass != null) {
-             nextMethod:
-             for (StructMethod mt : stClass.getMethods()) {
--              if (name.equals(mt.getName())) {
-+              if (name.equals(mt.getName()) && (currCls == null || canAccess(currCls.classStruct, mt))) {
-                 MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
-                 if (md.params.length == descriptor.params.length) {
-                   for (int x = 0; x < md.params.length; x++) {
-@@ -494,7 +495,7 @@ public class InvocationExprent extends Exprent {
-           StructClass stClass = DecompilerContext.getStructContext().getClass(className);
-           if (stClass != null) {
-             for (StructMethod mt : stClass.getMethods()) {
--              if (name.equals(mt.getName()) && !stringDescriptor.equals(mt.getDescriptor())) {
-+              if (name.equals(mt.getName()) && (currCls == null || canAccess(currCls.classStruct, mt)) && !stringDescriptor.equals(mt.getDescriptor())) {
-                 MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
-                 if (md.params.length == descriptor.params.length) {
-                   if (md.params[i].getType() == CodeConstants.TYPE_OBJECT) {
-@@ -511,6 +512,22 @@ public class InvocationExprent extends Exprent {
-       }
-     }
- 
-+    if (instance != null && !genArgs.isEmpty()) {
-+        StructClass stClass = DecompilerContext.getStructContext().getClass(className);
-+        StructMethod me = stClass.getMethodRecursive(getName(), getStringDescriptor());
-+        if (me != null && me.getSignature() != null) {
-+            for (int x = 0; x < types.length; x++) {
-+                VarType type = me.getSignature().parameterTypes.get(x);
-+                if (type.isGeneric()) {
-+                    VarType _new = type.remap(genArgs);
-+                    if (_new != type) {
-+                        types[x] = _new;
-+                    }
-+                }
-+            }
-+        }
-+    }
-+
- 
-     boolean firstParameter = true;
-     for (int i = start; i < this.parameters.size(); i++) {
-@@ -665,27 +682,98 @@ public class InvocationExprent extends Exprent {
- 
-   private List<StructMethod> getMatchedDescriptors() {
-     List<StructMethod> matches = new ArrayList<>();
-+    ClassNode currCls = ((ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE));
-     StructClass cl = DecompilerContext.getStructContext().getClass(className);
-     if (cl == null) return matches;
- 
--    nextMethod:
--    for (StructMethod mt : cl.getMethods()) {
--      if (name.equals(mt.getName())) {
--        MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
--        if (md.params.length == descriptor.params.length) {
--          for (int i = 0; i < md.params.length; i++) {
--            if (md.params[i].getTypeFamily() != descriptor.params[i].getTypeFamily()) {
--              continue nextMethod;
--            }
-+    Set<String> visited = new HashSet<>();
-+    Queue<StructClass> que = new ArrayDeque<>();
-+    que.add(cl);
-+
-+    while (!que.isEmpty()) {
-+      StructClass cls = que.poll();
-+      if (cls == null)
-+          continue;
-+
-+      for (StructMethod mt : cls.getMethods()) {
-+        if (name.equals(mt.getName())) {
-+          MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
-+          if (matches(md.params, descriptor.params) && (currCls == null || canAccess(currCls.classStruct, mt))) {
-+            matches.add(mt);
-+          }
-+        }
-+      }
-+
-+      if (cls == cl && !matches.isEmpty()) {
-+        return matches;
-+      }
-+
-+      visited.add(cls.qualifiedName);
-+      if (cls.superClass != null && !visited.contains(cls.superClass.value)) {
-+        StructClass tmp = DecompilerContext.getStructContext().getClass((String)cls.superClass.value);
-+        if (tmp != null) {
-+          que.add(tmp);
-+        }
-+      }
-+
-+      for (String intf : cls.getInterfaceNames()) {
-+        if (!visited.contains(intf)) {
-+          StructClass tmp = DecompilerContext.getStructContext().getClass(intf);
-+          if (tmp != null) {
-+            que.add(tmp);
-           }
--          matches.add(mt);
-         }
-       }
-+
-     }
- 
-     return matches;
-   }
- 
-+  private boolean matches(VarType[] left, VarType[] right) {
-+    if (left.length == right.length) {
-+      for (int i = 0; i < left.length; i++) {
-+        if (left[i].getTypeFamily() != right[i].getTypeFamily()) {
-+          return false;
-+        }
-+      }
-+      return true;
-+    }
-+    return false;
-+  }
-+
-+  private boolean canAccess(StructClass currCls, StructMethod mt) {
-+    if (mt.hasModifier(CodeConstants.ACC_PUBLIC)) {
-+      return true;
-+    }
-+    else if (mt.hasModifier(CodeConstants.ACC_PRIVATE)) {
-+      return mt.getClassQualifiedName().equals(currCls.qualifiedName);
-+    }
-+    else if (mt.hasModifier(CodeConstants.ACC_PROTECTED)) {
-+      boolean samePackage = isInSamePackage(currCls.qualifiedName, mt.getClassQualifiedName());
-+      return samePackage || DecompilerContext.getStructContext().instanceOf(currCls.qualifiedName, mt.getClassQualifiedName());
-+    }
-+    else {
-+      return isInSamePackage(currCls.qualifiedName, mt.getClassQualifiedName());
-+    }
-+  }
-+
-+  private boolean isInSamePackage(String class1, String class2) {
-+    int pos1 = class1.lastIndexOf('/');
-+    int pos2 = class2.lastIndexOf('/');
-+    if (pos1 != pos2) {
-+      return false;
-+    }
-+
-+    if (pos1 == -1) {
-+      return true;
-+    }
-+
-+    String pkg1 = class1.substring(0, pos1);
-+    String pkg2 = class2.substring(0, pos2);
-+    return pkg1.equals(pkg2);
-+  }
-+
-   private BitSet getAmbiguousParameters(List<StructMethod> matches) {
-     StructClass cl = DecompilerContext.getStructContext().getClass(className);
-     if (cl == null || matches.size() == 1) {
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
-index bead2d172e27075e63f6977562988041a96a4371..4115efedd42ef96e61425d05dc83153e20ebf9a2 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructClass.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructClass.java
-@@ -159,6 +159,35 @@ public class StructClass extends StructMember {
-     return methods.getWithKey(InterpreterUtil.makeUniqueKey(name, descriptor));
-   }
- 
-+  public StructMethod getMethodRecursive(String name, String descriptor) {
-+    StructMethod ret = getMethod(name, descriptor);
-+
-+    if (ret != null) {
-+      return ret;
-+    }
-+
-+    if (superClass != null) {
-+      StructClass cls = DecompilerContext.getStructContext().getClass((String)superClass.value);
-+      if (cls != null) {
-+        ret = cls.getMethodRecursive(name, descriptor);
-+        if (ret != null) {
-+          return ret;
-+        }
-+      }
-+    }
-+
-+    for (String intf : getInterfaceNames()) {
-+      StructClass cls = DecompilerContext.getStructContext().getClass(intf);
-+      if (cls != null) {
-+        ret = cls.getMethodRecursive(name, descriptor);
-+        if (ret != null) {
-+          return ret;
-+        }
-+      }
-+    }
-+    return null;
-+  }
-+
-   public String getInterface(int i) {
-     return interfaceNames[i];
-   }
diff --git a/FernFlower-Patches/0017-Sort-local-variables-and-variable-definitions.-Again.patch b/FernFlower-Patches/0017-Sort-local-variables-and-variable-definitions.-Again.patch
new file mode 100644
index 0000000..58b407a
--- /dev/null
+++ b/FernFlower-Patches/0017-Sort-local-variables-and-variable-definitions.-Again.patch
@@ -0,0 +1,150 @@
+From 0ecec99fee439f1f018c51826f4105c7753af7f2 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Mon, 3 Aug 2015 17:26:00 -0700
+Subject: [PATCH 017/122] Sort local variables and variable definitions. Again,
+ different JVMs sort hash sets differently causing different variable names.
+
+---
+ .../modules/decompiler/ExprProcessor.java     |  1 +
+ .../modules/decompiler/exps/Exprent.java      | 53 +++++++++++++++----
+ .../decompiler/vars/VarVersionsProcessor.java | 11 +++-
+ 3 files changed, 53 insertions(+), 12 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+index 9296bb3..205b187 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+@@ -833,6 +833,7 @@ public class ExprProcessor implements CodeConstants {
+     }
+ 
+     TextBuffer buf = new TextBuffer();
++    lst = Exprent.sortIndexed(lst);
+ 
+     for (Exprent expr : lst) {
+       TextBuffer content = expr.toJava(indent, tracer);
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+index fbd146e..5f2cb56 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+@@ -17,6 +17,8 @@ package org.jetbrains.java.decompiler.modules.decompiler.exps;
+ 
+ import java.util.ArrayList;
+ import java.util.Collection;
++import java.util.Collections;
++import java.util.Comparator;
+ import java.util.HashSet;
+ import java.util.List;
+ import java.util.Map.Entry;
+@@ -140,23 +142,23 @@ public class Exprent implements IMatchable {
+       }
+     }
+   }
+-  
++
+   // *****************************************************************************
+   // IMatchable implementation
+   // *****************************************************************************
+-  
++
+   public IMatchable findObject(MatchNode matchNode, int index) {
+-    
++
+     if(matchNode.getType() != MatchNode.MATCHNODE_EXPRENT) {
+       return null;
+     }
+ 
+     List<Exprent> lstAllExprents = getAllExprents();
+-    
++
+     if(lstAllExprents == null || lstAllExprents.isEmpty()) {
+       return null;
+     }
+-    
++
+     String position = (String)matchNode.getRuleValue(MatchProperties.EXPRENT_POSITION);
+     if(position != null) {
+       if(position.matches("-?\\d+")) {
+@@ -170,11 +172,11 @@ public class Exprent implements IMatchable {
+   }
+ 
+   public boolean match(MatchNode matchNode, MatchEngine engine) {
+-    
++
+     if(matchNode.getType() != MatchNode.MATCHNODE_EXPRENT) {
+       return false;
+     }
+-    
++
+     for(Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
+       switch(rule.getKey()) {
+       case EXPRENT_TYPE:
+@@ -188,10 +190,41 @@ public class Exprent implements IMatchable {
+         }
+         break;
+       }
+-      
++
+     }
+-    
++
+     return true;
+   }
+-  
++
++  public static List<Exprent> sortIndexed(List<Exprent> lst) {
++    List<Exprent> ret = new ArrayList<Exprent>();
++    List<VarExprent> defs = new ArrayList<VarExprent>();
++
++    Comparator<VarExprent> comp = new Comparator<VarExprent>() {
++      public int compare(VarExprent o1, VarExprent o2) {
++        return o1.getIndex() - o2.getIndex();
++      }
++    };
++
++    for (Exprent exp : lst) {
++      boolean isDef = exp instanceof VarExprent && ((VarExprent)exp).isDefinition();
++      if (!isDef) {
++        if (defs.size() > 0) {
++          Collections.sort(defs, comp);
++          ret.addAll(defs);
++          defs.clear();
++        }
++        ret.add(exp);
++      }
++      else {
++        defs.add((VarExprent)exp);
++      }
++    }
++
++    if (defs.size() > 0) {
++      Collections.sort(defs, comp);
++      ret.addAll(defs);
++    }
++    return ret;
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+index 31f0f86..4751052 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+@@ -235,8 +235,15 @@ public class VarVersionsProcessor {
+     Map<Integer, Integer> mapOriginalVarIndices = new HashMap<Integer, Integer>();
+ 
+     // map var-version pairs on new var indexes
+-    Set<VarVersionPair> set = new HashSet<VarVersionPair>(mapExprentMinTypes.keySet());
+-    for (VarVersionPair pair : set) {
++    List<VarVersionPair> lst = new ArrayList<VarVersionPair>(mapExprentMinTypes.keySet());
++    Collections.sort(lst, new Comparator<VarVersionPair>() {
++      public int compare(VarVersionPair o1, VarVersionPair o2) {
++        if (o1.var != o2.var) return o1.var - o2.var;
++        return o1.version - o2.version;
++      }
++    });
++
++    for (VarVersionPair pair : lst) {
+ 
+       if (pair.version >= 0) {
+         int newIndex = pair.version == 1 ? pair.var : counters.getCounterAndIncrement(CounterContainer.VAR_COUNTER);
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0018-Add-cfg-argument-Used-to-specify-a-text-file-with-ad.patch b/FernFlower-Patches/0018-Add-cfg-argument-Used-to-specify-a-text-file-with-ad.patch
deleted file mode 100644
index 88a608b..0000000
--- a/FernFlower-Patches/0018-Add-cfg-argument-Used-to-specify-a-text-file-with-ad.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Fri, 6 Apr 2018 20:45:33 -0700
-Subject: [PATCH] Add -cfg argument Used to specify a text file with additional
- command line arguments.
-
-Our use case is specifying a ton of external libraries. It will read a text file and replace the -cfg entry with those lines.
-
-diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
-index d0ae9a7c3b20de44cb202390cc0dfd4d690fee64..c5398222893b170023afa13fa5b6c773ab3edc8d 100644
---- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
-+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
-@@ -10,9 +10,13 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil;
- 
- import java.io.*;
- import java.nio.charset.StandardCharsets;
-+import java.nio.file.Files;
-+import java.nio.file.Path;
-+import java.nio.file.Paths;
- import java.util.*;
- import java.util.jar.JarFile;
- import java.util.jar.Manifest;
-+import java.util.stream.Stream;
- import java.util.zip.ZipEntry;
- import java.util.zip.ZipFile;
- import java.util.zip.ZipOutputStream;
-@@ -20,6 +24,38 @@ import java.util.zip.ZipOutputStream;
- public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
-   @SuppressWarnings("UseOfSystemOutOrSystemErr")
-   public static void main(String[] args) {
-+    List<String> params = new ArrayList<>();
-+    for (int x = 0; x < args.length; x++) {
-+      if (args[x].startsWith("-cfg")) {
-+        String path = null;
-+        if (args[x].startsWith("-cfg=")) {
-+          path = args[x].substring(5);
-+        }
-+        else if (args.length > x+1) {
-+          path = args[++x];
-+        }
-+        else {
-+          System.out.println("Must specify a file when using -cfg argument.");
-+          return;
-+        }
-+        Path file = Paths.get(path);
-+        if (!Files.exists(file)) {
-+          System.out.println("error: missing config '" + path + "'");
-+          return;
-+        }
-+        try (Stream<String> stream = Files.lines(file)) {
-+          stream.forEach(params::add);
-+        } catch (IOException e) {
-+          System.out.println("error: Failed to read config file '" + path + "'");
-+          throw new RuntimeException(e);
-+        }
-+      }
-+      else {
-+        params.add(args[x]);
-+      }
-+    }
-+    args = params.toArray(new String[params.size()]);
-+
-     if (args.length < 2) {
-       System.out.println(
-         "Usage: java -jar fernflower.jar [-<option>=<value>]* [<source>]+ <destination>\n" +
-@@ -280,4 +316,4 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
-       DecompilerContext.getLogger().writeMessage("Cannot close " + file, IFernflowerLogger.Severity.WARN);
-     }
-   }
--}
-\ No newline at end of file
-+}
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructContext.java b/src/org/jetbrains/java/decompiler/struct/StructContext.java
-index 2b6448c01968ddb6bde275304e0073837d7fa575..58290caab9b84bb73291ea8af64b6897c01b162a 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructContext.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructContext.java
-@@ -93,6 +93,7 @@ public class StructContext {
-       catch (IOException ex) {
-         String message = "Corrupted archive file: " + file;
-         DecompilerContext.getLogger().writeMessage(message, ex);
-+        throw new RuntimeException(ex);
-       }
-       if (isArchive) {
-         return;
-@@ -114,6 +115,7 @@ public class StructContext {
-         catch (IOException ex) {
-           String message = "Corrupted class file: " + file;
-           DecompilerContext.getLogger().writeMessage(message, ex);
-+          throw new RuntimeException(ex);
-         }
-       }
-       else {
diff --git a/FernFlower-Patches/0018-No-Synthetic-classes-allowed-in-parameters.patch b/FernFlower-Patches/0018-No-Synthetic-classes-allowed-in-parameters.patch
new file mode 100644
index 0000000..c222ee8
--- /dev/null
+++ b/FernFlower-Patches/0018-No-Synthetic-classes-allowed-in-parameters.patch
@@ -0,0 +1,39 @@
+From f373923f5a6d05f0c6d2f42ad4a8d00af6fefd1c Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Mon, 3 Aug 2015 21:20:43 -0700
+Subject: [PATCH 018/122] No Synthetic classes allowed in parameters -.-
+
+---
+ .../jetbrains/java/decompiler/main/InitializerProcessor.java    | 2 +-
+ .../java/decompiler/modules/decompiler/exps/NewExprent.java     | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
+index 85d580d..0438fd4 100644
+--- a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
+@@ -349,7 +349,7 @@ public class InitializerProcessor {
+           VarType type = md.params[md.params.length - 1];
+           if (type.type == CodeConstants.TYPE_OBJECT) {
+             ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(type.value);
+-            if (node != null && (node.namelessConstructorStub || node.type == ClassNode.CLASS_ANONYMOUS)) {
++            if (node != null && (node.namelessConstructorStub || node.type == ClassNode.CLASS_ANONYMOUS || (node.access & CodeConstants.ACC_SYNTHETIC) != 0)) {
+               //TODO: Verify that the body is JUST a this([args]) call?
+               wrapper.getHiddenMembers().add(InterpreterUtil.makeUniqueKey(name, desc));
+             }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+index 0297a55..51137cc 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+@@ -327,7 +327,7 @@ public class NewExprent extends Exprent {
+ 
+                 if (i == lstParameters.size() - 1 && expr.getExprType() == VarType.VARTYPE_NULL) {
+                   ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(leftType.value);
+-                  if (node != null && (node.namelessConstructorStub || node.type == ClassNode.CLASS_ANONYMOUS)) {
++                  if (node != null && (node.namelessConstructorStub || node.type == ClassNode.CLASS_ANONYMOUS || (node.access & CodeConstants.ACC_SYNTHETIC) != 0)) {
+                     break;  // skip last parameter of synthetic constructor call
+                   }
+                 }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0019-Add-support-for-destination-to-be-a-zip-file-if-ther.patch b/FernFlower-Patches/0019-Add-support-for-destination-to-be-a-zip-file-if-ther.patch
deleted file mode 100644
index ea923de..0000000
--- a/FernFlower-Patches/0019-Add-support-for-destination-to-be-a-zip-file-if-ther.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Thu, 19 Jul 2018 22:57:52 -0700
-Subject: [PATCH] Add support for destination to be a zip file if there is only
- one input, and it is a file.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
-index c5398222893b170023afa13fa5b6c773ab3edc8d..b44bf391a4914dcee3228cfbb3bbdfefec2f3527 100644
---- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
-+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
-@@ -100,7 +100,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
-     }
- 
-     File destination = new File(args[args.length - 1]);
--    if (!destination.isDirectory()) {
-+    if (!destination.isDirectory() && (sources.size() > 1 || !sources.get(0).isFile())) {
-       System.out.println("error: destination '" + destination + "' is not a directory");
-       return;
-     }
-@@ -140,7 +140,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
- 
-   protected ConsoleDecompiler(File destination, Map<String, Object> options, IFernflowerLogger logger) {
-     root = destination;
--    engine = new Fernflower(this, this, options, logger);
-+    engine = new Fernflower(this, root.isDirectory() ? this : new SingleFileSaver(destination), options, logger);
-   }
- 
-   public void addSource(File source) {
-diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/SingleFileSaver.java b/src/org/jetbrains/java/decompiler/main/decompiler/SingleFileSaver.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..651584c6758413e31edd5ee6952cb069246c10d4
---- /dev/null
-+++ b/src/org/jetbrains/java/decompiler/main/decompiler/SingleFileSaver.java
-@@ -0,0 +1,128 @@
-+package org.jetbrains.java.decompiler.main.decompiler;
-+
-+import java.io.File;
-+import java.io.FileOutputStream;
-+import java.io.IOException;
-+import java.io.InputStream;
-+import java.util.HashSet;
-+import java.util.Set;
-+import java.util.jar.JarFile;
-+import java.util.jar.Manifest;
-+import java.util.zip.ZipEntry;
-+import java.util.zip.ZipFile;
-+import java.util.zip.ZipOutputStream;
-+
-+import org.jetbrains.java.decompiler.main.DecompilerContext;
-+import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
-+import org.jetbrains.java.decompiler.main.extern.IResultSaver;
-+
-+public class SingleFileSaver implements IResultSaver {
-+  private final File target;
-+  private ZipOutputStream output;
-+  private Set<String> entries = new HashSet<>();
-+
-+  public SingleFileSaver(File target) {
-+    this.target = target;
-+  }
-+
-+  @Override
-+  public void saveFolder(String path) {
-+    if (!"".equals(path))
-+      throw new UnsupportedOperationException("Targeted a single output, but tried to create a directory");
-+  }
-+
-+  @Override
-+  public void copyFile(String source, String path, String entryName) {
-+    throw new UnsupportedOperationException("Targeted a single output, but tried to copy file");
-+  }
-+
-+  @Override
-+  public void saveClassFile(String path, String qualifiedName, String entryName, String content, int[] mapping) {
-+    throw new UnsupportedOperationException("Targeted a single output, but tried to save a class file");
-+  }
-+
-+  @Override
-+  public void createArchive(String path, String archiveName, Manifest manifest) {
-+    if (output != null)
-+      throw new UnsupportedOperationException("Attempted to write multiple archives at the same time");
-+    try {
-+      FileOutputStream stream = new FileOutputStream(target);
-+      output = new ZipOutputStream(stream);
-+      if (manifest != null) {
-+        final ZipEntry manifestEntry = new ZipEntry(JarFile.MANIFEST_NAME);
-+        manifestEntry.setTime(STABLE_ZIP_TIMESTAMP);
-+        output.putNextEntry(manifestEntry);
-+        manifest.write(output);
-+        output.closeEntry();
-+      }
-+    } catch (IOException e) {
-+      DecompilerContext.getLogger().writeMessage("Cannot create archive " + target, e);
-+    }
-+  }
-+
-+  @Override
-+  public void saveDirEntry(String path, String archiveName, String entryName) {
-+    saveClassEntry(path, archiveName, null, entryName, null);
-+  }
-+
-+  @Override
-+  public void copyEntry(String source, String path, String archiveName, String entryName) {
-+    if (!checkEntry(entryName))
-+      return;
-+
-+    try (ZipFile srcArchive = new ZipFile(new File(source))) {
-+      ZipEntry entry = srcArchive.getEntry(entryName);
-+      if (entry != null) {
-+        try (InputStream in = srcArchive.getInputStream(entry)) {
-+          final ZipEntry newEntry = new ZipEntry(entryName);
-+          newEntry.setTime(entry.getTime());
-+          output.putNextEntry(newEntry);
-+          in.transferTo(output);
-+        }
-+      }
-+    }
-+    catch (IOException ex) {
-+      String message = "Cannot copy entry " + entryName + " from " + source + " to " + target;
-+      DecompilerContext.getLogger().writeMessage(message, ex);
-+    }
-+  }
-+
-+  @Override
-+  public void saveClassEntry(String path, String archiveName, String qualifiedName, String entryName, String content) {
-+    if (!checkEntry(entryName))
-+        return;
-+
-+    try {
-+      ZipEntry entry = new ZipEntry(entryName);
-+      entry.setTime(STABLE_ZIP_TIMESTAMP);
-+      output.putNextEntry(entry);
-+      if (content != null)
-+          output.write(content.getBytes("UTF-8"));
-+    }
-+    catch (IOException ex) {
-+      String message = "Cannot write entry " + entryName + " to " + target;
-+      DecompilerContext.getLogger().writeMessage(message, ex);
-+    }
-+  }
-+
-+  @Override
-+  public void closeArchive(String path, String archiveName) {
-+    try {
-+      output.close();
-+      entries.clear();
-+      output = null;
-+    }
-+    catch (IOException ex) {
-+      DecompilerContext.getLogger().writeMessage("Cannot close " + target, IFernflowerLogger.Severity.WARN);
-+    }
-+  }
-+
-+  private boolean checkEntry(String entryName) {
-+    boolean added = entries.add(entryName);
-+    if (!added) {
-+      String message = "Zip entry " + entryName + " already exists in " + target;
-+      DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
-+    }
-+    return added;
-+  }
-+}
diff --git a/FernFlower-Patches/0019-Change-LVT-indexing-to-VarVersionPair.patch b/FernFlower-Patches/0019-Change-LVT-indexing-to-VarVersionPair.patch
new file mode 100644
index 0000000..8a72e3c
--- /dev/null
+++ b/FernFlower-Patches/0019-Change-LVT-indexing-to-VarVersionPair.patch
@@ -0,0 +1,142 @@
+From f3b023e5db4654cb1201528f0633545592f2f610 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Tue, 4 Aug 2015 21:50:19 -0700
+Subject: [PATCH 019/122] Change LVT indexing to VarVersionPair
+
+---
+ .../modules/decompiler/vars/VarProcessor.java |  9 ++--
+ .../StructLocalVariableTableAttribute.java    | 51 +++++++++++++++----
+ 2 files changed, 46 insertions(+), 14 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+index ce81474..fbd3455 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+@@ -44,7 +44,7 @@ public class VarProcessor {
+     new VarDefinitionHelper(root, mt, this).setVarDefinitions();
+   }
+ 
+-  public void setDebugVarNames(Map<Integer, String> mapDebugVarNames) {
++  public void setDebugVarNames(Map<VarVersionPair, String> mapDebugVarNames) {
+     if (varVersions == null) {
+       return;
+     }
+@@ -65,8 +65,11 @@ public class VarProcessor {
+       String name = mapVarNames.get(pair);
+ 
+       Integer index = mapOriginalVarIndices.get(pair.var);
+-      if (index != null && mapDebugVarNames.containsKey(index)) {
+-        name = mapDebugVarNames.get(index);
++      if (index != null) {
++        VarVersionPair key = new VarVersionPair(index.intValue(), pair.version);
++        if (mapDebugVarNames.containsKey(key)) {
++          name = mapDebugVarNames.get(key);
++        }
+       }
+ 
+       Integer counter = mapNames.get(name);
+diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+index 04f534e..5f55537 100644
+--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
++++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+@@ -15,12 +15,14 @@
+  */
+ package org.jetbrains.java.decompiler.struct.attr;
+ 
++import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+ import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+ import org.jetbrains.java.decompiler.util.DataInputFullStream;
+ 
+ import java.io.IOException;
+ import java.util.ArrayList;
+ import java.util.Collections;
++import java.util.Comparator;
+ import java.util.HashMap;
+ import java.util.HashSet;
+ import java.util.List;
+@@ -89,7 +91,17 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
+         return 0;
+     }
+   }
+-  private Map<Integer, String> mapVarNames = Collections.emptyMap();
++
++  private static Comparator<LVTVariable> comp = new Comparator<LVTVariable>() {
++    @Override
++    public int compare(LVTVariable o1, LVTVariable o2)
++    {
++      if (o1.index != o2.index) return o1.index - o2.index;
++      if (o1.start != o2.start) return o1.start - o2.start;
++      return o1.end - o2.end;
++    }
++  };
++  private Map<VarVersionPair, String> mapVarNames = Collections.emptyMap();
+ 
+   private Map<Integer, Set<LVTVariable>> endpoints = Collections.emptyMap();
+   private ArrayList<LVTVariable> allLVT;
+@@ -101,7 +113,7 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
+     int len = data.readUnsignedShort();
+     boolean isLVTT = this.getName().equals(ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
+     if (len > 0) {
+-      mapVarNames = new HashMap<Integer, String>(len);
++      mapVarNames = new HashMap<VarVersionPair, String>(len);
+       endpoints = new HashMap<Integer,Set<LVTVariable>>(len);
+       allLVT = new ArrayList<LVTVariable>(len);
+       for (int i = 0; i < len; i++) {
+@@ -111,10 +123,11 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
+         int descIndex = data.readUnsignedShort(); // either descriptor or signature
+         int varIndex = data.readUnsignedShort();
+         LVTVariable v = new LVTVariable(pool.getPrimitiveConstant(nameIndex).getString(), pool.getPrimitiveConstant(descIndex).getString(),start,start+vlen,varIndex,isLVTT);
+-        mapVarNames.put(varIndex, pool.getPrimitiveConstant(nameIndex).getString());
+         allLVT.add(v);
+         v.addTo(endpoints);
+       }
++      Collections.sort(allLVT, comp);
++      buildNameMap();
+     }
+     else {
+       mapVarNames = Collections.emptyMap();
+@@ -124,17 +137,33 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
+   public void addLocalVariableTable(StructLocalVariableTableAttribute attr) {
+     mapVarNames.putAll(attr.getMapVarNames());
+     for (LVTVariable other : attr.allLVT) {
+-        int idx = allLVT.indexOf(other);
+-        if (idx < 0) {
+-            allLVT.add(other);
+-        } else {
+-            LVTVariable mine = allLVT.get(idx);
+-            mine.merge(other);
+-        }
++      int idx = allLVT.indexOf(other);
++      if (idx < 0) {
++        allLVT.add(other);
++      }
++      else {
++        LVTVariable mine = allLVT.get(idx);
++        mine.merge(other);
++      }
++    }
++    Collections.sort(allLVT, comp);
++  }
++
++  private void buildNameMap() {
++    Map<Integer, Integer> versions = new HashMap<Integer, Integer>();
++    mapVarNames.clear();
++    for (LVTVariable lvt : allLVT) {
++      Integer idx = versions.get(lvt.index);
++      if (idx == null)
++        idx = 0;
++      else
++        idx++;
++      versions.put(lvt.index, idx);
++      mapVarNames.put(new VarVersionPair(lvt.index, idx.intValue()), lvt.name);
+     }
+   }
+ 
+-  public Map<Integer, String> getMapVarNames() {
++  public Map<VarVersionPair, String> getMapVarNames() {
+     return mapVarNames;
+   }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0020-Add-a-metadata-file-named-fernflower_abstract_parame.patch b/FernFlower-Patches/0020-Add-a-metadata-file-named-fernflower_abstract_parame.patch
deleted file mode 100644
index bdb4a9e..0000000
--- a/FernFlower-Patches/0020-Add-a-metadata-file-named-fernflower_abstract_parame.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Fri, 20 Jul 2018 01:37:36 -0700
-Subject: [PATCH] Add a metadata file named
- 'fernflower_abstract_parameter_names.txt' to rename abstract parameters.
-
-Format: ClassName MethodName Descriptor Param1[ Param2...]
-
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index 410a83345e5e145962137536b95ca4f22185d678..0fb12b6d99f3c1dc7652e5ab49e36683d7a6db08 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-@@ -755,7 +755,11 @@ public class ClassWriter {
-             if (parameterName == null) {
-               parameterName = "param" + index; // null iff decompiled with errors
-             }
--            parameterName = methodWrapper.methodStruct.getVariableNamer().renameParameter(flags, typeName, parameterName, index);
-+            String newParameterName = methodWrapper.methodStruct.getVariableNamer().renameParameter(flags, typeName, parameterName, index);
-+            if ((flags & (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_NATIVE)) != 0 && newParameterName.equals(parameterName)) {
-+              newParameterName = DecompilerContext.getStructContext().renameAbstractParameter(methodWrapper.methodStruct.getClassQualifiedName(), mt.getName(), mt.getDescriptor(), index - (((flags & CodeConstants.ACC_STATIC) == 0) ? 1 : 0), parameterName);
-+            }
-+            parameterName = newParameterName;
-             buffer.append(parameterName);
- 
-             paramCount++;
-diff --git a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
-index 2d68b9418fcde253948cfa7ffc9c43519884ddce..7b0946ed0de6af2dbe2043332650a09880027726 100644
---- a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
-+++ b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
-@@ -7,12 +7,16 @@ import org.jetbrains.java.decompiler.main.extern.IResultSaver;
- import org.jetbrains.java.decompiler.struct.lazy.LazyLoader;
- import org.jetbrains.java.decompiler.struct.lazy.LazyLoader.Link;
- import org.jetbrains.java.decompiler.util.DataInputFullStream;
-+import org.jetbrains.java.decompiler.util.InterpreterUtil;
- 
-+import java.io.File;
- import java.io.IOException;
-+import java.nio.charset.StandardCharsets;
- import java.util.ArrayList;
- import java.util.List;
- import java.util.jar.JarFile;
- import java.util.jar.Manifest;
-+import java.util.zip.ZipFile;
- 
- public class ContextUnit {
- 
-@@ -54,6 +58,24 @@ public class ContextUnit {
-   }
- 
-   public void addOtherEntry(String fullPath, String entry) {
-+    if ("fernflower_abstract_parameter_names.txt".equals(entry)) {
-+      byte[] data;
-+      try {
-+        if (type == TYPE_JAR || type == TYPE_ZIP) {
-+          try (ZipFile archive = new ZipFile(fullPath)) {
-+            data = InterpreterUtil.getBytes(archive, archive.getEntry(entry));
-+          }
-+        } else {
-+          data = InterpreterUtil.getBytes(new File(fullPath));
-+        }
-+        DecompilerContext.getStructContext().loadAbstractMetadata(new String(data, StandardCharsets.UTF_8));
-+      }
-+      catch (IOException e) {
-+        String message = "Cannot read fernflower_abstract_parameter_names.txt from " + fullPath;
-+        DecompilerContext.getLogger().writeMessage(message, e);
-+      }
-+      return;
-+    }
-     if (DecompilerContext.getOption(IFernflowerPreferences.SKIP_EXTRA_FILES))
-         return;
-     otherEntries.add(new String[]{fullPath, entry});
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructContext.java b/src/org/jetbrains/java/decompiler/struct/StructContext.java
-index 58290caab9b84bb73291ea8af64b6897c01b162a..1274df19dd56bf8061384af8d3db78856f836928 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructContext.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructContext.java
-@@ -4,14 +4,18 @@ package org.jetbrains.java.decompiler.struct;
- import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.main.extern.IResultSaver;
- import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger.Severity;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericMethodDescriptor;
- import org.jetbrains.java.decompiler.struct.lazy.LazyLoader;
- import org.jetbrains.java.decompiler.util.DataInputFullStream;
- import org.jetbrains.java.decompiler.util.InterpreterUtil;
- 
- import java.io.File;
- import java.io.IOException;
-+import java.util.ArrayList;
- import java.util.Enumeration;
- import java.util.HashMap;
-+import java.util.List;
- import java.util.Map;
- import java.util.jar.JarFile;
- import java.util.zip.ZipEntry;
-@@ -23,6 +27,7 @@ public class StructContext {
-   private final LazyLoader loader;
-   private final Map<String, ContextUnit> units = new HashMap<>();
-   private final Map<String, StructClass> classes = new HashMap<>();
-+  private final Map<String, List<String>> abstractNames = new HashMap<>();
- 
-   public StructContext(IResultSaver saver, IDecompiledData decompiledData, LazyLoader loader) {
-     this.saver = saver;
-@@ -208,4 +213,24 @@ public class StructContext {
- 
-     return false;
-   }
-+
-+  public void loadAbstractMetadata(String string) {
-+    for (String line : string.split("\n")) {
-+      String[] pts = line.split(" ");
-+      if (pts.length < 4) //class method desc [args...]
-+        continue;
-+      GenericMethodDescriptor desc = GenericMain.parseMethodSignature(pts[2]);
-+      List<String> params = new ArrayList<>();
-+      for (int x = 0; x < pts.length - 3; x++) {
-+        for (int y = 0; y < desc.parameterTypes.get(x).getStackSize(); y++)
-+            params.add(pts[x+3]);
-+      }
-+      this.abstractNames.put(pts[0] + ' '+ pts[1] + ' ' + pts[2], params);
-+    }
-+  }
-+
-+  public String renameAbstractParameter(String className, String methodName, String descriptor, int index, String _default) {
-+    List<String> params = this.abstractNames.get(className + ' ' + methodName + ' ' + descriptor);
-+    return params != null && index < params.size() ? params.get(index) : _default;
-+  }
- }
diff --git a/FernFlower-Patches/0020-Convert-Exprent.bytecode-to-a-BitMap-as-it-gives-bet.patch b/FernFlower-Patches/0020-Convert-Exprent.bytecode-to-a-BitMap-as-it-gives-bet.patch
new file mode 100644
index 0000000..cbf9b9e
--- /dev/null
+++ b/FernFlower-Patches/0020-Convert-Exprent.bytecode-to-a-BitMap-as-it-gives-bet.patch
@@ -0,0 +1,876 @@
+From 814dc4a3267ceceb892d6fa84de99f2311274400 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Thu, 6 Aug 2015 12:18:10 -0700
+Subject: [PATCH 020/122] Convert Exprent.bytecode to a BitMap, as it gives
+ better speed and functionality. Added method to gather bytecode markers for
+ every exporession. Allows us to get the bytecode offsets for an entire block
+ of code.
+
+---
+ .../collectors/BytecodeMappingTracer.java     |  6 ++--
+ .../modules/decompiler/ExprProcessor.java     |  6 +++-
+ .../decompiler/SimplifyExprentsHelper.java    | 27 ++++++++--------
+ .../decompiler/exps/AnnotationExprent.java    |  7 ++++
+ .../modules/decompiler/exps/ArrayExprent.java | 11 +++++--
+ .../decompiler/exps/AssertExprent.java        |  7 ++++
+ .../decompiler/exps/AssignmentExprent.java    | 12 +++++--
+ .../modules/decompiler/exps/ConstExprent.java | 11 +++++--
+ .../modules/decompiler/exps/ExitExprent.java  | 20 ++++++++----
+ .../modules/decompiler/exps/Exprent.java      | 32 ++++++++++++++-----
+ .../modules/decompiler/exps/FieldExprent.java | 24 ++++++++------
+ .../decompiler/exps/FunctionExprent.java      | 22 ++++++++-----
+ .../modules/decompiler/exps/IfExprent.java    | 10 ++++--
+ .../decompiler/exps/InvocationExprent.java    | 10 ++++--
+ .../decompiler/exps/MonitorExprent.java       | 10 ++++--
+ .../modules/decompiler/exps/NewExprent.java   | 14 ++++++--
+ .../decompiler/exps/SwitchExprent.java        | 20 ++++++++++--
+ .../modules/decompiler/exps/VarExprent.java   | 18 +++++++----
+ .../decompiler/stats/DummyExitStatement.java  | 11 +++----
+ 19 files changed, 199 insertions(+), 79 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
+index e25cca2..f847784 100644
+--- a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
++++ b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
+@@ -55,10 +55,10 @@ public class BytecodeMappingTracer {
+     }
+   }
+ 
+-  public void addMapping(Set<Integer> bytecode_offsets) {
++  public void addMapping(BitSet bytecode_offsets) {
+     if (bytecode_offsets != null) {
+-      for (Integer bytecode_offset : bytecode_offsets) {
+-        addMapping(bytecode_offset);
++      for (int i = bytecode_offsets.nextSetBit(0); i >= 0; i = bytecode_offsets.nextSetBit(i+1)) {
++        addMapping(i);
+       }
+     }
+   }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+index 205b187..f33e438 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+@@ -336,7 +336,11 @@ public class ExprProcessor implements CodeConstants {
+ 
+       Instruction instr = seq.getInstr(i);
+       Integer bytecode_offset = block.getOldOffset(i);
+-      Set<Integer> bytecode_offsets = bytecode_offset >= 0 ? Collections.singleton(bytecode_offset) : null;
++      BitSet bytecode_offsets = null;
++      if (bytecode_offset >= 0) {
++        bytecode_offsets = new BitSet();
++        bytecode_offsets.set(bytecode_offset);
++      }
+ 
+       switch (instr.opcode) {
+         case opc_aconst_null:
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
+index ddf6865..106a904 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
+@@ -17,6 +17,7 @@ package org.jetbrains.java.decompiler.modules.decompiler;
+ 
+ import java.util.ArrayList;
+ import java.util.Arrays;
++import java.util.BitSet;
+ import java.util.HashMap;
+ import java.util.HashSet;
+ import java.util.List;
+@@ -52,7 +53,7 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ public class SimplifyExprentsHelper {
+ 
+   static final MatchEngine class14Builder = new MatchEngine();
+-  
++
+   private final boolean firstInvocation;
+ 
+   public SimplifyExprentsHelper(boolean firstInvocation) {
+@@ -777,7 +778,7 @@ public class SimplifyExprentsHelper {
+       IfStatement stif = (IfStatement)stat;
+ 
+       Exprent ifheadexpr = stif.getHeadexprent();
+-      Set<Integer> ifheadexpr_bytecode = (ifheadexpr == null ? null : ifheadexpr.bytecode);
++      BitSet ifheadexpr_bytecode = (ifheadexpr == null ? null : ifheadexpr.bytecode);
+ 
+       if (stif.iftype == IfStatement.IFTYPE_IFELSE) {
+         Statement ifstat = stif.getIfstat();
+@@ -892,47 +893,47 @@ public class SimplifyExprentsHelper {
+           "   exprent type:var index:$var$\n" +
+           "   exprent type:field name:$fieldname$\n" +
+           " statement type:sequence statsize:2\n" +
+-          "  statement type:trycatch\n" +  
++          "  statement type:trycatch\n" +
+           "   statement type:basicblock exprsize:1\n" +
+           "    exprent type:assignment\n" +
+           "     exprent type:var index:$var$\n" +
+           "     exprent type:invocation invclass:java/lang/Class signature:forName(Ljava/lang/String;)Ljava/lang/Class;\n" +
+           "      exprent position:0 type:constant consttype:string constvalue:$classname$\n" +
+           "   statement type:basicblock exprsize:1\n" +
+-          "    exprent type:exit exittype:throw\n" + 
+-          "  statement type:basicblock exprsize:1\n" + 
+-          "   exprent type:assignment\n" + 
++          "    exprent type:exit exittype:throw\n" +
++          "  statement type:basicblock exprsize:1\n" +
++          "   exprent type:assignment\n" +
+           "    exprent type:field name:$fieldname$ ret:$field$\n" +
+           "    exprent type:var index:$var$"
+         );
+   }
+-  
++
+   private static boolean collapseInlinedClass14(Statement stat) {
+ 
+     boolean ret = class14Builder.match(stat);
+     if(ret) {
+-      
++
+       String class_name = (String)class14Builder.getVariableValue("$classname$");
+       AssignmentExprent assfirst = (AssignmentExprent)class14Builder.getVariableValue("$assignfield$");
+       FieldExprent fieldexpr = (FieldExprent)class14Builder.getVariableValue("$field$");
+ 
+       assfirst.replaceExprent(assfirst.getRight(), new ConstExprent(VarType.VARTYPE_CLASS, class_name, null));
+-      
++
+       List<Exprent> data = new ArrayList<Exprent>();
+       data.addAll(stat.getFirst().getExprents());
+ 
+       stat.setExprents(data);
+ 
+       SequenceHelper.destroyAndFlattenStatement(stat);
+-      
++
+       ClassWrapper wrapper = (ClassWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_WRAPPER);
+       if (wrapper != null) {
+         wrapper.getHiddenMembers().add(InterpreterUtil.makeUniqueKey(fieldexpr.getName(), fieldexpr.getDescriptor().descriptorString));
+       }
+-      
++
+     }
+-    
++
+     return ret;
+   }
+-  
++
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
+index 905bc21..0560ae6 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
+@@ -21,6 +21,7 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ 
++import java.util.BitSet;
+ import java.util.List;
+ 
+ public class AnnotationExprent extends Exprent {
+@@ -99,4 +100,10 @@ public class AnnotationExprent extends Exprent {
+            InterpreterUtil.equalLists(parNames, ann.parNames) &&
+            InterpreterUtil.equalLists(parValues, ann.parValues);
+   }
++
++  @Override
++  public void getBytecodeRange(BitSet values) {
++    measureBytecode(values, parValues);
++    measureBytecode(values);
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
+index 8f7269b..ebbcab0 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
+@@ -23,8 +23,8 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ 
+ import java.util.ArrayList;
++import java.util.BitSet;
+ import java.util.List;
+-import java.util.Set;
+ 
+ public class ArrayExprent extends Exprent {
+ 
+@@ -32,7 +32,7 @@ public class ArrayExprent extends Exprent {
+   private Exprent index;
+   private final VarType hardType;
+ 
+-  public ArrayExprent(Exprent array, Exprent index, VarType hardType, Set<Integer> bytecodeOffsets) {
++  public ArrayExprent(Exprent array, Exprent index, VarType hardType, BitSet bytecodeOffsets) {
+     super(EXPRENT_ARRAY);
+     this.array = array;
+     this.index = index;
+@@ -121,4 +121,11 @@ public class ArrayExprent extends Exprent {
+   public Exprent getIndex() {
+     return index;
+   }
++
++  @Override
++  public void getBytecodeRange(BitSet values) {
++    measureBytecode(values, array);
++    measureBytecode(values, index);
++    measureBytecode(values);
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
+index af95d15..82305f3 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
+@@ -18,6 +18,7 @@ package org.jetbrains.java.decompiler.modules.decompiler.exps;
+ import org.jetbrains.java.decompiler.main.TextBuffer;
+ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+ 
++import java.util.BitSet;
+ import java.util.List;
+ 
+ public class AssertExprent extends Exprent {
+@@ -51,4 +52,10 @@ public class AssertExprent extends Exprent {
+ 
+     return buffer;
+   }
++
++  @Override
++  public void getBytecodeRange(BitSet values) {
++    measureBytecode(values, parameters);
++    measureBytecode(values);
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
+index 95ebdc5..efc64b9 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
+@@ -27,8 +27,8 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ 
+ import java.util.ArrayList;
++import java.util.BitSet;
+ import java.util.List;
+-import java.util.Set;
+ 
+ public class AssignmentExprent extends Exprent {
+ 
+@@ -52,7 +52,7 @@ public class AssignmentExprent extends Exprent {
+   private Exprent right;
+   private int condType = CONDITION_NONE;
+ 
+-  public AssignmentExprent(Exprent left, Exprent right, Set<Integer> bytecodeOffsets) {
++  public AssignmentExprent(Exprent left, Exprent right, BitSet bytecodeOffsets) {
+     super(EXPRENT_ASSIGNMENT);
+     this.left = left;
+     this.right = right;
+@@ -178,6 +178,14 @@ public class AssignmentExprent extends Exprent {
+            condType == as.getCondType();
+   }
+ 
++
++  @Override
++  public void getBytecodeRange(BitSet values) {
++    measureBytecode(values, left);
++    measureBytecode(values, right);
++    measureBytecode(values);
++  }
++
+   // *****************************************************************************
+   // getter and setter methods
+   // *****************************************************************************
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+index 5a751f9..312f6c8 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+@@ -48,15 +48,15 @@ public class ConstExprent extends Exprent {
+   private final Object value;
+   private final boolean boolPermitted;
+ 
+-  public ConstExprent(int val, boolean boolPermitted, Set<Integer> bytecodeOffsets) {
++  public ConstExprent(int val, boolean boolPermitted, BitSet bytecodeOffsets) {
+     this(guessType(val, boolPermitted), new Integer(val), boolPermitted, bytecodeOffsets);
+   }
+ 
+-  public ConstExprent(VarType constType, Object value, Set<Integer> bytecodeOffsets) {
++  public ConstExprent(VarType constType, Object value, BitSet bytecodeOffsets) {
+     this(constType, value, false, bytecodeOffsets);
+   }
+ 
+-  private ConstExprent(VarType constType, Object value, boolean boolPermitted, Set<Integer> bytecodeOffsets) {
++  private ConstExprent(VarType constType, Object value, boolean boolPermitted, BitSet bytecodeOffsets) {
+     super(EXPRENT_CONST);
+     this.constType = constType;
+     this.value = value;
+@@ -411,6 +411,11 @@ public class ConstExprent extends Exprent {
+     return boolPermitted;
+   }
+ 
++  @Override
++  public void getBytecodeRange(BitSet values) {
++    measureBytecode(values);
++  }
++
+   // *****************************************************************************
+   // IMatchable implementation
+   // *****************************************************************************
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
+index 7b4a5ac..fd1491f 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
+@@ -31,8 +31,8 @@ import org.jetbrains.java.decompiler.struct.match.IMatchable.MatchProperties;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ 
+ import java.util.ArrayList;
++import java.util.BitSet;
+ import java.util.List;
+-import java.util.Set;
+ 
+ public class ExitExprent extends Exprent {
+ 
+@@ -43,7 +43,7 @@ public class ExitExprent extends Exprent {
+   private Exprent value;
+   private final VarType retType;
+ 
+-  public ExitExprent(int exitType, Exprent value, VarType retType, Set<Integer> bytecodeOffsets) {
++  public ExitExprent(int exitType, Exprent value, VarType retType, BitSet bytecodeOffsets) {
+     super(EXPRENT_EXIT);
+     this.exitType = exitType;
+     this.value = value;
+@@ -154,25 +154,31 @@ public class ExitExprent extends Exprent {
+   public VarType getRetType() {
+     return retType;
+   }
+-  
++
++  @Override
++  public void getBytecodeRange(BitSet values) {
++    measureBytecode(values, value);
++    measureBytecode(values);
++  }
++
+   // *****************************************************************************
+   // IMatchable implementation
+   // *****************************************************************************
+-  
++
+   public boolean match(MatchNode matchNode, MatchEngine engine) {
+ 
+     if(!super.match(matchNode, engine)) {
+       return false;
+     }
+-    
++
+     Integer type = (Integer)matchNode.getRuleValue(MatchProperties.EXPRENT_EXITTYPE);
+     if(type != null) {
+       if(this.exitType != type.intValue()) {
+         return false;
+       }
+     }
+-    
++
+     return true;
+   }
+-  
++
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+index 5f2cb56..db839fe 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+@@ -16,6 +16,7 @@
+ package org.jetbrains.java.decompiler.modules.decompiler.exps;
+ 
+ import java.util.ArrayList;
++import java.util.BitSet;
+ import java.util.Collection;
+ import java.util.Collections;
+ import java.util.Comparator;
+@@ -36,7 +37,7 @@ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
+ import org.jetbrains.java.decompiler.struct.match.MatchNode;
+ import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
+ 
+-public class Exprent implements IMatchable {
++public abstract class Exprent implements IMatchable {
+ 
+   public static final int MULTIPLE_USES = 1;
+   public static final int SIDE_EFFECTS_FREE = 2;
+@@ -59,7 +60,7 @@ public class Exprent implements IMatchable {
+ 
+   public final int type;
+   public final int id;
+-  public Set<Integer> bytecode = null;  // offsets of bytecode instructions decompiled to this exprent
++  public BitSet bytecode = null;  // offsets of bytecode instructions decompiled to this exprent
+ 
+   public Exprent(int type) {
+     this.type = type;
+@@ -132,14 +133,29 @@ public class Exprent implements IMatchable {
+ 
+   public void replaceExprent(Exprent oldExpr, Exprent newExpr) { }
+ 
+-  public void addBytecodeOffsets(Collection<Integer> bytecodeOffsets) {
+-    if (bytecodeOffsets != null && !bytecodeOffsets.isEmpty()) {
++  public void addBytecodeOffsets(BitSet bytecodeOffsets) {
++    if (bytecodeOffsets != null) {
+       if (bytecode == null) {
+-        bytecode = new HashSet<Integer>(bytecodeOffsets);
+-      }
+-      else {
+-        bytecode.addAll(bytecodeOffsets);
++        bytecode = new BitSet();
+       }
++      bytecode.or(bytecodeOffsets);
++    }
++  }
++
++  public abstract void getBytecodeRange(BitSet values);
++
++  protected void measureBytecode(BitSet values) {
++    if (bytecode != null)
++      values.or(bytecode);
++  }
++  protected static void measureBytecode(BitSet values, Exprent exprent) {
++    if (exprent != null)
++      exprent.getBytecodeRange(values);
++  }
++  protected static void measureBytecode(BitSet values, List<Exprent> list) {
++    if (list != null && !list.isEmpty()) {
++      for (Exprent e : list)
++        e.getBytecodeRange(values);
+     }
+   }
+ 
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
+index 4ac8123..fdc9cec 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
+@@ -34,8 +34,8 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ import org.jetbrains.java.decompiler.util.TextUtil;
+ 
+ import java.util.ArrayList;
++import java.util.BitSet;
+ import java.util.List;
+-import java.util.Set;
+ 
+ public class FieldExprent extends Exprent {
+ 
+@@ -45,11 +45,11 @@ public class FieldExprent extends Exprent {
+   private Exprent instance;
+   private final FieldDescriptor descriptor;
+ 
+-  public FieldExprent(LinkConstant cn, Exprent instance, Set<Integer> bytecodeOffsets) {
++  public FieldExprent(LinkConstant cn, Exprent instance, BitSet bytecodeOffsets) {
+     this(cn.elementname, cn.classname, instance == null, instance, FieldDescriptor.parseDescriptor(cn.descriptor), bytecodeOffsets);
+   }
+ 
+-  public FieldExprent(String name, String classname, boolean isStatic, Exprent instance, FieldDescriptor descriptor, Set<Integer> bytecodeOffsets) {
++  public FieldExprent(String name, String classname, boolean isStatic, Exprent instance, FieldDescriptor descriptor, BitSet bytecodeOffsets) {
+     super(EXPRENT_FIELD);
+     this.name = name;
+     this.classname = classname;
+@@ -185,31 +185,37 @@ public class FieldExprent extends Exprent {
+   public String getName() {
+     return name;
+   }
+-  
++
++  @Override
++  public void getBytecodeRange(BitSet values) {
++    measureBytecode(values, instance);
++    measureBytecode(values);
++  }
++
+   // *****************************************************************************
+   // IMatchable implementation
+   // *****************************************************************************
+-  
++
+   public boolean match(MatchNode matchNode, MatchEngine engine) {
+ 
+     if(!super.match(matchNode, engine)) {
+       return false;
+     }
+-    
++
+     RuleValue rule = matchNode.getRules().get(MatchProperties.EXPRENT_FIELD_NAME);
+     if(rule != null) {
+       if(rule.isVariable()) {
+         if(!engine.checkAndSetVariableValue((String)rule.value, this.name)) {
+           return false;
+         }
+-      } else { 
++      } else {
+         if(!rule.value.equals(this.name)) {
+           return false;
+         }
+       }
+     }
+-    
++
+     return true;
+   }
+-  
++
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
+index 48206a7..e8edbd5 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
+@@ -198,7 +198,7 @@ public class FunctionExprent extends Exprent {
+   private VarType implicitType;
+   private final List<Exprent> lstOperands;
+ 
+-  public FunctionExprent(int funcType, ListStack<Exprent> stack, Set<Integer> bytecodeOffsets) {
++  public FunctionExprent(int funcType, ListStack<Exprent> stack, BitSet bytecodeOffsets) {
+     this(funcType, new ArrayList<Exprent>(), bytecodeOffsets);
+ 
+     if (funcType >= FUNCTION_BIT_NOT && funcType <= FUNCTION_PPI && funcType != FUNCTION_CAST && funcType != FUNCTION_INSTANCEOF) {
+@@ -214,7 +214,7 @@ public class FunctionExprent extends Exprent {
+     }
+   }
+ 
+-  public FunctionExprent(int funcType, List<Exprent> operands, Set<Integer> bytecodeOffsets) {
++  public FunctionExprent(int funcType, List<Exprent> operands, BitSet bytecodeOffsets) {
+     super(EXPRENT_FUNCTION);
+     this.funcType = funcType;
+     this.lstOperands = operands;
+@@ -222,7 +222,7 @@ public class FunctionExprent extends Exprent {
+     addBytecodeOffsets(bytecodeOffsets);
+   }
+ 
+-  public FunctionExprent(int funcType, Exprent operand, Set<Integer> bytecodeOffsets) {
++  public FunctionExprent(int funcType, Exprent operand, BitSet bytecodeOffsets) {
+     this(funcType, new ArrayList<Exprent>(1), bytecodeOffsets);
+     lstOperands.add(operand);
+   }
+@@ -587,6 +587,12 @@ public class FunctionExprent extends Exprent {
+     return VarType.VARTYPE_INT;
+   }
+ 
++  @Override
++  public void getBytecodeRange(BitSet values) {
++    measureBytecode(values, lstOperands);
++    measureBytecode(values);
++  }
++
+   // *****************************************************************************
+   // getter and setter methods
+   // *****************************************************************************
+@@ -606,25 +612,25 @@ public class FunctionExprent extends Exprent {
+   public void setImplicitType(VarType implicitType) {
+     this.implicitType = implicitType;
+   }
+-  
++
+   // *****************************************************************************
+   // IMatchable implementation
+   // *****************************************************************************
+-  
++
+   public boolean match(MatchNode matchNode, MatchEngine engine) {
+ 
+     if(!super.match(matchNode, engine)) {
+       return false;
+     }
+-    
++
+     Integer type = (Integer)matchNode.getRuleValue(MatchProperties.EXPRENT_FUNCTYPE);
+     if(type != null) {
+       if(this.funcType != type.intValue()) {
+         return false;
+       }
+     }
+-    
++
+     return true;
+   }
+-  
++
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
+index 059270f..84ac9e7 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
+@@ -75,7 +75,7 @@ public class IfExprent extends Exprent {
+ 
+   private Exprent condition;
+ 
+-  public IfExprent(int ifType, ListStack<Exprent> stack, Set<Integer> bytecodeOffsets) {
++  public IfExprent(int ifType, ListStack<Exprent> stack, BitSet bytecodeOffsets) {
+     this(null, bytecodeOffsets);
+ 
+     if (ifType <= IF_LE) {
+@@ -93,7 +93,7 @@ public class IfExprent extends Exprent {
+     }
+   }
+ 
+-  private IfExprent(Exprent condition, Set<Integer> bytecodeOffsets) {
++  private IfExprent(Exprent condition, BitSet bytecodeOffsets) {
+     super(EXPRENT_IF);
+     this.condition = condition;
+ 
+@@ -146,4 +146,10 @@ public class IfExprent extends Exprent {
+   public void setCondition(Exprent condition) {
+     this.condition = condition;
+   }
++
++  @Override
++  public void getBytecodeRange(BitSet values) {
++    measureBytecode(values, condition);
++    measureBytecode(values);
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+index 4e73f06..7cf83be 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+@@ -20,7 +20,6 @@ import java.util.BitSet;
+ import java.util.Collections;
+ import java.util.List;
+ import java.util.Map.Entry;
+-import java.util.Set;
+ 
+ import org.jetbrains.java.decompiler.code.CodeConstants;
+ import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
+@@ -74,7 +73,7 @@ public class InvocationExprent extends Exprent {
+     super(EXPRENT_INVOCATION);
+   }
+ 
+-  public InvocationExprent(int opcode, LinkConstant cn, ListStack<Exprent> stack, int dynamicInvocationType, Set<Integer> bytecodeOffsets) {
++  public InvocationExprent(int opcode, LinkConstant cn, ListStack<Exprent> stack, int dynamicInvocationType, BitSet bytecodeOffsets) {
+     this();
+ 
+     name = cn.elementname;
+@@ -420,6 +419,13 @@ public class InvocationExprent extends Exprent {
+            InterpreterUtil.equalLists(lstParameters, it.getLstParameters());
+   }
+ 
++  @Override
++  public void getBytecodeRange(BitSet values) {
++    measureBytecode(values, lstParameters);
++    measureBytecode(values, instance);
++    measureBytecode(values);
++  }
++
+   public List<Exprent> getLstParameters() {
+     return lstParameters;
+   }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
+index 0ece9aa..bd9207f 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
+@@ -20,8 +20,8 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ 
+ import java.util.ArrayList;
++import java.util.BitSet;
+ import java.util.List;
+-import java.util.Set;
+ 
+ public class MonitorExprent extends Exprent {
+ 
+@@ -31,7 +31,7 @@ public class MonitorExprent extends Exprent {
+   private final int monType;
+   private Exprent value;
+ 
+-  public MonitorExprent(int monType, Exprent value, Set<Integer> bytecodeOffsets) {
++  public MonitorExprent(int monType, Exprent value, BitSet bytecodeOffsets) {
+     super(EXPRENT_MONITOR);
+     this.monType = monType;
+     this.value = value;
+@@ -80,6 +80,12 @@ public class MonitorExprent extends Exprent {
+            InterpreterUtil.equalObjects(value, me.getValue());
+   }
+ 
++  @Override
++  public void getBytecodeRange(BitSet values) {
++    measureBytecode(values, value);
++    measureBytecode(values);
++  }
++
+   public int getMonType() {
+     return monType;
+   }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+index 51137cc..1e87201 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+@@ -34,9 +34,9 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ import org.jetbrains.java.decompiler.util.ListStack;
+ 
+ import java.util.ArrayList;
++import java.util.BitSet;
+ import java.util.Collections;
+ import java.util.List;
+-import java.util.Set;
+ 
+ public class NewExprent extends Exprent {
+ 
+@@ -49,11 +49,11 @@ public class NewExprent extends Exprent {
+   private boolean lambda;
+   private boolean enumConst;
+ 
+-  public NewExprent(VarType newType, ListStack<Exprent> stack, int arrayDim, Set<Integer> bytecodeOffsets) {
++  public NewExprent(VarType newType, ListStack<Exprent> stack, int arrayDim, BitSet bytecodeOffsets) {
+     this(newType, getDimensions(arrayDim, stack), bytecodeOffsets);
+   }
+ 
+-  public NewExprent(VarType newType, List<Exprent> lstDims, Set<Integer> bytecodeOffsets) {
++  public NewExprent(VarType newType, List<Exprent> lstDims, BitSet bytecodeOffsets) {
+     super(EXPRENT_NEW);
+     this.newType = newType;
+     this.lstDims = lstDims;
+@@ -476,6 +476,14 @@ public class NewExprent extends Exprent {
+            InterpreterUtil.equalLists(lstArrayElements, ne.getLstArrayElements());
+   }
+ 
++  @Override
++  public void getBytecodeRange(BitSet values) {
++    measureBytecode(values, lstArrayElements);
++    measureBytecode(values, lstDims);
++    measureBytecode(values, constructor);
++    measureBytecode(values);
++  }
++
+   public InvocationExprent getConstructor() {
+     return constructor;
+   }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
+index fd77112..c2065c1 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
+@@ -22,15 +22,15 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ 
+ import java.util.ArrayList;
++import java.util.BitSet;
+ import java.util.List;
+-import java.util.Set;
+ 
+ public class SwitchExprent extends Exprent {
+ 
+   private Exprent value;
+   private List<List<ConstExprent>> caseValues = new ArrayList<List<ConstExprent>>();
+ 
+-  public SwitchExprent(Exprent value, Set<Integer> bytecodeOffsets) {
++  public SwitchExprent(Exprent value, BitSet bytecodeOffsets) {
+     super(EXPRENT_SWITCH);
+     this.value = value;
+ 
+@@ -112,6 +112,22 @@ public class SwitchExprent extends Exprent {
+     return InterpreterUtil.equalObjects(value, sw.getValue());
+   }
+ 
++  @Override
++  public void getBytecodeRange(BitSet values) {
++    if (caseValues != null && !caseValues.isEmpty()) {
++      for (List<ConstExprent> l : caseValues) {
++        if (l != null && !l.isEmpty()) {
++          for (Exprent e : l) {
++            if (e != null)
++              e.getBytecodeRange(values);
++          }
++        }
++      }
++    }
++    measureBytecode(values, value);
++    measureBytecode(values);
++  }
++
+   public Exprent getValue() {
+     return value;
+   }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+index 4436cb5..f071933 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+@@ -33,6 +33,7 @@ import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ 
+ import java.util.ArrayList;
++import java.util.BitSet;
+ import java.util.List;
+ 
+ public class VarExprent extends Exprent {
+@@ -120,6 +121,11 @@ public class VarExprent extends Exprent {
+            InterpreterUtil.equalObjects(getVarType(), ve.getVarType()); // FIXME: varType comparison redundant?
+   }
+ 
++  @Override
++  public void getBytecodeRange(BitSet values) {
++    measureBytecode(values);
++  }
++
+   public int getIndex() {
+     return index;
+   }
+@@ -184,31 +190,31 @@ public class VarExprent extends Exprent {
+   public void setStack(boolean stack) {
+     this.stack = stack;
+   }
+-  
++
+   // *****************************************************************************
+   // IMatchable implementation
+   // *****************************************************************************
+-  
++
+   public boolean match(MatchNode matchNode, MatchEngine engine) {
+ 
+     if(!super.match(matchNode, engine)) {
+       return false;
+     }
+-    
++
+     RuleValue rule = matchNode.getRules().get(MatchProperties.EXPRENT_VAR_INDEX);
+     if(rule != null) {
+       if(rule.isVariable()) {
+         if(!engine.checkAndSetVariableValue((String)rule.value, this.index)) {
+           return false;
+         }
+-      } else { 
++      } else {
+         if(this.index != Integer.valueOf((String)rule.value).intValue()) {
+           return false;
+         }
+       }
+     }
+-    
++
+     return true;
+   }
+-  
++
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java
+index ba82182..30a7a8f 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java
+@@ -15,6 +15,7 @@
+  */
+ package org.jetbrains.java.decompiler.modules.decompiler.stats;
+ 
++import java.util.BitSet;
+ import java.util.Collection;
+ import java.util.HashSet;
+ import java.util.Set;
+@@ -23,20 +24,18 @@ import java.util.Set;
+  * @author egor
+  */
+ public class DummyExitStatement extends Statement {
+-  public Set<Integer> bytecode = null;  // offsets of bytecode instructions mapped to dummy exit
++  public BitSet bytecode = null;  // offsets of bytecode instructions mapped to dummy exit
+ 
+   public DummyExitStatement() {
+     type = Statement.TYPE_DUMMYEXIT;
+   }
+ 
+-  public void addBytecodeOffsets(Collection<Integer> bytecodeOffsets) {
++  public void addBytecodeOffsets(BitSet bytecodeOffsets) {
+     if (bytecodeOffsets != null && !bytecodeOffsets.isEmpty()) {
+       if (bytecode == null) {
+-        bytecode = new HashSet<Integer>(bytecodeOffsets);
+-      }
+-      else {
+-        bytecode.addAll(bytecodeOffsets);
++        bytecode = new BitSet();
+       }
++      bytecode.or(bytecodeOffsets);
+     }
+   }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0021-Seperate-the-LVT-data-from-the-Struct-for-easier-abi.patch b/FernFlower-Patches/0021-Seperate-the-LVT-data-from-the-Struct-for-easier-abi.patch
new file mode 100644
index 0000000..f7b5782
--- /dev/null
+++ b/FernFlower-Patches/0021-Seperate-the-LVT-data-from-the-Struct-for-easier-abi.patch
@@ -0,0 +1,335 @@
+From 635b7b9fccfa0208ecb581cda039124cdd50eb9c Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Thu, 6 Aug 2015 13:52:24 -0700
+Subject: [PATCH 021/122] Seperate the LVT data from the Struct for easier
+ ability to pass around.
+
+---
+ .../modules/decompiler/vars/LVTVariable.java  |  70 +++++++++++
+ .../decompiler/vars/LocalVariableTable.java   |  72 +++++++++++
+ .../StructLocalVariableTableAttribute.java    | 116 ++----------------
+ 3 files changed, 151 insertions(+), 107 deletions(-)
+ create mode 100644 src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
+ create mode 100644 src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
+new file mode 100644
+index 0000000..0533981
+--- /dev/null
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
+@@ -0,0 +1,70 @@
++package org.jetbrains.java.decompiler.modules.decompiler.vars;
++
++import java.util.Comparator;
++import java.util.HashSet;
++import java.util.Map;
++import java.util.Set;
++
++public class LVTVariable implements Comparable<LVTVariable> {
++  public static final Comparator<LVTVariable> INDEX_SORTER = new Comparator<LVTVariable>() {
++    @Override
++    public int compare(LVTVariable o1, LVTVariable o2) {
++      if (o1.index != o2.index) return o1.index - o2.index;
++      if (o1.start != o2.start) return o1.start - o2.start;
++      return o1.end - o2.end;
++    }
++  };
++
++  public final String name;
++  public final int start;
++  public final int end;
++  public final int index;
++  private String desc;
++  private String sig;
++  private boolean isLVTT;
++
++  public LVTVariable(String name, String desc, int start, int end, int index, boolean isLVTT) {
++    this.name = name;
++    this.desc = desc;
++    this.start = start;
++    this.end = end;
++    this.index = index;
++    this.isLVTT = isLVTT;
++  }
++
++  void merge(LVTVariable other) {
++    if (other.isLVTT && this.sig == null) {
++      this.sig = other.desc;
++    }
++  }
++
++  @Override
++  public boolean equals(Object obj) {
++    if (!(obj instanceof LVTVariable))
++      return false;
++    return ((LVTVariable) obj).index == index && ((LVTVariable) obj).start == start;
++  }
++
++  @Override
++  public int hashCode() {
++    return index * 31 + start;
++  }
++
++  public void addTo(Map<Integer, Set<LVTVariable>> startpoints) {
++    Set<LVTVariable> starts = startpoints.get(this.start);
++    if (starts == null) {
++      starts = new HashSet<LVTVariable>();
++      startpoints.put(this.start, starts);
++    }
++    starts.add(this);
++  }
++
++  @Override
++  public int compareTo(LVTVariable o) {
++    if (o.start > start) return -1;
++    if (o.start < start) return 1;
++    if (o.index > index) return -1;
++    if (o.index < index) return 1;
++    return 0;
++  }
++}
+\ No newline at end of file
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+new file mode 100644
+index 0000000..75f144d
+--- /dev/null
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+@@ -0,0 +1,72 @@
++package org.jetbrains.java.decompiler.modules.decompiler.vars;
++
++import java.util.ArrayList;
++import java.util.HashMap;
++import java.util.List;
++import java.util.Map;
++import java.util.Set;
++
++public class LocalVariableTable {
++  private Map<Integer, Set<LVTVariable>> startpoints;
++  private ArrayList<LVTVariable> allLVT;
++  private Map<VarVersionPair, String> mapVarNames;
++
++  public LocalVariableTable(int len) {
++    startpoints = new HashMap<Integer,Set<LVTVariable>>(len);
++    allLVT = new ArrayList<LVTVariable>(len);
++  }
++
++  public void addVariable(LVTVariable v) {
++    allLVT.add(v);
++    v.addTo(startpoints);
++  }
++
++  public void mergeLVTs(LocalVariableTable otherLVT) {
++   for (LVTVariable other : otherLVT.allLVT) {
++      int idx = allLVT.indexOf(other);
++      if (idx < 0) {
++        allLVT.add(other);
++      }
++      else {
++        LVTVariable mine = allLVT.get(idx);
++        mine.merge(other);
++      }
++    }
++    mapVarNames = null; // Invalidate the cache and rebuild it.
++  }
++
++  public LVTVariable find(Integer index, List<Integer> offsets) {
++    for (Integer offset : offsets) {
++      Set<LVTVariable> lvs = startpoints.get(offset);
++      if (lvs == null || lvs.isEmpty())
++        continue;
++      int idx = index.intValue();
++
++      for (LVTVariable lv : lvs) {
++        if (lv.index == idx)
++          return lv;
++      }
++    }
++    return null;
++  }
++
++  public Map<VarVersionPair, String> getMapVarNames() {
++    if (mapVarNames == null)
++      buildNameMap();
++    return mapVarNames;
++  }
++
++  private void buildNameMap() {
++    Map<Integer, Integer> versions = new HashMap<Integer, Integer>();
++    mapVarNames = new HashMap<VarVersionPair, String>();
++    for (LVTVariable lvt : allLVT) {
++      Integer idx = versions.get(lvt.index);
++      if (idx == null)
++        idx = 0;
++      else
++        idx++;
++      versions.put(lvt.index, idx);
++      mapVarNames.put(new VarVersionPair(lvt.index, idx.intValue()), lvt.name);
++    }
++  }
++}
+\ No newline at end of file
+diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+index 5f55537..4455785 100644
+--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
++++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+@@ -15,20 +15,15 @@
+  */
+ package org.jetbrains.java.decompiler.struct.attr;
+ 
++import org.jetbrains.java.decompiler.modules.decompiler.vars.LVTVariable;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.LocalVariableTable;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+ import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+ import org.jetbrains.java.decompiler.util.DataInputFullStream;
+ 
+ import java.io.IOException;
+-import java.util.ArrayList;
+ import java.util.Collections;
+-import java.util.Comparator;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.List;
+ import java.util.Map;
+-import java.util.Map.Entry;
+-import java.util.Set;
+ 
+ /*
+   u2 local_variable_table_length;
+@@ -42,69 +37,8 @@ import java.util.Set;
+ */
+ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
+ 
+-  public static class LVTVariable implements Comparable<LVTVariable> {
+-      public final String name;
+-      public final int start;
+-      public final int end;
+-      public final int index;
+-      private String desc;
+-      private String sig;
+-      private boolean isLVTT;
+-      LVTVariable(String name, String desc, int start, int end, int index, boolean isLVTT) {
+-          this.name = name;
+-          this.desc = desc;
+-          this.start = start;
+-          this.end = end;
+-          this.index = index;
+-          this.isLVTT = isLVTT;
+-      }
+-
+-    void merge(LVTVariable other) {
+-        if (other.isLVTT && this.sig == null) {
+-            this.sig = other.desc;
+-        }
+-    }
+-    @Override
+-    public boolean equals(Object obj) {
+-        return ((LVTVariable) obj).index == index && ((LVTVariable) obj).end == end;
+-    }
+-    @Override
+-    public int hashCode() {
+-        return index * 31 + end;
+-    }
+-
+-    public void addTo(Map<Integer, Set<LVTVariable>> endpoints) {
+-        Set<LVTVariable> ends = endpoints.get(this.end);
+-        if (ends == null) {
+-            ends = new HashSet<LVTVariable>();
+-            endpoints.put(this.end, ends);
+-        }
+-        ends.add(this);
+-    }
+-
+-    @Override
+-    public int compareTo(LVTVariable o) {
+-        if (o.end > end) return -1;
+-        if (o.end < end) return 1;
+-        if (o.index > index) return -1;
+-        if (o.index < index) return 1;
+-        return 0;
+-    }
+-  }
+-
+-  private static Comparator<LVTVariable> comp = new Comparator<LVTVariable>() {
+-    @Override
+-    public int compare(LVTVariable o1, LVTVariable o2)
+-    {
+-      if (o1.index != o2.index) return o1.index - o2.index;
+-      if (o1.start != o2.start) return o1.start - o2.start;
+-      return o1.end - o2.end;
+-    }
+-  };
+-  private Map<VarVersionPair, String> mapVarNames = Collections.emptyMap();
+-
+-  private Map<Integer, Set<LVTVariable>> endpoints = Collections.emptyMap();
+-  private ArrayList<LVTVariable> allLVT;
++  private Map<VarVersionPair, String> EMPTY_LVT = Collections.emptyMap();
++  private LocalVariableTable lvt;
+ 
+   @Override
+   public void initContent(ConstantPool pool) throws IOException {
+@@ -113,9 +47,7 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
+     int len = data.readUnsignedShort();
+     boolean isLVTT = this.getName().equals(ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
+     if (len > 0) {
+-      mapVarNames = new HashMap<VarVersionPair, String>(len);
+-      endpoints = new HashMap<Integer,Set<LVTVariable>>(len);
+-      allLVT = new ArrayList<LVTVariable>(len);
++      lvt = new LocalVariableTable(len);
+       for (int i = 0; i < len; i++) {
+         int start = data.readUnsignedShort();
+         int vlen = data.readUnsignedShort();
+@@ -123,47 +55,17 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
+         int descIndex = data.readUnsignedShort(); // either descriptor or signature
+         int varIndex = data.readUnsignedShort();
+         LVTVariable v = new LVTVariable(pool.getPrimitiveConstant(nameIndex).getString(), pool.getPrimitiveConstant(descIndex).getString(),start,start+vlen,varIndex,isLVTT);
+-        allLVT.add(v);
+-        v.addTo(endpoints);
++        lvt.addVariable(v);
+       }
+-      Collections.sort(allLVT, comp);
+-      buildNameMap();
+-    }
+-    else {
+-      mapVarNames = Collections.emptyMap();
+     }
+   }
+ 
+   public void addLocalVariableTable(StructLocalVariableTableAttribute attr) {
+-    mapVarNames.putAll(attr.getMapVarNames());
+-    for (LVTVariable other : attr.allLVT) {
+-      int idx = allLVT.indexOf(other);
+-      if (idx < 0) {
+-        allLVT.add(other);
+-      }
+-      else {
+-        LVTVariable mine = allLVT.get(idx);
+-        mine.merge(other);
+-      }
+-    }
+-    Collections.sort(allLVT, comp);
+-  }
+-
+-  private void buildNameMap() {
+-    Map<Integer, Integer> versions = new HashMap<Integer, Integer>();
+-    mapVarNames.clear();
+-    for (LVTVariable lvt : allLVT) {
+-      Integer idx = versions.get(lvt.index);
+-      if (idx == null)
+-        idx = 0;
+-      else
+-        idx++;
+-      versions.put(lvt.index, idx);
+-      mapVarNames.put(new VarVersionPair(lvt.index, idx.intValue()), lvt.name);
+-    }
++    lvt.mergeLVTs(attr.lvt);
++    attr.lvt = lvt;
+   }
+ 
+   public Map<VarVersionPair, String> getMapVarNames() {
+-    return mapVarNames;
++    return lvt == null ? EMPTY_LVT : lvt.getMapVarNames();
+   }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0022-Aded-debug-printer-to-MethodProcessorRunnable-for-th.patch b/FernFlower-Patches/0022-Aded-debug-printer-to-MethodProcessorRunnable-for-th.patch
new file mode 100644
index 0000000..0665cce
--- /dev/null
+++ b/FernFlower-Patches/0022-Aded-debug-printer-to-MethodProcessorRunnable-for-th.patch
@@ -0,0 +1,179 @@
+From 7f9bb7d21c105347ab987df050eb7458ac8ab1f5 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Thu, 6 Aug 2015 17:01:25 -0700
+Subject: [PATCH 022/122] Aded debug printer to MethodProcessorRunnable for the
+ method outline.
+
+---
+ .../main/rels/MethodProcessorRunnable.java    | 123 +++++++++++++++++-
+ 1 file changed, 122 insertions(+), 1 deletion(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+index 1c90fb6..dc6f2f0 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+@@ -17,6 +17,7 @@ package org.jetbrains.java.decompiler.main.rels;
+ 
+ import org.jetbrains.java.decompiler.code.CodeConstants;
+ import org.jetbrains.java.decompiler.code.InstructionSequence;
++import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
+ import org.jetbrains.java.decompiler.code.cfg.ControlFlowGraph;
+ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
+@@ -25,12 +26,16 @@ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+ import org.jetbrains.java.decompiler.modules.code.DeadCodeHelper;
+ import org.jetbrains.java.decompiler.modules.decompiler.*;
+ import org.jetbrains.java.decompiler.modules.decompiler.deobfuscator.ExceptionDeobfuscator;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.DummyExitStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
+ import org.jetbrains.java.decompiler.struct.StructClass;
+ import org.jetbrains.java.decompiler.struct.StructMethod;
+ 
+ import java.io.IOException;
++import java.util.BitSet;
+ 
+ public class MethodProcessorRunnable implements Runnable {
+ 
+@@ -138,7 +143,7 @@ public class MethodProcessorRunnable implements Runnable {
+     proc.processStatement(root, cl);
+ 
+     SequenceHelper.condenseSequences(root);
+-    
++
+     while (true) {
+       StackVarsProcessor stackProc = new StackVarsProcessor();
+       stackProc.simplifyStackVars(root, mt, cl);
+@@ -199,6 +204,8 @@ public class MethodProcessorRunnable implements Runnable {
+ 
+     varProc.setVarDefinitions(root);
+ 
++    printMethod(root);
++
+     // must be the last invocation, because it makes the statement structure inconsistent
+     // FIXME: new edge type needed
+     LabelHelper.replaceContinueWithBreak(root);
+@@ -217,4 +224,118 @@ public class MethodProcessorRunnable implements Runnable {
+   public boolean isFinished() {
+     return finished;
+   }
++
++  private static void printMethod(RootStatement root) {
++    System.out.println("{");
++
++    for (Object obj : root.getSequentialObjects()) {
++      if (obj instanceof Statement) {
++        printStatement((Statement)obj, "  ");
++      } else {
++        System.out.println("  " + obj.getClass().getSimpleName());
++      }
++    }
++    printStatement(root.getDummyExit(), "  ");
++    System.out.println("}");
++  }
++
++  private static void getOffset(Statement st, BitSet values) {
++    if (st instanceof DummyExitStatement && ((DummyExitStatement)st).bytecode != null)
++      values.or(((DummyExitStatement)st).bytecode);
++    if (st.getExprents() != null) {
++      for (Exprent e : st.getExprents()) {
++        e.getBytecodeRange(values);
++      }
++    } else {
++      for (Object obj : st.getSequentialObjects()) {
++        if (obj instanceof Statement) {
++          getOffset((Statement)obj, values);
++        } else if (obj instanceof Exprent) {
++          ((Exprent)obj).getBytecodeRange(values);
++        } else {
++          System.out.println("WTF?" + obj.getClass());
++        }
++      }
++    }
++  }
++
++  private static void printStatement(Statement statement, String indent) {
++    BitSet values = new BitSet();
++    getOffset(statement, values);
++    int start = values.nextSetBit(0);
++    int end = values.length()-1;
++
++    System.out.println(indent + statement.type + ": (" + start + ", " + end + ") " + statement.getClass().getSimpleName());
++
++    if (statement.getExprents() != null) {
++      for(Exprent exp : statement.getExprents()) {
++        System.out.println(indent + "  " + exp.getClass().getSimpleName());
++      }
++    }
++    /*
++      for (Object obj : stat.getSequentialObjects()) {
++        if (obj instanceof Statement) {
++          Statement st = (Statement)obj;
++          childVars.addAll(initStatement(st));
++
++          if (st.type == DoStatement.TYPE_DO) {
++            DoStatement dost = (DoStatement)st;
++            if (dost.getLooptype() != DoStatement.LOOP_FOR &&
++                dost.getLooptype() != DoStatement.LOOP_DO) {
++              currVars.add(dost.getConditionExprent());
++            }
++          }
++          else if (st.type == DoStatement.TYPE_CATCHALL) {
++            CatchAllStatement fin = (CatchAllStatement)st;
++            if (fin.isFinally() && fin.getMonitor() != null) {
++              currVars.add(fin.getMonitor());
++            }
++          }
++        }
++        else if (obj instanceof Exprent) {
++          currVars.add((Exprent)obj);
++        }
++      }
++
++      // children statements
++      for (Integer index : childVars) {
++        Integer count = mapCount.get(index);
++        if (count == null) {
++          count = new Integer(0);
++        }
++        mapCount.put(index, new Integer(count.intValue() + 1));
++      }
++
++      condlst = getAllVars(currVars);
++    }
++    else {
++      condlst = getAllVars(stat.getExprents());
++    }
++
++    // this statement
++    for (VarExprent var : condlst) {
++      mapCount.put(new Integer(var.getIndex()), new Integer(2));
++    }
++
++
++    HashSet<Integer> set = new HashSet<Integer>(mapCount.keySet());
++
++    // put all variables defined in this statement into the set
++    for (Entry<Integer, Integer> en : mapCount.entrySet()) {
++      if (en.getValue().intValue() > 1) {
++        mapVarDefStatements.put(en.getKey(), stat);
++      }
++    }
++
++    mapStatementVars.put(stat.id, set);
++*/
++    indent += "  ";
++    for (Object obj : statement.getSequentialObjects()) {
++      if (obj instanceof Statement) {
++        printStatement((Statement)obj, indent);
++      } else {
++        System.out.println(indent + obj.getClass().getSimpleName());
++      }
++    }
++  }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0023-A-scoping-test-simpler-than-the-complex-one-almost-p.patch b/FernFlower-Patches/0023-A-scoping-test-simpler-than-the-complex-one-almost-p.patch
new file mode 100644
index 0000000..52fdd9c
--- /dev/null
+++ b/FernFlower-Patches/0023-A-scoping-test-simpler-than-the-complex-one-almost-p.patch
@@ -0,0 +1,120 @@
+From d72455431b4c610f5c9768a2f27c7adffcc7f086 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sat, 8 Aug 2015 13:37:49 -0400
+Subject: [PATCH 023/122] A scoping test, simpler than the complex one, almost
+ passes.
+
+---
+ testData/classes/pkg/TestLVTScoping.class | Bin 0 -> 1024 bytes
+ testData/results/TestLVTScoping.dec       |  35 ++++++++++++++++++++++
+ testData/src/pkg/TestLVTScoping.java      |  34 +++++++++++++++++++++
+ 3 files changed, 69 insertions(+)
+ create mode 100644 testData/classes/pkg/TestLVTScoping.class
+ create mode 100644 testData/results/TestLVTScoping.dec
+ create mode 100644 testData/src/pkg/TestLVTScoping.java
+
+diff --git a/testData/classes/pkg/TestLVTScoping.class b/testData/classes/pkg/TestLVTScoping.class
+new file mode 100644
+index 0000000000000000000000000000000000000000..b13a2da2070ddc93780406d9b74262fec5610576
+GIT binary patch
+literal 1024
+zcma)4U2hUW6g>l5mZeZWODkY&>ldIFZPgcyNn>I{N?Q{M34L4WNVkPu0!yR+#<xD}
+z0~#Ov0sbaqJhKpxRHK<>=H8h*=bU?HzW@CC4Ztp*>+lIA`WKy2T@Kx9qh4z}ear6X
+z&;(-V=A~Kcns%pj+&Y(SS0M1hvMu+efInYo2xzaIQyGFEMi@&72t=!vEssXMmK@a0
+zR#y_d>a@*n!yH&DpKfaInKcwhRj)IbNz#+<nR6OK3<(`^f%sfV#dc*!4#G$xC7@rL
+z-H|+gE0E4t3e{_6WrdLrV-4#9LCba<s@_vy2_nOwx!(*T$KYtcX<!4lbZjnkUVA@u
+zWiN~^Y_rN4(S+3rk>!-$42W5C2h!}3>JIMdxGRwKbSxf+aUXdK?yDPJn;`k$<Pw6W
+zmzAZ$RG!T{nH~v5YOdM7I5hj7hdLfD%JdLOF!6487VRlrPZT}(wET(3aUu|^Iio>a
+zzP8jOB^O_RN71umHq37VXpH#0oONa;u7c}Q@iT%S8Tb(5td3RbGUxE5fNO-AftA_i
+zA*)qgPSd_1I>zb;7>OGPR|q7s2cK}WIL2*->Gv=*ya$plBS;JbaqgywnkBB{NfT{_
+zwFMNJrC2qI9xyZDi~oR6$3uoY{}vGWyMP$U;v`CN=D*{}lKTGy7!v`dnSggw2e#)9
+zM71(o&y4Z-3V)Qb;TgY9$_zWtQb3M>dV|>}pJ{6*CBnJ__Sk*Ki<B$M3k|+CgT6my
+H?8CEPwhyta
+
+literal 0
+HcmV?d00001
+
+diff --git a/testData/results/TestLVTScoping.dec b/testData/results/TestLVTScoping.dec
+new file mode 100644
+index 0000000..7bbf624
+--- /dev/null
++++ b/testData/results/TestLVTScoping.dec
+@@ -0,0 +1,35 @@
++package pkg;
++
++public class TestLVTScoping {
++
++
++   public static void method() {      String a;
++      if(1 == Integer.valueOf(1).intValue()) {
++         a = "YAY";
++      } else {
++         a = "NAY";      }
++
++      System.out.println(a);
++   }
++
++   public static void method2() {      String a;
++      if(1 == Integer.valueOf(1).intValue()) {
++         a = "YAY";
++      } else {
++         a = "NAY";
++         System.out.println(a);
++      }   }
++
++   public static void method3() {
++      if(1 == Integer.valueOf(1).intValue()) {
++
++         boolean a = true;
++         System.out.println(a);
++      } else {
++
++         String a = "NAY";
++         System.out.println(a);
++      }
++
++   }
++}
+diff --git a/testData/src/pkg/TestLVTScoping.java b/testData/src/pkg/TestLVTScoping.java
+new file mode 100644
+index 0000000..ab57832
+--- /dev/null
++++ b/testData/src/pkg/TestLVTScoping.java
+@@ -0,0 +1,34 @@
++package pkg;
++
++
++public class TestLVTScoping {
++    public static void method() {
++        String a;
++        if (1 == Integer.valueOf(1)) {
++            a = "YAY";
++        } else {
++            a = "NAY";
++        }
++        System.out.println(a);
++    }
++    public static void method2() {
++        String a;
++        if (1 == Integer.valueOf(1)) {
++            a = "YAY";
++        } else {
++            a = "NAY";
++            System.out.println(a);
++        }
++    }
++    public static void method3() {
++        if (1 == Integer.valueOf(1)) {
++            boolean a;
++            a = true;
++            System.out.println(a);
++        } else {
++            String a;
++            a = "NAY";
++            System.out.println(a);
++        }
++    }
++}
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0024-Add-the-test-to-the-harness.patch b/FernFlower-Patches/0024-Add-the-test-to-the-harness.patch
new file mode 100644
index 0000000..bff8191
--- /dev/null
+++ b/FernFlower-Patches/0024-Add-the-test-to-the-harness.patch
@@ -0,0 +1,22 @@
+From 1314b694ee1457fd6e9a91adcfa910ef9549faf0 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sat, 8 Aug 2015 13:43:47 -0400
+Subject: [PATCH 024/122] Add the test to the harness
+
+---
+ test/org/jetbrains/java/decompiler/LVTTest.java | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
+index 2d39827..983368c 100644
+--- a/test/org/jetbrains/java/decompiler/LVTTest.java
++++ b/test/org/jetbrains/java/decompiler/LVTTest.java
+@@ -30,4 +30,5 @@ public class LVTTest extends SingleClassesTestBase {
+   }
+ 
+   @Test public void testMatch1() { doTest("pkg/TestLVT"); }
++  @Test public void testMatch2() { doTest("pkg/TestLVTScoping"); }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0025-Prioritize-self-and-enclosing-class-when-encounterin.patch b/FernFlower-Patches/0025-Prioritize-self-and-enclosing-class-when-encounterin.patch
deleted file mode 100644
index 5d0ed68..0000000
--- a/FernFlower-Patches/0025-Prioritize-self-and-enclosing-class-when-encounterin.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Wed, 12 Sep 2018 03:01:05 -0700
-Subject: [PATCH] Prioritize self and enclosing class when encountering
- inconsistent InnerClass attributes.
-
-The compiler encodes all REFERENCED inner classes into the class. The first found used to win, but now ThisClass > EnclosingClass > Others AccessTransformers only edit the targeted class as it can't find all references.
-Fixes AccessTransformers.
-
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index 0fb12b6d99f3c1dc7652e5ab49e36683d7a6db08..6f2f8419d41a240c6d1428be0b0ca9258f058127 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-@@ -1205,6 +1205,10 @@ public class ClassWriter {
-     }
-   }
- 
-+  public static String getModifiers(int flags) {
-+    return MODIFIERS.entrySet().stream().filter(e -> (e.getKey() & flags) != 0).map(Map.Entry::getValue).collect(Collectors.joining(" "));
-+  }
-+
-   public static void appendTypeParameters(
-       TextBuffer buffer,
-       List<String> parameters,
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index 3398f884985021a324fc5ae6ac6a461f8e5b2f33..921b3b653743ff77dead340be940fcef759bcead 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-@@ -41,10 +41,20 @@ public class ClassesProcessor implements CodeConstants {
-     private String simpleName;
-     private int type;
-     private int accessFlags;
-+    private String source;
- 
-     private static boolean equal(Inner o1, Inner o2) {
-       return o1.type == o2.type && o1.accessFlags == o2.accessFlags && Objects.equals(o1.simpleName, o2.simpleName);
-     }
-+
-+    @Override
-+    public String toString() {
-+      return simpleName + " " + ClassWriter.getModifiers(accessFlags) + " " + getType() + " " + source;
-+    }
-+
-+    private String getType() {
-+        return type == ClassNode.CLASS_ANONYMOUS ? "ANONYMOUS" : type == ClassNode.CLASS_LAMBDA ? "LAMBDA" : type == ClassNode.CLASS_LOCAL ? "LOCAL" : type == ClassNode.CLASS_MEMBER ? "MEMBER" : type == ClassNode.CLASS_ROOT ? "ROOT" : "UNKNOWN(" + type +")";
-+    }
-   }
- 
-   public ClassesProcessor(StructContext context) {
-@@ -87,6 +97,7 @@ public class ClassesProcessor implements CodeConstants {
-               rec.simpleName = simpleName;
-               rec.type = entry.simpleNameIdx == 0 ? ClassNode.CLASS_ANONYMOUS : entry.outerNameIdx == 0 ? ClassNode.CLASS_LOCAL : ClassNode.CLASS_MEMBER;
-               rec.accessFlags = entry.accessFlags;
-+              rec.source = cl.qualifiedName;
- 
-               // nested class type
-               if (entry.innerName != null) {
-@@ -131,6 +142,13 @@ public class ClassesProcessor implements CodeConstants {
-                 else if (!Inner.equal(existingRec, rec)) {
-                   String message = "Inconsistent inner class entries for " + innerName + "!";
-                   DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
-+                  DecompilerContext.getLogger().writeMessage("  Old: " + existingRec.toString(), IFernflowerLogger.Severity.WARN);
-+                  DecompilerContext.getLogger().writeMessage("  New: " + rec.toString(), IFernflowerLogger.Severity.WARN);
-+                  int oldPriority = existingRec.source.equals(innerName) ? 1 : existingRec.source.equals(enclClassName) ? 2 : 3;
-+                  int newPriority = rec.source.equals(innerName) ? 1 : rec.source.equals(enclClassName) ? 2 : 3;
-+                  if (newPriority < oldPriority) {
-+                      mapInnerClasses.put(innerName, rec);
-+                  }
-                 }
- 
-                 // reference to the nested class
diff --git a/FernFlower-Patches/0025-Some-modifications-to-the-printout.-Also-fixed-a-fas.patch b/FernFlower-Patches/0025-Some-modifications-to-the-printout.-Also-fixed-a-fas.patch
new file mode 100644
index 0000000..3e6a8a4
--- /dev/null
+++ b/FernFlower-Patches/0025-Some-modifications-to-the-printout.-Also-fixed-a-fas.patch
@@ -0,0 +1,267 @@
+From cca06e0f3dd96dd8f0412628e2ee33359c461179 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sat, 8 Aug 2015 16:13:27 -0400
+Subject: [PATCH 025/122] Some modifications to the printout. Also, fixed a
+ fascinating bug in VarVersionsProcessor where it dumped the original indexes
+ because setVarVersions is called multiple times (seems to be some sort of
+ reparse loop). Preserving an existing origvarstable across the that method
+ seems to have improved accuracy a LOT.
+
+---
+ .../decompiler/main/rels/ClassWrapper.java    |  4 ++
+ .../main/rels/MethodProcessorRunnable.java    | 42 +++++++++++++++----
+ .../modules/decompiler/vars/LVTVariable.java  |  4 ++
+ .../decompiler/vars/LocalVariableTable.java   | 12 ++++++
+ .../modules/decompiler/vars/VarProcessor.java | 21 ++++++++++
+ .../decompiler/vars/VarVersionsProcessor.java |  1 +
+ .../StructLocalVariableTableAttribute.java    |  4 ++
+ 7 files changed, 79 insertions(+), 9 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+index 18f05a3..4e86556 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+@@ -170,9 +170,13 @@ public class ClassWrapper {
+ 
+         if (attr != null) {
+           varProc.setDebugVarNames(attr.getMapVarNames());
++          varProc.setLVT(attr.getLVT());
+         }
+       }
+ 
++      MethodProcessorRunnable.printMethod(root, mt.getClassStruct().qualifiedName+"."+mt.getName()+mt.getDescriptor(),varProc);
++
++
+       DecompilerContext.getLogger().endMethod();
+     }
+ 
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+index dc6f2f0..f0b17a5 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+@@ -26,16 +26,20 @@ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+ import org.jetbrains.java.decompiler.modules.code.DeadCodeHelper;
+ import org.jetbrains.java.decompiler.modules.decompiler.*;
+ import org.jetbrains.java.decompiler.modules.decompiler.deobfuscator.ExceptionDeobfuscator;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.DummyExitStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.LVTVariable;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
+ import org.jetbrains.java.decompiler.struct.StructClass;
+ import org.jetbrains.java.decompiler.struct.StructMethod;
+ 
+ import java.io.IOException;
+ import java.util.BitSet;
++import java.util.List;
+ 
+ public class MethodProcessorRunnable implements Runnable {
+ 
+@@ -204,8 +208,6 @@ public class MethodProcessorRunnable implements Runnable {
+ 
+     varProc.setVarDefinitions(root);
+ 
+-    printMethod(root);
+-
+     // must be the last invocation, because it makes the statement structure inconsistent
+     // FIXME: new edge type needed
+     LabelHelper.replaceContinueWithBreak(root);
+@@ -225,17 +227,17 @@ public class MethodProcessorRunnable implements Runnable {
+     return finished;
+   }
+ 
+-  private static void printMethod(RootStatement root) {
+-    System.out.println("{");
++  public static void printMethod(RootStatement root, String name, VarProcessor varProc) {
++    System.out.println(name + " {");
+ 
+     for (Object obj : root.getSequentialObjects()) {
+       if (obj instanceof Statement) {
+-        printStatement((Statement)obj, "  ");
++        printStatement((Statement)obj, "  ",varProc);
+       } else {
+         System.out.println("  " + obj.getClass().getSimpleName());
+       }
+     }
+-    printStatement(root.getDummyExit(), "  ");
++    printStatement(root.getDummyExit(), "  ",varProc);
+     System.out.println("}");
+   }
+ 
+@@ -259,7 +261,7 @@ public class MethodProcessorRunnable implements Runnable {
+     }
+   }
+ 
+-  private static void printStatement(Statement statement, String indent) {
++  private static void printStatement(Statement statement, String indent, VarProcessor varProc) {
+     BitSet values = new BitSet();
+     getOffset(statement, values);
+     int start = values.nextSetBit(0);
+@@ -269,7 +271,7 @@ public class MethodProcessorRunnable implements Runnable {
+ 
+     if (statement.getExprents() != null) {
+       for(Exprent exp : statement.getExprents()) {
+-        System.out.println(indent + "  " + exp.getClass().getSimpleName());
++          System.out.println(printExprent(indent + "  ", exp,varProc));
+       }
+     }
+     /*
+@@ -332,10 +334,32 @@ public class MethodProcessorRunnable implements Runnable {
+     indent += "  ";
+     for (Object obj : statement.getSequentialObjects()) {
+       if (obj instanceof Statement) {
+-        printStatement((Statement)obj, indent);
++        printStatement((Statement)obj, indent,varProc);
++      } else if (obj instanceof Exprent) {
++          System.out.println(printExprent(indent, (Exprent) obj, varProc));
+       } else {
+         System.out.println(indent + obj.getClass().getSimpleName());
+       }
+     }
+   }
++  private static String printExprent(String indent, Exprent exp, VarProcessor varProc) {
++      StringBuffer sb = new StringBuffer();
++      sb.append(indent);
++      BitSet values = new BitSet();
++      exp.getBytecodeRange(values);
++      sb.append("(").append(values.nextSetBit(0)).append(", ").append(values.length()-1).append(") ");
++      sb.append(exp.getClass().getSimpleName());
++      sb.append(" ").append(exp.id).append(" ");
++      if (exp instanceof VarExprent) {
++          VarExprent varExprent = (VarExprent)exp;
++        int currindex = varExprent.getIndex();
++        int origindex = varProc.getRemapped(currindex);
++        List<LVTVariable> candidates = varProc.getLVT().getCandidates(origindex);
++        sb.append("[").append(currindex).append(":").append(origindex).append(", ").append(varExprent.isStack()).append("]").append(candidates);
++      } else if (exp instanceof AssignmentExprent) {
++          AssignmentExprent assignmentExprent = (AssignmentExprent)exp;
++        sb.append("{").append(printExprent(" ",assignmentExprent.getLeft(),varProc)).append(" =").append(printExprent(" ",assignmentExprent.getRight(),varProc)).append("}");
++      }
++      return sb.toString();
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
+index 0533981..13cfa70 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
+@@ -67,4 +67,8 @@ public class LVTVariable implements Comparable<LVTVariable> {
+     if (o.index < index) return 1;
+     return 0;
+   }
++  @Override
++    public String toString() {
++        return "\'("+index+","+start+")"+desc+(sig!=null ? "<"+sig+"> ":" ")+name+"\'";
++    }
+ }
+\ No newline at end of file
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+index 75f144d..027e816 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+@@ -10,6 +10,7 @@ public class LocalVariableTable {
+   private Map<Integer, Set<LVTVariable>> startpoints;
+   private ArrayList<LVTVariable> allLVT;
+   private Map<VarVersionPair, String> mapVarNames;
++private Map<Integer, List<LVTVariable>> mapLVT;
+ 
+   public LocalVariableTable(int len) {
+     startpoints = new HashMap<Integer,Set<LVTVariable>>(len);
+@@ -59,6 +60,7 @@ public class LocalVariableTable {
+   private void buildNameMap() {
+     Map<Integer, Integer> versions = new HashMap<Integer, Integer>();
+     mapVarNames = new HashMap<VarVersionPair, String>();
++    mapLVT = new HashMap<Integer,List<LVTVariable>>();
+     for (LVTVariable lvt : allLVT) {
+       Integer idx = versions.get(lvt.index);
+       if (idx == null)
+@@ -66,7 +68,17 @@ public class LocalVariableTable {
+       else
+         idx++;
+       versions.put(lvt.index, idx);
++      List<LVTVariable> lvtList = mapLVT.get(lvt.index);
++      if (lvtList == null) {
++          lvtList = new ArrayList<LVTVariable>();
++          mapLVT.put(lvt.index, lvtList);
++      }
++      lvtList.add(lvt);
+       mapVarNames.put(new VarVersionPair(lvt.index, idx.intValue()), lvt.name);
+     }
+   }
++
++public List<LVTVariable> getCandidates(int index) {
++    return mapLVT.get(index);
++}
+ }
+\ No newline at end of file
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+index fbd3455..07b5398 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+@@ -31,10 +31,18 @@ public class VarProcessor {
+   private VarVersionsProcessor varVersions;
+   private final Map<VarVersionPair, String> thisVars = new HashMap<VarVersionPair, String>();
+   private final Set<VarVersionPair> externalVars = new HashSet<VarVersionPair>();
++private LocalVariableTable lvt;
+ 
+   public void setVarVersions(RootStatement root) {
++    Map<Integer, Integer> mapOriginalVarIndices = null;
++    if (varVersions != null) {
++        mapOriginalVarIndices = varVersions.getMapOriginalVarIndices();
++    }
+     varVersions = new VarVersionsProcessor();
+     varVersions.setVarVersions(root);
++    if (mapOriginalVarIndices != null) {
++        varVersions.getMapOriginalVarIndices().putAll(mapOriginalVarIndices);
++    }
+   }
+ 
+   public void setVarDefinitions(Statement root) {
+@@ -121,4 +129,17 @@ public class VarProcessor {
+   public Set<VarVersionPair> getExternalVars() {
+     return externalVars;
+   }
++
++public void setLVT(LocalVariableTable lvt) {
++    this.lvt = lvt;
++}
++public LocalVariableTable getLVT() {
++    return this.lvt;
++}
++
++public int getRemapped(int index) {
++    Integer res = varVersions.getMapOriginalVarIndices().get(index);
++    if (res == null) return index;
++    return res;
++}
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+index 4751052..0de789a 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+@@ -233,6 +233,7 @@ public class VarVersionsProcessor {
+ 
+     final Map<VarVersionPair, Integer> mapVarPaar = new HashMap<VarVersionPair, Integer>();
+     Map<Integer, Integer> mapOriginalVarIndices = new HashMap<Integer, Integer>();
++    mapOriginalVarIndices.putAll(this.mapOriginalVarIndices);
+ 
+     // map var-version pairs on new var indexes
+     List<VarVersionPair> lst = new ArrayList<VarVersionPair>(mapExprentMinTypes.keySet());
+diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+index 4455785..4b00061 100644
+--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
++++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+@@ -68,4 +68,8 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
+   public Map<VarVersionPair, String> getMapVarNames() {
+     return lvt == null ? EMPTY_LVT : lvt.getMapVarNames();
+   }
++
++public LocalVariableTable getLVT() {
++    return lvt;
++}
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0026-Change-to-track-the-varversionpair-in-the-oldnames-t.patch b/FernFlower-Patches/0026-Change-to-track-the-varversionpair-in-the-oldnames-t.patch
new file mode 100644
index 0000000..7016ea9
--- /dev/null
+++ b/FernFlower-Patches/0026-Change-to-track-the-varversionpair-in-the-oldnames-t.patch
@@ -0,0 +1,126 @@
+From 67a6f1d47bd5780221f7a545e899430cfc82e9be Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sat, 8 Aug 2015 17:22:07 -0400
+Subject: [PATCH 026/122] Change to track the varversionpair in the "oldnames"
+ table. Track if we have an lvt entry when generating names and trust it's
+ name exactly.
+
+---
+ .../decompiler/vars/LocalVariableTable.java     |  2 +-
+ .../modules/decompiler/vars/VarProcessor.java   | 17 +++++++++--------
+ .../decompiler/vars/VarVersionsProcessor.java   |  8 ++++----
+ 3 files changed, 14 insertions(+), 13 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+index 027e816..99025a5 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+@@ -64,7 +64,7 @@ private Map<Integer, List<LVTVariable>> mapLVT;
+     for (LVTVariable lvt : allLVT) {
+       Integer idx = versions.get(lvt.index);
+       if (idx == null)
+-        idx = 0;
++        idx = 1;
+       else
+         idx++;
+       versions.put(lvt.index, idx);
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+index 07b5398..a2a79f5 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+@@ -34,7 +34,7 @@ public class VarProcessor {
+ private LocalVariableTable lvt;
+ 
+   public void setVarVersions(RootStatement root) {
+-    Map<Integer, Integer> mapOriginalVarIndices = null;
++    Map<Integer, VarVersionPair> mapOriginalVarIndices = null;
+     if (varVersions != null) {
+         mapOriginalVarIndices = varVersions.getMapOriginalVarIndices();
+     }
+@@ -57,7 +57,7 @@ private LocalVariableTable lvt;
+       return;
+     }
+ 
+-    Map<Integer, Integer> mapOriginalVarIndices = varVersions.getMapOriginalVarIndices();
++    Map<Integer, VarVersionPair> mapOriginalVarIndices = varVersions.getMapOriginalVarIndices();
+ 
+     List<VarVersionPair> listVars = new ArrayList<VarVersionPair>(mapVarNames.keySet());
+     Collections.sort(listVars, new Comparator<VarVersionPair>() {
+@@ -72,18 +72,19 @@ private LocalVariableTable lvt;
+     for (VarVersionPair pair : listVars) {
+       String name = mapVarNames.get(pair);
+ 
+-      Integer index = mapOriginalVarIndices.get(pair.var);
+-      if (index != null) {
+-        VarVersionPair key = new VarVersionPair(index.intValue(), pair.version);
++      VarVersionPair key = mapOriginalVarIndices.get(pair.var);
++      boolean lvtName = false;
++      if (key != null) {
+         if (mapDebugVarNames.containsKey(key)) {
+           name = mapDebugVarNames.get(key);
++          lvtName = true;
+         }
+       }
+ 
+       Integer counter = mapNames.get(name);
+       mapNames.put(name, counter == null ? counter = new Integer(0) : ++counter);
+ 
+-      if (counter > 0) {
++      if (counter > 0 && !lvtName) {
+         name += String.valueOf(counter);
+       }
+ 
+@@ -138,8 +139,8 @@ public LocalVariableTable getLVT() {
+ }
+ 
+ public int getRemapped(int index) {
+-    Integer res = varVersions.getMapOriginalVarIndices().get(index);
++    VarVersionPair res = varVersions.getMapOriginalVarIndices().get(index);
+     if (res == null) return index;
+-    return res;
++    return res.var;
+ }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+index 0de789a..eae4cba 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+@@ -34,7 +34,7 @@ import java.util.Map.Entry;
+ 
+ public class VarVersionsProcessor {
+ 
+-  private Map<Integer, Integer> mapOriginalVarIndices = new HashMap<Integer, Integer>();
++  private Map<Integer, VarVersionPair> mapOriginalVarIndices = new HashMap<Integer, VarVersionPair>();
+   private VarTypeProcessor typeProcessor;
+ 
+   public void setVarVersions(RootStatement root) {
+@@ -232,7 +232,7 @@ public class VarVersionsProcessor {
+     CounterContainer counters = DecompilerContext.getCounterContainer();
+ 
+     final Map<VarVersionPair, Integer> mapVarPaar = new HashMap<VarVersionPair, Integer>();
+-    Map<Integer, Integer> mapOriginalVarIndices = new HashMap<Integer, Integer>();
++    Map<Integer, VarVersionPair> mapOriginalVarIndices = new HashMap<Integer, VarVersionPair>();
+     mapOriginalVarIndices.putAll(this.mapOriginalVarIndices);
+ 
+     // map var-version pairs on new var indexes
+@@ -259,7 +259,7 @@ public class VarVersionsProcessor {
+         }
+ 
+         mapVarPaar.put(pair, newIndex);
+-        mapOriginalVarIndices.put(newIndex, pair.var);
++        mapOriginalVarIndices.put(newIndex, pair);
+       }
+     }
+ 
+@@ -316,7 +316,7 @@ public class VarVersionsProcessor {
+     typeProcessor.getMapFinalVars().put(pair, finalType);
+   }
+ 
+-  public Map<Integer, Integer> getMapOriginalVarIndices() {
++  public Map<Integer, VarVersionPair> getMapOriginalVarIndices() {
+     return mapOriginalVarIndices;
+   }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0026-Fix-ambiguous-lambdas.patch b/FernFlower-Patches/0026-Fix-ambiguous-lambdas.patch
deleted file mode 100644
index c57c3e1..0000000
--- a/FernFlower-Patches/0026-Fix-ambiguous-lambdas.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Justin <jrd2558@gmail.com>
-Date: Wed, 19 Sep 2018 22:51:00 -0700
-Subject: [PATCH] Fix ambiguous lambdas
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-index f7e086c560b6e1e5d67d93813c91ecc70db49ce1..c5b8af9d9047d9c06840dfcb95e18a8703bd0b0e 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-@@ -1067,6 +1067,9 @@ public class ExprProcessor implements CodeConstants {
-       (castNull && rightType.getType() == CodeConstants.TYPE_NULL && !UNDEFINED_TYPE_STRING.equals(getTypeName(leftType, Collections.emptyList()))) ||
-       (castNarrowing && isIntConstant(exprent) && isNarrowedIntType(leftType));
- 
-+    boolean castLambda = !cast && exprent.type == Exprent.EXPRENT_NEW && !leftType.equals(rightType) &&
-+                          lambdaNeedsCast(leftType, (NewExprent)exprent);
-+
-     boolean quote = cast && exprent.getPrecedence() >= FunctionExprent.getPrecedence(FunctionExprent.FUNCTION_CAST);
- 
-     // cast instead to 'byte' / 'short' when int constant is used as a value for 'Byte' / 'Short'
-@@ -1081,6 +1084,8 @@ public class ExprProcessor implements CodeConstants {
- 
-     if (cast) buffer.append('(').append(ExprProcessor.getCastTypeName(leftType, Collections.emptyList())).append(')');
- 
-+    if (castLambda) buffer.append('(').append(getCastTypeName(rightType, Collections.emptyList())).append(')');
-+
-     if (quote) buffer.append('(');
- 
-     if (exprent.type == Exprent.EXPRENT_CONST) {
-@@ -1110,4 +1115,12 @@ public class ExprProcessor implements CodeConstants {
-   private static boolean isNarrowedIntType(VarType type) {
-     return VarType.VARTYPE_INT.isStrictSuperset(type) || type.equals(VarType.VARTYPE_BYTE_OBJ) || type.equals(VarType.VARTYPE_SHORT_OBJ);
-   }
-+
-+  private static boolean lambdaNeedsCast(VarType left, NewExprent exprent) {
-+    if (exprent.isLambda() && !exprent.isMethodReference()) {
-+      StructClass cls = DecompilerContext.getStructContext().getClass(left.getValue());
-+      return cls == null || cls.getMethod(exprent.getLambdaMethodKey()) == null;
-+    }
-+    return false;
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index c77ac2f2e4f8936c131f932940878fab9f5c2eb8..165a152ea68e6b6580a9064bd1f4a4d39677f972 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-@@ -791,7 +791,8 @@ public class InvocationExprent extends Exprent {
-       if (md.params.length == parameters.size()) {
-         boolean exact = true;
-         for (int i = 0; i < md.params.length; i++) {
--          if (!md.params[i].equals(parameters.get(i).getExprType())) {
-+          Exprent exp = parameters.get(i);
-+          if (!md.params[i].equals(exp.getExprType()) || (exp.type == EXPRENT_NEW && ((NewExprent)exp).isLambda() && !((NewExprent)exp).isMethodReference())) {
-             exact = false;
-             missed.set(i);
-           }
-@@ -805,7 +806,8 @@ public class InvocationExprent extends Exprent {
-       boolean failed = false;
-       MethodDescriptor md = MethodDescriptor.parseDescriptor(mtt.getDescriptor());
-       for (int i = 0; i < parameters.size(); i++) {
--        VarType ptype = parameters.get(i).getExprType();
-+        Exprent exp = parameters.get(i);
-+        VarType ptype = exp.getExprType();
-         if (!missed.get(i)) {
-           if (!md.params[i].equals(ptype)) {
-             failed = true;
-@@ -813,6 +815,17 @@ public class InvocationExprent extends Exprent {
-           }
-         }
-         else {
-+          if (exp.type == EXPRENT_NEW) {
-+            NewExprent newExp = (NewExprent)exp;
-+            if (newExp.isLambda() && !newExp.isMethodReference() && !DecompilerContext.getStructContext().instanceOf(md.params[i].getValue(), exp.getExprType().getValue())) {
-+              StructClass pcls = DecompilerContext.getStructContext().getClass(md.params[i].getValue());
-+              if (pcls != null && pcls.getMethod(newExp.getLambdaMethodKey()) == null) {
-+                failed = true;
-+                break;
-+              }
-+              continue;
-+            }
-+          }
-           if (md.params[i].getType() == CodeConstants.TYPE_OBJECT) {
-             if (ptype.getType() != CodeConstants.TYPE_NULL) {
-               if (!DecompilerContext.getStructContext().instanceOf(ptype.getValue(), md.params[i].getValue())) {
-@@ -840,7 +853,10 @@ public class InvocationExprent extends Exprent {
- 
-         GenericMethodDescriptor gen = mtt.getSignature(); //TODO: Find synthetic flags for params, as Enum generic signatures do no contain the String,int params
-         if (gen != null && gen.parameterTypes.size() > i && gen.parameterTypes.get(i).isGeneric()) {
--          break;
-+          Exprent exp = parameters.get(i);
-+          if (exp.type != EXPRENT_NEW || !((NewExprent)exp).isLambda() || ((NewExprent)exp).isMethodReference()) {
-+            break;
-+          }
-         }
- 
-         MethodDescriptor md = MethodDescriptor.parseDescriptor(mtt.getDescriptor());
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-index 2405fe08663102626f6ab007ccf5ee6c0e8922ea..049bf247002da65a90392f054ad2c57a04ebae81 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-@@ -5,6 +5,8 @@ import org.jetbrains.java.decompiler.code.CodeConstants;
- import org.jetbrains.java.decompiler.main.ClassWriter;
- import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
- import org.jetbrains.java.decompiler.main.DecompilerContext;
-+import org.jetbrains.java.decompiler.struct.consts.PrimitiveConstant;
-+import org.jetbrains.java.decompiler.util.TextBuffer;
- import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
- import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
- import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
-@@ -14,8 +16,8 @@ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
- import org.jetbrains.java.decompiler.struct.StructClass;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
- import org.jetbrains.java.decompiler.struct.gen.generics.GenericClassDescriptor;
-+import org.jetbrains.java.decompiler.util.InterpreterUtil;
- import org.jetbrains.java.decompiler.util.ListStack;
--import org.jetbrains.java.decompiler.util.TextBuffer;
- 
- import java.util.*;
- 
-@@ -28,6 +30,7 @@ public class NewExprent extends Exprent {
-   private boolean isVarArgParam;
-   private boolean anonymous;
-   private boolean lambda;
-+  private boolean methodReference = false;
-   private boolean enumConst;
-   private List<VarType> genericArgs = new ArrayList<>();
- 
-@@ -48,6 +51,7 @@ public class NewExprent extends Exprent {
-         anonymous = true;
-         if (node.type == ClassNode.CLASS_LAMBDA) {
-           lambda = true;
-+          methodReference = node.lambdaInformation.is_method_reference;
-         }
-       }
-     }
-@@ -510,4 +514,17 @@ public class NewExprent extends Exprent {
-   public void setEnumConst(boolean enumConst) {
-     this.enumConst = enumConst;
-   }
--}
-\ No newline at end of file
-+
-+  public boolean isMethodReference() {
-+    return methodReference;
-+  }
-+
-+  public String getLambdaMethodKey() {
-+    ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(newType.getValue());
-+    if (node != null && constructor != null) {
-+      String descriptor = ((PrimitiveConstant)constructor.getBootstrapArguments().get(0)).getString();
-+      return InterpreterUtil.makeUniqueKey(node.lambdaInformation.method_name, descriptor);
-+    }
-+    return "";
-+  }
-+}
diff --git a/FernFlower-Patches/0027-Fix-field-initalizers.patch b/FernFlower-Patches/0027-Fix-field-initalizers.patch
deleted file mode 100644
index 1c3a634..0000000
--- a/FernFlower-Patches/0027-Fix-field-initalizers.patch
+++ /dev/null
@@ -1,498 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Wed, 12 Apr 2017 10:51:55 -0700
-Subject: [PATCH] Fix field initalizers
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
-index b44a78019f0717213822ef5572c5d7ecde6d4ee3..20d3f0391343689eb604b8b953cabb26fc90e1bd 100644
---- a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
-@@ -3,6 +3,7 @@ package org.jetbrains.java.decompiler.main;
- 
- import org.jetbrains.java.decompiler.code.CodeConstants;
- import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
-+import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
- import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
- import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
- import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
-@@ -19,7 +20,13 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
- import org.jetbrains.java.decompiler.util.InterpreterUtil;
- 
- import java.util.ArrayList;
-+import java.util.HashMap;
-+import java.util.HashSet;
-+import java.util.Iterator;
-+import java.util.LinkedList;
- import java.util.List;
-+import java.util.Map;
-+import java.util.Set;
- 
- public final class InitializerProcessor {
-   public static void extractInitializers(ClassWrapper wrapper) {
-@@ -148,12 +155,16 @@ public final class InitializerProcessor {
-   private static void extractStaticInitializers(ClassWrapper wrapper, MethodWrapper method) {
-     RootStatement root = method.root;
-     StructClass cl = wrapper.getClassStruct();
-+    Set<String> whitelist = new HashSet<>();
-+
-     Statement firstData = Statements.findFirstData(root);
-     if (firstData != null) {
-       boolean inlineInitializers = cl.hasModifier(CodeConstants.ACC_INTERFACE) || cl.hasModifier(CodeConstants.ACC_ENUM);
--
--      while (!firstData.getExprents().isEmpty()) {
--        Exprent exprent = firstData.getExprents().get(0);
-+      List<AssignmentExprent> exprentsToRemove = new LinkedList<>();//when we loop back through the list, stores ones we need to remove outside iterator loop
-+      Map<Integer, AssignmentExprent> nonFieldAssigns = new HashMap<>();
-+      Iterator<Exprent> itr = firstData.getExprents().iterator();
-+      while (itr.hasNext()) {
-+        Exprent exprent = itr.next();
- 
-         boolean found = false;
- 
-@@ -165,22 +176,55 @@ public final class InitializerProcessor {
-                 cl.hasField(fExpr.getName(), fExpr.getDescriptor().descriptorString)) {
- 
-               // interfaces fields should always be initialized inline
--              if (inlineInitializers || isExprentIndependent(assignExpr.getRight(), method)) {
--                String keyField = InterpreterUtil.makeUniqueKey(fExpr.getName(), fExpr.getDescriptor().descriptorString);
-+              String keyField = InterpreterUtil.makeUniqueKey(fExpr.getName(), fExpr.getDescriptor().descriptorString);
-+              boolean exprentIndependent = isExprentIndependent(assignExpr.getRight(), method, cl, whitelist, cl.getFields().getIndexByKey(keyField), true);
-+              if (inlineInitializers || exprentIndependent) {
-                 if (!wrapper.getStaticFieldInitializers().containsKey(keyField)) {
--                  wrapper.getStaticFieldInitializers().addWithKey(assignExpr.getRight(), keyField);
--                  firstData.getExprents().remove(0);
-                   found = true;
-+                  if (exprentIndependent) {
-+                    wrapper.getStaticFieldInitializers().addWithKey(assignExpr.getRight(), keyField);
-+                    whitelist.add(keyField);
-+                    itr.remove();
-+                  } else { //inlineInitializers
-+                    if (assignExpr.getRight() instanceof NewExprent){
-+                      NewExprent newExprent = (NewExprent) assignExpr.getRight();
-+                      Exprent instance = newExprent.getConstructor().getInstance();
-+                      if (instance instanceof VarExprent && nonFieldAssigns.containsKey(((VarExprent) instance).getIndex())){
-+                        AssignmentExprent nonFieldAssignment = nonFieldAssigns.remove(((VarExprent) instance).getIndex());
-+                        newExprent.getConstructor().setInstance(nonFieldAssignment.getRight());
-+                        exprentsToRemove.add(nonFieldAssignment);
-+                        wrapper.getStaticFieldInitializers().addWithKey(assignExpr.getRight(), keyField);
-+                        whitelist.add(keyField);
-+                        itr.remove();
-+                      } else {
-+                        DecompilerContext.getLogger().writeMessage("Don't know how to handle non independent "+assignExpr.getRight().getClass().getName(), IFernflowerLogger.Severity.ERROR);
-+                      }
-+                    } else {
-+                      DecompilerContext.getLogger().writeMessage("Don't know how to handle non independent "+assignExpr.getRight().getClass().getName(), IFernflowerLogger.Severity.ERROR);
-+                    }
-+                  }
-                 }
-               }
-             }
-+          } else if (inlineInitializers){
-+            DecompilerContext.getLogger().writeMessage("Found non field assignment when needing to force inline: "+assignExpr.toString(), IFernflowerLogger.Severity.TRACE);
-+            if (assignExpr.getLeft() instanceof VarExprent) {
-+              nonFieldAssigns.put(((VarExprent) assignExpr.getLeft()).getIndex(), assignExpr);
-+            } else {
-+              DecompilerContext.getLogger().writeMessage("Left isnt VarExprent :(", IFernflowerLogger.Severity.ERROR);
-+            }
-           }
-+        } else if (inlineInitializers && cl.hasModifier(CodeConstants.ACC_INTERFACE)){
-+          DecompilerContext.getLogger().writeMessage("Non assignment found in initialiser when we're needing to inline all", IFernflowerLogger.Severity.ERROR);
-         }
- 
-         if (!found) {
-           break;
-         }
-       }
-+      if (exprentsToRemove.size() > 0){
-+        firstData.getExprents().removeAll(exprentsToRemove);
-+      }
-     }
-   }
- 
-@@ -196,18 +240,18 @@ public final class InitializerProcessor {
-       if (CodeConstants.INIT_NAME.equals(method.methodStruct.getName()) && method.root != null) { // successfully decompiled constructor
-         Statement firstData = Statements.findFirstData(method.root);
-         if (firstData == null || firstData.getExprents().isEmpty()) {
--          return;
-+          continue;
-         }
--        lstFirst.add(firstData.getExprents());
--        lstMethodWrappers.add(method);
- 
-         Exprent exprent = firstData.getExprents().get(0);
-         if (!isAnonymous) { // FIXME: doesn't make sense
-           if (exprent.type != Exprent.EXPRENT_INVOCATION ||
-               !Statements.isInvocationInitConstructor((InvocationExprent)exprent, method, wrapper, false)) {
--            return;
-+            continue;
-           }
-         }
-+        lstFirst.add(firstData.getExprents());
-+        lstMethodWrappers.add(method);
-       }
-     }
- 
-@@ -215,6 +259,9 @@ public final class InitializerProcessor {
-       return;
-     }
- 
-+    Set<String> whitelist = new HashSet<>(wrapper.getStaticFieldInitializers().getLstKeys());
-+    int prev_fidx = 0;
-+
-     while (true) {
-       String fieldWithDescr = null;
-       Exprent value = null;
-@@ -237,8 +284,10 @@ public final class InitializerProcessor {
-             if (!fExpr.isStatic() && fExpr.getClassname().equals(cl.qualifiedName) &&
-                 cl.hasField(fExpr.getName(), fExpr.getDescriptor().descriptorString)) { // check for the physical existence of the field. Could be defined in a superclass.
- 
--              if (isExprentIndependent(assignExpr.getRight(), lstMethodWrappers.get(i))) {
--                String fieldKey = InterpreterUtil.makeUniqueKey(fExpr.getName(), fExpr.getDescriptor().descriptorString);
-+              String fieldKey = InterpreterUtil.makeUniqueKey(fExpr.getName(), fExpr.getDescriptor().descriptorString);
-+              int fidx = cl.getFields().getIndexByKey(fieldKey);
-+              if (prev_fidx <= fidx && isExprentIndependent(assignExpr.getRight(), lstMethodWrappers.get(i), cl, whitelist, fidx, false)) {
-+                prev_fidx = fidx;
-                 if (fieldWithDescr == null) {
-                   fieldWithDescr = fieldKey;
-                   value = assignExpr.getRight();
-@@ -262,6 +311,7 @@ public final class InitializerProcessor {
- 
-       if (!wrapper.getDynamicFieldInitializers().containsKey(fieldWithDescr)) {
-         wrapper.getDynamicFieldInitializers().addWithKey(value, fieldWithDescr);
-+        whitelist.add(fieldWithDescr);
- 
-         for (List<Exprent> lst : lstFirst) {
-           lst.remove(isAnonymous ? 0 : 1);
-@@ -273,14 +323,14 @@ public final class InitializerProcessor {
-     }
-   }
- 
--  private static boolean isExprentIndependent(Exprent exprent, MethodWrapper method) {
-+  private static boolean isExprentIndependent(Exprent exprent, MethodWrapper method, StructClass cl, Set<String> whitelist, int fidx, boolean isStatic) {
-     List<Exprent> lst = exprent.getAllExprents(true);
-     lst.add(exprent);
- 
-     for (Exprent expr : lst) {
-       switch (expr.type) {
-         case Exprent.EXPRENT_VAR -> {
--          VarVersionPair varPair = new VarVersionPair((VarExprent)expr);
-+          VarVersionPair varPair = new VarVersionPair((VarExprent) expr);
-           if (!method.varproc.getExternalVars().contains(varPair)) {
-             String varName = method.varproc.getVarName(varPair);
-             if (!varName.equals("this") && !varName.endsWith(".this")) { // FIXME: remove direct comparison with strings
-@@ -289,11 +339,63 @@ public final class InitializerProcessor {
-           }
-         }
-         case Exprent.EXPRENT_FIELD -> {
--          return false;
-+          FieldExprent fexpr = (FieldExprent) expr;
-+          if (cl.hasField(fexpr.getName(), fexpr.getDescriptor().descriptorString)) {
-+            String key = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
-+            if (isStatic) {
-+              // There is a very stupid section of the JLS
-+              if (!fexpr.isStatic()) {
-+                return false;
-+              } else if (cl.getFields().getIndexByKey(key) >= fidx) {
-+                fexpr.forceQualified(true);
-+              }
-+            } else {
-+              if (!whitelist.contains(key)) {
-+                return false;
-+              } else if (cl.getFields().getIndexByKey(key) > fidx) {
-+                return false;
-+              }
-+            }
-+          } else if (!fexpr.isStatic() && fexpr.getInstance() == null) {
-+            return false;
-+          }
-         }
-+        case Exprent.EXPRENT_NEW -> makeLaterFieldsInLambdaQualified((NewExprent)expr, cl, fidx);
-       }
-     }
- 
-     return true;
-   }
--}
-\ No newline at end of file
-+
-+  // Makes lambdas that are used to initialize a static field only reference
-+  // static fields defined later in the class by qualified name
-+  private static void makeLaterFieldsInLambdaQualified(NewExprent nexpr, StructClass cl, int fidx) {
-+    boolean isStatic = cl.getFields().get(fidx).hasModifier(CodeConstants.ACC_STATIC);
-+    if (isStatic && nexpr.isLambda() && !nexpr.isMethodReference()) {
-+      ClassNode child = DecompilerContext.getClassProcessor().getMapRootClasses().get(nexpr.getNewType().getValue());
-+      MethodWrapper wrapper = child.parent.getWrapper().getMethods().getWithKey(child.lambdaInformation.content_method_key);
-+
-+      Set<Exprent> s = new HashSet<>();
-+      wrapper.getOrBuildGraph().iterateExprentsDeep(e -> {
-+        if (e.type == Exprent.EXPRENT_FIELD || e.type == Exprent.EXPRENT_NEW)
-+          s.add(e);
-+        return 0;
-+      });
-+      s.stream().forEach(e -> {
-+        switch (e.type) {
-+          case Exprent.EXPRENT_FIELD:
-+            FieldExprent fe = (FieldExprent)e;
-+            if (fe.isStatic() && cl.hasField(fe.getName(), fe.getDescriptor().descriptorString)) {
-+              String key = InterpreterUtil.makeUniqueKey(fe.getName(), fe.getDescriptor().descriptorString);
-+              if (fe.getInstance() == null && cl.getFields().getIndexByKey(key) > fidx) {
-+                fe.forceQualified(true);
-+              }
-+            }
-+            break;
-+          case Exprent.EXPRENT_NEW:
-+            makeLaterFieldsInLambdaQualified((NewExprent)e, cl, fidx);
-+        }
-+      });
-+    }
-+  }
-+}
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-index 040e5d21985979a9686cb9fee6e3048fe87e5464..e98b53eb94ed7f1f5c936887be8418e6637b2b43 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-@@ -33,18 +33,24 @@ public class FieldExprent extends Exprent {
-   private final boolean isStatic;
-   private Exprent instance;
-   private final FieldDescriptor descriptor;
-+  private boolean forceQualified = false;
- 
-   public FieldExprent(LinkConstant cn, Exprent instance, BitSet bytecodeOffsets) {
-     this(cn.elementname, cn.classname, instance == null, instance, FieldDescriptor.parseDescriptor(cn.descriptor), bytecodeOffsets);
-   }
- 
-   public FieldExprent(String name, String classname, boolean isStatic, Exprent instance, FieldDescriptor descriptor, BitSet bytecodeOffsets) {
-+    this(name, classname, isStatic, instance, descriptor, bytecodeOffsets, false);
-+  }
-+
-+  public FieldExprent(String name, String classname, boolean isStatic, Exprent instance, FieldDescriptor descriptor, BitSet bytecodeOffsets, boolean forceQualified) {
-     super(EXPRENT_FIELD);
-     this.name = name;
-     this.classname = classname;
-     this.isStatic = isStatic;
-     this.instance = instance;
-     this.descriptor = descriptor;
-+    this.forceQualified = forceQualified;
- 
-     addBytecodeOffsets(bytecodeOffsets);
-   }
-@@ -111,7 +117,7 @@ public class FieldExprent extends Exprent {
- 
-     if (isStatic) {
-       ClassNode node = (ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE);
--      if (node == null || !classname.equals(node.classStruct.qualifiedName) || isAmbiguous()) {
-+      if (node == null || !classname.equals(node.classStruct.qualifiedName) || isAmbiguous() || forceQualified) {
-         buf.append(DecompilerContext.getImportCollector().getNestedNameInClassContext(ExprProcessor.buildJavaClassName(classname)));
-         buf.append(".");
-       }
-@@ -206,6 +212,10 @@ public class FieldExprent extends Exprent {
-     return name;
-   }
- 
-+  public void forceQualified(boolean value) {
-+    this.forceQualified = value;
-+  }
-+
-   @Override
-   public void getBytecodeRange(BitSet values) {
-     measureBytecode(values, instance);
-diff --git a/testData/classes/pkg/TestClassFields$Inner.class b/testData/classes/pkg/TestClassFields$Inner.class
-index 1c16a7e3b3a72a2d00987cd024702775f328a0ae..996ad8e2d4dcbd470e913ca7707356a1f5b0664b 100644
-GIT binary patch
-delta 134
-zcmdnVyq;O=)W2Q(7#J8#7$i6um>C4P7+4qt*%^e{8N?<^c?cOWGB9gsdNML_*d*s<
-z=4F=HO{_Iw6rZ?m#pEVNITsEFUIq>ZMg~rx39>*M1X$TNGcaxhG8h@SfFv7On3aKv
-Yfe*-IV&G>G1=3tVQDz1q1`!4>05Vh&RR910
-
-delta 138
-zcmZ3_ypvh#)W2Q(7#J8#7$i9vm>C4Q7+4sD*cn9F8N??_c}N>EGO%cPYI-s<a3v-u
-zrxq8h7#J8ZGB9gsdQL1cV3e4+bcL!M0}}%y&<HlE$juClYk(}EY7ieR$|AtQz{|il
-e*^N<El8J#ID9*$nz#s;sxq$M_48jbe3|s(;<PxX=
-
-diff --git a/testData/classes/pkg/TestClassFields.class b/testData/classes/pkg/TestClassFields.class
-index e8788e044b56381c8df5b82c7da5c6fa33ec8ee3..8edd958ea46c0d8034e63270391ec62c48603676 100644
-GIT binary patch
-delta 266
-zcmYL@KT^U_7{q@s3BKedK!^&;A0aA;Ru<AQLrG!jJ-keYJ1}F(P{2@d04ndm1v~-c
-zhC-X&{oc2`-}?@}g2~~u+XHWm9gdEr8`2B8i-_o#FmS}=rMkB~SRO6IV!HINxGs*v
-zETxf9qn<G0DIw!>(KjETuLgho{7$Z%Q@<~iOUj{$xLtb19tL#@o0@uJBd)w`Fe?c|
-zOL%d9^a;87v(5>$fqd~}+OsWoP57V4&f7?*YC4rNkn*^d-_u+bJ9WnTUV{4th$<Fh
-
-delta 334
-zcmYL_KTZNc6vltEGy8{O71>o(6cJ@{0gH{%Mk~v0Y$yyRA)bH(cm~29Oe}Q^iBS$<
-z<q15B@vVh6-}m0UdEfjpkLJ@{etf^KfOAeQRrY;a0S5u?3YNoCI+l>5QjW{E>y!BO
-zd`{*U4|<En{3~hJi9%{@grxLC1`I=DHWl&WTE&Z@y1GA8m^AO_3Okuj?`E@ZmSqZ^
-z_H#OtTNMZ`E-6x3BvQOt#)vy8<So%{>007S+#S52o}^Ihh<d+=nt<KEt2Y>#z@+EC
-z<BWBrM`IJ2QGxr6yLz()p0~umT@n;j{=*u$vbHW9HKC}}7M?_C9O+7)J(-o9N<PN2
-GhW!C-@ghk8
-
-diff --git a/testData/results/TestClashName.dec b/testData/results/TestClashName.dec
-index 9adf65e9646db3f5243ab2ead6806f502cfea1bb..14242655cc785caa4ba0773580f4795b410c2ef9 100644
---- a/testData/results/TestClashName.dec
-+++ b/testData/results/TestClashName.dec
-@@ -7,25 +7,14 @@ public class TestClashName extends ext.TestClashNameParent implements TestClashN
-    int SharedName1 = 0;
-    int SharedName4 = 0;
-    int SharedName5 = 0;
--   int i;
--   int j;
--   int k;
--   int l;
--   int m;
--   int n;
--   SharedName1 p;
--   SharedName5<SharedName1> q;
--
--   public TestClashName() {
--      this.i = pkg.SharedName1.f;// 59
--      this.j = NonSharedName.f;// 60
--      this.k = SharedName2.f;// 61
--      this.l = pkg.SharedName3.f;// 62
--      this.m = pkg.SharedName1.getF();// 63
--      this.n = NonSharedName.getF();// 64
--      this.p = null;// 65
--      this.q = null;// 67
--   }
-+   int i = pkg.SharedName1.f;
-+   int j = NonSharedName.f;
-+   int k = SharedName2.f;
-+   int l = pkg.SharedName3.f;
-+   int m = pkg.SharedName1.getF();
-+   int n = NonSharedName.getF();
-+   SharedName1 p = null;
-+   SharedName5<SharedName1> q = null;
- 
-    @SharedName4
-    public int m() {
-@@ -42,26 +31,6 @@ public class TestClashName extends ext.TestClashNameParent implements TestClashN
- }
- 
- class 'pkg/TestClashName' {
--   method '<init> ()V' {
--      1e      19
--      21      19
--      25      20
--      28      20
--      2c      21
--      2f      21
--      33      22
--      36      22
--      3a      23
--      3d      23
--      41      24
--      44      24
--      48      25
--      49      25
--      4d      26
--      4e      26
--      51      27
--   }
--
-    method 'm ()I' {
-       0      20
-       1      20
-@@ -99,30 +68,15 @@ class 'pkg/TestClashName' {
-    }
- 
-    method 'f ()V' {
--      0      40
-+      0      29
-    }
- }
- 
- Lines mapping:
--59 <-> 20
--60 <-> 21
--61 <-> 22
--62 <-> 23
--63 <-> 24
--64 <-> 25
--65 <-> 26
--67 <-> 27
--73 <-> 32
--74 <-> 33
--75 <-> 34
--76 <-> 35
--77 <-> 36
--78 <-> 37
--82 <-> 41
--Not mapped:
--52
--53
--54
--55
--56
--57
-+73 <-> 21
-+74 <-> 22
-+75 <-> 23
-+76 <-> 24
-+77 <-> 25
-+78 <-> 26
-+82 <-> 30
-diff --git a/testData/results/TestClassFields.dec b/testData/results/TestClassFields.dec
-index 4c37124913d759059ccf151547cfd163d6342412..1547551e536084420a529a7cb7c5d621159938b3 100644
---- a/testData/results/TestClassFields.dec
-+++ b/testData/results/TestClassFields.dec
-@@ -3,16 +3,14 @@ package pkg;
- public class TestClassFields {
-    private static int[] sizes;
-    private static String[] names = new String[]{"name1", "name2"};
--   private static final int SIZE;
-+   private static final int SIZE = TestClassFields.Inner.staticMutable;
- 
-    static {
--      sizes = new int[names.length];// 15
--      TestClassFields.Inner.staticMutable = 3;// 17
--      SIZE = TestClassFields.Inner.staticMutable;// 18
--   }// 19
-+      sizes = new int[names.length];// 14
-+   }// 17
- 
-    private static class Inner {
--      private static int staticMutable;
-+      private static int staticMutable = 3;
-    }
- }
- 
-@@ -30,9 +28,8 @@ class 'pkg/TestClassFields' {
- }
- 
- Lines mapping:
--15 <-> 9
-+14 <-> 9
- 17 <-> 10
--18 <-> 11
--19 <-> 12
- Not mapped:
--14
-+9
-+16
-diff --git a/testData/src/pkg/TestClassFields.java b/testData/src/pkg/TestClassFields.java
-index 8a77fe0038a8aad333b5004ca17c5d5d6edfa62d..6e31d5c7515e942c26821ad3320a2eb4dfead920 100644
---- a/testData/src/pkg/TestClassFields.java
-+++ b/testData/src/pkg/TestClassFields.java
-@@ -2,19 +2,17 @@ package pkg;
- 
- public class TestClassFields {
-   private static class Inner {
--    private static int staticMutable;
-+    private static int staticMutable = 3;
-   }
- 
-   private static int[] sizes;
--  private static String[] names;
-+  private static String[] names = new String[]{"name1", "name2"};
- 
-   private static final int SIZE;
- 
-   static {
--    names = new String[]{"name1", "name2"};
-     sizes = new int[names.length];
- 
--    Inner.staticMutable = 3;
-     SIZE = Inner.staticMutable;
-   }
- }
-\ No newline at end of file
diff --git a/FernFlower-Patches/0027-Sort-by-version-it-seems-that-it-increases-as-the-vi.patch b/FernFlower-Patches/0027-Sort-by-version-it-seems-that-it-increases-as-the-vi.patch
new file mode 100644
index 0000000..6a7c158
--- /dev/null
+++ b/FernFlower-Patches/0027-Sort-by-version-it-seems-that-it-increases-as-the-vi.patch
@@ -0,0 +1,148 @@
+From b75a7c5fc84e6da8582a01e6a772572eaf1dcdc4 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sat, 8 Aug 2015 19:43:37 -0400
+Subject: [PATCH 027/122] Sort by version (it seems that it increases as the
+ visitors visit the various methods), and use that to align versions with
+ different instances of the same variable. Still some tweaks need to be made,
+ but it's starting to look promising.
+
+---
+ .../decompiler/vars/LocalVariableTable.java   | 11 +++----
+ .../modules/decompiler/vars/VarProcessor.java | 29 +++++++++++++++----
+ .../StructLocalVariableTableAttribute.java    |  5 ++--
+ 3 files changed, 31 insertions(+), 14 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+index 99025a5..e5fbec8 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+@@ -9,7 +9,6 @@ import java.util.Set;
+ public class LocalVariableTable {
+   private Map<Integer, Set<LVTVariable>> startpoints;
+   private ArrayList<LVTVariable> allLVT;
+-  private Map<VarVersionPair, String> mapVarNames;
+ private Map<Integer, List<LVTVariable>> mapLVT;
+ 
+   public LocalVariableTable(int len) {
+@@ -33,7 +32,7 @@ private Map<Integer, List<LVTVariable>> mapLVT;
+         mine.merge(other);
+       }
+     }
+-    mapVarNames = null; // Invalidate the cache and rebuild it.
++    mapLVT = null; // Invalidate the cache and rebuild it.
+   }
+ 
+   public LVTVariable find(Integer index, List<Integer> offsets) {
+@@ -51,15 +50,14 @@ private Map<Integer, List<LVTVariable>> mapLVT;
+     return null;
+   }
+ 
+-  public Map<VarVersionPair, String> getMapVarNames() {
+-    if (mapVarNames == null)
++  public Map<Integer, List<LVTVariable>> getMapVarNames() {
++    if (mapLVT == null)
+       buildNameMap();
+-    return mapVarNames;
++    return mapLVT;
+   }
+ 
+   private void buildNameMap() {
+     Map<Integer, Integer> versions = new HashMap<Integer, Integer>();
+-    mapVarNames = new HashMap<VarVersionPair, String>();
+     mapLVT = new HashMap<Integer,List<LVTVariable>>();
+     for (LVTVariable lvt : allLVT) {
+       Integer idx = versions.get(lvt.index);
+@@ -74,7 +72,6 @@ private Map<Integer, List<LVTVariable>> mapLVT;
+           mapLVT.put(lvt.index, lvtList);
+       }
+       lvtList.add(lvt);
+-      mapVarNames.put(new VarVersionPair(lvt.index, idx.intValue()), lvt.name);
+     }
+   }
+ 
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+index a2a79f5..ccd1bd6 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+@@ -52,7 +52,7 @@ private LocalVariableTable lvt;
+     new VarDefinitionHelper(root, mt, this).setVarDefinitions();
+   }
+ 
+-  public void setDebugVarNames(Map<VarVersionPair, String> mapDebugVarNames) {
++  public void setDebugVarNames(Map<Integer, List<LVTVariable>> mapDebugVarNames) {
+     if (varVersions == null) {
+       return;
+     }
+@@ -68,16 +68,35 @@ private LocalVariableTable lvt;
+     });
+ 
+     Map<String, Integer> mapNames = new HashMap<String, Integer>();
+-
++    Map<Integer,SortedSet<VarVersionPair>> indexedPairs = new HashMap<Integer,SortedSet<VarVersionPair>>();
++    Comparator<VarVersionPair> vvpVersionComparator = new Comparator<VarVersionPair>() {
++        @Override
++        public int compare(VarVersionPair o1, VarVersionPair o2) {
++            return o1.version - o2.version;
++        }
++    };
++    for (Entry<Integer, VarVersionPair> vvp : mapOriginalVarIndices.entrySet()) {
++        SortedSet<VarVersionPair> set = indexedPairs.get(vvp.getValue().var);
++        if (set == null) {
++            set = new TreeSet<VarVersionPair>(vvpVersionComparator);
++            indexedPairs.put(vvp.getValue().var, set);
++        }
++        set.add(vvp.getValue());
++    }
+     for (VarVersionPair pair : listVars) {
+       String name = mapVarNames.get(pair);
+ 
+       VarVersionPair key = mapOriginalVarIndices.get(pair.var);
++
+       boolean lvtName = false;
+       if (key != null) {
+-        if (mapDebugVarNames.containsKey(key)) {
+-          name = mapDebugVarNames.get(key);
+-          lvtName = true;
++        if (indexedPairs.containsKey(key.var)) {
++          int veridx = indexedPairs.get(key.var).headSet(key).size();
++          List<LVTVariable> list = mapDebugVarNames.get(key.var);
++          if (list.size()>veridx) {
++              name = list.get(veridx).name;
++              lvtName = true;
++          }
+         }
+       }
+ 
+diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+index 4b00061..a983b27 100644
+--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
++++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+@@ -23,6 +23,7 @@ import org.jetbrains.java.decompiler.util.DataInputFullStream;
+ 
+ import java.io.IOException;
+ import java.util.Collections;
++import java.util.List;
+ import java.util.Map;
+ 
+ /*
+@@ -37,7 +38,7 @@ import java.util.Map;
+ */
+ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
+ 
+-  private Map<VarVersionPair, String> EMPTY_LVT = Collections.emptyMap();
++  private Map<Integer, List<LVTVariable>> EMPTY_LVT = Collections.emptyMap();
+   private LocalVariableTable lvt;
+ 
+   @Override
+@@ -65,7 +66,7 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
+     attr.lvt = lvt;
+   }
+ 
+-  public Map<VarVersionPair, String> getMapVarNames() {
++  public Map<Integer, List<LVTVariable>> getMapVarNames() {
+     return lvt == null ? EMPTY_LVT : lvt.getMapVarNames();
+   }
+ 
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0028-Ignore-variables-without-an-LVT-entry.-They-re-likel.patch b/FernFlower-Patches/0028-Ignore-variables-without-an-LVT-entry.-They-re-likel.patch
new file mode 100644
index 0000000..5c00daa
--- /dev/null
+++ b/FernFlower-Patches/0028-Ignore-variables-without-an-LVT-entry.-They-re-likel.patch
@@ -0,0 +1,196 @@
+From 1f19690b00959c237600d3fac5ae0a28d8e4045f Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sun, 9 Aug 2015 11:58:54 -0400
+Subject: [PATCH 028/122] Ignore variables without an LVT entry. They're likely
+ dummy vars generated by FF for exceptions, little info is missing. Also,
+ don't exception on empty blocks, they're just empty blocks!
+
+---
+ .../decompiler/main/rels/ClassWrapper.java    |   2 +-
+ .../main/rels/MethodProcessorRunnable.java    |   5 +-
+ .../modules/decompiler/vars/VarProcessor.java |   4 +-
+ .../MinecraftDecompilationTest.java           | 125 ++++++++++++++++++
+ 4 files changed, 133 insertions(+), 3 deletions(-)
+ create mode 100644 test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
+
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+index 4e86556..5a35cc8 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+@@ -169,8 +169,8 @@ public class ClassWrapper {
+           StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
+ 
+         if (attr != null) {
+-          varProc.setDebugVarNames(attr.getMapVarNames());
+           varProc.setLVT(attr.getLVT());
++          varProc.setDebugVarNames(attr.getMapVarNames());
+         }
+       }
+ 
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+index f0b17a5..388e76a 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+@@ -229,7 +229,10 @@ public class MethodProcessorRunnable implements Runnable {
+ 
+   public static void printMethod(RootStatement root, String name, VarProcessor varProc) {
+     System.out.println(name + " {");
+-
++    if (root == null || root.getSequentialObjects() == null) {
++        System.out.println("}");
++        return;
++    }
+     for (Object obj : root.getSequentialObjects()) {
+       if (obj instanceof Statement) {
+         printStatement((Statement)obj, "  ",varProc);
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+index ccd1bd6..6b15a12 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+@@ -93,9 +93,11 @@ private LocalVariableTable lvt;
+         if (indexedPairs.containsKey(key.var)) {
+           int veridx = indexedPairs.get(key.var).headSet(key).size();
+           List<LVTVariable> list = mapDebugVarNames.get(key.var);
+-          if (list.size()>veridx) {
++          if (list != null && list.size()>veridx) {
+               name = list.get(veridx).name;
+               lvtName = true;
++          } else if (list == null) {
++              // we're an exception type, probably. let's just fall through
+           }
+         }
+       }
+diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
+new file mode 100644
+index 0000000..c7e781e
+--- /dev/null
++++ b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
+@@ -0,0 +1,125 @@
++/*
++ * Copyright 2000-2014 JetBrains s.r.o.
++ *
++ * Licensed under the Apache License, Version 2.0 (the "License");
++ * you may not use this file except in compliance with the License.
++ * You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++package org.jetbrains.java.decompiler;
++
++import org.hamcrest.Matchers;
++import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
++import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
++import org.jetbrains.java.decompiler.util.InterpreterUtil;
++import org.junit.After;
++import org.junit.Before;
++import org.junit.Test;
++
++import java.io.*;
++import java.util.Enumeration;
++import java.util.HashMap;
++import java.util.Map;
++import java.util.zip.ZipEntry;
++import java.util.zip.ZipFile;
++
++import static org.junit.Assert.assertThat;
++import static org.junit.Assert.assertTrue;
++
++public class MinecraftDecompilationTest {
++  private DecompilerTestFixture fixture;
++
++  private static final String MC_JAR = "minecraft_ff_in.jar";
++  @Before
++  public void setUp() throws IOException {
++    fixture = new DecompilerTestFixture();
++    // -din=1 -rbr=0 -dgs=1 -asc=1 -rsy=0
++    Map<String,Object> mcFFOptions = new HashMap<String,Object>() {{
++        put(IFernflowerPreferences.DECOMPILE_INNER,"1");
++        put(IFernflowerPreferences.REMOVE_BRIDGE, "0");
++        put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES,"1");
++        put(IFernflowerPreferences.ASCII_STRING_CHARACTERS,"1");
++        put(IFernflowerPreferences.REMOVE_SYNTHETIC,"0");
++    }};
++    fixture.setUp(mcFFOptions);
++    if (!new File(fixture.getTestDataDir(), MC_JAR).exists()) {
++        throw new RuntimeException("Missing "+MC_JAR+" in testData dir - aborting");
++    }
++  }
++
++  @After
++  public void tearDown() {
++//    fixture.tearDown();
++//    fixture = null;
++  }
++
++//  @Test
++//  public void testDirectory() {
++//    File classes = new File(fixture.getTempDir(), "classes");
++//    unpack(new File(fixture.getTestDataDir(), "mc-fernflower-in.jar"), classes);
++//
++//    ConsoleDecompiler decompiler = fixture.getDecompiler();
++//    decompiler.addSpace(classes, true);
++//    decompiler.decompileContext();
++//
++//    compareDirectories(new File(fixture.getTestDataDir(), "bulk"), fixture.getTargetDir());
++//  }
++
++  @Test
++  public void testJar() {
++    ConsoleDecompiler decompiler = fixture.getDecompiler();
++    decompiler.addSpace(new File(fixture.getTestDataDir(), MC_JAR), true);
++    decompiler.decompileContext();
++
++    File unpacked = new File(fixture.getTempDir(), "unpacked");
++    unpack(new File(fixture.getTargetDir(), "bulk.jar"), unpacked);
++
++//    compareDirectories(new File(fixture.getTestDataDir(), "bulk"), unpacked);
++  }
++
++  private static void unpack(File archive, File targetDir) {
++    try {
++      ZipFile zip = new ZipFile(archive);
++      try {
++        Enumeration<? extends ZipEntry> entries = zip.entries();
++        while (entries.hasMoreElements()) {
++          ZipEntry entry = entries.nextElement();
++          if (!entry.isDirectory()) {
++            File file = new File(targetDir, entry.getName());
++            assertTrue(file.getParentFile().mkdirs() || file.getParentFile().isDirectory());
++            InputStream in = zip.getInputStream(entry);
++            OutputStream out = new FileOutputStream(file);
++            InterpreterUtil.copyStream(in, out);
++            out.close();
++            in.close();
++          }
++        }
++      }
++      finally {
++        zip.close();
++      }
++    }
++    catch (IOException e) {
++      throw new RuntimeException(e);
++    }
++  }
++
++  private static void compareDirectories(File expected, File actual) {
++    String[] expectedList = expected.list();
++    String[] actualList = actual.list();
++    assertThat(actualList, Matchers.arrayContainingInAnyOrder(expectedList));
++    for (String name : expectedList) {
++      File child = new File(expected, name);
++      if (child.isDirectory()) {
++        compareDirectories(child, new File(actual, name));
++      }
++    }
++  }
++}
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0028-Improve-inferred-generic-types.patch b/FernFlower-Patches/0028-Improve-inferred-generic-types.patch
deleted file mode 100644
index 879c65a..0000000
--- a/FernFlower-Patches/0028-Improve-inferred-generic-types.patch
+++ /dev/null
@@ -1,1901 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Justin <jrd2558@gmail.com>
-Date: Tue, 30 Apr 2019 10:34:56 -0700
-Subject: [PATCH] Improve inferred generic types
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-index 53349248a038cea0ef82cdc2138ca93e722d1d06..a25566f0e6ba9a4f67c6412fc379874ffca92c21 100644
---- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-@@ -38,6 +38,7 @@ public interface IFernflowerPreferences {
-   String STANDARDIZE_FLOATING_POINT_NUMBERS = "sfn";
-   String INCLUDE_ENTIRE_CLASSPATH = "iec";
-   String QUALIFY_INNER_CLASSES = "qin";
-+  String EXPLICIT_GENERIC_ARGUMENTS = "ega";
- 
-   String LOG_LEVEL = "log";
-   String MAX_PROCESSING_METHOD = "mpm";
-@@ -93,6 +94,7 @@ public interface IFernflowerPreferences {
-     defaults.put(STANDARDIZE_FLOATING_POINT_NUMBERS, "1");
-     defaults.put(INCLUDE_ENTIRE_CLASSPATH, "0");
-     defaults.put(QUALIFY_INNER_CLASSES, "1");
-+    defaults.put(EXPLICIT_GENERIC_ARGUMENTS, "0");
- 
-     defaults.put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name());
-     defaults.put(MAX_PROCESSING_METHOD, "0");
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
-index 406848324e427a2b18d3666e321172f0f130ec4c..e14e8821ea5e7642ff49b04eb4cf1e4d0aa32190 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
-@@ -39,6 +39,17 @@ public class ArrayExprent extends Exprent {
-     }
-   }
- 
-+  @Override
-+  public VarType getInferredExprType(VarType upperBound) {
-+    VarType exprType = array.getInferredExprType(upperBound);
-+    if (exprType.equals(VarType.VARTYPE_NULL)) {
-+      return hardType.copy();
-+    }
-+    else {
-+      return exprType.decreaseArrayDim();
-+    }
-+  }
-+
-   @Override
-   public int getExprentUse() {
-     return array.getExprentUse() & index.getExprentUse() & Exprent.MULTIPLE_USES;
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-index f0c519aa31ca4ca83dac02d1bf729ff67e9e8992..df602b646b7ab2b6f13c42617634f334f828cc0e 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-@@ -4,6 +4,7 @@ package org.jetbrains.java.decompiler.modules.decompiler.exps;
- import org.jetbrains.java.decompiler.code.CodeConstants;
- import org.jetbrains.java.decompiler.main.ClassesProcessor;
- import org.jetbrains.java.decompiler.main.DecompilerContext;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
- import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
- import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
- import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
-@@ -146,6 +147,12 @@ public class ConstExprent extends Exprent {
-     this.value = value;
-     this.boolPermitted = boolPermitted;
-     addBytecodeOffsets(bytecodeOffsets);
-+
-+    if (constType.equals(VarType.VARTYPE_CLASS) && value != null) {
-+      String stringVal = value.toString();
-+      List<VarType> args = Collections.singletonList(new VarType(stringVal, !stringVal.startsWith("[")));
-+      this.constType = new GenericType(constType.getType(), constType.getArrayDim(), constType.getValue(), null, args, GenericType.WILDCARD_NO);
-+    }
-   }
- 
-   private static VarType guessType(int val, boolean boolPermitted) {
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-index e2f36231b51e547b4aae610c8450d83bc0952e44..0509360d7637650341acca72e72e49026dc535a7 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-@@ -53,6 +53,8 @@ public abstract class Exprent implements IMatchable {
-   public static final int EXPRENT_ANNOTATION = 13;
-   public static final int EXPRENT_ASSERT = 14;
- 
-+  protected static ThreadLocal<Map<String, VarType>> inferredLambdaTypes = ThreadLocal.withInitial(HashMap::new);
-+
-   public final int type;
-   public final int id;
-   public BitSet bytecode = null;  // offsets of bytecode instructions decompiled to this exprent
-@@ -198,30 +200,26 @@ public abstract class Exprent implements IMatchable {
-       return ret;
-     }
- 
--  protected VarType gatherGenerics(VarType upperBound, VarType ret, List<String> fparams, List<VarType> genericArgs) {
--    Map<VarType, VarType> map = new HashMap<>();
--
-+  protected void gatherGenerics(VarType upperBound, VarType ret, Map<VarType, VarType> genericsMap) {
-     // List<T> -> List<String>
--    if (upperBound != null && upperBound.isGeneric() && ret.isGeneric()) {
--      List<VarType> leftArgs = ((GenericType)upperBound).getArguments();
--      List<VarType> rightArgs = ((GenericType)ret).getArguments();
--      if (leftArgs.size() == rightArgs.size() && rightArgs.size() == fparams.size()) {
--        for (int i = 0; i < leftArgs.size(); i++) {
--          VarType left = leftArgs.get(i);
--          VarType right = rightArgs.get(i);
--          if (left != null && right.getValue().equals(fparams.get(i))) {
--            genericArgs.add(left);
--            map.put(right, left);
--          } else {
--            genericArgs.clear();
--            map.clear();
--            break;
--          }
--        }
-+    if (upperBound != null && upperBound.isGeneric() && ret.isGeneric() && upperBound.getArrayDim() == ret.getArrayDim()) {
-+      int left = ((GenericType)upperBound).getArguments().size();
-+      int right = ((GenericType)ret).getArguments().size();
-+      if (left == right) {
-+        ((GenericType)ret).mapGenVarsTo((GenericType)upperBound, genericsMap);
-       }
-     }
-+  }
- 
--    return map.isEmpty() ? ret : ret.remap(map);
-+  protected void getGenericArgs(List<String> fparams, Map<VarType, VarType> genericsMap, List<VarType> genericArgs) {
-+    for (String type : fparams) {
-+      VarType arg = genericsMap.get(GenericType.parse("T" + type + ";"));
-+      if (arg == null || (arg.isGeneric() && ((GenericType)arg).getWildcard() != GenericType.WILDCARD_NO)) {
-+        genericArgs.clear();
-+        break;
-+      }
-+      genericArgs.add(arg);
-+    }
-   }
- 
-   protected void appendParameters(TextBuffer buf, List<VarType> genericArgs) {
-@@ -244,22 +242,27 @@ public abstract class Exprent implements IMatchable {
-     ClassNode class_ = (ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE);
-     MethodWrapper method = (MethodWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_WRAPPER);
- 
--    //TODO: Loop enclosing classes?
--    GenericClassDescriptor cls = class_ == null ? null : class_.classStruct.getSignature();
--    if (cls != null) {
--      for (int x = 0; x < cls.fparameters.size(); x++) {
--        ret.put(GenericType.parse("T" + cls.fparameters.get(x) + ";"), cls.fbounds.get(x));
-+    while (true) {
-+      GenericClassDescriptor cls = class_ == null ? null : class_.classStruct.getSignature();
-+      if (cls != null) {
-+        for (int x = 0; x < cls.fparameters.size(); x++) {
-+          ret.put(GenericType.parse("T" + cls.fparameters.get(x) + ";"), cls.fbounds.get(x));
-+        }
-       }
--    }
- 
--    //TODO: Loop enclosing method?
--    GenericMethodDescriptor mtd = method == null ? null : method.methodStruct.getSignature();
--    if (mtd != null) {
--      for (int x = 0; x < mtd.typeParameters.size(); x++) {
--        ret.put(GenericType.parse("T" + mtd.typeParameters.get(x) + ";"), mtd.typeParameterBounds.get(x));
-+      GenericMethodDescriptor mtd = method == null ? null : method.methodStruct.getSignature();
-+      if (mtd != null) {
-+        for (int x = 0; x < mtd.typeParameters.size(); x++) {
-+          ret.put(GenericType.parse("T" + mtd.typeParameters.get(x) + ";"), mtd.typeParameterBounds.get(x));
-+        }
-       }
--    }
- 
-+      if (class_ == null) {
-+        break;
-+      }
-+      method = class_.enclosingMethod == null ? null : class_.parent.getWrapper().getMethods().getWithKey(class_.enclosingMethod);
-+      class_ = class_.parent;
-+    }
-     return ret;
-   }
- 
-@@ -311,6 +314,8 @@ public abstract class Exprent implements IMatchable {
-     buf.prepend("(" + ExprProcessor.getCastTypeName(left, Collections.emptyList()) + ")");
-   }
- 
-+  public void setInvocationInstance() {}
-+
-   // *****************************************************************************
-   // IMatchable implementation
-   // *****************************************************************************
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-index e98b53eb94ed7f1f5c936887be8418e6637b2b43..3099a4611a01341d3a923d84723303ed0e76741b 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-@@ -14,6 +14,7 @@ import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribu
- import org.jetbrains.java.decompiler.struct.consts.LinkConstant;
- import org.jetbrains.java.decompiler.struct.gen.FieldDescriptor;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
- import org.jetbrains.java.decompiler.struct.match.MatchEngine;
- import org.jetbrains.java.decompiler.struct.match.MatchNode;
- import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
-@@ -23,6 +24,7 @@ import org.jetbrains.java.decompiler.util.TextUtil;
- import java.util.ArrayList;
- import java.util.BitSet;
- import java.util.Collections;
-+import java.util.HashMap;
- import java.util.List;
- import java.util.Map;
- import java.util.Objects;
-@@ -74,7 +76,28 @@ public class FieldExprent extends Exprent {
-     }
- 
-     if (ft != null && ft.getSignature() != null) {
--      return ft.getSignature().type.remap(types.getOrDefault(cl.qualifiedName, Collections.emptyMap()));
-+      VarType ret =  ft.getSignature().type.remap(types.getOrDefault(cl.qualifiedName, Collections.emptyMap()));
-+
-+      if (instance != null && cl.getSignature() != null) {
-+        VarType instType = instance.getInferredExprType(null);
-+
-+        if (instType.isGeneric() && instType.getType() != CodeConstants.TYPE_GENVAR) {
-+          GenericType ginstance = (GenericType)instType;
-+
-+          cl = DecompilerContext.getStructContext().getClass(instType.getValue());
-+          if (cl != null && cl.getSignature() != null) {
-+            Map<VarType, VarType> tempMap = new HashMap<>();
-+            cl.getSignature().genericType.mapGenVarsTo(ginstance, tempMap);
-+            VarType _new = ret.remap(tempMap);
-+
-+            if (_new != null) {
-+              ret = _new;
-+            }
-+          }
-+        }
-+      }
-+
-+      return ret;
-     }
- 
-     return getExprType();
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-index cb15c8bc3d924e99c0bf9db350e8fe102bc5f97a..e74a3c65c126f3378a4551bc96dd82aff9dc4601 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-@@ -316,6 +316,11 @@ public class FunctionExprent extends Exprent {
-         this.needsCast = right.getType() == CodeConstants.TYPE_NULL || !DecompilerContext.getStructContext().instanceOf(right.getValue(), cast.getValue());
-       }
-     }
-+    else if (funcType == FUNCTION_IIF) {
-+      // TODO return common generic type?
-+      lstOperands.get(1).getInferredExprType(upperBound);
-+      lstOperands.get(2).getInferredExprType(upperBound);
-+    }
-     return getExprType();
-   }
- 
-@@ -633,6 +638,17 @@ public class FunctionExprent extends Exprent {
-     this.implicitType = implicitType;
-   }
- 
-+  public boolean doesCast() {
-+    return needsCast;
-+  }
-+
-+  @Override
-+  public void setInvocationInstance() {
-+    if (funcType == FUNCTION_CAST) {
-+      lstOperands.get(0).setInvocationInstance();
-+    }
-+  }
-+
-   @Override
-   public void getBytecodeRange(BitSet values) {
-     measureBytecode(values, lstOperands);
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 165a152ea68e6b6580a9064bd1f4a4d39677f972..1661a1deb02a4caa5238b5342e5d6043e4e37b7b 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-@@ -32,6 +32,7 @@ import org.jetbrains.java.decompiler.util.TextUtil;
- import java.lang.reflect.Method;
- import java.util.*;
- import java.util.Map.Entry;
-+import java.util.stream.Collectors;
- 
- public class InvocationExprent extends Exprent {
-   private static final int INVOKE_SPECIAL = 1;
-@@ -52,6 +53,7 @@ public class InvocationExprent extends Exprent {
-   private boolean canIgnoreBoxing = true;
-   private int funcType = TYPE_GENERAL;
-   private Exprent instance;
-+  private StructMethod desc = null;
-   private MethodDescriptor descriptor;
-   private String stringDescriptor;
-   private String invokeDynamicClassSuffix;
-@@ -59,6 +61,8 @@ public class InvocationExprent extends Exprent {
-   private List<Exprent> parameters = new ArrayList<>();
-   private List<PooledConstant> bootstrapArguments;
-   private List<VarType> genericArgs = new ArrayList<>();
-+  private Map<VarType, VarType> genericsMap = new HashMap<>();
-+  private boolean isInvocationInstance = false;
-   private boolean forceBoxing = false;
-   private boolean forceUnboxing = false;
-   private boolean isSyntheticNullCheck = false;
-@@ -168,45 +172,326 @@ public class InvocationExprent extends Exprent {
- 
-   @Override
-   public VarType getInferredExprType(VarType upperBound) {
--    List<StructMethod> matches = getMatchedDescriptors();
--    StructMethod desc = null;
--    if(matches.size() == 1) {
--      desc = matches.get(0);
-+    if (desc == null) {
-+      StructClass cl = DecompilerContext.getStructContext().getClass(className);
-+      desc = cl != null ? cl.getMethodRecursive(name, stringDescriptor) : null;
-     }
- 
-     genericArgs.clear();
-+    genericsMap.clear();
-+
-+    StructClass mthCls = DecompilerContext.getStructContext().getClass(className);
-+
-+    if (desc != null && mthCls != null) {
-+      boolean isNew = funcType == TYPE_INIT;
-+      boolean isGenNew = isNew && mthCls.getSignature() != null;
-+      if (desc.getSignature() != null || isGenNew) {
-+        Map<VarType, List<VarType>> named = getNamedGenerics();
-+        Map<VarType, List<VarType>> bounds = getGenericBounds(mthCls);
-+
-+        List<String> fparams = isGenNew ? mthCls.getSignature().fparameters : desc.getSignature().typeParameters;
-+        VarType ret = isGenNew ? mthCls.getSignature().genericType : desc.getSignature().returnType;
-+
-+        StructClass cls;
-+        Map<VarType, VarType> tempMap = new HashMap<>();
-+        Map<VarType, VarType> upperBoundsMap = new HashMap<>();
-+        Map<VarType, VarType> hierarchyMap = new HashMap<>();
-+
-+        if (!className.equals(desc.getClassQualifiedName())) {
-+          Map<String, Map<VarType, VarType>> hierarchy = mthCls.getAllGenerics();
-+          if (hierarchy.containsKey(desc.getClassQualifiedName())) {
-+            hierarchyMap = hierarchy.get(desc.getClassQualifiedName());
-+            hierarchyMap.forEach((from, to) -> {
-+              if (to.getType() == CodeConstants.TYPE_GENVAR) {
-+                if (bounds.containsKey(to) && !bounds.containsKey(from)) {
-+                  bounds.put(from, bounds.get(to));
-+                }
-+              }
-+              else if (!bounds.containsKey(from)) {
-+                genericsMap.put(from, to);
-+              }
-+            });
-+          }
-+        }
- 
--    if (desc != null && desc.getSignature() != null) {
--      VarType ret = desc.getSignature().returnType;
-+        // if possible, collect mappings from the ub
-+        // these mappings will be used to help 'fill in the blanks' when creating the ub types for the instance/params
-+        if (upperBound != null && !upperBound.equals(VarType.VARTYPE_OBJECT) && (upperBound.getType() != CodeConstants.TYPE_GENVAR || named.containsKey(upperBound))) {
-+          VarType ub = upperBound; // keep original
-+          VarType r = ret;
-+          if (ub.getType() != CodeConstants.TYPE_GENVAR && r.getType() != CodeConstants.TYPE_GENVAR && !ub.getValue().equals(r.getValue())) {
-+            if (DecompilerContext.getStructContext().instanceOf(ub.getValue(), r.getValue())) {
-+              ub = GenericType.getGenericSuperType(ub, r);
-+            }
-+            else {
-+              r = GenericType.getGenericSuperType(r, ub);
-+            }
-+          }
- 
--      if (instance != null) {
--        VarType instType = instance.getInferredExprType(upperBound);
-+          if (r.getType() == CodeConstants.TYPE_GENVAR) {
-+            upperBoundsMap.put(r.resizeArrayDim(0), upperBound.resizeArrayDim(upperBound.getArrayDim() - r.getArrayDim()));
-+          }
-+          else {
-+            gatherGenerics(ub, r, tempMap);
-+            tempMap.forEach((from, to) -> {
-+              if (!genericsMap.containsKey(from)) {
-+                if (to != null && (to.getType() != CodeConstants.TYPE_GENVAR || named.containsKey(to))) {
-+                  if (isMappingInBounds(from, to, named, bounds)) {
-+                    upperBoundsMap.put(from, to);
-+                  }
-+                }
-+              }
-+            });
-+            tempMap.clear();
-+          }
-+        }
- 
--        if (instType.isGeneric()) {
--          StructClass cls = DecompilerContext.getStructContext().getClass(instType.getValue());
-+        // add all other known gen types to the UB map as a dummy value
-+        // this is important for the creation of instance/param UBs
-+        // leaving a type 'T' because we have no mapping for it is bad; it is taken as we expect the result to be 'T'
-+        // really though, we have no idea what 'T' is supposed to be and this is an attempt to make that clear
-+        fparams.stream().map(p -> "T" + p + ";").map(GenericType::parse).filter(t -> !upperBoundsMap.containsKey(t)).forEach(t -> upperBoundsMap.put(t, GenericType.DUMMY_VAR));
-+        if (mthCls.getSignature() != null) {
-+          mthCls.getSignature().fparameters.stream().map(p -> "T" + p + ";").map(GenericType::parse).filter(t -> !upperBoundsMap.containsKey(t)).forEach(t -> upperBoundsMap.put(t, GenericType.DUMMY_VAR));
-+        }
- 
--          if (cls != null && cls.getSignature() != null) {
--            Map<VarType, VarType> map = new HashMap<>();
-+        // types gathered from the instance have the highest priority
-+        if (instance != null && !isNew) {
-+          instance.setInvocationInstance();
-+
-+          VarType instUB = mthCls.getSignature() != null ? mthCls.getSignature().genericType.remap(upperBoundsMap) : upperBound;
-+          VarType instType;
-+
-+          // don't want the casted type
-+          if (instance.type == EXPRENT_FUNCTION && ((FunctionExprent)instance).getFuncType() == FunctionExprent.FUNCTION_CAST) {
-+            instType = ((FunctionExprent)instance).getLstOperands().get(0).getInferredExprType(instUB);
-+          }
-+          else {
-+            instType = instance.getInferredExprType(instUB);
-+          }
-+
-+          if (instType.getType() == CodeConstants.TYPE_GENVAR && named.containsKey(instType)) {
-+            instType = named.get(instType).get(0);
-+          }
-+
-+          if (instType.isGeneric() && instType.getType() != CodeConstants.TYPE_GENVAR) {
-             GenericType ginstance = (GenericType)instType;
- 
--            if (cls.getSignature().fparameters.size() == ginstance.getArguments().size()) {
--              for (int x = 0; x < ginstance.getArguments().size(); x++) {
--                if (ginstance.getArguments().get(x) != null) { //TODO: Wildcards are null arguments.. look into fixing things?
--                  map.put(GenericType.parse("T" + cls.getSignature().fparameters.get(x) + ";"), ginstance.getArguments().get(x));
-+            cls = DecompilerContext.getStructContext().getClass(instType.getValue());
-+            if (cls != null && cls.getSignature() != null) {
-+              cls.getSignature().genericType.mapGenVarsTo(ginstance, tempMap);
-+              tempMap.forEach((from, to) -> {
-+                if (!fparams.contains(from.getValue())) {
-+                  processGenericMapping(from, to, named, bounds);
-                 }
-+              });
-+              tempMap.clear();
-+            }
-+          }
-+        }
-+
-+        // fix for this() & super()
-+        if (upperBound == null && isGenNew) {
-+          ClassNode currentCls = (ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE);
-+
-+          if (currentCls != null) {
-+            if (mthCls.equals(currentCls.classStruct)) {
-+              mthCls.getSignature().genericType.getAllGenericVars().forEach(var -> genericsMap.put(var, var));
-+            }
-+            else {
-+              Map<String, Map<VarType, VarType>> hierarchy = currentCls.classStruct.getAllGenerics();
-+              if (hierarchy.containsKey(mthCls.qualifiedName)) {
-+                hierarchy.get(mthCls.qualifiedName).forEach(genericsMap::put);
-               }
-             }
-+          }
-+        }
- 
--            if (!map.isEmpty()) {
--              ret = ret.remap(map);
-+        if (!isInvocationInstance) {
-+          upperBoundsMap.forEach((k, v) -> {
-+            if (fparams.contains(k.getValue()) && !GenericType.DUMMY_VAR.equals(v) && !genericsMap.containsKey(k)) {
-+              genericsMap.put(k, v);
-+            }
-+          });
-+        }
-+
-+        Set<VarType> paramGenerics = new HashSet<>();
-+        if (!parameters.isEmpty() && desc.getSignature() != null) {
-+          List<VarVersionPair> mask = null;
-+          int start = 0;
-+          ClassNode newNode = DecompilerContext.getClassProcessor().getMapRootClasses().get(className);
-+          if (newNode != null) {
-+            if (isNew) {
-+              mask = ExprUtil.getSyntheticParametersMask(newNode, stringDescriptor, parameters.size());
-+              start = newNode.classStruct.hasModifier(CodeConstants.ACC_ENUM) ? 2 : 0;
-+            } else if (!newNode.enclosingClasses.isEmpty()) {
-+              start = (newNode.access & CodeConstants.ACC_STATIC) == 0 ? 1 : 0;
-+            }
-+          }
-+
-+          int j = 0;
-+          for (int i = start; i < parameters.size(); ++i) {
-+            if (mask == null || mask.get(i) == null) {
-+              VarType paramType = desc.getSignature().parameterTypes.get(j++);
-+              if (paramType.isGeneric()) {
-+                Exprent parameter = parameters.get(i);
-+                Set<VarType> excluded = new HashSet<>();
-+                if (parameter.type == Exprent.EXPRENT_NEW) {
-+                  NewExprent newExprent = (NewExprent) parameter;
-+                  if (newExprent.isLambda()) {
-+                    ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(newExprent.getNewType().getValue());
-+                    int potentialMethodCount = Integer.MAX_VALUE;
-+                    if (node.lambdaInformation.is_method_reference) {
-+                      StructClass content = (StructClass) DecompilerContext.getStructContext().getClass(node.lambdaInformation.content_class_name);
-+                      if (content != null) {
-+                        StructClass currentCls = (StructClass) DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS);
-+                        potentialMethodCount = (int) content.getMethods().stream()
-+                            .filter((method) -> canAccess(currentCls, method))
-+                            .map(StructMethod::getName)
-+                            .filter(node.lambdaInformation.content_method_name::equals)
-+                            .count();
-+                      }
-+                    }
-+                    if (potentialMethodCount > 1) {
-+                      StructClass base = DecompilerContext.getStructContext().getClass(newExprent.getExprType().getValue());
-+                      if (base != null) {
-+                        StructMethod found = null;
-+                        for (StructMethod method : base.getMethods()) {
-+                          if (!method.hasModifier(CodeConstants.ACC_STATIC) && method.getInstructionSequence() == null) {
-+                            found = method;
-+                            break;
-+                          }
-+                        }
-+                        if (found != null) {
-+                          Map<VarType, VarType> genvars = new HashMap<>();
-+                          if (base.getSignature() != null) {
-+                            base.getSignature().genericType.mapGenVarsTo((GenericType) paramType, genvars);
-+                            excluded.addAll(found.getSignature().parameterTypes.stream()
-+                                .filter(VarType::isGeneric)
-+                                .map(GenericType.class::cast)
-+                                .map(GenericType::getAllGenericVars)
-+                                .flatMap(List::stream)
-+                                .map(genvars::get)
-+                                .filter(Objects::nonNull)
-+                                .filter(VarType::isGeneric)
-+                                .map(GenericType.class::cast)
-+                                .map(GenericType::getAllGenericVars)
-+                                .flatMap(List::stream)
-+                                .collect(Collectors.toList()));
-+                          }
-+                        }
-+                      }
-+                    }
-+                  }
-+                }
-+
-+                Map<VarType, VarType> combined = new HashMap<>(genericsMap);
-+                upperBoundsMap.forEach((k, v) -> {
-+                  if (!combined.containsKey(k))
-+                    combined.put(k, v);
-+                });
-+                VarType paramUB = paramType.remap(hierarchyMap).remap(combined);
-+
-+                VarType argtype;
-+                if (parameters.get(i).type == EXPRENT_FUNCTION && ((FunctionExprent)parameters.get(i)).getFuncType() == FunctionExprent.FUNCTION_CAST) {
-+                  argtype = ((FunctionExprent)parameters.get(i)).getLstOperands().get(0).getInferredExprType(paramUB);
-+                }
-+                else {
-+                  argtype = parameters.get(i).getInferredExprType(paramUB);
-+                }
-+
-+                StructClass paramCls = DecompilerContext.getStructContext().getClass(paramType.getValue());
-+                cls = argtype.getType() != CodeConstants.TYPE_GENVAR ? DecompilerContext.getStructContext().getClass(argtype.getValue()) : null;
-+
-+                if (cls != null && paramCls != null) {
-+                  if (paramType.isGeneric() && !paramType.getValue().equals(argtype.getValue())) {
-+                    argtype = GenericType.getGenericSuperType(argtype, paramType);
-+                  }
-+
-+                  if (paramType.isGeneric() && argtype.isGeneric()) {
-+                    GenericType genParamType = (GenericType)paramType;
-+                    GenericType genArgType = (GenericType)argtype;
-+
-+                    genParamType.mapGenVarsTo(genArgType, tempMap);
-+                    tempMap.forEach((from, to) -> {
-+                      if (!excluded.contains(from)) {
-+                        paramGenerics.add(from);
-+                      }
-+                      processGenericMapping(from, to, named, bounds);
-+                    });
-+                    tempMap.clear();
-+                  }
-+                }
-+                else if (paramType.getType() == CodeConstants.TYPE_GENVAR && !paramType.equals(argtype) && argtype.getArrayDim() >= paramType.getArrayDim()) {
-+                  if (paramType.getArrayDim() > 0) {
-+                    argtype = argtype.resizeArrayDim(argtype.getArrayDim() - paramType.getArrayDim());
-+                    paramType = paramType.resizeArrayDim(0);
-+                  }
-+                  if (!excluded.contains(paramType)) {
-+                    paramGenerics.add(paramType);
-+                  }
-+                  processGenericMapping(paramType, argtype, named, bounds);
-+                }
-+              }
-             }
-           }
-         }
--      }
- 
--      VarType _new = this.gatherGenerics(upperBound, ret, desc.getSignature().typeParameters, genericArgs);
--      if (desc.getSignature().returnType != _new) {
--        return _new;
-+        upperBoundsMap.forEach((k, v) -> {
-+          if (fparams.contains(k.getValue()) && !GenericType.DUMMY_VAR.equals(v)) {
-+            processGenericMapping(k, v ,named, bounds);
-+          }
-+        });
-+
-+        if (!genericsMap.isEmpty()) {
-+          VarType newRet = ret.remap(hierarchyMap);
-+
-+          boolean skipArgs = true;
-+          if (!fparams.isEmpty() && newRet.isGeneric()) {
-+            for (VarType genVar : ((GenericType)newRet).getAllGenericVars()) {
-+              if (fparams.contains(genVar.getValue())) {
-+                skipArgs = false;
-+                break;
-+              }
-+            }
-+          }
-+
-+          newRet = newRet.remap(genericsMap);
-+          if (newRet == null) {
-+            newRet = bounds.get(ret).get(0).remap(genericsMap);
-+          }
-+
-+          if (!skipArgs && (!isNew || isGenNew)) {
-+            boolean missing = paramGenerics.isEmpty();
-+
-+            if (!missing) {
-+              for (String param : fparams) {
-+                if (!paramGenerics.contains(GenericType.parse("T" + param + ";"))) {
-+                  missing = true;
-+                  break;
-+                }
-+              }
-+            }
-+
-+            boolean suppress = (!missing || !isInvocationInstance) &&
-+              (upperBound == null || !newRet.isGeneric() || DecompilerContext.getStructContext().instanceOf(newRet.getValue(), upperBound.getValue()));
-+
-+            if (!suppress || DecompilerContext.getOption(IFernflowerPreferences.EXPLICIT_GENERIC_ARGUMENTS)) {
-+              getGenericArgs(fparams, genericsMap, genericArgs);
-+            }
-+            else if (isGenNew) {
-+              genericArgs.add(GenericType.DUMMY_VAR);
-+            }
-+          }
-+
-+          if (newRet != ret && !(newRet.isGeneric() && ((GenericType)newRet).hasUnknownGenericType(named.keySet()))) {
-+            return newRet;
-+          }
-+        }
-+
-+        if (ret.isGeneric() && ((GenericType)ret).getAllGenericVars().isEmpty()) {
-+          return ret;
-+        }
-       }
-     }
- 
-@@ -309,7 +594,19 @@ public class InvocationExprent extends Exprent {
-           TextUtil.writeQualifiedSuper(buf, super_qualifier);
-         }
-         else if (instance != null) {
-+          StructClass cl = DecompilerContext.getStructContext().getClass(className);
-+
-           VarType leftType = new VarType(CodeConstants.TYPE_OBJECT, 0, className);
-+          if (!genericsMap.isEmpty() && cl != null && cl.getSignature() != null) {
-+            VarType _new = cl.getSignature().genericType.remap(genericsMap);
-+            if (_new != cl.getSignature().genericType) {
-+              leftType = _new;
-+            }
-+          }
-+
-+          instance.setInvocationInstance();
-+          VarType rightType = instance.getInferredExprType(leftType);
-+
-           if (isUnboxingCall() && !forceUnboxing) {
-             // we don't print the unboxing call - no need to bother with the instance wrapping / casting
-             if (instance.type == Exprent.EXPRENT_FUNCTION) {
-@@ -338,7 +635,8 @@ public class InvocationExprent extends Exprent {
- 
-           TextBuffer res = instance.toJava(indent, tracer);
- 
--          VarType rightType = instance.getExprType();
-+          boolean skippedCast = instance.type == EXPRENT_FUNCTION &&
-+            ((FunctionExprent)instance).getFuncType() == FunctionExprent.FUNCTION_CAST && !((FunctionExprent)instance).doesCast();
- 
-           if (rightType.equals(VarType.VARTYPE_OBJECT) && !leftType.equals(rightType)) {
-             buf.append("((").append(ExprProcessor.getCastTypeName(leftType, Collections.emptyList())).append(")");
-@@ -348,7 +646,7 @@ public class InvocationExprent extends Exprent {
-             }
-             buf.append(res).append(")");
-           }
--          else if (instance.getPrecedence() > getPrecedence()) {
-+          else if (instance.getPrecedence() > getPrecedence() && !skippedCast) {
-             buf.append("(").append(res).append(")");
-           }
-           else {
-@@ -392,6 +690,12 @@ public class InvocationExprent extends Exprent {
-       }
-     }
- 
-+    buf.append(appendParamList(indent, tracer)).append(')');
-+    return buf;
-+  }
-+
-+  public TextBuffer appendParamList(int indent, BytecodeMappingTracer tracer) {
-+    TextBuffer buf = new TextBuffer();
-     List<VarVersionPair> mask = null;
-     boolean isEnum = false;
-     if (funcType == TYPE_INIT) {
-@@ -404,28 +708,6 @@ public class InvocationExprent extends Exprent {
-     ClassNode currCls = ((ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE));
-     List<StructMethod> matches = getMatchedDescriptors();
-     BitSet setAmbiguousParameters = getAmbiguousParameters(matches);
--    StructMethod desc = null;
--    if(matches.size() == 1) {
--      desc = matches.get(0);
--    }
--
--    StructClass cl = DecompilerContext.getStructContext().getClass(className);
--    Map<VarType, VarType> genArgs = new HashMap<>();
--
--    // building generic info from the instance
--    VarType inferred = instance == null ? null : instance.getInferredExprType(null);
--    if (cl != null && cl.getSignature() != null && instance != null && inferred.isGeneric()) {
--      GenericType genType = (GenericType)inferred;
--      if (genType.getArguments().size() == cl.getSignature().fparameters.size()) {
--        for (int i = 0; i < cl.getSignature().fparameters.size(); i++) {
--          VarType from = GenericType.parse("T" + cl.getSignature().fparameters.get(i) + ";");
--          VarType to = genType.getArguments().get(i);
--          if (from != null && to != null) {
--            genArgs.put(from, to);
--          }
--        }
--      }
--    }
- 
-     // omit 'new Type[] {}' for the last parameter of a vararg method call
-     if (parameters.size() == descriptor.params.length && isVarArgCall()) {
-@@ -514,20 +796,42 @@ public class InvocationExprent extends Exprent {
-       }
-     }
- 
--    if (instance != null && !genArgs.isEmpty()) {
--        StructClass stClass = DecompilerContext.getStructContext().getClass(className);
--        StructMethod me = stClass.getMethodRecursive(getName(), getStringDescriptor());
--        if (me != null && me.getSignature() != null) {
--            for (int x = 0; x < types.length; x++) {
--                VarType type = me.getSignature().parameterTypes.get(x);
--                if (type.isGeneric()) {
--                    VarType _new = type.remap(genArgs);
--                    if (_new != type) {
--                        types[x] = _new;
--                    }
--                }
--            }
-+    if (desc == null) {
-+      this.getInferredExprType(null);
-+
-+      if (genericsMap.isEmpty() && instance != null && funcType != TYPE_INIT) {
-+        VarType instType = instance.getInferredExprType(null);
-+        if (instType.isGeneric() && instType.getType() != CodeConstants.TYPE_GENVAR) {
-+          GenericType ginstance = (GenericType)instType;
-+
-+          StructClass cls = DecompilerContext.getStructContext().getClass(instType.getValue());
-+          if (cls != null && cls.getSignature() != null) {
-+            cls.getSignature().genericType.mapGenVarsTo(ginstance, genericsMap);
-+          }
-         }
-+      }
-+    }
-+    if (desc != null && desc.getSignature() != null) {
-+      Map<VarType, VarType> hierarchyMap = new HashMap<>();
-+      if (!className.equals(desc.getClassQualifiedName())) {
-+        StructClass mthCls = DecompilerContext.getStructContext().getClass(className);
-+        if (mthCls != null) {
-+          Map<String, Map<VarType, VarType>> hierarchy = mthCls.getAllGenerics();
-+          if (hierarchy.containsKey(desc.getClassQualifiedName())) {
-+            hierarchyMap = hierarchy.get(desc.getClassQualifiedName());
-+          }
-+        }
-+      }
-+      Set<VarType> namedGens = getNamedGenerics().keySet();
-+      int y = 0;
-+      for (int x = start; x < types.length; x++) {
-+        if (mask == null || mask.get(x) == null) {
-+          VarType type = desc.getSignature().parameterTypes.get(y++).remap(hierarchyMap).remap(genericsMap);
-+          if (type != null && !(type.isGeneric() && ((GenericType)type).hasUnknownGenericType(namedGens))) {
-+            types[x] = type;
-+          }
-+        }
-+      }
-     }
- 
- 
-@@ -565,6 +869,10 @@ public class InvocationExprent extends Exprent {
-         }
-         */
- 
-+        if (i == parameters.size() - 1 && this.parameters.get(i).getExprType() == VarType.VARTYPE_NULL && NewExprent.probablySyntheticParameter(descriptor.params[i].getValue())) {
-+          break;  // skip last parameter of synthetic constructor call
-+        }
-+
-         // 'byte' and 'short' literals need an explicit narrowing type cast when used as a parameter
-         ExprProcessor.getCastedExprent(this.parameters.get(i), types[i], buff, indent, true, ambiguous, true, true, tracer);
- 
-@@ -580,8 +888,6 @@ public class InvocationExprent extends Exprent {
-       }
-     }
- 
--    buf.append(')');
--
-     return buf;
-   }
- 
-@@ -869,6 +1175,162 @@ public class InvocationExprent extends Exprent {
-     return ambiguous;
-   }
- 
-+  private void processGenericMapping(VarType from, VarType to, Map<VarType, List<VarType>> named, Map<VarType, List<VarType>> bounds) {
-+    if (VarType.VARTYPE_NULL.equals(to) || (to != null && to.getType() == CodeConstants.TYPE_GENVAR && !named.containsKey(to))) {
-+      return;
-+    }
-+
-+    VarType current = genericsMap.get(from);
-+    if (!genericsMap.containsKey(from)) {
-+      putGenericMapping(from, to, named, bounds);
-+    }
-+    else if (to != null && current != null && !to.equals(current)) {
-+      if (named.containsKey(current)) {
-+        return;
-+      }
-+
-+      if (current.getType() != CodeConstants.TYPE_GENVAR && to.getType() == CodeConstants.TYPE_GENVAR) {
-+        if (named.containsKey(to)) {
-+          VarType bound = named.get(to).get(0);
-+          if (!bound.equals(VarType.VARTYPE_OBJECT) && DecompilerContext.getStructContext().instanceOf(bound.getValue(), current.getValue())) {
-+            return;
-+          }
-+        }
-+      }
-+
-+      if (to.isGeneric() && current.isGeneric() && GenericType.isAssignable(to, current, named)) {
-+        putGenericMapping(from, to, named, bounds);
-+      }
-+    }
-+  }
-+
-+  private void putGenericMapping(VarType from, VarType to, Map<VarType, List<VarType>> named, Map<VarType, List<VarType>> bounds) {
-+    if (isMappingInBounds(from, to, named, bounds)) {
-+      genericsMap.put(from, to);
-+    }
-+  }
-+
-+  private boolean isMappingInBounds(VarType from, VarType to, Map<VarType, List<VarType>> named, Map<VarType, List<VarType>> bounds) {
-+    if (!bounds.containsKey(from)) {
-+      return false;
-+    }
-+
-+    if (to == null || (to.getType() == CodeConstants.TYPE_GENVAR && !named.containsKey(to))) {
-+      return true;
-+    }
-+
-+    java.util.function.BiFunction<VarType, VarType, Boolean>  verifier = (newTo, bound) -> {
-+      if (bound.getType() == CodeConstants.TYPE_GENVAR) {
-+        java.util.function.Function<VarType, VarType> map = e -> {
-+          VarType mapped = genericsMap.get(e);
-+          if (mapped == null)
-+            mapped = named.containsKey(e) ? named.get(e).get(0) : null;
-+          return mapped;
-+        };
-+        VarType mapped = map.apply(bound);
-+
-+        if (mapped != null && !mapped.equals(bound)) {
-+          VarType last = bound;
-+          while (bound != null) {
-+            last = bound;
-+            bound = map.apply(bound);
-+          }
-+          bound = last;
-+
-+          if (bound.getType() != CodeConstants.TYPE_GENVAR) {
-+            return DecompilerContext.getStructContext().instanceOf(newTo.getValue(), bound.getValue());
-+          }
-+        }
-+
-+        return isMappingInBounds(bound, newTo, named, bounds);
-+      }
-+
-+      if (newTo.getType() < CodeConstants.TYPE_OBJECT) {
-+        return bound.equals(VarType.VARTYPE_OBJECT) || bound.equals(newTo);
-+      }
-+
-+      if (!DecompilerContext.getStructContext().instanceOf(newTo.getValue(), bound.getValue())) {
-+        return false;
-+      }
-+
-+      if (bound.isGeneric() && !((GenericType)bound).getArguments().isEmpty()) {
-+        GenericType genbound = (GenericType)bound;
-+        VarType _new = newTo;
-+
-+        if (!newTo.getValue().equals(bound.getValue())) {
-+          _new = GenericType.getGenericSuperType(newTo, bound);
-+        }
-+
-+        if (!_new.isGeneric() || ((GenericType)_new).getArguments().size() != genbound.getArguments().size()) {
-+          return false;
-+        }
-+
-+        Map<VarType, VarType> toAdd = new HashMap<>();
-+        GenericType genNew = (GenericType)_new;
-+        for (int i = 0; i < genbound.getArguments().size(); ++i) {
-+          VarType boundArg = genbound.getArguments().get(i);
-+          VarType newArg = genNew.getArguments().get(i);
-+
-+          if (boundArg == null) {
-+            continue;
-+          }
-+
-+          if (!boundArg.equals(newArg)) {
-+            // T extends Comparable<T>
-+            if (from.equals(boundArg) && to.equals(newArg)) {
-+              continue;
-+            }
-+
-+            // T extends Comparable<S>, S extends Object
-+            if (bounds.containsKey(boundArg) && isMappingInBounds(boundArg, newArg, named, bounds)) {
-+              toAdd.put(boundArg, newArg);
-+              continue;
-+            }
-+            return false;
-+          }
-+        }
-+        toAdd.forEach((k, v) -> processGenericMapping(k, v, named, bounds));
-+      }
-+      return true;
-+    };
-+
-+    List<VarType> toVerify = (to.getType() == CodeConstants.TYPE_GENVAR) ? named.get(to) : Collections.singletonList(to);
-+
-+    // We need to satisfy all the bounds for the type we are mapping to
-+    // The bounds can be satisfied by any of the bounds for the named type
-+    return bounds.get(from).stream().allMatch(bound -> toVerify.stream().anyMatch(v -> verifier.apply(v, bound)));
-+  }
-+
-+  private Map<VarType, List<VarType>> getGenericBounds(StructClass mthCls) {
-+    Map<VarType, List<VarType>> bounds = new HashMap<>();
-+
-+    if (desc.getSignature() != null) {
-+      for (int x = 0; x < desc.getSignature().typeParameters.size(); x++) {
-+        bounds.putIfAbsent(GenericType.parse("T" + desc.getSignature().typeParameters.get(x) + ";"), desc.getSignature().typeParameterBounds.get(x));
-+      }
-+    }
-+
-+    if (mthCls.getSignature() != null) {
-+      for (int x = 0; x < mthCls.getSignature().fparameters.size(); x++) {
-+        bounds.putIfAbsent(GenericType.parse("T" + mthCls.getSignature().fparameters.get(x) + ";"), mthCls.getSignature().fbounds.get(x));
-+      }
-+    }
-+
-+    ClassNode cn = DecompilerContext.getClassProcessor().getMapRootClasses().get(mthCls.qualifiedName);
-+    cn = cn != null ? cn.parent : null;
-+
-+    while (cn != null) {
-+      if (cn.classStruct.getSignature() != null) {
-+        for (int x = 0; x < cn.classStruct.getSignature().fparameters.size(); x++) {
-+          bounds.putIfAbsent(GenericType.parse("T" + cn.classStruct.getSignature().fparameters.get(x) + ";"), cn.classStruct.getSignature().fbounds.get(x));
-+        }
-+      }
-+      cn = cn.parent;
-+    }
-+
-+    return bounds;
-+  }
-+
-   @Override
-   public void replaceExprent(Exprent oldExpr, Exprent newExpr) {
-     if (oldExpr == instance) {
-@@ -980,6 +1442,19 @@ public class InvocationExprent extends Exprent {
-     return isSyntheticNullCheck;
-   }
- 
-+  public List<VarType> getGenericArgs() {
-+    return genericArgs;
-+  }
-+
-+  public Map<VarType, VarType> getGenericsMap() {
-+    return genericsMap;
-+  }
-+
-+  @Override
-+  public void setInvocationInstance() {
-+    isInvocationInstance = true;
-+  }
-+
-   @Override
-   public void getBytecodeRange(BitSet values) {
-     measureBytecode(values, parameters);
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-index 049bf247002da65a90392f054ad2c57a04ebae81..72205fbd81840cda91ca303d15758df4a2e79699 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-@@ -5,7 +5,16 @@ import org.jetbrains.java.decompiler.code.CodeConstants;
- import org.jetbrains.java.decompiler.main.ClassWriter;
- import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
- import org.jetbrains.java.decompiler.main.DecompilerContext;
-+import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
-+import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
-+import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.DummyExitStatement;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
-+import org.jetbrains.java.decompiler.struct.StructMethod;
- import org.jetbrains.java.decompiler.struct.consts.PrimitiveConstant;
-+import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericMethodDescriptor;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
- import org.jetbrains.java.decompiler.util.TextBuffer;
- import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
- import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
-@@ -33,6 +42,7 @@ public class NewExprent extends Exprent {
-   private boolean methodReference = false;
-   private boolean enumConst;
-   private List<VarType> genericArgs = new ArrayList<>();
-+  private VarType inferredLambdaType = null;
- 
-   public NewExprent(VarType newType, ListStack<Exprent> stack, int arrayDim, BitSet bytecodeOffsets) {
-     this(newType, getDimensions(arrayDim, stack), bytecodeOffsets);
-@@ -75,14 +85,158 @@ public class NewExprent extends Exprent {
-   @Override
-   public VarType getInferredExprType(VarType upperBound) {
-     genericArgs.clear();
--    if (newType.getType() == CodeConstants.TYPE_OBJECT && newType.getArrayDim() == 0) {
-+    if (!lambda && newType.getType() == CodeConstants.TYPE_OBJECT) {
-       StructClass node = DecompilerContext.getStructContext().getClass(newType.getValue());
- 
-       if (node != null && node.getSignature() != null) {
--        GenericClassDescriptor sig = node.getSignature();
--        VarType _new = this.gatherGenerics(upperBound, sig.genericType, sig.fparameters, genericArgs);
--        if (sig.genericType != _new) {
--          return _new;
-+        if (anonymous) {
-+          if (VarType.VARTYPE_OBJECT.equals(node.getSignature().superclass) && !node.getSignature().superinterfaces.isEmpty()) {
-+            return node.getSignature().superinterfaces.get(0);
-+          }
-+          return node.getSignature().superclass;
-+        }
-+        else if (newType.getArrayDim() == 0 && !node.getSignature().fparameters.isEmpty()) {
-+          GenericClassDescriptor sig = node.getSignature();
-+          if (constructor != null) {
-+            VarType ret = constructor.getInferredExprType(upperBound);
-+            return ret.getType() != CodeConstants.TYPE_VOID ? ret : getExprType();
-+          }
-+          else {
-+            Map<VarType, VarType> genericsMap = new HashMap<>();
-+            this.gatherGenerics(upperBound, sig.genericType, genericsMap);
-+            this.getGenericArgs(sig.fparameters, genericsMap, genericArgs);
-+            VarType _new = sig.genericType.remap(genericsMap);
-+            if (sig.genericType != _new) {
-+              return _new;
-+            }
-+          }
-+        }
-+      }
-+      else if (newType.getArrayDim() > 0 && !lstArrayElements.isEmpty() && newType.getValue().equals(VarType.VARTYPE_OBJECT.getValue())) {
-+        VarType first = lstArrayElements.get(0).getInferredExprType(null);
-+        if (first.getType() == CodeConstants.TYPE_GENVAR) {
-+          boolean matches = true;
-+          for (int i = 1; i < lstArrayElements.size(); ++i) {
-+            VarType type = lstArrayElements.get(i).getInferredExprType(null);
-+            if (!type.equals(first)) {
-+              matches = false;
-+              break;
-+            }
-+          }
-+          if (matches) {
-+            return first.resizeArrayDim(newType.getArrayDim());
-+          }
-+        }
-+      }
-+    }
-+
-+    if (lambda) {
-+      ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(newType.getValue());
-+
-+      if (node != null) {
-+
-+        VarType classType = node.anonymousClassType;
-+        StructClass cls = DecompilerContext.getStructContext().getClass(classType.getValue());
-+        MethodDescriptor desc = MethodDescriptor.parseDescriptor(node.lambdaInformation.method_descriptor);
-+        StructClass methodCls = DecompilerContext.getStructContext().getClass(node.lambdaInformation.content_class_name);
-+
-+        if (cls != null && cls.getSignature() != null && methodCls != null) {
-+          StructMethod refMethod = cls.getMethod(getLambdaMethodKey());
-+          StructMethod method = methodCls.getMethod(node.lambdaInformation.content_method_name, node.lambdaInformation.content_method_descriptor);
-+
-+          if (method != null && refMethod != null && refMethod.getSignature() != null) {
-+            GenericType ret = cls.getSignature().genericType;
-+
-+            HashMap<VarType, VarType> genericsMap = new HashMap<>();
-+            Map<VarType, List<VarType>> named = getNamedGenerics();
-+
-+            gatherGenerics(upperBound, ret, genericsMap);
-+
-+            HashMap<VarType, VarType> instanceMap = new HashMap<>();
-+            if (isMethodReference() && methodCls.getSignature() != null) {
-+              VarType first = ret.getArguments().get(0);
-+              if (constructor.getInstance() != null) {
-+                VarType instanceType = constructor.getInstance().getInferredExprType(null);
-+                if (instanceType.isGeneric()) {
-+                  methodCls.getSignature().genericType.mapGenVarsTo((GenericType)instanceType, instanceMap);
-+                }
-+              }
-+              else if (method.getSignature() != null) {
-+                for (int i = 0; i < method.getSignature().parameterTypes.size(); ++i) {
-+                  VarType mtype = method.getSignature().parameterTypes.get(i);
-+                  VarType rtype = refMethod.getSignature().parameterTypes.get(i);
-+                  if (mtype.getType() == CodeConstants.TYPE_GENVAR && rtype.getType() == CodeConstants.TYPE_GENVAR) {
-+                    if (genericsMap.containsKey(rtype)) {
-+                      instanceMap.put(mtype, genericsMap.get(rtype));
-+                    }
-+                  }
-+                }
-+              }
-+            }
-+
-+            // generated lambda methods have no generic info, so only map to generic var parameters
-+            List<VarType> types = method.getSignature() != null ? method.getSignature().parameterTypes : Arrays.asList(desc.params);
-+            for (int i = 0; i < types.size(); ++i) {
-+              if (refMethod.getSignature().parameterTypes.get(i).getType() == CodeConstants.TYPE_GENVAR) {
-+                if (!genericsMap.containsKey(refMethod.getSignature().parameterTypes.get(i))) {
-+                  VarType realType = types.get(i);
-+                  StructClass typeCls = DecompilerContext.getStructContext().getClass(realType.getValue());
-+                  if (typeCls != null && typeCls.getSignature() != null && !realType.equals(typeCls.getSignature().genericType)) {
-+                    realType = typeCls.getSignature().genericType.resizeArrayDim(realType.getArrayDim());
-+                  }
-+                  genericsMap.put(refMethod.getSignature().parameterTypes.get(i), realType);
-+                }
-+              }
-+            }
-+
-+            if (refMethod.getSignature().returnType.getType() == CodeConstants.TYPE_GENVAR) {
-+              VarType key = refMethod.getSignature().returnType;
-+              if (method.getName().equals(CodeConstants.INIT_NAME)) {
-+                if (methodCls.getSignature() != null) {
-+                  genericsMap.put(key, methodCls.getSignature().genericType);
-+                }
-+                else {
-+                  genericsMap.put(key, GenericType.parse("L" + methodCls.qualifiedName + ";"));
-+                }
-+              }
-+              else if (method.getSignature() != null || !desc.ret.equals(VarType.VARTYPE_OBJECT)) {
-+                VarType current = genericsMap.get(key);
-+                VarType returnType = method.getSignature() != null ? method.getSignature().returnType.remap(instanceMap) : desc.ret;
-+                StructClass retCls = returnType == null ? null : DecompilerContext.getStructContext().getClass(returnType.getValue());
-+
-+                if (!isMethodReference() && retCls != null && retCls.getSignature() != null && !retCls.getSignature().genericType.equalsExact(returnType)) {
-+                  VarType retUB = current != null && current.equals(returnType) ? current : returnType;
-+                  VarType realType = getLambdaReturnType(node, refMethod, retUB, genericsMap);
-+                  if (realType != null) {
-+                    returnType = realType;
-+                  }
-+                }
-+
-+                boolean add = current == null || returnType == null || returnType.isGeneric() ||
-+                  (!returnType.equals(genericsMap.get(key)) && (current.getType() != CodeConstants.TYPE_GENVAR || !named.containsKey(current)));
-+                if (add) {
-+                  genericsMap.put(key, returnType);
-+                }
-+              }
-+            }
-+
-+            ret.getAllGenericVars().forEach(from -> {
-+              genericsMap.putIfAbsent(from, GenericType.DUMMY_VAR);
-+            });
-+
-+            if (!genericsMap.isEmpty()) {
-+              VarType _new = ret.remap(genericsMap);
-+              if (_new != ret) {
-+                if (!_new.isGeneric() || !((GenericType)_new).hasUnknownGenericType(named.keySet())) {
-+                  inferredLambdaType = _new;
-+                }
-+                return _new;
-+              }
-+            }
-+          }
-+        }
-+        else {
-+          inferredLambdaType = classType;
-         }
-       }
-     }
-@@ -210,30 +364,13 @@ public class NewExprent extends Exprent {
-         }
-       }
- 
--      appendParameters(buf, genericArgs);
--      buf.append('(');
--
-       if (!lambda && constructor != null) {
--        List<Exprent> parameters = constructor.getParameters();
--        List<VarVersionPair> mask = child.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, constructor.getStringDescriptor()).synthParameters;
--        if (mask == null) {
--          InvocationExprent superCall = child.superInvocation;
--          mask = ExprUtil.getSyntheticParametersMask(superCall.getClassName(), superCall.getStringDescriptor(), parameters.size());
--        }
--
--        int start = enumConst ? 2 : 0;
--        boolean firstParam = true;
--        for (int i = start; i < parameters.size(); i++) {
--          if (mask == null || mask.get(i) == null) {
--            if (!firstParam) {
--              buf.append(", ");
--            }
--
--            ExprProcessor.getCastedExprent(parameters.get(i), constructor.getDescriptor().params[i], buf, indent, true, tracer);
--
--            firstParam = false;
--          }
--        }
-+        appendParameters(buf, constructor.getGenericArgs());
-+        buf.append('(').append(constructor.appendParamList(indent, tracer));
-+      }
-+      else {
-+        appendParameters(buf, genericArgs);
-+        buf.append('(');
-       }
- 
-       buf.append(')');
-@@ -246,6 +383,7 @@ public class NewExprent extends Exprent {
-         if (!DecompilerContext.getOption(IFernflowerPreferences.LAMBDA_TO_ANONYMOUS_CLASS)) {
-           buf.setLength(0);  // remove the usual 'new <class>()', it will be replaced with lambda style '() ->'
-         }
-+        setLambdaGenericTypes();
-         Exprent methodObject = constructor == null ? null : constructor.getInstance();
-         TextBuffer clsBuf = new TextBuffer();
-         new ClassWriter().classLambdaToJava(child, clsBuf, methodObject, indent, tracer);
-@@ -297,36 +435,10 @@ public class NewExprent extends Exprent {
-       }
- 
-       if (constructor != null) {
--        List<Exprent> parameters = constructor.getParameters();
--        List<VarVersionPair> mask = ExprUtil.getSyntheticParametersMask(constructor.getClassName(), constructor.getStringDescriptor(), parameters.size());
--
-         int start = enumConst ? 2 : 0;
--        if (!enumConst || start < parameters.size()) {
--          appendParameters(buf, genericArgs);
--          buf.append('(');
--
--          boolean firstParam = true;
--          for (int i = start; i < parameters.size(); i++) {
--            if (mask == null || mask.get(i) == null) {
--              Exprent expr = parameters.get(i);
--              VarType leftType = constructor.getDescriptor().params[i];
--
--              if (i == parameters.size() - 1 && expr.getExprType() == VarType.VARTYPE_NULL && probablySyntheticParameter(
--                leftType.getValue())) {
--                break;  // skip last parameter of synthetic constructor call
--              }
--
--              if (!firstParam) {
--                buf.append(", ");
--              }
--
--              ExprProcessor.getCastedExprent(expr, leftType, buf, indent, true, false, true, true, tracer);
--
--              firstParam = false;
--            }
--          }
--
--          buf.append(')');
-+        if (!enumConst || start < constructor.getParameters().size()) {
-+          appendParameters(buf, constructor.getGenericArgs());
-+          buf.append('(').append(constructor.appendParamList(indent, tracer)).append(')');
-         }
-       }
-     }
-@@ -386,7 +498,8 @@ public class NewExprent extends Exprent {
-     return buf;
-   }
- 
--  private static boolean probablySyntheticParameter(String className) {
-+  // TODO move to InvocationExprent
-+  public static boolean probablySyntheticParameter(String className) {
-     ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(className);
-     return node != null && node.type == ClassNode.CLASS_ANONYMOUS;
-   }
-@@ -424,6 +537,158 @@ public class NewExprent extends Exprent {
-     return null;
-   }
- 
-+  private static VarType getLambdaReturnType(ClassNode node, StructMethod desc, VarType upperBound, Map<VarType, VarType> genericsMap) {
-+    ClassWrapper wrapper = node.getWrapper();
-+    Map<String, VarType> inferredLambdaTypes = Exprent.inferredLambdaTypes.get();
-+
-+    if (wrapper != null) {
-+      MethodWrapper mt = wrapper.getMethodWrapper(node.lambdaInformation.content_method_name, node.lambdaInformation.content_method_descriptor);
-+
-+      if (mt != null && mt.root != null) {
-+        List<String> paramNames = new ArrayList<>();
-+
-+        MethodDescriptor md_content = MethodDescriptor.parseDescriptor(node.lambdaInformation.content_method_descriptor);
-+        MethodDescriptor md_lambda = MethodDescriptor.parseDescriptor(node.lambdaInformation.method_descriptor);
-+
-+        int index = node.lambdaInformation.is_content_method_static ? 0 : 1;
-+        int start_index = md_content.params.length - md_lambda.params.length;
-+
-+        int j = 0;
-+        for (int i = 0; i < md_content.params.length; i++) {
-+          if (i >= start_index) {
-+            VarVersionPair vpp = new VarVersionPair(index, 0);
-+            VarType curType = mt.varproc.getVarType(vpp);
-+            VarType infType = desc.getSignature().parameterTypes.get(j++).remap(genericsMap);
-+
-+            if (infType != null && !infType.equals(VarType.VARTYPE_VOID)) {
-+              if (!curType.equals(infType) || (infType.isGeneric() && !((GenericType)infType).equalsExact(curType))) {
-+                String varName = mt.varproc.getVarName(vpp);
-+                paramNames.add(varName);
-+                inferredLambdaTypes.put(varName, infType);
-+              }
-+            }
-+          }
-+          index += md_content.params[i].getStackSize();
-+        }
-+
-+        DummyExitStatement dummyExit = mt.root.getDummyExit();
-+
-+        for (StatEdge edge : dummyExit.getAllPredecessorEdges()) {
-+          Statement source = edge.getSource();
-+          List<Exprent> lstExpr = source.getExprents();
-+
-+          if (lstExpr != null && !lstExpr.isEmpty()) {
-+            Exprent expr = lstExpr.get(lstExpr.size() - 1);
-+            if (expr.type == Exprent.EXPRENT_EXIT) {
-+              ExitExprent ex = (ExitExprent)expr;
-+              if (ex.getExitType() == ExitExprent.EXIT_RETURN) {
-+                VarType realRetType = ex.getValue().getInferredExprType(upperBound);
-+                if (realRetType.isGeneric()) {
-+                  paramNames.forEach(inferredLambdaTypes::remove);
-+                  return realRetType;
-+                }
-+              }
-+            }
-+          }
-+        }
-+
-+        paramNames.forEach(inferredLambdaTypes::remove);
-+      }
-+    }
-+    return null;
-+  }
-+
-+  private void setLambdaGenericTypes() {
-+    if (inferredLambdaType != null) {
-+      ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(newType.getValue());
-+      StructClass cls = DecompilerContext.getStructContext().getClass(inferredLambdaType.getValue());
-+
-+      if (node != null && cls != null) {
-+        StructMethod desc = cls.getMethod(getLambdaMethodKey());
-+        ClassWrapper wrapper = node.getWrapper();
-+        MethodWrapper methodWrapper = wrapper != null ? wrapper.getMethodWrapper(node.lambdaInformation.content_method_name, node.lambdaInformation.content_method_descriptor) : null;
-+
-+        if (desc != null && desc.getSignature() != null && methodWrapper != null && methodWrapper.root != null) {
-+          if (!desc.getClassQualifiedName().equals(inferredLambdaType.getValue())) {
-+            StructClass candidate = DecompilerContext.getStructContext().getClass(desc.getClassQualifiedName());
-+            if (candidate.getSignature() != null) {
-+              cls = candidate;
-+              inferredLambdaType = GenericType.getGenericSuperType(inferredLambdaType, candidate.getSignature().genericType);
-+            }
-+          }
-+
-+          Map<VarType, VarType> tempMap = new HashMap<>();
-+          if (inferredLambdaType.isGeneric()) {
-+            cls.getSignature().genericType.mapGenVarsTo((GenericType)inferredLambdaType, tempMap);
-+          }
-+
-+          MethodDescriptor md_content = MethodDescriptor.parseDescriptor(node.lambdaInformation.content_method_descriptor);
-+          MethodDescriptor md_lambda = MethodDescriptor.parseDescriptor(node.lambdaInformation.method_descriptor);
-+
-+          int index = node.lambdaInformation.is_content_method_static ? 0 : 1;
-+          int start_index = md_content.params.length - md_lambda.params.length;
-+
-+          int j = 0;
-+          for (int i = 0; i < md_content.params.length; i++) {
-+            if (i >= start_index) {
-+              VarVersionPair vpp = new VarVersionPair(index, 0);
-+              VarType curType = methodWrapper.varproc.getVarType(vpp);
-+              VarType infType = desc.getSignature().parameterTypes.get(j++).remap(tempMap);
-+
-+              if (infType != null && !infType.equals(VarType.VARTYPE_VOID)) {
-+                if (!curType.equals(infType) || (infType.isGeneric() && !((GenericType)infType).equalsExact(curType))) {
-+                  methodWrapper.varproc.setVarType(vpp, infType);
-+                  String paramName = methodWrapper.varproc.getVarName(vpp);
-+
-+                  LinkedList<ClassNode> nested = new LinkedList<>(node.nested);
-+                  while (!nested.isEmpty()) {
-+                    ClassNode childNode = nested.removeFirst();
-+                    nested.addAll(childNode.nested);
-+
-+                    if (childNode.type == ClassNode.CLASS_LAMBDA && !childNode.lambdaInformation.is_method_reference) {
-+                      MethodWrapper enclosedMethod = wrapper.getMethodWrapper(childNode.lambdaInformation.content_method_name, childNode.lambdaInformation.content_method_descriptor);
-+
-+                      if (enclosedMethod != null && paramName.equals(enclosedMethod.varproc.getVarName(vpp))) {
-+                        enclosedMethod.varproc.setVarType(vpp, infType);
-+                      }
-+                    }
-+                  }
-+                }
-+              }
-+            }
-+            index += md_content.params[i].getStackSize();
-+          }
-+
-+          VarType curType = md_content.ret;
-+          VarType infType = desc.getSignature().returnType.remap(tempMap);
-+
-+          if (infType != null && !infType.equals(VarType.VARTYPE_VOID)) {
-+            if (!curType.equals(infType) || (infType.isGeneric() && !((GenericType)infType).equalsExact(curType))) {
-+              GenericMethodDescriptor genDesc = new GenericMethodDescriptor(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), infType, Collections.emptyList());
-+              DummyExitStatement dummyExit = methodWrapper.root.getDummyExit();
-+
-+              for (StatEdge edge : dummyExit.getAllPredecessorEdges()) {
-+                Statement source = edge.getSource();
-+                List<Exprent> lstExpr = source.getExprents();
-+
-+                if (lstExpr != null && !lstExpr.isEmpty()) {
-+                  Exprent expr = lstExpr.get(lstExpr.size() - 1);
-+                  if (expr.type == Exprent.EXPRENT_EXIT) {
-+                    ExitExprent ex = (ExitExprent)expr;
-+                    if (ex.getExitType() == ExitExprent.EXIT_RETURN) {
-+                      ex.getMethodDescriptor().genericInfo = genDesc;
-+                      break; // desc var should be the same for all returns
-+                    }
-+                  }
-+                }
-+              }
-+            }
-+          }
-+        }
-+      }
-+    }
-+  }
-+
-   @Override
-   public void replaceExprent(Exprent oldExpr, Exprent newExpr) {
-     if (oldExpr == constructor) {
-@@ -527,4 +792,11 @@ public class NewExprent extends Exprent {
-     }
-     return "";
-   }
-+
-+  @Override
-+  public void setInvocationInstance() {
-+    if (constructor != null) {
-+      constructor.setInvocationInstance();
-+    }
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index bbe17e0b2c4dcb7214e0c94cc34156e5c9f233a0..e7bb1eb49b73102af8f967b7d5d3dbed5a1fc86a 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-@@ -13,6 +13,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
-+import org.jetbrains.java.decompiler.struct.StructClass;
- import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
- import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute;
- import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute.LocalVariable;
-@@ -235,7 +236,21 @@ public class VarExprent extends Exprent {
- 
-     VarType vt = null;
-     if (processor != null) {
--      vt = processor.getVarType(getVarVersionPair());
-+      String name = processor.getVarName(getVarVersionPair());
-+      vt = Exprent.inferredLambdaTypes.get().get(name);
-+      if (vt == null) {
-+        vt = processor.getVarType(getVarVersionPair());
-+        if (processor.getThisVars().containsKey(getVarVersionPair())) {
-+          String qaulName = processor.getThisVars().get(getVarVersionPair());
-+          StructClass cls = DecompilerContext.getStructContext().getClass(qaulName);
-+          if (cls.getSignature() != null) {
-+            vt = cls.getSignature().genericType;
-+          }
-+          else if (vt == null) {
-+            vt = new VarType(CodeConstants.TYPE_OBJECT, 0, qaulName);
-+          }
-+        }
-+      }
-     }
- 
-     if (vt == null || (varType != null && varType.getType() != CodeConstants.TYPE_UNKNOWN)) {
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
-index 4115efedd42ef96e61425d05dc83153e20ebf9a2..969d6feb0133be481210b4e24a3db72637d0ccdd 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructClass.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructClass.java
-@@ -21,6 +21,7 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil;
- import org.jetbrains.java.decompiler.util.VBStyleCollection;
- 
- import java.io.IOException;
-+import java.util.ArrayList;
- import java.util.Collections;
- import java.util.HashMap;
- import java.util.HashSet;
-@@ -396,4 +397,28 @@ public class StructClass extends StructMember {
-     this.genericHiarachy = ret.isEmpty() ? Collections.emptyMap() : ret;
-     return this.genericHiarachy;
-   }
-+
-+  private List<StructClass> superClasses;
-+  public List<StructClass> getAllSuperClasses() {
-+    if (superClasses != null) {
-+      return superClasses;
-+    }
-+
-+    List<StructClass> classList = new ArrayList<>();
-+    StructContext context = DecompilerContext.getStructContext();
-+
-+    if (this.superClass != null) {
-+      StructClass cl = context.getClass(this.superClass.getString());
-+      while (cl != null) {
-+        classList.add(cl);
-+        if (cl.superClass == null) {
-+          break;
-+        }
-+        cl = context.getClass(cl.superClass.getString());
-+      }
-+    }
-+
-+    superClasses = classList;
-+    return superClasses;
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructContext.java b/src/org/jetbrains/java/decompiler/struct/StructContext.java
-index 1274df19dd56bf8061384af8d3db78856f836928..80ad6c5234031d18947bebfb87eda7895ace2550 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructContext.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructContext.java
-@@ -214,6 +214,24 @@ public class StructContext {
-     return false;
-   }
- 
-+  public StructClass getFirstCommonClass(String firstclass, String secondclass) {
-+    StructClass fcls = this.getClass(firstclass);
-+    StructClass scls = this.getClass(secondclass);
-+
-+    if (fcls != null && scls != null) {
-+      List<StructClass> clsList = scls.getAllSuperClasses();
-+      while (fcls != null) {
-+        if (clsList.contains(fcls)) {
-+          return fcls;
-+        }
-+
-+        fcls = fcls.superClass == null ? null : this.getClass(fcls.superClass.getString());
-+      }
-+    }
-+
-+    return null;
-+  }
-+
-   public void loadAbstractMetadata(String string) {
-     for (String line : string.split("\n")) {
-       String[] pts = line.split(" ");
-diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
-index f4115448cfa13ba37fb1ee1795903ffb0c79a6af..d089b8180169910658f302a143d3372137f735c2 100644
---- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
-+++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
-@@ -389,8 +389,10 @@ public class VarType implements Type {  // TODO: optimize switch
-   }
- 
-   public VarType remap(Map<VarType, VarType> map) {
--    if (map.containsKey(this)) {
--      return map.get(this);
-+    VarType key = arrayDim == 0 ? this : this.resizeArrayDim(0);
-+    if (map.containsKey(key)) {
-+      VarType ret = map.get(key);
-+      return arrayDim == 0 || ret == null ? ret : ret.resizeArrayDim(ret.arrayDim + arrayDim);
-     }
-     return this;
-   }
-diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-index e430a99b30757bb0ba5b8dda66e0790383ab8d75..3343efecd7fd33b16ef02bc3885bb053925c72ad 100644
---- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-@@ -5,15 +5,19 @@ import org.jetbrains.java.decompiler.code.CodeConstants;
- import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
- import org.jetbrains.java.decompiler.modules.decompiler.typeann.TypeAnnotationWriteHelper;
-+import org.jetbrains.java.decompiler.struct.StructClass;
- import org.jetbrains.java.decompiler.struct.gen.Type;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
- 
- import java.util.ArrayList;
- import java.util.Arrays;
- import java.util.Collections;
-+import java.util.HashMap;
- import java.util.List;
- import java.util.Map;
- import java.util.regex.Pattern;
-+import java.util.Objects;
-+import java.util.Set;
- 
- public class GenericType extends VarType implements Type {
- 
-@@ -28,6 +32,8 @@ public class GenericType extends VarType implements Type {
-   private final List<VarType> arguments;
-   private final int wildcard;
- 
-+  public static final GenericType DUMMY_VAR = new GenericType(CodeConstants.TYPE_GENVAR, 0, "", null, null, GenericType.WILDCARD_NO);
-+
-   public GenericType(int type, int arrayDim, String value, VarType parent, List<VarType> arguments, int wildcard) {
-     super(type, arrayDim, value, getFamily(type, arrayDim), getStackSize(type, arrayDim), false);
-     this.parent = parent;
-@@ -233,6 +239,14 @@ public class GenericType extends VarType implements Type {
-     return value.substring(0, index + 1);
-   }
- 
-+  public static VarType withWildcard(VarType var, int wildcard) {
-+    if (var.isGeneric()) {
-+      GenericType genVar = (GenericType)var;
-+      return new GenericType(genVar.getType(), genVar.getArrayDim(), genVar.getValue(), genVar.parent, genVar.arguments, wildcard);
-+    }
-+    return new GenericType(var.getType(), var.getArrayDim(), var.getValue(), null, Collections.emptyList(), wildcard);
-+  }
-+
-   @Override
-   public GenericType decreaseArrayDim() {
-     assert getArrayDim() > 0 : this;
-@@ -254,7 +268,7 @@ public class GenericType extends VarType implements Type {
- 
-   @Override
-   public boolean isGeneric() {
--    return true;
-+    return getType() == CodeConstants.TYPE_GENVAR || !arguments.isEmpty() || parent != null || wildcard != WILDCARD_NO;
-   }
- 
-   public int getWildcard() {
-@@ -337,6 +351,10 @@ public class GenericType extends VarType implements Type {
-   public VarType remap(Map<VarType, VarType> map) {
-     VarType main = super.remap(map);
-     if (main != this) {
-+      int wild = main != null && main.isGeneric() ? ((GenericType)main).getWildcard() : WILDCARD_NO;
-+      if (main != null && getWildcard() != WILDCARD_NO && wild != getWildcard()) {
-+        main = withWildcard(main, getWildcard());
-+      }
-       return main;
-     }
-     boolean changed = false;
-@@ -363,4 +381,267 @@ public class GenericType extends VarType implements Type {
-     }
-     return this;
-   }
-+
-+  public boolean equalsExact(Object o) {
-+    if (o == this) {
-+      return true;
-+    }
-+
-+    if (!(o instanceof VarType)) {
-+      return false;
-+    }
-+
-+    if (!(o instanceof GenericType)) {
-+      return parent == null && arguments.isEmpty() && wildcard == WILDCARD_NO && o.equals(this);
-+    }
-+
-+    GenericType gt = (GenericType)o;
-+    if (getType() != gt.getType() || getArrayDim() != gt.getArrayDim() || wildcard != gt.wildcard || !Objects.equals(getValue(), gt.getValue())) {
-+      return false;
-+    }
-+
-+    return this.argumentsEqual(gt);
-+  }
-+
-+  public boolean argumentsEqual(GenericType gt) {
-+    if (arguments.size() != gt.arguments.size()) {
-+      return false;
-+    }
-+
-+    for (int i = 0; i < arguments.size(); ++i) {
-+      VarType t = arguments.get(i);
-+      VarType o = gt.arguments.get(i);
-+
-+      if (t == null && o == null) {
-+        continue;
-+      }
-+
-+      if (t == null || o == null || t.isGeneric() != o.isGeneric() || !t.equals(o)) {
-+        return false;
-+      }
-+
-+      if ((t.isGeneric() && !((GenericType)t).equalsExact(o))) {
-+        return false;
-+      }
-+    }
-+    return true;
-+  }
-+
-+  public static boolean isAssignable(VarType from, VarType to, Map<VarType, List<VarType>> named) {
-+    if (from.getArrayDim() != to.getArrayDim()) {
-+        return false;
-+    }
-+
-+    if (from.getType() == CodeConstants.TYPE_OBJECT && from.getType() == to.getType()) {
-+      if (!DecompilerContext.getStructContext().instanceOf(from.getValue(), to.getValue())) {
-+        return false;
-+      }
-+    }
-+    else if (!from.equals(to)) {
-+      if (from.getType() == CodeConstants.TYPE_GENVAR && from.getType() != to.getType() && named.containsKey(from)) {
-+        return named.get(from).stream().anyMatch(bound -> {
-+          if (to.isGeneric() && !bound.getValue().equals(to.getValue())) {
-+            VarType _new = getGenericSuperType(bound, to);
-+
-+            if (bound != _new && _new.isGeneric()) {
-+              bound = _new;
-+            }
-+          }
-+
-+          return areArgumentsAssignable(bound, to, named);
-+        });
-+      }
-+      else {
-+        return false;
-+      }
-+    }
-+
-+    if (to.isGeneric() && !from.getValue().equals(to.getValue())) {
-+      VarType _new = getGenericSuperType(from, to);
-+
-+      if (from != _new && _new.isGeneric()) {
-+        from = _new;
-+      }
-+    }
-+
-+    return areArgumentsAssignable(from, to, named);
-+  }
-+
-+  public static boolean areArgumentsAssignable(VarType from, VarType to, Map<VarType, List<VarType>> named) {
-+    if (from.isGeneric() && to.isGeneric()) {
-+      GenericType genFrom = (GenericType)from;
-+      GenericType genTo = (GenericType)to;
-+
-+      if (genFrom.arguments.size() != genTo.arguments.size()) {
-+        return genFrom.arguments.isEmpty() || genTo.arguments.isEmpty();
-+      }
-+
-+      for (int i = 0; i < genFrom.arguments.size(); ++i) {
-+        VarType f = genFrom.arguments.get(i);
-+        VarType t = genTo.arguments.get(i);
-+
-+        if (t == null) {
-+          continue;
-+        }
-+
-+        int tWild = t.isGeneric() ? ((GenericType)t).wildcard : WILDCARD_NO;
-+
-+        if (f == null) {
-+          StructClass cls = DecompilerContext.getStructContext().getClass(genFrom.getValue());
-+          VarType bounds = cls.getSignature().fbounds.get(i).get(0);
-+          if (VarType.VARTYPE_OBJECT.equals(bounds)) {
-+            return false;
-+          }
-+          f = bounds;
-+        }
-+        else if (f.getType() == CodeConstants.TYPE_GENVAR && f.getType() != t.getType() && named.containsKey(f))
-+        {
-+          f = named.get(f).get(0);
-+        }
-+
-+        int fWild = f.isGeneric() ? ((GenericType)f).wildcard : WILDCARD_NO;
-+
-+        if (tWild == WILDCARD_EXTENDS) {
-+          if (fWild == WILDCARD_SUPER || !DecompilerContext.getStructContext().instanceOf(f.getValue(), t.getValue())) {
-+            return false;
-+          }
-+        }
-+        else if (tWild == WILDCARD_SUPER) {
-+          if (fWild == WILDCARD_EXTENDS || !DecompilerContext.getStructContext().instanceOf(t.getValue(), f.getValue())) {
-+            return false;
-+          }
-+        }
-+        else if (tWild == WILDCARD_NO && fWild != tWild && genFrom.wildcard == genTo.wildcard) {
-+          return false;
-+        }
-+        else if (!f.getValue().equals(t.getValue())) {
-+          return false;
-+        }
-+
-+        if (!areArgumentsAssignable(f, t, named)) {
-+          return false;
-+        }
-+      }
-+    }
-+
-+    return true;
-+  }
-+
-+  public List<GenericType> getAllGenericVars() {
-+    List<GenericType> ret = new ArrayList<>();
-+
-+    if (this.getType() == CodeConstants.TYPE_GENVAR) {
-+      ret.add((GenericType)this.resizeArrayDim(0));
-+      return ret;
-+    }
-+
-+    for (VarType arg : arguments) {
-+      if (arg != null && arg.isGeneric()) {
-+        ret.addAll(((GenericType)arg).getAllGenericVars());
-+      }
-+    }
-+    return ret;
-+  }
-+
-+  public void mapGenVarsTo(GenericType other, Map<VarType, VarType> map) {
-+    if (arguments.size() == other.arguments.size()) {
-+      for (int i = 0; i < arguments.size(); ++i) {
-+        VarType thisArg = arguments.get(i);
-+        VarType otherArg = other.arguments.get(i);
-+
-+        if (thisArg != null && !DUMMY_VAR.equals(otherArg)) {
-+          if (thisArg.getType() == CodeConstants.TYPE_GENVAR) {
-+            int tWild = ((GenericType)thisArg).wildcard;
-+            int oWild = otherArg == null || !otherArg.isGeneric() ? WILDCARD_NO : ((GenericType)otherArg).wildcard;
-+
-+            if (tWild == oWild && tWild != WILDCARD_NO) {
-+              thisArg = withWildcard(thisArg, WILDCARD_NO);
-+              otherArg = withWildcard(otherArg, WILDCARD_NO);
-+            }
-+
-+            if (otherArg == null && thisArg.getArrayDim() == 0) {
-+              if (!map.containsKey(thisArg)) {
-+                map.put(thisArg, otherArg);
-+              }
-+            }
-+            else if (otherArg != null && thisArg.getArrayDim() <= otherArg.getArrayDim()) {
-+              if (thisArg.getArrayDim() > 0) {
-+                otherArg = otherArg.resizeArrayDim(otherArg.getArrayDim() - thisArg.getArrayDim());
-+                thisArg = thisArg.resizeArrayDim(0);
-+              }
-+              if (!map.containsKey(thisArg)) {
-+                map.put(thisArg, otherArg);
-+              }
-+              else {
-+                VarType curr = map.get(thisArg);
-+                int cWild = curr == null || !curr.isGeneric() ? WILDCARD_NO : ((GenericType)curr).wildcard;
-+                if (oWild != cWild) {
-+                  map.put(thisArg, withWildcard(otherArg, WILDCARD_NO));
-+                }
-+              }
-+            }
-+          }
-+          else if (thisArg.isGeneric() && otherArg != null && otherArg.isGeneric()) {
-+            ((GenericType)thisArg).mapGenVarsTo((GenericType)otherArg, map);
-+          }
-+        }
-+      }
-+
-+      if (other.parent != null && other.parent.isGeneric())
-+      {
-+        GenericType parent = this.parent != null && this.parent.isGeneric() ? (GenericType)this.parent : null;
-+        if (parent == null) {
-+          StructClass cls = DecompilerContext.getStructContext().getClass(other.parent.getValue());
-+          parent = cls.getSignature().genericType;
-+        }
-+
-+        parent.mapGenVarsTo((GenericType)other.parent, map);
-+      }
-+    }
-+  }
-+
-+  public boolean hasUnknownGenericType(Set<VarType> namedGenerics) {
-+    if (getType() == CodeConstants.TYPE_GENVAR) {
-+      return !namedGenerics.contains(this.resizeArrayDim(0));
-+    }
-+
-+    for (VarType arg : arguments) {
-+      if (arg != null && arg.isGeneric() && ((GenericType)arg).hasUnknownGenericType(namedGenerics)) {
-+        return true;
-+      }
-+    }
-+    return false;
-+  }
-+
-+  public static VarType getGenericSuperType(VarType derivedType, VarType superType) {
-+    StructClass dcls = DecompilerContext.getStructContext().getClass(derivedType.getValue());
-+    StructClass scls = DecompilerContext.getStructContext().getClass(superType.getValue());
-+
-+    if (dcls != null && scls != null) {
-+      Map<String, Map<VarType, VarType>> hierarchy = dcls.getAllGenerics();
-+
-+      if (hierarchy.containsKey(scls.qualifiedName) && scls.getSignature() != null) {
-+        Map<VarType, VarType> tempMap = new HashMap<>();
-+
-+        if (derivedType.isGeneric() && dcls.getSignature() != null) {
-+          dcls.getSignature().genericType.mapGenVarsTo((GenericType)derivedType, tempMap);
-+          // Given MyClass<T extends MyClass<T>> implements MyInterface<T>
-+          // converting MyClass<?> to MyInterface should produce MyInterface<MyClass<?>> not MyInterface<?>
-+          for (int i = 0; i < dcls.getSignature().fparameters.size(); ++i) {
-+            VarType param = parse("T" + dcls.getSignature().fparameters.get(i) + ";");
-+            if (tempMap.get(param) == null) {
-+              List<VarType> bounds = dcls.getSignature().fbounds.get(i);
-+              if (!bounds.isEmpty()) {
-+                VarType replacement = bounds.get(0).remap(tempMap);
-+                if (!VarType.VARTYPE_OBJECT.equals(replacement))
-+                  tempMap.put(param, replacement);
-+              }
-+            }
-+          }
-+        }
-+        return scls.getSignature().genericType.remap(hierarchy.get(scls.qualifiedName)).remap(tempMap);
-+      }
-+    }
-+    return derivedType;
-+  }
- }
diff --git a/FernFlower-Patches/0029-Improve-stack-var-processor-output.patch b/FernFlower-Patches/0029-Improve-stack-var-processor-output.patch
deleted file mode 100644
index 064adcf..0000000
--- a/FernFlower-Patches/0029-Improve-stack-var-processor-output.patch
+++ /dev/null
@@ -1,752 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Justin <jrd2558@gmail.com>
-Date: Sun, 25 Aug 2019 18:02:16 -0700
-Subject: [PATCH] Improve stack var processor output
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index 4713a0212ee1ae4cc269dd24f2227a91a2c9beed..9ae846d540337db99dc054ec1a43271e2d41ab7d 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-@@ -183,11 +183,12 @@ public class MethodProcessorRunnable implements Runnable {
-       if (DecompilerContext.getOption(IFernflowerPreferences.IDEA_NOT_NULL_ANNOTATION)) {
-         if (IdeaNotNullHelper.removeHardcodedChecks(root, mt)) {
-           SequenceHelper.condenseSequences(root);
--          stackProc.simplifyStackVars(root, mt, cl);
--          varProc.setVarVersions(root);
-         }
-       }
- 
-+      stackProc.simplifyStackVars(root, mt, cl);
-+      varProc.setVarVersions(root);
-+
-       LabelHelper.identifyLabels(root);
- 
-       if (TryHelper.enhanceTryStats(root, mt)) {
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index fde1c3bca1b12454b6f9a692c5f870ba946a590e..95db638383c843bf01df05daf2d94240cfe5ebc8 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-@@ -141,6 +141,9 @@ public class NestedClassProcessor {
-                 if (param.type == Exprent.EXPRENT_VAR) {
-                   mapNewNames.put(varVersion, enclosingMethod.varproc.getVarName(new VarVersionPair((VarExprent)param)));
-                   lvts.put(varVersion, ((VarExprent)param).getLVT());
-+                  if (enclosingMethod.varproc.getVarFinal((new VarVersionPair((VarExprent)param))) == VarProcessor.VAR_NON_FINAL) {
-+                    //DecompilerContext.getLogger().writeMessage("Lambda in " + parent.simpleName + "." + enclosingMethod.methodStruct.getName() + " given non-final var " + ((VarExprent)param).getName() + "!", IFernflowerLogger.Severity.ERROR);
-+                  }
-                 }
-               }
-               else {
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
-index efa677ae6cfdc08635eff080c7241ec086e5c945..36cc1c986f5a5aeeea6f4cfe3897666ed2fbf847 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
-@@ -135,6 +135,11 @@ public class SimplifyExprentsHelper {
-       }
- 
-       Exprent next = list.get(index + 1);
-+      if (isAssignmentReturn(current, next)) {
-+        list.remove(index);
-+        res = true;
-+        continue;
-+      }
- 
-       // constructor invocation
-       if (isConstructorInvocationRemote(list, index)) {
-@@ -342,6 +347,27 @@ public class SimplifyExprentsHelper {
-     return 0;
-   }
- 
-+  private static boolean isAssignmentReturn(Exprent first, Exprent second) {
-+    //If assignment then exit.
-+    if (first.type == Exprent.EXPRENT_ASSIGNMENT && second.type == Exprent.EXPRENT_EXIT) {
-+      AssignmentExprent assignment = (AssignmentExprent) first;
-+      ExitExprent exit = (ExitExprent) second;
-+      //if simple assign and exit is return and return isn't void
-+      if (assignment.getCondType() == AssignmentExprent.CONDITION_NONE && exit.getExitType() == ExitExprent.EXIT_RETURN && exit.getValue() != null) {
-+        if (assignment.getLeft().type == Exprent.EXPRENT_VAR && exit.getValue().type == Exprent.EXPRENT_VAR) {
-+          VarExprent assignmentLeft = (VarExprent) assignment.getLeft();
-+          VarExprent exitValue = (VarExprent) exit.getValue();
-+          //If the assignment before the return is immediately used in the return, inline it.
-+          if (assignmentLeft.equals(exitValue) && !assignmentLeft.isStack() && !exitValue.isStack()) {
-+            exit.replaceExprent(exitValue, assignment.getRight());
-+            return true;
-+          }
-+        }
-+      }
-+    }
-+    return false;
-+  }
-+
-   private static boolean isTrivialStackAssignment(Exprent first) {
-     if (first.type == Exprent.EXPRENT_ASSIGNMENT) {
-       AssignmentExprent asf = (AssignmentExprent)first;
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
-index d8fd9bdf784704836e69cfdd1596ae29b2732232..139ccdb55347a5d66627c1489ee73910fed46f05 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
-@@ -2,6 +2,8 @@
- package org.jetbrains.java.decompiler.modules.decompiler;
- 
- import org.jetbrains.java.decompiler.code.CodeConstants;
-+import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
-+import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.*;
- import org.jetbrains.java.decompiler.modules.decompiler.sforms.*;
- import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectNode.DirectNodeType;
-@@ -16,11 +18,14 @@ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionsGraph;
- import org.jetbrains.java.decompiler.struct.StructClass;
- import org.jetbrains.java.decompiler.struct.StructMethod;
-+import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
-+import org.jetbrains.java.decompiler.struct.gen.VarType;
- import org.jetbrains.java.decompiler.util.FastSparseSetFactory.FastSparseSet;
- import org.jetbrains.java.decompiler.util.SFormsFastMapDirect;
- 
- import java.util.*;
- import java.util.Map.Entry;
-+import java.util.stream.Collectors;
- 
- public class StackVarsProcessor {
-   public void simplifyStackVars(RootStatement root, StructMethod mt, StructClass cl) {
-@@ -29,11 +34,12 @@ public class StackVarsProcessor {
- 
-     while (true) {
-       boolean found = false;
-+      boolean first = ssau == null;
- 
-       SSAConstructorSparseEx ssa = new SSAConstructorSparseEx();
-       ssa.splitVariables(root, mt);
- 
--      SimplifyExprentsHelper sehelper = new SimplifyExprentsHelper(ssau == null);
-+      SimplifyExprentsHelper sehelper = new SimplifyExprentsHelper(first);
-       while (sehelper.simplifyStackVarsStatement(root, setReorderedIfs, ssa, cl)) {
-         found = true;
-       }
-@@ -45,6 +51,10 @@ public class StackVarsProcessor {
-       ssau = new SSAUConstructorSparseEx();
-       ssau.splitVariables(root, mt);
- 
-+      if (first) {
-+        setEffectivelyFinalVars(root, ssau, new HashMap<>());
-+      }
-+
-       if (iterateStatements(root, ssau)) {
-         found = true;
-       }
-@@ -267,7 +277,7 @@ public class StackVarsProcessor {
-       }
-     }
- 
--    if (left == null) {
-+    if (left == null || left.isEffectivelyFinal()) {
-       return new int[]{-1, changed};
-     }
- 
-@@ -445,7 +455,7 @@ public class StackVarsProcessor {
-       }
-     }
- 
--    if (left == null) {
-+    if (left == null || left.isEffectivelyFinal()) {
-       return new Object[]{null, changed, false};
-     }
- 
-@@ -664,4 +674,164 @@ public class StackVarsProcessor {
- 
-     return map;
-   }
-+
-+  private static void setEffectivelyFinalVars(Statement stat, SSAUConstructorSparseEx ssau, Map<VarVersionPair, VarExprent> varLookupMap) {
-+    if (stat.getExprents() != null && !stat.getExprents().isEmpty()) {
-+      for (int i = 0; i < stat.getExprents().size(); ++i) {
-+        setEffectivelyFinalVars(stat.getExprents().get(i), ssau, i, stat.getExprents(), varLookupMap);
-+      }
-+    }
-+
-+    for (Statement st : stat.getStats()) {
-+      setEffectivelyFinalVars(st, ssau, varLookupMap);
-+    }
-+  }
-+
-+  private static void setEffectivelyFinalVars(Exprent exprent, SSAUConstructorSparseEx ssau, int index, List<Exprent> list, Map<VarVersionPair, VarExprent> varLookupMap) {
-+    if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
-+      AssignmentExprent assign = (AssignmentExprent)exprent;
-+      if (assign.getLeft().type == Exprent.EXPRENT_VAR) {
-+        VarExprent var = (VarExprent)assign.getLeft();
-+        varLookupMap.put(var.getVarVersionPair(), var);
-+      }
-+    }
-+    else if (exprent.type == Exprent.EXPRENT_NEW) {
-+      NewExprent newExpr = (NewExprent)exprent;
-+      if (newExpr.isAnonymous()) {
-+        ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(newExpr.getNewType().getValue());
-+
-+        if (node != null) {
-+          if (!newExpr.isLambda()) {
-+            for (StructMethod mt : node.classStruct.getMethods()) {
-+              if (mt.getName().equals(CodeConstants.INIT_NAME)) {
-+                List<VarType> paramTypes = Arrays.asList(MethodDescriptor.parseDescriptor(mt.getDescriptor()).params);
-+
-+                for (int i = Math.max(0, index - paramTypes.size()); i < index; ++i) {
-+                  Exprent temp = list.get(i);
-+                  if (temp.type == Exprent.EXPRENT_ASSIGNMENT) {
-+                    Exprent left = ((AssignmentExprent)temp).getLeft();
-+                    if (left.type == Exprent.EXPRENT_VAR) {
-+                      VarExprent leftVar = (VarExprent)left;
-+                      if (leftVar.getLVT() != null && paramTypes.contains(leftVar.getLVT().getVarType())) {
-+                        leftVar.setEffectivelyFinal(true);
-+                      }
-+                    }
-+                  }
-+                }
-+                break;
-+              }
-+            }
-+          }
-+          else if (!newExpr.isMethodReference()) {
-+            MethodDescriptor mdLambda = MethodDescriptor.parseDescriptor(node.lambdaInformation.method_descriptor);
-+            MethodDescriptor mdContent = MethodDescriptor.parseDescriptor(node.lambdaInformation.content_method_descriptor);
-+            int paramOffset = node.lambdaInformation.is_content_method_static ? 0 : 1;
-+            int varsCount = mdContent.params.length - mdLambda.params.length;
-+
-+            for (int i = 0; i < varsCount; ++i) {
-+              Exprent param = newExpr.getConstructor().getParameters().get(paramOffset + i);
-+              if (param.type == Exprent.EXPRENT_VAR) {
-+                VarExprent paramVar = (VarExprent)param;
-+                VarVersionPair vvp = paramVar.getVarVersionPair();
-+                VarVersionNode vvnode = ssau.getSsuversions().nodes.getWithKey(vvp);
-+
-+                while (true) {
-+                  VarVersionNode next = null;
-+                  if (vvnode.var >= VarExprent.STACK_BASE) {
-+                    vvnode = vvnode.predecessors.iterator().next().source;
-+                    VarVersionPair nextVVP = ssau.getVarAssignmentMap().get(new VarVersionPair(vvnode.var, vvnode.version));
-+                    next = ssau.getSsuversions().nodes.getWithKey(nextVVP);
-+
-+                    if (nextVVP != null && nextVVP.var < 0) { // TODO check if field is final?
-+                      vvp = nextVVP;
-+                      break;
-+                    }
-+                  }
-+                  else {
-+                    final int j = i;
-+                    final int varIndex = vvnode.var;
-+                    final int varVersion = vvnode.version;
-+                    List<VarVersionNode> roots = getRoots(vvnode);
-+                    List<VarVersionNode> allRoots = ssau.getSsuversions().nodes.stream()
-+                                                          .distinct()
-+                                                          .filter(n -> n.var == varIndex && n.predecessors.isEmpty())
-+                                                          .filter(n -> {
-+                                                            if (n.lvt != null) {
-+                                                              return mdContent.params[j].equals(new VarType(n.lvt.getDescriptor()));
-+                                                            }
-+                                                            return n.version > varVersion;
-+                                                          })
-+                                                          .collect(Collectors.toList());
-+
-+                    if (roots.size() >= allRoots.size()) {
-+                      if (roots.size() == 1) {
-+                        vvnode = roots.get(0);
-+                        vvp = new VarVersionPair(vvnode.var, vvnode.version);
-+                        VarVersionPair nextVVP = ssau.getVarAssignmentMap().get(vvp);
-+                        next = ssau.getSsuversions().nodes.getWithKey(nextVVP);
-+                        if (nextVVP != null && nextVVP.var < 0) {
-+                          vvp = nextVVP;
-+                          break;
-+                        }
-+                      }
-+                      else if (roots.size() == 2) {
-+                        VarVersionNode first = roots.get(0);
-+                        VarVersionNode second = roots.get(1);
-+
-+                        // check for an if-else var definition
-+                        if (first.lvt != null && second.lvt != null && first.lvt.getVersion().equals(second.lvt.getVersion())) {
-+                          vvp = first.lvt.getVersion();
-+                          break;
-+                        }
-+                      }
-+                    }
-+                  }
-+
-+                  if (next == null) {
-+                    break;
-+                  }
-+                  vvnode = next;
-+                }
-+
-+                VarExprent var = varLookupMap.get(vvp);
-+                if (var != null) {
-+                  var.setEffectivelyFinal(true);
-+                }
-+              }
-+            }
-+          }
-+        }
-+      }
-+    }
-+
-+    for (Exprent ex : exprent.getAllExprents()) {
-+      setEffectivelyFinalVars(ex, ssau, index, list, varLookupMap);
-+    }
-+  }
-+
-+  private static List<VarVersionNode> getRoots(VarVersionNode vvnode) {
-+    List<VarVersionNode> ret = new ArrayList<>();
-+    Set<VarVersionNode> visited = new HashSet<>();
-+    LinkedList<VarVersionNode> queue = new LinkedList<>();
-+
-+    queue.add(vvnode);
-+    visited.add(vvnode);
-+
-+    while (!queue.isEmpty()) {
-+      VarVersionNode next = queue.removeFirst();
-+
-+      if (next.predecessors.isEmpty()) {
-+        ret.add(next);
-+      }
-+      else {
-+        next.predecessors.forEach(vvn -> {
-+          if (visited.add(vvn.source)) {
-+            queue.add(vvn.source);
-+          }
-+        });
-+      }
-+    }
-+
-+    return ret;
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 1661a1deb02a4caa5238b5342e5d6043e4e37b7b..4633697497baaa977d1f5451c5340eae3769472f 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-@@ -162,6 +162,11 @@ public class InvocationExprent extends Exprent {
-     addBytecodeOffsets(expr.bytecode);
-     bootstrapArguments = expr.getBootstrapArguments();
-     isSyntheticNullCheck = expr.isSyntheticNullCheck();
-+
-+    if (invocationType == INVOKE_DYNAMIC && !isStatic && instance != null && !this.parameters.isEmpty()) {
-+      // method reference, instance and first param are expected to be the same var object
-+      instance = this.parameters.get(0);
-+    }
-   }
- 
-   @Override
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index e7bb1eb49b73102af8f967b7d5d3dbed5a1fc86a..8807a1534a587af70c2779f2bf8f7cdf3ec9d7f2 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-@@ -46,6 +46,7 @@ public class VarExprent extends Exprent {
-   private boolean classDef = false;
-   private boolean stack = false;
-   private LocalVariable lvt = null;
-+  private boolean isEffectivelyFinal = false;
- 
-   public VarExprent(int index, VarType varType, VarProcessor processor) {
-     this(index, varType, processor, null);
-@@ -98,6 +99,7 @@ public class VarExprent extends Exprent {
-     var.setClassDef(classDef);
-     var.setStack(stack);
-     var.setLVT(lvt);
-+    var.setEffectivelyFinal(isEffectivelyFinal);
-     return var;
-   }
- 
-@@ -311,6 +313,14 @@ public class VarExprent extends Exprent {
-     return lvt;
-   }
- 
-+  public void setEffectivelyFinal(boolean isEffectivelyFinal) {
-+    this.isEffectivelyFinal = isEffectivelyFinal;
-+  }
-+
-+  public boolean isEffectivelyFinal() {
-+    return this.isEffectivelyFinal;
-+  }
-+
-   public String getName() {
-     VarVersionPair pair = getVarVersionPair();
-     if (lvt != null)
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
-index 82e8870671180ade3be93bbb54920b0321a9912b..e269d88570f392511ecc19984feeec2dee66019b 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
-@@ -98,7 +98,7 @@ public class SSAConstructorSparseEx {
-       mergeInVarMaps(node, dgraph);
- 
-       SFormsFastMapDirect varmap = inVarVersions.get(node.id);
--      varmap = new SFormsFastMapDirect(varmap);
-+      varmap = varmap.getCopy();
- 
-       SFormsFastMapDirect[] varmaparr = new SFormsFastMapDirect[]{varmap, null};
- 
-@@ -155,7 +155,7 @@ public class SSAConstructorSparseEx {
- 
-             SFormsFastMapDirect varmapFalse;
-             if (varmaparr[1] == null) {
--              varmapFalse = new SFormsFastMapDirect(varmaparr[0]);
-+              varmapFalse = varmaparr[0].getCopy();
-             }
-             else {
-               varmapFalse = varmaparr[1];
-@@ -175,7 +175,7 @@ public class SSAConstructorSparseEx {
-           case FunctionExprent.FUNCTION_CADD -> {
-             processExprent(func.getLstOperands().get(0), varmaparr);
- 
--            SFormsFastMapDirect[] varmaparrAnd = new SFormsFastMapDirect[]{new SFormsFastMapDirect(varmaparr[0]), null};
-+            SFormsFastMapDirect[] varmaparrAnd = new SFormsFastMapDirect[]{varmaparr[0].getCopy(), null};
- 
-             processExprent(func.getLstOperands().get(1), varmaparrAnd);
- 
-@@ -190,7 +190,7 @@ public class SSAConstructorSparseEx {
-             processExprent(func.getLstOperands().get(0), varmaparr);
- 
-             SFormsFastMapDirect[] varmaparrOr =
--              new SFormsFastMapDirect[]{new SFormsFastMapDirect(varmaparr[varmaparr[1] == null ? 0 : 1]), null};
-+              new SFormsFastMapDirect[]{varmaparr[varmaparr[1] == null ? 0 : 1].getCopy(), null};
- 
-             processExprent(func.getLstOperands().get(1), varmaparrOr);
- 
-@@ -241,7 +241,7 @@ public class SSAConstructorSparseEx {
-       Integer varindex = vardest.getIndex();
-       FastSparseSet<Integer> vers = varmap.get(varindex);
- 
--      int cardinality = vers.getCardinality();
-+      int cardinality = vers != null ? vers.getCardinality() : 0;
-       if (cardinality == 1) { // == 1
-         // set version
-         Integer it = vers.iterator().next();
-@@ -266,7 +266,17 @@ public class SSAConstructorSparseEx {
-           // create new phi node
-           phi.put(new VarVersionPair(varindex, nextver), vers);
-         }
--      } // 0 means uninitialized variable, which is impossible
-+      } // 0 means uninitialized variable
-+      else if (cardinality == 0) {
-+        if (vardest.getVersion() != 0) {
-+          setCurrentVar(varmap, varindex, vardest.getVersion());
-+        }
-+        else {
-+          Integer nextver = getNextFreeVersion(varindex);
-+          vardest.setVersion(nextver);
-+          setCurrentVar(varmap, varindex, nextver);
-+        }
-+      }
-     }
-   }
- 
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
-index 5e1e323a6e2043d776c513e800056be200ab2971..0262a3378080ce4a283ee12a44d11e921fca5777 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
-@@ -64,6 +64,9 @@ public class SSAUConstructorSparseEx {
-   // set factory
-   private FastSparseSetFactory<Integer> factory;
- 
-+  // track assignments for finding effectively final vars (left var, right var)
-+  private HashMap<VarVersionPair, VarVersionPair> varAssignmentMap = new HashMap<>();
-+
-   public void splitVariables(RootStatement root, StructMethod mt) {
- 
-     FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
-@@ -105,7 +108,7 @@ public class SSAUConstructorSparseEx {
-       updated.remove(node.id);
-       mergeInVarMaps(node, dgraph);
- 
--      SFormsFastMapDirect varmap = new SFormsFastMapDirect(inVarVersions.get(node.id));
-+      SFormsFastMapDirect varmap = inVarVersions.get(node.id).getCopy();
- 
-       SFormsFastMapDirect[] varmaparr = new SFormsFastMapDirect[]{varmap, null};
- 
-@@ -174,7 +177,7 @@ public class SSAUConstructorSparseEx {
- 
-             SFormsFastMapDirect varmapFalse;
-             if (varmaparr[1] == null) {
--              varmapFalse = new SFormsFastMapDirect(varmaparr[0]);
-+              varmapFalse = varmaparr[0].getCopy();
-             }
-             else {
-               varmapFalse = varmaparr[1];
-@@ -194,7 +197,7 @@ public class SSAUConstructorSparseEx {
-           case FunctionExprent.FUNCTION_CADD -> {
-             processExprent(func.getLstOperands().get(0), varmaparr, stat, calcLiveVars);
- 
--            SFormsFastMapDirect[] varmaparrAnd = new SFormsFastMapDirect[]{new SFormsFastMapDirect(varmaparr[0]), null};
-+            SFormsFastMapDirect[] varmaparrAnd = new SFormsFastMapDirect[]{varmaparr[0].getCopy(), null};
- 
-             processExprent(func.getLstOperands().get(1), varmaparrAnd, stat, calcLiveVars);
- 
-@@ -209,7 +212,7 @@ public class SSAUConstructorSparseEx {
-             processExprent(func.getLstOperands().get(0), varmaparr, stat, calcLiveVars);
- 
-             SFormsFastMapDirect[] varmaparrOr =
--              new SFormsFastMapDirect[]{new SFormsFastMapDirect(varmaparr[varmaparr[1] == null ? 0 : 1]), null};
-+              new SFormsFastMapDirect[]{varmaparr[varmaparr[1] == null ? 0 : 1].getCopy(), null};
- 
-             processExprent(func.getLstOperands().get(1), varmaparrOr, stat, calcLiveVars);
- 
-@@ -290,7 +293,7 @@ public class SSAUConstructorSparseEx {
-         varassign.setVersion(nextver);
- 
-         // ssu graph
--        ssuversions.createNode(new VarVersionPair(varindex, nextver));
-+        ssuversions.createNode(new VarVersionPair(varindex, nextver), varassign.getLVT());
- 
-         setCurrentVar(varmap, varindex, nextver);
-       }
-@@ -300,6 +303,17 @@ public class SSAUConstructorSparseEx {
-         }
-         setCurrentVar(varmap, varindex, varassign.getVersion());
-       }
-+
-+      AssignmentExprent assexpr = (AssignmentExprent)expr;
-+      if (assexpr.getRight().type == Exprent.EXPRENT_VAR) {
-+        VarVersionPair rightpaar = ((VarExprent)assexpr.getRight()).getVarVersionPair();
-+        varAssignmentMap.put(varassign.getVarVersionPair(), rightpaar);
-+      }
-+      else if (assexpr.getRight().type == Exprent.EXPRENT_FIELD) {
-+        int index = mapFieldVars.get(((FieldExprent)assexpr.getRight()).id);
-+        VarVersionPair rightpaar = new VarVersionPair(index, 0);
-+        varAssignmentMap.put(varassign.getVarVersionPair(), rightpaar);
-+      }
-     }
-     else if (expr.type == Exprent.EXPRENT_FUNCTION) { // MM or PP function
-       FunctionExprent func = (FunctionExprent)expr;
-@@ -352,7 +366,7 @@ public class SSAUConstructorSparseEx {
- 
-       FastSparseSet<Integer> vers = varmap.get(varindex);
- 
--      int cardinality = vers.getCardinality();
-+      int cardinality = vers != null ? vers.getCardinality() : 0;
-       if (cardinality == 1) { // size == 1
-         if (current_vers != 0) {
-           if (calcLiveVars) {
-@@ -400,7 +414,21 @@ public class SSAUConstructorSparseEx {
-         }
- 
-         createOrUpdatePhiNode(new VarVersionPair(varindex, current_vers), vers, stat);
--      } // vers.size() == 0 means uninitialized variable, which is impossible
-+      } // vers.size() == 0 means uninitialized variable
-+      else if (cardinality == 0) {
-+        if (current_vers != 0) {
-+          if (calcLiveVars) {
-+            varMapToGraph(new VarVersionPair(varindex.intValue(), vardest.getVersion()), varmap);
-+          }
-+          setCurrentVar(varmap, varindex, vardest.getVersion());
-+        }
-+        else {
-+          Integer usever = getNextFreeVersion(varindex, stat);
-+          vardest.setVersion(usever);
-+          ssuversions.createNode(new VarVersionPair(varindex, usever), vardest.getLVT());
-+          setCurrentVar(varmap, varindex, usever);
-+        }
-+      }
-     }
-   }
- 
-@@ -467,7 +495,7 @@ public class SSAUConstructorSparseEx {
- 
-     VarVersionNode node = nodes.getWithKey(varpaar);
- 
--    node.live = new SFormsFastMapDirect(varmap);
-+    node.live = varmap.getCopy();
-   }
- 
-   private Integer getNextFreeVersion(Integer var, Statement stat) {
-@@ -810,4 +838,8 @@ public class SSAUConstructorSparseEx {
-   public HashMap<Integer, Integer> getMapFieldVars() {
-     return mapFieldVars;
-   }
-+
-+  public HashMap<VarVersionPair, VarVersionPair> getVarAssignmentMap() {
-+    return varAssignmentMap;
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 13d023de573ced3cde29f9b42212051a47232733..347ba24dbcc6a530307d9a1d4eae946efa1dfac6 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-@@ -11,6 +11,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.ExitExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.FieldExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.NewExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
-@@ -226,6 +227,7 @@ public class VarDefinitionHelper {
- 
-     mergeVars(root);
-     propogateLVTs(root);
-+    setNonFinal(root, new HashSet<>());
-   }
- 
- 
-@@ -1126,4 +1128,79 @@ public class VarDefinitionHelper {
-     }
-     return false;
-   }
-+
-+  private void setNonFinal(Statement stat, Set<VarVersionPair> unInitialized) {
-+    if (stat.getExprents() != null && !stat.getExprents().isEmpty()) {
-+      for (Exprent exp : stat.getExprents()) {
-+        if (exp.type == Exprent.EXPRENT_VAR) {
-+          unInitialized.add(new VarVersionPair((VarExprent)exp));
-+        }
-+        else {
-+          setNonFinal(exp, unInitialized);
-+        }
-+      }
-+    }
-+
-+    if (!stat.getVarDefinitions().isEmpty()) {
-+      if (stat.type != Statement.StatementType.DO) {
-+        for (Exprent var : stat.getVarDefinitions()) {
-+          unInitialized.add(new VarVersionPair((VarExprent)var));
-+        }
-+      }
-+    }
-+
-+    if (stat.type == Statement.StatementType.DO) {
-+      DoStatement dostat = (DoStatement)stat;
-+      if (dostat.getInitExprentList() != null) {
-+        setNonFinal(dostat.getInitExprent(), unInitialized);
-+      }
-+      if (dostat.getIncExprentList() != null) {
-+        setNonFinal(dostat.getIncExprent(), unInitialized);
-+      }
-+    }
-+    else if (stat.type == Statement.StatementType.IF) {
-+      IfStatement ifstat = (IfStatement)stat;
-+      if (ifstat.getIfstat() != null && ifstat.getElsestat() != null) {
-+        setNonFinal(ifstat.getFirst(), unInitialized);
-+        setNonFinal(ifstat.getIfstat(), new HashSet<>(unInitialized));
-+        setNonFinal(ifstat.getElsestat(), unInitialized);
-+        return;
-+      }
-+    }
-+
-+    for (Statement st : stat.getStats()) {
-+      setNonFinal(st, unInitialized);
-+    }
-+  }
-+
-+  private void setNonFinal(Exprent exp, Set<VarVersionPair> unInitialized) {
-+    VarExprent var = null;
-+
-+    if (exp == null) {
-+      return;
-+    }
-+
-+    if (exp.type == Exprent.EXPRENT_ASSIGNMENT) {
-+      AssignmentExprent assign = (AssignmentExprent)exp;
-+      if (assign.getLeft().type == Exprent.EXPRENT_VAR) {
-+        var = (VarExprent)assign.getLeft();
-+      }
-+    }
-+    else if (exp.type == Exprent.EXPRENT_FUNCTION) {
-+      FunctionExprent func = (FunctionExprent)exp;
-+      if (func.getFuncType() >= FunctionExprent.FUNCTION_IMM && func.getFuncType() <= FunctionExprent.FUNCTION_PPI) {
-+        if (func.getLstOperands().get(0).type == Exprent.EXPRENT_VAR) {
-+          var = (VarExprent)func.getLstOperands().get(0);
-+        }
-+      }
-+    }
-+
-+    if (var != null && !var.isDefinition() && !unInitialized.remove(var.getVarVersionPair())) {
-+      var.getProcessor().setVarFinal(var.getVarVersionPair(), VarProcessor.VAR_NON_FINAL);
-+    }
-+
-+    for (Exprent ex : exp.getAllExprents()) {
-+      setNonFinal(ex, unInitialized);
-+    }
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java
-index 73a054d03a44c110dc949298a9c5e9de761187c8..1625c1d10fa0c40a9a7be98626b8c71597ffa48b 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java
-@@ -2,6 +2,7 @@
- package org.jetbrains.java.decompiler.modules.decompiler.vars;
- 
- import org.jetbrains.java.decompiler.modules.decompiler.decompose.IGraphNode;
-+import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute.LocalVariable;
- import org.jetbrains.java.decompiler.util.SFormsFastMapDirect;
- 
- import java.util.ArrayList;
-@@ -19,12 +20,18 @@ public class VarVersionNode implements IGraphNode {
- 
-   public int flags;
-   public SFormsFastMapDirect live = new SFormsFastMapDirect();
-+  public LocalVariable lvt = null;
- 
-   public VarVersionNode(int var, int version) {
-     this.var = var;
-     this.version = version;
-   }
- 
-+  public VarVersionNode(int var, int version, LocalVariable lvt) {
-+    this(var, version);
-+    this.lvt = lvt;
-+  }
-+
-   public void addPredecessor(VarVersionEdge edge) {
-     predecessors.add(edge);
-   }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
-index 572dde919042921ffebc5f83e0d9f5ebe7276788..51a88dc3d8ecaefd6aff46cbc24eecbebe5d11d2 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
-@@ -4,6 +4,7 @@ package org.jetbrains.java.decompiler.modules.decompiler.vars;
- import org.jetbrains.java.decompiler.modules.decompiler.decompose.GenericDominatorEngine;
- import org.jetbrains.java.decompiler.modules.decompiler.decompose.IGraph;
- import org.jetbrains.java.decompiler.modules.decompiler.decompose.IGraphNode;
-+import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute.LocalVariable;
- import org.jetbrains.java.decompiler.util.VBStyleCollection;
- 
- import java.util.*;
-@@ -14,8 +15,12 @@ public class VarVersionsGraph {
-   private GenericDominatorEngine engine;
- 
-   public VarVersionNode createNode(VarVersionPair ver) {
-+    return createNode(ver, null);
-+  }
-+
-+  public VarVersionNode createNode(VarVersionPair ver, LocalVariable lvt) {
-     VarVersionNode node;
--    nodes.addWithKey(node = new VarVersionNode(ver.var, ver.version), ver);
-+    nodes.addWithKey(node = new VarVersionNode(ver.var, ver.version, lvt), ver);
-     return node;
-   }
- 
-diff --git a/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java b/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
-index bb8b4dd9b866ec54491da50310b09b6fcb0bdf3f..3ea10bf76c3d2faf0e3e5683411597dbea5bfa7b 100644
---- a/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
-+++ b/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
-@@ -32,25 +32,6 @@ public class SFormsFastMapDirect {
-     }
-   }
- 
--  public SFormsFastMapDirect(SFormsFastMapDirect map) {
--    for (int i = 2; i >= 0; i--) {
--      FastSparseSet<Integer>[] arr = map.elements[i];
--      int[] arrnext = map.next[i];
--
--      int length = arr.length;
--      @SuppressWarnings("unchecked") FastSparseSet<Integer>[] arrnew = new FastSparseSet[length];
--      int[] arrnextnew = new int[length];
--
--      System.arraycopy(arr, 0, arrnew, 0, length);
--      System.arraycopy(arrnext, 0, arrnextnew, 0, length);
--
--      elements[i] = arrnew;
--      next[i] = arrnextnew;
--
--      size = map.size;
--    }
--  }
--
-   public SFormsFastMapDirect getCopy() {
- 
-     SFormsFastMapDirect map = new SFormsFastMapDirect(false);
diff --git a/FernFlower-Patches/0029-TryCatch-statements-will-now-use-the-correct-variabl.patch b/FernFlower-Patches/0029-TryCatch-statements-will-now-use-the-correct-variabl.patch
new file mode 100644
index 0000000..c6aba77
--- /dev/null
+++ b/FernFlower-Patches/0029-TryCatch-statements-will-now-use-the-correct-variabl.patch
@@ -0,0 +1,257 @@
+From 5f699acc70d8e40f758737ae88aeddecc07edc8c Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sun, 9 Aug 2015 15:04:04 -0700
+Subject: [PATCH 029/122] TryCatch statements will now use the correct variable
+ index for their exception variable. Some small cleanups and NPE fix.
+
+---
+ .../decompiler/main/ClassesProcessor.java     |  1 -
+ .../main/rels/MethodProcessorRunnable.java    | 63 +------------------
+ .../decompiler/stats/CatchAllStatement.java   | 11 +++-
+ .../decompiler/stats/CatchStatement.java      | 10 ++-
+ .../modules/decompiler/vars/VarProcessor.java | 13 ++--
+ .../StructLocalVariableTableAttribute.java    |  1 -
+ .../TestClassSimpleBytecodeMapping.dec        |  4 +-
+ testData/results/TestTryCatchFinally.dec      | 12 ++--
+ 8 files changed, 37 insertions(+), 78 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+index 7f75a0c..0060021 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+@@ -32,7 +32,6 @@ import org.jetbrains.java.decompiler.struct.StructClass;
+ import org.jetbrains.java.decompiler.struct.StructContext;
+ import org.jetbrains.java.decompiler.struct.StructMethod;
+ import org.jetbrains.java.decompiler.struct.attr.StructEnclosingMethodAttribute;
+-import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
+ import org.jetbrains.java.decompiler.struct.attr.StructInnerClassesAttribute;
+ import org.jetbrains.java.decompiler.struct.attr.StructInnerClassesAttribute.InnerClassInfo;
+ import org.jetbrains.java.decompiler.struct.gen.VarType;
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+index 388e76a..9542a80 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+@@ -17,7 +17,6 @@ package org.jetbrains.java.decompiler.main.rels;
+ 
+ import org.jetbrains.java.decompiler.code.CodeConstants;
+ import org.jetbrains.java.decompiler.code.InstructionSequence;
+-import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
+ import org.jetbrains.java.decompiler.code.cfg.ControlFlowGraph;
+ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
+@@ -277,63 +276,6 @@ public class MethodProcessorRunnable implements Runnable {
+           System.out.println(printExprent(indent + "  ", exp,varProc));
+       }
+     }
+-    /*
+-      for (Object obj : stat.getSequentialObjects()) {
+-        if (obj instanceof Statement) {
+-          Statement st = (Statement)obj;
+-          childVars.addAll(initStatement(st));
+-
+-          if (st.type == DoStatement.TYPE_DO) {
+-            DoStatement dost = (DoStatement)st;
+-            if (dost.getLooptype() != DoStatement.LOOP_FOR &&
+-                dost.getLooptype() != DoStatement.LOOP_DO) {
+-              currVars.add(dost.getConditionExprent());
+-            }
+-          }
+-          else if (st.type == DoStatement.TYPE_CATCHALL) {
+-            CatchAllStatement fin = (CatchAllStatement)st;
+-            if (fin.isFinally() && fin.getMonitor() != null) {
+-              currVars.add(fin.getMonitor());
+-            }
+-          }
+-        }
+-        else if (obj instanceof Exprent) {
+-          currVars.add((Exprent)obj);
+-        }
+-      }
+-
+-      // children statements
+-      for (Integer index : childVars) {
+-        Integer count = mapCount.get(index);
+-        if (count == null) {
+-          count = new Integer(0);
+-        }
+-        mapCount.put(index, new Integer(count.intValue() + 1));
+-      }
+-
+-      condlst = getAllVars(currVars);
+-    }
+-    else {
+-      condlst = getAllVars(stat.getExprents());
+-    }
+-
+-    // this statement
+-    for (VarExprent var : condlst) {
+-      mapCount.put(new Integer(var.getIndex()), new Integer(2));
+-    }
+-
+-
+-    HashSet<Integer> set = new HashSet<Integer>(mapCount.keySet());
+-
+-    // put all variables defined in this statement into the set
+-    for (Entry<Integer, Integer> en : mapCount.entrySet()) {
+-      if (en.getValue().intValue() > 1) {
+-        mapVarDefStatements.put(en.getKey(), stat);
+-      }
+-    }
+-
+-    mapStatementVars.put(stat.id, set);
+-*/
+     indent += "  ";
+     for (Object obj : statement.getSequentialObjects()) {
+       if (obj instanceof Statement) {
+@@ -357,8 +299,9 @@ public class MethodProcessorRunnable implements Runnable {
+           VarExprent varExprent = (VarExprent)exp;
+         int currindex = varExprent.getIndex();
+         int origindex = varProc.getRemapped(currindex);
+-        List<LVTVariable> candidates = varProc.getLVT().getCandidates(origindex);
+-        sb.append("[").append(currindex).append(":").append(origindex).append(", ").append(varExprent.isStack()).append("]").append(candidates);
++        sb.append("[").append(currindex).append(":").append(origindex).append(", ").append(varExprent.isStack()).append("]");
++        if (varProc.getLVT() != null)
++          sb.append(varProc.getLVT().getCandidates(origindex));
+       } else if (exp instanceof AssignmentExprent) {
+           AssignmentExprent assignmentExprent = (AssignmentExprent)exp;
+         sb.append("{").append(printExprent(" ",assignmentExprent.getLeft(),varProc)).append(" =").append(printExprent(" ",assignmentExprent.getRight(),varProc)).append("}");
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
+index 812ed10..d5b432c 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
+@@ -16,6 +16,7 @@
+ package org.jetbrains.java.decompiler.modules.decompiler.stats;
+ 
+ import org.jetbrains.java.decompiler.code.CodeConstants;
++import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
+ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.TextBuffer;
+ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+@@ -68,7 +69,15 @@ public class CatchAllStatement extends Statement {
+       }
+     }
+ 
+-    vars.add(new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
++    int varIndex = -1;
++    BasicBlock block = handler.getBasichead().getBlock();
++    if (!block.getSeq().isEmpty() && block.getInstruction(0).opcode == CodeConstants.opc_astore) {
++      varIndex = block.getInstruction(0).getOperand(0);
++    }
++    else {
++      varIndex = DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER);
++    }
++    vars.add(new VarExprent(varIndex,
+                             new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Throwable"),
+                             (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR)));
+   }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
+index 8d56042..fda5ed3 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
+@@ -60,7 +60,15 @@ public class CatchStatement extends Statement {
+         stats.addWithKey(stat, stat.id);
+         exctstrings.add(new ArrayList<String>(edge.getExceptions()));
+ 
+-        vars.add(new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
++        int varIndex = -1;
++        BasicBlock block = stat.getBasichead().getBlock();
++        if (!block.getSeq().isEmpty() && block.getInstruction(0).opcode == CodeConstants.opc_astore) {
++          varIndex = block.getInstruction(0).getOperand(0);
++        }
++        else {
++          varIndex = DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER);
++        }
++        vars.add(new VarExprent(varIndex,
+                                 new VarType(CodeConstants.TYPE_OBJECT, 0, edge.getExceptions().get(0)),
+                                 // FIXME: for now simply the first type. Should get the first common superclass when possible.
+                                 (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR)));
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+index 6b15a12..ef07c6b 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+@@ -152,16 +152,17 @@ private LocalVariableTable lvt;
+     return externalVars;
+   }
+ 
+-public void setLVT(LocalVariableTable lvt) {
++  public void setLVT(LocalVariableTable lvt) {
+     this.lvt = lvt;
+-}
+-public LocalVariableTable getLVT() {
++  }
++
++  public LocalVariableTable getLVT() {
+     return this.lvt;
+-}
++  }
+ 
+-public int getRemapped(int index) {
++  public int getRemapped(int index) {
+     VarVersionPair res = varVersions.getMapOriginalVarIndices().get(index);
+     if (res == null) return index;
+     return res.var;
+-}
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+index a983b27..a654359 100644
+--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
++++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+@@ -17,7 +17,6 @@ package org.jetbrains.java.decompiler.struct.attr;
+ 
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.LVTVariable;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.LocalVariableTable;
+-import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+ import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+ import org.jetbrains.java.decompiler.util.DataInputFullStream;
+ 
+diff --git a/testData/results/TestClassSimpleBytecodeMapping.dec b/testData/results/TestClassSimpleBytecodeMapping.dec
+index 1a2532f..4a2f333 100644
+--- a/testData/results/TestClassSimpleBytecodeMapping.dec
++++ b/testData/results/TestClassSimpleBytecodeMapping.dec
+@@ -21,8 +21,8 @@ public class TestClassSimpleBytecodeMapping {
+    public void test2(String var1) {
+       try {
+          Integer.parseInt(var1);// 34
+-      } catch (Exception var6) {// 35
+-         System.out.println(var6);// 36
++      } catch (Exception var2) {// 35
++         System.out.println(var2);// 36
+       } finally {
+          System.out.println("Finally");// 38
+       }
+diff --git a/testData/results/TestTryCatchFinally.dec b/testData/results/TestTryCatchFinally.dec
+index 772a76e..fbe5782 100644
+--- a/testData/results/TestTryCatchFinally.dec
++++ b/testData/results/TestTryCatchFinally.dec
+@@ -4,10 +4,10 @@ public class TestTryCatchFinally {
+    public void test1(String var1) {
+       try {
+          System.out.println("sout1");// 24
+-      } catch (Exception var9) {
++      } catch (Exception var2) {
+          try {
+             System.out.println("sout2");// 27
+-         } catch (Exception var8) {// 28
++         } catch (Exception var3) {// 28
+             ;
+          }
+       } finally {
+@@ -28,10 +28,10 @@ public class TestTryCatchFinally {
+ 
+    public int test(String var1) {
+       try {
+-         int var2 = Integer.parseInt(var1);// 51
+-         return var2;
+-      } catch (Exception var6) {// 52
+-         System.out.println("Error" + var6);// 53
++         int var5 = Integer.parseInt(var1);// 51
++         return var5;
++      } catch (Exception var2) {// 52
++         System.out.println("Error" + var2);// 53
+       } finally {
+          System.out.println("Finally");// 55
+       }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0030-Add-enhanced-ForEach-loop-detection-and-re-introduce.patch b/FernFlower-Patches/0030-Add-enhanced-ForEach-loop-detection-and-re-introduce.patch
new file mode 100644
index 0000000..aec6678
--- /dev/null
+++ b/FernFlower-Patches/0030-Add-enhanced-ForEach-loop-detection-and-re-introduce.patch
@@ -0,0 +1,802 @@
+From 143b1e688e6e73e0f54be08e2c381c740c75fd13 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Thu, 13 Aug 2015 16:03:24 -0700
+Subject: [PATCH 030/122] Add enhanced ForEach loop detection and re-introduce
+ the DotExporter for debugging.
+
+---
+ .../decompiler/main/rels/ClassWrapper.java    |   1 -
+ .../main/rels/NestedClassProcessor.java       |   2 +
+ .../modules/decompiler/MergeHelper.java       | 210 +++++++++++++++-
+ .../modules/decompiler/exps/VarExprent.java   |   5 +
+ .../sforms/FlattenStatementsHelper.java       |   7 +-
+ .../sforms/SSAConstructorSparseEx.java        |  17 +-
+ .../sforms/SSAUConstructorSparseEx.java       |  16 +-
+ .../modules/decompiler/stats/DoStatement.java |  12 +
+ .../decompiler/vars/VarDefinitionHelper.java  |  10 +
+ .../modules/decompiler/vars/VarProcessor.java |   2 +-
+ .../decompiler/vars/VarVersionsProcessor.java |   2 +
+ .../java/decompiler/util/DotExporter.java     | 238 ++++++++++++++++++
+ 12 files changed, 498 insertions(+), 24 deletions(-)
+ create mode 100644 src/org/jetbrains/java/decompiler/util/DotExporter.java
+
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+index 5a35cc8..01b9292 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+@@ -176,7 +176,6 @@ public class ClassWrapper {
+ 
+       MethodProcessorRunnable.printMethod(root, mt.getClassStruct().qualifiedName+"."+mt.getName()+mt.getDescriptor(),varProc);
+ 
+-
+       DecompilerContext.getLogger().endMethod();
+     }
+ 
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+index 9aedf22..c6eda1b 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+@@ -301,6 +301,8 @@ public class NestedClassProcessor {
+         if (meth.root != null) { // neither abstract, nor native
+           DirectGraph graph = meth.getOrBuildGraph();
+ 
++          org.jetbrains.java.decompiler.util.DotExporter.toDotFile(graph, meth.methodStruct, "computeLocalVars");
++
+           graph.iterateExprents(new DirectGraph.ExprentIterator() {
+             public int processExprent(Exprent exprent) {
+               List<Exprent> lst = exprent.getAllExprents(true);
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+index 71d3d79..d994c26 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+@@ -18,8 +18,13 @@ package org.jetbrains.java.decompiler.modules.decompiler;
+ import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
+ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.ArrayExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.IfExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.*;
+ 
+ import java.util.ArrayList;
+@@ -63,6 +68,8 @@ public class MergeHelper {
+         if (matchWhile(stat)) {
+           // identify a for loop - subtype of while
+           matchFor(stat);
++          // identify for each loop,
++          matchForEach(stat);
+         }
+         else {
+           // identify a do{}while loop
+@@ -72,6 +79,7 @@ public class MergeHelper {
+         break;
+       case DoStatement.LOOP_WHILE:
+         matchFor(stat);
++        matchForEach(stat);
+     }
+ 
+     return (stat.getLooptype() != oldloop);
+@@ -366,17 +374,193 @@ public class MergeHelper {
+       stat.setIncExprent(lastData.getExprents().remove(lastData.getExprents().size() - 1));
+     }
+ 
+-    if (lastData.getExprents().isEmpty()) {
+-      List<StatEdge> lst = lastData.getAllSuccessorEdges();
+-      if (!lst.isEmpty()) {
+-        lastData.removeSuccessor(lst.get(0));
++    cleanEmptyStatements(stat, lastData);
++
++    return true;
++  }
++
++  private static boolean matchForEach(DoStatement stat) {
++    AssignmentExprent firstDoExprent = null, initDoExprent = null, initCopyExprent = null;
++    Statement firstData, preData = null;
++
++    // search for an initializing exprent
++    Statement current = stat;
++    while (true) {
++      Statement parent = current.getParent();
++      if (parent == null) {
++        break;
++      }
++
++      if (parent.type == Statement.TYPE_SEQUENCE) {
++        if (current == parent.getFirst()) {
++          current = parent;
++        }
++        else {
++          preData = current.getNeighbours(StatEdge.TYPE_REGULAR, Statement.DIRECTION_BACKWARD).get(0);
++          preData = getLastDirectData(preData);
++          if (preData != null && !preData.getExprents().isEmpty()) {
++            Exprent exprent = preData.getExprents().get(preData.getExprents().size() - 1);
++            if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
++              initDoExprent = (AssignmentExprent)exprent;
++              if (preData.getExprents().size() >= 2) {
++                exprent = preData.getExprents().get(preData.getExprents().size() - 2);
++                if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
++                  initCopyExprent = (AssignmentExprent)exprent;
++                }
++              }
++            }
++          }
++          break;
++        }
++      }
++      else {
++        break;
+       }
+-      removeLastEmptyStatement(stat, lastData);
+     }
+ 
++    firstData = getFirstDirectData(stat.getFirst());
++    if (firstData != null && firstData.getExprents().get(0).type == Exprent.EXPRENT_ASSIGNMENT) {
++      firstDoExprent = (AssignmentExprent)firstData.getExprents().get(0);
++    }
++
++    if (stat.getLooptype() == DoStatement.LOOP_WHILE && initDoExprent != null && firstDoExprent != null) {
++      if (initDoExprent.type == Exprent.EXPRENT_ASSIGNMENT &&
++          isInvoke(((AssignmentExprent)initDoExprent).getRight(), null, "iterator", "()Ljava/util/Iterator;")) {
++
++        if (!isInvoke(drillNots(stat.getConditionExprent()), "java/util/Iterator", "hasNext", "()Z") ||
++            firstDoExprent.type != Exprent.EXPRENT_ASSIGNMENT) {
++          return false;
++        }
++
++        AssignmentExprent ass = (AssignmentExprent)firstDoExprent;
++        if (!isInvoke(ass.getRight(), "java/util/Iterator", "next", "()Ljava/lang/Object;") ||
++            ass.getLeft().type != Exprent.EXPRENT_VAR) {
++          return false;
++        }
++
++        InvocationExprent holder = (InvocationExprent)((AssignmentExprent)initDoExprent).getRight();
++        stat.setLooptype(DoStatement.LOOP_FOREACH);
++        stat.setInitExprent(ass.getLeft());
++        stat.setIncExprent(holder.getInstance());
++        preData.getExprents().remove(initDoExprent);
++        firstData.getExprents().remove(firstDoExprent);
++      }
++    }
++    else if (stat.getLooptype() == DoStatement.LOOP_FOR) {
++      if (isType(stat.getInitExprent(), Exprent.EXPRENT_ASSIGNMENT) &&
++          isInvoke(((AssignmentExprent)stat.getInitExprent()).getRight(), null, "iterator", "()Ljava/util/Iterator;") &&
++          isType(stat.getConditionExprent(), Exprent.EXPRENT_FUNCTION)) {
++
++        if (!isInvoke(drillNots(stat.getConditionExprent()), "java/util/Iterator", "hasNext", "()Z") ||
++            !isType(stat.getIncExprent(), Exprent.EXPRENT_ASSIGNMENT)) {
++          return false;
++        }
++
++        AssignmentExprent ass = (AssignmentExprent)stat.getIncExprent();
++        if (!isInvoke(ass.getRight(), "java/util/Iterator", "next", "()Ljava/lang/Object;") ||
++            ass.getLeft().type != Exprent.EXPRENT_VAR) {
++          return false;
++        }
++
++        InvocationExprent holder = (InvocationExprent)((AssignmentExprent)stat.getInitExprent()).getRight();
++        stat.setLooptype(DoStatement.LOOP_FOREACH);
++        stat.setInitExprent(ass.getLeft());
++        stat.setIncExprent(holder.getInstance());
++      }
++      else if (initDoExprent != null && initDoExprent.getRight().type == Exprent.EXPRENT_FUNCTION) {
++        if (firstDoExprent == null ||
++            firstDoExprent.getRight().type != Exprent.EXPRENT_ARRAY ||
++            firstDoExprent.getLeft().type != Exprent.EXPRENT_VAR ||
++            !isType(stat.getIncExprent(), Exprent.EXPRENT_FUNCTION) ||
++            !isType(stat.getInitExprent(), Exprent.EXPRENT_ASSIGNMENT)) {
++          return false;
++        }
++
++        FunctionExprent funcRight = (FunctionExprent)initDoExprent.getRight();
++        FunctionExprent funcInc = (FunctionExprent)stat.getIncExprent();
++        ArrayExprent arr = (ArrayExprent)firstDoExprent.getRight();
++
++        if (funcRight.getFuncType() != FunctionExprent.FUNCTION_ARRAY_LENGTH ||
++            (funcInc.getFuncType() != FunctionExprent.FUNCTION_PPI && funcInc.getFuncType() != FunctionExprent.FUNCTION_IPP) ||
++            arr.getIndex().type != Exprent.EXPRENT_VAR ||
++            arr.getArray().type != Exprent.EXPRENT_VAR) {
++            return false;
++        }
++
++        VarExprent index = (VarExprent)arr.getIndex();
++        VarExprent array = (VarExprent)arr.getArray();
++        VarExprent counter = (VarExprent)funcInc.getLstOperands().get(0);
++
++        if (counter.getIndex() != index.getIndex() ||
++            counter.getVersion() != index.getVersion()) {
++          return false;
++        }
++
++        stat.setLooptype(DoStatement.LOOP_FOREACH);
++        stat.setInitExprent(firstDoExprent.getLeft());
++        stat.setIncExprent(funcRight.getLstOperands().get(0));
++        preData.getExprents().remove(initDoExprent);
++        firstData.getExprents().remove(firstDoExprent);
++
++        if (initCopyExprent != null && initCopyExprent.getLeft().type == Exprent.EXPRENT_VAR) {
++          VarExprent copy = (VarExprent)initCopyExprent.getLeft();
++          if (copy.getIndex() == array.getIndex() && copy.getVersion() == array.getVersion()) {
++            preData.getExprents().remove(initCopyExprent);
++            stat.setIncExprent(initCopyExprent.getRight());
++          }
++        }
++      }
++    }
++
++    cleanEmptyStatements(stat, firstData);
++
+     return true;
+   }
+ 
++  private static boolean isType(Exprent exp, int type) { //This is just a helper macro, Wish java had real macros.
++    return exp != null && exp.type == type;
++  }
++
++  private static boolean isInvoke(Exprent exp, String cls, String method, String desc) {
++    if (!isType(exp,  Exprent.EXPRENT_INVOCATION)) {
++      return false;
++    }
++    InvocationExprent invoc = (InvocationExprent)exp;
++    if (cls != null && !cls.equals(invoc.getClassname())) {
++      return false;
++    }
++    return method.equals(invoc.getName()) && desc.equals(invoc.getStringDescriptor());
++  }
++  private static Exprent drillNots(Exprent exp) {
++    while (true) {
++      if (exp.type == Exprent.EXPRENT_FUNCTION) {
++        FunctionExprent fun = (FunctionExprent)exp;
++        if (fun.getFuncType() == FunctionExprent.FUNCTION_BOOL_NOT) {
++          exp = fun.getLstOperands().get(0);
++        }
++        else if (fun.getFuncType() == FunctionExprent.FUNCTION_EQ ||
++                 fun.getFuncType() == FunctionExprent.FUNCTION_NE) {
++          return fun.getLstOperands().get(0);
++        }
++        else {
++          return null;
++        }
++      }
++      else {
++        return null;
++      }
++    }
++  }
++
++  private static void cleanEmptyStatements(DoStatement dostat, Statement stat) {
++    if (stat != null && stat.getExprents().isEmpty()) {
++      List<StatEdge> lst = stat.getAllSuccessorEdges();
++      if (!lst.isEmpty()) {
++        stat.removeSuccessor(lst.get(0));
++      }
++      removeLastEmptyStatement(dostat, stat);
++    }
++  }
+   private static void removeLastEmptyStatement(DoStatement dostat, Statement stat) {
+ 
+     if (stat == dostat.getFirst()) {
+@@ -418,4 +602,20 @@ public class MergeHelper {
+     }
+     return null;
+   }
++
++  private static Statement getFirstDirectData(Statement stat) {
++    if (stat.getExprents() != null && !stat.getExprents().isEmpty()) {
++      return stat;
++    }
++
++    if (stat.type == Statement.TYPE_SEQUENCE) {
++      for (Statement tmp : stat.getStats()) {
++        Statement ret = getFirstDirectData(tmp);
++        if (ret != null) {
++          return ret;
++        }
++      }
++    }
++    return null;
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+index f071933..969a03e 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+@@ -217,4 +217,9 @@ public class VarExprent extends Exprent {
+     return true;
+   }
+ 
++  @Override
++  public String toString() {
++    return "var_" + index + "_" + version;
++  }
++
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
+index 971ace5..d88480e 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
+@@ -16,8 +16,12 @@
+ package org.jetbrains.java.decompiler.modules.decompiler.sforms;
+ 
+ import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.*;
++import org.jetbrains.java.decompiler.struct.gen.VarType;
+ 
+ import java.util.*;
+ import java.util.Map.Entry;
+@@ -215,6 +219,7 @@ public class FlattenStatementsHelper {
+                 sourcenode = node;
+                 break;
+               case DoStatement.LOOP_FOR:
++              case DoStatement.LOOP_FOREACH:
+                 DirectNode nodeinit = new DirectNode(DirectNode.NODE_INIT, stat, stat.id + "_init");
+                 if (dostat.getInitExprent() != null) {
+                   nodeinit.exprents = dostat.getInitExprentList();
+@@ -222,7 +227,7 @@ public class FlattenStatementsHelper {
+                 graph.nodes.putWithKey(nodeinit, nodeinit.id);
+ 
+                 DirectNode nodecond = new DirectNode(DirectNode.NODE_CONDITION, stat, stat.id + "_cond");
+-                nodecond.exprents = dostat.getConditionExprentList();
++                nodecond.exprents = (stat.type == DoStatement.LOOP_FOREACH ? null : dostat.getConditionExprentList());
+                 graph.nodes.putWithKey(nodecond, nodecond.id);
+ 
+                 DirectNode nodeinc = new DirectNode(DirectNode.NODE_INCREMENT, stat, stat.id + "_inc");
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
+index 76a973f..7f4118c 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
+@@ -59,6 +59,7 @@ public class SSAConstructorSparseEx {
+   // var, version
+   private final HashMap<Integer, Integer> lastversion = new HashMap<Integer, Integer>();
+ 
++  @Deprecated // Collection containing all vars for catch blocks and parameters. Not used for anything...
+   private final List<VarVersionPair> startVars = new ArrayList<VarVersionPair>();
+ 
+   // set factory
+@@ -69,11 +70,9 @@ public class SSAConstructorSparseEx {
+     FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
+     DirectGraph dgraph = flatthelper.buildDirectGraph(root);
+ 
+-    // try {
+-    // DotExporter.toDotFile(dgraph, new File("c:\\Temp\\gr12_my.dot"));
+-    // } catch(Exception ex) {ex.printStackTrace();}
++    org.jetbrains.java.decompiler.util.DotExporter.toDotFile(dgraph, mt, "ssaSplitVariables");
+ 
+-    HashSet<Integer> setInit = new HashSet<Integer>();
++    List<Integer> setInit = new ArrayList<Integer>(); //Important: HashSets have undefined order, so use a ordered list.
+     for (int i = 0; i < 64; i++) {
+       setInit.add(i);
+     }
+@@ -84,20 +83,19 @@ public class SSAConstructorSparseEx {
+ 
+     setCatchMaps(root, dgraph, flatthelper);
+ 
++    int itteration = 1;
+     HashSet<String> updated = new HashSet<String>();
+     do {
+       // System.out.println("~~~~~~~~~~~~~ \r\n"+root.toJava());
+-      ssaStatements(dgraph, updated);
++      ssaStatements(dgraph, updated, mt, itteration++);
+       // System.out.println("~~~~~~~~~~~~~ \r\n"+root.toJava());
+     }
+     while (!updated.isEmpty());
+   }
+ 
+-  private void ssaStatements(DirectGraph dgraph, HashSet<String> updated) {
++  private void ssaStatements(DirectGraph dgraph, HashSet<String> updated, StructMethod mt, int itteration) {
+ 
+-    // try {
+-    // DotExporter.toDotFile(dgraph, new File("c:\\Temp\\gr1_my.dot"));
+-    // } catch(Exception ex) {ex.printStackTrace();}
++    org.jetbrains.java.decompiler.util.DotExporter.toDotFile(dgraph, mt, "ssaStatements_" + itteration, outVarVersions);
+ 
+     for (DirectNode node : dgraph.nodes) {
+ 
+@@ -523,6 +521,7 @@ public class SSAConstructorSparseEx {
+     return phi;
+   }
+ 
++  @Deprecated // Collection containing all vars for catch blocks and parameters.
+   public List<VarVersionPair> getStartVars() {
+     return startVars;
+   }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
+index 95cefcf..9ba8195 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
+@@ -88,7 +88,9 @@ public class SSAUConstructorSparseEx {
+     FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
+     DirectGraph dgraph = flatthelper.buildDirectGraph(root);
+ 
+-    HashSet<Integer> setInit = new HashSet<Integer>();
++    org.jetbrains.java.decompiler.util.DotExporter.toDotFile(dgraph, mt, "ssauSplitVariables");
++
++    List<Integer> setInit = new ArrayList<Integer>(); //Important: HashSets have undefined order, so use a ordered list.
+     for (int i = 0; i < 64; i++) {
+       setInit.add(i);
+     }
+@@ -98,25 +100,25 @@ public class SSAUConstructorSparseEx {
+ 
+     setCatchMaps(root, dgraph, flatthelper);
+ 
+-    //		try {
+-    //			DotExporter.toDotFile(dgraph, new File("c:\\Temp\\gr12_my.dot"));
+-    //		} catch(Exception ex) {ex.printStackTrace();}
+ 
++    int itteration = 1;
+     HashSet<String> updated = new HashSet<String>();
+     do {
+       //			System.out.println("~~~~~~~~~~~~~ \r\n"+root.toJava());
+-      ssaStatements(dgraph, updated, false);
++      ssaStatements(dgraph, updated, false, mt, itteration++);
+       //			System.out.println("~~~~~~~~~~~~~ \r\n"+root.toJava());
+     }
+     while (!updated.isEmpty());
+ 
+ 
+-    ssaStatements(dgraph, updated, true);
++    ssaStatements(dgraph, updated, true, mt, itteration);
+ 
+     ssuversions.initDominators();
+   }
+ 
+-  private void ssaStatements(DirectGraph dgraph, HashSet<String> updated, boolean calcLiveVars) {
++  private void ssaStatements(DirectGraph dgraph, HashSet<String> updated, boolean calcLiveVars, StructMethod mt, int itteration) {
++
++    org.jetbrains.java.decompiler.util.DotExporter.toDotFile(dgraph, mt, "ssauStatements_" + itteration);
+ 
+     for (DirectNode node : dgraph.nodes) {
+ 
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
+index ef5ea76..8359284 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
+@@ -19,6 +19,7 @@ import org.jetbrains.java.decompiler.main.TextBuffer;
+ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
+ import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+ 
+ import java.util.ArrayList;
+@@ -31,6 +32,7 @@ public class DoStatement extends Statement {
+   public static final int LOOP_DOWHILE = 1;
+   public static final int LOOP_WHILE = 2;
+   public static final int LOOP_FOR = 3;
++  public static final int LOOP_FOREACH = 4;
+ 
+   private int looptype;
+ 
+@@ -135,6 +137,13 @@ public class DoStatement extends Statement {
+         buf.append(ExprProcessor.jmpWrapper(first, indent + 1, true, tracer));
+         buf.appendIndent(indent).append("}").appendLineSeparator();
+         tracer.incrementCurrentSourceLine();
++        break;
++      case LOOP_FOREACH:
++        buf.appendIndent(indent).append("for(").append(initExprent.get(0).toJava(indent, tracer));
++        buf.append(" : ").append(incExprent.get(0).toJava(indent, tracer)).append(") {").appendLineSeparator();
++        tracer.incrementCurrentSourceLine();
++        buf.append(ExprProcessor.jmpWrapper(first, indent + 1, true, tracer));
++        buf.appendIndent(indent).append("}").appendLineSeparator();
+     }
+ 
+     return buf;
+@@ -151,6 +160,9 @@ public class DoStatement extends Statement {
+         }
+       case LOOP_WHILE:
+         lst.add(getConditionExprent());
++        break;
++      case LOOP_FOREACH:
++        lst.add(getInitExprent());
+     }
+ 
+     lst.add(first);
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index 23b1c5e..aa2ef6e 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -154,6 +154,15 @@ public class VarDefinitionHelper {
+             }
+           }
+         }
++        else if (dstat.getLooptype() == DoStatement.LOOP_FOREACH) {
++          if (dstat.getInitExprent() != null && dstat.getInitExprent().type == Exprent.EXPRENT_VAR) {
++            VarExprent var = (VarExprent)dstat.getInitExprent();
++            if (var.getIndex() == index.intValue()) {
++              var.setDefinition(true);
++              continue;
++            }
++          }
++        }
+       }
+ 
+ 
+@@ -269,6 +278,7 @@ public class VarDefinitionHelper {
+           if (st.type == DoStatement.TYPE_DO) {
+             DoStatement dost = (DoStatement)st;
+             if (dost.getLooptype() != DoStatement.LOOP_FOR &&
++                dost.getLooptype() != DoStatement.LOOP_FOREACH &&
+                 dost.getLooptype() != DoStatement.LOOP_DO) {
+               currVars.add(dost.getConditionExprent());
+             }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+index ef07c6b..0f530f9 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+@@ -31,7 +31,7 @@ public class VarProcessor {
+   private VarVersionsProcessor varVersions;
+   private final Map<VarVersionPair, String> thisVars = new HashMap<VarVersionPair, String>();
+   private final Set<VarVersionPair> externalVars = new HashSet<VarVersionPair>();
+-private LocalVariableTable lvt;
++  private LocalVariableTable lvt;
+ 
+   public void setVarVersions(RootStatement root) {
+     Map<Integer, VarVersionPair> mapOriginalVarIndices = null;
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+index eae4cba..cb37d4d 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+@@ -46,6 +46,8 @@ public class VarVersionsProcessor {
+     FlattenStatementsHelper flattenHelper = new FlattenStatementsHelper();
+     DirectGraph graph = flattenHelper.buildDirectGraph(root);
+ 
++    org.jetbrains.java.decompiler.util.DotExporter.toDotFile(graph, mt, "setVarVersions");
++
+     mergePhiVersions(ssa, graph);
+ 
+     typeProcessor = new VarTypeProcessor();
+diff --git a/src/org/jetbrains/java/decompiler/util/DotExporter.java b/src/org/jetbrains/java/decompiler/util/DotExporter.java
+new file mode 100644
+index 0000000..0d41718
+--- /dev/null
++++ b/src/org/jetbrains/java/decompiler/util/DotExporter.java
+@@ -0,0 +1,238 @@
++package org.jetbrains.java.decompiler.util;
++
++import java.io.BufferedOutputStream;
++import java.io.File;
++import java.io.FileOutputStream;
++import java.util.Collections;
++import java.util.HashSet;
++import java.util.List;
++import java.util.Map;
++import java.util.Set;
++import java.util.Map.Entry;
++
++import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
++import org.jetbrains.java.decompiler.code.cfg.ControlFlowGraph;
++import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
++import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph;
++import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectNode;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionEdge;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionNode;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionsGraph;
++import org.jetbrains.java.decompiler.struct.StructMethod;
++import org.jetbrains.java.decompiler.util.FastSparseSetFactory.FastSparseSet;
++
++public class DotExporter {
++  private static final String DOTS_FOLDER = "Z:/dots/";
++  private static final boolean DUMP_DOTS = false;
++  // http://graphs.grevian.org/graph is a nice visualizer for the outputed dots.
++
++  private static String toDotFormat(Statement stat) {
++
++    StringBuffer buffer = new StringBuffer();
++
++    buffer.append("digraph G {\r\n");
++
++    for(Statement st : stat.getStats()) {
++
++      String sourceid = st.id + (st.getSuccessorEdges(StatEdge.TYPE_EXCEPTION).isEmpty()?"":"000000");
++
++      buffer.append(sourceid+" [shape=box,label=\""+sourceid+"\"];\r\n");
++
++      for(StatEdge edge : st.getSuccessorEdges(Statement.STATEDGE_DIRECT_ALL)) {
++        String destid = edge.getDestination().id + (edge.getDestination().getSuccessorEdges(StatEdge.TYPE_EXCEPTION).isEmpty()?"":"000000");
++
++        buffer.append(sourceid+"->"+destid+";\r\n");
++
++        if(!stat.getStats().contains(edge.getDestination())) {
++          buffer.append(destid+" [label=\""+destid+"\"];\r\n");
++        }
++      }
++
++      for(StatEdge edge : st.getSuccessorEdges(StatEdge.TYPE_EXCEPTION)) {
++        String destid = edge.getDestination().id + (edge.getDestination().getSuccessorEdges(StatEdge.TYPE_EXCEPTION).isEmpty()?"":"000000");
++
++        buffer.append(sourceid+" -> "+destid+" [style=dotted];\r\n");
++
++        if(!stat.getStats().contains(edge.getDestination())) {
++          buffer.append(destid+" [label=\""+destid+"\"];\r\n");
++        }
++      }
++    }
++
++    buffer.append("}");
++
++    return buffer.toString();
++  }
++
++
++  private static String toDotFormat(ControlFlowGraph graph, boolean showMultipleEdges) {
++
++    StringBuffer buffer = new StringBuffer();
++
++    buffer.append("digraph G {\r\n");
++
++    List<BasicBlock> blocks = graph.getBlocks();
++    for(int i=0;i<blocks.size();i++) {
++      BasicBlock block = (BasicBlock)blocks.get(i);
++
++      buffer.append(block.id+" [shape=box,label=\""+block.id+"\"];\r\n");
++
++
++      List<BasicBlock> suc = block.getSuccs();
++      if(!showMultipleEdges) {
++        HashSet<BasicBlock> set = new HashSet<BasicBlock>();
++        set.addAll(suc);
++        suc = Collections.list(Collections.enumeration(set));
++      }
++      for(int j=0;j<suc.size();j++) {
++        buffer.append(block.id+"->"+((BasicBlock)suc.get(j)).id+";\r\n");
++      }
++
++
++      suc = block.getSuccExceptions();
++      if(!showMultipleEdges) {
++        HashSet<BasicBlock> set = new HashSet<BasicBlock>();
++        set.addAll(suc);
++        suc = Collections.list(Collections.enumeration(set));
++      }
++      for(int j=0;j<suc.size();j++) {
++        buffer.append(block.id+" -> "+((BasicBlock)suc.get(j)).id+" [style=dotted];\r\n");
++      }
++    }
++
++    buffer.append("}");
++
++    return buffer.toString();
++  }
++
++  private static String toDotFormat(VarVersionsGraph graph) {
++
++    StringBuffer buffer = new StringBuffer();
++
++    buffer.append("digraph G {\r\n");
++
++    List<VarVersionNode> blocks = graph.nodes;
++    for(int i=0;i<blocks.size();i++) {
++      VarVersionNode block = blocks.get(i);
++
++      buffer.append((block.var*1000+block.version)+" [shape=box,label=\""+block.var+"_"+block.version+"\"];\r\n");
++
++      for(VarVersionEdge edge: block.succs) {
++        VarVersionNode dest = edge.dest;
++        buffer.append((block.var*1000+block.version)+"->"+(dest.var*1000+dest.version)+(edge.type==VarVersionEdge.EDGE_PHANTOM?" [style=dotted]":"")+";\r\n");
++      }
++    }
++
++    buffer.append("}");
++
++    return buffer.toString();
++  }
++
++  private static String toDotFormat(DirectGraph graph, Map<String, SFormsFastMapDirect> vars) {
++
++    StringBuffer buffer = new StringBuffer();
++
++    buffer.append("digraph G {\r\n");
++
++    List<DirectNode> blocks = graph.nodes;
++    for(int i=0;i<blocks.size();i++) {
++      DirectNode block = blocks.get(i);
++
++      StringBuilder label = new StringBuilder(block.id);
++      if (vars != null && vars.containsKey(block.id)) {
++        SFormsFastMapDirect map = vars.get(block.id);
++
++        List<Entry<Integer, FastSparseSet<Integer>>> lst = map.entryList();
++        if (lst != null) {
++          for (Entry<Integer, FastSparseSet<Integer>> entry : lst) {
++             label.append("\\n").append(entry.getKey());
++            Set<Integer> set = entry.getValue().toPlainSet();
++            label.append("=").append(set.toString());
++          }
++        }
++      }
++
++      buffer.append(directBlockIdToDot(block.id)+" [shape=box,label=\""+label+"\"];\r\n");
++
++      for(DirectNode dest: block.succs) {
++        buffer.append(directBlockIdToDot(block.id)+"->"+directBlockIdToDot(dest.id)+";\r\n");
++      }
++    }
++
++    buffer.append("}");
++
++    return buffer.toString();
++  }
++
++  private static String directBlockIdToDot(String id) {
++    id = id.replaceAll("_try", "999");
++    id = id.replaceAll("_tail", "888");
++
++    id = id.replaceAll("_init", "111");
++    id = id.replaceAll("_cond", "222");
++    id = id.replaceAll("_inc", "333");
++    return id;
++  }
++
++  private static File getFile(StructMethod mt, String suffix) {
++    File root = new File(DOTS_FOLDER + mt.getClassStruct().qualifiedName);
++    if (!root.isDirectory())
++      root.mkdirs();
++    return new File(root,
++      mt.getName().replace('<', '.').replace('>', '_') +
++      mt.getDescriptor().replace('/', '.') +
++      '_' + suffix + ".dot");
++  }
++
++  public static void toDotFile(DirectGraph dgraph, StructMethod mt, String suffix) {
++    toDotFile(dgraph, mt, suffix, null);
++  }
++  public static void toDotFile(DirectGraph dgraph, StructMethod mt, String suffix, Map<String, SFormsFastMapDirect> vars) {
++    if (!DUMP_DOTS)
++      return;
++    try{
++      BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(getFile(mt, suffix)));
++      out.write(toDotFormat(dgraph, vars).getBytes());
++      out.close();
++    } catch (Exception e) {
++      e.printStackTrace();
++    }
++  }
++
++  public static void toDotFile(Statement stat, StructMethod mt, String suffix) {
++    if (!DUMP_DOTS)
++      return;
++    try{
++      BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(getFile(mt, suffix)));
++      out.write(toDotFormat(stat).getBytes());
++      out.close();
++    } catch (Exception e) {
++      e.printStackTrace();
++    }
++  }
++
++  public static void toDotFile(VarVersionsGraph graph, StructMethod mt, String suffix) {
++    if (!DUMP_DOTS)
++      return;
++    try{
++      BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(getFile(mt, suffix)));
++      out.write(toDotFormat(graph).getBytes());
++      out.close();
++    } catch (Exception e) {
++      e.printStackTrace();
++    }
++  }
++
++  public static void toDotFile(ControlFlowGraph graph, StructMethod mt, String suffix, boolean showMultipleEdges) {
++    if (!DUMP_DOTS)
++      return;
++    try{
++      BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(getFile(mt, suffix)));
++      out.write(toDotFormat(graph, showMultipleEdges).getBytes());
++      out.close();
++    } catch (Exception e) {
++      e.printStackTrace();
++    }
++  }
++}
+\ No newline at end of file
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0030-Fix-finally-processor-instruction-comparison.patch b/FernFlower-Patches/0030-Fix-finally-processor-instruction-comparison.patch
deleted file mode 100644
index 7633403..0000000
--- a/FernFlower-Patches/0030-Fix-finally-processor-instruction-comparison.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Justin <jrd2558@gmail.com>
-Date: Sat, 11 Jan 2020 17:00:41 -0700
-Subject: [PATCH] Fix finally processor instruction comparison
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
-index b240e83853cff82f917a7fc9f80dab661dd7ceb9..13317a543c5122c97c86801e63e0872a49df8f77 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
-@@ -799,13 +799,17 @@ public class FinallyProcessor {
-         int secondOp = second.operand(i);
-         if (firstOp != secondOp) {
-           // a-load/store instructions
--          if (first.opcode == CodeConstants.opc_aload || first.opcode == CodeConstants.opc_astore) {
-+          if (first.opcode == CodeConstants.opc_aload) {
-             for (int[] arr : lstStoreVars) {
-               if (arr[0] == firstOp && arr[1] == secondOp) {
-                 return true;
-               }
-             }
-           }
-+          else if (first.opcode == CodeConstants.opc_astore) {
-+            lstStoreVars.add(new int[]{firstOp, secondOp});
-+            return true;
-+          }
- 
-           return false;
-         }
diff --git a/FernFlower-Patches/0031-Fix-permissions-on-gradlew.-It-s-writeable-on-linux.patch b/FernFlower-Patches/0031-Fix-permissions-on-gradlew.-It-s-writeable-on-linux.patch
new file mode 100644
index 0000000..f70dafe
--- /dev/null
+++ b/FernFlower-Patches/0031-Fix-permissions-on-gradlew.-It-s-writeable-on-linux.patch
@@ -0,0 +1,16 @@
+From 1326398474ddba2211b73412ca7be68ba9c32342 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Thu, 13 Aug 2015 17:06:24 -0700
+Subject: [PATCH 031/122] Fix permissions on gradlew. It's writeable on linux.
+
+---
+ gradlew | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 gradlew
+
+diff --git a/gradlew b/gradlew
+old mode 100644
+new mode 100755
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0031-Simple-lambda-syntax-support-isl-0-to-disable.patch b/FernFlower-Patches/0031-Simple-lambda-syntax-support-isl-0-to-disable.patch
deleted file mode 100644
index 0cfd647..0000000
--- a/FernFlower-Patches/0031-Simple-lambda-syntax-support-isl-0-to-disable.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Justin <jrd2558@gmail.com>
-Date: Fri, 20 Dec 2019 08:35:30 -0700
-Subject: [PATCH] Simple lambda syntax support, --isl=0 to disable.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index 6f2f8419d41a240c6d1428be0b0ca9258f058127..d9c338ff9189953329a0812250fb494656eb749a 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-@@ -10,14 +10,19 @@ import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
- import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
- import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.AnnotationExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.ExitExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.NewExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
- import org.jetbrains.java.decompiler.modules.decompiler.typeann.TargetInfo;
- import org.jetbrains.java.decompiler.modules.decompiler.typeann.TypeAnnotation;
- import org.jetbrains.java.decompiler.modules.decompiler.typeann.TypeAnnotationWriteHelper;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
- import org.jetbrains.java.decompiler.modules.renamer.PoolInterceptor;
- import org.jetbrains.java.decompiler.struct.*;
-@@ -84,7 +89,15 @@ public class ClassWriter {
-       if (node.lambdaInformation.is_method_reference) {
-         if (!node.lambdaInformation.is_content_method_static && method_object != null) {
-           // reference to a virtual method
--          buffer.append(method_object.toJava(indent, tracer));
-+          method_object.getInferredExprType(new VarType(CodeConstants.TYPE_OBJECT, 0, node.lambdaInformation.content_class_name));
-+          String instance = method_object.toJava(indent, tracer).toString();
-+          // If the instance is casted, then we need to wrap it
-+          if (method_object.type == Exprent.EXPRENT_FUNCTION && ((FunctionExprent)method_object).getFuncType() == FunctionExprent.FUNCTION_CAST && ((FunctionExprent)method_object).doesCast()) {
-+            buffer.append('(').append(instance).append(')');
-+          }
-+          else {
-+            buffer.append(instance);
-+          }
-         }
-         else {
-           // reference to a static method
-@@ -103,6 +116,7 @@ public class ClassWriter {
- 
-         List<TypeAnnotation> parameterTypeAnnotations = TargetInfo.FormalParameterTarget.extract(TypeAnnotation.listFrom(mt));
-         boolean explicitlyTyped = !parameterTypeAnnotations.isEmpty();
-+        boolean simpleLambda = false;
- 
-         if (!lambdaToAnonymous) {
-           buffer.append('(');
-@@ -139,16 +153,60 @@ public class ClassWriter {
-           }
- 
-           buffer.append(") ->");
-+
-+          RootStatement root = wrapper.getMethodWrapper(mt.getName(), mt.getDescriptor()).root;
-+          if (DecompilerContext.getOption(IFernflowerPreferences.INLINE_SIMPLE_LAMBDAS) && !methodWrapper.decompiledWithErrors && root != null) {
-+            Statement firstStat = root.getFirst();
-+            if (firstStat.type == Statement.StatementType.BASIC_BLOCK && firstStat.getExprents() != null && firstStat.getExprents().size() == 1) {
-+              Exprent firstExpr = firstStat.getExprents().get(0);
-+              boolean isVarDefinition = firstExpr.type == Exprent.EXPRENT_ASSIGNMENT &&
-+                ((AssignmentExprent)firstExpr).getLeft().type == Exprent.EXPRENT_VAR &&
-+                ((VarExprent)((AssignmentExprent)firstExpr).getLeft()).isDefinition();
-+
-+              boolean isThrow = firstExpr.type == Exprent.EXPRENT_EXIT &&
-+                ((ExitExprent)firstExpr).getExitType() == ExitExprent.EXIT_THROW;
-+
-+              if (!isVarDefinition && !isThrow) {
-+                simpleLambda = true;
-+                MethodWrapper outerWrapper = (MethodWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_WRAPPER);
-+                DecompilerContext.setProperty(DecompilerContext.CURRENT_METHOD_WRAPPER, methodWrapper);
-+                try {
-+                  TextBuffer codeBuffer = firstExpr.toJava(indent + 1, tracer);
-+
-+                  if (firstExpr.type == Exprent.EXPRENT_EXIT)
-+                    codeBuffer.setStart(6); // skip return
-+                  else
-+                    codeBuffer.prepend(" ");
-+
-+                  buffer.append(codeBuffer);
-+                }
-+                catch (Throwable ex) {
-+                  DecompilerContext.getLogger().writeMessage("Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be written.",
-+                    IFernflowerLogger.Severity.WARN,
-+                    ex);
-+                  methodWrapper.decompiledWithErrors = true;
-+                  buffer.append(" // $FF: Couldn't be decompiled");
-+                }
-+                finally {
-+                  tracer.addMapping(root.getDummyExit().bytecode);
-+                  addTracer(cl, mt, tracer);
-+                  DecompilerContext.setProperty(DecompilerContext.CURRENT_METHOD_WRAPPER, outerWrapper);
-+                }
-+              }
-+            }
-+          }
-         }
- 
--        buffer.append(" {").appendLineSeparator();
--        tracer.incrementCurrentSourceLine();
-+        if (!simpleLambda) {
-+          buffer.append(" {").appendLineSeparator();
-+          tracer.incrementCurrentSourceLine();
- 
--        methodLambdaToJava(node, wrapper, mt, buffer, indent + 1, !lambdaToAnonymous, tracer);
-+          methodLambdaToJava(node, wrapper, mt, buffer, indent + 1, !lambdaToAnonymous, tracer);
- 
--        buffer.appendIndent(indent).append("}");
-+          buffer.appendIndent(indent).append("}");
- 
--        addTracer(cl, mt, tracer);
-+          addTracer(cl, mt, tracer);
-+        }
-       }
-     }
-     finally {
-diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-index a25566f0e6ba9a4f67c6412fc379874ffca92c21..f5e95e65a807e335ce33a589348e11ad1dbbf5fe 100644
---- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-@@ -39,6 +39,7 @@ public interface IFernflowerPreferences {
-   String INCLUDE_ENTIRE_CLASSPATH = "iec";
-   String QUALIFY_INNER_CLASSES = "qin";
-   String EXPLICIT_GENERIC_ARGUMENTS = "ega";
-+  String INLINE_SIMPLE_LAMBDAS = "isl";
- 
-   String LOG_LEVEL = "log";
-   String MAX_PROCESSING_METHOD = "mpm";
-@@ -95,6 +96,7 @@ public interface IFernflowerPreferences {
-     defaults.put(INCLUDE_ENTIRE_CLASSPATH, "0");
-     defaults.put(QUALIFY_INNER_CLASSES, "1");
-     defaults.put(EXPLICIT_GENERIC_ARGUMENTS, "0");
-+    defaults.put(INLINE_SIMPLE_LAMBDAS, "1");
- 
-     defaults.put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name());
-     defaults.put(MAX_PROCESSING_METHOD, "0");
-diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
-index 16ceb1e8e47c90da72ef3039cf625eec25b68223..c78c9554df9788b87028bcf181fc243db7a29f3f 100644
---- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
-+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
-@@ -24,7 +24,8 @@ public class SingleClassesTest extends SingleClassesTestBase {
-                          IFernflowerPreferences.DUMP_ORIGINAL_LINES, "1",
-                          IFernflowerPreferences.IGNORE_INVALID_BYTECODE, "1",
-                          IFernflowerPreferences.VERIFY_ANONYMOUS_CLASSES, "1",
--                         IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH, "1"
-+                         IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH, "1",
-+                         IFernflowerPreferences.INLINE_SIMPLE_LAMBDAS, "0"
- );
-   }
- 
diff --git a/FernFlower-Patches/0032-Add-explicit-cast-to-invocations-of-java-nio-Buffer-.patch b/FernFlower-Patches/0032-Add-explicit-cast-to-invocations-of-java-nio-Buffer-.patch
deleted file mode 100644
index c6c2647..0000000
--- a/FernFlower-Patches/0032-Add-explicit-cast-to-invocations-of-java-nio-Buffer-.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Tue, 14 Apr 2020 19:25:41 -0700
-Subject: [PATCH] Add explicit cast to invocations of java/nio/Buffer
- functions.
-
-Java 9+ added overrides to these functions to return the specific subclass, however, when there is a compiler "bug" that when targeting release * or below, it will still reference these new methods, causing exceptions at runtime on Java 8.
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 4633697497baaa977d1f5451c5340eae3769472f..1a3bd9c6b051447ef2aca98b58ff70b3b89da52c 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-@@ -47,6 +47,8 @@ public class InvocationExprent extends Exprent {
- 
-   private static final BitSet EMPTY_BIT_SET = new BitSet(0);
- 
-+  private static final VarType JAVA_NIO_BUFFER = new VarType(CodeConstants.TYPE_OBJECT, 0, "java/nio/Buffer");
-+
-   private String name;
-   private String className;
-   private boolean isStatic;
-@@ -654,6 +656,12 @@ public class InvocationExprent extends Exprent {
-           else if (instance.getPrecedence() > getPrecedence() && !skippedCast) {
-             buf.append("(").append(res).append(")");
-           }
-+          //Java 9+ adds some overrides to java/nio/Buffer's subclasses that alter the return types.
-+          //This isn't properly handled by the compiler. So explicit casts are needed to retain J8 compatibility.
-+          else if (JAVA_NIO_BUFFER.equals(descriptor.ret) && !JAVA_NIO_BUFFER.equals(rightType)
-+              && DecompilerContext.getStructContext().instanceOf(rightType.getValue(), JAVA_NIO_BUFFER.getValue())) {
-+              buf.append("((").append(ExprProcessor.getCastTypeName(JAVA_NIO_BUFFER, Collections.emptyList())).append(")").append(res).append(")");
-+          }
-           else {
-             buf.append(res);
-           }
diff --git a/FernFlower-Patches/0032-Partially-revert-TryCatch-statements-will-now-use-th.patch b/FernFlower-Patches/0032-Partially-revert-TryCatch-statements-will-now-use-th.patch
new file mode 100644
index 0000000..bdfe7e3
--- /dev/null
+++ b/FernFlower-Patches/0032-Partially-revert-TryCatch-statements-will-now-use-th.patch
@@ -0,0 +1,115 @@
+From 52c5082cd65ed6436412b97c742edf08878890f8 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Thu, 13 Aug 2015 21:45:39 -0700
+Subject: [PATCH 032/122] Partially revert "TryCatch statements will now use
+ the correct variable index for their exception variable." (rolled back catch
+ changes)
+
+This reverts commit 5f699acc70d8e40f758737ae88aeddecc07edc8c.
+---
+ .../modules/decompiler/stats/CatchAllStatement.java  | 11 +----------
+ .../modules/decompiler/stats/CatchStatement.java     | 10 +---------
+ testData/results/TestClassSimpleBytecodeMapping.dec  |  4 ++--
+ testData/results/TestTryCatchFinally.dec             | 12 ++++++------
+ 4 files changed, 10 insertions(+), 27 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
+index d5b432c..812ed10 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
+@@ -16,7 +16,6 @@
+ package org.jetbrains.java.decompiler.modules.decompiler.stats;
+ 
+ import org.jetbrains.java.decompiler.code.CodeConstants;
+-import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
+ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.TextBuffer;
+ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+@@ -69,15 +68,7 @@ public class CatchAllStatement extends Statement {
+       }
+     }
+ 
+-    int varIndex = -1;
+-    BasicBlock block = handler.getBasichead().getBlock();
+-    if (!block.getSeq().isEmpty() && block.getInstruction(0).opcode == CodeConstants.opc_astore) {
+-      varIndex = block.getInstruction(0).getOperand(0);
+-    }
+-    else {
+-      varIndex = DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER);
+-    }
+-    vars.add(new VarExprent(varIndex,
++    vars.add(new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
+                             new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Throwable"),
+                             (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR)));
+   }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
+index fda5ed3..8d56042 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
+@@ -60,15 +60,7 @@ public class CatchStatement extends Statement {
+         stats.addWithKey(stat, stat.id);
+         exctstrings.add(new ArrayList<String>(edge.getExceptions()));
+ 
+-        int varIndex = -1;
+-        BasicBlock block = stat.getBasichead().getBlock();
+-        if (!block.getSeq().isEmpty() && block.getInstruction(0).opcode == CodeConstants.opc_astore) {
+-          varIndex = block.getInstruction(0).getOperand(0);
+-        }
+-        else {
+-          varIndex = DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER);
+-        }
+-        vars.add(new VarExprent(varIndex,
++        vars.add(new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
+                                 new VarType(CodeConstants.TYPE_OBJECT, 0, edge.getExceptions().get(0)),
+                                 // FIXME: for now simply the first type. Should get the first common superclass when possible.
+                                 (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR)));
+diff --git a/testData/results/TestClassSimpleBytecodeMapping.dec b/testData/results/TestClassSimpleBytecodeMapping.dec
+index 4a2f333..1a2532f 100644
+--- a/testData/results/TestClassSimpleBytecodeMapping.dec
++++ b/testData/results/TestClassSimpleBytecodeMapping.dec
+@@ -21,8 +21,8 @@ public class TestClassSimpleBytecodeMapping {
+    public void test2(String var1) {
+       try {
+          Integer.parseInt(var1);// 34
+-      } catch (Exception var2) {// 35
+-         System.out.println(var2);// 36
++      } catch (Exception var6) {// 35
++         System.out.println(var6);// 36
+       } finally {
+          System.out.println("Finally");// 38
+       }
+diff --git a/testData/results/TestTryCatchFinally.dec b/testData/results/TestTryCatchFinally.dec
+index fbe5782..772a76e 100644
+--- a/testData/results/TestTryCatchFinally.dec
++++ b/testData/results/TestTryCatchFinally.dec
+@@ -4,10 +4,10 @@ public class TestTryCatchFinally {
+    public void test1(String var1) {
+       try {
+          System.out.println("sout1");// 24
+-      } catch (Exception var2) {
++      } catch (Exception var9) {
+          try {
+             System.out.println("sout2");// 27
+-         } catch (Exception var3) {// 28
++         } catch (Exception var8) {// 28
+             ;
+          }
+       } finally {
+@@ -28,10 +28,10 @@ public class TestTryCatchFinally {
+ 
+    public int test(String var1) {
+       try {
+-         int var5 = Integer.parseInt(var1);// 51
+-         return var5;
+-      } catch (Exception var2) {// 52
+-         System.out.println("Error" + var2);// 53
++         int var2 = Integer.parseInt(var1);// 51
++         return var2;
++      } catch (Exception var6) {// 52
++         System.out.println("Error" + var6);// 53
+       } finally {
+          System.out.println("Finally");// 55
+       }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0033-Added-a-test-for-variables-that-seem-to-come-into-sc.patch b/FernFlower-Patches/0033-Added-a-test-for-variables-that-seem-to-come-into-sc.patch
new file mode 100644
index 0000000..deeb63f
--- /dev/null
+++ b/FernFlower-Patches/0033-Added-a-test-for-variables-that-seem-to-come-into-sc.patch
@@ -0,0 +1,66 @@
+From 1d9d7cdb8476a39a10b588465f749347b9d1c713 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Thu, 13 Aug 2015 22:57:55 -0700
+Subject: [PATCH 033/122] Added a test for variables that seem to come into
+ scope if we remove VarVersionsProcessor.simpleMerge
+
+---
+ testData/classes/pkg/TestLVT.class | Bin 1672 -> 1860 bytes
+ testData/results/TestLVT.dec       |  11 +++++++++--
+ testData/src/pkg/TestLVT.java      |   9 +++++++++
+ 3 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/testData/classes/pkg/TestLVT.class b/testData/classes/pkg/TestLVT.class
+index d8a5829d4f6504567ecf46bf65167047e41cd291..1cf6286f2a679368b301d408c928d93ed4eecf48 100644
+GIT binary patch
+delta 224
+zcmeC+J;KLz>ff$?3=9lL3~3v=v{}sAb5lz)@>3GI7_1qhc^K>%Vi*}%G+Z>p*z9-C
+z1c6y>_8%b(Mh3=2Aa()bq{+rC>Ws{rqggbV>e(0=8Q6hFmNKvcAp?Uvp9jC!CI%CA
+z&E#ziQ6dbn9wH3!2!V}2B}@!lKvE8@O%}+LV_;#BXW(T}U=U<bWDsRg0*WXza0AsS
+lFffCRWZ(hHg7nEUBr+rcEo5PkW=ICIm>D=38B)MfsQ}<yCF%eG
+
+delta 36
+scmX@Y*TKtm>ff$?3=9lL4AC38v{@$Sv8XaKZJxrS!NkhIz{C&*0Mu#;EC2ui
+
+diff --git a/testData/results/TestLVT.dec b/testData/results/TestLVT.dec
+index b1b7e2e..d161f07 100644
+--- a/testData/results/TestLVT.dec
++++ b/testData/results/TestLVT.dec
+@@ -23,7 +23,14 @@ public class TestLVT {
+          String spam = scope1a + scope2 + scope2a + i + noise;
+          System.out.println(spam);
+       }
+-        
+    }
+-}
+ 
++   public void methoda() {
++      double a = 0.0D;
++      double b = 1.0D;
++      System.out.println(a + b);
++      a = 0.1D;
++      b = 1.1D;
++      System.out.println(a + b);
++   }
++}
+diff --git a/testData/src/pkg/TestLVT.java b/testData/src/pkg/TestLVT.java
+index 05b5228..9a46272 100644
+--- a/testData/src/pkg/TestLVT.java
++++ b/testData/src/pkg/TestLVT.java
+@@ -24,4 +24,13 @@ public class TestLVT {
+             System.out.println(spam);
+         }
+     }
++    
++    public void methoda() {
++    	double a = 0D;
++    	double b = 1D;
++    	System.out.println(a+b);
++    	a = 0.1D;
++    	b = 1.1D;
++    	System.out.println(a+b);
++    }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0033-Revert-change-to-FieldExprent-getExprentUse.patch b/FernFlower-Patches/0033-Revert-change-to-FieldExprent-getExprentUse.patch
deleted file mode 100644
index 8624781..0000000
--- a/FernFlower-Patches/0033-Revert-change-to-FieldExprent-getExprentUse.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: covers1624 <laughlan.cov@internode.on.net>
-Date: Sun, 7 Jun 2020 16:53:49 +0930
-Subject: [PATCH] Revert change to FieldExprent#getExprentUse
-
-Revert part of a change introduced upstream. https://github.com/MinecraftForge/FernFlower/commit/81faff674cce55100d4d04cad22c2d8fcb71b05c#diff-e057d0d70e5b15f5e12ec86ac46c85eeR57
-This upstream change causes local variables to not be inlined in many cases, and makes decomp very messy for the reason of 'thread safety'.
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-index 3099a4611a01341d3a923d84723303ed0e76741b..34ee7377dfef29d73f4cd0e5bf53944befafbd7d 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-@@ -105,7 +105,13 @@ public class FieldExprent extends Exprent {
- 
-   @Override
-   public int getExprentUse() {
--    return 0; // multiple references to a field considered dangerous in a multithreaded environment, thus no Exprent.MULTIPLE_USES set here
-+    //Revert the following line it produces messy code as follows:
-+    //-            this.field_225230_a[l + i1 * this.field_225231_b] &= 16777215;
-+    //+            int[] aint = this.field_225230_a;
-+    //+            int j1 = l + i1 * this.field_225231_b;
-+    //+            aint[j1] &= 16777215;
-+    //return 0; // multiple references to a field considered dangerous in a multithreaded environment, thus no Exprent.MULTIPLE_USES set here
-+    return instance == null ? Exprent.MULTIPLE_USES : instance.getExprentUse() & Exprent.MULTIPLE_USES;
-   }
- 
-   @Override
diff --git a/FernFlower-Patches/0034-Add-only-argument-It-will-filter-what-classes-are-de.patch b/FernFlower-Patches/0034-Add-only-argument-It-will-filter-what-classes-are-de.patch
deleted file mode 100644
index 63b4c60..0000000
--- a/FernFlower-Patches/0034-Add-only-argument-It-will-filter-what-classes-are-de.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Wed, 10 Jun 2020 09:59:19 -0700
-Subject: [PATCH] Add -only argument It will filter what classes are decompiled
- from the target jar.
-
-Uses a prefix system, so -only=net/minecraft/block/ will decompile all classes in the block package and subpackages.
-Useful for debugging to limit scope/runtime.
-
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index 921b3b653743ff77dead340be940fcef759bcead..ff19c7105c0e6bcfa280dca8255eaf32357a2fc3 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-@@ -36,6 +36,7 @@ public class ClassesProcessor implements CodeConstants {
- 
-   private final StructContext context;
-   private final Map<String, ClassNode> mapRootClasses = new HashMap<>();
-+  private final Set<String> whitelist = new HashSet<>();
- 
-   private static class Inner {
-     private String simpleName;
-@@ -61,6 +62,22 @@ public class ClassesProcessor implements CodeConstants {
-     this.context = context;
-   }
- 
-+  public void addWhitelist(String prefix) {
-+    this.whitelist.add(prefix);
-+  }
-+
-+  public boolean isWhitelisted(String cls) {
-+    if (this.whitelist.isEmpty())
-+      return true;
-+
-+    for (String prefix : this.whitelist) {
-+      if (cls.startsWith(prefix))
-+        return true;
-+    }
-+
-+    return false;
-+  }
-+
-   public void loadClasses(IIdentifierRenamer renamer) {
-     Map<String, Inner> mapInnerClasses = new HashMap<>();
-     Map<String, Set<String>> mapNestedClassReferences = new HashMap<>();
-@@ -160,9 +177,11 @@ public class ClassesProcessor implements CodeConstants {
-           }
-         }
- 
--        ClassNode node = new ClassNode(ClassNode.CLASS_ROOT, cl);
--        node.access = cl.getAccessFlags();
--        mapRootClasses.put(cl.qualifiedName, node);
-+        if (isWhitelisted(cl.qualifiedName)) {
-+          ClassNode node = new ClassNode(ClassNode.CLASS_ROOT, cl);
-+          node.access = cl.getAccessFlags();
-+          mapRootClasses.put(cl.qualifiedName, node);
-+        }
-       }
-       linkEnclosingMethods(cl);
-     }
-diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-index aa8b1132b84fc44bf6decd96ebaf5c021c185ac1..bc97cdaa10bcc5e99860241f0ee0ef8cfff8434e 100644
---- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
-+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-@@ -116,6 +116,10 @@ public class Fernflower implements IDecompiledData {
-     structContext.saveContext();
-   }
- 
-+  public void addWhitelist(String prefix) {
-+    classProcessor.addWhitelist(prefix);
-+  }
-+
-   public void clearContext() {
-     DecompilerContext.setCurrentContext(null);
-   }
-@@ -123,7 +127,7 @@ public class Fernflower implements IDecompiledData {
-   @Override
-   public String getClassEntryName(StructClass cl, String entryName) {
-     ClassNode node = classProcessor.getMapRootClasses().get(cl.qualifiedName);
--    if (node.type != ClassNode.CLASS_ROOT) {
-+    if (node == null || node.type != ClassNode.CLASS_ROOT) {
-       return null;
-     }
-     else if (converter != null) {
-diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
-index b44bf391a4914dcee3228cfbb3bbdfefec2f3527..e77afd845015501a743b091d3a3cc716497ffc75 100644
---- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
-+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
-@@ -66,6 +66,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
-     Map<String, Object> mapOptions = new HashMap<>();
-     List<File> sources = new ArrayList<>();
-     List<File> libraries = new ArrayList<>();
-+    Set<String> whitelist = new HashSet<>();
- 
-     boolean isOption = true;
-     for (int i = 0; i < args.length - 1; ++i) { // last parameter - destination
-@@ -88,6 +89,9 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
-         if (arg.startsWith("-e=")) {
-           addPath(libraries, arg.substring(3));
-         }
-+        else if (arg.startsWith("-only=")) {
-+          whitelist.add(arg.substring(6));
-+        }
-         else {
-           addPath(sources, arg);
-         }
-@@ -114,6 +118,9 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
-     for (File source : sources) {
-       decompiler.addSource(source);
-     }
-+    for (String prefix : whitelist) {
-+      decompiler.addWhitelist(prefix);
-+    }
- 
-     decompiler.decompileContext();
-   }
-@@ -151,6 +158,10 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
-     engine.addLibrary(library);
-   }
- 
-+  public void addWhitelist(String prefix) {
-+    engine.addWhitelist(prefix);
-+  }
-+
-   public void decompileContext() {
-     try {
-       engine.decompileContext();
diff --git a/FernFlower-Patches/0034-Hook-in-LVT-to-VarExprent-and-print-generic-types.patch b/FernFlower-Patches/0034-Hook-in-LVT-to-VarExprent-and-print-generic-types.patch
new file mode 100644
index 0000000..4b129ff
--- /dev/null
+++ b/FernFlower-Patches/0034-Hook-in-LVT-to-VarExprent-and-print-generic-types.patch
@@ -0,0 +1,288 @@
+From c45318da6da9d2d073e1979350e67042d03d4b81 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Fri, 14 Aug 2015 15:56:08 -0700
+Subject: [PATCH 034/122] Hook in LVT to VarExprent and print generic types.
+
+---
+ .../decompiler/main/rels/ClassWrapper.java    | 13 ++++++++--
+ .../modules/decompiler/ExprProcessor.java     |  7 ++++++
+ .../decompiler/exps/InvocationExprent.java    |  3 +++
+ .../modules/decompiler/exps/VarExprent.java   | 24 +++++++++++++++----
+ .../modules/decompiler/vars/LVTVariable.java  | 14 ++++++++---
+ .../decompiler/vars/LocalVariableTable.java   | 11 ++++-----
+ .../decompiler/vars/VarDefinitionHelper.java  | 10 ++++++++
+ .../modules/decompiler/vars/VarProcessor.java |  4 ++++
+ .../StructLocalVariableTableAttribute.java    |  4 ++--
+ 9 files changed, 73 insertions(+), 17 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+index 01b9292..c302cfc 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+@@ -81,6 +81,16 @@ public class ClassWrapper {
+ 
+       RootStatement root = null;
+ 
++      // if debug information present and should be used
++      if (DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_VAR_NAMES)) {
++        StructLocalVariableTableAttribute attr = (StructLocalVariableTableAttribute)mt.getAttributes().getWithKey(
++          StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
++
++        if (attr != null) {
++          varProc.setLVT(attr.getLVT());
++        }
++      }
++
+       boolean isError = false;
+ 
+       try {
+@@ -169,12 +179,11 @@ public class ClassWrapper {
+           StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
+ 
+         if (attr != null) {
+-          varProc.setLVT(attr.getLVT());
+           varProc.setDebugVarNames(attr.getMapVarNames());
+         }
+       }
+ 
+-      MethodProcessorRunnable.printMethod(root, mt.getClassStruct().qualifiedName+"."+mt.getName()+mt.getDescriptor(),varProc);
++      //MethodProcessorRunnable.printMethod(root, mt.getClassStruct().qualifiedName+"."+mt.getName()+mt.getDescriptor(),varProc);
+ 
+       DecompilerContext.getLogger().endMethod();
+     }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+index f33e438..0425fbc 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+@@ -38,6 +38,8 @@ import org.jetbrains.java.decompiler.struct.consts.PooledConstant;
+ import org.jetbrains.java.decompiler.struct.consts.PrimitiveConstant;
+ import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
+ import org.jetbrains.java.decompiler.struct.gen.VarType;
++import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
++import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
+ 
+ import java.util.*;
+ 
+@@ -725,6 +727,11 @@ public class ExprProcessor implements CodeConstants {
+       return "void";
+     }
+     else if (tp == CodeConstants.TYPE_OBJECT) {
++      //if (type.signatureDebugGens != null) {
++      //  GenericType gen = new GenericType(type.signatureDebugGens);
++      //  return GenericMain.getGenericCastTypeName(gen);
++      //}
++
+       String ret = buildJavaClassName(type.value);
+       if (getShort) {
+         ret = DecompilerContext.getImportCollector().getShortName(ret);
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+index 7cf83be..9d16de2 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+@@ -241,6 +241,9 @@ public class InvocationExprent extends Exprent {
+         if (super_qualifier != null) {
+           TextUtil.writeQualifiedSuper(buf, super_qualifier);
+         }
++        //else if (getExprType().equals(VarType.VARTYPE_OBJECT) && instance instanceof FunctionExprent && ((FunctionExprent)instance).getFuncType() == FunctionExprent.FUNCTION_CAST) {
++        //  buf.append(((FunctionExprent)instance).getLstOperands().get(0).toJava(indent, tracer));
++        //} // THis in theory removes casts that are not needed... ignore it for now.
+         else if (instance != null) {
+           TextBuffer res = instance.toJava(indent, tracer);
+ 
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+index 969a03e..6c973af 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+@@ -22,13 +22,15 @@ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.TextBuffer;
+ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.LVTVariable;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarTypeProcessor;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+ import org.jetbrains.java.decompiler.struct.gen.VarType;
++import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
++import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
+ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
+ import org.jetbrains.java.decompiler.struct.match.MatchNode;
+-import org.jetbrains.java.decompiler.struct.match.IMatchable.MatchProperties;
+ import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ 
+@@ -48,6 +50,7 @@ public class VarExprent extends Exprent {
+   private int version = 0;
+   private boolean classDef = false;
+   private boolean stack = false;
++  private LVTVariable lvt = null;
+ 
+   public VarExprent(int index, VarType varType, VarProcessor processor) {
+     super(EXPRENT_VAR);
+@@ -94,7 +97,10 @@ public class VarExprent extends Exprent {
+     }
+     else {
+       String name = null;
+-      if (processor != null) {
++      if (lvt != null) {
++        name = lvt.name;
++      }
++      else if (processor != null) {
+         name = processor.getVarName(new VarVersionPair(index, version));
+       }
+ 
+@@ -102,7 +108,12 @@ public class VarExprent extends Exprent {
+         if (processor != null && processor.getVarFinal(new VarVersionPair(index, version)) == VarTypeProcessor.VAR_EXPLICIT_FINAL) {
+           buffer.append("final ");
+         }
+-        buffer.append(ExprProcessor.getCastTypeName(getVarType())).append(" ");
++        if (lvt != null && lvt.getSig() != null) {
++          buffer.append(GenericMain.getGenericCastTypeName(new GenericType(lvt.getSig()))).append(" ");
++        }
++        else {
++          buffer.append(ExprProcessor.getCastTypeName(getVarType())).append(" ");
++        }
+       }
+       buffer.append(name == null ? ("var" + index + (version == 0 ? "" : "_" + version)) : name);
+     }
+@@ -136,6 +147,7 @@ public class VarExprent extends Exprent {
+ 
+   public VarType getVarType() {
+     VarType vt = null;
++
+     if (processor != null) {
+       vt = processor.getVarType(new VarVersionPair(index, version));
+     }
+@@ -217,9 +229,13 @@ public class VarExprent extends Exprent {
+     return true;
+   }
+ 
++  public void setLVT(LVTVariable lvt) {
++    this.lvt = lvt;
++  }
++
+   @Override
+   public String toString() {
+-    return "var_" + index + "_" + version;
++    return lvt != null ? lvt.name :  "var_" + index + "_" + version;
+   }
+ 
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
+index 13cfa70..dc7783c 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
+@@ -68,7 +68,15 @@ public class LVTVariable implements Comparable<LVTVariable> {
+     return 0;
+   }
+   @Override
+-    public String toString() {
+-        return "\'("+index+","+start+")"+desc+(sig!=null ? "<"+sig+"> ":" ")+name+"\'";
+-    }
++  public String toString() {
++    return "\'("+index+","+start+")"+desc+(sig!=null ? "<"+sig+"> ":" ")+name+"\'";
++  }
++
++  public String getDesc() {
++    return desc;
++  }
++
++  public String getSig() {
++    return sig;
++  }
+ }
+\ No newline at end of file
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+index e5fbec8..270def3 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+@@ -9,7 +9,7 @@ import java.util.Set;
+ public class LocalVariableTable {
+   private Map<Integer, Set<LVTVariable>> startpoints;
+   private ArrayList<LVTVariable> allLVT;
+-private Map<Integer, List<LVTVariable>> mapLVT;
++  private Map<Integer, List<LVTVariable>> mapLVT;
+ 
+   public LocalVariableTable(int len) {
+     startpoints = new HashMap<Integer,Set<LVTVariable>>(len);
+@@ -35,15 +35,14 @@ private Map<Integer, List<LVTVariable>> mapLVT;
+     mapLVT = null; // Invalidate the cache and rebuild it.
+   }
+ 
+-  public LVTVariable find(Integer index, List<Integer> offsets) {
++  public LVTVariable find(int index, List<Integer> offsets) {
+     for (Integer offset : offsets) {
+       Set<LVTVariable> lvs = startpoints.get(offset);
+       if (lvs == null || lvs.isEmpty())
+         continue;
+-      int idx = index.intValue();
+ 
+       for (LVTVariable lv : lvs) {
+-        if (lv.index == idx)
++        if (lv.index == index)
+           return lv;
+       }
+     }
+@@ -75,7 +74,7 @@ private Map<Integer, List<LVTVariable>> mapLVT;
+     }
+   }
+ 
+-public List<LVTVariable> getCandidates(int index) {
++  public List<LVTVariable> getCandidates(int index) {
+     return mapLVT.get(index);
+-}
++  }
+ }
+\ No newline at end of file
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index aa2ef6e..53201ed 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -185,6 +185,16 @@ public class VarDefinitionHelper {
+       // search for the first assignement to var [index]
+       int addindex = 0;
+       for (Exprent expr : lst) {
++        LVTVariable lvt = varproc.findLVT(index, first.getBasichead().getBlock().getInstrOldOffsets());
++        if (lvt != null) {
++          for (Exprent exp : expr.getAllExprents(true)) {
++            if (exp.type == Exprent.EXPRENT_VAR && ((VarExprent)exp).getIndex() == index) {
++              ((VarExprent)exp).setLVT(lvt);
++              break;
++            }
++          }
++        }
++
+         if (setDefinition(expr, index)) {
+           defset = true;
+           break;
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+index 0f530f9..0a619d0 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+@@ -160,6 +160,10 @@ public class VarProcessor {
+     return this.lvt;
+   }
+ 
++  public LVTVariable findLVT(int index, List<Integer> instructionOffsets) {
++    return this.lvt == null ? null : lvt.find(index, instructionOffsets);
++  }
++
+   public int getRemapped(int index) {
+     VarVersionPair res = varVersions.getMapOriginalVarIndices().get(index);
+     if (res == null) return index;
+diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+index a654359..771ec7a 100644
+--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
++++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+@@ -69,7 +69,7 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
+     return lvt == null ? EMPTY_LVT : lvt.getMapVarNames();
+   }
+ 
+-public LocalVariableTable getLVT() {
++  public LocalVariableTable getLVT() {
+     return lvt;
+-}
++  }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0035-Fix-local-variables-incorrectly-merging.patch b/FernFlower-Patches/0035-Fix-local-variables-incorrectly-merging.patch
deleted file mode 100644
index cef82b4..0000000
--- a/FernFlower-Patches/0035-Fix-local-variables-incorrectly-merging.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Mon, 15 Jun 2020 22:07:51 -0700
-Subject: [PATCH] Fix local variables incorrectly merging.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
-index 139ccdb55347a5d66627c1489ee73910fed46f05..388ead266fe10aa4c251d3b7c6207e20126e66b9 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
-@@ -602,7 +602,7 @@ public class StackVarsProcessor {
- 
-     for (Entry<Integer, Set<VarVersionPair>> ent : mapVars.entrySet()) {
-       FastSparseSet<Integer> liveverset = mapLiveVars.get(ent.getKey());
--      if (liveverset == null) {
-+      if (liveverset == null || liveverset.isEmpty()) {
-         return false;
-       }
- 
-@@ -611,13 +611,13 @@ public class StackVarsProcessor {
-         domset.add(ssuversions.nodes.getWithKey(verpaar));
-       }
- 
--      boolean isdom = false;
-+      boolean isdom = true;
- 
-       for (Integer livever : liveverset) {
-         VarVersionNode node = ssuversions.nodes.getWithKey(new VarVersionPair(ent.getKey().intValue(), livever.intValue()));
- 
--        if (ssuversions.isDominatorSet(node, domset)) {
--          isdom = true;
-+        if (!ssuversions.isDominatorSet(node, domset)) {
-+          isdom = false;
-           break;
-         }
-       }
diff --git a/FernFlower-Patches/0035-Make-Loop-Enhancement-retain-all-bytecode-data.-And-.patch b/FernFlower-Patches/0035-Make-Loop-Enhancement-retain-all-bytecode-data.-And-.patch
new file mode 100644
index 0000000..0afa242
--- /dev/null
+++ b/FernFlower-Patches/0035-Make-Loop-Enhancement-retain-all-bytecode-data.-And-.patch
@@ -0,0 +1,274 @@
+From fff1261eeb1e19a8f57fea9b1a81bce7894f9aef Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Tue, 25 Aug 2015 12:03:36 -0700
+Subject: [PATCH 035/122] Make Loop Enhancement retain all bytecode data. And
+ support iterator/listIterator.
+
+---
+ .../modules/decompiler/MergeHelper.java       | 147 ++++++++++++++----
+ 1 file changed, 115 insertions(+), 32 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+index d994c26..3172b5e 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+@@ -118,6 +118,10 @@ public class MergeHelper {
+           if (ifedge.getType() == StatEdge.TYPE_BREAK) {
+             ifexpr.negateIf();
+           }
++          if (stat.getConditionExprent() != null) {
++            ifexpr.getCondition().addBytecodeOffsets(stat.getConditionExprent().bytecode);
++          }
++          ifexpr.getCondition().addBytecodeOffsets(lastif.getHeadexprent().bytecode);
+           stat.setConditionExprent(ifexpr.getCondition());
+           lastif.getFirst().removeSuccessor(ifedge);
+           lastif.removeSuccessor(elseedge);
+@@ -175,6 +179,10 @@ public class MergeHelper {
+               // negate condition (while header)
+               IfExprent ifexpr = (IfExprent)firstif.getHeadexprent().copy();
+               ifexpr.negateIf();
++              if (stat.getConditionExprent() != null) {
++                ifexpr.getCondition().addBytecodeOffsets(stat.getConditionExprent().bytecode);
++              }
++              ifexpr.getCondition().addBytecodeOffsets(firstif.getHeadexprent().bytecode);
+               stat.setConditionExprent(ifexpr.getCondition());
+ 
+               // remove edges
+@@ -213,7 +221,12 @@ public class MergeHelper {
+               stat.setLooptype(DoStatement.LOOP_WHILE);
+ 
+               // no need to negate the while condition
+-              stat.setConditionExprent(((IfExprent)firstif.getHeadexprent().copy()).getCondition());
++              IfExprent ifexpr = (IfExprent)firstif.getHeadexprent().copy();
++              if (stat.getConditionExprent() != null) {
++                ifexpr.getCondition().addBytecodeOffsets(stat.getConditionExprent().bytecode);
++              }
++              ifexpr.getCondition().addBytecodeOffsets(firstif.getHeadexprent().bytecode);
++              stat.setConditionExprent(ifexpr.getCondition());
+ 
+               // remove edges
+               StatEdge ifedge = firstif.getIfEdge();
+@@ -369,9 +382,17 @@ public class MergeHelper {
+ 
+       stat.setLooptype(DoStatement.LOOP_FOR);
+       if (hasinit) {
+-        stat.setInitExprent(preData.getExprents().remove(preData.getExprents().size() - 1));
++        Exprent exp = preData.getExprents().remove(preData.getExprents().size() - 1);
++        if (stat.getInitExprent() != null) {
++          exp.addBytecodeOffsets(stat.getInitExprent().bytecode);
++        }
++        stat.setInitExprent(exp);
+       }
+-      stat.setIncExprent(lastData.getExprents().remove(lastData.getExprents().size() - 1));
++      Exprent exp = lastData.getExprents().remove(lastData.getExprents().size() - 1);
++      if (stat.getIncExprent() != null) {
++        exp.addBytecodeOffsets(stat.getIncExprent().bytecode);
++      }
++      stat.setIncExprent(exp);
+     }
+ 
+     cleanEmptyStatements(stat, lastData);
+@@ -425,20 +446,29 @@ public class MergeHelper {
+ 
+     if (stat.getLooptype() == DoStatement.LOOP_WHILE && initDoExprent != null && firstDoExprent != null) {
+       if (initDoExprent.type == Exprent.EXPRENT_ASSIGNMENT &&
+-          isInvoke(((AssignmentExprent)initDoExprent).getRight(), null, "iterator", "()Ljava/util/Iterator;")) {
++          isIteratorCall(((AssignmentExprent)initDoExprent).getRight())) {
+ 
+-        if (!isInvoke(drillNots(stat.getConditionExprent()), "java/util/Iterator", "hasNext", "()Z") ||
++        if (!isHasNextCall(drillNots(stat.getConditionExprent())) ||
+             firstDoExprent.type != Exprent.EXPRENT_ASSIGNMENT) {
+           return false;
+         }
+ 
+         AssignmentExprent ass = (AssignmentExprent)firstDoExprent;
+-        if (!isInvoke(ass.getRight(), "java/util/Iterator", "next", "()Ljava/lang/Object;") ||
+-            ass.getLeft().type != Exprent.EXPRENT_VAR) {
++        if (!isNextCall(ass.getRight()) || ass.getLeft().type != Exprent.EXPRENT_VAR) {
+           return false;
+         }
+ 
+         InvocationExprent holder = (InvocationExprent)((AssignmentExprent)initDoExprent).getRight();
++
++        holder.getInstance().addBytecodeOffsets(initDoExprent.bytecode);
++        ass.getLeft().addBytecodeOffsets(firstDoExprent.bytecode);
++        if (stat.getIncExprent() != null) {
++          holder.getInstance().addBytecodeOffsets(stat.getIncExprent().bytecode);
++        }
++        if (stat.getInitExprent() != null) {
++          ass.getLeft().addBytecodeOffsets(stat.getInitExprent().bytecode);
++        }
++
+         stat.setLooptype(DoStatement.LOOP_FOREACH);
+         stat.setInitExprent(ass.getLeft());
+         stat.setIncExprent(holder.getInstance());
+@@ -448,24 +478,48 @@ public class MergeHelper {
+     }
+     else if (stat.getLooptype() == DoStatement.LOOP_FOR) {
+       if (isType(stat.getInitExprent(), Exprent.EXPRENT_ASSIGNMENT) &&
+-          isInvoke(((AssignmentExprent)stat.getInitExprent()).getRight(), null, "iterator", "()Ljava/util/Iterator;") &&
++          isIteratorCall(((AssignmentExprent)stat.getInitExprent()).getRight()) &&
+           isType(stat.getConditionExprent(), Exprent.EXPRENT_FUNCTION)) {
+ 
+-        if (!isInvoke(drillNots(stat.getConditionExprent()), "java/util/Iterator", "hasNext", "()Z") ||
++        Exprent exp = drillNots(stat.getConditionExprent());
++        if (!isHasNextCall(exp) ||
+             !isType(stat.getIncExprent(), Exprent.EXPRENT_ASSIGNMENT)) {
+           return false;
+         }
+ 
+         AssignmentExprent ass = (AssignmentExprent)stat.getIncExprent();
+-        if (!isInvoke(ass.getRight(), "java/util/Iterator", "next", "()Ljava/lang/Object;") ||
+-            ass.getLeft().type != Exprent.EXPRENT_VAR) {
+-          return false;
++        if (!isNextCall(ass.getRight()) || ass.getLeft().type != Exprent.EXPRENT_VAR) {
++
++          if (firstDoExprent == null || !isNextCall(firstDoExprent.getRight()) ||
++              firstDoExprent.getLeft().type != Exprent.EXPRENT_VAR) {
++            return false;
++          }
++
++          //Move the inc exprent back to the end of the body and remove the .next call
++          Statement last = getLastDirectData(stat.getFirst());
++          InvocationExprent holder = (InvocationExprent)getUncast(((AssignmentExprent)stat.getInitExprent()).getRight());
++
++          firstData.getExprents().remove(firstDoExprent);
++          last.getExprents().add(stat.getIncExprent());
++
++          firstDoExprent.getLeft().addBytecodeOffsets(stat.getInitExprent().bytecode);
++          firstDoExprent.getLeft().addBytecodeOffsets(stat.getIncExprent().bytecode);
++          firstDoExprent.getLeft().addBytecodeOffsets(firstDoExprent.bytecode);
++
++          stat.setLooptype(DoStatement.LOOP_FOREACH);
++          stat.setInitExprent(firstDoExprent.getLeft());
++          stat.setIncExprent(holder.getInstance());
+         }
++        else {
++          InvocationExprent holder = (InvocationExprent)getUncast(((AssignmentExprent)stat.getInitExprent()).getRight());
+ 
+-        InvocationExprent holder = (InvocationExprent)((AssignmentExprent)stat.getInitExprent()).getRight();
+-        stat.setLooptype(DoStatement.LOOP_FOREACH);
+-        stat.setInitExprent(ass.getLeft());
+-        stat.setIncExprent(holder.getInstance());
++          holder.getInstance().addBytecodeOffsets(stat.getInitExprent().bytecode);
++          ass.getLeft().addBytecodeOffsets(stat.getIncExprent().bytecode);
++
++          stat.setLooptype(DoStatement.LOOP_FOREACH);
++          stat.setInitExprent(ass.getLeft());
++          stat.setIncExprent(holder.getInstance());
++        }
+       }
+       else if (initDoExprent != null && initDoExprent.getRight().type == Exprent.EXPRENT_FUNCTION) {
+         if (firstDoExprent == null ||
+@@ -496,23 +550,31 @@ public class MergeHelper {
+           return false;
+         }
+ 
++        funcRight.getLstOperands().get(0).addBytecodeOffsets(initDoExprent.bytecode);
++        funcRight.getLstOperands().get(0).addBytecodeOffsets(stat.getIncExprent().bytecode);
++        firstDoExprent.getLeft().addBytecodeOffsets(firstDoExprent.bytecode);
++        firstDoExprent.getLeft().addBytecodeOffsets(stat.getInitExprent().bytecode);
++
+         stat.setLooptype(DoStatement.LOOP_FOREACH);
+         stat.setInitExprent(firstDoExprent.getLeft());
+         stat.setIncExprent(funcRight.getLstOperands().get(0));
+         preData.getExprents().remove(initDoExprent);
+         firstData.getExprents().remove(firstDoExprent);
+ 
++
+         if (initCopyExprent != null && initCopyExprent.getLeft().type == Exprent.EXPRENT_VAR) {
+           VarExprent copy = (VarExprent)initCopyExprent.getLeft();
+           if (copy.getIndex() == array.getIndex() && copy.getVersion() == array.getVersion()) {
+             preData.getExprents().remove(initCopyExprent);
++            initCopyExprent.getRight().addBytecodeOffsets(initCopyExprent.bytecode);
++            initCopyExprent.getRight().addBytecodeOffsets(stat.getIncExprent().bytecode);
+             stat.setIncExprent(initCopyExprent.getRight());
+           }
+         }
+       }
+     }
+ 
+-    cleanEmptyStatements(stat, firstData);
++    //cleanEmptyStatements(stat, firstData); //TODO: Look into this and see what it does...
+ 
+     return true;
+   }
+@@ -520,8 +582,8 @@ public class MergeHelper {
+   private static boolean isType(Exprent exp, int type) { //This is just a helper macro, Wish java had real macros.
+     return exp != null && exp.type == type;
+   }
+-
+   private static boolean isInvoke(Exprent exp, String cls, String method, String desc) {
++    exp = getUncast(exp);
+     if (!isType(exp,  Exprent.EXPRENT_INVOCATION)) {
+       return false;
+     }
+@@ -591,15 +653,13 @@ public class MergeHelper {
+       return stat;
+     }
+ 
+-    switch (stat.type) {
+-      case Statement.TYPE_SEQUENCE:
+-        for (int i = stat.getStats().size() - 1; i >= 0; i--) {
+-          Statement tmp = getLastDirectData(stat.getStats().get(i));
+-          if (tmp == null || !tmp.getExprents().isEmpty()) {
+-            return tmp;
+-          }
+-        }
++    for (int i = stat.getStats().size() - 1; i >= 0; i--) {
++      Statement tmp = getLastDirectData(stat.getStats().get(i));
++      if (tmp == null || !tmp.getExprents().isEmpty()) {
++        return tmp;
++      }
+     }
++
+     return null;
+   }
+ 
+@@ -608,14 +668,37 @@ public class MergeHelper {
+       return stat;
+     }
+ 
+-    if (stat.type == Statement.TYPE_SEQUENCE) {
+-      for (Statement tmp : stat.getStats()) {
+-        Statement ret = getFirstDirectData(tmp);
+-        if (ret != null) {
+-          return ret;
+-        }
++    for (Statement tmp : stat.getStats()) {
++      Statement ret = getFirstDirectData(tmp);
++      if (ret != null) {
++        return ret;
+       }
+     }
+     return null;
+   }
++
++  private static Exprent getUncast(Exprent exp) {
++    if (exp.type == Exprent.EXPRENT_FUNCTION) {
++      FunctionExprent func = (FunctionExprent)exp;
++      if (func.getFuncType() == FunctionExprent.FUNCTION_CAST) {
++        return getUncast(func.getLstOperands().get(0));
++      }
++    }
++    return exp;
++  }
++
++  private static boolean isIteratorCall(Exprent exp) {
++    return isInvoke(exp, null, "iterator",     "()Ljava/util/Iterator;"    ) ||
++           isInvoke(exp, null, "listIterator", "()Ljava/util/ListIterator;");
++  }
++
++  private static boolean isHasNextCall(Exprent exp) {
++    return isInvoke(exp, "java/util/Iterator",     "hasNext", "()Z") ||
++           isInvoke(exp, "java/util/ListIterator", "hasNext", "()Z");
++  }
++
++  private static boolean isNextCall(Exprent exp) {
++    return isInvoke(exp, "java/util/Iterator",     "next", "()Ljava/lang/Object;") ||
++           isInvoke(exp, "java/util/ListIterator", "next", "()Ljava/lang/Object;");
++  }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0036-Add-step-to-VarDefintionHelper-that-splits-variables.patch b/FernFlower-Patches/0036-Add-step-to-VarDefintionHelper-that-splits-variables.patch
new file mode 100644
index 0000000..584ee1a
--- /dev/null
+++ b/FernFlower-Patches/0036-Add-step-to-VarDefintionHelper-that-splits-variables.patch
@@ -0,0 +1,501 @@
+From 5d42ed490c525d168d6d2f9d727610aa6262237c Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Tue, 25 Aug 2015 12:05:24 -0700
+Subject: [PATCH 036/122] Add step to VarDefintionHelper that splits variables
+ out as best it can. For now ForEach loops are forced to seperate variables.
+ Also attempt to attach LVT information EVERY VarExprent in the method not
+ just in head.
+
+---
+ .../main/rels/MethodProcessorRunnable.java    |   2 +-
+ .../modules/decompiler/exps/Exprent.java      |   1 -
+ .../sforms/FlattenStatementsHelper.java       |   4 +-
+ .../decompiler/vars/LocalVariableTable.java   |  64 ++++-
+ .../decompiler/vars/VarDefinitionHelper.java  | 248 +++++++++++++++++-
+ .../modules/decompiler/vars/VarProcessor.java |  11 +-
+ 6 files changed, 304 insertions(+), 26 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+index 9542a80..54a77e1 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+@@ -243,7 +243,7 @@ public class MethodProcessorRunnable implements Runnable {
+     System.out.println("}");
+   }
+ 
+-  private static void getOffset(Statement st, BitSet values) {
++  public static void getOffset(Statement st, BitSet values) {
+     if (st instanceof DummyExitStatement && ((DummyExitStatement)st).bytecode != null)
+       values.or(((DummyExitStatement)st).bytecode);
+     if (st.getExprents() != null) {
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+index db839fe..ca9c1ed 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+@@ -17,7 +17,6 @@ package org.jetbrains.java.decompiler.modules.decompiler.exps;
+ 
+ import java.util.ArrayList;
+ import java.util.BitSet;
+-import java.util.Collection;
+ import java.util.Collections;
+ import java.util.Comparator;
+ import java.util.HashSet;
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
+index d88480e..abc0f67 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
+@@ -227,7 +227,9 @@ public class FlattenStatementsHelper {
+                 graph.nodes.putWithKey(nodeinit, nodeinit.id);
+ 
+                 DirectNode nodecond = new DirectNode(DirectNode.NODE_CONDITION, stat, stat.id + "_cond");
+-                nodecond.exprents = (stat.type == DoStatement.LOOP_FOREACH ? null : dostat.getConditionExprentList());
++                if (looptype != DoStatement.LOOP_FOREACH) {
++                  nodecond.exprents = dostat.getConditionExprentList();
++                }
+                 graph.nodes.putWithKey(nodecond, nodecond.id);
+ 
+                 DirectNode nodeinc = new DirectNode(DirectNode.NODE_INCREMENT, stat, stat.id + "_inc");
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+index 270def3..cd56bac 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+@@ -1,11 +1,16 @@
+ package org.jetbrains.java.decompiler.modules.decompiler.vars;
+ 
+ import java.util.ArrayList;
++import java.util.BitSet;
+ import java.util.HashMap;
+ import java.util.List;
+ import java.util.Map;
++import java.util.Map.Entry;
+ import java.util.Set;
+ 
++import org.jetbrains.java.decompiler.main.rels.MethodProcessorRunnable;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
++
+ public class LocalVariableTable {
+   private Map<Integer, Set<LVTVariable>> startpoints;
+   private ArrayList<LVTVariable> allLVT;
+@@ -35,15 +40,20 @@ public class LocalVariableTable {
+     mapLVT = null; // Invalidate the cache and rebuild it.
+   }
+ 
+-  public LVTVariable find(int index, List<Integer> offsets) {
+-    for (Integer offset : offsets) {
+-      Set<LVTVariable> lvs = startpoints.get(offset);
+-      if (lvs == null || lvs.isEmpty())
+-        continue;
++  public LVTVariable find(int index, Statement stat) {
++    BitSet values = new BitSet();
++    MethodProcessorRunnable.getOffset(stat, values);
++    int start = values.nextSetBit(0);
++    int end = values.length()-1;
++    //System.out.println(indent + stat.getClass().getSimpleName() + " (" + start +", " + end + ")");
+ 
+-      for (LVTVariable lv : lvs) {
+-        if (lv.index == index)
+-          return lv;
++    Map<Integer, List<LVTVariable>> map = getMapVarNames();
++    if (!map.containsKey(index)) {
++      return null;
++    }
++    for (LVTVariable lvt : map.get(index)) {
++      if (lvt.start >= start && lvt.end <= end) {
++        return lvt;
+       }
+     }
+     return null;
+@@ -75,6 +85,42 @@ public class LocalVariableTable {
+   }
+ 
+   public List<LVTVariable> getCandidates(int index) {
+-    return mapLVT.get(index);
++    return getMapVarNames().get(index);
++  }
++
++  public List<LVTVariable> getVars(int index, int start, int end) {
++    if (!getMapVarNames().containsKey(index)) {
++      return null;
++    }
++
++    List<LVTVariable> ret = new ArrayList<LVTVariable>();
++    for (LVTVariable lvt : getMapVarNames().get(index)) {
++      if (lvt.start >= start && lvt.end <= end) {
++        ret.add(lvt);
++      }
++    }
++
++    return ret;
++  }
++
++  public Map<Integer, LVTVariable> getVars(Statement stat) {
++    BitSet values = new BitSet();
++    MethodProcessorRunnable.getOffset(stat, values);
++    int start = values.nextSetBit(0);
++    int end = values.length()-1;
++    //System.out.println(indent + stat.getClass().getSimpleName() + " (" + start +", " + end + ")");
++
++    Map<Integer, LVTVariable> ret = new HashMap<Integer, LVTVariable>();
++    for (Entry<Integer, List<LVTVariable>> entry : getMapVarNames().entrySet()) {
++      for (LVTVariable lvt : entry.getValue()) {
++        if (lvt.start >= start && lvt.end <= end) {
++          if (ret.containsKey(entry.getKey())) {
++            System.out.println("DUPLICATE INDEX WHAT THE FUCK: " + entry.getKey());
++          }
++          ret.put(entry.getKey(), lvt);
++        }
++      }
++    }
++    return ret;
+   }
+ }
+\ No newline at end of file
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index 53201ed..1e1a4a7 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -17,7 +17,9 @@ package org.jetbrains.java.decompiler.modules.decompiler.vars;
+ 
+ import org.jetbrains.java.decompiler.code.CodeConstants;
+ import org.jetbrains.java.decompiler.main.DecompilerContext;
++import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
+ import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
++import org.jetbrains.java.decompiler.main.rels.MethodProcessorRunnable;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
+@@ -43,6 +45,8 @@ public class VarDefinitionHelper {
+ 
+   private final VarProcessor varproc;
+ 
++  private final CounterContainer counters = DecompilerContext.getCounterContainer();
++
+   public VarDefinitionHelper(Statement root, StructMethod mt, VarProcessor varproc) {
+ 
+     mapVarDefStatements = new HashMap<Integer, Statement>();
+@@ -91,6 +95,8 @@ public class VarDefinitionHelper {
+       vc.addName("this");
+     }
+ 
++    splitVaribles(root, "");
++
+     // catch variables are implicitly defined
+     LinkedList<Statement> stack = new LinkedList<Statement>();
+     stack.add(root);
+@@ -120,7 +126,6 @@ public class VarDefinitionHelper {
+     initStatement(root);
+   }
+ 
+-
+   public void setVarDefinitions() {
+ 
+     VarNamesCollector vc = DecompilerContext.getVarNamesCollector();
+@@ -129,6 +134,8 @@ public class VarDefinitionHelper {
+       Statement stat = en.getValue();
+       Integer index = en.getKey();
+ 
++      setupLVTs(stat);
++
+       if (implDefVars.contains(index)) {
+         // already implicitly defined
+         continue;
+@@ -165,7 +172,6 @@ public class VarDefinitionHelper {
+         }
+       }
+ 
+-
+       Statement first = findFirstBlock(stat, index);
+ 
+       List<Exprent> lst;
+@@ -179,21 +185,11 @@ public class VarDefinitionHelper {
+         lst = first.getExprents();
+       }
+ 
+-
+       boolean defset = false;
+ 
+       // search for the first assignement to var [index]
+       int addindex = 0;
+       for (Exprent expr : lst) {
+-        LVTVariable lvt = varproc.findLVT(index, first.getBasichead().getBlock().getInstrOldOffsets());
+-        if (lvt != null) {
+-          for (Exprent exp : expr.getAllExprents(true)) {
+-            if (exp.type == Exprent.EXPRENT_VAR && ((VarExprent)exp).getIndex() == index) {
+-              ((VarExprent)exp).setLVT(lvt);
+-              break;
+-            }
+-          }
+-        }
+ 
+         if (setDefinition(expr, index)) {
+           defset = true;
+@@ -218,6 +214,21 @@ public class VarDefinitionHelper {
+         VarExprent var = new VarExprent(index.intValue(), varproc.getVarType(new VarVersionPair(index.intValue(), 0)), varproc);
+         var.setDefinition(true);
+ 
++        if (varproc.getLVT() != null) {
++          BitSet values = new BitSet();
++          MethodProcessorRunnable.getOffset(stat, values);
++          int start = values.nextSetBit(0);
++          int end = values.length()-1;
++          List<LVTVariable> vars = varproc.getLVT().getVars(index, start, end);
++          if (vars != null) {
++            if (vars.size() == 1) {
++              var.setLVT(vars.get(0));
++            }
++            // ToDo: If this is >1 then we need to decrease the scope of these variables.
++            //if this is = 0 and we have lvts for this... then we need to expand the scope...
++          }
++        }
++
+         lst.add(addindex, var);
+       }
+     }
+@@ -372,4 +383,217 @@ public class VarDefinitionHelper {
+     }
+     return false;
+   }
++
++  //We merge variables together earlier to make ++ and -- work, we need to now
++  // split them using the LVT data and full method structure into separate versions.
++  // this also allows us to re-index/version variables that were not done
++  // before such as exceptions.
++  // Return value of referenced variables
++  //  The boolean is 'isAssignment', true if first reference is assignment, false if just reference.
++  private Map<VarVersionPair, Boolean> splitVaribles(Statement stat, String indent) {
++    Map<VarVersionPair, Boolean> vars = new HashMap<VarVersionPair, Boolean>();
++
++    //BitSet values = new BitSet();
++    //MethodProcessorRunnable.getOffset(stat, values);
++    //int start = values.nextSetBit(0);
++    //int end = values.length()-1;
++    //System.out.println(indent + stat.getClass().getSimpleName() + " (" + start +", " + end + ")");
++
++    if (stat.type == Statement.TYPE_DO) {
++      DoStatement dost = (DoStatement)stat;
++      if (dost.getLooptype() == DoStatement.LOOP_FOREACH) {
++        vars.put(new VarVersionPair((VarExprent)dost.getInitExprent()), true);
++        splitExprent(dost.getIncExprent(), vars, indent);
++      }
++      else if (dost.getLooptype() == DoStatement.LOOP_FOR) {
++        splitExprent(dost.getInitExprent(), vars, indent);
++        splitExprent(dost.getConditionExprent(), vars, indent);
++        splitExprent(dost.getIncExprent(), vars, indent);
++      }
++      else if (dost.getLooptype() == DoStatement.LOOP_WHILE) {
++        splitExprent(dost.getConditionExprent(), vars, indent);
++      }
++    }
++
++    if (stat.getExprents() == null) {
++      List<Statement> stats = stat.getStats();
++      List<Map<VarVersionPair, Boolean>> stat_vars = new ArrayList<Map<VarVersionPair, Boolean>>(stats.size());
++
++      for (Statement st : stats) {
++        stat_vars.add(splitVaribles(st, "  " + indent));
++      }
++
++      for (int x = 0; x < stats.size(); x++) {
++        switch (stats.get(x).type) {
++          case Statement.TYPE_DO: {
++            DoStatement dost = (DoStatement)stats.get(x);
++            VarVersionPair init = extractVar(dost.getInitExprent());
++            if (init != null && (dost.getLooptype() == DoStatement.LOOP_FOR || dost.getLooptype()== DoStatement.LOOP_FOREACH)) {
++              if (safeToRename(init, stats, stat_vars, x)) {
++                VarVersionPair newIndex = new VarVersionPair(counters.getCounterAndIncrement(CounterContainer.VAR_COUNTER), 0);
++                remapVar(init, newIndex, stats.get(x), stat_vars.get(x));
++              }
++            }
++            break;
++          }
++        }
++      }
++
++      for (Map<VarVersionPair, Boolean> var : stat_vars) {
++        for (Entry<VarVersionPair, Boolean> entry : var.entrySet()) {
++          if (!vars.containsKey(entry.getKey())) {
++            vars.put(entry.getKey(), entry.getValue());
++          }
++        }
++      }
++    }
++    else {
++      for (Exprent e : stat.getExprents()) {
++        splitExprent(e, vars, indent);
++      }
++    }
++
++    if (stat.type == Statement.TYPE_DO) {
++      DoStatement dost = (DoStatement)stat;
++      if (dost.getLooptype() == DoStatement.LOOP_DOWHILE) {
++        splitExprent(dost.getConditionExprent(), vars, indent);
++      }
++    }
++
++    //for (Map.Entry<VarVersionPair, Boolean> entry : vars.entrySet()) {
++    //  System.out.println(indent + "  " + (entry.getValue() ? "ass " : "ref ") + entry.getKey());
++    //}
++
++    return vars;
++  }
++
++  private static void splitExprent(Exprent e, Map<VarVersionPair, Boolean> map, String indent) {
++    if (e == null)
++      return;
++    if (e.type == Exprent.EXPRENT_ASSIGNMENT && ((AssignmentExprent)e).getLeft().type == Exprent.EXPRENT_VAR) {
++      VarVersionPair var = new VarVersionPair((VarExprent)((AssignmentExprent)e).getLeft());
++      if (!map.containsKey(var)) {
++        map.put(var, true);
++      }
++      splitExprent(((AssignmentExprent)e).getRight(), map, indent);
++    }
++    else {
++      for (VarVersionPair var : e.getAllVariables()) {
++        if (!map.containsKey(var)) {
++          map.put(var, false);
++        }
++      }
++    }
++  }
++
++  private static VarVersionPair extractVar(Exprent exp) {
++    if (exp == null) {
++      return null;
++    }
++    if (exp.type == Exprent.EXPRENT_ASSIGNMENT && ((AssignmentExprent)exp).getLeft().type == Exprent.EXPRENT_VAR) {
++      return new VarVersionPair((VarExprent)((AssignmentExprent)exp).getLeft());
++    }
++    else if (exp.type == Exprent.EXPRENT_VAR) {
++      return new VarVersionPair((VarExprent)exp);
++    }
++    return null;
++  }
++
++  private static boolean safeToRename(VarVersionPair var, List<Statement> stats, List<Map<VarVersionPair, Boolean>> list, int index) {
++    for (int x = index + 1; x < list.size(); x++) {
++      Map<VarVersionPair, Boolean> map = list.get(x);
++      if (map.containsKey(var)) {
++        return map.get(var);
++      }
++    }
++    return false;
++  }
++
++  private void remapVar(VarVersionPair from, VarVersionPair to, Statement stat, Map<VarVersionPair, Boolean> stats) {
++    remapVar(from, to, stat);
++    varproc.copyVarInfo(from, to);
++    stats.put(to, true);
++    stats.remove(from);
++  }
++
++  private static void remapVar(VarVersionPair from, VarVersionPair to, Statement stat) {
++    if (stat == null) {
++      return;
++    }
++    if (stat.getExprents() == null) {
++      for (Object obj : stat.getSequentialObjects()) {
++        if (obj instanceof Statement) {
++          remapVar(from, to, (Statement)obj);
++        }
++        else if (obj instanceof Exprent) {
++          remapVar(from, to, (Exprent)obj);
++        }
++      }
++    }
++    else {
++      for (Exprent exp : stat.getExprents()) {
++        remapVar(from, to, exp);
++      }
++    }
++  }
++
++  private static void remapVar(VarVersionPair from, VarVersionPair to, Exprent exprent) {
++    if (exprent == null) {
++      return;
++    }
++    List<Exprent> lst = exprent.getAllExprents(true);
++    lst.add(exprent);
++
++    for (Exprent expr : lst) {
++      if (expr.type == Exprent.EXPRENT_VAR) {
++        VarExprent var = (VarExprent)expr;
++        if (var.getIndex() == from.var && var.getVersion() == from.version) {
++          var.setIndex(to.var);
++          var.setVersion(to.version);
++        }
++      }
++    }
++  }
++
++  private void setupLVTs(Statement stat) {
++    if (stat == null || varproc.getLVT() != null) {
++      return;
++    }
++
++    Map<Integer, LVTVariable> vars = varproc.getLVT().getVars(stat);
++    if (stat.getExprents() == null) {
++      for (Object obj : stat.getSequentialObjects()) {
++        if (obj instanceof Statement) {
++          setupLVTs((Statement)obj);
++        }
++        else if (obj instanceof Exprent) {
++          setupLVTs((Exprent)obj, vars);
++        }
++      }
++    }
++    else {
++      for (Exprent exp : stat.getExprents()) {
++        setupLVTs(exp, vars);
++      }
++    }
++  }
++
++  private void setupLVTs(Exprent exprent, Map<Integer, LVTVariable> lvts) {
++    if (exprent == null) {
++      return;
++    }
++    List<Exprent> lst = exprent.getAllExprents(true);
++    lst.add(exprent);
++
++    for (Exprent expr : lst) {
++      if (expr.type == Exprent.EXPRENT_VAR) {
++        VarExprent var = (VarExprent)expr;
++        int index = varproc.getRemapped(var.getIndex());
++        LVTVariable lvt = lvts.get(index);
++        if (lvt != null) {
++          var.setLVT(lvt);
++        }
++      }
++    }
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+index 0a619d0..a8ad019 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+@@ -160,8 +160,8 @@ public class VarProcessor {
+     return this.lvt;
+   }
+ 
+-  public LVTVariable findLVT(int index, List<Integer> instructionOffsets) {
+-    return this.lvt == null ? null : lvt.find(index, instructionOffsets);
++  public LVTVariable findLVT(int index, Statement stat) {
++    return this.lvt == null ? null : lvt.find(index, stat);
+   }
+ 
+   public int getRemapped(int index) {
+@@ -169,4 +169,11 @@ public class VarProcessor {
+     if (res == null) return index;
+     return res.var;
+   }
++
++  public void copyVarInfo(VarVersionPair from, VarVersionPair to) {
++    setVarName(to, getVarName(from));
++    setVarFinal(to, getVarFinal(from));
++    setVarType(to, getVarType(from));
++    varVersions.getMapOriginalVarIndices().put(to.var, varVersions.getMapOriginalVarIndices().get(from.var));
++  }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0036-Do-not-rebuild-variable-names-in-lambdas.patch b/FernFlower-Patches/0036-Do-not-rebuild-variable-names-in-lambdas.patch
deleted file mode 100644
index ac30e63..0000000
--- a/FernFlower-Patches/0036-Do-not-rebuild-variable-names-in-lambdas.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Wed, 17 Jun 2020 11:07:09 -0700
-Subject: [PATCH] Do not rebuild variable names in lambdas.
-
-Breaks outer this references. Code existed before my time, no idea what it's intention is.
-
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 95db638383c843bf01df05daf2d94240cfe5ebc8..1518aae1cf006454e11471b52c54267991b65596 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-@@ -163,7 +163,7 @@ public class NestedClassProcessor {
-     Set<String> setNewOuterNames = new HashSet<>(mapNewNames.values());
-     setNewOuterNames.removeAll(method.setOuterVarNames);
- 
--    method.varproc.refreshVarNames(new VarNamesCollector(setNewOuterNames));
-+    //method.varproc.refreshVarNames(new VarNamesCollector(setNewOuterNames));
-     method.setOuterVarNames.addAll(setNewOuterNames);
- 
-     for (Entry<VarVersionPair, String> entry : mapNewNames.entrySet()) {
diff --git a/FernFlower-Patches/0037-Add-toString-to-MethodDescriptor.patch b/FernFlower-Patches/0037-Add-toString-to-MethodDescriptor.patch
deleted file mode 100644
index 305ca18..0000000
--- a/FernFlower-Patches/0037-Add-toString-to-MethodDescriptor.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Wed, 17 Jun 2020 11:08:27 -0700
-Subject: [PATCH] Add toString to MethodDescriptor
-
-
-diff --git a/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
-index 2096754661e845cfe3148d47c5c3ff914bcb0322..c033ae3122302a16f760df24110ab3dd07e39852 100644
---- a/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
-+++ b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
-@@ -19,11 +19,13 @@ import java.util.Objects;
- public final class MethodDescriptor {
-   public final VarType[] params;
-   public final VarType ret;
-+  private final String descriptor;
-   public GenericMethodDescriptor genericInfo;
- 
--  private MethodDescriptor(VarType[] params, VarType ret) {
-+  private MethodDescriptor(VarType[] params, VarType ret, String descriptor) {
-     this.params = params;
-     this.ret = ret;
-+    this.descriptor = descriptor;
-   }
- 
-   public static MethodDescriptor parseDescriptor(String descriptor) {
-@@ -71,7 +73,7 @@ public final class MethodDescriptor {
- 
-     VarType ret = new VarType(descriptor.substring(parenth + 1));
- 
--    return new MethodDescriptor(params, ret);
-+    return new MethodDescriptor(params, ret, descriptor);
-   }
- 
-   public static MethodDescriptor parseDescriptor(StructMethod struct, ClassNode node) {
-@@ -150,6 +152,11 @@ public final class MethodDescriptor {
-     return null;
-   }
- 
-+  @Override
-+  public String toString() {
-+    return this.descriptor;
-+  }
-+
-   @Override
-   public boolean equals(Object o) {
-     if (o == this) return true;
diff --git a/FernFlower-Patches/0037-Lex-s-tests.patch b/FernFlower-Patches/0037-Lex-s-tests.patch
new file mode 100644
index 0000000..dcaad26
--- /dev/null
+++ b/FernFlower-Patches/0037-Lex-s-tests.patch
@@ -0,0 +1,279 @@
+From 9f908e30826e71247955a0c38f1154d8065073ec Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Thu, 27 Aug 2015 15:39:39 -0400
+Subject: [PATCH 037/122] Lex's tests
+
+---
+ .../decompiler/DecompilerTestFixture.java     |   3 +-
+ .../jetbrains/java/decompiler/LVTTest.java    |   7 ++
+ .../decompiler/SingleClassesTestBase.java     |   2 +-
+ .../classes/pkg/TestLexManosLVT$Bob.class     | Bin 0 -> 1472 bytes
+ testData/classes/pkg/TestLexManosLVT.class    | Bin 0 -> 1967 bytes
+ testData/results/TestLexManosLVT.dec          |  64 ++++++++++++++++++
+ testData/src/pkg/TestLexManosLVT.java         |  64 ++++++++++++++++++
+ 7 files changed, 138 insertions(+), 2 deletions(-)
+ create mode 100644 testData/classes/pkg/TestLexManosLVT$Bob.class
+ create mode 100644 testData/classes/pkg/TestLexManosLVT.class
+ create mode 100644 testData/results/TestLexManosLVT.dec
+ create mode 100644 testData/src/pkg/TestLexManosLVT.java
+
+diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
+index d0d869c..f2c344a 100644
+--- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
++++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
+@@ -31,6 +31,7 @@ public class DecompilerTestFixture {
+   private File tempDir;
+   private File targetDir;
+   private ConsoleDecompiler decompiler;
++  public boolean cleanup = true;
+ 
+   public void setUp() throws IOException {
+     setUp(Collections.<String, Object>emptyMap());
+@@ -62,7 +63,7 @@ public class DecompilerTestFixture {
+   }
+ 
+   public void tearDown() {
+-    if (tempDir != null) {
++    if (tempDir != null && cleanup) {
+       delete(tempDir);
+     }
+   }
+diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
+index 983368c..f4d869c 100644
+--- a/test/org/jetbrains/java/decompiler/LVTTest.java
++++ b/test/org/jetbrains/java/decompiler/LVTTest.java
+@@ -18,6 +18,7 @@ package org.jetbrains.java.decompiler;
+ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+ import org.junit.Test;
+ 
++import java.io.IOException;
+ import java.util.HashMap;
+ import java.util.Map;
+ 
+@@ -29,6 +30,12 @@ public class LVTTest extends SingleClassesTestBase {
+     }};
+   }
+ 
++  @Override
++    public void setUp() throws IOException {
++        super.setUp();
++        fixture.cleanup = false;
++    }
++  @Test public void testMatchLM() { doTest("pkg/TestLexManosLVT"); }
+   @Test public void testMatch1() { doTest("pkg/TestLVT"); }
+   @Test public void testMatch2() { doTest("pkg/TestLVTScoping"); }
+ }
+diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java b/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
+index 165f695..064ca5c 100644
+--- a/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
++++ b/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
+@@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals;
+ import static org.junit.Assert.assertTrue;
+ 
+ public abstract class SingleClassesTestBase {
+-  private DecompilerTestFixture fixture;
++  protected DecompilerTestFixture fixture;
+ 
+   @Before
+   public void setUp() throws IOException {
+diff --git a/testData/classes/pkg/TestLexManosLVT$Bob.class b/testData/classes/pkg/TestLexManosLVT$Bob.class
+new file mode 100644
+index 0000000000000000000000000000000000000000..38c9bd23ae2a768cab887a845c780bfd31e4c560
+GIT binary patch
+literal 1472
+zcmaJ>-%k@+6#h=9?R44^urgpNtL`o;En>B5b=$&%$YzNJOp1-oK26KWj+PnHnW{XR
+z@aCib1H4G~O)*)CW*Z;&Y5xxY4(qvBkglPoncjQO{mys4^JC_}Pw(0QvY1y9APjFj
+zT+6Ijo?o(_ESiq%l`1P^H{F_wAffMp`N+&POlK`K@3htlf!`MhiBgZ40s~6RgxLJj
+z-NmuWZ0YWNnK1Ilckq#7y<t1HKTS}^Qx!sR&Rw-42t`5Y*D-+Ogm7^mGBjQ~R8;nx
+zwzF1PNL4h(p3o6OI097|LpoH1#qOkz2sA-9q9ch>CVONyT9!u`9Z&UErr{LMs5ng+
+z=(=&!^R0CqKjJ5r>$ZG?@kNmBX6~>WpEX(LdLe=_&SchGy&uInjH@`$0wvG?fjUx1
+z6Vwe6+i;lfhy+Dd`b)NBEw$EbR&&LyH7r8B<krnb#cbNb-gi=sKy`jr3CGI5S%0`_
+zZpbrL6hT2h%kuxUy(p)5O-Byb37Xk#nwxcZW0R2XzJIy)z^eO&g|3<(xVY#nTUK)U
+zK4G#uY`-t5o?RD03Oa6}NVwJ=IoB{fuh4bfSE|Dvh&kjri<aG1vu^!ni&_kRGrt!F
+zoD(bCYmVu+nhcrfVigp{p6aHVU0-k<t10DJo{Bl{-Vr0uGr%v(%q1Q!h2JP;CLu-;
+z;FYHj7#I<=$0tEvqlht12gqcbSG;%+s>Y8gZ_)P#acK+&rD25r;Ui@i@p3h|3#0r7
+z!+S_nm)cWGaR>J%liAzC&a3TQSjmNUP)MjoD4P#TZ>*h*DmiTj$wbW1viV3l5qyc*
+zE`Esr{5Q^SX=G?dbi4C$D?~=f2yb`(-6BekZg>8AE%Lww|EF0oa21n0BvZJKGWW~I
+zFL05^W8Oby-!ndYj%i$A<Qa~e!V=>-b4Fj}Uzjts(T5E0BDlnU3u=c+f*?|H8R#I6
+zh{~2Uzd8-*2hM}_AYw4k;hG*1qaCs$Aif)4%FVYZvOQ{gV)QMtBEx{pFw6kpid3)5
+zy~>tQuZb_ket3?1D!Mzgi{a{RCEczTMROLF<Q}eGc=Zh%Nw$FGxWS3aj&m&ol0O=!
+f^d9mbK)vHc6@|iS{3_QO%<?KeV1%2vH8b)VjZ`gJ
+
+literal 0
+HcmV?d00001
+
+diff --git a/testData/classes/pkg/TestLexManosLVT.class b/testData/classes/pkg/TestLexManosLVT.class
+new file mode 100644
+index 0000000000000000000000000000000000000000..1f3363d36c4d981d9d5f4e7d9bc463ec6627f95c
+GIT binary patch
+literal 1967
+zcmZ`)-%}G;6#j0q$tKGJ;YXm+Afl)VA}MIm5<~&Dqy|uvLJ_K6V2djuflYAWsWTn_
+zfIj!7<AbHsna)@{gSK_(Tc^|hBb`39ojTK(cA9>7lOVA;ll$xJIp00!JLjJK^zXMj
+z0QxYm!X?nOy1W!ioB2Z0+!!~qxqNaetwIq9+%@hQv5b*jicQYnH5Up3$2wEfiS+2$
+z?ey?S@^U9FJ72Qw9LdcKxMmXq-a#vC6@~=dk?53wGMZa7HMmiuLxoSEK51pmiS?Cv
+z(@q=n8B?G!nOiV2Q-*EHb6Kbq?pS$&U~(Tn<Ahx?tgIi6Xjaiw<#cK@Uocm61kpkt
+za_jUzm~>*Ya<OZ+l`W(SwrQ-yeRz#HMt<=F4F?cbageO+qo|_|hXmABX`9IsE>gmC
+zI3k#pU5ZDiR2;6@uNSOLY}mGq&7_qtXlO@`oQ~?~#4!P%RWNO%kh29^BGD3-W0EM#
+z<25*esEP==aU81ps-p`h>3P=NU~J75ggqH^>`&?FL5zOiG4d0RDid;3gFvqi5Bi7@
+ziOwecID>u_ZwR#R!?et+j<Yz&<c=}9q5aY!mEsz426V(R$SZU9qLno=P7Ne{IP1d&
+z0wgDW7#0wQ52IXIFk*valY`K%jo#f%RTIc`H|}A)RFxFEHW-9!Q%(k_y*lNrkl^at
+z+FY&F*IwRtQ#JViYle7HZK_}_ERP$jPHn32sz_DWoKpmTa{G?t)+@=F*6}W8_#W;V
+znRSz;946hbq)(<{R>uXLQ}Ld_fftW(B9~fUxO2raGmDpPTNaI$%B|ZA<`qjmp5~Wc
+zVvn>G&=c9LX^&=%d|uw|W{S{3|J-Z=BA`hpxpPy(N6FdGQ;e(N>gjp{?JI6v&^dcc
+zLez4vm-lt3=gE&i#n|;ZwFx3l`<`i6yJiNIogw%6E!2dRaL?d<mk75#DE{?A-sH$1
+zqoJ{N8=>;|-@Zfp%oB7ZPj2JL#1^zu-{82wIG1jLPm0gW@>^wjKzpVQC?RELz_-({
+zy8FFbs15mo-kyHXeXj_5gX)9gpH-iO<<GkpSJZy3NGf-I`V_A}#_4Um+4BWMMU+F5
+z<Kk%H=#U2I={sYT+aYeL&);Y8H(ngyg12#G{M8aKb!gX3GfB1LQ2h}ObI&$RTEo!L
+zjT+X4hCz~l33Zqw;mc^i8XMooXvRZ!xi7gsK`XxJw;vJ0&m6ztApRi2a~#6o=nx8y
+z2o*<#hE7q76QYH!C4{I5qf4}t+XzmHlWZ1!=ylS3gZC>U#ye$|bn|o>R~Y^!{EoLU
+z#@#Z~lqE>V8Yb{I^%Q#J!&T~ei0wua<NTj#r+3bdTBY(SVN4R^8YOFJF0z(9Dy~D&
+z$LkEgzP?B+g$I>gQ)MrNH&A4c_LoE|+!XGy@HaOU$xf9;5fQk`5YW^*SKUAIe4{4d
+zliiQk%aZ@lc><8BPS5-R<<az0Ozp@DF6CaC+=4RA!%Y@~r*xS48tF$2JV2tuOi3G#
+vvpVL8^zv(wwIYKI!81lzifDopBBwcAl@noZQNe}Vc%Q56&SyA`iwFJ#JW7^o
+
+literal 0
+HcmV?d00001
+
+diff --git a/testData/results/TestLexManosLVT.dec b/testData/results/TestLexManosLVT.dec
+new file mode 100644
+index 0000000..9ef5e62
+--- /dev/null
++++ b/testData/results/TestLexManosLVT.dec
+@@ -0,0 +1,64 @@
++package pkg;
++
++import java.util.ArrayList;
++
++public class TestLexManosLVT {
++   public static void main() {
++      int[] x = new int[5];
++      for(int y : x) {
++         ;
++      }
++      for(int y : x) {
++         System.out.println("asdf");
++      }
++      ArrayList<Object> x1 = new ArrayList<Object>();
++      for(Object y : x1) {
++         ;
++      }
++      for(Object y : x1) {
++         int[] x2 = new int[10];
++         for(int y2 : x2) {
++            ;
++
++         }
++         for(int y2 : x2) {
++            System.out.println("asdf");
++
++         }
++         System.out.println("asdf");
++
++      }
++      switch(Bob.HI) {
++      case HI:         System.out.println("HI");
++         break;
++      case LO:
++         System.out.println("LO");
++      }
++
++      if(TestLexManosLVT.Bob.HI == TestLexManosLVT.Bob.HI) {
++         String a = "a";
++      } else {
++         String b = "b";      }
++      String a2;
++      if(TestLexManosLVT.Bob.HI == TestLexManosLVT.Bob.HI) {
++            a2 = "a";
++      } else {            a2 = "b";
++      }
++      if (TestLexManosLVT.Bob.HI == TestLexManosLVT.Bob.HI) {
++         a2 = "a";
++      }
++      System.out.println(a2);   }   private static enum Bob {      HI,      LO;
++      static {
++         for(TestLexManosLVT.Bob b : values()) {
++            for(TestLexManosLVT.Bob c : values()) {
++               for(TestLexManosLVT.Bob d : values()) {
++                  if(b == c) {
++                     System.out.println("Asdf");
++                  }
++               }
++            }
++         }
++
++      }
++   }
++}
+diff --git a/testData/src/pkg/TestLexManosLVT.java b/testData/src/pkg/TestLexManosLVT.java
+new file mode 100644
+index 0000000..e04de1e
+--- /dev/null
++++ b/testData/src/pkg/TestLexManosLVT.java
+@@ -0,0 +1,64 @@
++package pkg;
++
++import java.util.ArrayList;
++
++public class TestLexManosLVT {
++    public static void main() {
++        int[] x = new int[5];
++        for (int y : x)
++            ;
++        for (int y : x) {
++            System.out.println("asdf");
++        }
++        ArrayList<Object> x1 = new ArrayList<Object>();
++        for (Object y : x1)
++            ;
++        for (Object y : x1) {
++            int[] x2 = new int[10];
++            for (int y2 : x2)
++                ;
++            for (int y2 : x2) {
++                System.out.println("asdf");
++            }
++            System.out.println("asdf");
++        }
++        switch (Bob.HI) {
++        case HI:
++            System.out.println("HI");
++            break;
++        case LO:
++            System.out.println("LO");
++            break;
++        }
++        if (Bob.HI == Bob.HI) {
++            String a = "a";
++        } else {
++            String b = "b";
++        }
++        String a2;
++        if (Bob.HI == Bob.HI) {
++            a2 = "a";
++        } else {
++            a2 = "b";
++        }
++        if (Bob.HI == Bob.HI) {
++            a2 = "a";
++        }
++        System.out.println(a2);
++
++    }
++
++    private static enum Bob {
++        HI, LO;
++        static {
++            for (Bob b : Bob.values()) {
++                for (Bob c : values()) {
++                    for (Bob d : values()) {
++                        if (b == c)
++                            System.out.println("Asdf");
++                    }
++                }
++            }
++        };
++    }
++}
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0038-Fix-inverted-null-test.patch b/FernFlower-Patches/0038-Fix-inverted-null-test.patch
new file mode 100644
index 0000000..8cb7f05
--- /dev/null
+++ b/FernFlower-Patches/0038-Fix-inverted-null-test.patch
@@ -0,0 +1,25 @@
+From f023a4410692d9e353b0ddd61d3072df16fdd18a Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Thu, 27 Aug 2015 15:41:47 -0400
+Subject: [PATCH 038/122] Fix inverted null test
+
+---
+ .../decompiler/modules/decompiler/vars/VarDefinitionHelper.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index 1e1a4a7..d24813f 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -556,7 +556,7 @@ public class VarDefinitionHelper {
+   }
+ 
+   private void setupLVTs(Statement stat) {
+-    if (stat == null || varproc.getLVT() != null) {
++    if (stat == null || varproc.getLVT() == null) {
+       return;
+     }
+ 
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0038-Make-decomp-threaded.patch b/FernFlower-Patches/0038-Make-decomp-threaded.patch
deleted file mode 100644
index f5af630..0000000
--- a/FernFlower-Patches/0038-Make-decomp-threaded.patch
+++ /dev/null
@@ -1,809 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: covers1624 <laughlan.cov@internode.on.net>
-Date: Sat, 20 Jun 2020 00:48:35 +0930
-Subject: [PATCH] Make decomp threaded
-
-`-thr <number>` anything < 1 is treaded as single threaded.
-`-thr AUTO` to auto select, (default)
-
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index ff19c7105c0e6bcfa280dca8255eaf32357a2fc3..a1629d28780be9743ab816b5ffbfe664291008a3 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-@@ -30,12 +30,13 @@ import org.jetbrains.java.decompiler.util.TextBuffer;
- import java.io.IOException;
- import java.util.*;
- import java.util.Map.Entry;
-+import java.util.concurrent.ConcurrentHashMap;
- 
- public class ClassesProcessor implements CodeConstants {
-   public static final int AVERAGE_CLASS_SIZE = 16 * 1024;
- 
-   private final StructContext context;
--  private final Map<String, ClassNode> mapRootClasses = new HashMap<>();
-+  private final Map<String, ClassNode> mapRootClasses = new ConcurrentHashMap<>();
-   private final Set<String> whitelist = new HashSet<>();
- 
-   private static class Inner {
-@@ -396,7 +397,7 @@ public class ClassesProcessor implements CodeConstants {
-     return true;
-   }
- 
--  public void writeClass(StructClass cl, TextBuffer buffer) throws IOException {
-+  public void processClass(StructClass cl) throws IOException {
-     ClassNode root = mapRootClasses.get(cl.qualifiedName);
-     if (root.type != ClassNode.CLASS_ROOT) {
-       return;
-@@ -405,25 +406,12 @@ public class ClassesProcessor implements CodeConstants {
-     boolean packageInfo = cl.isSynthetic() && "package-info".equals(root.simpleName);
-     boolean moduleInfo = cl.hasModifier(CodeConstants.ACC_MODULE) && cl.hasAttribute(StructGeneralAttribute.ATTRIBUTE_MODULE);
- 
--    DecompilerContext.getLogger().startReadingClass(cl.qualifiedName);
--    try {
-+    DecompilerContext.getLogger().startProcessingClass(cl.qualifiedName);
-+    {
-       ImportCollector importCollector = new ImportCollector(root);
-       DecompilerContext.startClass(importCollector);
- 
--      if (packageInfo) {
--        ClassWriter.packageInfoToJava(cl, buffer);
--
--        importCollector.writeImports(buffer, false);
--      }
--      else if (moduleInfo) {
--        TextBuffer moduleBuffer = new TextBuffer(AVERAGE_CLASS_SIZE);
--        ClassWriter.moduleInfoToJava(cl, moduleBuffer);
--
--        importCollector.writeImports(buffer, true);
--
--        buffer.append(moduleBuffer);
--      }
--      else {
-+      if (!packageInfo && !moduleInfo) {
-         new LambdaProcessor().processClass(root);
- 
-         // add simple class names to implicit import
-@@ -435,7 +423,36 @@ public class ClassesProcessor implements CodeConstants {
-         new NestedClassProcessor().processClass(root, root);
- 
-         new NestedMemberAccess().propagateMemberAccess(root);
-+      }
- 
-+      DecompilerContext.getLogger().endProcessingClass();
-+    }
-+  }
-+
-+  public void writeClass(StructClass cl, TextBuffer buffer) throws IOException {
-+    ClassNode root = mapRootClasses.get(cl.qualifiedName);
-+    if (root.type != ClassNode.CLASS_ROOT) {
-+      return;
-+    }
-+
-+    boolean packageInfo = cl.isSynthetic() && "package-info".equals(root.simpleName);
-+    boolean moduleInfo = cl.hasModifier(CodeConstants.ACC_MODULE) && cl.hasAttribute(StructGeneralAttribute.ATTRIBUTE_MODULE);
-+    DecompilerContext.getLogger().startReadingClass(cl.qualifiedName);
-+    try {
-+      if (packageInfo) {
-+        ClassWriter.packageInfoToJava(cl, buffer);
-+
-+        DecompilerContext.getImportCollector().writeImports(buffer, false);
-+      }
-+      else if (moduleInfo) {
-+        TextBuffer moduleBuffer = new TextBuffer(AVERAGE_CLASS_SIZE);
-+        ClassWriter.moduleInfoToJava(cl, moduleBuffer);
-+
-+        DecompilerContext.getImportCollector().writeImports(buffer, true);
-+
-+        buffer.append(moduleBuffer);
-+      }
-+      else {
-         TextBuffer classBuffer = new TextBuffer(AVERAGE_CLASS_SIZE);
-         new ClassWriter().classToJava(root, classBuffer, 0, null);
- 
-@@ -445,7 +462,7 @@ public class ClassesProcessor implements CodeConstants {
-           buffer.append("package ").append(packageName).append(';').appendLineSeparator().appendLineSeparator();
-         }
- 
--        importCollector.writeImports(buffer, true);
-+        DecompilerContext.getImportCollector().writeImports(buffer, true);
- 
-         int offsetLines = buffer.countLines();
- 
-diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-index bb7b5b4e4a590219939a8f7e883b9c259c1adf73..458d119056f3fa7eceec7215fa577018d7f8cb8c 100644
---- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-+++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-@@ -11,6 +11,7 @@ import org.jetbrains.java.decompiler.main.extern.IVariableNamingFactory;
- import org.jetbrains.java.decompiler.modules.renamer.PoolInterceptor;
- import org.jetbrains.java.decompiler.struct.StructContext;
- 
-+import java.util.HashMap;
- import java.util.Map;
- import java.util.Objects;
- 
-@@ -29,12 +30,14 @@ public class DecompilerContext {
-   private final ClassesProcessor classProcessor;
-   private final PoolInterceptor poolInterceptor;
-   private final IVariableNamingFactory renamerFactory;
-+  private final int threads;
-   private ImportCollector importCollector;
-   private VarProcessor varProcessor;
-   private CounterContainer counterContainer;
-   private BytecodeSourceMapper bytecodeSourceMapper;
- 
-   public DecompilerContext(Map<String, Object> properties,
-+                           int threads,
-                            IFernflowerLogger logger,
-                            StructContext structContext,
-                            ClassesProcessor classProcessor,
-@@ -46,6 +49,7 @@ public class DecompilerContext {
-     Objects.requireNonNull(classProcessor);
- 
-     this.properties = properties;
-+    this.threads = threads;
-     this.logger = logger;
-     this.structContext = structContext;
-     this.classProcessor = classProcessor;
-@@ -54,6 +58,18 @@ public class DecompilerContext {
-     this.counterContainer = new CounterContainer();
-   }
- 
-+  //Safe to not copy some of the fields.
-+  @SuppressWarnings ("CopyConstructorMissesField")
-+  private DecompilerContext(DecompilerContext other) {
-+    this.properties = new HashMap<>(other.properties);
-+    this.logger = other.logger;
-+    this.structContext = other.structContext;
-+    this.classProcessor = other.classProcessor;
-+    this.poolInterceptor = other.poolInterceptor;
-+    this.renamerFactory = other.renamerFactory;
-+    this.threads = other.threads;
-+  }
-+
-   // *****************************************************************************
-   // context setup and update
-   // *****************************************************************************
-@@ -68,6 +84,14 @@ public class DecompilerContext {
-     currentContext.set(context);
-   }
- 
-+  public static void cloneContext(DecompilerContext root) {
-+    DecompilerContext current = getCurrentContext();
-+    if (current == null) {
-+      current = new DecompilerContext(root);
-+      setCurrentContext(current);
-+    }
-+  }
-+
-   public static void setProperty(String key, Object value) {
-     getCurrentContext().properties.put(key, value);
-   }
-@@ -102,6 +126,10 @@ public class DecompilerContext {
-            IFernflowerPreferences.LINE_SEPARATOR_UNX : IFernflowerPreferences.LINE_SEPARATOR_WIN;
-   }
- 
-+  public static int getThreads() {
-+    return getCurrentContext().threads;
-+  }
-+
-   public static IFernflowerLogger getLogger() {
-     return getCurrentContext().logger;
-   }
-diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-index bc97cdaa10bcc5e99860241f0ee0ef8cfff8434e..8e8abfd701a61accbd67ca4e661d7d329fd48c0b 100644
---- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
-+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-@@ -25,7 +25,24 @@ public class Fernflower implements IDecompiledData {
-   private final IIdentifierRenamer helper;
-   private final IdentifierConverter converter;
- 
-+  private static int getThreads(Map<String, Object> options, final String def) {
-+    String thr = options != null ? (String) options.getOrDefault(IFernflowerPreferences.THREADS, def) : def;
-+    if ("AUTO".equals(thr)) {
-+      return Runtime.getRuntime().availableProcessors();
-+    } else {
-+      try {
-+        return Integer.parseInt(thr);
-+      } catch (NumberFormatException e) {
-+        throw new RuntimeException("Malformed threads option: " + thr);
-+      }
-+    }
-+  }
-+
-   public Fernflower(IBytecodeProvider provider, IResultSaver saver, Map<String, Object> customProperties, IFernflowerLogger logger) {
-+    this(provider, saver, customProperties, logger, getThreads(customProperties, "AUTO"));
-+  }
-+
-+  public Fernflower(IBytecodeProvider provider, IResultSaver saver, Map<String, Object> customProperties, IFernflowerLogger logger, int threads) {
-     Map<String, Object> properties = new HashMap<>(IFernflowerPreferences.DEFAULTS);
-     if (customProperties != null) {
-       properties.putAll(customProperties);
-@@ -71,7 +88,7 @@ public class Fernflower implements IDecompiledData {
-       }
-     }
- 
--    DecompilerContext context = new DecompilerContext(properties, logger, structContext, classProcessor, interceptor, renamerFactory);
-+    DecompilerContext context = new DecompilerContext(properties, threads, logger, structContext, classProcessor, interceptor, renamerFactory);
-     DecompilerContext.setCurrentContext(context);
- 
-     String vendor = System.getProperty("java.vendor", "missing vendor");
-@@ -139,6 +156,17 @@ public class Fernflower implements IDecompiledData {
-     }
-   }
- 
-+  @Override
-+  public boolean processClass(StructClass cl) {
-+    try {
-+      classProcessor.processClass(cl);
-+      return true;
-+    } catch (Throwable t) {
-+      DecompilerContext.getLogger().writeMessage("Class " + cl.qualifiedName + " couldn't be processed.", t);
-+      return false;
-+    }
-+  }
-+
-   @Override
-   public String getClassContent(StructClass cl) {
-     try {
-diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
-index e77afd845015501a743b091d3a3cc716497ffc75..7af078ed357349951585906564c1bf8239c0c810 100644
---- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
-+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
-@@ -109,7 +109,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
-       return;
-     }
- 
--    PrintStreamLogger logger = new PrintStreamLogger(System.out);
-+    IFernflowerLogger logger = new ThreadedPrintStreamLogger(System.out);
-     ConsoleDecompiler decompiler = new ConsoleDecompiler(destination, mapOptions, logger);
- 
-     for (File library : libraries) {
-@@ -147,7 +147,9 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
- 
-   protected ConsoleDecompiler(File destination, Map<String, Object> options, IFernflowerLogger logger) {
-     root = destination;
--    engine = new Fernflower(this, root.isDirectory() ? this : new SingleFileSaver(destination), options, logger);
-+
-+    IResultSaver saver = root.isDirectory() ? this : new SingleFileSaver(destination);
-+    engine = new Fernflower(this, saver, options, logger);
-   }
- 
-   public void addSource(File source) {
-diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java b/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java
-index ff3b9b3dd27f5f07ebc80f6ca4ac3c632c93c83d..4398128ff456563af17a51479e563bb90f5badcb 100644
---- a/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java
-+++ b/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java
-@@ -31,6 +31,22 @@ public class PrintStreamLogger extends IFernflowerLogger {
-     }
-   }
- 
-+  @Override
-+  public void startProcessingClass(String className) {
-+    if (accepts(Severity.INFO)) {
-+      writeMessage("PreProcessing class " + className, Severity.INFO);
-+      ++indent;
-+    }
-+  }
-+
-+  @Override
-+  public void endProcessingClass() {
-+    if (accepts(Severity.INFO)) {
-+      --indent;
-+      writeMessage("... done", Severity.INFO);
-+    }
-+  }
-+
-   @Override
-   public void startReadingClass(String className) {
-     if (accepts(Severity.INFO)) {
-diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ThreadSafeResultSaver.java b/src/org/jetbrains/java/decompiler/main/decompiler/ThreadSafeResultSaver.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..98fe00844f7b4d5bbdcef09e379bb8e634a96dff
---- /dev/null
-+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ThreadSafeResultSaver.java
-@@ -0,0 +1,213 @@
-+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-+package org.jetbrains.java.decompiler.main.decompiler;
-+
-+import org.jetbrains.java.decompiler.main.DecompilerContext;
-+import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
-+import org.jetbrains.java.decompiler.main.extern.IResultSaver;
-+import org.jetbrains.java.decompiler.util.InterpreterUtil;
-+
-+import java.io.*;
-+import java.nio.charset.StandardCharsets;
-+import java.util.HashMap;
-+import java.util.HashSet;
-+import java.util.Map;
-+import java.util.Set;
-+import java.util.jar.JarFile;
-+import java.util.jar.Manifest;
-+import java.util.zip.ZipEntry;
-+import java.util.zip.ZipFile;
-+import java.util.zip.ZipOutputStream;
-+
-+/**
-+ * File saver supporting both, Threaded saving and 'SingleFile' mode.
-+ */
-+//TODO, Split off default impl inside ConsoleDecompiler and make this extend that.
-+public class ThreadSafeResultSaver implements IResultSaver {
-+
-+  private final Map<String, ArchiveContext> archiveContexts = new HashMap<>();
-+  private final File target;
-+  private final boolean archiveMode;//Latch for Archive mode.
-+  private ArchiveContext singeArchiveCtx;
-+
-+  public ThreadSafeResultSaver(File target) {
-+    this.target = target;
-+    this.archiveMode = !target.isDirectory();
-+  }
-+
-+  private ArchiveContext getCtx(String path) {
-+    if (archiveMode) {
-+      return singeArchiveCtx;
-+    }
-+    return archiveContexts.get(path);
-+  }
-+
-+  @Override
-+  public void createArchive(String path, String archiveName, Manifest manifest) {
-+    if (archiveMode && singeArchiveCtx != null) {
-+      throw new UnsupportedOperationException("Attempted to write multiple archives at the same time.");
-+    }
-+    File file = archiveMode ? target : new File(getAbsolutePath(path), archiveName);
-+    ArchiveContext ctx = getCtx(file.getPath());
-+    if (ctx != null) {
-+      throw new RuntimeException("Archive already open for: " + file);
-+    }
-+    try {
-+      if (!(file.createNewFile() || file.isFile())) {
-+        throw new IOException("Cannot create file " + file);
-+      }
-+      FileOutputStream fos = new FileOutputStream(file);
-+      ZipOutputStream zos = new ZipOutputStream(fos);
-+      if (manifest != null) {
-+        final ZipEntry manifestEntry = new ZipEntry(JarFile.MANIFEST_NAME);
-+        manifestEntry.setTime(STABLE_ZIP_TIMESTAMP);
-+        zos.putNextEntry(manifestEntry);
-+        manifest.write(zos);
-+        zos.closeEntry();
-+      }
-+      ctx = new ArchiveContext(file, zos);
-+      if (archiveMode) {
-+        singeArchiveCtx = ctx;
-+      } else {
-+        archiveContexts.put(file.getPath(), ctx);
-+      }
-+    } catch (IOException e) {
-+      DecompilerContext.getLogger().writeMessage("Cannot create archive " + file, e);
-+    }
-+  }
-+
-+  @Override
-+  public void saveDirEntry(String path, String archiveName, String entryName) {
-+    saveClassEntry(path, archiveName, null, entryName, null);
-+  }
-+
-+  @Override
-+  public void copyEntry(String source, String path, String archiveName, String entryName) {
-+    String file = new File(getAbsolutePath(path), archiveName).getPath();
-+    ArchiveContext ctx = getCtx(file);
-+    if (ctx == null) {
-+      throw new RuntimeException("Archive closed and tried to copy entry '" + entryName + "' from '" + source + "' to '" + file + "'.");
-+    }
-+    if (!ctx.addEntry(entryName)) {
-+      return;
-+    }
-+    try (ZipFile srcArchive = new ZipFile(new File(source))) {
-+      ZipEntry entry = srcArchive.getEntry(entryName);
-+      if (entry != null) {
-+        try (InputStream in = srcArchive.getInputStream(entry)) {
-+          final ZipEntry newEntry = new ZipEntry(entryName);
-+          newEntry.setTime(entry.getTime());
-+          ctx.stream.putNextEntry(newEntry);
-+          in.transferTo(ctx.stream);
-+        }
-+      }
-+    } catch (IOException e) {
-+      DecompilerContext.getLogger().writeMessage("Cannot copy entry " + entryName + " from " + source + " to " + file, e);
-+    }
-+  }
-+
-+  @Override
-+  public void saveClassEntry(String path, String archiveName, String qualifiedName, String entryName, String content) {
-+    String file = new File(getAbsolutePath(path), archiveName).getPath();
-+    ArchiveContext ctx = getCtx(file);
-+    if (ctx == null) {
-+      throw new RuntimeException("Archive closed and tried to write entry '" + entryName + "' to '" + file + "'.");
-+    }
-+    if (!ctx.addEntry(entryName)) {
-+      return;
-+    }
-+    try {
-+      ZipEntry entry = new ZipEntry(entryName);
-+      entry.setTime(STABLE_ZIP_TIMESTAMP);
-+      ctx.stream.putNextEntry(entry);
-+      if (content != null) {
-+        ctx.stream.write(content.getBytes(StandardCharsets.UTF_8));
-+      }
-+    } catch (IOException e) {
-+      DecompilerContext.getLogger().writeMessage("Cannot write entry " + entryName + " to " + file, e);
-+    }
-+  }
-+
-+  @Override
-+  public void closeArchive(String path, String archiveName) {
-+    String file = new File(getAbsolutePath(path), archiveName).getPath();
-+    ArchiveContext ctx = getCtx(file);
-+    if (ctx == null) {
-+      throw new RuntimeException("Tried to close closed archive '" + file + "'.");
-+    }
-+    try {
-+      ctx.stream.close();
-+    } catch (IOException e) {
-+      DecompilerContext.getLogger().writeMessage("Cannot close " + file, IFernflowerLogger.Severity.WARN, e);
-+    }
-+
-+    if (archiveMode) {
-+      singeArchiveCtx = null;
-+    } else {
-+      //We are done.
-+      archiveContexts.remove(file);
-+    }
-+  }
-+
-+  @Override
-+  public void saveFolder(String path) {
-+    if (archiveMode) {
-+      if (!"".equals(path)) {
-+        throw new UnsupportedOperationException("Targeted a single output, but tried to create a directory");
-+      }
-+      return;
-+    }
-+    File dir = new File(getAbsolutePath(path));
-+    if (!(dir.mkdirs() || dir.isDirectory())) {
-+      throw new RuntimeException("Cannot create directory " + dir);
-+    }
-+  }
-+
-+  @Override
-+  public void copyFile(String source, String path, String entryName) {
-+    if (archiveMode) {
-+      throw new UnsupportedOperationException("Targeted a single output, but tried to copy file");
-+    }
-+    try {
-+      InterpreterUtil.copyFile(new File(source), new File(getAbsolutePath(path), entryName));
-+    } catch (IOException ex) {
-+      DecompilerContext.getLogger().writeMessage("Cannot copy " + source + " to " + entryName, ex);
-+    }
-+  }
-+
-+  @Override
-+  public void saveClassFile(String path, String qualifiedName, String entryName, String content, int[] mapping) {
-+    if (archiveMode) {
-+      throw new UnsupportedOperationException("Targeted a single output, but tried to save a class file");
-+    }
-+    File file = new File(getAbsolutePath(path), entryName);
-+    try (Writer out = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8)) {
-+      out.write(content);
-+    } catch (IOException ex) {
-+      DecompilerContext.getLogger().writeMessage("Cannot write class file " + file, ex);
-+    }
-+  }
-+
-+  private String getAbsolutePath(String path) {
-+    return new File(target, path).getAbsolutePath();
-+  }
-+
-+  private static class ArchiveContext {
-+
-+    public final File file;
-+    public final ZipOutputStream stream;
-+    public final Set<String> savedEntries = new HashSet<>();
-+
-+    private ArchiveContext(File file, ZipOutputStream stream) {
-+      this.file = file;
-+      this.stream = stream;
-+    }
-+
-+    public boolean addEntry(String entryName) {
-+      boolean added = savedEntries.add(entryName);
-+      if (!added) {
-+        DecompilerContext.getLogger().writeMessage("Zip entry " + entryName + " already exists in " + file, IFernflowerLogger.Severity.WARN);
-+      }
-+      return added;
-+    }
-+  }
-+}
-diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ThreadedPrintStreamLogger.java b/src/org/jetbrains/java/decompiler/main/decompiler/ThreadedPrintStreamLogger.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..fe8608901ab47ede002a24b3ad2199150bc8bbf0
---- /dev/null
-+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ThreadedPrintStreamLogger.java
-@@ -0,0 +1,114 @@
-+// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-+package org.jetbrains.java.decompiler.main.decompiler;
-+
-+import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
-+import org.jetbrains.java.decompiler.util.TextUtil;
-+
-+import java.io.PrintStream;
-+import java.util.concurrent.atomic.AtomicInteger;
-+
-+public class ThreadedPrintStreamLogger extends IFernflowerLogger {
-+
-+  private final PrintStream stream;
-+  private final ThreadLocal<AtomicInteger> indent = ThreadLocal.withInitial(AtomicInteger::new);
-+
-+  public ThreadedPrintStreamLogger(PrintStream printStream) {
-+    stream = printStream;
-+  }
-+
-+  @Override
-+  public void writeMessage(String message, Severity severity) {
-+    if (accepts(severity)) {
-+      Thread th = Thread.currentThread();
-+      stream.println(th.getName() + ": " + severity.prefix + TextUtil.getIndentString(indent.get().get()) + message);
-+    }
-+  }
-+
-+  @Override
-+  public void writeMessage(String message, Severity severity, Throwable t) {
-+    if (accepts(severity)) {
-+      writeMessage(message, severity);
-+      t.printStackTrace(stream);
-+    }
-+  }
-+
-+  @Override
-+  public void startProcessingClass(String className) {
-+    if (accepts(Severity.INFO)) {
-+      writeMessage("PreProcessing class " + className, Severity.INFO);
-+      indent.get().incrementAndGet();
-+    }
-+  }
-+
-+  @Override
-+  public void endProcessingClass() {
-+    if (accepts(Severity.INFO)) {
-+      indent.get().decrementAndGet();
-+      writeMessage("... done", Severity.INFO);
-+    }
-+  }
-+
-+  @Override
-+  public void startReadingClass(String className) {
-+    if (accepts(Severity.INFO)) {
-+      writeMessage("Decompiling class " + className, Severity.INFO);
-+      indent.get().incrementAndGet();
-+    }
-+  }
-+
-+  @Override
-+  public void endReadingClass() {
-+    if (accepts(Severity.INFO)) {
-+      indent.get().decrementAndGet();
-+      writeMessage("... done", Severity.INFO);
-+    }
-+  }
-+
-+  @Override
-+  public void startClass(String className) {
-+    if (accepts(Severity.INFO)) {
-+      writeMessage("Processing class " + className, Severity.TRACE);
-+      indent.get().decrementAndGet();
-+    }
-+  }
-+
-+  @Override
-+  public void endClass() {
-+    if (accepts(Severity.INFO)) {
-+      indent.get().decrementAndGet();
-+      writeMessage("... proceeded", Severity.TRACE);
-+    }
-+  }
-+
-+  @Override
-+  public void startMethod(String methodName) {
-+    if (accepts(Severity.INFO)) {
-+      writeMessage("Processing method " + methodName, Severity.TRACE);
-+      indent.get().decrementAndGet();
-+    }
-+  }
-+
-+  @Override
-+  public void endMethod() {
-+    if (accepts(Severity.INFO)) {
-+      indent.get().decrementAndGet();
-+      writeMessage("... proceeded", Severity.TRACE);
-+    }
-+  }
-+
-+  @Override
-+  public void startWriteClass(String className) {
-+    if (accepts(Severity.INFO)) {
-+      writeMessage("Writing class " + className, Severity.TRACE);
-+      indent.get().decrementAndGet();
-+    }
-+  }
-+
-+  @Override
-+  public void endWriteClass() {
-+    if (accepts(Severity.INFO)) {
-+      indent.get().decrementAndGet();
-+      writeMessage("... written", Severity.TRACE);
-+    }
-+  }
-+}
-diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java
-index c9ece039b0d986c1d84b62426a65e6780ddc80e1..3ca43800b47e1d26a1dc036f21cb6e6e83ed5138 100644
---- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java
-+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java
-@@ -31,6 +31,10 @@ public abstract class IFernflowerLogger {
-     writeMessage(message, Severity.ERROR, t);
-   }
- 
-+  public void startProcessingClass(String className) {}
-+
-+  public void endProcessingClass() { }
-+
-   public void startReadingClass(String className) { }
- 
-   public void endReadingClass() { }
-diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-index f5e95e65a807e335ce33a589348e11ad1dbbf5fe..19ba388f94dfd41c9a544ea58295ef6f69141738 100644
---- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-@@ -40,6 +40,7 @@ public interface IFernflowerPreferences {
-   String QUALIFY_INNER_CLASSES = "qin";
-   String EXPLICIT_GENERIC_ARGUMENTS = "ega";
-   String INLINE_SIMPLE_LAMBDAS = "isl";
-+  String THREADS = "thr";
- 
-   String LOG_LEVEL = "log";
-   String MAX_PROCESSING_METHOD = "mpm";
-@@ -97,6 +98,7 @@ public interface IFernflowerPreferences {
-     defaults.put(QUALIFY_INNER_CLASSES, "1");
-     defaults.put(EXPLICIT_GENERIC_ARGUMENTS, "0");
-     defaults.put(INLINE_SIMPLE_LAMBDAS, "1");
-+    defaults.put(THREADS, "AUTO");
- 
-     defaults.put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name());
-     defaults.put(MAX_PROCESSING_METHOD, "0");
-diff --git a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
-index 7b0946ed0de6af2dbe2043332650a09880027726..7d44617f437ad6e78e204d56c394be5e0d5962c4 100644
---- a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
-+++ b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
-@@ -14,8 +14,14 @@ import java.io.IOException;
- import java.nio.charset.StandardCharsets;
- import java.util.ArrayList;
- import java.util.List;
-+import java.util.concurrent.ExecutionException;
-+import java.util.concurrent.ExecutorService;
-+import java.util.concurrent.Executors;
-+import java.util.concurrent.Future;
- import java.util.jar.JarFile;
- import java.util.jar.Manifest;
-+import java.util.stream.Collectors;
-+import java.util.stream.IntStream;
- import java.util.zip.ZipFile;
- 
- public class ContextUnit {
-@@ -121,7 +127,10 @@ public class ContextUnit {
-           }
-           String entryName = decompiledData.getClassEntryName(cl, classEntries.get(i));
-           if (entryName != null) {
--            String content = decompiledData.getClassContent(cl);
-+            String content = null;
-+            if (decompiledData.processClass(cl)) {
-+              content = decompiledData.getClassContent(cl);
-+            }
-             if (content != null) {
-               int[] mapping = null;
-               if (DecompilerContext.getOption(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING)) {
-@@ -149,13 +158,51 @@ public class ContextUnit {
-           }
-         }
- 
-+        //Whooo threads!
-+        int threads = DecompilerContext.getThreads();
-+        DecompilerContext rootContext = DecompilerContext.getCurrentContext();
-+        ExecutorService executor = threads > 0 ? Executors.newFixedThreadPool(threads) : Executors.newSingleThreadExecutor();
-+
-+        //Compute the classes we need to decomp.
-+        List<ClassContext> toProcess = IntStream.range(0, classes.size()).parallel()
-+          .mapToObj(i -> {
-+            StructClass cl = classes.get(i);
-+            return new ClassContext(cl, decompiledData.getClassEntryName(cl, classEntries.get(i)));
-+          })
-+          .filter(e -> e.entryName != null)
-+          .collect(Collectors.toList());
-+        List<Future<?>> futures = new ArrayList<>(toProcess.size());
-+
-+        //Submit preprocessor jobs.
-+        for (ClassContext clCtx : toProcess) {
-+          futures.add(executor.submit(() -> {
-+            DecompilerContext.cloneContext(rootContext);
-+            clCtx.ctx = DecompilerContext.getCurrentContext();
-+            clCtx.shouldContinue = decompiledData.processClass(clCtx.cl);
-+            DecompilerContext.setCurrentContext(null);
-+          }));
-+        }
-+
-+        //Ask the executor to shutdown
-+        waitForAll(futures);
-+        futures.clear();
-+
-         // classes
--        for (int i = 0; i < classes.size(); i++) {
--          StructClass cl = classes.get(i);
--          String entryName = decompiledData.getClassEntryName(cl, classEntries.get(i));
--          if (entryName != null) {
--            String content = decompiledData.getClassContent(cl);
--            resultSaver.saveClassEntry(archivePath, filename, cl.qualifiedName, entryName, content);
-+        for (ClassContext clCtx : toProcess) {
-+          if (clCtx.shouldContinue) {
-+            futures.add(executor.submit(() -> {
-+              DecompilerContext.setCurrentContext(clCtx.ctx);
-+              clCtx.classContent = decompiledData.getClassContent(clCtx.cl);
-+              DecompilerContext.setCurrentContext(null);
-+            }));
-+          }
-+        }
-+        executor.shutdown();
-+        waitForAll(futures);
-+
-+        for (final ClassContext clCtx : toProcess) {
-+          if (clCtx.shouldContinue) {
-+            resultSaver.saveClassEntry(archivePath, filename, clCtx.cl.qualifiedName, clCtx.entryName, clCtx.classContent);
-           }
-         }
- 
-@@ -164,6 +211,16 @@ public class ContextUnit {
-     }
-   }
- 
-+  private static void waitForAll(List<Future<?>> futures) {
-+    for (Future<?> future : futures) {
-+      try {
-+        future.get();
-+      } catch (InterruptedException | ExecutionException e) {
-+        throw new RuntimeException(e);
-+      }
-+    }
-+  }
-+
-   public void setManifest(Manifest manifest) {
-     this.manifest = manifest;
-   }
-@@ -175,4 +232,18 @@ public class ContextUnit {
-   public List<StructClass> getClasses() {
-     return classes;
-   }
-+
-+  private static class ClassContext {
-+    public final StructClass cl;
-+    public final String entryName;
-+    public boolean shouldContinue;
-+    public DecompilerContext ctx;
-+    String classContent;
-+
-+    private ClassContext(StructClass cl, String entryName) {
-+      this.cl = cl;
-+      this.entryName = entryName;
-+    }
-+  }
-+
- }
-diff --git a/src/org/jetbrains/java/decompiler/struct/IDecompiledData.java b/src/org/jetbrains/java/decompiler/struct/IDecompiledData.java
-index b3b38dd0c7fca39a4b90d2dd0bf9b91fb8ec2568..356a2a40d9e2834bbdf114c5b4745e72570e8ac6 100644
---- a/src/org/jetbrains/java/decompiler/struct/IDecompiledData.java
-+++ b/src/org/jetbrains/java/decompiler/struct/IDecompiledData.java
-@@ -5,5 +5,7 @@ public interface IDecompiledData {
- 
-   String getClassEntryName(StructClass cl, String entryname);
- 
-+  boolean processClass(StructClass cl);
-+
-   String getClassContent(StructClass cl);
- }
diff --git a/FernFlower-Patches/0039-More-tweaks.-Closer.patch b/FernFlower-Patches/0039-More-tweaks.-Closer.patch
new file mode 100644
index 0000000..14f9688
--- /dev/null
+++ b/FernFlower-Patches/0039-More-tweaks.-Closer.patch
@@ -0,0 +1,608 @@
+From de3a686365bc75c89bf8a1cf47d8c9cb9266b7df Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Fri, 11 Sep 2015 21:57:09 -0400
+Subject: [PATCH 039/122] More tweaks. Closer!
+
+---
+ .../java/decompiler/code/cfg/BasicBlock.java  | 15 +++++
+ .../main/rels/MethodProcessorRunnable.java    |  2 +-
+ .../modules/decompiler/PPandMMHelper.java     | 65 ++++++++++++++++++-
+ .../modules/decompiler/stats/Statement.java   | 10 ++-
+ .../modules/decompiler/vars/LVTVariable.java  | 22 +++----
+ .../decompiler/vars/LocalVariableTable.java   | 61 ++++++++---------
+ .../decompiler/vars/VarDefinitionHelper.java  | 60 ++++++++++++-----
+ .../decompiler/vars/VarVersionsProcessor.java |  4 +-
+ testData/results/TestLVT.dec                  |  6 +-
+ testData/results/TestLVTScoping.dec           |  6 +-
+ testData/results/TestLexManosLVT.dec          | 14 ++--
+ 11 files changed, 187 insertions(+), 78 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
+index 2e29529..a36047b 100644
+--- a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
++++ b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
+@@ -262,4 +262,19 @@ public class BasicBlock implements IGraphNode {
+   public void setPredExceptions(List<BasicBlock> predExceptions) {
+     this.predExceptions = predExceptions;
+   }
++
++  public int getStartInstruction() {
++      if (seq.isEmpty()) {
++          return 0;
++      }
++      return instrOldOffsets.get(0);
++  }
++
++  public int getEndInstruction() {
++      if (seq.isEmpty()) {
++          return 0;
++      }
++      int end = seq.getLastInstr().length();
++      return end + instrOldOffsets.get(size() -1);
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+index 54a77e1..5844b93 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+@@ -153,7 +153,7 @@ public class MethodProcessorRunnable implements Runnable {
+ 
+       varProc.setVarVersions(root);
+ 
+-      if (!new PPandMMHelper().findPPandMM(root)) {
++      if (!new PPandMMHelper(varProc).findPPandMM(root)) {
+         break;
+       }
+     }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
+index 4eb366b..d93bad6 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
+@@ -19,19 +19,31 @@ import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph;
+ import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectNode;
+ import org.jetbrains.java.decompiler.modules.decompiler.sforms.FlattenStatementsHelper;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+ import org.jetbrains.java.decompiler.struct.gen.VarType;
++import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ 
++import java.util.HashMap;
+ import java.util.HashSet;
+ import java.util.LinkedList;
+ import java.util.List;
++import java.util.Map;
+ 
+ public class PPandMMHelper {
+ 
+   private boolean exprentReplaced;
++  private VarProcessor varProc;
++  private Map<VarVersionPair, VarVersionPair> remaps = new HashMap<VarVersionPair, VarVersionPair>();
++
++  public PPandMMHelper(VarProcessor varProc) {
++    this.varProc = varProc;
++  }
+ 
+   public boolean findPPandMM(RootStatement root) {
+ 
+@@ -59,6 +71,8 @@ public class PPandMMHelper {
+       stack.addAll(node.succs);
+     }
+ 
++    updateVersions(dgraph);
++
+     return res;
+   }
+ 
+@@ -134,13 +148,16 @@ public class PPandMMHelper {
+             Exprent left = as.getLeft();
+ 
+             VarType condtype = econd.getExprType();
+-            if (left.equals(econd) && (midlayer == null || midlayer.equals(condtype))) {
++            if (exprsEqual(left, econd) && (midlayer == null || midlayer.equals(condtype))) {
+               FunctionExprent ret = new FunctionExprent(
+                 func.getFuncType() == FunctionExprent.FUNCTION_ADD ? FunctionExprent.FUNCTION_PPI : FunctionExprent.FUNCTION_MMI,
+                 econd, func.bytecode);
+               ret.setImplicitType(condtype);
+ 
+               exprentReplaced = true;
++              if (!left.equals(econd)) {
++                remaps.put(new VarVersionPair((VarExprent)left), new VarVersionPair((VarExprent)econd));
++              }
+               return ret;
+             }
+           }
+@@ -150,4 +167,48 @@ public class PPandMMHelper {
+ 
+     return null;
+   }
+-}
++
++  private boolean exprsEqual(Exprent e1, Exprent e2) {
++    if (e1 == e2) return true;
++    if (e1 == null || e2 == null) return false;
++    if (e1.type == VarExprent.EXPRENT_VAR) {
++      return varsEqual(e1, e2);
++    }
++    return e1.equals(e2);
++  }
++
++  private boolean varsEqual(Exprent e1, Exprent e2) {
++    if (!(e1 instanceof VarExprent)) return false;
++    if (!(e2 instanceof VarExprent)) return false;
++
++    VarExprent v1 = (VarExprent)e1;
++    VarExprent v2 = (VarExprent)e2;
++    return varProc.getRemapped(v1.getIndex()) == varProc.getRemapped(v2.getIndex())
++            && InterpreterUtil.equalObjects(v1.getVarType(), v2.getVarType());
++  }
++
++
++  private void updateVersions(DirectGraph graph) {
++    if (remaps.isEmpty()) return;
++    graph.iterateExprents(new DirectGraph.ExprentIterator() {
++      @Override
++      public int processExprent(Exprent exprent) {
++        List<Exprent> lst = exprent.getAllExprents(true);
++        lst.add(exprent);
++
++        for (Exprent expr : lst) {
++          if (expr.type == Exprent.EXPRENT_VAR) {
++            VarExprent var = (VarExprent)expr;
++            VarVersionPair nvar = remaps.get(new VarVersionPair(var));
++            if (nvar != null) {
++              var.setIndex(nvar.var);
++              var.setVersion(nvar.version);
++            }
++          }
++        }
++
++        return 0;
++      }
++    });
++  }
++}
+\ No newline at end of file
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+index ced701f..5a44fcf 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+@@ -862,9 +862,9 @@ public class Statement implements IMatchable {
+ 
+   // helper methods
+   public String toString() {
+-    return id.toString();
++    return String.format("{%d}:%d", type, id);
+   }
+-  
++
+   // *****************************************************************************
+   // IMatchable implementation
+   // *****************************************************************************
+@@ -937,5 +937,9 @@ public class Statement implements IMatchable {
+     
+     return true;
+   }
+-  
++
++public SequenceStatement getParentSequenceStat() {
++    return (SequenceStatement) (getParent()!=null && getParent().type == TYPE_SEQUENCE ? getParent() : null);
++}
++
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
+index dc7783c..bc7ba23 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
+@@ -42,34 +42,34 @@ public class LVTVariable implements Comparable<LVTVariable> {
+   public boolean equals(Object obj) {
+     if (!(obj instanceof LVTVariable))
+       return false;
+-    return ((LVTVariable) obj).index == index && ((LVTVariable) obj).start == start;
++    return ((LVTVariable) obj).index == index && ((LVTVariable) obj).end == end;
+   }
+ 
+   @Override
+   public int hashCode() {
+-    return index * 31 + start;
++    return index * 31 + end;
+   }
+ 
+-  public void addTo(Map<Integer, Set<LVTVariable>> startpoints) {
+-    Set<LVTVariable> starts = startpoints.get(this.start);
+-    if (starts == null) {
+-      starts = new HashSet<LVTVariable>();
+-      startpoints.put(this.start, starts);
++  public void addTo(Map<Integer, Set<LVTVariable>> endpoints) {
++    Set<LVTVariable> ends = endpoints.get(this.end);
++    if (ends == null) {
++      ends = new HashSet<LVTVariable>();
++      endpoints.put(this.end, ends);
+     }
+-    starts.add(this);
++    ends.add(this);
+   }
+ 
+   @Override
+   public int compareTo(LVTVariable o) {
+-    if (o.start > start) return -1;
+-    if (o.start < start) return 1;
++    if (o.end > end) return -1;
++    if (o.end < end) return 1;
+     if (o.index > index) return -1;
+     if (o.index < index) return 1;
+     return 0;
+   }
+   @Override
+   public String toString() {
+-    return "\'("+index+","+start+")"+desc+(sig!=null ? "<"+sig+"> ":" ")+name+"\'";
++    return "\'("+index+","+end+")"+desc+(sig!=null ? "<"+sig+"> ":" ")+name+"\'";
+   }
+ 
+   public String getDesc() {
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+index cd56bac..f7e1858 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+@@ -1,29 +1,37 @@
+ package org.jetbrains.java.decompiler.modules.decompiler.vars;
+ 
++import java.util.ArrayDeque;
+ import java.util.ArrayList;
+ import java.util.BitSet;
+ import java.util.HashMap;
++import java.util.HashSet;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.Map.Entry;
+ import java.util.Set;
++import java.util.Stack;
+ 
++import org.jetbrains.java.decompiler.code.Instruction;
++import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
+ import org.jetbrains.java.decompiler.main.rels.MethodProcessorRunnable;
++import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatement;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
+ 
+ public class LocalVariableTable {
+-  private Map<Integer, Set<LVTVariable>> startpoints;
++  private Map<Integer, Set<LVTVariable>> endpoints;
+   private ArrayList<LVTVariable> allLVT;
+   private Map<Integer, List<LVTVariable>> mapLVT;
+ 
+   public LocalVariableTable(int len) {
+-    startpoints = new HashMap<Integer,Set<LVTVariable>>(len);
++    endpoints = new HashMap<Integer,Set<LVTVariable>>(len);
+     allLVT = new ArrayList<LVTVariable>(len);
+   }
+ 
+   public void addVariable(LVTVariable v) {
+     allLVT.add(v);
+-    v.addTo(startpoints);
++    v.addTo(endpoints);
+   }
+ 
+   public void mergeLVTs(LocalVariableTable otherLVT) {
+@@ -88,39 +96,32 @@ public class LocalVariableTable {
+     return getMapVarNames().get(index);
+   }
+ 
+-  public List<LVTVariable> getVars(int index, int start, int end) {
+-    if (!getMapVarNames().containsKey(index)) {
+-      return null;
+-    }
+-
+-    List<LVTVariable> ret = new ArrayList<LVTVariable>();
+-    for (LVTVariable lvt : getMapVarNames().get(index)) {
+-      if (lvt.start >= start && lvt.end <= end) {
+-        ret.add(lvt);
++  public Map<Integer, LVTVariable> getVars(SequenceStatement sequenceStatement) {
++      if (sequenceStatement == null) return new HashMap<Integer, LVTVariable>();
++      int start = Integer.MAX_VALUE;
++      int end = Integer.MIN_VALUE;
++      for (Statement st : sequenceStatement.getStats()) {
++          start = Math.min(start, st.getBasichead().getBlock().getStartInstruction());
++          end = Math.max(end, st.getBasichead().getBlock().getEndInstruction());
+       }
+-    }
+-
+-    return ret;
+-  }
+-
+-  public Map<Integer, LVTVariable> getVars(Statement stat) {
+-    BitSet values = new BitSet();
+-    MethodProcessorRunnable.getOffset(stat, values);
+-    int start = values.nextSetBit(0);
+-    int end = values.length()-1;
+     //System.out.println(indent + stat.getClass().getSimpleName() + " (" + start +", " + end + ")");
+ 
+     Map<Integer, LVTVariable> ret = new HashMap<Integer, LVTVariable>();
+-    for (Entry<Integer, List<LVTVariable>> entry : getMapVarNames().entrySet()) {
+-      for (LVTVariable lvt : entry.getValue()) {
+-        if (lvt.start >= start && lvt.end <= end) {
+-          if (ret.containsKey(entry.getKey())) {
+-            System.out.println("DUPLICATE INDEX WHAT THE FUCK: " + entry.getKey());
+-          }
+-          ret.put(entry.getKey(), lvt);
++    if (endpoints.containsKey(end)) {
++        for (LVTVariable lvt : endpoints.get(end)) {
++            ret.put(lvt.index,lvt);
+         }
+-      }
+     }
++//    for (Entry<Integer, List<LVTVariable>> entry : endpoints.get(end)) {
++//      for (LVTVariable lvt : entry.getValue()) {
++//        if (lvt.start >= start && lvt.end <= end) {
++//          if (ret.containsKey(entry.getKey())) {
++//            System.out.println("DUPLICATE INDEX WHAT THE FUCK: " + entry.getKey());
++//          }
++//          ret.put(entry.getKey(), lvt);
++//        }
++//      }
++//    }
+     return ret;
+   }
+ }
+\ No newline at end of file
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index d24813f..d68ee36 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -16,6 +16,7 @@
+ package org.jetbrains.java.decompiler.modules.decompiler.vars;
+ 
+ import org.jetbrains.java.decompiler.code.CodeConstants;
++import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
+ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
+ import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
+@@ -23,9 +24,13 @@ import org.jetbrains.java.decompiler.main.rels.MethodProcessorRunnable;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph;
++import org.jetbrains.java.decompiler.modules.decompiler.sforms.FlattenStatementsHelper;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchAllStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
+ import org.jetbrains.java.decompiler.struct.StructClass;
+ import org.jetbrains.java.decompiler.struct.StructMethod;
+@@ -47,12 +52,13 @@ public class VarDefinitionHelper {
+ 
+   private final CounterContainer counters = DecompilerContext.getCounterContainer();
+ 
++  private final Map<SequenceStatement,List<VarVersionPair>> scopedVVPs;
+   public VarDefinitionHelper(Statement root, StructMethod mt, VarProcessor varproc) {
+ 
+     mapVarDefStatements = new HashMap<Integer, Statement>();
+     mapStatementVars = new HashMap<Integer, HashSet<Integer>>();
+     implDefVars = new HashSet<Integer>();
+-
++    scopedVVPs = new HashMap<SequenceStatement,List<VarVersionPair>>();
+     this.varproc = varproc;
+ 
+     VarNamesCollector vc = DecompilerContext.getVarNamesCollector();
+@@ -70,10 +76,21 @@ public class VarDefinitionHelper {
+ 
+     // method parameters are implicitly defined
+     int varindex = 0;
++    Statement seq = root.getFirst();
++    SequenceStatement seqStat = null;
++    if (seq.type == Statement.TYPE_SEQUENCE) {
++        seqStat = (SequenceStatement) seq;
++    }
+     for (int i = 0; i < paramcount; i++) {
+       implDefVars.add(varindex);
+-      varproc.setVarName(new VarVersionPair(varindex, 0), vc.getFreeName(varindex));
+-
++      VarVersionPair vvp = new VarVersionPair(varindex, 0);
++      varproc.setVarName(vvp, vc.getFreeName(varindex));
++      if (seqStat != null) {
++          if (scopedVVPs.get(seqStat) == null) {
++              scopedVVPs.put(seqStat,new ArrayList<VarVersionPair>());
++          }
++          scopedVVPs.get(seqStat).add(vvp);
++      }
+       if (thisvar) {
+         if (i == 0) {
+           varindex++;
+@@ -115,7 +132,8 @@ public class VarDefinitionHelper {
+       if (lstVars != null) {
+         for (VarExprent var : lstVars) {
+           implDefVars.add(var.getIndex());
+-          varproc.setVarName(new VarVersionPair(var), vc.getFreeName(var.getIndex()));
++          VarVersionPair pair = new VarVersionPair(var);
++          varproc.setVarName(pair, vc.getFreeName(var.getIndex()));
+           var.setDefinition(true);
+         }
+       }
+@@ -127,12 +145,18 @@ public class VarDefinitionHelper {
+   }
+ 
+   public void setVarDefinitions() {
++    FlattenStatementsHelper flattenHelper = new FlattenStatementsHelper();
++    DirectGraph graph = flattenHelper.buildDirectGraph(root);
+ 
+     VarNamesCollector vc = DecompilerContext.getVarNamesCollector();
+ 
+     for (Entry<Integer, Statement> en : mapVarDefStatements.entrySet()) {
+       Statement stat = en.getValue();
+       Integer index = en.getKey();
++      int newindex = varproc.getRemapped(index);
++      if (index.intValue() != newindex) {
++          // remerge
++      }
+ 
+       setupLVTs(stat);
+ 
+@@ -215,17 +239,9 @@ public class VarDefinitionHelper {
+         var.setDefinition(true);
+ 
+         if (varproc.getLVT() != null) {
+-          BitSet values = new BitSet();
+-          MethodProcessorRunnable.getOffset(stat, values);
+-          int start = values.nextSetBit(0);
+-          int end = values.length()-1;
+-          List<LVTVariable> vars = varproc.getLVT().getVars(index, start, end);
+-          if (vars != null) {
+-            if (vars.size() == 1) {
+-              var.setLVT(vars.get(0));
+-            }
+-            // ToDo: If this is >1 then we need to decrease the scope of these variables.
+-            //if this is = 0 and we have lvts for this... then we need to expand the scope...
++          Map<Integer, LVTVariable> vars = varproc.getLVT().getVars(stat.getParentSequenceStat());
++          if (vars.containsKey(var.getIndex())) {
++              var.setLVT(vars.get(var.getIndex()));
+           }
+         }
+ 
+@@ -393,12 +409,17 @@ public class VarDefinitionHelper {
+   private Map<VarVersionPair, Boolean> splitVaribles(Statement stat, String indent) {
+     Map<VarVersionPair, Boolean> vars = new HashMap<VarVersionPair, Boolean>();
+ 
++    SequenceStatement seqStat = stat.getParentSequenceStat();
+     //BitSet values = new BitSet();
+     //MethodProcessorRunnable.getOffset(stat, values);
+     //int start = values.nextSetBit(0);
+     //int end = values.length()-1;
+     //System.out.println(indent + stat.getClass().getSimpleName() + " (" + start +", " + end + ")");
+-
++    if (seqStat != null) {
++        if (!scopedVVPs.containsKey(stat.getBasichead())) {
++            scopedVVPs.put(seqStat, new ArrayList<VarVersionPair>());
++        }
++    }
+     if (stat.type == Statement.TYPE_DO) {
+       DoStatement dost = (DoStatement)stat;
+       if (dost.getLooptype() == DoStatement.LOOP_FOREACH) {
+@@ -443,6 +464,9 @@ public class VarDefinitionHelper {
+         for (Entry<VarVersionPair, Boolean> entry : var.entrySet()) {
+           if (!vars.containsKey(entry.getKey())) {
+             vars.put(entry.getKey(), entry.getValue());
++            if (seqStat != null) {
++                scopedVVPs.get(seqStat).add(entry.getKey());
++            }
+           }
+         }
+       }
+@@ -560,7 +584,9 @@ public class VarDefinitionHelper {
+       return;
+     }
+ 
+-    Map<Integer, LVTVariable> vars = varproc.getLVT().getVars(stat);
++    Map<Integer, LVTVariable> vars = varproc.getLVT().getVars(stat.getParentSequenceStat());
++    List<VarVersionPair> vvps = scopedVVPs.get(stat.getBasichead());
++
+     if (stat.getExprents() == null) {
+       for (Object obj : stat.getSequentialObjects()) {
+         if (obj instanceof Statement) {
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+index cb37d4d..d56c778 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+@@ -53,7 +53,7 @@ public class VarVersionsProcessor {
+     typeProcessor = new VarTypeProcessor();
+     typeProcessor.calculateVarTypes(root, graph);
+ 
+-    simpleMerge(typeProcessor, graph, mt);
++//    simpleMerge(typeProcessor, graph, mt);
+ 
+     // FIXME: advanced merging
+ 
+@@ -103,7 +103,7 @@ public class VarVersionsProcessor {
+     updateVersions(graph, phiVersions);
+   }
+ 
+-  private static void updateVersions(DirectGraph graph, final Map<VarVersionPair, Integer> versions) {
++  public static void updateVersions(DirectGraph graph, final Map<VarVersionPair, Integer> versions) {
+     graph.iterateExprents(new DirectGraph.ExprentIterator() {
+       @Override
+       public int processExprent(Exprent exprent) {
+diff --git a/testData/results/TestLVT.dec b/testData/results/TestLVT.dec
+index d161f07..aed09b4 100644
+--- a/testData/results/TestLVT.dec
++++ b/testData/results/TestLVT.dec
+@@ -14,9 +14,9 @@ public class TestLVT {
+          String scope2a = "scope2a";
+          ArrayList noise = new ArrayList();
+          String spam = scope1 + scope2 + scope2a + i + noise;
+-         System.out.println(spam);
+-      }
+-      for (long i = 0L; i < 10L; ++i) {
++         System.out.println(spam);      }
++
++      for(long i = 0L; i < 10L; ++i) {
+          String scope2 = "scope2+1";
+          String scope2a = "scope2+1a";
+          HashMap noise = new HashMap();
+diff --git a/testData/results/TestLVTScoping.dec b/testData/results/TestLVTScoping.dec
+index 7bbf624..2949d31 100644
+--- a/testData/results/TestLVTScoping.dec
++++ b/testData/results/TestLVTScoping.dec
+@@ -12,11 +12,11 @@ public class TestLVTScoping {
+       System.out.println(a);
+    }
+ 
+-   public static void method2() {      String a;
++   public static void method2() {
+       if(1 == Integer.valueOf(1).intValue()) {
+-         a = "YAY";
++         String a = "YAY";
+       } else {
+-         a = "NAY";
++         String a = "NAY";
+          System.out.println(a);
+       }   }
+ 
+diff --git a/testData/results/TestLexManosLVT.dec b/testData/results/TestLexManosLVT.dec
+index 9ef5e62..285cb14 100644
+--- a/testData/results/TestLexManosLVT.dec
++++ b/testData/results/TestLexManosLVT.dec
+@@ -29,26 +29,28 @@ public class TestLexManosLVT {
+ 
+       }
+       switch(Bob.HI) {
+-      case HI:         System.out.println("HI");
++      case HI:
++         System.out.println("HI");
+          break;
+       case LO:
+-         System.out.println("LO");
+-      }
++         System.out.println("LO");      }
+ 
+       if(TestLexManosLVT.Bob.HI == TestLexManosLVT.Bob.HI) {
+          String a = "a";
+       } else {
+-         String b = "b";      }
++         String b = "b";
++      }
+       String a2;
+       if(TestLexManosLVT.Bob.HI == TestLexManosLVT.Bob.HI) {
+             a2 = "a";
+       } else {            a2 = "b";
+       }
+       if (TestLexManosLVT.Bob.HI == TestLexManosLVT.Bob.HI) {
+-         a2 = "a";
+-      }
++         a2 = "a";      }
+       System.out.println(a2);   }   private static enum Bob {      HI,      LO;
+       static {
++
++
+          for(TestLexManosLVT.Bob b : values()) {
+             for(TestLexManosLVT.Bob c : values()) {
+                for(TestLexManosLVT.Bob d : values()) {
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0040-More-tweaks-it-passes-the-TestLVT-tests.patch b/FernFlower-Patches/0040-More-tweaks-it-passes-the-TestLVT-tests.patch
new file mode 100644
index 0000000..83d5772
--- /dev/null
+++ b/FernFlower-Patches/0040-More-tweaks-it-passes-the-TestLVT-tests.patch
@@ -0,0 +1,160 @@
+From d828cac2aee189062bac3731431f33e2a6ba30ca Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Fri, 11 Sep 2015 23:42:09 -0400
+Subject: [PATCH 040/122] More tweaks, it passes the TestLVT tests
+
+---
+ .../modules/decompiler/stats/Statement.java   | 20 ++++++++------
+ .../decompiler/vars/VarDefinitionHelper.java  | 27 ++++++++++++-------
+ 2 files changed, 29 insertions(+), 18 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+index 5a44fcf..c126050 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+@@ -868,11 +868,11 @@ public class Statement implements IMatchable {
+   // *****************************************************************************
+   // IMatchable implementation
+   // *****************************************************************************
+-  
++
+   public IMatchable findObject(MatchNode matchNode, int index) {
+-    
++
+     int node_type = matchNode.getType();
+-    
++
+     if (node_type == MatchNode.MATCHNODE_STATEMENT && !this.stats.isEmpty()) {
+       String position = (String)matchNode.getRuleValue(MatchProperties.STATEMENT_POSITION);
+       if(position != null) {
+@@ -897,11 +897,11 @@ public class Statement implements IMatchable {
+   }
+ 
+   public boolean match(MatchNode matchNode, MatchEngine engine) {
+-    
++
+     if(matchNode.getType() != MatchNode.MATCHNODE_STATEMENT) {
+       return false;
+     }
+-    
++
+     for(Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
+       switch(rule.getKey()) {
+       case STATEMENT_TYPE:
+@@ -932,14 +932,18 @@ public class Statement implements IMatchable {
+         }
+         break;
+       }
+-      
++
+     }
+-    
++
+     return true;
+   }
+ 
++  private SequenceStatement parentSeqStat;
+ public SequenceStatement getParentSequenceStat() {
+-    return (SequenceStatement) (getParent()!=null && getParent().type == TYPE_SEQUENCE ? getParent() : null);
++    if (parentSeqStat == null) {
++        parentSeqStat = (getParent()!=null && getParent().type == TYPE_SEQUENCE) ? (SequenceStatement)getParent() : new SequenceStatement(Arrays.asList(this));
++    }
++    return parentSeqStat;
+ }
+ 
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index d68ee36..db41fb8 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -30,6 +30,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatemen
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchAllStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
+ import org.jetbrains.java.decompiler.struct.StructClass;
+@@ -53,6 +54,8 @@ public class VarDefinitionHelper {
+   private final CounterContainer counters = DecompilerContext.getCounterContainer();
+ 
+   private final Map<SequenceStatement,List<VarVersionPair>> scopedVVPs;
++
++private RootStatement rootStmt;
+   public VarDefinitionHelper(Statement root, StructMethod mt, VarProcessor varproc) {
+ 
+     mapVarDefStatements = new HashMap<Integer, Statement>();
+@@ -60,6 +63,7 @@ public class VarDefinitionHelper {
+     implDefVars = new HashSet<Integer>();
+     scopedVVPs = new HashMap<SequenceStatement,List<VarVersionPair>>();
+     this.varproc = varproc;
++    this.rootStmt = (RootStatement) root;
+ 
+     VarNamesCollector vc = DecompilerContext.getVarNamesCollector();
+ 
+@@ -145,19 +149,17 @@ public class VarDefinitionHelper {
+   }
+ 
+   public void setVarDefinitions() {
+-    FlattenStatementsHelper flattenHelper = new FlattenStatementsHelper();
+-    DirectGraph graph = flattenHelper.buildDirectGraph(root);
+-
+     VarNamesCollector vc = DecompilerContext.getVarNamesCollector();
+ 
++    Map<SequenceStatement,Map<Integer,VarExprent>> trackingMap = new HashMap<SequenceStatement,Map<Integer,VarExprent>>();
+     for (Entry<Integer, Statement> en : mapVarDefStatements.entrySet()) {
+       Statement stat = en.getValue();
++      if (!trackingMap.containsKey(stat.getParentSequenceStat())) {
++          trackingMap.put(stat.getParentSequenceStat(), new HashMap<Integer,VarExprent>());
++      }
++      Map<Integer, VarExprent> scopedMap = trackingMap.get(stat.getParentSequenceStat());
+       Integer index = en.getKey();
+       int newindex = varproc.getRemapped(index);
+-      if (index.intValue() != newindex) {
+-          // remerge
+-      }
+-
+       setupLVTs(stat);
+ 
+       if (implDefVars.contains(index)) {
+@@ -172,7 +174,7 @@ public class VarDefinitionHelper {
+         DoStatement dstat = (DoStatement)stat;
+         if (dstat.getLooptype() == DoStatement.LOOP_FOR) {
+ 
+-          if (dstat.getInitExprent() != null && setDefinition(dstat.getInitExprent(), index)) {
++          if (dstat.getInitExprent() != null && setDefinition(dstat.getInitExprent(), index, scopedMap)) {
+             continue;
+           }
+           else {
+@@ -215,7 +217,11 @@ public class VarDefinitionHelper {
+       int addindex = 0;
+       for (Exprent expr : lst) {
+ 
+-        if (setDefinition(expr, index)) {
++        if (scopedMap.containsKey(newindex)) {
++            defset = true;
++            break;
++        }
++        if (setDefinition(expr, index, scopedMap)) {
+           defset = true;
+           break;
+         }
+@@ -386,13 +392,14 @@ public class VarDefinitionHelper {
+     return res;
+   }
+ 
+-  private static boolean setDefinition(Exprent expr, Integer index) {
++  private static boolean setDefinition(Exprent expr, Integer index, Map<Integer,VarExprent> stats) {
+     if (expr.type == Exprent.EXPRENT_ASSIGNMENT) {
+       Exprent left = ((AssignmentExprent)expr).getLeft();
+       if (left.type == Exprent.EXPRENT_VAR) {
+         VarExprent var = (VarExprent)left;
+         if (var.getIndex() == index.intValue()) {
+           var.setDefinition(true);
++          stats.put(index, var);
+           return true;
+         }
+       }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0041-Another-fix-from-lex-merges-RHS-and-LHS-of-exprents.patch b/FernFlower-Patches/0041-Another-fix-from-lex-merges-RHS-and-LHS-of-exprents.patch
new file mode 100644
index 0000000..fd23024
--- /dev/null
+++ b/FernFlower-Patches/0041-Another-fix-from-lex-merges-RHS-and-LHS-of-exprents.patch
@@ -0,0 +1,382 @@
+From 9ac4c6fcc3a1c13833ad17c41d6c6218ec9059bb Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sat, 12 Sep 2015 00:00:42 -0400
+Subject: [PATCH 041/122] Another fix from lex, merges RHS and LHS of exprents
+
+---
+ .../decompiler/vars/VarDefinitionHelper.java  | 241 +++++-------------
+ 1 file changed, 61 insertions(+), 180 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index db41fb8..5a276cd 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -16,21 +16,14 @@
+ package org.jetbrains.java.decompiler.modules.decompiler.vars;
+ 
+ import org.jetbrains.java.decompiler.code.CodeConstants;
+-import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
+ import org.jetbrains.java.decompiler.main.DecompilerContext;
+-import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
+ import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
+-import org.jetbrains.java.decompiler.main.rels.MethodProcessorRunnable;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
+-import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph;
+-import org.jetbrains.java.decompiler.modules.decompiler.sforms.FlattenStatementsHelper;
+-import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchAllStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement;
+-import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
+ import org.jetbrains.java.decompiler.struct.StructClass;
+@@ -39,6 +32,7 @@ import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
+ 
+ import java.util.*;
+ import java.util.Map.Entry;
++import java.util.AbstractMap.SimpleImmutableEntry;
+ 
+ public class VarDefinitionHelper {
+ 
+@@ -51,19 +45,12 @@ public class VarDefinitionHelper {
+ 
+   private final VarProcessor varproc;
+ 
+-  private final CounterContainer counters = DecompilerContext.getCounterContainer();
+-
+-  private final Map<SequenceStatement,List<VarVersionPair>> scopedVVPs;
+-
+-private RootStatement rootStmt;
+   public VarDefinitionHelper(Statement root, StructMethod mt, VarProcessor varproc) {
+ 
+     mapVarDefStatements = new HashMap<Integer, Statement>();
+     mapStatementVars = new HashMap<Integer, HashSet<Integer>>();
+     implDefVars = new HashSet<Integer>();
+-    scopedVVPs = new HashMap<SequenceStatement,List<VarVersionPair>>();
+     this.varproc = varproc;
+-    this.rootStmt = (RootStatement) root;
+ 
+     VarNamesCollector vc = DecompilerContext.getVarNamesCollector();
+ 
+@@ -80,21 +67,10 @@ private RootStatement rootStmt;
+ 
+     // method parameters are implicitly defined
+     int varindex = 0;
+-    Statement seq = root.getFirst();
+-    SequenceStatement seqStat = null;
+-    if (seq.type == Statement.TYPE_SEQUENCE) {
+-        seqStat = (SequenceStatement) seq;
+-    }
+     for (int i = 0; i < paramcount; i++) {
+       implDefVars.add(varindex);
+       VarVersionPair vvp = new VarVersionPair(varindex, 0);
+       varproc.setVarName(vvp, vc.getFreeName(varindex));
+-      if (seqStat != null) {
+-          if (scopedVVPs.get(seqStat) == null) {
+-              scopedVVPs.put(seqStat,new ArrayList<VarVersionPair>());
+-          }
+-          scopedVVPs.get(seqStat).add(vvp);
+-      }
+       if (thisvar) {
+         if (i == 0) {
+           varindex++;
+@@ -116,7 +92,7 @@ private RootStatement rootStmt;
+       vc.addName("this");
+     }
+ 
+-    splitVaribles(root, "");
++    mergeVars(root);
+ 
+     // catch variables are implicitly defined
+     LinkedList<Statement> stack = new LinkedList<Statement>();
+@@ -407,211 +383,117 @@ private RootStatement rootStmt;
+     return false;
+   }
+ 
+-  //We merge variables together earlier to make ++ and -- work, we need to now
+-  // split them using the LVT data and full method structure into separate versions.
+-  // this also allows us to re-index/version variables that were not done
+-  // before such as exceptions.
+-  // Return value of referenced variables
+-  //  The boolean is 'isAssignment', true if first reference is assignment, false if just reference.
+-  private Map<VarVersionPair, Boolean> splitVaribles(Statement stat, String indent) {
+-    Map<VarVersionPair, Boolean> vars = new HashMap<VarVersionPair, Boolean>();
+-
+-    SequenceStatement seqStat = stat.getParentSequenceStat();
+-    //BitSet values = new BitSet();
+-    //MethodProcessorRunnable.getOffset(stat, values);
+-    //int start = values.nextSetBit(0);
+-    //int end = values.length()-1;
+-    //System.out.println(indent + stat.getClass().getSimpleName() + " (" + start +", " + end + ")");
+-    if (seqStat != null) {
+-        if (!scopedVVPs.containsKey(stat.getBasichead())) {
+-            scopedVVPs.put(seqStat, new ArrayList<VarVersionPair>());
+-        }
+-    }
+-    if (stat.type == Statement.TYPE_DO) {
+-      DoStatement dost = (DoStatement)stat;
+-      if (dost.getLooptype() == DoStatement.LOOP_FOREACH) {
+-        vars.put(new VarVersionPair((VarExprent)dost.getInitExprent()), true);
+-        splitExprent(dost.getIncExprent(), vars, indent);
+-      }
+-      else if (dost.getLooptype() == DoStatement.LOOP_FOR) {
+-        splitExprent(dost.getInitExprent(), vars, indent);
+-        splitExprent(dost.getConditionExprent(), vars, indent);
+-        splitExprent(dost.getIncExprent(), vars, indent);
+-      }
+-      else if (dost.getLooptype() == DoStatement.LOOP_WHILE) {
+-        splitExprent(dost.getConditionExprent(), vars, indent);
+-      }
++  private void setupLVTs(Statement stat) {
++    if (stat == null || varproc.getLVT() == null) {
++      return;
+     }
+ 
+-    if (stat.getExprents() == null) {
+-      List<Statement> stats = stat.getStats();
+-      List<Map<VarVersionPair, Boolean>> stat_vars = new ArrayList<Map<VarVersionPair, Boolean>>(stats.size());
+-
+-      for (Statement st : stats) {
+-        stat_vars.add(splitVaribles(st, "  " + indent));
+-      }
++    Map<Integer, LVTVariable> vars = varproc.getLVT().getVars(stat.getParentSequenceStat());
+ 
+-      for (int x = 0; x < stats.size(); x++) {
+-        switch (stats.get(x).type) {
+-          case Statement.TYPE_DO: {
+-            DoStatement dost = (DoStatement)stats.get(x);
+-            VarVersionPair init = extractVar(dost.getInitExprent());
+-            if (init != null && (dost.getLooptype() == DoStatement.LOOP_FOR || dost.getLooptype()== DoStatement.LOOP_FOREACH)) {
+-              if (safeToRename(init, stats, stat_vars, x)) {
+-                VarVersionPair newIndex = new VarVersionPair(counters.getCounterAndIncrement(CounterContainer.VAR_COUNTER), 0);
+-                remapVar(init, newIndex, stats.get(x), stat_vars.get(x));
+-              }
+-            }
+-            break;
+-          }
++    if (stat.getExprents() == null) {
++      for (Object obj : stat.getSequentialObjects()) {
++        if (obj instanceof Statement) {
++          setupLVTs((Statement)obj);
+         }
+-      }
+-
+-      for (Map<VarVersionPair, Boolean> var : stat_vars) {
+-        for (Entry<VarVersionPair, Boolean> entry : var.entrySet()) {
+-          if (!vars.containsKey(entry.getKey())) {
+-            vars.put(entry.getKey(), entry.getValue());
+-            if (seqStat != null) {
+-                scopedVVPs.get(seqStat).add(entry.getKey());
+-            }
+-          }
++        else if (obj instanceof Exprent) {
++          setupLVTs((Exprent)obj, vars);
+         }
+       }
+     }
+     else {
+-      for (Exprent e : stat.getExprents()) {
+-        splitExprent(e, vars, indent);
+-      }
+-    }
+-
+-    if (stat.type == Statement.TYPE_DO) {
+-      DoStatement dost = (DoStatement)stat;
+-      if (dost.getLooptype() == DoStatement.LOOP_DOWHILE) {
+-        splitExprent(dost.getConditionExprent(), vars, indent);
++      for (Exprent exp : stat.getExprents()) {
++        setupLVTs(exp, vars);
+       }
+     }
+-
+-    //for (Map.Entry<VarVersionPair, Boolean> entry : vars.entrySet()) {
+-    //  System.out.println(indent + "  " + (entry.getValue() ? "ass " : "ref ") + entry.getKey());
+-    //}
+-
+-    return vars;
+   }
+ 
+-  private static void splitExprent(Exprent e, Map<VarVersionPair, Boolean> map, String indent) {
+-    if (e == null)
++  private void setupLVTs(Exprent exprent, Map<Integer, LVTVariable> lvts) {
++    if (exprent == null) {
+       return;
+-    if (e.type == Exprent.EXPRENT_ASSIGNMENT && ((AssignmentExprent)e).getLeft().type == Exprent.EXPRENT_VAR) {
+-      VarVersionPair var = new VarVersionPair((VarExprent)((AssignmentExprent)e).getLeft());
+-      if (!map.containsKey(var)) {
+-        map.put(var, true);
+-      }
+-      splitExprent(((AssignmentExprent)e).getRight(), map, indent);
+     }
+-    else {
+-      for (VarVersionPair var : e.getAllVariables()) {
+-        if (!map.containsKey(var)) {
+-          map.put(var, false);
+-        }
+-      }
+-    }
+-  }
+-
+-  private static VarVersionPair extractVar(Exprent exp) {
+-    if (exp == null) {
+-      return null;
+-    }
+-    if (exp.type == Exprent.EXPRENT_ASSIGNMENT && ((AssignmentExprent)exp).getLeft().type == Exprent.EXPRENT_VAR) {
+-      return new VarVersionPair((VarExprent)((AssignmentExprent)exp).getLeft());
+-    }
+-    else if (exp.type == Exprent.EXPRENT_VAR) {
+-      return new VarVersionPair((VarExprent)exp);
+-    }
+-    return null;
+-  }
++    List<Exprent> lst = exprent.getAllExprents(true);
++    lst.add(exprent);
+ 
+-  private static boolean safeToRename(VarVersionPair var, List<Statement> stats, List<Map<VarVersionPair, Boolean>> list, int index) {
+-    for (int x = index + 1; x < list.size(); x++) {
+-      Map<VarVersionPair, Boolean> map = list.get(x);
+-      if (map.containsKey(var)) {
+-        return map.get(var);
++    for (Exprent expr : lst) {
++      if (expr.type == Exprent.EXPRENT_VAR) {
++        VarExprent var = (VarExprent)expr;
++        int index = varproc.getRemapped(var.getIndex());
++        LVTVariable lvt = lvts.get(index);
++        if (lvt != null) {
++          var.setLVT(lvt);
++        }
+       }
+     }
+-    return false;
+-  }
+-
+-  private void remapVar(VarVersionPair from, VarVersionPair to, Statement stat, Map<VarVersionPair, Boolean> stats) {
+-    remapVar(from, to, stat);
+-    varproc.copyVarInfo(from, to);
+-    stats.put(to, true);
+-    stats.remove(from);
+   }
+ 
+-  private static void remapVar(VarVersionPair from, VarVersionPair to, Statement stat) {
+-    if (stat == null) {
+-      return;
+-    }
++  private void mergeVars(Statement stat) {
+     if (stat.getExprents() == null) {
+       for (Object obj : stat.getSequentialObjects()) {
+         if (obj instanceof Statement) {
+-          remapVar(from, to, (Statement)obj);
++          mergeVars((Statement)obj);
+         }
+-        else if (obj instanceof Exprent) {
+-          remapVar(from, to, (Exprent)obj);
++        else if (obj instanceof AssignmentExprent) {
++          remapVar(checkAssignment((AssignmentExprent)obj), stat.getParent());
+         }
+       }
+     }
+     else {
+       for (Exprent exp : stat.getExprents()) {
+-        remapVar(from, to, exp);
++        if (exp instanceof AssignmentExprent) {
++          remapVar(checkAssignment((AssignmentExprent)exp), stat.getParent());
++        }
+       }
+     }
+   }
+ 
+-  private static void remapVar(VarVersionPair from, VarVersionPair to, Exprent exprent) {
+-    if (exprent == null) {
+-      return;
++  private Map.Entry<VarVersionPair, VarVersionPair> checkAssignment(AssignmentExprent exp) {
++    if (exp.getLeft().type != Exprent.EXPRENT_VAR) {
++      return null;
+     }
+-    List<Exprent> lst = exprent.getAllExprents(true);
+-    lst.add(exprent);
+ 
+-    for (Exprent expr : lst) {
+-      if (expr.type == Exprent.EXPRENT_VAR) {
+-        VarExprent var = (VarExprent)expr;
+-        if (var.getIndex() == from.var && var.getVersion() == from.version) {
+-          var.setIndex(to.var);
+-          var.setVersion(to.version);
++    VarExprent left = (VarExprent)exp.getLeft();
++    VarExprent right = null;
++    int index = varproc.getRemapped(left.getIndex());
++
++    for (Exprent e : exp.getRight().getAllExprents(true)) {
++      if (e.type == Exprent.EXPRENT_VAR) {
++        if (varproc.getRemapped(((VarExprent)e).getIndex()) == index) {
++          right = (VarExprent)e;
++          break;
+         }
+       }
+     }
++
++    if (right == null) {
++      return null;
++    }
++
++    return new SimpleImmutableEntry<VarVersionPair, VarVersionPair>(new VarVersionPair(left), new VarVersionPair(right));
+   }
+ 
+-  private void setupLVTs(Statement stat) {
+-    if (stat == null || varproc.getLVT() == null) {
++  private static void remapVar(Entry<VarVersionPair, VarVersionPair> remap, Statement stat) {
++    if (remap == null || stat == null) {
+       return;
+     }
+ 
+-    Map<Integer, LVTVariable> vars = varproc.getLVT().getVars(stat.getParentSequenceStat());
+-    List<VarVersionPair> vvps = scopedVVPs.get(stat.getBasichead());
+-
+     if (stat.getExprents() == null) {
+       for (Object obj : stat.getSequentialObjects()) {
+         if (obj instanceof Statement) {
+-          setupLVTs((Statement)obj);
++          remapVar(remap, (Statement)obj);
+         }
+         else if (obj instanceof Exprent) {
+-          setupLVTs((Exprent)obj, vars);
++          remapVar(remap.getKey(), remap.getValue(), (Exprent)obj);
+         }
+       }
+     }
+     else {
+       for (Exprent exp : stat.getExprents()) {
+-        setupLVTs(exp, vars);
++        remapVar(remap.getKey(), remap.getValue(), exp);
+       }
+     }
+   }
+ 
+-  private void setupLVTs(Exprent exprent, Map<Integer, LVTVariable> lvts) {
++  private static void remapVar(VarVersionPair from, VarVersionPair to, Exprent exprent) {
+     if (exprent == null) {
+       return;
+     }
+@@ -621,12 +503,11 @@ private RootStatement rootStmt;
+     for (Exprent expr : lst) {
+       if (expr.type == Exprent.EXPRENT_VAR) {
+         VarExprent var = (VarExprent)expr;
+-        int index = varproc.getRemapped(var.getIndex());
+-        LVTVariable lvt = lvts.get(index);
+-        if (lvt != null) {
+-          var.setLVT(lvt);
++        if (var.getIndex() == from.var && var.getVersion() == from.version) {
++          var.setIndex(to.var);
++          var.setVersion(to.version);
+         }
+       }
+     }
+   }
+-}
++}
+\ No newline at end of file
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0042-need-to-match-both-start-and-end-to-avoid-weirdness-.patch b/FernFlower-Patches/0042-need-to-match-both-start-and-end-to-avoid-weirdness-.patch
new file mode 100644
index 0000000..8444a55
--- /dev/null
+++ b/FernFlower-Patches/0042-need-to-match-both-start-and-end-to-avoid-weirdness-.patch
@@ -0,0 +1,111 @@
+From 09209954680f314ed735818b7f22ca1e81080509 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sat, 12 Sep 2015 00:48:02 -0400
+Subject: [PATCH 042/122] need to match both start and end, to avoid weirdness
+ sometimes
+
+---
+ .../modules/decompiler/vars/LVTVariable.java   |  7 ++++---
+ .../decompiler/vars/LocalVariableTable.java    | 17 +++++------------
+ .../modules/decompiler/vars/StartEndPair.java  | 18 ++++++++++++++++++
+ 3 files changed, 27 insertions(+), 15 deletions(-)
+ create mode 100644 src/org/jetbrains/java/decompiler/modules/decompiler/vars/StartEndPair.java
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
+index bc7ba23..59dee69 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
+@@ -50,11 +50,12 @@ public class LVTVariable implements Comparable<LVTVariable> {
+     return index * 31 + end;
+   }
+ 
+-  public void addTo(Map<Integer, Set<LVTVariable>> endpoints) {
+-    Set<LVTVariable> ends = endpoints.get(this.end);
++  public void addTo(Map<StartEndPair, Set<LVTVariable>> endpoints) {
++    StartEndPair sepair = new StartEndPair(this.start, this.end);
++    Set<LVTVariable> ends = endpoints.get(sepair);
+     if (ends == null) {
+       ends = new HashSet<LVTVariable>();
+-      endpoints.put(this.end, ends);
++      endpoints.put(sepair, ends);
+     }
+     ends.add(this);
+   }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+index f7e1858..1de7181 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+@@ -1,31 +1,23 @@
+ package org.jetbrains.java.decompiler.modules.decompiler.vars;
+ 
+-import java.util.ArrayDeque;
+ import java.util.ArrayList;
+ import java.util.BitSet;
+ import java.util.HashMap;
+-import java.util.HashSet;
+ import java.util.List;
+ import java.util.Map;
+-import java.util.Map.Entry;
+ import java.util.Set;
+-import java.util.Stack;
+ 
+-import org.jetbrains.java.decompiler.code.Instruction;
+-import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
+ import org.jetbrains.java.decompiler.main.rels.MethodProcessorRunnable;
+-import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
+-import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
+ 
+ public class LocalVariableTable {
+-  private Map<Integer, Set<LVTVariable>> endpoints;
++  private Map<StartEndPair, Set<LVTVariable>> endpoints;
+   private ArrayList<LVTVariable> allLVT;
+   private Map<Integer, List<LVTVariable>> mapLVT;
+ 
+   public LocalVariableTable(int len) {
+-    endpoints = new HashMap<Integer,Set<LVTVariable>>(len);
++    endpoints = new HashMap<StartEndPair,Set<LVTVariable>>(len);
+     allLVT = new ArrayList<LVTVariable>(len);
+   }
+ 
+@@ -106,9 +98,10 @@ public class LocalVariableTable {
+       }
+     //System.out.println(indent + stat.getClass().getSimpleName() + " (" + start +", " + end + ")");
+ 
++    StartEndPair sepair = new StartEndPair(start, end);
+     Map<Integer, LVTVariable> ret = new HashMap<Integer, LVTVariable>();
+-    if (endpoints.containsKey(end)) {
+-        for (LVTVariable lvt : endpoints.get(end)) {
++    if (endpoints.containsKey(sepair)) {
++        for (LVTVariable lvt : endpoints.get(sepair)) {
+             ret.put(lvt.index,lvt);
+         }
+     }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/StartEndPair.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/StartEndPair.java
+new file mode 100644
+index 0000000..23a3929
+--- /dev/null
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/StartEndPair.java
+@@ -0,0 +1,18 @@
++package org.jetbrains.java.decompiler.modules.decompiler.vars;
++
++public class StartEndPair {
++    public final int start;
++    public final int end;
++    public StartEndPair(int start, int end) {
++        this.start = start;
++        this.end = end;
++    }
++    @Override
++    public boolean equals(Object obj) {
++        return ((StartEndPair)obj).start == start && ((StartEndPair)obj).end == end;
++    }
++    @Override
++    public int hashCode() {
++        return start * 31 + end;
++    }
++}
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0043-Better-remapping-of-assignment-merges.patch b/FernFlower-Patches/0043-Better-remapping-of-assignment-merges.patch
new file mode 100644
index 0000000..e8f9cf9
--- /dev/null
+++ b/FernFlower-Patches/0043-Better-remapping-of-assignment-merges.patch
@@ -0,0 +1,131 @@
+From fcb5e35a68f7155018b1330846e9fe8222f9e39d Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Fri, 11 Sep 2015 21:50:11 -0700
+Subject: [PATCH 043/122] Better remapping of assignment merges.
+
+---
+ .../decompiler/vars/VarDefinitionHelper.java  | 56 +++++++++++--------
+ 1 file changed, 34 insertions(+), 22 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index 5a276cd..2436d6d 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -427,51 +427,61 @@ public class VarDefinitionHelper {
+   }
+ 
+   private void mergeVars(Statement stat) {
++    Map<VarVersionPair, VarVersionPair> remaps = new HashMap<VarVersionPair, VarVersionPair>();
++    mergeVars(stat, remaps);
++    if (!remaps.isEmpty()) {
++      for (Entry<VarVersionPair, VarVersionPair> entry : remaps.entrySet()) {
++        VarVersionPair end = entry.getKey();
++        while (remaps.containsKey(end)) {
++          end = remaps.get(end);
++        }
++        remaps.put(entry.getKey(), end);
++      }
++      remapVar(remaps, stat);
++    }
++  }
++  private void mergeVars(Statement stat, Map<VarVersionPair, VarVersionPair> remaps) {
+     if (stat.getExprents() == null) {
+       for (Object obj : stat.getSequentialObjects()) {
+         if (obj instanceof Statement) {
+-          mergeVars((Statement)obj);
++          mergeVars((Statement)obj, remaps);
+         }
+         else if (obj instanceof AssignmentExprent) {
+-          remapVar(checkAssignment((AssignmentExprent)obj), stat.getParent());
++          checkAssignment((AssignmentExprent)obj, remaps);
+         }
+       }
+     }
+     else {
+       for (Exprent exp : stat.getExprents()) {
+         if (exp instanceof AssignmentExprent) {
+-          remapVar(checkAssignment((AssignmentExprent)exp), stat.getParent());
++          checkAssignment((AssignmentExprent)exp, remaps);
+         }
+       }
+     }
+   }
+ 
+-  private Map.Entry<VarVersionPair, VarVersionPair> checkAssignment(AssignmentExprent exp) {
++  private void checkAssignment(AssignmentExprent exp, Map<VarVersionPair, VarVersionPair> remaps) {
+     if (exp.getLeft().type != Exprent.EXPRENT_VAR) {
+-      return null;
++      return;
+     }
+ 
+     VarExprent left = (VarExprent)exp.getLeft();
+-    VarExprent right = null;
+     int index = varproc.getRemapped(left.getIndex());
+ 
+     for (Exprent e : exp.getRight().getAllExprents(true)) {
+       if (e.type == Exprent.EXPRENT_VAR) {
+-        if (varproc.getRemapped(((VarExprent)e).getIndex()) == index) {
+-          right = (VarExprent)e;
+-          break;
++          VarExprent right = (VarExprent)e;
++        if (varproc.getRemapped(right.getIndex()) == index) {
++          if (!left.equals(right) && left.getIndex() > right.getIndex()) {
++            remaps.put(new VarVersionPair(left), new VarVersionPair(right));
++          }
++          return;
+         }
+       }
+     }
+-
+-    if (right == null) {
+-      return null;
+-    }
+-
+-    return new SimpleImmutableEntry<VarVersionPair, VarVersionPair>(new VarVersionPair(left), new VarVersionPair(right));
+   }
+ 
+-  private static void remapVar(Entry<VarVersionPair, VarVersionPair> remap, Statement stat) {
++  private static void remapVar(Map<VarVersionPair, VarVersionPair> remap, Statement stat) {
+     if (remap == null || stat == null) {
+       return;
+     }
+@@ -482,18 +492,18 @@ public class VarDefinitionHelper {
+           remapVar(remap, (Statement)obj);
+         }
+         else if (obj instanceof Exprent) {
+-          remapVar(remap.getKey(), remap.getValue(), (Exprent)obj);
++          remapVar(remap, (Exprent)obj);
+         }
+       }
+     }
+     else {
+       for (Exprent exp : stat.getExprents()) {
+-        remapVar(remap.getKey(), remap.getValue(), exp);
++        remapVar(remap, exp);
+       }
+     }
+   }
+ 
+-  private static void remapVar(VarVersionPair from, VarVersionPair to, Exprent exprent) {
++  private static void remapVar(Map<VarVersionPair, VarVersionPair> remap, Exprent exprent) {
+     if (exprent == null) {
+       return;
+     }
+@@ -503,9 +513,11 @@ public class VarDefinitionHelper {
+     for (Exprent expr : lst) {
+       if (expr.type == Exprent.EXPRENT_VAR) {
+         VarExprent var = (VarExprent)expr;
+-        if (var.getIndex() == from.var && var.getVersion() == from.version) {
+-          var.setIndex(to.var);
+-          var.setVersion(to.version);
++        VarVersionPair old = new VarVersionPair(var);
++        VarVersionPair new_ = remap.get(old);
++        if (new_ != null) {
++          var.setIndex(new_.var);
++          var.setVersion(new_.version);
+         }
+       }
+     }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0044-PPMM-test-for-lex.patch b/FernFlower-Patches/0044-PPMM-test-for-lex.patch
new file mode 100644
index 0000000..01051b7
--- /dev/null
+++ b/FernFlower-Patches/0044-PPMM-test-for-lex.patch
@@ -0,0 +1,67 @@
+From ab0b5409d7cacdc6d9c208de4657377a4a259c05 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sun, 13 Sep 2015 18:25:07 -0400
+Subject: [PATCH 044/122] PPMM test for lex
+
+---
+ test/org/jetbrains/java/decompiler/LVTTest.java |   9 ++++++---
+ testData/classes/pkg/TestPPMM.class             | Bin 0 -> 371 bytes
+ testData/src/pkg/TestPPMM.java                  |  11 +++++++++++
+ 3 files changed, 17 insertions(+), 3 deletions(-)
+ create mode 100644 testData/classes/pkg/TestPPMM.class
+ create mode 100644 testData/src/pkg/TestPPMM.java
+
+diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
+index f4d869c..d2a8f1c 100644
+--- a/test/org/jetbrains/java/decompiler/LVTTest.java
++++ b/test/org/jetbrains/java/decompiler/LVTTest.java
+@@ -35,7 +35,10 @@ public class LVTTest extends SingleClassesTestBase {
+         super.setUp();
+         fixture.cleanup = false;
+     }
+-  @Test public void testMatchLM() { doTest("pkg/TestLexManosLVT"); }
+-  @Test public void testMatch1() { doTest("pkg/TestLVT"); }
+-  @Test public void testMatch2() { doTest("pkg/TestLVTScoping"); }
++  @Test public void testMatch1() { doTest("pkg/TestPPMM"); }
++//  @Test public void testMatchLM() { doTest("pkg/TestLexManosLVT"); }
++//  @Test public void testMatch1() { doTest("pkg/TestLVT"); }
++//  @Test public void testMatch2() { doTest("pkg/TestLVTScoping"); }
++//  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
++//  @Test public void testMCGuiCmdBlock() { doTest("net/minecraft/client/gui/GuiCommandBlock"); }
+ }
+diff --git a/testData/classes/pkg/TestPPMM.class b/testData/classes/pkg/TestPPMM.class
+new file mode 100644
+index 0000000000000000000000000000000000000000..e493a99dbb742f1f20c3cb134d7366db47c5d4b4
+GIT binary patch
+literal 371
+zcmYjL%}&BV7@V&yEtFyr6A#|JsRx^Qm3T2RF)2zS!Sl9maIv;cDL#QO<jKT?58y)?
+zr+{d7cfS38X1@9Q{`drNhCL6KASj<^(L^um@pv@y;0XG2^`fFo<+JEEnd`I`xI>eh
+z`a)nI9Zv<$W$~bW*ysdk!4-tD$@R_hInmWbC7Bis;v!YqR8^+QH$|s@Gz-B_{D0@U
+zz$#0DD86ffe^)H4R9~4!ruXaYv@wN4&;rc^7Jpn#^q57A!q_@_NBeEn_K8g!By@?v
+zdVsOVj3&0^duA4Ep*?&R+1@{y1CCOgLoU%no2QEoCH$52{+hm#wzwcfpQ3_Y@+=H~
+E0NOq`X8-^I
+
+literal 0
+HcmV?d00001
+
+diff --git a/testData/src/pkg/TestPPMM.java b/testData/src/pkg/TestPPMM.java
+new file mode 100644
+index 0000000..02eecf4
+--- /dev/null
++++ b/testData/src/pkg/TestPPMM.java
+@@ -0,0 +1,11 @@
++package pkg;
++
++public class TestPPMM {
++    public void pp() {
++        int a = 0;
++        a++;
++        a++;
++        a++;
++        a++;
++    }
++}
+\ No newline at end of file
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0045-Change-begin-end-detection.-Less-derpy.patch b/FernFlower-Patches/0045-Change-begin-end-detection.-Less-derpy.patch
new file mode 100644
index 0000000..ac2f62e
--- /dev/null
+++ b/FernFlower-Patches/0045-Change-begin-end-detection.-Less-derpy.patch
@@ -0,0 +1,309 @@
+From 78afb4580567df9f7d1e6245dc9735eba714a3b2 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sun, 13 Sep 2015 18:26:04 -0400
+Subject: [PATCH 045/122] Change begin/end detection. Less derpy.
+
+---
+ .../modules/decompiler/stats/DoStatement.java |  6 +++++
+ .../modules/decompiler/stats/IfStatement.java | 15 ++++++++-----
+ .../decompiler/stats/RootStatement.java       |  6 +++++
+ .../decompiler/stats/SequenceStatement.java   |  6 +++++
+ .../modules/decompiler/stats/Statement.java   | 22 ++++++++++++-------
+ .../decompiler/stats/SwitchStatement.java     | 12 ++++++++++
+ .../decompiler/vars/LocalVariableTable.java   | 17 +++++---------
+ .../modules/decompiler/vars/StartEndPair.java | 15 +++++++++++++
+ .../decompiler/vars/VarDefinitionHelper.java  | 14 +++++++-----
+ 9 files changed, 82 insertions(+), 31 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
+index 8359284..0768912 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
+@@ -21,6 +21,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
+ import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.StartEndPair;
+ 
+ import java.util.ArrayList;
+ import java.util.List;
+@@ -241,4 +242,9 @@ public class DoStatement extends Statement {
+   public void setLooptype(int looptype) {
+     this.looptype = looptype;
+   }
++
++  @Override
++    public StartEndPair getStartEndRange() {
++        return super.getStartEndRange();
++    }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
+index 8be0dcc..f216b73 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
+@@ -22,6 +22,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
+ import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.IfExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.StartEndPair;
+ import org.jetbrains.java.decompiler.struct.match.IMatchable;
+ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
+ import org.jetbrains.java.decompiler.struct.match.MatchNode;
+@@ -425,18 +426,18 @@ public class IfStatement extends Statement {
+   public StatEdge getElseEdge() {
+     return elseedge;
+   }
+-  
++
+   // *****************************************************************************
+   // IMatchable implementation
+   // *****************************************************************************
+-  
++
+   public IMatchable findObject(MatchNode matchNode, int index) {
+ 
+     IMatchable object = super.findObject(matchNode, index);
+     if(object != null) {
+       return object;
+     }
+-    
++
+     if(matchNode.getType() == MatchNode.MATCHNODE_EXPRENT) {
+       String position = (String)matchNode.getRuleValue(MatchProperties.EXPRENT_POSITION);
+       if("head".equals(position)) {
+@@ -459,8 +460,12 @@ public class IfStatement extends Statement {
+         return false;
+       }
+     }
+-        
++
+     return true;
+   }
+-  
++
++  @Override
++    public StartEndPair getStartEndRange() {
++        return StartEndPair.join(super.getStartEndRange(),ifstat != null ? ifstat.getStartEndRange() : null,elsestat != null ? elsestat.getStartEndRange(): null);
++    }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
+index 7193f9a..0a1e798 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
+@@ -18,6 +18,7 @@ package org.jetbrains.java.decompiler.modules.decompiler.stats;
+ import org.jetbrains.java.decompiler.main.TextBuffer;
+ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.StartEndPair;
+ 
+ 
+ public class RootStatement extends Statement {
+@@ -46,4 +47,9 @@ public class RootStatement extends Statement {
+   public void setDummyExit(DummyExitStatement dummyExit) {
+     this.dummyExit = dummyExit;
+   }
++
++  @Override
++    public StartEndPair getStartEndRange() {
++        return first.getStartEndRange();
++    }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
+index 7d2ee43..b3785fb 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
+@@ -20,6 +20,7 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+ import org.jetbrains.java.decompiler.modules.decompiler.DecHelper;
+ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
+ import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.StartEndPair;
+ 
+ import java.util.Arrays;
+ import java.util.List;
+@@ -137,4 +138,9 @@ public class SequenceStatement extends Statement {
+   public Statement getSimpleCopy() {
+     return new SequenceStatement();
+   }
++
++  @Override
++    public StartEndPair getStartEndRange() {
++        return super.getStartEndRange();
++    }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+index c126050..806c4d5 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+@@ -24,6 +24,7 @@ import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
+ import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
+ import org.jetbrains.java.decompiler.modules.decompiler.StrongConnectivityHelper;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.StartEndPair;
+ import org.jetbrains.java.decompiler.struct.match.IMatchable;
+ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
+ import org.jetbrains.java.decompiler.struct.match.MatchNode;
+@@ -938,12 +939,17 @@ public class Statement implements IMatchable {
+     return true;
+   }
+ 
+-  private SequenceStatement parentSeqStat;
+-public SequenceStatement getParentSequenceStat() {
+-    if (parentSeqStat == null) {
+-        parentSeqStat = (getParent()!=null && getParent().type == TYPE_SEQUENCE) ? (SequenceStatement)getParent() : new SequenceStatement(Arrays.asList(this));
+-    }
+-    return parentSeqStat;
+-}
+-
++  private StartEndPair endpoints;
++  public StartEndPair getStartEndRange() {
++      if (endpoints == null) {
++          int start = Integer.MAX_VALUE;
++          int end = Integer.MIN_VALUE;
++          for (Statement st : getStats()) {
++              start = Math.min(start, st.getBasichead().getBlock().getStartInstruction());
++              end = Math.max(end, st.getBasichead().getBlock().getEndInstruction());
++          }
++          endpoints = new StartEndPair(start,end);
++      }
++      return endpoints;
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
+index 5916490..8d7127c 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
+@@ -27,6 +27,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.SwitchExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.StartEndPair;
+ import org.jetbrains.java.decompiler.struct.gen.VarType;
+ 
+ import java.util.*;
+@@ -365,4 +366,15 @@ public class SwitchStatement extends Statement {
+   public List<List<ConstExprent>> getCaseValues() {
+     return caseValues;
+   }
++
++  @Override
++    public StartEndPair getStartEndRange() {
++      StartEndPair[] sepairs = new StartEndPair[caseStatements.size() + 1];
++      int i = 0;
++      sepairs[i++] = super.getStartEndRange();
++      for (Statement st : caseStatements) {
++          sepairs[i++] = st.getStartEndRange();
++      }
++      return StartEndPair.join(sepairs);
++    }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+index 1de7181..fe45b11 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+@@ -3,6 +3,7 @@ package org.jetbrains.java.decompiler.modules.decompiler.vars;
+ import java.util.ArrayList;
+ import java.util.BitSet;
+ import java.util.HashMap;
++import java.util.HashSet;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.Set;
+@@ -88,18 +89,10 @@ public class LocalVariableTable {
+     return getMapVarNames().get(index);
+   }
+ 
+-  public Map<Integer, LVTVariable> getVars(SequenceStatement sequenceStatement) {
+-      if (sequenceStatement == null) return new HashMap<Integer, LVTVariable>();
+-      int start = Integer.MAX_VALUE;
+-      int end = Integer.MIN_VALUE;
+-      for (Statement st : sequenceStatement.getStats()) {
+-          start = Math.min(start, st.getBasichead().getBlock().getStartInstruction());
+-          end = Math.max(end, st.getBasichead().getBlock().getEndInstruction());
+-      }
+-    //System.out.println(indent + stat.getClass().getSimpleName() + " (" + start +", " + end + ")");
+-
+-    StartEndPair sepair = new StartEndPair(start, end);
+-    Map<Integer, LVTVariable> ret = new HashMap<Integer, LVTVariable>();
++  public Map<Integer, LVTVariable> getVars(Statement statement) {
++      HashMap<Integer,LVTVariable> ret = new HashMap<Integer,LVTVariable>();
++      if (statement == null) return ret;
++      StartEndPair sepair = statement.getStartEndRange();
+     if (endpoints.containsKey(sepair)) {
+         for (LVTVariable lvt : endpoints.get(sepair)) {
+             ret.put(lvt.index,lvt);
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/StartEndPair.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/StartEndPair.java
+index 23a3929..32c8799 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/StartEndPair.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/StartEndPair.java
+@@ -15,4 +15,19 @@ public class StartEndPair {
+     public int hashCode() {
+         return start * 31 + end;
+     }
++    @Override
++    public String toString() {
++        return String.format("%d->%d",start,end);
++    }
++
++    public static StartEndPair join(StartEndPair... pairs) {
++        int start = Integer.MAX_VALUE;
++        int end = Integer.MIN_VALUE;
++        for (StartEndPair pair : pairs) {
++            if (pair == null) continue;
++            start = Math.min(start, pair.start);
++            end = Math.max(end, pair.end);
++        }
++        return new StartEndPair(start, end);
++    }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index 2436d6d..56061fe 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -127,13 +127,13 @@ public class VarDefinitionHelper {
+   public void setVarDefinitions() {
+     VarNamesCollector vc = DecompilerContext.getVarNamesCollector();
+ 
+-    Map<SequenceStatement,Map<Integer,VarExprent>> trackingMap = new HashMap<SequenceStatement,Map<Integer,VarExprent>>();
++    Map<Statement,Map<Integer,VarExprent>> trackingMap = new HashMap<Statement,Map<Integer,VarExprent>>();
+     for (Entry<Integer, Statement> en : mapVarDefStatements.entrySet()) {
+       Statement stat = en.getValue();
+-      if (!trackingMap.containsKey(stat.getParentSequenceStat())) {
+-          trackingMap.put(stat.getParentSequenceStat(), new HashMap<Integer,VarExprent>());
++      if (!trackingMap.containsKey(stat)) {
++          trackingMap.put(stat, new HashMap<Integer,VarExprent>());
+       }
+-      Map<Integer, VarExprent> scopedMap = trackingMap.get(stat.getParentSequenceStat());
++      Map<Integer, VarExprent> scopedMap = trackingMap.get(stat);
+       Integer index = en.getKey();
+       int newindex = varproc.getRemapped(index);
+       setupLVTs(stat);
+@@ -221,7 +221,7 @@ public class VarDefinitionHelper {
+         var.setDefinition(true);
+ 
+         if (varproc.getLVT() != null) {
+-          Map<Integer, LVTVariable> vars = varproc.getLVT().getVars(stat.getParentSequenceStat());
++          Map<Integer, LVTVariable> vars = varproc.getLVT().getVars(stat);
+           if (vars.containsKey(var.getIndex())) {
+               var.setLVT(vars.get(var.getIndex()));
+           }
+@@ -388,7 +388,7 @@ public class VarDefinitionHelper {
+       return;
+     }
+ 
+-    Map<Integer, LVTVariable> vars = varproc.getLVT().getVars(stat.getParentSequenceStat());
++    Map<Integer, LVTVariable> vars = varproc.getLVT().getVars(stat);
+ 
+     if (stat.getExprents() == null) {
+       for (Object obj : stat.getSequentialObjects()) {
+@@ -421,6 +421,8 @@ public class VarDefinitionHelper {
+         LVTVariable lvt = lvts.get(index);
+         if (lvt != null) {
+           var.setLVT(lvt);
++        } else {
++            System.currentTimeMillis();
+         }
+       }
+     }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0046-Fixup-NPE-from-PPMM-helper-and-expand-PPMM-test-to-i.patch b/FernFlower-Patches/0046-Fixup-NPE-from-PPMM-helper-and-expand-PPMM-test-to-i.patch
new file mode 100644
index 0000000..790d095
--- /dev/null
+++ b/FernFlower-Patches/0046-Fixup-NPE-from-PPMM-helper-and-expand-PPMM-test-to-i.patch
@@ -0,0 +1,247 @@
+From 7e027aef8ba2caaee9f3e93412274b7073b8f6a7 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sun, 13 Sep 2015 17:49:00 -0700
+Subject: [PATCH 046/122] Fixup NPE from PPMM helper, and expand PPMM test to
+ include more edge cases.
+
+---
+ .../modules/decompiler/PPandMMHelper.java     |  15 +++-
+ .../modules/decompiler/exps/ConstExprent.java |   5 ++
+ testData/classes/pkg/TestPPMM.class           | Bin 371 -> 936 bytes
+ testData/results/TestPPMM.dec                 |  70 ++++++++++++++++++
+ testData/src/pkg/TestPPMM.java                |  69 +++++++++++++++--
+ 5 files changed, 150 insertions(+), 9 deletions(-)
+ create mode 100644 testData/results/TestPPMM.dec
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
+index d93bad6..f39946d 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
+@@ -34,6 +34,7 @@ import java.util.HashSet;
+ import java.util.LinkedList;
+ import java.util.List;
+ import java.util.Map;
++import java.util.Map.Entry;
+ 
+ public class PPandMMHelper {
+ 
+@@ -183,13 +184,23 @@ public class PPandMMHelper {
+ 
+     VarExprent v1 = (VarExprent)e1;
+     VarExprent v2 = (VarExprent)e2;
+-    return varProc.getRemapped(v1.getIndex()) == varProc.getRemapped(v2.getIndex())
+-            && InterpreterUtil.equalObjects(v1.getVarType(), v2.getVarType());
++    return varProc.getRemapped(v1.getIndex()) == varProc.getRemapped(v2.getIndex());
++    //Probably should up this to checking if the types are in the same family, Like byte == int == long
++            //&& InterpreterUtil.equalObjects(v1.getVarType(), v2.getVarType());
+   }
+ 
+ 
+   private void updateVersions(DirectGraph graph) {
+     if (remaps.isEmpty()) return;
++
++    for (Entry<VarVersionPair, VarVersionPair> remap : remaps.entrySet()) {
++      VarVersionPair target = remap.getValue();
++      while (remaps.containsKey(target)) {
++        target = remaps.get(target);
++      }
++      remaps.put(remap.getKey(), target);
++    }
++
+     graph.iterateExprents(new DirectGraph.ExprentIterator() {
+       @Override
+       public int processExprent(Exprent exprent) {
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+index 312f6c8..3398924 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+@@ -416,6 +416,11 @@ public class ConstExprent extends Exprent {
+     measureBytecode(values);
+   }
+ 
++  @Override
++  public String toString() {
++    return "const(" + toJava(0, new BytecodeMappingTracer()) + ")";
++  }
++
+   // *****************************************************************************
+   // IMatchable implementation
+   // *****************************************************************************
+diff --git a/testData/classes/pkg/TestPPMM.class b/testData/classes/pkg/TestPPMM.class
+index e493a99dbb742f1f20c3cb134d7366db47c5d4b4..38580c978dbdec1baf1fe2a0d4c7bbb11e2d2a11 100644
+GIT binary patch
+literal 936
+zcmb`F&rZTX5XQfuMYI+{RQ!X67%%9Bg9i^1FCGjDL=J@ef)$Gt8flCVzzccOc<=#y
+zDDhiMiqR%=pxMs1JJb2?bTS{GZ|?w3v2Ve|js*j|DeR?C5G+;Pfg4;1jM8ySU|tSy
+z96_!&?5KWAJ-DjfcbeKT7Tmcb!CK9~@0Od+C}=e5^>b#rzAq5Px5|_6yV~b@w4TSk
+z$@ndW0WFMZVTd9Dx23ASTApkqv1DTld4c`&5<#}79#y%o2Ho;?yXSNQ9P%$r{uN+B
+zbRunvrz5IRlP52bXKn<`w07vk3P0Dr)hOYNrv!Z&qcRqW)+{w2hNr0sqzOwiiLF=!
+zBohyrjAgp!sU*7y$a)01n)ak<R0{0KD-yBtyRu@`ql2hNxi~191wvzG9_U6KlqF8W
+oO8?3{(9Jj~nPH_d@;}tl!^~dl!7P5y9cOQr77nFgoAboy3oV9k<p2Nx
+
+literal 371
+zcmYjL%}&BV7@V&yEtFyr6A#|JsRx^Qm3T2RF)2zS!Sl9maIv;cDL#QO<jKT?58y)?
+zr+{d7cfS38X1@9Q{`drNhCL6KASj<^(L^um@pv@y;0XG2^`fFo<+JEEnd`I`xI>eh
+z`a)nI9Zv<$W$~bW*ysdk!4-tD$@R_hInmWbC7Bis;v!YqR8^+QH$|s@Gz-B_{D0@U
+zz$#0DD86ffe^)H4R9~4!ruXaYv@wN4&;rc^7Jpn#^q57A!q_@_NBeEn_K8g!By@?v
+zdVsOVj3&0^duA4Ep*?&R+1@{y1CCOgLoU%no2QEoCH$52{+hm#wzwcfpQ3_Y@+=H~
+E0NOq`X8-^I
+
+diff --git a/testData/results/TestPPMM.dec b/testData/results/TestPPMM.dec
+new file mode 100644
+index 0000000..ba3a5fc
+--- /dev/null
++++ b/testData/results/TestPPMM.dec
+@@ -0,0 +1,70 @@
++package pkg;
++
++public class TestPPMM {
++   public void ipp() {
++      int a = 0;
++      ++a;
++      ++a;
++      ++a;
++      ++a;
++   }
++
++   public void ppi() {
++      int a = 0;
++      ++a;
++      ++a;
++      ++a;
++      ++a;
++   }
++
++   public void imm() {
++      int a = 0;
++      --a;
++      --a;
++      --a;
++      --a;
++   }
++
++   public void mmi() {
++      int a = 0;
++      --a;
++      --a;
++      --a;
++      --a;
++   }
++
++   public void ippf() {
++      int a = 0;
++      t(a++);
++      t(a++);
++      t(a++);
++      t(a++);
++   }
++
++   public void ppif() {
++      int a = 0;
++      t(++a);
++      t(++a);
++      t(++a);
++      t(++a);
++   }
++
++   public void immf() {
++      int a = 0;
++      t(a--);
++      t(a--);
++      t(a--);
++      t(a--);
++   }
++
++   public void mmif() {
++      int a = 0;
++      t(--a);
++      t(--a);
++      t(--a);
++      t(--a);
++   }
++
++   private static void t(int x) {
++   }
++}
+diff --git a/testData/src/pkg/TestPPMM.java b/testData/src/pkg/TestPPMM.java
+index 02eecf4..21c7f2e 100644
+--- a/testData/src/pkg/TestPPMM.java
++++ b/testData/src/pkg/TestPPMM.java
+@@ -1,11 +1,66 @@
+ package pkg;
+ 
+ public class TestPPMM {
+-    public void pp() {
+-        int a = 0;
+-        a++;
+-        a++;
+-        a++;
+-        a++;
+-    }
++   // Bytecode wise ipp and ppi are identical when not using the intermediate value. 
++   // We keep these seperate tests just to see the bytecode.
++   public void ipp() {
++      int a = 0;
++      a++;
++      a++;
++      a++;
++      a++;
++   }
++   public void ppi() {
++      int a = 0;
++      ++a;
++      ++a;
++      ++a;
++      ++a;
++   }
++   public void imm() {
++      int a = 0;
++      a--;
++      a--;
++      a--;
++      a--;
++   }
++   public void mmi() {
++      int a = 0;
++      --a;
++      --a;
++      --a;
++      --a;
++   }
++   
++   // These versions actually use the intermediate value
++   public void ippf() {
++      int a = 0;
++      t(a++);
++      t(a++);
++      t(a++);
++      t(a++);
++   }
++   public void ppif() {
++      int a = 0;
++      t(++a);
++      t(++a);
++      t(++a);
++      t(++a);
++   }
++   public void immf() {
++      int a = 0;
++      t(a--);
++      t(a--);
++      t(a--);
++      t(a--);
++   }
++   public void mmif() {
++      int a = 0;
++      t(--a);
++      t(--a);
++      t(--a);
++      t(--a);
++   }
++   private static void t(int x){
++   }
+ }
+\ No newline at end of file
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0047-Prevent-infinite-loops-in-PPMM.patch b/FernFlower-Patches/0047-Prevent-infinite-loops-in-PPMM.patch
new file mode 100644
index 0000000..a3056d9
--- /dev/null
+++ b/FernFlower-Patches/0047-Prevent-infinite-loops-in-PPMM.patch
@@ -0,0 +1,29 @@
+From 613a1873954a310ee5ee18be6db5790e6ec74ba0 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sun, 13 Sep 2015 18:19:20 -0700
+Subject: [PATCH 047/122] Prevent infinite loops in PPMM.
+
+---
+ .../java/decompiler/modules/decompiler/PPandMMHelper.java   | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
+index f39946d..db70f64 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
+@@ -157,7 +157,11 @@ public class PPandMMHelper {
+ 
+               exprentReplaced = true;
+               if (!left.equals(econd)) {
+-                remaps.put(new VarVersionPair((VarExprent)left), new VarVersionPair((VarExprent)econd));
++                VarVersionPair _old = new VarVersionPair((VarExprent)left);
++                VarVersionPair _new = new VarVersionPair((VarExprent)econd);
++                if (_old.var > _new.var) { // Try and prevent infinite loops here by only merging 'down'
++                  remaps.put(_old, _new);
++                }
+               }
+               return ret;
+             }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0048-Merge-in-and-use-alternative-code-for-ppmm.patch b/FernFlower-Patches/0048-Merge-in-and-use-alternative-code-for-ppmm.patch
new file mode 100644
index 0000000..ec2e151
--- /dev/null
+++ b/FernFlower-Patches/0048-Merge-in-and-use-alternative-code-for-ppmm.patch
@@ -0,0 +1,225 @@
+From 5f3e0ca392561ae4c3a9a4ec50eeb1a1aacf72b5 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sun, 13 Sep 2015 21:52:45 -0400
+Subject: [PATCH 048/122] Merge in and use alternative code for ppmm
+
+---
+ .../modules/decompiler/PPandMMHelper.java     |   6 +-
+ .../modules/decompiler/exps/ConstExprent.java |   5 ++
+ testData/classes/pkg/TestPPMM.class           | Bin 371 -> 936 bytes
+ testData/results/TestPPMM.dec                 |  70 ++++++++++++++++++
+ testData/src/pkg/TestPPMM.java                |  69 +++++++++++++++--
+ 5 files changed, 141 insertions(+), 9 deletions(-)
+ create mode 100644 testData/results/TestPPMM.dec
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
+index d93bad6..cbde16f 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
+@@ -183,8 +183,10 @@ public class PPandMMHelper {
+ 
+     VarExprent v1 = (VarExprent)e1;
+     VarExprent v2 = (VarExprent)e2;
+-    return varProc.getRemapped(v1.getIndex()) == varProc.getRemapped(v2.getIndex())
+-            && InterpreterUtil.equalObjects(v1.getVarType(), v2.getVarType());
++    if (remaps.containsKey(new VarVersionPair(v1.getIndex(),v1.getVersion())) || remaps.containsKey(new VarVersionPair(v2.getIndex(),v2.getVersion()))) {
++        return false;
++    }
++    return varProc.getRemapped(v1.getIndex()) == varProc.getRemapped(v2.getIndex());
+   }
+ 
+ 
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+index 312f6c8..3398924 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+@@ -416,6 +416,11 @@ public class ConstExprent extends Exprent {
+     measureBytecode(values);
+   }
+ 
++  @Override
++  public String toString() {
++    return "const(" + toJava(0, new BytecodeMappingTracer()) + ")";
++  }
++
+   // *****************************************************************************
+   // IMatchable implementation
+   // *****************************************************************************
+diff --git a/testData/classes/pkg/TestPPMM.class b/testData/classes/pkg/TestPPMM.class
+index e493a99dbb742f1f20c3cb134d7366db47c5d4b4..38580c978dbdec1baf1fe2a0d4c7bbb11e2d2a11 100644
+GIT binary patch
+literal 936
+zcmb`F&rZTX5XQfuMYI+{RQ!X67%%9Bg9i^1FCGjDL=J@ef)$Gt8flCVzzccOc<=#y
+zDDhiMiqR%=pxMs1JJb2?bTS{GZ|?w3v2Ve|js*j|DeR?C5G+;Pfg4;1jM8ySU|tSy
+z96_!&?5KWAJ-DjfcbeKT7Tmcb!CK9~@0Od+C}=e5^>b#rzAq5Px5|_6yV~b@w4TSk
+z$@ndW0WFMZVTd9Dx23ASTApkqv1DTld4c`&5<#}79#y%o2Ho;?yXSNQ9P%$r{uN+B
+zbRunvrz5IRlP52bXKn<`w07vk3P0Dr)hOYNrv!Z&qcRqW)+{w2hNr0sqzOwiiLF=!
+zBohyrjAgp!sU*7y$a)01n)ak<R0{0KD-yBtyRu@`ql2hNxi~191wvzG9_U6KlqF8W
+oO8?3{(9Jj~nPH_d@;}tl!^~dl!7P5y9cOQr77nFgoAboy3oV9k<p2Nx
+
+literal 371
+zcmYjL%}&BV7@V&yEtFyr6A#|JsRx^Qm3T2RF)2zS!Sl9maIv;cDL#QO<jKT?58y)?
+zr+{d7cfS38X1@9Q{`drNhCL6KASj<^(L^um@pv@y;0XG2^`fFo<+JEEnd`I`xI>eh
+z`a)nI9Zv<$W$~bW*ysdk!4-tD$@R_hInmWbC7Bis;v!YqR8^+QH$|s@Gz-B_{D0@U
+zz$#0DD86ffe^)H4R9~4!ruXaYv@wN4&;rc^7Jpn#^q57A!q_@_NBeEn_K8g!By@?v
+zdVsOVj3&0^duA4Ep*?&R+1@{y1CCOgLoU%no2QEoCH$52{+hm#wzwcfpQ3_Y@+=H~
+E0NOq`X8-^I
+
+diff --git a/testData/results/TestPPMM.dec b/testData/results/TestPPMM.dec
+new file mode 100644
+index 0000000..ba3a5fc
+--- /dev/null
++++ b/testData/results/TestPPMM.dec
+@@ -0,0 +1,70 @@
++package pkg;
++
++public class TestPPMM {
++   public void ipp() {
++      int a = 0;
++      ++a;
++      ++a;
++      ++a;
++      ++a;
++   }
++
++   public void ppi() {
++      int a = 0;
++      ++a;
++      ++a;
++      ++a;
++      ++a;
++   }
++
++   public void imm() {
++      int a = 0;
++      --a;
++      --a;
++      --a;
++      --a;
++   }
++
++   public void mmi() {
++      int a = 0;
++      --a;
++      --a;
++      --a;
++      --a;
++   }
++
++   public void ippf() {
++      int a = 0;
++      t(a++);
++      t(a++);
++      t(a++);
++      t(a++);
++   }
++
++   public void ppif() {
++      int a = 0;
++      t(++a);
++      t(++a);
++      t(++a);
++      t(++a);
++   }
++
++   public void immf() {
++      int a = 0;
++      t(a--);
++      t(a--);
++      t(a--);
++      t(a--);
++   }
++
++   public void mmif() {
++      int a = 0;
++      t(--a);
++      t(--a);
++      t(--a);
++      t(--a);
++   }
++
++   private static void t(int x) {
++   }
++}
+diff --git a/testData/src/pkg/TestPPMM.java b/testData/src/pkg/TestPPMM.java
+index 02eecf4..21c7f2e 100644
+--- a/testData/src/pkg/TestPPMM.java
++++ b/testData/src/pkg/TestPPMM.java
+@@ -1,11 +1,66 @@
+ package pkg;
+ 
+ public class TestPPMM {
+-    public void pp() {
+-        int a = 0;
+-        a++;
+-        a++;
+-        a++;
+-        a++;
+-    }
++   // Bytecode wise ipp and ppi are identical when not using the intermediate value. 
++   // We keep these seperate tests just to see the bytecode.
++   public void ipp() {
++      int a = 0;
++      a++;
++      a++;
++      a++;
++      a++;
++   }
++   public void ppi() {
++      int a = 0;
++      ++a;
++      ++a;
++      ++a;
++      ++a;
++   }
++   public void imm() {
++      int a = 0;
++      a--;
++      a--;
++      a--;
++      a--;
++   }
++   public void mmi() {
++      int a = 0;
++      --a;
++      --a;
++      --a;
++      --a;
++   }
++   
++   // These versions actually use the intermediate value
++   public void ippf() {
++      int a = 0;
++      t(a++);
++      t(a++);
++      t(a++);
++      t(a++);
++   }
++   public void ppif() {
++      int a = 0;
++      t(++a);
++      t(++a);
++      t(++a);
++      t(++a);
++   }
++   public void immf() {
++      int a = 0;
++      t(a--);
++      t(a--);
++      t(a--);
++      t(a--);
++   }
++   public void mmif() {
++      int a = 0;
++      t(--a);
++      t(--a);
++      t(--a);
++      t(--a);
++   }
++   private static void t(int x){
++   }
+ }
+\ No newline at end of file
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0049-Kill-the-remapping-tracking-entirely-and-just-do-a-f.patch b/FernFlower-Patches/0049-Kill-the-remapping-tracking-entirely-and-just-do-a-f.patch
new file mode 100644
index 0000000..9ff1ec0
--- /dev/null
+++ b/FernFlower-Patches/0049-Kill-the-remapping-tracking-entirely-and-just-do-a-f.patch
@@ -0,0 +1,101 @@
+From 58f09199efda8b5923200b57f1e7c22c63f61b4d Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sun, 13 Sep 2015 22:34:26 -0400
+Subject: [PATCH 049/122] Kill the remapping tracking entirely, and just do a
+ full graph replace on contraction. Not as efficient, but guaranteed to work..
+
+---
+ .../modules/decompiler/PPandMMHelper.java     | 24 +++++++------------
+ 1 file changed, 8 insertions(+), 16 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
+index cbde16f..99d22bd 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
+@@ -39,7 +39,7 @@ public class PPandMMHelper {
+ 
+   private boolean exprentReplaced;
+   private VarProcessor varProc;
+-  private Map<VarVersionPair, VarVersionPair> remaps = new HashMap<VarVersionPair, VarVersionPair>();
++  private DirectGraph dgraph;
+ 
+   public PPandMMHelper(VarProcessor varProc) {
+     this.varProc = varProc;
+@@ -48,7 +48,7 @@ public class PPandMMHelper {
+   public boolean findPPandMM(RootStatement root) {
+ 
+     FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
+-    DirectGraph dgraph = flatthelper.buildDirectGraph(root);
++    dgraph = flatthelper.buildDirectGraph(root);
+ 
+     LinkedList<DirectNode> stack = new LinkedList<DirectNode>();
+     stack.add(dgraph.first);
+@@ -71,8 +71,6 @@ public class PPandMMHelper {
+       stack.addAll(node.succs);
+     }
+ 
+-    updateVersions(dgraph);
+-
+     return res;
+   }
+ 
+@@ -99,7 +97,6 @@ public class PPandMMHelper {
+   }
+ 
+   private Exprent processExprentRecursive(Exprent exprent) {
+-
+     boolean replaced = true;
+     while (replaced) {
+       replaced = false;
+@@ -147,7 +144,7 @@ public class PPandMMHelper {
+           if (econst.type == Exprent.EXPRENT_CONST && ((ConstExprent)econst).hasValueOne()) {
+             Exprent left = as.getLeft();
+ 
+-            VarType condtype = econd.getExprType();
++            VarType condtype = left.getExprType();
+             if (exprsEqual(left, econd) && (midlayer == null || midlayer.equals(condtype))) {
+               FunctionExprent ret = new FunctionExprent(
+                 func.getFuncType() == FunctionExprent.FUNCTION_ADD ? FunctionExprent.FUNCTION_PPI : FunctionExprent.FUNCTION_MMI,
+@@ -156,7 +153,7 @@ public class PPandMMHelper {
+ 
+               exprentReplaced = true;
+               if (!left.equals(econd)) {
+-                remaps.put(new VarVersionPair((VarExprent)left), new VarVersionPair((VarExprent)econd));
++                updateVersions(dgraph, new VarVersionPair((VarExprent) left), new VarVersionPair((VarExprent) econd));
+               }
+               return ret;
+             }
+@@ -183,15 +180,11 @@ public class PPandMMHelper {
+ 
+     VarExprent v1 = (VarExprent)e1;
+     VarExprent v2 = (VarExprent)e2;
+-    if (remaps.containsKey(new VarVersionPair(v1.getIndex(),v1.getVersion())) || remaps.containsKey(new VarVersionPair(v2.getIndex(),v2.getVersion()))) {
+-        return false;
+-    }
+     return varProc.getRemapped(v1.getIndex()) == varProc.getRemapped(v2.getIndex());
+   }
+ 
+ 
+-  private void updateVersions(DirectGraph graph) {
+-    if (remaps.isEmpty()) return;
++  private void updateVersions(DirectGraph graph, final VarVersionPair oldVVP, final VarVersionPair newVVP) {
+     graph.iterateExprents(new DirectGraph.ExprentIterator() {
+       @Override
+       public int processExprent(Exprent exprent) {
+@@ -201,10 +194,9 @@ public class PPandMMHelper {
+         for (Exprent expr : lst) {
+           if (expr.type == Exprent.EXPRENT_VAR) {
+             VarExprent var = (VarExprent)expr;
+-            VarVersionPair nvar = remaps.get(new VarVersionPair(var));
+-            if (nvar != null) {
+-              var.setIndex(nvar.var);
+-              var.setVersion(nvar.version);
++            if (var.getIndex() == oldVVP.var && var.getVersion() == oldVVP.version) {
++              var.setIndex(newVVP.var);
++              var.setVersion(newVVP.version);
+             }
+           }
+         }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0050-Types-are-merged-properly-now.patch b/FernFlower-Patches/0050-Types-are-merged-properly-now.patch
new file mode 100644
index 0000000..638c659
--- /dev/null
+++ b/FernFlower-Patches/0050-Types-are-merged-properly-now.patch
@@ -0,0 +1,167 @@
+From 38305edba97b6b5ae23d451ffb9d5dee9dc4bcf4 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Mon, 14 Sep 2015 00:42:17 -0400
+Subject: [PATCH 050/122] Types are merged properly now
+
+---
+ .../modules/decompiler/exps/VarExprent.java       |   3 +++
+ .../modules/decompiler/vars/LVTVariable.java      |   6 ++++++
+ .../decompiler/vars/VarDefinitionHelper.java      |  11 +++++++++--
+ .../modules/decompiler/vars/VarProcessor.java     |   4 ++++
+ .../decompiler/vars/VarVersionsProcessor.java     |   3 +++
+ testData/classes/pkg/TestVarType.class            | Bin 0 -> 375 bytes
+ testData/src/pkg/TestVarType.java                 |   9 +++++++++
+ 7 files changed, 34 insertions(+), 2 deletions(-)
+ create mode 100644 testData/classes/pkg/TestVarType.class
+ create mode 100644 testData/src/pkg/TestVarType.java
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+index 6c973af..3d5f03b 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+@@ -231,6 +231,9 @@ public class VarExprent extends Exprent {
+ 
+   public void setLVT(LVTVariable lvt) {
+     this.lvt = lvt;
++    if (processor != null) {
++        processor.setVarType(new VarVersionPair(this),lvt.getVarType());
++    }
+   }
+ 
+   @Override
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
+index 59dee69..209d3e0 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
+@@ -5,6 +5,8 @@ import java.util.HashSet;
+ import java.util.Map;
+ import java.util.Set;
+ 
++import org.jetbrains.java.decompiler.struct.gen.VarType;
++
+ public class LVTVariable implements Comparable<LVTVariable> {
+   public static final Comparator<LVTVariable> INDEX_SORTER = new Comparator<LVTVariable>() {
+     @Override
+@@ -80,4 +82,8 @@ public class LVTVariable implements Comparable<LVTVariable> {
+   public String getSig() {
+     return sig;
+   }
++
++public VarType getVarType() {
++    return new VarType(desc);
++}
+ }
+\ No newline at end of file
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index 56061fe..7abcec8 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -24,11 +24,13 @@ import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchAllStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
+ import org.jetbrains.java.decompiler.struct.StructClass;
+ import org.jetbrains.java.decompiler.struct.StructMethod;
+ import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
++import org.jetbrains.java.decompiler.struct.gen.VarType;
+ 
+ import java.util.*;
+ import java.util.Map.Entry;
+@@ -483,7 +485,7 @@ public class VarDefinitionHelper {
+     }
+   }
+ 
+-  private static void remapVar(Map<VarVersionPair, VarVersionPair> remap, Statement stat) {
++  private void remapVar(Map<VarVersionPair, VarVersionPair> remap, Statement stat) {
+     if (remap == null || stat == null) {
+       return;
+     }
+@@ -505,12 +507,13 @@ public class VarDefinitionHelper {
+     }
+   }
+ 
+-  private static void remapVar(Map<VarVersionPair, VarVersionPair> remap, Exprent exprent) {
++  private void remapVar(Map<VarVersionPair, VarVersionPair> remap, Exprent exprent) {
+     if (exprent == null) {
+       return;
+     }
+     List<Exprent> lst = exprent.getAllExprents(true);
+     lst.add(exprent);
++    Map<VarVersionPair, VarType> mapExprentMinTypes = varproc.getVarVersions().getTypeProcessor().getMapExprentMinTypes();
+ 
+     for (Exprent expr : lst) {
+       if (expr.type == Exprent.EXPRENT_VAR) {
+@@ -518,8 +521,12 @@ public class VarDefinitionHelper {
+         VarVersionPair old = new VarVersionPair(var);
+         VarVersionPair new_ = remap.get(old);
+         if (new_ != null) {
++          VarType firstMinType = mapExprentMinTypes.get(old);
++          VarType secondMinType = mapExprentMinTypes.get(new_);
+           var.setIndex(new_.var);
+           var.setVersion(new_.version);
++          VarType type = VarType.getCommonSupertype(firstMinType, secondMinType);
++          mapExprentMinTypes.put(new_, type);
+         }
+       }
+     }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+index a8ad019..691797e 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+@@ -176,4 +176,8 @@ public class VarProcessor {
+     setVarType(to, getVarType(from));
+     varVersions.getMapOriginalVarIndices().put(to.var, varVersions.getMapOriginalVarIndices().get(from.var));
+   }
++
++  public VarVersionsProcessor getVarVersions() {
++    return varVersions;
++}
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+index d56c778..d201157 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+@@ -321,4 +321,7 @@ public class VarVersionsProcessor {
+   public Map<Integer, VarVersionPair> getMapOriginalVarIndices() {
+     return mapOriginalVarIndices;
+   }
++  public VarTypeProcessor getTypeProcessor() {
++    return typeProcessor;
++}
+ }
+diff --git a/testData/classes/pkg/TestVarType.class b/testData/classes/pkg/TestVarType.class
+new file mode 100644
+index 0000000000000000000000000000000000000000..de04ad7bc6fc7b7c1c7489d444a9e6e97f89ab09
+GIT binary patch
+literal 375
+zcmZ9HKTpFz48@=Gw}h64AhELn1Cdy%Sdfqq0S2P(mvAaqLQ<tEQulr#CL{(XCO!`{
+z;-#$sq0`y-&i2pt$Jgr{fMe|Vumt_d!zfPmv>B>8olmq6M-YzHlZp#fj^dkatn)_T
+z4NPg8Q-QsIFcdgv)twGtW1|Zf9yy6A_4VvA({-w{LJOj#%2h$EY4!TkY3|Kbu$}yC
+zdm`|&d819qUSfDJ1i@`Jt8;yBT3q;N$fI^X?19s86~N+)Q_%WUF}={chcD<nFT(+C
+z8wLwDX}hZg`W}^F>!<jN%Hm%yyc{gVeP2N2^A{4qVbCSU<M9dTEP=bLqBYP)fIdQ^
+JxGM84MBh+NKNkQ1
+
+literal 0
+HcmV?d00001
+
+diff --git a/testData/src/pkg/TestVarType.java b/testData/src/pkg/TestVarType.java
+new file mode 100644
+index 0000000..1847aa2
+--- /dev/null
++++ b/testData/src/pkg/TestVarType.java
+@@ -0,0 +1,9 @@
++package pkg;
++
++public class TestVarType {
++    public void byteint() {
++        int i = 75;
++        i+=5;
++        i+=500;
++    }
++}
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0051-More-merging.-It-does-some-things-better.-But-still-.patch b/FernFlower-Patches/0051-More-merging.-It-does-some-things-better.-But-still-.patch
new file mode 100644
index 0000000..4f39f6f
--- /dev/null
+++ b/FernFlower-Patches/0051-More-merging.-It-does-some-things-better.-But-still-.patch
@@ -0,0 +1,143 @@
+From f88735d87e1dc889676151707ce066420475da78 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Wed, 16 Sep 2015 00:49:12 -0400
+Subject: [PATCH 051/122] More merging. It does some things better. But still
+ not anywhere near good enough :(
+
+---
+ .../decompiler/stats/BasicBlockStatement.java | 10 ++++
+ .../decompiler/vars/VarDefinitionHelper.java  | 54 +++++++++++++++----
+ 2 files changed, 55 insertions(+), 9 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
+index 762fd01..ea7e611 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
+@@ -24,6 +24,7 @@ import org.jetbrains.java.decompiler.main.TextBuffer;
+ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+ import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
+ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.StartEndPair;
+ 
+ public class BasicBlockStatement extends Statement {
+ 
+@@ -94,4 +95,13 @@ public class BasicBlockStatement extends Statement {
+   public BasicBlock getBlock() {
+     return block;
+   }
++
++  @Override
++    public StartEndPair getStartEndRange() {
++      if (block.size() > 0) {
++          return new StartEndPair(block.getStartInstruction(),block.getEndInstruction());
++    } else {
++        return null;
++    }
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index 7abcec8..8c42c0c 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -19,6 +19,7 @@ import org.jetbrains.java.decompiler.code.CodeConstants;
+ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchAllStatement;
+@@ -47,11 +48,14 @@ public class VarDefinitionHelper {
+ 
+   private final VarProcessor varproc;
+ 
++  private final Map<VarVersionPair,List<ConstExprent>> constExprents;
++
+   public VarDefinitionHelper(Statement root, StructMethod mt, VarProcessor varproc) {
+ 
+     mapVarDefStatements = new HashMap<Integer, Statement>();
+     mapStatementVars = new HashMap<Integer, HashSet<Integer>>();
+     implDefVars = new HashSet<Integer>();
++    constExprents = new HashMap<VarVersionPair,List<ConstExprent>>();
+     this.varproc = varproc;
+ 
+     VarNamesCollector vc = DecompilerContext.getVarNamesCollector();
+@@ -472,16 +476,33 @@ public class VarDefinitionHelper {
+     VarExprent left = (VarExprent)exp.getLeft();
+     int index = varproc.getRemapped(left.getIndex());
+ 
+-    for (Exprent e : exp.getRight().getAllExprents(true)) {
+-      if (e.type == Exprent.EXPRENT_VAR) {
+-          VarExprent right = (VarExprent)e;
+-        if (varproc.getRemapped(right.getIndex()) == index) {
+-          if (!left.equals(right) && left.getIndex() > right.getIndex()) {
+-            remaps.put(new VarVersionPair(left), new VarVersionPair(right));
++    // constant
++    VarVersionPair source = new VarVersionPair(left);
++    if (exp.getRight().type == Exprent.EXPRENT_CONST) {
++        VarVersionPair target = new VarVersionPair(index,0);
++        if (index < left.getIndex()) {
++            remaps.put(source, target);
++        }
++        if (!constExprents.containsKey(source)) {
++            constExprents.put(source, new ArrayList<ConstExprent>());
++        }
++        List<ConstExprent> ceList = constExprents.get(source);
++        ceList.add((ConstExprent) exp.getRight());
++    } else {
++        for (Exprent e : exp.getRight().getAllExprents(true)) {
++          if (e.type == Exprent.EXPRENT_VAR) {
++              VarExprent right = (VarExprent)e;
++            if (varproc.getRemapped(right.getIndex()) == index) {
++              if (!left.equals(right) && left.getIndex() > right.getIndex()) {
++                remaps.put(source, new VarVersionPair(right));
++              }
++              return;
++            }
+           }
+-          return;
+         }
+-      }
++        if (index < left.getIndex()) {
++            remaps.put(source, new VarVersionPair(index,0));
++        }
+     }
+   }
+ 
+@@ -514,6 +535,7 @@ public class VarDefinitionHelper {
+     List<Exprent> lst = exprent.getAllExprents(true);
+     lst.add(exprent);
+     Map<VarVersionPair, VarType> mapExprentMinTypes = varproc.getVarVersions().getTypeProcessor().getMapExprentMinTypes();
++    Map<VarVersionPair, VarType> mapExprentMaxTypes = varproc.getVarVersions().getTypeProcessor().getMapExprentMaxTypes();
+ 
+     for (Exprent expr : lst) {
+       if (expr.type == Exprent.EXPRENT_VAR) {
+@@ -523,10 +545,24 @@ public class VarDefinitionHelper {
+         if (new_ != null) {
+           VarType firstMinType = mapExprentMinTypes.get(old);
+           VarType secondMinType = mapExprentMinTypes.get(new_);
++          VarType type = firstMinType == null ? secondMinType : (secondMinType == null ? firstMinType :VarType.getCommonSupertype(firstMinType, secondMinType));
++          if (type == null || firstMinType == null || secondMinType == null) {
++              // no common supertype, skip the remapping
++              continue;
++          }
++          if (type.typeFamily == CodeConstants.TYPE_FAMILY_OBJECT && mapExprentMaxTypes.get(old) != null && mapExprentMaxTypes.get(new_) != null) {
++              type = VarType.getCommonMinType(mapExprentMaxTypes.get(old), mapExprentMaxTypes.get(new_));
++          } else if (type.typeFamily == CodeConstants.TYPE_FAMILY_OBJECT) {
++              continue;
++          }
+           var.setIndex(new_.var);
+           var.setVersion(new_.version);
+-          VarType type = VarType.getCommonSupertype(firstMinType, secondMinType);
+           mapExprentMinTypes.put(new_, type);
++          if (constExprents.containsKey(old)) {
++              for (ConstExprent ce : constExprents.get(old)) {
++                  ce.setConstType(type);
++              }
++          }
+         }
+       }
+     }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0052-More-tweaks-to-merging.-It-s-pretty-decent.-But-stil.patch b/FernFlower-Patches/0052-More-tweaks-to-merging.-It-s-pretty-decent.-But-stil.patch
new file mode 100644
index 0000000..93dddd0
--- /dev/null
+++ b/FernFlower-Patches/0052-More-tweaks-to-merging.-It-s-pretty-decent.-But-stil.patch
@@ -0,0 +1,52 @@
+From 8ac9ea89c0f38c0fd16568424e3ae274f709ca5f Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Thu, 17 Sep 2015 17:13:17 -0400
+Subject: [PATCH 052/122] More tweaks to merging. It's pretty decent. But still
+ no where near good enough.
+
+---
+ .../decompiler/vars/VarDefinitionHelper.java  | 21 +++++++++++++++----
+ 1 file changed, 17 insertions(+), 4 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index 8c42c0c..ca27e47 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -550,10 +550,18 @@ public class VarDefinitionHelper {
+               // no common supertype, skip the remapping
+               continue;
+           }
+-          if (type.typeFamily == CodeConstants.TYPE_FAMILY_OBJECT && mapExprentMaxTypes.get(old) != null && mapExprentMaxTypes.get(new_) != null) {
+-              type = VarType.getCommonMinType(mapExprentMaxTypes.get(old), mapExprentMaxTypes.get(new_));
+-          } else if (type.typeFamily == CodeConstants.TYPE_FAMILY_OBJECT) {
+-              continue;
++          if (type.typeFamily == CodeConstants.TYPE_FAMILY_OBJECT) {
++              if (mapExprentMaxTypes.get(old) != null && mapExprentMaxTypes.get(new_) != null) {
++                  type = VarType.getCommonMinType(mapExprentMaxTypes.get(old), mapExprentMaxTypes.get(new_));
++              } else if (firstMinType.arrayDim != secondMinType.arrayDim) {
++                  continue;
++              } else {
++                  type = VarType.getCommonMinType(firstMinType, secondMinType);
++                  // couldn't find a sane common supertype, we're not gonna be able to merge
++                  if (type == null || type == VarType.VARTYPE_NULL) {
++                      continue;
++                  }
++              }
+           }
+           var.setIndex(new_.var);
+           var.setVersion(new_.version);
+@@ -563,6 +571,11 @@ public class VarDefinitionHelper {
+                   ce.setConstType(type);
+               }
+           }
++          if (constExprents.containsKey(new_)) {
++              for (ConstExprent ce : constExprents.get(new_)) {
++                  ce.setConstType(type);
++              }
++          }
+         }
+       }
+     }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0053-New-aproach-to-merging-variables.-Use-top-down-manua.patch b/FernFlower-Patches/0053-New-aproach-to-merging-variables.-Use-top-down-manua.patch
new file mode 100644
index 0000000..6de8aae
--- /dev/null
+++ b/FernFlower-Patches/0053-New-aproach-to-merging-variables.-Use-top-down-manua.patch
@@ -0,0 +1,535 @@
+From 42cf0ce83e1c02a459430065811093cd923073b4 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Fri, 18 Sep 2015 14:36:48 -0700
+Subject: [PATCH 053/122] New aproach to merging variables. Use top down manual
+ scoping. 341
+
+---
+ .../decompiler/vars/VarDefinitionHelper.java  | 378 ++++++++++++------
+ 1 file changed, 258 insertions(+), 120 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index ca27e47..0c03cd5 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -25,8 +25,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchAllStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement;
+-import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
+-import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
+ import org.jetbrains.java.decompiler.struct.StructClass;
+ import org.jetbrains.java.decompiler.struct.StructMethod;
+@@ -35,7 +34,6 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
+ 
+ import java.util.*;
+ import java.util.Map.Entry;
+-import java.util.AbstractMap.SimpleImmutableEntry;
+ 
+ public class VarDefinitionHelper {
+ 
+@@ -48,15 +46,16 @@ public class VarDefinitionHelper {
+ 
+   private final VarProcessor varproc;
+ 
+-  private final Map<VarVersionPair,List<ConstExprent>> constExprents;
++  private final Statement root;
++  private final StructMethod mt;
+ 
+   public VarDefinitionHelper(Statement root, StructMethod mt, VarProcessor varproc) {
+-
+     mapVarDefStatements = new HashMap<Integer, Statement>();
+     mapStatementVars = new HashMap<Integer, HashSet<Integer>>();
+     implDefVars = new HashSet<Integer>();
+-    constExprents = new HashMap<VarVersionPair,List<ConstExprent>>();
+     this.varproc = varproc;
++    this.root = root;
++    this.mt = mt;
+ 
+     VarNamesCollector vc = DecompilerContext.getVarNamesCollector();
+ 
+@@ -98,8 +97,6 @@ public class VarDefinitionHelper {
+       vc.addName("this");
+     }
+ 
+-    mergeVars(root);
+-
+     // catch variables are implicitly defined
+     LinkedList<Statement> stack = new LinkedList<Statement>();
+     stack.add(root);
+@@ -133,15 +130,9 @@ public class VarDefinitionHelper {
+   public void setVarDefinitions() {
+     VarNamesCollector vc = DecompilerContext.getVarNamesCollector();
+ 
+-    Map<Statement,Map<Integer,VarExprent>> trackingMap = new HashMap<Statement,Map<Integer,VarExprent>>();
+     for (Entry<Integer, Statement> en : mapVarDefStatements.entrySet()) {
+       Statement stat = en.getValue();
+-      if (!trackingMap.containsKey(stat)) {
+-          trackingMap.put(stat, new HashMap<Integer,VarExprent>());
+-      }
+-      Map<Integer, VarExprent> scopedMap = trackingMap.get(stat);
+       Integer index = en.getKey();
+-      int newindex = varproc.getRemapped(index);
+       setupLVTs(stat);
+ 
+       if (implDefVars.contains(index)) {
+@@ -156,7 +147,7 @@ public class VarDefinitionHelper {
+         DoStatement dstat = (DoStatement)stat;
+         if (dstat.getLooptype() == DoStatement.LOOP_FOR) {
+ 
+-          if (dstat.getInitExprent() != null && setDefinition(dstat.getInitExprent(), index, scopedMap)) {
++          if (dstat.getInitExprent() != null && setDefinition(dstat.getInitExprent(), index)) {
+             continue;
+           }
+           else {
+@@ -198,12 +189,7 @@ public class VarDefinitionHelper {
+       // search for the first assignement to var [index]
+       int addindex = 0;
+       for (Exprent expr : lst) {
+-
+-        if (scopedMap.containsKey(newindex)) {
+-            defset = true;
+-            break;
+-        }
+-        if (setDefinition(expr, index, scopedMap)) {
++        if (setDefinition(expr, index)) {
+           defset = true;
+           break;
+         }
+@@ -229,13 +215,17 @@ public class VarDefinitionHelper {
+         if (varproc.getLVT() != null) {
+           Map<Integer, LVTVariable> vars = varproc.getLVT().getVars(stat);
+           if (vars.containsKey(var.getIndex())) {
+-              var.setLVT(vars.get(var.getIndex()));
++            var.setLVT(vars.get(var.getIndex()));
+           }
+         }
+ 
+         lst.add(addindex, var);
+       }
+     }
++if (mt.getName().equals("func_180655_c")){
++    System.out.println("asdf");
++}
++    mergeVars(root);
+   }
+ 
+ 
+@@ -374,14 +364,13 @@ public class VarDefinitionHelper {
+     return res;
+   }
+ 
+-  private static boolean setDefinition(Exprent expr, Integer index, Map<Integer,VarExprent> stats) {
++  private static boolean setDefinition(Exprent expr, Integer index) {
+     if (expr.type == Exprent.EXPRENT_ASSIGNMENT) {
+       Exprent left = ((AssignmentExprent)expr).getLeft();
+       if (left.type == Exprent.EXPRENT_VAR) {
+         VarExprent var = (VarExprent)left;
+         if (var.getIndex() == index.intValue()) {
+           var.setDefinition(true);
+-          stats.put(index, var);
+           return true;
+         }
+       }
+@@ -434,150 +423,299 @@ public class VarDefinitionHelper {
+     }
+   }
+ 
+-  private void mergeVars(Statement stat) {
+-    Map<VarVersionPair, VarVersionPair> remaps = new HashMap<VarVersionPair, VarVersionPair>();
+-    mergeVars(stat, remaps);
+-    if (!remaps.isEmpty()) {
+-      for (Entry<VarVersionPair, VarVersionPair> entry : remaps.entrySet()) {
+-        VarVersionPair end = entry.getKey();
+-        while (remaps.containsKey(end)) {
+-          end = remaps.get(end);
+-        }
+-        remaps.put(entry.getKey(), end);
++  private VPPEntry mergeVars(Statement stat) {
++    Map<Integer, VarVersionPair> parent = new HashMap<Integer, VarVersionPair>(); // Always empty dua!
++    MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
++
++    int index = 0;
++    if (!mt.hasModifier(CodeConstants.ACC_STATIC)) {
++      parent.put(index, new VarVersionPair(index++, 0));
++    }
++
++    for (VarType var : md.params) {
++      parent.put(index, new VarVersionPair(index, 0));
++      index += var.stackSize;
++    }
++
++    Map<VarVersionPair, VarVersionPair> blacklist = new HashMap<VarVersionPair, VarVersionPair>();
++    VPPEntry remap = mergeVars(stat, parent, new HashMap<Integer, VarVersionPair>(), blacklist);
++    VPPEntry ast = remap;
++    while (remap != null) {
++      //System.out.println("Remapping: " + remap.getKey() + " -> " + remap.getValue());
++      if (!remapVar(stat, remap.getKey(), remap.getValue())) {
++        blacklist.put(remap.getKey(), remap.getValue());
++      }
++      remap = mergeVars(stat, parent, new HashMap<Integer, VarVersionPair>(), blacklist);
++      if (ast.equals(remap)){
++          System.currentTimeMillis();
+       }
+-      remapVar(remaps, stat);
+     }
++    return null;
+   }
+-  private void mergeVars(Statement stat, Map<VarVersionPair, VarVersionPair> remaps) {
++
++  private VPPEntry mergeVars(Statement stat, Map<Integer, VarVersionPair> parent, Map<Integer, VarVersionPair> leaked, Map<VarVersionPair, VarVersionPair> blacklist) {
++    Map<Integer, VarVersionPair> this_vars = new HashMap<Integer, VarVersionPair>();
++    if (parent.size() > 0)
++      this_vars.putAll(parent);
++
++    if (stat.getVarDefinitions().size() > 0) {
++      for (int x = 0; x < stat.getVarDefinitions().size(); x++) {
++        Exprent exp = stat.getVarDefinitions().get(x);
++        if (exp.type == Exprent.EXPRENT_VAR) {
++          VarExprent var = (VarExprent)exp;
++          int index = varproc.getRemapped(var.getIndex());
++          if (this_vars.containsKey(index)) {
++            stat.getVarDefinitions().remove(x);
++            return new VPPEntry(var, this_vars.get(index));
++          }
++          this_vars.put(index, new VarVersionPair(var));
++          leaked.put(index, new VarVersionPair(var));
++        }
++      }
++    }
++
++    Map<Integer, VarVersionPair> scoped = null;
++    switch (stat.type) { // These are the type of statements that leak vars
++      case Statement.TYPE_BASICBLOCK:
++      case Statement.TYPE_GENERAL:
++      case Statement.TYPE_ROOT:
++      case Statement.TYPE_SEQUENCE:
++        scoped = leaked;
++    }
++
+     if (stat.getExprents() == null) {
+       for (Object obj : stat.getSequentialObjects()) {
+         if (obj instanceof Statement) {
+-          mergeVars((Statement)obj, remaps);
++          Statement st = (Statement)obj;
++
++          //Map<VarVersionPair, VarVersionPair> blacklist_n = new HashMap<VarVersionPair, VarVersionPair>();
++          Map<Integer, VarVersionPair> leaked_n = new HashMap<Integer, VarVersionPair>();
++          VPPEntry remap = mergeVars(st, this_vars, leaked_n, blacklist);
++
++          if (remap != null) {
++            return remap;
++          }
++          /* TODO: See if we can optimize and only go up till needed.
++          while (remap != null) {
++            System.out.println("Remapping: " + remap.getKey() + " -> " + remap.getValue());
++            VarVersionPair var = parent.get(varproc.getRemapped(remap.getValue().var));
++            if (remap.getValue().equals(var)) { //Drill up to original declaration.
++              return remap;
++            }
++            if (!remapVar(stat, remap.getKey(), remap.getValue())) {
++              blacklist_n.put(remap.getKey(), remap.getValue());
++            }
++            leaked_n.clear();
++            remap = mergeVars(st, this_vars, leaked_n, blacklist_n);
++          }
++          */
++
++          if (leaked_n.size() > 0) {
++            if (stat.type == Statement.TYPE_IF) {
++              IfStatement ifst = (IfStatement)stat;
++              if (obj == ifst.getIfstat() || obj == ifst.getElsestat()) {
++                leaked_n.clear(); // Force no leaking at the end of if blocks
++                // We may need to do this for Switches as well.. But havent run into that issue yet...
++              }
++            }
++            this_vars.putAll(leaked_n);
++          }
+         }
+-        else if (obj instanceof AssignmentExprent) {
+-          checkAssignment((AssignmentExprent)obj, remaps);
++        else if (obj instanceof Exprent) {
++          VPPEntry ret = processExprent((Exprent)obj, this_vars, scoped, blacklist);
++          if (ret != null) {
++            return ret;
++          }
+         }
+       }
+     }
+     else {
+       for (Exprent exp : stat.getExprents()) {
+-        if (exp instanceof AssignmentExprent) {
+-          checkAssignment((AssignmentExprent)exp, remaps);
++        VPPEntry ret = processExprent(exp, this_vars, scoped, blacklist);
++        if (ret != null) {
++          return ret;
+         }
+       }
+     }
++    return null; // We made it with no remaps!!!!!!!
+   }
+ 
+-  private void checkAssignment(AssignmentExprent exp, Map<VarVersionPair, VarVersionPair> remaps) {
+-    if (exp.getLeft().type != Exprent.EXPRENT_VAR) {
+-      return;
++  private VPPEntry processExprent(Exprent exp, Map<Integer, VarVersionPair> this_vars, Map<Integer, VarVersionPair> leaked, Map<VarVersionPair, VarVersionPair> blacklist) {
++    VarExprent var = null;
++
++    if (exp.type == Exprent.EXPRENT_ASSIGNMENT) {
++      AssignmentExprent ass = (AssignmentExprent)exp;
++      if (ass.getLeft().type != Exprent.EXPRENT_VAR) {
++        return null;
++      }
++
++      var = (VarExprent)ass.getLeft();
++    }
++    else if (exp.type == Exprent.EXPRENT_VAR) {
++      var = (VarExprent)exp;
+     }
+ 
+-    VarExprent left = (VarExprent)exp.getLeft();
+-    int index = varproc.getRemapped(left.getIndex());
++    if (var == null) {
++      return null;
++    }
+ 
+-    // constant
+-    VarVersionPair source = new VarVersionPair(left);
+-    if (exp.getRight().type == Exprent.EXPRENT_CONST) {
+-        VarVersionPair target = new VarVersionPair(index,0);
+-        if (index < left.getIndex()) {
+-            remaps.put(source, target);
+-        }
+-        if (!constExprents.containsKey(source)) {
+-            constExprents.put(source, new ArrayList<ConstExprent>());
+-        }
+-        List<ConstExprent> ceList = constExprents.get(source);
+-        ceList.add((ConstExprent) exp.getRight());
+-    } else {
+-        for (Exprent e : exp.getRight().getAllExprents(true)) {
+-          if (e.type == Exprent.EXPRENT_VAR) {
+-              VarExprent right = (VarExprent)e;
+-            if (varproc.getRemapped(right.getIndex()) == index) {
+-              if (!left.equals(right) && left.getIndex() > right.getIndex()) {
+-                remaps.put(source, new VarVersionPair(right));
+-              }
+-              return;
+-            }
+-          }
+-        }
+-        if (index < left.getIndex()) {
+-            remaps.put(source, new VarVersionPair(index,0));
+-        }
++    if (!var.isDefinition()) {
++      return null;
+     }
+-  }
+ 
+-  private void remapVar(Map<VarVersionPair, VarVersionPair> remap, Statement stat) {
+-    if (remap == null || stat == null) {
+-      return;
++    int index = varproc.getRemapped(var.getIndex());
++    VarVersionPair new_ = this_vars.get(index);
++    if (new_ != null) {
++      VarVersionPair old = new VarVersionPair(var);
++      VarVersionPair black = blacklist.get(old);
++      if (black == null || !black.equals(new_)) {
++        return new VPPEntry(var, this_vars.get(index));
++      }
+     }
++    this_vars.put(index, new VarVersionPair(var));
+ 
++    if (leaked != null) {
++      leaked.put(index, new VarVersionPair(var));
++    }
++
++    return null;
++  }
++
++  private boolean remapVar(Statement stat, VarVersionPair from, VarVersionPair to) {
++    if (from.equals(to))
++      throw new IllegalArgumentException("Shit went wrong: " + from);
++    boolean success = false;
+     if (stat.getExprents() == null) {
+       for (Object obj : stat.getSequentialObjects()) {
+         if (obj instanceof Statement) {
+-          remapVar(remap, (Statement)obj);
++          success |= remapVar((Statement)obj, from, to);
+         }
+         else if (obj instanceof Exprent) {
+-          remapVar(remap, (Exprent)obj);
++          if (remapVar((Exprent)obj, from, to)) {
++            success = true;
++          }
+         }
+       }
+     }
+     else {
+-      for (Exprent exp : stat.getExprents()) {
+-        remapVar(remap, exp);
++      boolean remapped = false;
++      for (int x = 0; x < stat.getExprents().size(); x++) {
++        Exprent exp = stat.getExprents().get(x);
++        if (remapVar(exp, from, to)) {
++          remapped = true;
++          if (exp.type == Exprent.EXPRENT_VAR) {
++            if (!((VarExprent)exp).isDefinition()) {
++              stat.getExprents().remove(x);
++              x--;
++            }
++          }
++        }
+       }
++      success |= remapped;
+     }
++    return success;
+   }
+ 
+-  private void remapVar(Map<VarVersionPair, VarVersionPair> remap, Exprent exprent) {
+-    if (exprent == null) {
+-      return;
++  private boolean remapVar(Exprent exprent, VarVersionPair from, VarVersionPair to) {
++    if (exprent == null) { // Sometimes there are null exprents?
++      return false;
+     }
+     List<Exprent> lst = exprent.getAllExprents(true);
+     lst.add(exprent);
+     Map<VarVersionPair, VarType> mapExprentMinTypes = varproc.getVarVersions().getTypeProcessor().getMapExprentMinTypes();
+     Map<VarVersionPair, VarType> mapExprentMaxTypes = varproc.getVarVersions().getTypeProcessor().getMapExprentMaxTypes();
+ 
++    boolean remapped = false;
++
+     for (Exprent expr : lst) {
+-      if (expr.type == Exprent.EXPRENT_VAR) {
+-        VarExprent var = (VarExprent)expr;
+-        VarVersionPair old = new VarVersionPair(var);
+-        VarVersionPair new_ = remap.get(old);
+-        if (new_ != null) {
+-          VarType firstMinType = mapExprentMinTypes.get(old);
+-          VarType secondMinType = mapExprentMinTypes.get(new_);
+-          VarType type = firstMinType == null ? secondMinType : (secondMinType == null ? firstMinType :VarType.getCommonSupertype(firstMinType, secondMinType));
+-          if (type == null || firstMinType == null || secondMinType == null) {
+-              // no common supertype, skip the remapping
+-              continue;
+-          }
+-          if (type.typeFamily == CodeConstants.TYPE_FAMILY_OBJECT) {
+-              if (mapExprentMaxTypes.get(old) != null && mapExprentMaxTypes.get(new_) != null) {
+-                  type = VarType.getCommonMinType(mapExprentMaxTypes.get(old), mapExprentMaxTypes.get(new_));
+-              } else if (firstMinType.arrayDim != secondMinType.arrayDim) {
+-                  continue;
+-              } else {
+-                  type = VarType.getCommonMinType(firstMinType, secondMinType);
+-                  // couldn't find a sane common supertype, we're not gonna be able to merge
+-                  if (type == null || type == VarType.VARTYPE_NULL) {
+-                      continue;
+-                  }
+-              }
+-          }
+-          var.setIndex(new_.var);
+-          var.setVersion(new_.version);
+-          mapExprentMinTypes.put(new_, type);
+-          if (constExprents.containsKey(old)) {
+-              for (ConstExprent ce : constExprents.get(old)) {
+-                  ce.setConstType(type);
+-              }
++      if (expr.type == Exprent.EXPRENT_ASSIGNMENT) {
++        AssignmentExprent ass = (AssignmentExprent)expr;
++        if (ass.getLeft().type == Exprent.EXPRENT_VAR && ass.getRight().type == Exprent.EXPRENT_CONST) {
++          VarVersionPair left = new VarVersionPair((VarExprent)ass.getLeft());
++          if (!left.equals(from) && !left.equals(to)) {
++            continue;
+           }
+-          if (constExprents.containsKey(new_)) {
+-              for (ConstExprent ce : constExprents.get(new_)) {
+-                  ce.setConstType(type);
+-              }
++
++          ConstExprent right = (ConstExprent)ass.getRight();
++          VarType merged = getMergedType(mapExprentMinTypes.get(from), mapExprentMinTypes.get(to),
++                                         mapExprentMaxTypes.get(from), mapExprentMaxTypes.get(to));
++
++          if (merged == null) { // Types incompatible, do not merge
++            continue;
+           }
++
++          right.setConstType(merged);
+         }
+       }
++      else if (expr.type == Exprent.EXPRENT_VAR) {
++        VarExprent var = (VarExprent)expr;
++        VarVersionPair old = new VarVersionPair(var);
++        if (!old.equals(from)) {
++          continue;
++        }
++        VarType merged = getMergedType(mapExprentMinTypes.get(from), mapExprentMinTypes.get(to),
++                                       mapExprentMaxTypes.get(from), mapExprentMaxTypes.get(to));
++        if (merged == null) { // Types incompatible, do not merge
++          continue;
++        }
++
++        var.setIndex(to.var);
++        var.setVersion(to.version);
++        var.setVarType(merged);
++        if (var.isDefinition()) {
++          var.setDefinition(false);
++        }
++        mapExprentMinTypes.put(to, merged);
++        remapped = true;
++      }
++    }
++    return remapped;
++  }
++
++  private VarType getMergedType(VarType firstMin, VarType secondMin, VarType firstMax, VarType secondMax) {
++    if (firstMin != null && firstMin.equals(secondMin)) {
++      return firstMin; // Short circuit this for simplicities sake
++    }
++    VarType type = firstMin == null ? secondMin : (secondMin == null ? firstMin : VarType.getCommonSupertype(firstMin, secondMin));
++    if (type == null || firstMin == null || secondMin == null) {
++      return null; // no common supertype, skip the remapping
++    }
++    if (type.typeFamily == CodeConstants.TYPE_FAMILY_OBJECT) {
++      if (firstMax != null && secondMax != null) {
++        type = VarType.getCommonMinType(firstMax, secondMax);
++      } else if (firstMin.arrayDim != secondMin.arrayDim) {
++        return null; // Don't merge is arrays don't match.
++      } else {
++        type = VarType.getCommonMinType(firstMin, secondMin);
++        // couldn't find a sane common supertype, we're not gonna be able to merge
++        if (type == null || type == VarType.VARTYPE_NULL) {
++          return null;
++        }
++      }
++    }
++    return type;
++  }
++
++  //Helper classes because Java is dumb and doesn't have a Pair<K,V> class
++  private static class SimpleEntry<K, V> implements Entry<K, V> {
++    private K key;
++    private V value;
++    public SimpleEntry(K key, V value) {
++      this.key = key;
++      this.value = value;
++    }
++    @Override public K getKey() { return key; }
++    @Override public V getValue() { return value; }
++    @Override
++    public V setValue(V value) {
++      V tmp = this.value;
++      this.value = value;
++      return tmp;
++    }
++  }
++  private static class VPPEntry extends SimpleEntry<VarVersionPair, VarVersionPair> {
++    public VPPEntry(VarExprent key, VarVersionPair value) {
++        super(new VarVersionPair(key), value);
+     }
+   }
+ }
+\ No newline at end of file
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0054-If-it-s-a-null-constant-don-t-give-it-a-type.-Cleans.patch b/FernFlower-Patches/0054-If-it-s-a-null-constant-don-t-give-it-a-type.-Cleans.patch
new file mode 100644
index 0000000..af31d8e
--- /dev/null
+++ b/FernFlower-Patches/0054-If-it-s-a-null-constant-don-t-give-it-a-type.-Cleans.patch
@@ -0,0 +1,54 @@
+From a0351b03097955eeac9fc6cba0e22242365280b5 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Thu, 24 Sep 2015 00:00:19 -0400
+Subject: [PATCH 054/122] If it's a null constant, don't give it a type. Cleans
+ up some more errors.
+
+---
+ .../modules/decompiler/vars/VarDefinitionHelper.java |  3 +++
+ test/org/jetbrains/java/decompiler/LVTTest.java      | 12 +++++++++++-
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index 0c03cd5..9ecb28b 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -637,6 +637,9 @@ if (mt.getName().equals("func_180655_c")){
+           }
+ 
+           ConstExprent right = (ConstExprent)ass.getRight();
++          if (right.getConstType() == VarType.VARTYPE_NULL) {
++              continue;
++          }
+           VarType merged = getMergedType(mapExprentMinTypes.get(from), mapExprentMinTypes.get(to),
+                                          mapExprentMaxTypes.get(from), mapExprentMaxTypes.get(to));
+ 
+diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
+index d2a8f1c..52428c7 100644
+--- a/test/org/jetbrains/java/decompiler/LVTTest.java
++++ b/test/org/jetbrains/java/decompiler/LVTTest.java
+@@ -35,10 +35,20 @@ public class LVTTest extends SingleClassesTestBase {
+         super.setUp();
+         fixture.cleanup = false;
+     }
+-  @Test public void testMatch1() { doTest("pkg/TestPPMM"); }
++//  @Test public void testMatch1() { doTest("pkg/TestPPMM"); }
+ //  @Test public void testMatchLM() { doTest("pkg/TestLexManosLVT"); }
+ //  @Test public void testMatch1() { doTest("pkg/TestLVT"); }
+ //  @Test public void testMatch2() { doTest("pkg/TestLVTScoping"); }
+ //  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
+ //  @Test public void testMCGuiCmdBlock() { doTest("net/minecraft/client/gui/GuiCommandBlock"); }
++
++//  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
++
++//  @Test public void testMCGuiCmdBlock() { doTest("net/minecraft/client/gui/GuiCommandBlock"); }
++
++//  @Test public void testMCBlockFence() { doTest("net/minecraft/block/BlockFence"); }
++
++//  @Test public void testMCAbstractTexture() { doTest("net/minecraft/client/multiplayer/ServerAddress"); }
++//  @Test public void testMCAbstractTexture() { doTest("net/minecraft/client/resources/AbstractResourcePack"); }
++  @Test public void testMCGuiShareToLan() { doTest("net/minecraft/client/gui/GuiShareToLan"); }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0055-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch b/FernFlower-Patches/0055-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch
new file mode 100644
index 0000000..9c6ffeb
--- /dev/null
+++ b/FernFlower-Patches/0055-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch
@@ -0,0 +1,157 @@
+From b065f7aef331543501429be47e0f36a22933c617 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Thu, 24 Sep 2015 12:48:31 -0400
+Subject: [PATCH 055/122] Bind the LVTs at the time we create the exprents. The
+ offset is absolute at that point, and won't be incorrect.
+
+---
+ .../decompiler/modules/decompiler/ExprProcessor.java | 10 +++++++---
+ .../modules/decompiler/vars/LocalVariableTable.java  |  8 ++------
+ .../modules/decompiler/vars/VarDefinitionHelper.java |  3 +--
+ .../modules/decompiler/vars/VarProcessor.java        | 12 +++++++++---
+ test/org/jetbrains/java/decompiler/LVTTest.java      |  6 +++---
+ 5 files changed, 22 insertions(+), 17 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+index 0425fbc..7b94e5b 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+@@ -382,7 +382,9 @@ public class ExprProcessor implements CodeConstants {
+         case opc_fload:
+         case opc_dload:
+         case opc_aload:
+-          pushEx(stack, exprlist, new VarExprent(instr.getOperand(0), vartypes[instr.opcode - opc_iload], varProcessor));
++          VarExprent varExprent = new VarExprent(instr.getOperand(0), vartypes[instr.opcode - opc_iload], varProcessor);
++          varProcessor.findLVT(varExprent, bytecode_offset+instr.length());
++          pushEx(stack, exprlist, varExprent);
+           break;
+         case opc_iaload:
+         case opc_laload:
+@@ -412,8 +414,9 @@ public class ExprProcessor implements CodeConstants {
+         case opc_astore:
+           Exprent top = stack.pop();
+           int varindex = instr.getOperand(0);
+-          AssignmentExprent assign =
+-            new AssignmentExprent(new VarExprent(varindex, vartypes[instr.opcode - opc_istore], varProcessor), top, bytecode_offsets);
++          varExprent = new VarExprent(varindex, vartypes[instr.opcode - opc_istore], varProcessor);
++          varProcessor.findLVT(varExprent, bytecode_offset+instr.length());
++          AssignmentExprent assign = new AssignmentExprent(varExprent, top, bytecode_offsets);
+           exprlist.add(assign);
+           break;
+         case opc_iastore:
+@@ -475,6 +478,7 @@ public class ExprProcessor implements CodeConstants {
+           break;
+         case opc_iinc:
+           VarExprent vevar = new VarExprent(instr.getOperand(0), VarType.VARTYPE_INT, varProcessor);
++          varProcessor.findLVT(vevar,bytecode_offset+instr.length());
+           exprlist.add(new AssignmentExprent(vevar, new FunctionExprent(
+             instr.getOperand(1) < 0 ? FunctionExprent.FUNCTION_SUB : FunctionExprent.FUNCTION_ADD, Arrays
+             .asList(vevar.copy(), new ConstExprent(VarType.VARTYPE_INT, Math.abs(instr.getOperand(1)), null)),
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+index fe45b11..4193f56 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+@@ -41,11 +41,7 @@ public class LocalVariableTable {
+     mapLVT = null; // Invalidate the cache and rebuild it.
+   }
+ 
+-  public LVTVariable find(int index, Statement stat) {
+-    BitSet values = new BitSet();
+-    MethodProcessorRunnable.getOffset(stat, values);
+-    int start = values.nextSetBit(0);
+-    int end = values.length()-1;
++  public LVTVariable find(int index, Integer bytecodeOffset) {
+     //System.out.println(indent + stat.getClass().getSimpleName() + " (" + start +", " + end + ")");
+ 
+     Map<Integer, List<LVTVariable>> map = getMapVarNames();
+@@ -53,7 +49,7 @@ public class LocalVariableTable {
+       return null;
+     }
+     for (LVTVariable lvt : map.get(index)) {
+-      if (lvt.start >= start && lvt.end <= end) {
++      if (lvt.start == bytecodeOffset) {
+         return lvt;
+       }
+     }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index 9ecb28b..6d8ab12 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -133,7 +133,7 @@ public class VarDefinitionHelper {
+     for (Entry<Integer, Statement> en : mapVarDefStatements.entrySet()) {
+       Statement stat = en.getValue();
+       Integer index = en.getKey();
+-      setupLVTs(stat);
++//      setupLVTs(stat);
+ 
+       if (implDefVars.contains(index)) {
+         // already implicitly defined
+@@ -452,7 +452,6 @@ if (mt.getName().equals("func_180655_c")){
+     }
+     return null;
+   }
+-
+   private VPPEntry mergeVars(Statement stat, Map<Integer, VarVersionPair> parent, Map<Integer, VarVersionPair> leaked, Map<VarVersionPair, VarVersionPair> blacklist) {
+     Map<Integer, VarVersionPair> this_vars = new HashMap<Integer, VarVersionPair>();
+     if (parent.size() > 0)
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+index 691797e..bbf17ad 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+@@ -17,6 +17,7 @@ package org.jetbrains.java.decompiler.modules.decompiler.vars;
+ 
+ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
+ import org.jetbrains.java.decompiler.struct.StructMethod;
+@@ -125,7 +126,9 @@ public class VarProcessor {
+   }
+ 
+   public void setVarType(VarVersionPair pair, VarType type) {
+-    varVersions.setVarType(pair, type);
++    if (varVersions != null) {
++        varVersions.setVarType(pair, type);
++    }
+   }
+ 
+   public String getVarName(VarVersionPair pair) {
+@@ -160,8 +163,11 @@ public class VarProcessor {
+     return this.lvt;
+   }
+ 
+-  public LVTVariable findLVT(int index, Statement stat) {
+-    return this.lvt == null ? null : lvt.find(index, stat);
++  public void findLVT(VarExprent varExprent, int bytecodeOffset) {
++    LVTVariable var = this.lvt == null ? null : lvt.find(varExprent.getIndex(), bytecodeOffset);
++    if (var != null) {
++        varExprent.setLVT(var);
++    }
+   }
+ 
+   public int getRemapped(int index) {
+diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
+index 52428c7..d4771bb 100644
+--- a/test/org/jetbrains/java/decompiler/LVTTest.java
++++ b/test/org/jetbrains/java/decompiler/LVTTest.java
+@@ -42,13 +42,13 @@ public class LVTTest extends SingleClassesTestBase {
+ //  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
+ //  @Test public void testMCGuiCmdBlock() { doTest("net/minecraft/client/gui/GuiCommandBlock"); }
+ 
+-//  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
++  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
+ 
+ //  @Test public void testMCGuiCmdBlock() { doTest("net/minecraft/client/gui/GuiCommandBlock"); }
+ 
+ //  @Test public void testMCBlockFence() { doTest("net/minecraft/block/BlockFence"); }
+ 
+ //  @Test public void testMCAbstractTexture() { doTest("net/minecraft/client/multiplayer/ServerAddress"); }
+-//  @Test public void testMCAbstractTexture() { doTest("net/minecraft/client/resources/AbstractResourcePack"); }
+-  @Test public void testMCGuiShareToLan() { doTest("net/minecraft/client/gui/GuiShareToLan"); }
++//  @Test public void testMCAbstractResourcePack() { doTest("net/minecraft/client/resources/AbstractResourcePack"); }
++//  @Test public void testMCGuiShareToLan() { doTest("net/minecraft/client/gui/GuiShareToLan"); }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0056-Some-code-cleanup-damn-cpw.patch b/FernFlower-Patches/0056-Some-code-cleanup-damn-cpw.patch
new file mode 100644
index 0000000..46e26c6
--- /dev/null
+++ b/FernFlower-Patches/0056-Some-code-cleanup-damn-cpw.patch
@@ -0,0 +1,251 @@
+From 97779c0a2088cb5153b21f1b3f4f7459cc9c4ec0 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sun, 27 Sep 2015 21:17:03 -0700
+Subject: [PATCH 056/122] Some code cleanup damn cpw
+
+---
+ .../java/decompiler/code/cfg/BasicBlock.java  | 18 +++++------
+ .../decompiler/stats/BasicBlockStatement.java |  8 ++---
+ .../modules/decompiler/stats/DoStatement.java |  5 ---
+ .../modules/decompiler/stats/IfStatement.java |  8 +++--
+ .../decompiler/stats/RootStatement.java       |  6 ++--
+ .../decompiler/stats/SequenceStatement.java   |  5 ---
+ .../modules/decompiler/stats/Statement.java   | 18 +++++------
+ .../decompiler/stats/SwitchStatement.java     | 16 +++++-----
+ .../decompiler/vars/LocalVariableTable.java   | 32 ++++++-------------
+ 9 files changed, 48 insertions(+), 68 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
+index a36047b..407aaa9 100644
+--- a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
++++ b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
+@@ -264,17 +264,17 @@ public class BasicBlock implements IGraphNode {
+   }
+ 
+   public int getStartInstruction() {
+-      if (seq.isEmpty()) {
+-          return 0;
+-      }
+-      return instrOldOffsets.get(0);
++    if (seq.isEmpty()) {
++      return 0;
++    }
++    return instrOldOffsets.get(0);
+   }
+ 
+   public int getEndInstruction() {
+-      if (seq.isEmpty()) {
+-          return 0;
+-      }
+-      int end = seq.getLastInstr().length();
+-      return end + instrOldOffsets.get(size() -1);
++    if (seq.isEmpty()) {
++      return 0;
++    }
++    int end = seq.getLastInstr().length();
++    return end + instrOldOffsets.get(size() -1);
+   }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
+index ea7e611..e68cb97 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
+@@ -97,11 +97,11 @@ public class BasicBlockStatement extends Statement {
+   }
+ 
+   @Override
+-    public StartEndPair getStartEndRange() {
+-      if (block.size() > 0) {
+-          return new StartEndPair(block.getStartInstruction(),block.getEndInstruction());
++  public StartEndPair getStartEndRange() {
++    if (block.size() > 0) {
++      return new StartEndPair(block.getStartInstruction(), block.getEndInstruction());
+     } else {
+-        return null;
++      return null;
+     }
+   }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
+index 0768912..36cd7fb 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
+@@ -242,9 +242,4 @@ public class DoStatement extends Statement {
+   public void setLooptype(int looptype) {
+     this.looptype = looptype;
+   }
+-
+-  @Override
+-    public StartEndPair getStartEndRange() {
+-        return super.getStartEndRange();
+-    }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
+index f216b73..8f3e467 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
+@@ -465,7 +465,9 @@ public class IfStatement extends Statement {
+   }
+ 
+   @Override
+-    public StartEndPair getStartEndRange() {
+-        return StartEndPair.join(super.getStartEndRange(),ifstat != null ? ifstat.getStartEndRange() : null,elsestat != null ? elsestat.getStartEndRange(): null);
+-    }
++  public StartEndPair getStartEndRange() {
++    return StartEndPair.join(super.getStartEndRange(),
++      ifstat != null ? ifstat.getStartEndRange() : null,
++      elsestat != null ? elsestat.getStartEndRange(): null);
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
+index 0a1e798..d8329ff 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
+@@ -49,7 +49,7 @@ public class RootStatement extends Statement {
+   }
+ 
+   @Override
+-    public StartEndPair getStartEndRange() {
+-        return first.getStartEndRange();
+-    }
++  public StartEndPair getStartEndRange() {
++    return first.getStartEndRange();
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
+index b3785fb..81d31a5 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
+@@ -138,9 +138,4 @@ public class SequenceStatement extends Statement {
+   public Statement getSimpleCopy() {
+     return new SequenceStatement();
+   }
+-
+-  @Override
+-    public StartEndPair getStartEndRange() {
+-        return super.getStartEndRange();
+-    }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+index 806c4d5..f71ed84 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+@@ -941,15 +941,15 @@ public class Statement implements IMatchable {
+ 
+   private StartEndPair endpoints;
+   public StartEndPair getStartEndRange() {
+-      if (endpoints == null) {
+-          int start = Integer.MAX_VALUE;
+-          int end = Integer.MIN_VALUE;
+-          for (Statement st : getStats()) {
+-              start = Math.min(start, st.getBasichead().getBlock().getStartInstruction());
+-              end = Math.max(end, st.getBasichead().getBlock().getEndInstruction());
+-          }
+-          endpoints = new StartEndPair(start,end);
++    if (endpoints == null) {
++      int start = Integer.MAX_VALUE;
++      int end   = Integer.MIN_VALUE;
++      for (Statement st : getStats()) {
++        start = Math.min(start, st.getBasichead().getBlock().getStartInstruction());
++        end   = Math.max(end,   st.getBasichead().getBlock().getEndInstruction());
+       }
+-      return endpoints;
++      endpoints = new StartEndPair(start, end);
++    }
++    return endpoints;
+   }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
+index 8d7127c..3e27201 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
+@@ -368,13 +368,13 @@ public class SwitchStatement extends Statement {
+   }
+ 
+   @Override
+-    public StartEndPair getStartEndRange() {
+-      StartEndPair[] sepairs = new StartEndPair[caseStatements.size() + 1];
+-      int i = 0;
+-      sepairs[i++] = super.getStartEndRange();
+-      for (Statement st : caseStatements) {
+-          sepairs[i++] = st.getStartEndRange();
+-      }
+-      return StartEndPair.join(sepairs);
++  public StartEndPair getStartEndRange() {
++    StartEndPair[] sepairs = new StartEndPair[caseStatements.size() + 1];
++    int i = 0;
++    sepairs[i++] = super.getStartEndRange();
++    for (Statement st : caseStatements) {
++      sepairs[i++] = st.getStartEndRange();
+     }
++    return StartEndPair.join(sepairs);
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+index 4193f56..729a3d2 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+@@ -1,15 +1,11 @@
+ package org.jetbrains.java.decompiler.modules.decompiler.vars;
+ 
+ import java.util.ArrayList;
+-import java.util.BitSet;
+ import java.util.HashMap;
+-import java.util.HashSet;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.Set;
+ 
+-import org.jetbrains.java.decompiler.main.rels.MethodProcessorRunnable;
+-import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
+ 
+ public class LocalVariableTable {
+@@ -74,8 +70,8 @@ public class LocalVariableTable {
+       versions.put(lvt.index, idx);
+       List<LVTVariable> lvtList = mapLVT.get(lvt.index);
+       if (lvtList == null) {
+-          lvtList = new ArrayList<LVTVariable>();
+-          mapLVT.put(lvt.index, lvtList);
++        lvtList = new ArrayList<LVTVariable>();
++        mapLVT.put(lvt.index, lvtList);
+       }
+       lvtList.add(lvt);
+     }
+@@ -86,24 +82,16 @@ public class LocalVariableTable {
+   }
+ 
+   public Map<Integer, LVTVariable> getVars(Statement statement) {
+-      HashMap<Integer,LVTVariable> ret = new HashMap<Integer,LVTVariable>();
+-      if (statement == null) return ret;
+-      StartEndPair sepair = statement.getStartEndRange();
++    Map<Integer, LVTVariable> ret = new HashMap<Integer, LVTVariable>();
++    if (statement == null) {
++      return ret;
++    }
++    StartEndPair sepair = statement.getStartEndRange();
+     if (endpoints.containsKey(sepair)) {
+-        for (LVTVariable lvt : endpoints.get(sepair)) {
+-            ret.put(lvt.index,lvt);
+-        }
++      for (LVTVariable lvt : endpoints.get(sepair)) {
++        ret.put(lvt.index, lvt);
++      }
+     }
+-//    for (Entry<Integer, List<LVTVariable>> entry : endpoints.get(end)) {
+-//      for (LVTVariable lvt : entry.getValue()) {
+-//        if (lvt.start >= start && lvt.end <= end) {
+-//          if (ret.containsKey(entry.getKey())) {
+-//            System.out.println("DUPLICATE INDEX WHAT THE FUCK: " + entry.getKey());
+-//          }
+-//          ret.put(entry.getKey(), lvt);
+-//        }
+-//      }
+-//    }
+     return ret;
+   }
+ }
+\ No newline at end of file
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0057-Propogate-LVT-data-post-merge.-And-fix-injected-var-.patch b/FernFlower-Patches/0057-Propogate-LVT-data-post-merge.-And-fix-injected-var-.patch
new file mode 100644
index 0000000..f999684
--- /dev/null
+++ b/FernFlower-Patches/0057-Propogate-LVT-data-post-merge.-And-fix-injected-var-.patch
@@ -0,0 +1,273 @@
+From ec3558a5473045e647365b39187c259e1690042d Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sun, 27 Sep 2015 21:17:47 -0700
+Subject: [PATCH 057/122] Propogate LVT data post merge. And fix injected var
+ defs LVT association.
+
+---
+ .../modules/decompiler/exps/VarExprent.java   |   6 +-
+ .../decompiler/vars/VarDefinitionHelper.java  | 155 +++++++++++++++---
+ 2 files changed, 140 insertions(+), 21 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+index 3d5f03b..05a4f79 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+@@ -232,10 +232,14 @@ public class VarExprent extends Exprent {
+   public void setLVT(LVTVariable lvt) {
+     this.lvt = lvt;
+     if (processor != null) {
+-        processor.setVarType(new VarVersionPair(this),lvt.getVarType());
++      processor.setVarType(new VarVersionPair(this), lvt.getVarType());
+     }
+   }
+ 
++  public LVTVariable getLVT() {
++    return this.lvt;
++  }
++
+   @Override
+   public String toString() {
+     return lvt != null ? lvt.name :  "var_" + index + "_" + version;
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index 6d8ab12..cc5e5e4 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -133,7 +133,6 @@ public class VarDefinitionHelper {
+     for (Entry<Integer, Statement> en : mapVarDefStatements.entrySet()) {
+       Statement stat = en.getValue();
+       Integer index = en.getKey();
+-//      setupLVTs(stat);
+ 
+       if (implDefVars.contains(index)) {
+         // already implicitly defined
+@@ -213,19 +212,18 @@ public class VarDefinitionHelper {
+         var.setDefinition(true);
+ 
+         if (varproc.getLVT() != null) {
+-          Map<Integer, LVTVariable> vars = varproc.getLVT().getVars(stat);
+-          if (vars.containsKey(var.getIndex())) {
+-            var.setLVT(vars.get(var.getIndex()));
++          LVTVariable lvt = findLVT(index.intValue(), stat);
++          if (lvt != null) {
++            var.setLVT(lvt);
+           }
+         }
+ 
+         lst.add(addindex, var);
+       }
+     }
+-if (mt.getName().equals("func_180655_c")){
+-    System.out.println("asdf");
+-}
++
+     mergeVars(root);
++    propogateLVTs(root);
+   }
+ 
+ 
+@@ -233,6 +231,54 @@ if (mt.getName().equals("func_180655_c")){
+   // private methods
+   // *****************************************************************************
+ 
++  private LVTVariable findLVT(int index, Statement stat) {
++    if (stat.getExprents() == null) {
++      for (Object obj : stat.getSequentialObjects()) {
++        if (obj instanceof Statement) {
++          LVTVariable lvt = findLVT(index, (Statement)obj);
++          if (lvt != null) {
++            return lvt;
++          }
++        }
++        else if (obj instanceof Exprent) {
++          LVTVariable lvt = findLVT(index, (Exprent)obj);
++          if (lvt != null) {
++            return lvt;
++          }
++        }
++      }
++    }
++    else {
++      for (Exprent exp : stat.getExprents()) {
++        LVTVariable lvt = findLVT(index, exp);
++        if (lvt != null) {
++          return lvt;
++        }
++      }
++    }
++    return null;
++  }
++
++  private LVTVariable findLVT(int index, Exprent exp) {
++    VarExprent var = null;
++
++    if (exp.type == Exprent.EXPRENT_ASSIGNMENT) {
++      AssignmentExprent ass = (AssignmentExprent)exp;
++      if (ass.getLeft().type == Exprent.EXPRENT_VAR) {
++        var = (VarExprent)ass.getLeft();
++      }
++    }
++    else if (exp.type == Exprent.EXPRENT_VAR) {
++      var = (VarExprent)exp;
++    }
++
++    if (var == null) {
++      return null;
++    }
++
++    return var.getIndex() == index ? var.getLVT() : null;
++  }
++
+   private Statement findFirstBlock(Statement stat, Integer varindex) {
+ 
+     LinkedList<Statement> stack = new LinkedList<Statement>();
+@@ -378,31 +424,99 @@ if (mt.getName().equals("func_180655_c")){
+     return false;
+   }
+ 
+-  private void setupLVTs(Statement stat) {
+-    if (stat == null || varproc.getLVT() == null) {
++  private void propogateLVTs(Statement stat) {
++    if (varproc.getLVT() == null) {
+       return;
+     }
+ 
+-    Map<Integer, LVTVariable> vars = varproc.getLVT().getVars(stat);
++    MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
++    Map<VarVersionPair, LVTVariable> types = new HashMap<VarVersionPair, LVTVariable>();
++
++    int index = 0;
++    if (!mt.hasModifier(CodeConstants.ACC_STATIC)) {
++      types.put(new VarVersionPair(index, 0), varproc.getLVT().getCandidates(index++).get(0));
++    }
++
++    for (VarType var : md.params) {
++      types.put(new VarVersionPair(index, 0), varproc.getLVT().getCandidates(index).get(0));
++      index += var.stackSize;
++    }
++
++    findTypes(stat, types);
++
++    applyTypes(stat, types);
++  }
++
++  private void findTypes(Statement stat, Map<VarVersionPair, LVTVariable> types) {
++    if (stat == null) {
++      return;
++    }
++
++    for (Exprent exp : stat.getVarDefinitions()) {
++      findTypes(exp, types);
++    }
++
++    if (stat.getExprents() == null) {
++      for (Object obj : stat.getSequentialObjects()) {
++        if (obj instanceof Statement) {
++          findTypes((Statement)obj, types);
++        }
++        else if (obj instanceof Exprent) {
++          findTypes((Exprent)obj, types);
++        }
++      }
++    }
++    else {
++      for (Exprent exp : stat.getExprents()) {
++        findTypes(exp, types);
++      }
++    }
++  }
++
++  private void findTypes(Exprent exp, Map<VarVersionPair, LVTVariable> types) {
++    VarExprent var = null;
++
++    if (exp.type == Exprent.EXPRENT_ASSIGNMENT) {
++      AssignmentExprent ass = (AssignmentExprent)exp;
++      if (ass.getLeft().type == Exprent.EXPRENT_VAR) {
++        var = (VarExprent)ass.getLeft();
++      }
++    }
++    else if (exp.type == Exprent.EXPRENT_VAR) {
++      var = (VarExprent)exp;
++    }
++
++    if (var == null || !var.isDefinition()) {
++      return;
++    }
++
++    types.put(new VarVersionPair(var), var.getLVT());
++  }
++
++
++  private void applyTypes(Statement stat, Map<VarVersionPair, LVTVariable> types) {
++    if (stat == null || types.size() == 0) {
++      return;
++    }
+ 
+     if (stat.getExprents() == null) {
+       for (Object obj : stat.getSequentialObjects()) {
+         if (obj instanceof Statement) {
+-          setupLVTs((Statement)obj);
++          applyTypes((Statement)obj, types);
+         }
+         else if (obj instanceof Exprent) {
+-          setupLVTs((Exprent)obj, vars);
++          applyTypes((Exprent)obj, types);
+         }
+       }
+     }
+     else {
+       for (Exprent exp : stat.getExprents()) {
+-        setupLVTs(exp, vars);
++        applyTypes(exp, types);
+       }
+     }
+   }
+ 
+-  private void setupLVTs(Exprent exprent, Map<Integer, LVTVariable> lvts) {
++  private void applyTypes(Exprent exprent, Map<VarVersionPair, LVTVariable> types) {
+     if (exprent == null) {
+       return;
+     }
+@@ -412,12 +526,12 @@ if (mt.getName().equals("func_180655_c")){
+     for (Exprent expr : lst) {
+       if (expr.type == Exprent.EXPRENT_VAR) {
+         VarExprent var = (VarExprent)expr;
+-        int index = varproc.getRemapped(var.getIndex());
+-        LVTVariable lvt = lvts.get(index);
++        LVTVariable lvt = types.get(new VarVersionPair(var));
+         if (lvt != null) {
+           var.setLVT(lvt);
+         } else {
+-            System.currentTimeMillis();
++          System.currentTimeMillis();
++          System.out.println("null " + new VarVersionPair(var));
+         }
+       }
+     }
+@@ -439,19 +553,20 @@ if (mt.getName().equals("func_180655_c")){
+ 
+     Map<VarVersionPair, VarVersionPair> blacklist = new HashMap<VarVersionPair, VarVersionPair>();
+     VPPEntry remap = mergeVars(stat, parent, new HashMap<Integer, VarVersionPair>(), blacklist);
+-    VPPEntry ast = remap;
++    VPPEntry last = remap;
+     while (remap != null) {
+       //System.out.println("Remapping: " + remap.getKey() + " -> " + remap.getValue());
+       if (!remapVar(stat, remap.getKey(), remap.getValue())) {
+         blacklist.put(remap.getKey(), remap.getValue());
+       }
+       remap = mergeVars(stat, parent, new HashMap<Integer, VarVersionPair>(), blacklist);
+-      if (ast.equals(remap)){
+-          System.currentTimeMillis();
++      if (last.equals(remap)){
++        System.currentTimeMillis();
+       }
+     }
+     return null;
+   }
++
+   private VPPEntry mergeVars(Statement stat, Map<Integer, VarVersionPair> parent, Map<Integer, VarVersionPair> leaked, Map<VarVersionPair, VarVersionPair> blacklist) {
+     Map<Integer, VarVersionPair> this_vars = new HashMap<Integer, VarVersionPair>();
+     if (parent.size() > 0)
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0058-Fix-types-to-use-LVT-first-and-fallback-to-other-typ.patch b/FernFlower-Patches/0058-Fix-types-to-use-LVT-first-and-fallback-to-other-typ.patch
new file mode 100644
index 0000000..3cd2c06
--- /dev/null
+++ b/FernFlower-Patches/0058-Fix-types-to-use-LVT-first-and-fallback-to-other-typ.patch
@@ -0,0 +1,77 @@
+From f6acdf7dd26df4eebb27b2561f62f44e643c5f89 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Mon, 28 Sep 2015 01:26:23 -0400
+Subject: [PATCH 058/122] Fix types to use LVT first, and fallback to other
+ type bounds
+
+---
+ .../modules/decompiler/exps/VarExprent.java       | 15 ++++++++++++++-
+ .../modules/decompiler/vars/VarTypeProcessor.java |  7 ++++++-
+ 2 files changed, 20 insertions(+), 2 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+index 05a4f79..933b046 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+@@ -22,6 +22,7 @@ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.TextBuffer;
+ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.LVTVariable;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarTypeProcessor;
+@@ -111,6 +112,9 @@ public class VarExprent extends Exprent {
+         if (lvt != null && lvt.getSig() != null) {
+           buffer.append(GenericMain.getGenericCastTypeName(new GenericType(lvt.getSig()))).append(" ");
+         }
++        else if (lvt != null) {
++          buffer.append(ExprProcessor.getCastTypeName(lvt.getVarType())).append(" ");
++        }
+         else {
+           buffer.append(ExprProcessor.getCastTypeName(getVarType())).append(" ");
+         }
+@@ -231,7 +235,7 @@ public class VarExprent extends Exprent {
+ 
+   public void setLVT(LVTVariable lvt) {
+     this.lvt = lvt;
+-    if (processor != null) {
++    if (processor != null && lvt != null) {
+       processor.setVarType(new VarVersionPair(this), lvt.getVarType());
+     }
+   }
+@@ -245,4 +249,13 @@ public class VarExprent extends Exprent {
+     return lvt != null ? lvt.name :  "var_" + index + "_" + version;
+   }
+ 
++  @Override
++  public CheckTypesResult checkExprTypeBounds() {
++    CheckTypesResult checkExprTypeBounds = super.checkExprTypeBounds();
++    if (lvt != null) {
++      checkExprTypeBounds.addMinTypeExprent(this, lvt.getVarType());
++    }
++    return checkExprTypeBounds;
++  }
++
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
+index d6c746b..4a2cb8f 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
+@@ -108,7 +108,12 @@ public class VarTypeProcessor {
+ 
+         for (Exprent expr : lst) {
+           if (expr.type == Exprent.EXPRENT_VAR) {
+-            ((VarExprent)expr).setVarType(VarType.VARTYPE_UNKNOWN);
++            VarExprent ve = (VarExprent)expr;
++            if (ve.getLVT()!= null) {
++                ve.setVarType(ve.getLVT().getVarType());
++            } else {
++                ve.setVarType(VarType.VARTYPE_UNKNOWN);
++            }
+           }
+           else if (expr.type == Exprent.EXPRENT_CONST) {
+             ConstExprent constExpr = (ConstExprent)expr;
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0059-NPE-protection-in-LVT-loading.patch b/FernFlower-Patches/0059-NPE-protection-in-LVT-loading.patch
new file mode 100644
index 0000000..73d20e3
--- /dev/null
+++ b/FernFlower-Patches/0059-NPE-protection-in-LVT-loading.patch
@@ -0,0 +1,32 @@
+From 1dfe3bcf3f09d6595a5dbd0bac11056ebad79b4e Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Thu, 1 Oct 2015 18:03:36 -0700
+Subject: [PATCH 059/122] NPE protection in LVT loading.
+
+---
+ .../struct/attr/StructLocalVariableTableAttribute.java   | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+index 771ec7a..a95870f 100644
+--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
++++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+@@ -61,8 +61,13 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
+   }
+ 
+   public void addLocalVariableTable(StructLocalVariableTableAttribute attr) {
+-    lvt.mergeLVTs(attr.lvt);
+-    attr.lvt = lvt;
++    if (lvt == null) {
++      lvt = attr.lvt;
++    }
++    else {
++      lvt.mergeLVTs(attr.lvt);
++      attr.lvt = lvt;
++    }
+   }
+ 
+   public Map<Integer, List<LVTVariable>> getMapVarNames() {
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0060-Fix-variable-defintions-in-IfStatement-s-headers-hav.patch b/FernFlower-Patches/0060-Fix-variable-defintions-in-IfStatement-s-headers-hav.patch
new file mode 100644
index 0000000..b054feb
--- /dev/null
+++ b/FernFlower-Patches/0060-Fix-variable-defintions-in-IfStatement-s-headers-hav.patch
@@ -0,0 +1,36 @@
+From 8ea51a091a3d0fa64dbf8fd39d70391c7b7d5f80 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Thu, 1 Oct 2015 18:04:09 -0700
+Subject: [PATCH 060/122] Fix variable defintions in IfStatement's headers
+ having wrong scope.
+
+---
+ .../modules/decompiler/vars/VarDefinitionHelper.java         | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index cc5e5e4..560328a 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -531,7 +531,7 @@ public class VarDefinitionHelper {
+           var.setLVT(lvt);
+         } else {
+           System.currentTimeMillis();
+-          System.out.println("null " + new VarVersionPair(var));
++          //System.out.println("null " + new VarVersionPair(var));
+         }
+       }
+     }
+@@ -631,6 +631,9 @@ public class VarDefinitionHelper {
+                 leaked_n.clear(); // Force no leaking at the end of if blocks
+                 // We may need to do this for Switches as well.. But havent run into that issue yet...
+               }
++              else if (obj == ifst.getFirst()) {
++                leaked.putAll(leaked_n); //First is outside the scope so leak!
++              }
+             }
+             this_vars.putAll(leaked_n);
+           }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0061-Detect-if-the-itterator-is-being-used-elseware-befor.patch b/FernFlower-Patches/0061-Detect-if-the-itterator-is-being-used-elseware-befor.patch
new file mode 100644
index 0000000..f4cb113
--- /dev/null
+++ b/FernFlower-Patches/0061-Detect-if-the-itterator-is-being-used-elseware-befor.patch
@@ -0,0 +1,125 @@
+From de52ba808f928bd138c8cbf29baee707ecf469d3 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Thu, 1 Oct 2015 20:00:53 -0700
+Subject: [PATCH 061/122] Detect if the itterator is being used elseware before
+ creating an enhanced for loop.
+
+---
+ .../modules/decompiler/MergeHelper.java       | 73 +++++++++++++++++++
+ 1 file changed, 73 insertions(+)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+index 3172b5e..5ba4dcd 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+@@ -458,6 +458,14 @@ public class MergeHelper {
+           return false;
+         }
+ 
++        InvocationExprent next = (InvocationExprent)getUncast(ass.getRight());
++        InvocationExprent hnext = (InvocationExprent)getUncast(drillNots(stat.getConditionExprent()));
++        if (next.getInstance().type != Exprent.EXPRENT_VAR ||
++            hnext.getInstance().type != Exprent.EXPRENT_VAR ||
++            isVarReferenced((VarExprent)initDoExprent.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
++          return false;
++        }
++
+         InvocationExprent holder = (InvocationExprent)((AssignmentExprent)initDoExprent).getRight();
+ 
+         holder.getInstance().addBytecodeOffsets(initDoExprent.bytecode);
+@@ -487,6 +495,12 @@ public class MergeHelper {
+           return false;
+         }
+ 
++        AssignmentExprent itr = (AssignmentExprent)stat.getInitExprent();
++        InvocationExprent hnext = (InvocationExprent)exp;
++        if (itr.getLeft().type != Exprent.EXPRENT_VAR || hnext.getInstance().type != Exprent.EXPRENT_VAR) {
++          return false;
++        }
++
+         AssignmentExprent ass = (AssignmentExprent)stat.getIncExprent();
+         if (!isNextCall(ass.getRight()) || ass.getLeft().type != Exprent.EXPRENT_VAR) {
+ 
+@@ -495,6 +509,12 @@ public class MergeHelper {
+             return false;
+           }
+ 
++          InvocationExprent next = (InvocationExprent)getUncast(firstDoExprent.getRight());
++          if (next.getInstance().type != Exprent.EXPRENT_VAR ||
++              isVarReferenced((VarExprent)itr.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
++            return false;
++          }
++
+           //Move the inc exprent back to the end of the body and remove the .next call
+           Statement last = getLastDirectData(stat.getFirst());
+           InvocationExprent holder = (InvocationExprent)getUncast(((AssignmentExprent)stat.getInitExprent()).getRight());
+@@ -511,6 +531,12 @@ public class MergeHelper {
+           stat.setIncExprent(holder.getInstance());
+         }
+         else {
++          InvocationExprent next = (InvocationExprent)getUncast(ass.getRight());
++          if (next.getInstance().type != Exprent.EXPRENT_VAR ||
++              isVarReferenced((VarExprent)itr.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
++            return false;
++          }
++
+           InvocationExprent holder = (InvocationExprent)getUncast(((AssignmentExprent)stat.getInitExprent()).getRight());
+ 
+           holder.getInstance().addBytecodeOffsets(stat.getInitExprent().bytecode);
+@@ -579,6 +605,53 @@ public class MergeHelper {
+     return true;
+   }
+ 
++  private static boolean isVarReferenced(VarExprent var, Statement stat, VarExprent... whitelist) {
++    if (stat.getExprents() == null) {
++      for (Object obj : stat.getSequentialObjects()) {
++        if (obj instanceof Statement) {
++          if (isVarReferenced(var, (Statement)obj, whitelist)) {
++            return true;
++          }
++        }
++        else if (obj instanceof Exprent) {
++          if (isVarReferenced(var, (Exprent)obj, whitelist)) {
++            return true;
++          }
++        }
++      }
++    }
++    else {
++      for (Exprent exp : stat.getExprents()) {
++        if (isVarReferenced(var, exp, whitelist)) {
++          return true;
++        }
++      }
++    }
++    return false;
++  }
++
++  private static boolean isVarReferenced(VarExprent target, Exprent exp, VarExprent... whitelist) {
++    List<Exprent> lst = exp.getAllExprents(true);
++    lst.add(exp);
++    for (Exprent ex : lst) {
++      if (ex != target && ex.type == Exprent.EXPRENT_VAR) {
++        VarExprent var = (VarExprent)ex;
++        if (var.getIndex() == target.getIndex() && var.getVersion() == target.getVersion()) {
++          boolean allowed = false;
++          for (VarExprent white : whitelist) {
++            if (var == white) {
++              allowed = true;
++            }
++          }
++          if (!allowed) {
++            return true;
++          }
++        }
++      }
++    }
++    return false;
++  }
++
+   private static boolean isType(Exprent exp, int type) { //This is just a helper macro, Wish java had real macros.
+     return exp != null && exp.type == type;
+   }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0062-NPE-Protection-in-EnumProcessor.patch b/FernFlower-Patches/0062-NPE-Protection-in-EnumProcessor.patch
new file mode 100644
index 0000000..bc876df
--- /dev/null
+++ b/FernFlower-Patches/0062-NPE-Protection-in-EnumProcessor.patch
@@ -0,0 +1,27 @@
+From 950b975082f6252b0b3aedf6674f6af9b2951c33 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Fri, 2 Oct 2015 01:32:57 -0700
+Subject: [PATCH 062/122] NPE Protection in EnumProcessor
+
+---
+ src/org/jetbrains/java/decompiler/main/EnumProcessor.java | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/EnumProcessor.java b/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
+index 37a3384..8956e0e 100644
+--- a/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
+@@ -74,7 +74,9 @@ public class EnumProcessor {
+ 
+   // FIXME: move to a util class (see also InitializerProcessor)
+   private static Statement findFirstData(Statement stat) {
+-
++    if (stat == null) {
++      return null;
++    }
+     if (stat.getExprents() != null) {
+       return stat;
+     }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0063-Cleanup-unwanted-variables-in-synchronized-headers.patch b/FernFlower-Patches/0063-Cleanup-unwanted-variables-in-synchronized-headers.patch
new file mode 100644
index 0000000..459640e
--- /dev/null
+++ b/FernFlower-Patches/0063-Cleanup-unwanted-variables-in-synchronized-headers.patch
@@ -0,0 +1,275 @@
+From 280f466fb5135e0612b0afed08741a0925ee1936 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Fri, 2 Oct 2015 01:34:53 -0700
+Subject: [PATCH 063/122] Cleanup unwanted variables in synchronized headers.
+
+---
+ .../main/rels/MethodProcessorRunnable.java    |  2 +
+ .../modules/decompiler/MergeHelper.java       | 54 ++------------
+ .../decompiler/SynchronizedHelper.java        | 51 +++++++++++++
+ .../decompiler/vars/VarDefinitionHelper.java  |  6 ++
+ .../java/decompiler/util/ExprentUtil.java     | 71 +++++++++++++++++++
+ 5 files changed, 134 insertions(+), 50 deletions(-)
+ create mode 100644 src/org/jetbrains/java/decompiler/modules/decompiler/SynchronizedHelper.java
+ create mode 100644 src/org/jetbrains/java/decompiler/util/ExprentUtil.java
+
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+index 5844b93..a22d269 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+@@ -205,6 +205,8 @@ public class MethodProcessorRunnable implements Runnable {
+ 
+     SecondaryFunctionsHelper.identifySecondaryFunctions(root);
+ 
++    SynchronizedHelper.cleanSynchronizedVar(root);
++
+     varProc.setVarDefinitions(root);
+ 
+     // must be the last invocation, because it makes the statement structure inconsistent
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+index 5ba4dcd..5adf323 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+@@ -26,6 +26,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.exps.IfExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.*;
++import org.jetbrains.java.decompiler.util.ExprentUtil;
+ 
+ import java.util.ArrayList;
+ import java.util.List;
+@@ -462,7 +463,7 @@ public class MergeHelper {
+         InvocationExprent hnext = (InvocationExprent)getUncast(drillNots(stat.getConditionExprent()));
+         if (next.getInstance().type != Exprent.EXPRENT_VAR ||
+             hnext.getInstance().type != Exprent.EXPRENT_VAR ||
+-            isVarReferenced((VarExprent)initDoExprent.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
++            ExprentUtil.isVarReferenced((VarExprent)initDoExprent.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
+           return false;
+         }
+ 
+@@ -511,7 +512,7 @@ public class MergeHelper {
+ 
+           InvocationExprent next = (InvocationExprent)getUncast(firstDoExprent.getRight());
+           if (next.getInstance().type != Exprent.EXPRENT_VAR ||
+-              isVarReferenced((VarExprent)itr.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
++              ExprentUtil.isVarReferenced((VarExprent)itr.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
+             return false;
+           }
+ 
+@@ -533,7 +534,7 @@ public class MergeHelper {
+         else {
+           InvocationExprent next = (InvocationExprent)getUncast(ass.getRight());
+           if (next.getInstance().type != Exprent.EXPRENT_VAR ||
+-              isVarReferenced((VarExprent)itr.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
++              ExprentUtil.isVarReferenced((VarExprent)itr.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
+             return false;
+           }
+ 
+@@ -605,53 +606,6 @@ public class MergeHelper {
+     return true;
+   }
+ 
+-  private static boolean isVarReferenced(VarExprent var, Statement stat, VarExprent... whitelist) {
+-    if (stat.getExprents() == null) {
+-      for (Object obj : stat.getSequentialObjects()) {
+-        if (obj instanceof Statement) {
+-          if (isVarReferenced(var, (Statement)obj, whitelist)) {
+-            return true;
+-          }
+-        }
+-        else if (obj instanceof Exprent) {
+-          if (isVarReferenced(var, (Exprent)obj, whitelist)) {
+-            return true;
+-          }
+-        }
+-      }
+-    }
+-    else {
+-      for (Exprent exp : stat.getExprents()) {
+-        if (isVarReferenced(var, exp, whitelist)) {
+-          return true;
+-        }
+-      }
+-    }
+-    return false;
+-  }
+-
+-  private static boolean isVarReferenced(VarExprent target, Exprent exp, VarExprent... whitelist) {
+-    List<Exprent> lst = exp.getAllExprents(true);
+-    lst.add(exp);
+-    for (Exprent ex : lst) {
+-      if (ex != target && ex.type == Exprent.EXPRENT_VAR) {
+-        VarExprent var = (VarExprent)ex;
+-        if (var.getIndex() == target.getIndex() && var.getVersion() == target.getVersion()) {
+-          boolean allowed = false;
+-          for (VarExprent white : whitelist) {
+-            if (var == white) {
+-              allowed = true;
+-            }
+-          }
+-          if (!allowed) {
+-            return true;
+-          }
+-        }
+-      }
+-    }
+-    return false;
+-  }
+-
+   private static boolean isType(Exprent exp, int type) { //This is just a helper macro, Wish java had real macros.
+     return exp != null && exp.type == type;
+   }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SynchronizedHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SynchronizedHelper.java
+new file mode 100644
+index 0000000..371fc5a
+--- /dev/null
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SynchronizedHelper.java
+@@ -0,0 +1,51 @@
++/*
++ * Copyright 2000-2015 JetBrains s.r.o.
++ *
++ * Licensed under the Apache License, Version 2.0 (the "License");
++ * you may not use this file except in compliance with the License.
++ * You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++package org.jetbrains.java.decompiler.modules.decompiler;
++
++import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.MonitorExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.SynchronizedStatement;
++import org.jetbrains.java.decompiler.util.ExprentUtil;
++
++public class SynchronizedHelper {
++  public static void cleanSynchronizedVar(Statement stat) {
++    for (Statement st : stat.getStats()) {
++      cleanSynchronizedVar(st);
++    }
++
++    if (stat.type == Statement.TYPE_SYNCRONIZED) {
++      SynchronizedStatement sync = (SynchronizedStatement)stat;
++      if (sync.getHeadexprent().type == Exprent.EXPRENT_MONITOR) {
++        MonitorExprent mon = (MonitorExprent)sync.getHeadexprent();
++        for (Exprent e : sync.getFirst().getExprents()) {
++          if (e.type == Exprent.EXPRENT_ASSIGNMENT) {
++            AssignmentExprent ass = (AssignmentExprent)e;
++            if (ass.getLeft().type == Exprent.EXPRENT_VAR) {
++              VarExprent var = (VarExprent)ass.getLeft();
++              if (ass.getRight().equals(mon.getValue()) && !ExprentUtil.isVarReferenced(var, stat.getParent())) {
++                sync.getFirst().getExprents().remove(e);
++                break;
++              }
++            }
++          }
++        }
++      }
++    }
++  }
++}
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index 560328a..e294648 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -635,6 +635,12 @@ public class VarDefinitionHelper {
+                 leaked.putAll(leaked_n); //First is outside the scope so leak!
+               }
+             }
++            else if (stat.type == Statement.TYPE_SWITCH ||
++                     stat.type == Statement.TYPE_SYNCRONIZED) {
++              if (obj == stat.getFirst()) {
++                leaked.putAll(leaked_n); //First is outside the scope so leak!
++              }
++            }
+             this_vars.putAll(leaked_n);
+           }
+         }
+diff --git a/src/org/jetbrains/java/decompiler/util/ExprentUtil.java b/src/org/jetbrains/java/decompiler/util/ExprentUtil.java
+new file mode 100644
+index 0000000..39ce7ff
+--- /dev/null
++++ b/src/org/jetbrains/java/decompiler/util/ExprentUtil.java
+@@ -0,0 +1,71 @@
++/*
++ * Copyright 2000-2014 JetBrains s.r.o.
++ *
++ * Licensed under the Apache License, Version 2.0 (the "License");
++ * you may not use this file except in compliance with the License.
++ * You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++package org.jetbrains.java.decompiler.util;
++
++import java.util.List;
++
++import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
++
++public class ExprentUtil {
++  public static boolean isVarReferenced(VarExprent var, Statement stat, VarExprent... whitelist) {
++    if (stat.getExprents() == null) {
++      for (Object obj : stat.getSequentialObjects()) {
++        if (obj instanceof Statement) {
++          if (isVarReferenced(var, (Statement)obj, whitelist)) {
++            return true;
++          }
++        }
++        else if (obj instanceof Exprent) {
++          if (isVarReferenced(var, (Exprent)obj, whitelist)) {
++            return true;
++          }
++        }
++      }
++    }
++    else {
++      for (Exprent exp : stat.getExprents()) {
++        if (isVarReferenced(var, exp, whitelist)) {
++          return true;
++        }
++      }
++    }
++    return false;
++  }
++
++  private static boolean isVarReferenced(VarExprent target, Exprent exp, VarExprent... whitelist) {
++    List<Exprent> lst = exp.getAllExprents(true);
++    lst.add(exp);
++    for (Exprent ex : lst) {
++      if (ex != target && ex.type == Exprent.EXPRENT_VAR) {
++        VarExprent var = (VarExprent)ex;
++        if (var.getIndex() == target.getIndex() && var.getVersion() == target.getVersion()) {
++          boolean allowed = false;
++          for (VarExprent white : whitelist) {
++            if (var == white) {
++              allowed = true;
++            }
++            }
++          if (!allowed) {
++            return true;
++          }
++        }
++      }
++    }
++    return false;
++  }
++}
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0064-Include-LVT-info-in-VarExprent.copy.patch b/FernFlower-Patches/0064-Include-LVT-info-in-VarExprent.copy.patch
new file mode 100644
index 0000000..2f020b9
--- /dev/null
+++ b/FernFlower-Patches/0064-Include-LVT-info-in-VarExprent.copy.patch
@@ -0,0 +1,72 @@
+From 19773bf44e7d8f1ddbf06fe60ede5677ad698e03 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Fri, 2 Oct 2015 03:10:28 -0700
+Subject: [PATCH 064/122] Include LVT info in VarExprent.copy
+
+---
+ .../modules/decompiler/exps/VarExprent.java      |  1 +
+ .../decompiler/vars/VarDefinitionHelper.java     | 16 ++++++----------
+ .../modules/decompiler/vars/VarProcessor.java    |  2 +-
+ 3 files changed, 8 insertions(+), 11 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+index 933b046..c85d889 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+@@ -82,6 +82,7 @@ public class VarExprent extends Exprent {
+     var.setVersion(version);
+     var.setClassDef(classDef);
+     var.setStack(stack);
++    var.setLVT(lvt);
+     return var;
+   }
+ 
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index e294648..88dae4d 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -260,22 +260,18 @@ public class VarDefinitionHelper {
+   }
+ 
+   private LVTVariable findLVT(int index, Exprent exp) {
+-    VarExprent var = null;
+-
+-    if (exp.type == Exprent.EXPRENT_ASSIGNMENT) {
+-      AssignmentExprent ass = (AssignmentExprent)exp;
+-      if (ass.getLeft().type == Exprent.EXPRENT_VAR) {
+-        var = (VarExprent)ass.getLeft();
++    for (Exprent e : exp.getAllExprents(false)) {
++      LVTVariable lvt = findLVT(index, e);
++      if (lvt != null) {
++        return lvt;
+       }
+     }
+-    else if (exp.type == Exprent.EXPRENT_VAR) {
+-      var = (VarExprent)exp;
+-    }
+ 
+-    if (var == null) {
++    if (exp.type != Exprent.EXPRENT_VAR) {
+       return null;
+     }
+ 
++    VarExprent var = (VarExprent)exp;
+     return var.getIndex() == index ? var.getLVT() : null;
+   }
+ 
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+index bbf17ad..89f24f3 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+@@ -166,7 +166,7 @@ public class VarProcessor {
+   public void findLVT(VarExprent varExprent, int bytecodeOffset) {
+     LVTVariable var = this.lvt == null ? null : lvt.find(varExprent.getIndex(), bytecodeOffset);
+     if (var != null) {
+-        varExprent.setLVT(var);
++      varExprent.setLVT(var);
+     }
+   }
+ 
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0065-Remove-dowhile-detection-and-restore-do-loop-collaps.patch b/FernFlower-Patches/0065-Remove-dowhile-detection-and-restore-do-loop-collaps.patch
new file mode 100644
index 0000000..8dc15fd
--- /dev/null
+++ b/FernFlower-Patches/0065-Remove-dowhile-detection-and-restore-do-loop-collaps.patch
@@ -0,0 +1,110 @@
+From 89ea238257bbf10339409978ea26f982fd497090 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Fri, 2 Oct 2015 21:02:44 -0400
+Subject: [PATCH 065/122] Remove dowhile detection, and restore do loop
+ collapsing code. Seems to eliminate a lot of derpy loop smashage.
+
+---
+ .../main/rels/MethodProcessorRunnable.java    | 10 +++---
+ .../decompiler/EliminateLoopsHelper.java      | 36 ++++++++++---------
+ .../modules/decompiler/MergeHelper.java       |  2 +-
+ 3 files changed, 26 insertions(+), 22 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+index a22d269..ef7e97a 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+@@ -162,15 +162,17 @@ public class MethodProcessorRunnable implements Runnable {
+       LabelHelper.cleanUpEdges(root);
+ 
+       while (true) {
++          if (EliminateLoopsHelper.eliminateLoops(root, cl)) {
++              continue;
++          }
+         MergeHelper.enhanceLoops(root);
+-
++        if (!IfHelper.mergeAllIfs(root)) {
++            break;
++          }
+         if (LoopExtractHelper.extractLoops(root)) {
+           continue;
+         }
+ 
+-        if (!IfHelper.mergeAllIfs(root)) {
+-          break;
+-        }
+       }
+ 
+       if (DecompilerContext.getOption(IFernflowerPreferences.IDEA_NOT_NULL_ANNOTATION)) {
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
+index 16f7da0..823e561 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
+@@ -17,32 +17,34 @@ package org.jetbrains.java.decompiler.modules.decompiler;
+ 
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
++import org.jetbrains.java.decompiler.struct.StructClass;
+ 
+ import java.util.ArrayList;
+ import java.util.HashMap;
++import java.util.HashSet;
+ import java.util.List;
+ 
+ 
+ public class EliminateLoopsHelper {
+ 
+ 
+-  //	public static boolean eliminateLoops(Statement root) {
+-  //
+-  //		boolean ret = eliminateLoopsRec(root);
+-  //
+-  //		if(ret) {
+-  //			SequenceHelper.condenseSequences(root);
+-  //
+-  //			HashSet<Integer> setReorderedIfs = new HashSet<Integer>();
+-  //
+-  //			SimplifyExprentsHelper sehelper = new SimplifyExprentsHelper(false);
+-  //			while(sehelper.simplifyStackVarsStatement(root, setReorderedIfs, null)) {
+-  //				SequenceHelper.condenseSequences(root);
+-  //			}
+-  //		}
+-  //
+-  //		return ret;
+-  //	}
++  	public static boolean eliminateLoops(Statement root, StructClass cl) {
++
++  		boolean ret = eliminateLoopsRec(root);
++
++  		if(ret) {
++  			SequenceHelper.condenseSequences(root);
++
++  			HashSet<Integer> setReorderedIfs = new HashSet<Integer>();
++
++  			SimplifyExprentsHelper sehelper = new SimplifyExprentsHelper(false);
++  			while(sehelper.simplifyStackVarsStatement(root, setReorderedIfs, null,cl)) {
++  				SequenceHelper.condenseSequences(root);
++  			}
++  		}
++
++  		return ret;
++  	}
+ 
+   private static boolean eliminateLoopsRec(Statement stat) {
+ 
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+index 5adf323..0e7f1ab 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+@@ -74,7 +74,7 @@ public class MergeHelper {
+         }
+         else {
+           // identify a do{}while loop
+-          matchDoWhile(stat);
++//          matchDoWhile(stat);
+         }
+ 
+         break;
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0066-Move-LoopExtract-to-before-MergeHelper-and-add-more-.patch b/FernFlower-Patches/0066-Move-LoopExtract-to-before-MergeHelper-and-add-more-.patch
new file mode 100644
index 0000000..058fa9a
--- /dev/null
+++ b/FernFlower-Patches/0066-Move-LoopExtract-to-before-MergeHelper-and-add-more-.patch
@@ -0,0 +1,182 @@
+From 34a7253e7b3997dda29ae47f63151c976c9275a4 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sat, 3 Oct 2015 22:54:34 -0700
+Subject: [PATCH 066/122] Move LoopExtract to before MergeHelper and add more
+ debug information to printMethod.
+
+---
+ .../main/rels/MethodProcessorRunnable.java    | 46 +++++++++++++------
+ .../modules/decompiler/DomHelper.java         | 13 ++----
+ 2 files changed, 36 insertions(+), 23 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+index ef7e97a..eca3413 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+@@ -19,6 +19,7 @@ import org.jetbrains.java.decompiler.code.CodeConstants;
+ import org.jetbrains.java.decompiler.code.InstructionSequence;
+ import org.jetbrains.java.decompiler.code.cfg.ControlFlowGraph;
+ import org.jetbrains.java.decompiler.main.DecompilerContext;
++import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+ import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
+ import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
+ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+@@ -27,6 +28,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.*;
+ import org.jetbrains.java.decompiler.modules.decompiler.deobfuscator.ExceptionDeobfuscator;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.IfExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.DummyExitStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
+@@ -125,11 +127,11 @@ public class MethodProcessorRunnable implements Runnable {
+       DecompilerContext.getLogger().writeMessage("Heavily obfuscated exception ranges found!", IFernflowerLogger.Severity.WARN);
+     }
+ 
+-    RootStatement root = DomHelper.parseGraph(graph);
++    RootStatement root = DomHelper.parseGraph(graph, mt);
+ 
+     FinallyProcessor fProc = new FinallyProcessor(varProc);
+     while (fProc.iterateGraph(mt, root, graph)) {
+-      root = DomHelper.parseGraph(graph);
++      root = DomHelper.parseGraph(graph, mt);
+     }
+ 
+     // remove synchronized exception handler
+@@ -162,17 +164,19 @@ public class MethodProcessorRunnable implements Runnable {
+       LabelHelper.cleanUpEdges(root);
+ 
+       while (true) {
+-          if (EliminateLoopsHelper.eliminateLoops(root, cl)) {
+-              continue;
+-          }
+-        MergeHelper.enhanceLoops(root);
+-        if (!IfHelper.mergeAllIfs(root)) {
+-            break;
+-          }
++        if (EliminateLoopsHelper.eliminateLoops(root, cl)) {
++          continue;
++        }
++
+         if (LoopExtractHelper.extractLoops(root)) {
+           continue;
+         }
+ 
++        MergeHelper.enhanceLoops(root);
++
++        if (!IfHelper.mergeAllIfs(root)) {
++          break;
++        }
+       }
+ 
+       if (DecompilerContext.getOption(IFernflowerPreferences.IDEA_NOT_NULL_ANNOTATION)) {
+@@ -230,7 +234,7 @@ public class MethodProcessorRunnable implements Runnable {
+     return finished;
+   }
+ 
+-  public static void printMethod(RootStatement root, String name, VarProcessor varProc) {
++  public static void printMethod(Statement root, String name, VarProcessor varProc) {
+     System.out.println(name + " {");
+     if (root == null || root.getSequentialObjects() == null) {
+         System.out.println("}");
+@@ -243,7 +247,9 @@ public class MethodProcessorRunnable implements Runnable {
+         System.out.println("  " + obj.getClass().getSimpleName());
+       }
+     }
+-    printStatement(root.getDummyExit(), "  ",varProc);
++    if (root instanceof RootStatement) {
++      printStatement(((RootStatement)root).getDummyExit(), "  ",varProc);
++    }
+     System.out.println("}");
+   }
+ 
+@@ -256,6 +262,9 @@ public class MethodProcessorRunnable implements Runnable {
+       }
+     } else {
+       for (Object obj : st.getSequentialObjects()) {
++        if (obj == null) {
++          continue;
++        }
+         if (obj instanceof Statement) {
+           getOffset((Statement)obj, values);
+         } else if (obj instanceof Exprent) {
+@@ -273,7 +282,9 @@ public class MethodProcessorRunnable implements Runnable {
+     int start = values.nextSetBit(0);
+     int end = values.length()-1;
+ 
+-    System.out.println(indent + statement.type + ": (" + start + ", " + end + ") " + statement.getClass().getSimpleName());
++    System.out.println(indent + "{" + statement.type + "}:" + statement.id + " (" + start + ", " + end + ") " + statement.getClass().getSimpleName());
++    for (StatEdge edge : statement.getAllSuccessorEdges())
++      System.out.println(indent + " Dest: " + edge.getDestination());
+ 
+     if (statement.getExprents() != null) {
+       for(Exprent exp : statement.getExprents()) {
+@@ -282,6 +293,9 @@ public class MethodProcessorRunnable implements Runnable {
+     }
+     indent += "  ";
+     for (Object obj : statement.getSequentialObjects()) {
++      if (obj == null) {
++        continue;
++      }
+       if (obj instanceof Statement) {
+         printStatement((Statement)obj, indent,varProc);
+       } else if (obj instanceof Exprent) {
+@@ -302,13 +316,15 @@ public class MethodProcessorRunnable implements Runnable {
+       if (exp instanceof VarExprent) {
+           VarExprent varExprent = (VarExprent)exp;
+         int currindex = varExprent.getIndex();
+-        int origindex = varProc.getRemapped(currindex);
++        int origindex = varProc == null ? -2 : varProc.getRemapped(currindex);
+         sb.append("[").append(currindex).append(":").append(origindex).append(", ").append(varExprent.isStack()).append("]");
+-        if (varProc.getLVT() != null)
++        if (varProc != null && varProc.getLVT() != null)
+           sb.append(varProc.getLVT().getCandidates(origindex));
+       } else if (exp instanceof AssignmentExprent) {
+-          AssignmentExprent assignmentExprent = (AssignmentExprent)exp;
++        AssignmentExprent assignmentExprent = (AssignmentExprent)exp;
+         sb.append("{").append(printExprent(" ",assignmentExprent.getLeft(),varProc)).append(" =").append(printExprent(" ",assignmentExprent.getRight(),varProc)).append("}");
++      } else if (exp instanceof IfExprent) {
++        sb.append(" ").append(exp.toJava(0, new BytecodeMappingTracer()));
+       }
+       return sb.toString();
+   }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
+index c93be38..67d16d5 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
+@@ -20,9 +20,12 @@ import org.jetbrains.java.decompiler.code.cfg.ControlFlowGraph;
+ import org.jetbrains.java.decompiler.code.cfg.ExceptionRangeCFG;
+ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
++import org.jetbrains.java.decompiler.main.rels.MethodProcessorRunnable;
+ import org.jetbrains.java.decompiler.modules.decompiler.decompose.FastExtendedPostdominanceHelper;
+ import org.jetbrains.java.decompiler.modules.decompiler.deobfuscator.IrreducibleCFGDeobfuscator;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.*;
++import org.jetbrains.java.decompiler.struct.StructMethod;
++import org.jetbrains.java.decompiler.util.DotExporter;
+ import org.jetbrains.java.decompiler.util.FastFixedSetFactory;
+ import org.jetbrains.java.decompiler.util.FastFixedSetFactory.FastFixedSet;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+@@ -207,17 +210,11 @@ public class DomHelper {
+     return ret;
+   }
+ 
+-  public static RootStatement parseGraph(ControlFlowGraph graph) {
++  public static RootStatement parseGraph(ControlFlowGraph graph, StructMethod mt) {
+ 
+     RootStatement root = graphToStatement(graph);
+-
+     if (!processStatement(root, new HashMap<Integer, Set<Integer>>())) {
+-
+-      //			try {
+-      //				DotExporter.toDotFile(root.getFirst().getStats().get(13), new File("c:\\Temp\\stat1.dot"));
+-      //			} catch (Exception ex) {
+-      //				ex.printStackTrace();
+-      //			}
++      DotExporter.toDotFile(graph, mt, "parseGraphFail", true);
+       throw new RuntimeException("parsing failure!");
+     }
+ 
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0067-Loosen-up-LoopExtractHelper-to-include-break-edges-t.patch b/FernFlower-Patches/0067-Loosen-up-LoopExtractHelper-to-include-break-edges-t.patch
new file mode 100644
index 0000000..b7cb1af
--- /dev/null
+++ b/FernFlower-Patches/0067-Loosen-up-LoopExtractHelper-to-include-break-edges-t.patch
@@ -0,0 +1,90 @@
+From 751b2227a9b40757f0c01008882263e0c4acbd1d Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sat, 3 Oct 2015 22:55:00 -0700
+Subject: [PATCH 067/122] Loosen up LoopExtractHelper to include break edges
+ that can be extracted.
+
+---
+ .../modules/decompiler/LoopExtractHelper.java | 27 +++++++++++++++----
+ 1 file changed, 22 insertions(+), 5 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
+index d5c9e8f..93bc21d 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
+@@ -22,6 +22,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
+ 
+ import java.util.ArrayList;
+ import java.util.Arrays;
++import java.util.List;
+ import java.util.Set;
+ 
+ 
+@@ -79,21 +80,27 @@ public class LoopExtractHelper {
+       return false;
+     }
+ 
++    List<Statement> stats = new ArrayList<Statement>();
+     for (StatEdge edge : stat.getLabelEdges()) {
+       if (edge.getType() != StatEdge.TYPE_CONTINUE && edge.getDestination().type != Statement.TYPE_DUMMYEXIT) {
+-        return false;
++        if (edge.getType() == StatEdge.TYPE_BREAK && isExternStatement(stat, edge.getSource(), edge.getSource())) {
++          stats.add(edge.getSource());
++        }
++        else {
++          return false;
++        }
+       }
+     }
+ 
+-    if (!extractLastIf(stat)) {
+-      return extractFirstIf(stat);
++    if (!extractLastIf(stat, stats)) {
++      return extractFirstIf(stat, stats);
+     }
+     else {
+       return true;
+     }
+   }
+ 
+-  private static boolean extractLastIf(DoStatement stat) {
++  private static boolean extractLastIf(DoStatement stat, List<Statement> stats) {
+ 
+     // search for an if condition at the end of the loop
+     Statement last = stat.getFirst();
+@@ -114,6 +121,11 @@ public class LoopExtractHelper {
+ 
+           if (set.isEmpty()) { // no direct continues in a do{}while loop
+             if (isExternStatement(stat, ifstat, ifstat)) {
++              for (Statement s : stats) {
++                if (!ifstat.containsStatement(s)) {
++                  return false;
++                }
++              }
+               extractIfBlock(stat, lastif);
+               return true;
+             }
+@@ -124,7 +136,7 @@ public class LoopExtractHelper {
+     return false;
+   }
+ 
+-  private static boolean extractFirstIf(DoStatement stat) {
++  private static boolean extractFirstIf(DoStatement stat, List<Statement> stats) {
+ 
+     // search for an if condition at the entrance of the loop
+     Statement first = stat.getFirst();
+@@ -142,6 +154,11 @@ public class LoopExtractHelper {
+           Statement ifstat = firstif.getIfstat();
+ 
+           if (isExternStatement(stat, ifstat, ifstat)) {
++            for (Statement s : stats) {
++              if (!ifstat.containsStatement(s)) {
++                return false;
++              }
++            }
+             extractIfBlock(stat, firstif);
+             return true;
+           }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0068-Hack-to-prevent-extracted-ifs-from-being-inlined-aga.patch b/FernFlower-Patches/0068-Hack-to-prevent-extracted-ifs-from-being-inlined-aga.patch
new file mode 100644
index 0000000..9a82739
--- /dev/null
+++ b/FernFlower-Patches/0068-Hack-to-prevent-extracted-ifs-from-being-inlined-aga.patch
@@ -0,0 +1,123 @@
+From 3be7e213dcd0be08189ca0207b54c600a0ff4602 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sun, 4 Oct 2015 02:10:44 -0700
+Subject: [PATCH 068/122] Hack to prevent extracted ifs from being inlined
+ again in infinite loop. MC decompiles much better!
+
+---
+ .../main/rels/MethodProcessorRunnable.java        |  2 --
+ .../decompiler/modules/decompiler/ExitHelper.java |  2 +-
+ .../decompiler/InlineSingleBlockHelper.java       |  5 ++++-
+ .../modules/decompiler/LoopExtractHelper.java     | 15 +++++++++++++--
+ .../decompiler/modules/decompiler/StatEdge.java   |  2 ++
+ .../decompiler/stats/SequenceStatement.java       |  1 -
+ 6 files changed, 20 insertions(+), 7 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+index eca3413..62d5297 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+@@ -33,14 +33,12 @@ import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.DummyExitStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
+-import org.jetbrains.java.decompiler.modules.decompiler.vars.LVTVariable;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
+ import org.jetbrains.java.decompiler.struct.StructClass;
+ import org.jetbrains.java.decompiler.struct.StructMethod;
+ 
+ import java.io.IOException;
+ import java.util.BitSet;
+-import java.util.List;
+ 
+ public class MethodProcessorRunnable implements Runnable {
+ 
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
+index d467cdc..df2cb4a 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
+@@ -206,7 +206,7 @@ public class ExitHelper {
+     Statement dest = edge.getDestination();
+ 
+     if (edge.getType() == StatEdge.TYPE_BREAK && dest.type == Statement.TYPE_BASICBLOCK
+-        && edge.explicit && (edge.labeled || isOnlyEdge(edge))) {
++        && edge.explicit && (edge.labeled || isOnlyEdge(edge)) && edge.canInline) {
+       List<Exprent> data = dest.getExprents();
+ 
+       if (data != null && data.size() == 1) {
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
+index adeda02..1c468c8 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
+@@ -132,7 +132,10 @@ public class InlineSingleBlockHelper {
+       StatEdge edge = lst.get(0);
+ 
+       if (sameCatchRanges(edge)) {
+-        if (edge.explicit) {
++        if (!edge.canInline) {
++          return false; //Dirty hack, but lets do it!
++        }
++        else if (edge.explicit) {
+           return true;
+         }
+         else {
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
+index 93bc21d..f09dd3c 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
+@@ -92,8 +92,14 @@ public class LoopExtractHelper {
+       }
+     }
+ 
+-    if (!extractLastIf(stat, stats)) {
+-      return extractFirstIf(stat, stats);
++    if (stats.size() > 0) { // In this case prioritize first to help the Loop enhancer.
++      if (stat.getParent().getStats().getLast() != stat){
++        return false;
++      }
++    }
++
++    if (!extractFirstIf(stat, stats)) {
++      return extractLastIf(stat, stats);
+     }
+     else {
+       return true;
+@@ -219,5 +225,10 @@ public class LoopExtractHelper {
+         loop.addPredecessor(edge);
+       }
+     }
++
++    List<StatEdge> link = target.getPredecessorEdges(StatEdge.TYPE_BREAK);
++    if (link.size() == 1) {
++      link.get(0).canInline = false;
++    }
+   }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
+index 26d427b..7902069 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
+@@ -52,6 +52,8 @@ public class StatEdge {
+ 
+   public boolean explicit = true;
+ 
++  public boolean canInline = true;
++
+   public StatEdge(int type, Statement source, Statement destination, Statement closure) {
+     this(type, source, destination);
+     this.closure = closure;
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
+index 81d31a5..7d2ee43 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
+@@ -20,7 +20,6 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+ import org.jetbrains.java.decompiler.modules.decompiler.DecHelper;
+ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
+ import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
+-import org.jetbrains.java.decompiler.modules.decompiler.vars.StartEndPair;
+ 
+ import java.util.Arrays;
+ import java.util.List;
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0069-Include-ForEach-source-vars-in-itteration-allows-for.patch b/FernFlower-Patches/0069-Include-ForEach-source-vars-in-itteration-allows-for.patch
new file mode 100644
index 0000000..993d286
--- /dev/null
+++ b/FernFlower-Patches/0069-Include-ForEach-source-vars-in-itteration-allows-for.patch
@@ -0,0 +1,25 @@
+From 7dec35b37bbeb3c785e142980718e799d25c618a Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sun, 4 Oct 2015 04:22:34 -0700
+Subject: [PATCH 069/122] Include ForEach source vars in itteration, allows for
+ remapping in merge.
+
+---
+ .../java/decompiler/modules/decompiler/stats/DoStatement.java    | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
+index 36cd7fb..acc74a6 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
+@@ -164,6 +164,7 @@ public class DoStatement extends Statement {
+         break;
+       case LOOP_FOREACH:
+         lst.add(getInitExprent());
++        lst.add(getIncExprent());
+     }
+ 
+     lst.add(first);
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0070-Re-write-ForEach-detection-to-be-before-For-detectio.patch b/FernFlower-Patches/0070-Re-write-ForEach-detection-to-be-before-For-detectio.patch
new file mode 100644
index 0000000..5f8e9df
--- /dev/null
+++ b/FernFlower-Patches/0070-Re-write-ForEach-detection-to-be-before-For-detectio.patch
@@ -0,0 +1,273 @@
+From fd8b2a3bfada12e9d371230cb329f64ab801544e Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sun, 4 Oct 2015 04:23:24 -0700
+Subject: [PATCH 070/122] Re-write ForEach detection to be before For
+ detection. Fixes issues where incrementors would be added back in
+ incorrectly.
+
+---
+ .../modules/decompiler/MergeHelper.java       | 159 ++++++------------
+ 1 file changed, 56 insertions(+), 103 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+index 0e7f1ab..f354f06 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+@@ -20,6 +20,7 @@ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.ArrayExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.IfExprent;
+@@ -67,10 +68,9 @@ public class MergeHelper {
+ 
+         // identify a while loop
+         if (matchWhile(stat)) {
+-          // identify a for loop - subtype of while
+-          matchFor(stat);
+-          // identify for each loop,
+-          matchForEach(stat);
++          if (!matchForEach(stat)) {
++            matchFor(stat);
++          }
+         }
+         else {
+           // identify a do{}while loop
+@@ -79,8 +79,9 @@ public class MergeHelper {
+ 
+         break;
+       case DoStatement.LOOP_WHILE:
+-        matchFor(stat);
+-        matchForEach(stat);
++        if (!matchForEach(stat)) {
++          matchFor(stat);
++        }
+     }
+ 
+     return (stat.getLooptype() != oldloop);
+@@ -402,8 +403,10 @@ public class MergeHelper {
+   }
+ 
+   private static boolean matchForEach(DoStatement stat) {
+-    AssignmentExprent firstDoExprent = null, initDoExprent = null, initCopyExprent = null;
+-    Statement firstData, preData = null;
++    AssignmentExprent firstDoExprent = null;
++    AssignmentExprent[] initExprents = new AssignmentExprent[3];
++    Statement firstData = null, preData = null, lastData = null;
++    Exprent lastExprent = null;
+ 
+     // search for an initializing exprent
+     Statement current = stat;
+@@ -421,14 +424,13 @@ public class MergeHelper {
+           preData = current.getNeighbours(StatEdge.TYPE_REGULAR, Statement.DIRECTION_BACKWARD).get(0);
+           preData = getLastDirectData(preData);
+           if (preData != null && !preData.getExprents().isEmpty()) {
+-            Exprent exprent = preData.getExprents().get(preData.getExprents().size() - 1);
+-            if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
+-              initDoExprent = (AssignmentExprent)exprent;
+-              if (preData.getExprents().size() >= 2) {
+-                exprent = preData.getExprents().get(preData.getExprents().size() - 2);
+-                if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
+-                  initCopyExprent = (AssignmentExprent)exprent;
+-                }
++            int size = preData.getExprents().size();
++            for (int x = 0; x < initExprents.length; x++) {
++              if (size > x) {
++                 Exprent exprent = preData.getExprents().get(size - 1 - x);
++                 if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
++                   initExprents[x] = (AssignmentExprent)exprent;
++                 }
+               }
+             }
+           }
+@@ -444,10 +446,14 @@ public class MergeHelper {
+     if (firstData != null && firstData.getExprents().get(0).type == Exprent.EXPRENT_ASSIGNMENT) {
+       firstDoExprent = (AssignmentExprent)firstData.getExprents().get(0);
+     }
++    lastData = getLastDirectData(stat.getFirst());
++    if (lastData != null && !lastData.getExprents().isEmpty()) {
++      lastExprent = lastData.getExprents().get(lastData.getExprents().size() - 1);
++    }
+ 
+-    if (stat.getLooptype() == DoStatement.LOOP_WHILE && initDoExprent != null && firstDoExprent != null) {
+-      if (initDoExprent.type == Exprent.EXPRENT_ASSIGNMENT &&
+-          isIteratorCall(((AssignmentExprent)initDoExprent).getRight())) {
++    if (stat.getLooptype() == DoStatement.LOOP_WHILE && initExprents[0] != null && firstDoExprent != null) {
++      if (initExprents[0].type == Exprent.EXPRENT_ASSIGNMENT &&
++          isIteratorCall(((AssignmentExprent)initExprents[0]).getRight())) {
+ 
+         if (!isHasNextCall(drillNots(stat.getConditionExprent())) ||
+             firstDoExprent.type != Exprent.EXPRENT_ASSIGNMENT) {
+@@ -463,13 +469,13 @@ public class MergeHelper {
+         InvocationExprent hnext = (InvocationExprent)getUncast(drillNots(stat.getConditionExprent()));
+         if (next.getInstance().type != Exprent.EXPRENT_VAR ||
+             hnext.getInstance().type != Exprent.EXPRENT_VAR ||
+-            ExprentUtil.isVarReferenced((VarExprent)initDoExprent.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
++            ExprentUtil.isVarReferenced((VarExprent)initExprents[0].getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
+           return false;
+         }
+ 
+-        InvocationExprent holder = (InvocationExprent)((AssignmentExprent)initDoExprent).getRight();
++        InvocationExprent holder = (InvocationExprent)((AssignmentExprent)initExprents[0]).getRight();
+ 
+-        holder.getInstance().addBytecodeOffsets(initDoExprent.bytecode);
++        holder.getInstance().addBytecodeOffsets(initExprents[0].bytecode);
+         ass.getLeft().addBytecodeOffsets(firstDoExprent.bytecode);
+         if (stat.getIncExprent() != null) {
+           holder.getInstance().addBytecodeOffsets(stat.getIncExprent().bytecode);
+@@ -481,88 +487,31 @@ public class MergeHelper {
+         stat.setLooptype(DoStatement.LOOP_FOREACH);
+         stat.setInitExprent(ass.getLeft());
+         stat.setIncExprent(holder.getInstance());
+-        preData.getExprents().remove(initDoExprent);
++        preData.getExprents().remove(initExprents[0]);
+         firstData.getExprents().remove(firstDoExprent);
++        return true;
+       }
+-    }
+-    else if (stat.getLooptype() == DoStatement.LOOP_FOR) {
+-      if (isType(stat.getInitExprent(), Exprent.EXPRENT_ASSIGNMENT) &&
+-          isIteratorCall(((AssignmentExprent)stat.getInitExprent()).getRight()) &&
+-          isType(stat.getConditionExprent(), Exprent.EXPRENT_FUNCTION)) {
+-
+-        Exprent exp = drillNots(stat.getConditionExprent());
+-        if (!isHasNextCall(exp) ||
+-            !isType(stat.getIncExprent(), Exprent.EXPRENT_ASSIGNMENT)) {
++      else if (initExprents[0] != null && initExprents[1] != null && firstDoExprent != null) {
++        if (firstDoExprent.getRight().type != Exprent.EXPRENT_ARRAY || firstDoExprent.getLeft().type != Exprent.EXPRENT_VAR) {
+           return false;
+         }
+ 
+-        AssignmentExprent itr = (AssignmentExprent)stat.getInitExprent();
+-        InvocationExprent hnext = (InvocationExprent)exp;
+-        if (itr.getLeft().type != Exprent.EXPRENT_VAR || hnext.getInstance().type != Exprent.EXPRENT_VAR) {
++        if (lastExprent == null || lastExprent.type != Exprent.EXPRENT_FUNCTION) {
+           return false;
+         }
+ 
+-        AssignmentExprent ass = (AssignmentExprent)stat.getIncExprent();
+-        if (!isNextCall(ass.getRight()) || ass.getLeft().type != Exprent.EXPRENT_VAR) {
+-
+-          if (firstDoExprent == null || !isNextCall(firstDoExprent.getRight()) ||
+-              firstDoExprent.getLeft().type != Exprent.EXPRENT_VAR) {
+-            return false;
+-          }
+-
+-          InvocationExprent next = (InvocationExprent)getUncast(firstDoExprent.getRight());
+-          if (next.getInstance().type != Exprent.EXPRENT_VAR ||
+-              ExprentUtil.isVarReferenced((VarExprent)itr.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
+-            return false;
+-          }
+-
+-          //Move the inc exprent back to the end of the body and remove the .next call
+-          Statement last = getLastDirectData(stat.getFirst());
+-          InvocationExprent holder = (InvocationExprent)getUncast(((AssignmentExprent)stat.getInitExprent()).getRight());
+-
+-          firstData.getExprents().remove(firstDoExprent);
+-          last.getExprents().add(stat.getIncExprent());
+-
+-          firstDoExprent.getLeft().addBytecodeOffsets(stat.getInitExprent().bytecode);
+-          firstDoExprent.getLeft().addBytecodeOffsets(stat.getIncExprent().bytecode);
+-          firstDoExprent.getLeft().addBytecodeOffsets(firstDoExprent.bytecode);
+-
+-          stat.setLooptype(DoStatement.LOOP_FOREACH);
+-          stat.setInitExprent(firstDoExprent.getLeft());
+-          stat.setIncExprent(holder.getInstance());
+-        }
+-        else {
+-          InvocationExprent next = (InvocationExprent)getUncast(ass.getRight());
+-          if (next.getInstance().type != Exprent.EXPRENT_VAR ||
+-              ExprentUtil.isVarReferenced((VarExprent)itr.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
+-            return false;
+-          }
+-
+-          InvocationExprent holder = (InvocationExprent)getUncast(((AssignmentExprent)stat.getInitExprent()).getRight());
+-
+-          holder.getInstance().addBytecodeOffsets(stat.getInitExprent().bytecode);
+-          ass.getLeft().addBytecodeOffsets(stat.getIncExprent().bytecode);
+-
+-          stat.setLooptype(DoStatement.LOOP_FOREACH);
+-          stat.setInitExprent(ass.getLeft());
+-          stat.setIncExprent(holder.getInstance());
+-        }
+-      }
+-      else if (initDoExprent != null && initDoExprent.getRight().type == Exprent.EXPRENT_FUNCTION) {
+-        if (firstDoExprent == null ||
+-            firstDoExprent.getRight().type != Exprent.EXPRENT_ARRAY ||
+-            firstDoExprent.getLeft().type != Exprent.EXPRENT_VAR ||
+-            !isType(stat.getIncExprent(), Exprent.EXPRENT_FUNCTION) ||
+-            !isType(stat.getInitExprent(), Exprent.EXPRENT_ASSIGNMENT)) {
++        if (initExprents[0].getRight().type != Exprent.EXPRENT_CONST ||
++            initExprents[1].getRight().type != Exprent.EXPRENT_FUNCTION) {
+           return false;
+         }
+ 
+-        FunctionExprent funcRight = (FunctionExprent)initDoExprent.getRight();
+-        FunctionExprent funcInc = (FunctionExprent)stat.getIncExprent();
+-        ArrayExprent arr = (ArrayExprent)firstDoExprent.getRight();
++        FunctionExprent funcRight = (FunctionExprent)initExprents[1].getRight();
++        FunctionExprent funcInc   = (FunctionExprent)lastExprent;
++        ArrayExprent    arr       = (ArrayExprent)firstDoExprent.getRight();
++        int incType = funcInc.getFuncType();
+ 
+         if (funcRight.getFuncType() != FunctionExprent.FUNCTION_ARRAY_LENGTH ||
+-            (funcInc.getFuncType() != FunctionExprent.FUNCTION_PPI && funcInc.getFuncType() != FunctionExprent.FUNCTION_IPP) ||
++            (incType != FunctionExprent.FUNCTION_PPI && incType != FunctionExprent.FUNCTION_IPP) ||
+             arr.getIndex().type != Exprent.EXPRENT_VAR ||
+             arr.getArray().type != Exprent.EXPRENT_VAR) {
+             return false;
+@@ -577,33 +526,37 @@ public class MergeHelper {
+           return false;
+         }
+ 
+-        funcRight.getLstOperands().get(0).addBytecodeOffsets(initDoExprent.bytecode);
+-        funcRight.getLstOperands().get(0).addBytecodeOffsets(stat.getIncExprent().bytecode);
++        funcRight.getLstOperands().get(0).addBytecodeOffsets(initExprents[0].bytecode);
++        funcRight.getLstOperands().get(0).addBytecodeOffsets(initExprents[1].bytecode);
++        funcRight.getLstOperands().get(0).addBytecodeOffsets(lastExprent.bytecode);
+         firstDoExprent.getLeft().addBytecodeOffsets(firstDoExprent.bytecode);
+-        firstDoExprent.getLeft().addBytecodeOffsets(stat.getInitExprent().bytecode);
++        firstDoExprent.getLeft().addBytecodeOffsets(initExprents[0].bytecode);
+ 
+         stat.setLooptype(DoStatement.LOOP_FOREACH);
+         stat.setInitExprent(firstDoExprent.getLeft());
+         stat.setIncExprent(funcRight.getLstOperands().get(0));
+-        preData.getExprents().remove(initDoExprent);
++        preData.getExprents().remove(initExprents[0]);
++        preData.getExprents().remove(initExprents[1]);
+         firstData.getExprents().remove(firstDoExprent);
++        lastData.getExprents().remove(lastExprent);
+ 
+-
+-        if (initCopyExprent != null && initCopyExprent.getLeft().type == Exprent.EXPRENT_VAR) {
+-          VarExprent copy = (VarExprent)initCopyExprent.getLeft();
++        if (initExprents[2] != null && initExprents[2].getLeft().type == Exprent.EXPRENT_VAR) {
++          VarExprent copy = (VarExprent)initExprents[2].getLeft();
+           if (copy.getIndex() == array.getIndex() && copy.getVersion() == array.getVersion()) {
+-            preData.getExprents().remove(initCopyExprent);
+-            initCopyExprent.getRight().addBytecodeOffsets(initCopyExprent.bytecode);
+-            initCopyExprent.getRight().addBytecodeOffsets(stat.getIncExprent().bytecode);
+-            stat.setIncExprent(initCopyExprent.getRight());
++            preData.getExprents().remove(initExprents[2]);
++            initExprents[2].getRight().addBytecodeOffsets(initExprents[2].bytecode);
++            initExprents[2].getRight().addBytecodeOffsets(stat.getIncExprent().bytecode);
++            stat.setIncExprent(initExprents[2].getRight());
+           }
+         }
++
++        return true;
+       }
+     }
+ 
+     //cleanEmptyStatements(stat, firstData); //TODO: Look into this and see what it does...
+ 
+-    return true;
++    return false;
+   }
+ 
+   private static boolean isType(Exprent exp, int type) { //This is just a helper macro, Wish java had real macros.
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0071-Propogate-LVTs-to-inner-classes.patch b/FernFlower-Patches/0071-Propogate-LVTs-to-inner-classes.patch
new file mode 100644
index 0000000..3afd93a
--- /dev/null
+++ b/FernFlower-Patches/0071-Propogate-LVTs-to-inner-classes.patch
@@ -0,0 +1,316 @@
+From bf26fb1390f668dcadb5dc15cdf9cbfc12b84d81 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sun, 4 Oct 2015 16:52:33 -0700
+Subject: [PATCH 071/122] Propogate LVTs to inner classes. Fix improper var
+ merging in var handlers.
+
+---
+ .../main/rels/NestedClassProcessor.java       | 37 +++++++++++--
+ .../modules/decompiler/vars/LVTVariable.java  |  8 ++-
+ .../decompiler/vars/VarDefinitionHelper.java  | 53 ++++++++++++++-----
+ .../modules/decompiler/vars/VarProcessor.java | 13 ++++-
+ .../decompiler/vars/VarVersionsProcessor.java |  2 +-
+ 5 files changed, 90 insertions(+), 23 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+index c6eda1b..3378549 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+@@ -28,6 +28,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectNode;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.LVTVariable;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarTypeProcessor;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+ import org.jetbrains.java.decompiler.struct.StructClass;
+@@ -454,6 +455,8 @@ public class NestedClassProcessor {
+         HashMap<VarVersionPair, String> mapNewNames = new HashMap<VarVersionPair, String>();
+         // local var types
+         HashMap<VarVersionPair, VarType> mapNewTypes = new HashMap<VarVersionPair, VarType>();
++        // local var table entries
++        HashMap<VarVersionPair, LVTVariable> mapNewLVTs = new HashMap<VarVersionPair, LVTVariable>();
+ 
+         final HashMap<Integer, VarVersionPair> mapParamsToNewVars = new HashMap<Integer, VarVersionPair>();
+         if (meth.signatureFields != null) {
+@@ -469,15 +472,17 @@ public class NestedClassProcessor {
+ 
+               String varname = null;
+               VarType vartype = null;
++              LVTVariable varlvt = null;
+ 
+               if (child.type != ClassNode.CLASS_MEMBER) {
+                 varname = encmeth.varproc.getVarName(paar);
+                 vartype = encmeth.varproc.getVarType(paar);
++                varlvt = encmeth.varproc.getVarLVT(paar);
+ 
+                 encmeth.varproc.setVarFinal(paar, VarTypeProcessor.VAR_EXPLICIT_FINAL);
+               }
+ 
+-              if (paar.var == -1 || "this".equals(varname)) {
++              if (paar.var == -1 || "this".equals(varname) || (varlvt != null && "this".equals(varlvt.name))) {
+                 if (parent.simpleName == null) {
+                   // anonymous enclosing class, no access to this
+                   varname = VarExprent.VAR_NAMELESS_ENCLOSURE;
+@@ -485,11 +490,15 @@ public class NestedClassProcessor {
+                 else {
+                   varname = parent.simpleName + ".this";
+                 }
++                if (varlvt != null) {
++                  varlvt = varlvt.rename(varname);
++                }
+                 meth.varproc.getThisVars().put(newvar, parent.classStruct.qualifiedName);
+               }
+ 
+               mapNewNames.put(newvar, varname);
+               mapNewTypes.put(newvar, vartype);
++              mapNewLVTs.put(newvar, varlvt);
+             }
+             varindex += md.params[index++].stackSize;
+           }
+@@ -507,6 +516,7 @@ public class NestedClassProcessor {
+ 
+             String varname = null;
+             VarType vartype = null;
++            LVTVariable varlvt = null;
+ 
+             if (clnode.type != ClassNode.CLASS_MEMBER) {
+ 
+@@ -514,11 +524,12 @@ public class NestedClassProcessor {
+ 
+               varname = enclosing_method.varproc.getVarName(entr.getValue());
+               vartype = enclosing_method.varproc.getVarType(entr.getValue());
++              varlvt  = enclosing_method.varproc.getVarLVT(entr.getValue());
+ 
+               enclosing_method.varproc.setVarFinal(entr.getValue(), VarTypeProcessor.VAR_EXPLICIT_FINAL);
+             }
+ 
+-            if (entr.getValue().var == -1 || "this".equals(varname)) {
++            if (entr.getValue().var == -1 || "this".equals(varname) || (varlvt != null && "this".equals(varlvt.name))) {
+               if (clnode.parent.simpleName == null) {
+                 // anonymous enclosing class, no access to this
+                 varname = VarExprent.VAR_NAMELESS_ENCLOSURE;
+@@ -526,11 +537,15 @@ public class NestedClassProcessor {
+               else {
+                 varname = clnode.parent.simpleName + ".this";
+               }
++              if (varlvt != null) {
++                varlvt = varlvt.rename(varname);
++              }
+               meth.varproc.getThisVars().put(newvar, clnode.parent.classStruct.qualifiedName);
+             }
+ 
+             mapNewNames.put(newvar, varname);
+             mapNewTypes.put(newvar, vartype);
++            mapNewLVTs.put(newvar, varlvt);
+ 
+             // hide synthetic field
+             if (clnode == child) { // fields higher up the chain were already handled with their classes
+@@ -549,11 +564,15 @@ public class NestedClassProcessor {
+         for (Entry<VarVersionPair, String> entr : mapNewNames.entrySet()) {
+           VarVersionPair varpaar = entr.getKey();
+           VarType vartype = mapNewTypes.get(varpaar);
++          LVTVariable varlvt = mapNewLVTs.get(varpaar);
+ 
+           meth.varproc.setVarName(varpaar, entr.getValue());
+           if (vartype != null) {
+             meth.varproc.setVarType(varpaar, vartype);
+           }
++          if (varlvt != null) {
++            meth.varproc.setVarLVT(varpaar, varlvt);
++          }
+         }
+ 
+         DirectGraph graph = meth.getOrBuildGraph();
+@@ -602,7 +621,12 @@ public class NestedClassProcessor {
+               if (mapParamsToNewVars.containsKey(varindex)) {
+                 VarVersionPair newvar = mapParamsToNewVars.get(varindex);
+                 meth.varproc.getExternalVars().add(newvar);
+-                return new VarExprent(newvar.var, meth.varproc.getVarType(newvar), meth.varproc);
++                VarExprent ret = new VarExprent(newvar.var, meth.varproc.getVarType(newvar), meth.varproc);
++                LVTVariable lvt = meth.varproc.getVarLVT(newvar);
++                if (lvt != null) {
++                  ret.setLVT(lvt);
++                }
++                return ret;
+               }
+             }
+             else if (exprent.type == Exprent.EXPRENT_FIELD) {
+@@ -616,7 +640,12 @@ public class NestedClassProcessor {
+                 //		mapFieldsToNewVars.containsKey(keyField)) {
+                 VarVersionPair newvar = mapFieldsToNewVars.get(keyField);
+                 meth.varproc.getExternalVars().add(newvar);
+-                return new VarExprent(newvar.var, meth.varproc.getVarType(newvar), meth.varproc);
++                VarExprent ret = new VarExprent(newvar.var, meth.varproc.getVarType(newvar), meth.varproc);
++                LVTVariable lvt = meth.varproc.getVarLVT(newvar);
++                if (lvt != null) {
++                  ret.setLVT(lvt);
++                }
++                return ret;
+               }
+             }
+ 
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
+index 209d3e0..cb376d9 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
+@@ -83,7 +83,11 @@ public class LVTVariable implements Comparable<LVTVariable> {
+     return sig;
+   }
+ 
+-public VarType getVarType() {
++  public VarType getVarType() {
+     return new VarType(desc);
+-}
++  }
++
++  public LVTVariable rename(String newName) {
++    return new LVTVariable(newName, desc, start, end, index, isLVTT);
++  }
+ }
+\ No newline at end of file
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index 88dae4d..0427e3b 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -440,6 +440,10 @@ public class VarDefinitionHelper {
+ 
+     findTypes(stat, types);
+ 
++    for (Entry<VarVersionPair, LVTVariable> e : types.entrySet()) {
++      varproc.setVarLVT(e.getKey(), e.getValue());
++    }
++
+     applyTypes(stat, types);
+   }
+ 
+@@ -470,23 +474,24 @@ public class VarDefinitionHelper {
+   }
+ 
+   private void findTypes(Exprent exp, Map<VarVersionPair, LVTVariable> types) {
+-    VarExprent var = null;
++    List<Exprent> lst = exp.getAllExprents(true);
++    lst.add(exp);
+ 
+-    if (exp.type == Exprent.EXPRENT_ASSIGNMENT) {
+-      AssignmentExprent ass = (AssignmentExprent)exp;
+-      if (ass.getLeft().type == Exprent.EXPRENT_VAR) {
+-        var = (VarExprent)ass.getLeft();
++    for (Exprent exprent : lst) {
++      if (exprent.type == Exprent.EXPRENT_VAR) {
++        VarExprent var = (VarExprent)exprent;
++        if (var.getLVT() == null) {
++          continue;
++        }
++        VarVersionPair ver = new VarVersionPair(var);
++        if (var.isDefinition()) {
++          types.put(ver, var.getLVT());
++        }
++        else if (!types.containsKey(ver)) {
++          types.put(ver, var.getLVT());
++        }
+       }
+     }
+-    else if (exp.type == Exprent.EXPRENT_VAR) {
+-      var = (VarExprent)exp;
+-    }
+-
+-    if (var == null || !var.isDefinition()) {
+-      return;
+-    }
+-
+-    types.put(new VarVersionPair(var), var.getLVT());
+   }
+ 
+ 
+@@ -495,6 +500,10 @@ public class VarDefinitionHelper {
+       return;
+     }
+ 
++    for (Exprent exp : stat.getVarDefinitions()) {
++        applyTypes(exp, types);
++    }
++
+     if (stat.getExprents() == null) {
+       for (Object obj : stat.getSequentialObjects()) {
+         if (obj instanceof Statement) {
+@@ -637,6 +646,10 @@ public class VarDefinitionHelper {
+                 leaked.putAll(leaked_n); //First is outside the scope so leak!
+               }
+             }
++            else if (stat.type == Statement.TYPE_TRYCATCH ||
++                     stat.type == Statement.TYPE_CATCHALL) {
++              leaked_n.clear(); // Catches can't leak anything mwhahahahah!
++            }
+             this_vars.putAll(leaked_n);
+           }
+         }
+@@ -732,6 +745,18 @@ public class VarDefinitionHelper {
+       }
+       success |= remapped;
+     }
++    if (success) {
++      Iterator<Exprent> itr = stat.getVarDefinitions().iterator();
++      while (itr.hasNext()) {
++        Exprent exp = itr.next();
++        if (exp.type == Exprent.EXPRENT_VAR) {
++          VarExprent var = (VarExprent)exp;
++          if (from.var == var.getIndex() && from.version == var.getVersion()) {
++            itr.remove();
++          }
++        }
++      }
++    }
+     return success;
+   }
+ 
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+index 89f24f3..04ee48f 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+@@ -29,6 +29,7 @@ import java.util.Map.Entry;
+ public class VarProcessor {
+ 
+   private Map<VarVersionPair, String> mapVarNames = new HashMap<VarVersionPair, String>();
++  private Map<VarVersionPair, LVTVariable> mapVarLVTs = new HashMap<VarVersionPair, LVTVariable>();
+   private VarVersionsProcessor varVersions;
+   private final Map<VarVersionPair, String> thisVars = new HashMap<VarVersionPair, String>();
+   private final Set<VarVersionPair> externalVars = new HashSet<VarVersionPair>();
+@@ -127,7 +128,7 @@ public class VarProcessor {
+ 
+   public void setVarType(VarVersionPair pair, VarType type) {
+     if (varVersions != null) {
+-        varVersions.setVarType(pair, type);
++      varVersions.setVarType(pair, type);
+     }
+   }
+ 
+@@ -185,5 +186,13 @@ public class VarProcessor {
+ 
+   public VarVersionsProcessor getVarVersions() {
+     return varVersions;
+-}
++  }
++
++  public void setVarLVT(VarVersionPair var, LVTVariable lvt) {
++    mapVarLVTs.put(var, lvt);
++  }
++
++  public LVTVariable getVarLVT(VarVersionPair var) {
++    return mapVarLVTs.get(var);
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+index d201157..a1acd19 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+@@ -323,5 +323,5 @@ public class VarVersionsProcessor {
+   }
+   public VarTypeProcessor getTypeProcessor() {
+     return typeProcessor;
+-}
++  }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0072-Fix-issue-where-For-loops-would-be-enhanced-to-ForEa.patch b/FernFlower-Patches/0072-Fix-issue-where-For-loops-would-be-enhanced-to-ForEa.patch
new file mode 100644
index 0000000..aeac5a6
--- /dev/null
+++ b/FernFlower-Patches/0072-Fix-issue-where-For-loops-would-be-enhanced-to-ForEa.patch
@@ -0,0 +1,41 @@
+From 08cf2eed89abfcfed52fbcaac9ee4c4b172b465a Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sun, 4 Oct 2015 18:14:24 -0700
+Subject: [PATCH 072/122] Fix issue where For loops would be enhanced to
+ ForEach incorrectly.
+
+---
+ .../java/decompiler/modules/decompiler/MergeHelper.java    | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+index f354f06..11c7c59 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+@@ -501,10 +501,12 @@ public class MergeHelper {
+         }
+ 
+         if (initExprents[0].getRight().type != Exprent.EXPRENT_CONST ||
+-            initExprents[1].getRight().type != Exprent.EXPRENT_FUNCTION) {
++            initExprents[1].getRight().type != Exprent.EXPRENT_FUNCTION ||
++            stat.getConditionExprent().type != Exprent.EXPRENT_FUNCTION) {
+           return false;
+         }
+ 
++        //FunctionExprent funcCond  = (FunctionExprent)drillNots(stat.getConditionExprent()); //TODO: Verify this is counter < copy.length
+         FunctionExprent funcRight = (FunctionExprent)initExprents[1].getRight();
+         FunctionExprent funcInc   = (FunctionExprent)lastExprent;
+         ArrayExprent    arr       = (ArrayExprent)firstDoExprent.getRight();
+@@ -525,6 +527,9 @@ public class MergeHelper {
+             counter.getVersion() != index.getVersion()) {
+           return false;
+         }
++        if (ExprentUtil.isVarReferenced(counter, stat.getFirst(), index)) {
++          return false;
++        }
+ 
+         funcRight.getLstOperands().get(0).addBytecodeOffsets(initExprents[0].bytecode);
+         funcRight.getLstOperands().get(0).addBytecodeOffsets(initExprents[1].bytecode);
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0073-Fix-constructor-arguments-for-non-static-inner-class.patch b/FernFlower-Patches/0073-Fix-constructor-arguments-for-non-static-inner-class.patch
new file mode 100644
index 0000000..7e7edcc
--- /dev/null
+++ b/FernFlower-Patches/0073-Fix-constructor-arguments-for-non-static-inner-class.patch
@@ -0,0 +1,92 @@
+From af6a44bafd270347d61481d9d3b97ef3c263a42b Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sun, 4 Oct 2015 19:29:55 -0700
+Subject: [PATCH 073/122] Fix constructor arguments for non-static inner
+ classes with generic signatures.
+
+---
+ .../java/decompiler/main/ClassWriter.java     |  8 +++++++-
+ .../struct/gen/generics/GenericType.java      | 20 +++++++++++++++++++
+ 2 files changed, 27 insertions(+), 1 deletion(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+index 3e5789d..daf3444 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+@@ -725,6 +725,12 @@ public class ClassWriter {
+         int index = isEnum && init ? 3 : thisVar ? 1 : 0;
+         boolean hasDescriptor = descriptor != null;
+         int start = isEnum && init && !hasDescriptor ? 2 : 0;
++
++        if (init && hasDescriptor && !isEnum &&
++            ((node.access & CodeConstants.ACC_STATIC) == 0) && node.type == ClassNode.CLASS_MEMBER) {
++          index++; //Enclosing class
++        }
++
+         int params = hasDescriptor ? descriptor.params.size() : md.params.length;
+         for (int i = start; i < params; i++) {
+           if (hasDescriptor || (signFields == null || signFields.get(i) == null)) {
+@@ -787,7 +793,7 @@ public class ClassWriter {
+             paramCount++;
+           }
+ 
+-          index += md.params[i].stackSize;
++          index += hasDescriptor ? descriptor.params.get(i).stackSize : md.params[i].stackSize;
+         }
+ 
+         buffer.append(')');
+diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
+index d3b3896..9305bf9 100644
+--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
++++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
+@@ -31,6 +31,7 @@ public class GenericType {
+   public final int type;
+   public final int arrayDim;
+   public final String value;
++  public final int stackSize;
+ 
+   private final List<GenericType> enclosingClasses = new ArrayList<GenericType>();
+   private final List<GenericType> arguments = new ArrayList<GenericType>();
+@@ -40,6 +41,7 @@ public class GenericType {
+     this.type = type;
+     this.arrayDim = arrayDim;
+     this.value = value;
++    this.stackSize = getStackSize(type, arrayDim);
+   }
+ 
+   public GenericType(String signature) {
+@@ -102,6 +104,7 @@ public class GenericType {
+     this.type = type;
+     this.arrayDim = arrayDim;
+     this.value = value;
++    this.stackSize = getStackSize(type, arrayDim);
+   }
+ 
+   private static String getNextClassSignature(String value) {
+@@ -209,6 +212,23 @@ public class GenericType {
+     return value.substring(0, index + 1);
+   }
+ 
++  private static int getStackSize(int type, int arrayDim) {
++      if (arrayDim > 0) {
++        return 1;
++      }
++
++      switch (type) {
++        case CodeConstants.TYPE_DOUBLE:
++        case CodeConstants.TYPE_LONG:
++          return 2;
++        case CodeConstants.TYPE_VOID:
++        case CodeConstants.TYPE_GROUP2EMPTY:
++          return 0;
++        default:
++          return 1;
++      }
++    }
++
+   public GenericType decreaseArrayDim() {
+     assert arrayDim > 0 : this;
+     return new GenericType(type, arrayDim - 1, value);
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0074-Return-generic-typevar-casting-support.patch b/FernFlower-Patches/0074-Return-generic-typevar-casting-support.patch
new file mode 100644
index 0000000..50b27a5
--- /dev/null
+++ b/FernFlower-Patches/0074-Return-generic-typevar-casting-support.patch
@@ -0,0 +1,156 @@
+From e083cb151d05afd2e06431fb24443e381c03b361 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Mon, 5 Oct 2015 00:12:38 -0400
+Subject: [PATCH 074/122] Return generic typevar casting support
+
+---
+ .../jetbrains/java/decompiler/main/ClassWriter.java  |  5 ++++-
+ .../decompiler/modules/decompiler/ExprProcessor.java |  7 +++----
+ .../modules/decompiler/exps/ExitExprent.java         | 12 +++++++++++-
+ .../java/decompiler/struct/gen/MethodDescriptor.java |  5 +++++
+ .../java/decompiler/struct/gen/VarType.java          |  7 ++++++-
+ 5 files changed, 29 insertions(+), 7 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+index daf3444..404265f 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+@@ -607,6 +607,7 @@ public class ClassWriter {
+       boolean clinit = false, init = false, dinit = false;
+ 
+       MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
++      DecompilerContext.setProperty(DecompilerContext.CURRENT_METHOD_DESCRIPTOR, md);
+ 
+       int flags = mt.getAccessFlags();
+       if ((flags & CodeConstants.ACC_NATIVE) != 0) {
+@@ -686,7 +687,9 @@ public class ClassWriter {
+           }
+         }
+       }
+-
++      if (descriptor != null) {
++          md.addGenericDescriptor(descriptor);
++      }
+       boolean throwsExceptions = false;
+       int paramCount = 0;
+ 
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+index 7b94e5b..1abd093 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+@@ -731,10 +731,9 @@ public class ExprProcessor implements CodeConstants {
+       return "void";
+     }
+     else if (tp == CodeConstants.TYPE_OBJECT) {
+-      //if (type.signatureDebugGens != null) {
+-      //  GenericType gen = new GenericType(type.signatureDebugGens);
+-      //  return GenericMain.getGenericCastTypeName(gen);
+-      //}
++      if (type.genericType != null) {
++        return GenericMain.getGenericCastTypeName(type.genericType);
++      }
+ 
+       String ret = buildJavaClassName(type.value);
+       if (getShort) {
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
+index fd1491f..bbf1458 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
+@@ -24,7 +24,10 @@ import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
+ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
+ import org.jetbrains.java.decompiler.struct.attr.StructExceptionsAttribute;
++import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
+ import org.jetbrains.java.decompiler.struct.gen.VarType;
++import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
++import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
+ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
+ import org.jetbrains.java.decompiler.struct.match.MatchNode;
+ import org.jetbrains.java.decompiler.struct.match.IMatchable.MatchProperties;
+@@ -81,13 +84,20 @@ public class ExitExprent extends Exprent {
+   @Override
+   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
+     tracer.addMapping(bytecode);
++    MethodDescriptor md = (MethodDescriptor) DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_DESCRIPTOR);
+ 
+     if (exitType == EXIT_RETURN) {
+       TextBuffer buffer = new TextBuffer();
+ 
+       if (retType.type != CodeConstants.TYPE_VOID) {
++        VarType ret = retType;
++        boolean force = false;
++        if (md.genericInfo != null && md.genericInfo.ret != null) {
++            ret = new VarType(md.genericInfo.ret);
++            force = true;
++        }
+         buffer.append(" ");
+-        ExprProcessor.getCastedExprent(value, retType, buffer, indent, false, tracer);
++        ExprProcessor.getCastedExprent(value, ret, buffer, indent, false, force, tracer);
+       }
+ 
+       return buffer.prepend("return");
+diff --git a/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
+index 2465382..0ab555f 100644
+--- a/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
++++ b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
+@@ -16,6 +16,7 @@
+ package org.jetbrains.java.decompiler.struct.gen;
+ 
+ import org.jetbrains.java.decompiler.code.CodeConstants;
++import org.jetbrains.java.decompiler.struct.gen.generics.GenericMethodDescriptor;
+ 
+ import java.util.ArrayList;
+ import java.util.Arrays;
+@@ -25,6 +26,7 @@ public class MethodDescriptor {
+ 
+   public final VarType[] params;
+   public final VarType ret;
++  public GenericMethodDescriptor genericInfo;
+ 
+   private MethodDescriptor(VarType[] params, VarType ret) {
+     this.params = params;
+@@ -78,6 +80,9 @@ public class MethodDescriptor {
+     return new MethodDescriptor(params, ret);
+   }
+ 
++  public void addGenericDescriptor(GenericMethodDescriptor desc) {
++    this.genericInfo = desc;
++  }
+   public String buildNewDescriptor(NewClassNameBuilder builder) {
+     boolean updated = false;
+ 
+diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
+index 1eb177f..45fd289 100644
+--- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
++++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
+@@ -16,6 +16,7 @@
+ package org.jetbrains.java.decompiler.struct.gen;
+ 
+ import org.jetbrains.java.decompiler.code.CodeConstants;
++import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ 
+ public class VarType {  // TODO: optimize switch
+@@ -46,7 +47,7 @@ public class VarType {  // TODO: optimize switch
+   public final int typeFamily;
+   public final int stackSize;
+   public final boolean falseBoolean;
+-
++  public GenericType genericType;
+   public VarType(int type) {
+     this(type, 0);
+   }
+@@ -55,6 +56,10 @@ public class VarType {  // TODO: optimize switch
+     this(type, arrayDim, getChar(type));
+   }
+ 
++  public VarType(GenericType type) {
++      this(VARTYPE_OBJECT.type);
++      this.genericType = type;
++  }
+   public VarType(int type, int arrayDim, String value) {
+     this(type, arrayDim, value, getFamily(type, arrayDim), getStackSize(type, arrayDim), false);
+   }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0075-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch b/FernFlower-Patches/0075-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch
new file mode 100644
index 0000000..0a25207
--- /dev/null
+++ b/FernFlower-Patches/0075-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch
@@ -0,0 +1,95 @@
+From a88b1c06f60850be429ebdba20e5e6ba507936bb Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Fri, 9 Oct 2015 13:22:13 -0700
+Subject: [PATCH 075/122] Add new decompiler option -iec
+ Include_Entire_Classpath which will read the current JVM's classpath and
+ parse all libraries for metadata.
+
+---
+ .../java/decompiler/main/Fernflower.java      | 29 +++++++++++++++++++
+ .../main/extern/IFernflowerPreferences.java   |  3 ++
+ 2 files changed, 32 insertions(+)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
+index e355ee9..65733ac 100644
+--- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
++++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
+@@ -19,6 +19,7 @@ import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
+ import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
+ import org.jetbrains.java.decompiler.main.extern.IBytecodeProvider;
+ import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
++import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger.Severity;
+ import org.jetbrains.java.decompiler.main.extern.IResultSaver;
+ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+ import org.jetbrains.java.decompiler.modules.renamer.IdentifierConverter;
+@@ -27,7 +28,10 @@ import org.jetbrains.java.decompiler.struct.StructClass;
+ import org.jetbrains.java.decompiler.struct.StructContext;
+ import org.jetbrains.java.decompiler.struct.lazy.LazyLoader;
+ 
++import java.io.File;
++import java.util.HashSet;
+ import java.util.Map;
++import java.util.Set;
+ 
+ public class Fernflower implements IDecompiledData {
+ 
+@@ -39,6 +43,10 @@ public class Fernflower implements IDecompiledData {
+     DecompilerContext.initContext(options);
+     DecompilerContext.setCounterContainer(new CounterContainer());
+     DecompilerContext.setLogger(logger);
++
++    if (DecompilerContext.getOption(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH)) {
++      addAllClasspath();
++    }
+   }
+ 
+   public void decompileContext() {
+@@ -92,4 +100,25 @@ public class Fernflower implements IDecompiledData {
+       return null;
+     }
+   }
++
++  private void addAllClasspath() {
++    Set<String> found = new HashSet<String>();
++    String[] props = { System.getProperty("java.class.path"), System.getProperty("sun.boot.class.path") };
++    for (String prop : props) {
++      if (prop == null)
++        continue;
++
++      for (final String path : prop.split(File.pathSeparator)) {
++        File file = new File(path);
++        if (found.contains(file.getAbsolutePath()))
++          continue;
++
++        if (file.exists()) {
++          DecompilerContext.getLogger().writeMessage("Adding File to context from classpath: " + file, Severity.INFO);
++          structContext.addSpace(file, false);
++          found.add(file.getAbsolutePath());
++        }
++      }
++    }
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+index 31871c5..79dd8e8 100644
+--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
++++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+@@ -60,6 +60,8 @@ public interface IFernflowerPreferences {
+   String LINE_SEPARATOR_WIN = "\r\n";
+   String LINE_SEPARATOR_LIN = "\n";
+ 
++  String INCLUDE_ENTIRE_CLASSPATH = "iec";
++
+   Map<String, Object> DEFAULTS = Collections.unmodifiableMap(new HashMap<String, Object>() {{
+     put(REMOVE_BRIDGE, "1");
+     put(REMOVE_SYNTHETIC, "0");
+@@ -93,5 +95,6 @@ public interface IFernflowerPreferences {
+     put(BANNER, "");
+     put(UNIT_TEST_MODE, "0");
+     put(DUMP_ORIGINAL_LINES, "0");
++    put(INCLUDE_ENTIRE_CLASSPATH, "0");
+   }});
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0076-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch b/FernFlower-Patches/0076-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch
new file mode 100644
index 0000000..df0ca76
--- /dev/null
+++ b/FernFlower-Patches/0076-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch
@@ -0,0 +1,1068 @@
+From 676f9ba6584df07224d713698aca89eae71b44e4 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Fri, 9 Oct 2015 13:29:20 -0700
+Subject: [PATCH 076/122] Rework GenericType to be subclass of VarType and
+ contain all data needed to be treated as such.
+
+---
+ .../java/decompiler/main/ClassWriter.java     | 148 ++++---------
+ .../modules/decompiler/ExprProcessor.java     |   7 +-
+ .../modules/decompiler/exps/ExitExprent.java  |   6 +-
+ .../modules/decompiler/exps/NewExprent.java   |  20 +-
+ .../modules/decompiler/exps/VarExprent.java   |   2 +-
+ .../java/decompiler/struct/StructClass.java   |  21 ++
+ .../java/decompiler/struct/StructField.java   |  21 ++
+ .../java/decompiler/struct/StructMethod.java  |  18 +-
+ .../java/decompiler/struct/gen/VarType.java   |  15 +-
+ .../gen/generics/GenericClassDescriptor.java  |   8 +-
+ .../gen/generics/GenericFieldDescriptor.java  |   4 +-
+ .../struct/gen/generics/GenericMain.java      |  82 ++-----
+ .../gen/generics/GenericMethodDescriptor.java |  10 +-
+ .../struct/gen/generics/GenericType.java      | 204 ++++++++++++------
+ 14 files changed, 288 insertions(+), 278 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+index 404265f..4ec7fe9 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+@@ -342,13 +342,7 @@ public class ClassWriter {
+       buffer.append("class ");
+     }
+ 
+-    GenericClassDescriptor descriptor = null;
+-    if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
+-      StructGenericSignatureAttribute attr = (StructGenericSignatureAttribute)cl.getAttributes().getWithKey("Signature");
+-      if (attr != null) {
+-        descriptor = GenericMain.parseClassSignature(attr.getSignature());
+-      }
+-    }
++    GenericClassDescriptor descriptor = cl.getSignature();
+ 
+     buffer.append(node.simpleName);
+ 
+@@ -362,12 +356,7 @@ public class ClassWriter {
+       VarType supertype = new VarType(cl.superClass.getString(), true);
+       if (!VarType.VARTYPE_OBJECT.equals(supertype)) {
+         buffer.append("extends ");
+-        if (descriptor != null) {
+-          buffer.append(GenericMain.getGenericCastTypeName(descriptor.superclass));
+-        }
+-        else {
+-          buffer.append(ExprProcessor.getCastTypeName(supertype));
+-        }
++        buffer.append(ExprProcessor.getCastTypeName(descriptor == null ? supertype : descriptor.superclass));
+         buffer.append(' ');
+       }
+     }
+@@ -380,12 +369,8 @@ public class ClassWriter {
+           if (i > 0) {
+             buffer.append(", ");
+           }
+-          if (descriptor != null) {
+-            buffer.append(GenericMain.getGenericCastTypeName(descriptor.superinterfaces.get(i)));
+-          }
+-          else {
+-            buffer.append(ExprProcessor.getCastTypeName(new VarType(cl.getInterface(i), true)));
+-          }
++          VarType iface = descriptor == null ? new VarType(cl.getInterface(i), true) : descriptor.superinterfaces.get(i);
++          buffer.append(ExprProcessor.getCastTypeName(iface));
+         }
+         buffer.append(' ');
+       }
+@@ -423,21 +408,10 @@ public class ClassWriter {
+ 
+     VarType fieldType = new VarType(fd.getDescriptor(), false);
+ 
+-    GenericFieldDescriptor descriptor = null;
+-    if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
+-      StructGenericSignatureAttribute attr = (StructGenericSignatureAttribute)fd.getAttributes().getWithKey("Signature");
+-      if (attr != null) {
+-        descriptor = GenericMain.parseFieldSignature(attr.getSignature());
+-      }
+-    }
++    GenericFieldDescriptor descriptor = fd.getSignature();
+ 
+     if (!isEnum) {
+-      if (descriptor != null) {
+-        buffer.append(GenericMain.getGenericCastTypeName(descriptor.type));
+-      }
+-      else {
+-        buffer.append(ExprProcessor.getCastTypeName(fieldType));
+-      }
++      buffer.append(ExprProcessor.getCastTypeName(descriptor == null ? fieldType : descriptor.type));
+       buffer.append(' ');
+     }
+ 
+@@ -662,33 +636,25 @@ public class ClassWriter {
+         clinit = true;
+       }
+ 
+-      GenericMethodDescriptor descriptor = null;
+-      if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
+-        StructGenericSignatureAttribute attr = (StructGenericSignatureAttribute)mt.getAttributes().getWithKey("Signature");
+-        if (attr != null) {
+-          descriptor = GenericMain.parseMethodSignature(attr.getSignature());
+-          if (descriptor != null) {
+-            int actualParams = md.params.length;
+-            List<VarVersionPair> sigFields = methodWrapper.signatureFields;
+-            if (sigFields != null) {
+-               actualParams = 0;
+-              for (VarVersionPair field : methodWrapper.signatureFields) {
+-                if (field == null) {
+-                  actualParams++;
+-                }
+-              }
+-            }
+-            else if (isEnum && init) actualParams -= 2;
+-            if (actualParams != descriptor.params.size()) {
+-              String message = "Inconsistent generic signature in method " + mt.getName() + " " + mt.getDescriptor() + " in " + cl.qualifiedName;
+-              DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
+-              descriptor = null;
++      GenericMethodDescriptor descriptor = mt.getSignature();
++      if (descriptor != null) {
++        int actualParams = md.params.length;
++        List<VarVersionPair> sigFields = methodWrapper.signatureFields;
++        if (sigFields != null) {
++           actualParams = 0;
++          for (VarVersionPair field : methodWrapper.signatureFields) {
++            if (field == null) {
++              actualParams++;
+             }
+           }
+         }
+-      }
+-      if (descriptor != null) {
+-          md.addGenericDescriptor(descriptor);
++        else if (isEnum && init) actualParams -= 2;
++        if (actualParams != descriptor.params.size()) {
++          String message = "Inconsistent generic signature in method " + mt.getName() + " " + mt.getDescriptor() + " in " + cl.qualifiedName;
++          DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
++          descriptor = null;
++        }
++        md.addGenericDescriptor(descriptor);
+       }
+       boolean throwsExceptions = false;
+       int paramCount = 0;
+@@ -702,12 +668,7 @@ public class ClassWriter {
+         }
+ 
+         if (!init) {
+-          if (descriptor != null) {
+-            buffer.append(GenericMain.getGenericCastTypeName(descriptor.ret));
+-          }
+-          else {
+-            buffer.append(ExprProcessor.getCastTypeName(md.ret));
+-          }
++          buffer.append(ExprProcessor.getCastTypeName(descriptor == null ? md.ret : descriptor.ret));
+           buffer.append(' ');
+         }
+ 
+@@ -747,45 +708,23 @@ public class ClassWriter {
+               buffer.append("final ");
+             }
+ 
+-            if (descriptor != null) {
+-              GenericType parameterType = descriptor.params.get(i);
+-
+-              boolean isVarArg = (i == lastVisibleParameterIndex && mt.hasModifier(CodeConstants.ACC_VARARGS) && parameterType.arrayDim > 0);
+-              if (isVarArg) {
+-                parameterType = parameterType.decreaseArrayDim();
+-              }
+-
+-              String typeName = GenericMain.getGenericCastTypeName(parameterType);
+-              if (ExprProcessor.UNDEFINED_TYPE_STRING.equals(typeName) &&
+-                  DecompilerContext.getOption(IFernflowerPreferences.UNDEFINED_PARAM_TYPE_OBJECT)) {
+-                typeName = ExprProcessor.getCastTypeName(VarType.VARTYPE_OBJECT);
+-              }
+-
+-              buffer.append(typeName);
++            VarType parameterType = descriptor == null ? md.params[i] : descriptor.params.get(i);
+ 
+-              if (isVarArg) {
+-                buffer.append("...");
+-              }
++            boolean isVarArg = (i == lastVisibleParameterIndex && mt.hasModifier(CodeConstants.ACC_VARARGS) && parameterType.arrayDim > 0);
++            if (isVarArg) {
++              parameterType = parameterType.decreaseArrayDim();
+             }
+-            else {
+-              VarType parameterType = md.params[i];
+ 
+-              boolean isVarArg = (i == lastVisibleParameterIndex && mt.hasModifier(CodeConstants.ACC_VARARGS) && parameterType.arrayDim > 0);
+-              if (isVarArg) {
+-                parameterType = parameterType.decreaseArrayDim();
+-              }
+-
+-              String typeName = ExprProcessor.getCastTypeName(parameterType);
+-              if (ExprProcessor.UNDEFINED_TYPE_STRING.equals(typeName) &&
+-                  DecompilerContext.getOption(IFernflowerPreferences.UNDEFINED_PARAM_TYPE_OBJECT)) {
+-                typeName = ExprProcessor.getCastTypeName(VarType.VARTYPE_OBJECT);
+-              }
++            String typeName = ExprProcessor.getCastTypeName(parameterType);
++            if (ExprProcessor.UNDEFINED_TYPE_STRING.equals(typeName) &&
++                DecompilerContext.getOption(IFernflowerPreferences.UNDEFINED_PARAM_TYPE_OBJECT)) {
++              typeName = ExprProcessor.getCastTypeName(VarType.VARTYPE_OBJECT);
++            }
+ 
+-              buffer.append(typeName);
++            buffer.append(typeName);
+ 
+-              if (isVarArg) {
+-                buffer.append("...");
+-              }
++            if (isVarArg) {
++              buffer.append("...");
+             }
+ 
+             buffer.append(' ');
+@@ -810,14 +749,11 @@ public class ClassWriter {
+             if (i > 0) {
+               buffer.append(", ");
+             }
++            VarType type = new VarType(attr.getExcClassname(i, cl.getPool()), true);
+             if (descriptor != null && !descriptor.exceptions.isEmpty()) {
+-              GenericType type = descriptor.exceptions.get(i);
+-              buffer.append(GenericMain.getGenericCastTypeName(type));
+-            }
+-            else {
+-              VarType type = new VarType(attr.getExcClassname(i, cl.getPool()), true);
+-              buffer.append(ExprProcessor.getCastTypeName(type));
++              type = descriptor.exceptions.get(i);
+             }
++            buffer.append(ExprProcessor.getCastTypeName(type));
+           }
+         }
+       }
+@@ -1080,7 +1016,7 @@ public class ClassWriter {
+     }
+   }
+ 
+-  private static void appendTypeParameters(TextBuffer buffer, List<String> parameters, List<List<GenericType>> bounds) {
++  private static void appendTypeParameters(TextBuffer buffer, List<String> parameters, List<List<VarType>> bounds) {
+     buffer.append('<');
+ 
+     for (int i = 0; i < parameters.size(); i++) {
+@@ -1090,13 +1026,13 @@ public class ClassWriter {
+ 
+       buffer.append(parameters.get(i));
+ 
+-      List<GenericType> parameterBounds = bounds.get(i);
++      List<VarType> parameterBounds = bounds.get(i);
+       if (parameterBounds.size() > 1 || !"java/lang/Object".equals(parameterBounds.get(0).value)) {
+         buffer.append(" extends ");
+-        buffer.append(GenericMain.getGenericCastTypeName(parameterBounds.get(0)));
++        buffer.append(ExprProcessor.getCastTypeName(parameterBounds.get(0)));
+         for (int j = 1; j < parameterBounds.size(); j++) {
+           buffer.append(" & ");
+-          buffer.append(GenericMain.getGenericCastTypeName(parameterBounds.get(j)));
++          buffer.append(ExprProcessor.getCastTypeName(parameterBounds.get(j)));
+         }
+       }
+     }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+index 1abd093..162d9cb 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+@@ -730,9 +730,12 @@ public class ExprProcessor implements CodeConstants {
+     else if (tp == CodeConstants.TYPE_VOID) {
+       return "void";
+     }
++    else if (tp == CodeConstants.TYPE_GENVAR && type.isGeneric()) {
++        return type.value;
++    }
+     else if (tp == CodeConstants.TYPE_OBJECT) {
+-      if (type.genericType != null) {
+-        return GenericMain.getGenericCastTypeName(type.genericType);
++      if (type.isGeneric()) {
++        return ((GenericType)type).getCastName();
+       }
+ 
+       String ret = buildJavaClassName(type.value);
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
+index bbf1458..3b5f0ba 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
+@@ -26,11 +26,8 @@ import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
+ import org.jetbrains.java.decompiler.struct.attr.StructExceptionsAttribute;
+ import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
+ import org.jetbrains.java.decompiler.struct.gen.VarType;
+-import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
+-import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
+ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
+ import org.jetbrains.java.decompiler.struct.match.MatchNode;
+-import org.jetbrains.java.decompiler.struct.match.IMatchable.MatchProperties;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ 
+ import java.util.ArrayList;
+@@ -93,8 +90,7 @@ public class ExitExprent extends Exprent {
+         VarType ret = retType;
+         boolean force = false;
+         if (md.genericInfo != null && md.genericInfo.ret != null) {
+-            ret = new VarType(md.genericInfo.ret);
+-            force = true;
++            ret = md.genericInfo.ret;
+         }
+         buffer.append(" ");
+         ExprProcessor.getCastedExprent(value, ret, buffer, indent, false, force, tracer);
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+index 1e87201..56e6771 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+@@ -238,19 +238,17 @@ public class NewExprent extends Exprent {
+           }
+         }
+ 
+-        if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
+-          StructGenericSignatureAttribute attr = (StructGenericSignatureAttribute)child.getWrapper().getClassStruct().getAttributes().getWithKey("Signature");
+-          if (attr != null) {
+-              GenericClassDescriptor descriptor = GenericMain.parseClassSignature(attr.getSignature());
+-              // Anon classes can only be a child to one type. So either the first interface or the super class
+-              if (descriptor.superinterfaces.size() > 0) {
+-                  typename = GenericMain.getGenericCastTypeName(descriptor.superinterfaces.get(0));
+-              }
+-              else {
+-                  typename = GenericMain.getGenericCastTypeName(descriptor.superclass);
+-              }
++        GenericClassDescriptor descriptor = child.getWrapper().getClassStruct().getSignature();
++        if (descriptor != null) {
++          // Anon classes can only be a child to one type. So either the first interface or the super class
++          if (descriptor.superinterfaces.size() > 0) {
++            typename = ExprProcessor.getCastTypeName(descriptor.superinterfaces.get(0));
++          }
++          else {
++            typename = ExprProcessor.getCastTypeName(descriptor.superclass);
+           }
+         }
++
+         buf.prepend("new " + typename);
+ 
+         if (enclosing != null) {
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+index c85d889..4784e03 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+@@ -111,7 +111,7 @@ public class VarExprent extends Exprent {
+           buffer.append("final ");
+         }
+         if (lvt != null && lvt.getSig() != null) {
+-          buffer.append(GenericMain.getGenericCastTypeName(new GenericType(lvt.getSig()))).append(" ");
++          buffer.append(ExprProcessor.getCastTypeName(GenericType.parse(lvt.getSig()))).append(" ");
+         }
+         else if (lvt != null) {
+           buffer.append(ExprProcessor.getCastTypeName(lvt.getVarType())).append(" ");
+diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
+index cb24ff6..c0683fc 100644
+--- a/src/org/jetbrains/java/decompiler/struct/StructClass.java
++++ b/src/org/jetbrains/java/decompiler/struct/StructClass.java
+@@ -16,8 +16,14 @@
+ package org.jetbrains.java.decompiler.struct;
+ 
+ import org.jetbrains.java.decompiler.code.CodeConstants;
++import org.jetbrains.java.decompiler.main.DecompilerContext;
++import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
++import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
++import org.jetbrains.java.decompiler.struct.attr.StructGenericSignatureAttribute;
+ import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+ import org.jetbrains.java.decompiler.struct.consts.PrimitiveConstant;
++import org.jetbrains.java.decompiler.struct.gen.generics.GenericClassDescriptor;
++import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
+ import org.jetbrains.java.decompiler.struct.lazy.LazyLoader;
+ import org.jetbrains.java.decompiler.util.DataInputFullStream;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+@@ -58,6 +64,7 @@ public class StructClass extends StructMember {
+   private final String[] interfaceNames;
+   private final VBStyleCollection<StructField, String> fields;
+   private final VBStyleCollection<StructMethod, String> methods;
++  private GenericClassDescriptor signature = null;
+ 
+   private ConstantPool pool;
+ 
+@@ -192,4 +199,18 @@ public class StructClass extends StructMember {
+ 
+     return CodeConstants.BYTECODE_JAVA_LE_4;
+   }
++
++  @Override
++  protected StructGeneralAttribute readAttribute(DataInputFullStream in, ConstantPool pool, String name) throws IOException {
++    StructGeneralAttribute attribute = super.readAttribute(in, pool, name);
++    if ("Signature".equals(name) && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
++      StructGenericSignatureAttribute signature = (StructGenericSignatureAttribute)attribute;
++      this.signature = GenericMain.parseClassSignature(signature.getSignature());
++    }
++    return attribute;
++  }
++
++  public GenericClassDescriptor getSignature() {
++    return signature;
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/struct/StructField.java b/src/org/jetbrains/java/decompiler/struct/StructField.java
+index 796d77f..cde19f1 100644
+--- a/src/org/jetbrains/java/decompiler/struct/StructField.java
++++ b/src/org/jetbrains/java/decompiler/struct/StructField.java
+@@ -15,7 +15,13 @@
+  */
+ package org.jetbrains.java.decompiler.struct;
+ 
++import org.jetbrains.java.decompiler.main.DecompilerContext;
++import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
++import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
++import org.jetbrains.java.decompiler.struct.attr.StructGenericSignatureAttribute;
+ import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
++import org.jetbrains.java.decompiler.struct.gen.generics.GenericFieldDescriptor;
++import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
+ import org.jetbrains.java.decompiler.util.DataInputFullStream;
+ 
+ import java.io.IOException;
+@@ -33,6 +39,7 @@ public class StructField extends StructMember {
+ 
+   private final String name;
+   private final String descriptor;
++  private GenericFieldDescriptor signature;
+ 
+ 
+   public StructField(DataInputFullStream in, StructClass clStruct) throws IOException {
+@@ -55,4 +62,18 @@ public class StructField extends StructMember {
+   public String getDescriptor() {
+     return descriptor;
+   }
++
++  public GenericFieldDescriptor getSignature() {
++    return signature;
++  }
++
++  @Override
++  protected StructGeneralAttribute readAttribute(DataInputFullStream in, ConstantPool pool, String name) throws IOException {
++    StructGeneralAttribute attribute = super.readAttribute(in, pool, name);
++    if ("Signature".equals(name) && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
++      StructGenericSignatureAttribute signature = (StructGenericSignatureAttribute)attribute;
++      this.signature = GenericMain.parseFieldSignature(signature.getSignature());
++    }
++    return attribute;
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
+index 2b5249f..8f0da2b 100644
+--- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
++++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
+@@ -16,8 +16,13 @@
+ package org.jetbrains.java.decompiler.struct;
+ 
+ import org.jetbrains.java.decompiler.code.*;
++import org.jetbrains.java.decompiler.main.DecompilerContext;
++import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+ import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
++import org.jetbrains.java.decompiler.struct.attr.StructGenericSignatureAttribute;
+ import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
++import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
++import org.jetbrains.java.decompiler.struct.gen.generics.GenericMethodDescriptor;
+ import org.jetbrains.java.decompiler.util.DataInputFullStream;
+ import org.jetbrains.java.decompiler.util.VBStyleCollection;
+ 
+@@ -46,6 +51,7 @@ public class StructMethod extends StructMember {
+   private final StructClass classStruct;
+   private final String name;
+   private final String descriptor;
++  private GenericMethodDescriptor signature;
+ 
+   private boolean containsCode = false;
+   private int localVariables = 0;
+@@ -99,7 +105,13 @@ public class StructMethod extends StructMember {
+       return null;
+     }
+ 
+-    return super.readAttribute(in, pool, name);
++    StructGeneralAttribute attribute = super.readAttribute(in, pool, name);
++    if ("Signature".equals(name) && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
++      StructGenericSignatureAttribute signature = (StructGenericSignatureAttribute)attribute;
++      this.signature = GenericMain.parseMethodSignature(signature.getSignature());
++    }
++
++    return attribute;
+   }
+ 
+   public void expandData() throws IOException {
+@@ -389,4 +401,8 @@ public class StructMethod extends StructMember {
+   public InstructionSequence getInstructionSequence() {
+     return seq;
+   }
++
++  public GenericMethodDescriptor getSignature() {
++    return signature;
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
+index 45fd289..1b0df9d 100644
+--- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
++++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
+@@ -47,7 +47,6 @@ public class VarType {  // TODO: optimize switch
+   public final int typeFamily;
+   public final int stackSize;
+   public final boolean falseBoolean;
+-  public GenericType genericType;
+   public VarType(int type) {
+     this(type, 0);
+   }
+@@ -56,15 +55,11 @@ public class VarType {  // TODO: optimize switch
+     this(type, arrayDim, getChar(type));
+   }
+ 
+-  public VarType(GenericType type) {
+-      this(VARTYPE_OBJECT.type);
+-      this.genericType = type;
+-  }
+   public VarType(int type, int arrayDim, String value) {
+     this(type, arrayDim, value, getFamily(type, arrayDim), getStackSize(type, arrayDim), false);
+   }
+ 
+-  private VarType(int type, int arrayDim, String value, int typeFamily, int stackSize, boolean falseBoolean) {
++  protected VarType(int type, int arrayDim, String value, int typeFamily, int stackSize, boolean falseBoolean) {
+     this.type = type;
+     this.arrayDim = arrayDim;
+     this.value = value;
+@@ -156,7 +151,7 @@ public class VarType {  // TODO: optimize switch
+     }
+   }
+ 
+-  private static int getStackSize(int type, int arrayDim) {
++  protected static int getStackSize(int type, int arrayDim) {
+     if (arrayDim > 0) {
+       return 1;
+     }
+@@ -173,7 +168,7 @@ public class VarType {  // TODO: optimize switch
+     }
+   }
+ 
+-  private static int getFamily(int type, int arrayDim) {
++  protected static int getFamily(int type, int arrayDim) {
+     if (arrayDim > 0) {
+       return CodeConstants.TYPE_FAMILY_OBJECT;
+     }
+@@ -303,6 +298,10 @@ public class VarType {  // TODO: optimize switch
+     return res.toString();
+   }
+ 
++  public boolean isGeneric() {
++    return false;
++  }
++
+   // type1 and type2 must not be null
+   public static VarType getCommonMinType(VarType type1, VarType type2) {
+     if (type1.type == CodeConstants.TYPE_BOOLEAN && type2.type == CodeConstants.TYPE_BOOLEAN) { // special case booleans
+diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java
+index 2ff2954..9418bb8 100644
+--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java
++++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java
+@@ -18,13 +18,15 @@ package org.jetbrains.java.decompiler.struct.gen.generics;
+ import java.util.ArrayList;
+ import java.util.List;
+ 
++import org.jetbrains.java.decompiler.struct.gen.VarType;
++
+ public class GenericClassDescriptor {
+ 
+-  public GenericType superclass;
++  public VarType superclass;
+ 
+-  public final List<GenericType> superinterfaces = new ArrayList<GenericType>();
++  public final List<VarType> superinterfaces = new ArrayList<VarType>();
+ 
+   public final List<String> fparameters = new ArrayList<String>();
+ 
+-  public final List<List<GenericType>> fbounds = new ArrayList<List<GenericType>>();
++  public final List<List<VarType>> fbounds = new ArrayList<List<VarType>>();
+ }
+diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java
+index 598d17b..9857f60 100644
+--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java
++++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java
+@@ -15,7 +15,9 @@
+  */
+ package org.jetbrains.java.decompiler.struct.gen.generics;
+ 
++import org.jetbrains.java.decompiler.struct.gen.VarType;
++
+ public class GenericFieldDescriptor {
+ 
+-  public GenericType type;
++  public VarType type;
+ }
+diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
+index 0a3f9d3..cffd008 100644
+--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
++++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
+@@ -18,6 +18,8 @@ package org.jetbrains.java.decompiler.struct.gen.generics;
+ import org.jetbrains.java.decompiler.code.CodeConstants;
+ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
++import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
++import org.jetbrains.java.decompiler.struct.gen.VarType;
+ 
+ import java.util.ArrayList;
+ import java.util.List;
+@@ -43,12 +45,12 @@ public class GenericMain {
+       signature = parseFormalParameters(signature, descriptor.fparameters, descriptor.fbounds);
+ 
+       String superCl = GenericType.getNextType(signature);
+-      descriptor.superclass = new GenericType(superCl);
++      descriptor.superclass = GenericType.parse(superCl);
+ 
+       signature = signature.substring(superCl.length());
+       while (signature.length() > 0) {
+         String superIf = GenericType.getNextType(signature);
+-        descriptor.superinterfaces.add(new GenericType(superIf));
++        descriptor.superinterfaces.add(GenericType.parse(superIf));
+         signature = signature.substring(superIf.length());
+       }
+ 
+@@ -63,7 +65,7 @@ public class GenericMain {
+   public static GenericFieldDescriptor parseFieldSignature(String signature) {
+     try {
+       GenericFieldDescriptor descriptor = new GenericFieldDescriptor();
+-      descriptor.type = new GenericType(signature);
++      descriptor.type = GenericType.parse(signature);
+       return descriptor;
+     }
+     catch (RuntimeException e) {
+@@ -85,19 +87,19 @@ public class GenericMain {
+ 
+       while (pars.length() > 0) {
+         String par = GenericType.getNextType(pars);
+-        descriptor.params.add(new GenericType(par));
++        descriptor.params.add(GenericType.parse(par));
+         pars = pars.substring(par.length());
+       }
+ 
+       String par = GenericType.getNextType(signature);
+-      descriptor.ret = new GenericType(par);
++      descriptor.ret = GenericType.parse(par);
+       signature = signature.substring(par.length());
+ 
+       if (signature.length() > 0) {
+         String[] exceptions = signature.split("\\^");
+ 
+         for (int i = 1; i < exceptions.length; i++) {
+-          descriptor.exceptions.add(new GenericType(exceptions[i]));
++          descriptor.exceptions.add(GenericType.parse(exceptions[i]));
+         }
+       }
+ 
+@@ -109,7 +111,7 @@ public class GenericMain {
+     }
+   }
+ 
+-  private static String parseFormalParameters(String signature, List<String> parameters, List<List<GenericType>> bounds) {
++  private static String parseFormalParameters(String signature, List<String> parameters, List<List<VarType>> bounds) {
+     if (signature.charAt(0) != '<') {
+       return signature;
+     }
+@@ -142,7 +144,7 @@ public class GenericMain {
+       String param = value.substring(0, to);
+       value = value.substring(to + 1);
+ 
+-      List<GenericType> lstBounds = new ArrayList<GenericType>();
++      List<VarType> lstBounds = new ArrayList<VarType>();
+ 
+       while (true) {
+         if (value.charAt(0) == ':') {
+@@ -151,7 +153,7 @@ public class GenericMain {
+         }
+ 
+         String bound = GenericType.getNextType(value);
+-        lstBounds.add(new GenericType(bound));
++        lstBounds.add(GenericType.parse(bound));
+         value = value.substring(bound.length());
+ 
+ 
+@@ -191,69 +193,9 @@ public class GenericMain {
+       return type.value;
+     }
+     else if (tp == CodeConstants.TYPE_OBJECT) {
+-      StringBuilder buffer = new StringBuilder();
+-      appendClassName(type, buffer);
+-      return buffer.toString();
++      return type.getCastName();
+     }
+ 
+     throw new RuntimeException("Invalid type: " + type);
+   }
+-
+-  private static void appendClassName(GenericType type, StringBuilder buffer) {
+-    List<GenericType> enclosingClasses = type.getEnclosingClasses();
+-
+-    if (enclosingClasses.isEmpty()) {
+-      String name = type.value.replace('/', '.');
+-      buffer.append(DecompilerContext.getImportCollector().getShortName(name));
+-    }
+-    else {
+-      for (GenericType tp : enclosingClasses) {
+-        if (buffer.length() == 0) {
+-          buffer.append(DecompilerContext.getImportCollector().getShortName(tp.value));
+-        }
+-        else {
+-          buffer.append(tp.value);
+-        }
+-
+-        appendTypeArguments(tp, buffer);
+-        buffer.append('.');
+-      }
+-
+-      buffer.append(type.value);
+-    }
+-
+-    appendTypeArguments(type, buffer);
+-  }
+-
+-  private static void appendTypeArguments(GenericType type, StringBuilder buffer) {
+-    if (!type.getArguments().isEmpty()) {
+-      buffer.append('<');
+-
+-      for (int i = 0; i < type.getArguments().size(); i++) {
+-        if (i > 0) {
+-          buffer.append(", ");
+-        }
+-
+-        int wildcard = type.getWildcards().get(i);
+-        switch (wildcard) {
+-          case GenericType.WILDCARD_UNBOUND:
+-            buffer.append('?');
+-            break;
+-          case GenericType.WILDCARD_EXTENDS:
+-            buffer.append("? extends ");
+-            break;
+-          case GenericType.WILDCARD_SUPER:
+-            buffer.append("? super ");
+-            break;
+-        }
+-
+-        GenericType genPar = type.getArguments().get(i);
+-        if (genPar != null) {
+-          buffer.append(getGenericCastTypeName(genPar));
+-        }
+-      }
+-
+-      buffer.append(">");
+-    }
+-  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
+index 7ef9399..5c2ff05 100644
+--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
++++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
+@@ -18,15 +18,17 @@ package org.jetbrains.java.decompiler.struct.gen.generics;
+ import java.util.ArrayList;
+ import java.util.List;
+ 
++import org.jetbrains.java.decompiler.struct.gen.VarType;
++
+ public class GenericMethodDescriptor {
+ 
+   public final List<String> fparameters = new ArrayList<String>();
+ 
+-  public final List<List<GenericType>> fbounds = new ArrayList<List<GenericType>>();
++  public final List<List<VarType>> fbounds = new ArrayList<List<VarType>>();
+ 
+-  public final List<GenericType> params = new ArrayList<GenericType>();
++  public final List<VarType> params = new ArrayList<VarType>();
+ 
+-  public GenericType ret;
++  public VarType ret;
+ 
+-  public final List<GenericType> exceptions = new ArrayList<GenericType>();
++  public final List<VarType> exceptions = new ArrayList<VarType>();
+ }
+diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
+index 9305bf9..c45d47f 100644
+--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
++++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
+@@ -16,38 +16,43 @@
+ package org.jetbrains.java.decompiler.struct.gen.generics;
+ 
+ import org.jetbrains.java.decompiler.code.CodeConstants;
++import org.jetbrains.java.decompiler.main.DecompilerContext;
++import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
+ import org.jetbrains.java.decompiler.struct.gen.VarType;
+ 
+ import java.util.ArrayList;
++import java.util.Collections;
+ import java.util.List;
+ 
+-public class GenericType {
++public class GenericType extends VarType {
+ 
+   public static final int WILDCARD_EXTENDS = 1;
+   public static final int WILDCARD_SUPER = 2;
+   public static final int WILDCARD_UNBOUND = 3;
+   public static final int WILDCARD_NO = 4;
+ 
+-  public final int type;
+-  public final int arrayDim;
+-  public final String value;
+-  public final int stackSize;
++  private final VarType parent;
++  private final List<VarType> arguments;
++  private final int wildcard;
+ 
+-  private final List<GenericType> enclosingClasses = new ArrayList<GenericType>();
+-  private final List<GenericType> arguments = new ArrayList<GenericType>();
+-  private final List<Integer> wildcards = new ArrayList<Integer>();
++  private GenericType(int type, int arrayDim, String value, VarType parent, List<VarType> arguments, int wildcard) {
++    super(type, arrayDim, value, getFamily(type, arrayDim), getStackSize(type, arrayDim), false);
++    this.parent = parent;
++    this.arguments = arguments == null ? Collections.<VarType>emptyList() : arguments;
++    this.wildcard = wildcard;
++  }
+ 
+-  public GenericType(int type, int arrayDim, String value) {
+-    this.type = type;
+-    this.arrayDim = arrayDim;
+-    this.value = value;
+-    this.stackSize = getStackSize(type, arrayDim);
++  public static VarType parse(String signature) {
++    return parse(signature, WILDCARD_NO);
+   }
+ 
+-  public GenericType(String signature) {
++  public static VarType parse(String signature, int wildcard) {
+     int type = 0;
+     int arrayDim = 0;
+     String value = null;
++    List<VarType> params = null;
++    VarType parent = null;
++
+ 
+     int index = 0;
+     loop:
+@@ -65,32 +70,53 @@ public class GenericType {
+         case 'L':
+           type = CodeConstants.TYPE_OBJECT;
+           signature = signature.substring(index + 1, signature.length() - 1);
++          String cl = getNextClassSignature(signature);
+ 
+-          while (true) {
+-            String cl = getNextClassSignature(signature);
+-
+-            String name = cl;
+-            String args = null;
+-
+-            int argStart = cl.indexOf("<");
++          if (cl.length() == signature.length()) {
++            int argStart = cl.indexOf('<');
+             if (argStart >= 0) {
+-              name = cl.substring(0, argStart);
+-              args = cl.substring(argStart + 1, cl.length() - 1);
+-            }
+-
+-            if (cl.length() < signature.length()) {
+-              signature = signature.substring(cl.length() + 1); // skip '.'
+-              GenericType type11 = new GenericType(CodeConstants.TYPE_OBJECT, 0, name);
+-              parseArgumentsList(args, type11);
+-              enclosingClasses.add(type11);
++              value = cl.substring(0, argStart);
++              params = parseArgumentsList(cl.substring(argStart + 1, cl.length() - 1));
+             }
+             else {
+-              value = name;
+-              parseArgumentsList(args, this);
+-              break;
++              value = cl;
++            }
++          }
++          else {
++            StringBuilder name_buff = new StringBuilder();
++            while (signature.length() > 0) {
++              String name = cl;
++              String args = null;
++
++              int argStart = cl.indexOf('<');
++              if (argStart >= 0) {
++                name = cl.substring(0, argStart);
++                args = cl.substring(argStart + 1, cl.length() - 1);
++              }
++
++              if (name_buff.length() > 0) {
++                name_buff.append('.');
++              }
++              name_buff.append(name);
++
++              value = name_buff.toString();
++              params = args == null ? null : parseArgumentsList(args);
++
++              if (cl.length() == signature.length()) {
++                break;
++              }
++              else {
++                if (parent == null && params == null) {
++                  parent = GenericType.parse("L" + value + ";");
++                }
++                else {
++                  parent = new GenericType(CodeConstants.TYPE_OBJECT, 0, value, parent, params, wildcard);
++                }
++
++                signature = signature.substring(cl.length() + 1);
++              }
+             }
+           }
+-
+           break loop;
+ 
+         default:
+@@ -101,10 +127,20 @@ public class GenericType {
+       index++;
+     }
+ 
+-    this.type = type;
+-    this.arrayDim = arrayDim;
+-    this.value = value;
+-    this.stackSize = getStackSize(type, arrayDim);
++    if (type == CodeConstants.TYPE_GENVAR) {
++      return new GenericType(type, arrayDim, value, null, null, wildcard);
++    }
++    else if (type == CodeConstants.TYPE_OBJECT) {
++      if (parent == null && params == null && wildcard == WILDCARD_NO) {
++        return new VarType(type, arrayDim, value);
++      }
++      else {
++        return new GenericType(type, arrayDim, value, parent, params, wildcard);
++      }
++    }
++    else {
++      return new VarType(type, arrayDim, value);
++    }
+   }
+ 
+   private static String getNextClassSignature(String value) {
+@@ -132,11 +168,13 @@ public class GenericType {
+     return value.substring(0, index);
+   }
+ 
+-  private static void parseArgumentsList(String value, GenericType type) {
++  private static List<VarType> parseArgumentsList(String value) {
+     if (value == null) {
+-      return;
++      return null;
+     }
+ 
++    List<VarType> args = new ArrayList<VarType>();
++
+     while (value.length() > 0) {
+       String typeStr = getNextType(value);
+       int len = typeStr.length();
+@@ -154,16 +192,16 @@ public class GenericType {
+           break;
+       }
+ 
+-      type.getWildcards().add(wildcard);
+-
+       if (wildcard != WILDCARD_NO) {
+         typeStr = typeStr.substring(1);
+       }
+ 
+-      type.getArguments().add(typeStr.length() == 0 ? null : new GenericType(typeStr));
++      args.add(typeStr.length() == 0 ? null : GenericType.parse(typeStr, wildcard));
+ 
+       value = value.substring(len);
+     }
++
++    return args;
+   }
+ 
+   public static String getNextType(String value) {
+@@ -212,37 +250,71 @@ public class GenericType {
+     return value.substring(0, index + 1);
+   }
+ 
+-  private static int getStackSize(int type, int arrayDim) {
+-      if (arrayDim > 0) {
+-        return 1;
+-      }
+-
+-      switch (type) {
+-        case CodeConstants.TYPE_DOUBLE:
+-        case CodeConstants.TYPE_LONG:
+-          return 2;
+-        case CodeConstants.TYPE_VOID:
+-        case CodeConstants.TYPE_GROUP2EMPTY:
+-          return 0;
+-        default:
+-          return 1;
+-      }
+-    }
+-
+   public GenericType decreaseArrayDim() {
+     assert arrayDim > 0 : this;
+-    return new GenericType(type, arrayDim - 1, value);
++    return new GenericType(type, arrayDim - 1, value, parent, arguments, wildcard);
+   }
+ 
+-  public List<GenericType> getArguments() {
++  public List<VarType> getArguments() {
+     return arguments;
+   }
+ 
+-  public List<GenericType> getEnclosingClasses() {
+-    return enclosingClasses;
++  @Override
++  public boolean isGeneric() {
++    return true;
++  }
++
++  public int getWildcard() {
++    return wildcard;
++  }
++
++  public String getCastName() {
++    String clsName = null;
++    if (parent == null) {
++      clsName = DecompilerContext.getImportCollector().getShortName(value.replace('/', '.'));
++    }
++    else if (parent.isGeneric()) {
++      clsName = ((GenericType)parent).getCastName() + "." + value.substring(value.lastIndexOf('.') + 1);
++    }
++    else {
++      clsName = DecompilerContext.getImportCollector().getShortName(parent.value.replace('/', '.')) + "." + value.substring(value.lastIndexOf('.') + 1);
++    }
++    return clsName + getTypeArguments();
+   }
+ 
+-  public List<Integer> getWildcards() {
+-    return wildcards;
++  private String getTypeArguments() {
++    StringBuilder buffer = new StringBuilder();
++    if (!arguments.isEmpty()) {
++      buffer.append('<');
++
++      for (int i = 0; i < arguments.size(); i++) {
++        if (i > 0) {
++          buffer.append(", ");
++        }
++
++        VarType par = arguments.get(i);
++        if (par == null) { // Wildcard unbound
++          buffer.append('?');
++        }
++        else if (par.isGeneric()) {
++          GenericType gen = (GenericType)par;
++          switch (gen.getWildcard()) {
++            case GenericType.WILDCARD_EXTENDS:
++              buffer.append("? extends ");
++              break;
++            case GenericType.WILDCARD_SUPER:
++              buffer.append("? super ");
++              break;
++          }
++          buffer.append(GenericMain.getGenericCastTypeName(gen));
++        }
++        else {
++          buffer.append(ExprProcessor.getCastTypeName(par));
++        }
++      }
++
++      buffer.append(">");
++    }
++    return buffer.toString();
+   }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0077-Fix-up-the-scouting-for-an-init-exprent-not-to-look-.patch b/FernFlower-Patches/0077-Fix-up-the-scouting-for-an-init-exprent-not-to-look-.patch
new file mode 100644
index 0000000..1f71998
--- /dev/null
+++ b/FernFlower-Patches/0077-Fix-up-the-scouting-for-an-init-exprent-not-to-look-.patch
@@ -0,0 +1,301 @@
+From 0fac2512ae858770015e5bc2f3d84448ac5031c5 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sun, 11 Oct 2015 12:51:22 -0400
+Subject: [PATCH 077/122] Fix up the scouting for an init exprent, not to look
+ inside loops for it. Fixes the broken loops. Added tests for it.
+
+---
+ .../main/rels/MethodProcessorRunnable.java    |  24 ++++++++-
+ .../modules/decompiler/MergeHelper.java       |   2 +
+ .../jetbrains/java/decompiler/LVTTest.java    |   4 +-
+ .../java/decompiler/LoopMergingTests.java     |  30 +++++++++++
+ testData/classes/pkg/TestLoopMerging.class    | Bin 0 -> 1524 bytes
+ testData/results/TestLoopMerging.dec          |  49 ++++++++++++++++++
+ testData/src/pkg/TestLoopMerging.java         |  47 +++++++++++++++++
+ 7 files changed, 153 insertions(+), 3 deletions(-)
+ create mode 100644 test/org/jetbrains/java/decompiler/LoopMergingTests.java
+ create mode 100644 testData/classes/pkg/TestLoopMerging.class
+ create mode 100644 testData/results/TestLoopMerging.dec
+ create mode 100644 testData/src/pkg/TestLoopMerging.java
+
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+index 62d5297..2e1668d 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+@@ -28,9 +28,13 @@ import org.jetbrains.java.decompiler.modules.decompiler.*;
+ import org.jetbrains.java.decompiler.modules.decompiler.deobfuscator.ExceptionDeobfuscator;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.IfExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatement;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.DummyExitStatement;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
+@@ -42,6 +46,10 @@ import java.util.BitSet;
+ 
+ public class MethodProcessorRunnable implements Runnable {
+ 
++  private static RootStatement currentRoot;
++
++  private static VarProcessor vp;
++
+   public final Object lock = new Object();
+ 
+   private final StructMethod method;
+@@ -126,7 +134,8 @@ public class MethodProcessorRunnable implements Runnable {
+     }
+ 
+     RootStatement root = DomHelper.parseGraph(graph, mt);
+-
++    MethodProcessorRunnable.currentRoot = root;
++    MethodProcessorRunnable.vp = varProc;
+     FinallyProcessor fProc = new FinallyProcessor(varProc);
+     while (fProc.iterateGraph(mt, root, graph)) {
+       root = DomHelper.parseGraph(graph, mt);
+@@ -232,6 +241,9 @@ public class MethodProcessorRunnable implements Runnable {
+     return finished;
+   }
+ 
++  public static void printMethod(String desc) {
++      printMethod(currentRoot, desc, vp);
++  }
+   public static void printMethod(Statement root, String name, VarProcessor varProc) {
+     System.out.println(name + " {");
+     if (root == null || root.getSequentialObjects() == null) {
+@@ -280,7 +292,13 @@ public class MethodProcessorRunnable implements Runnable {
+     int start = values.nextSetBit(0);
+     int end = values.length()-1;
+ 
+-    System.out.println(indent + "{" + statement.type + "}:" + statement.id + " (" + start + ", " + end + ") " + statement.getClass().getSimpleName());
++    System.out.print(indent + "{" + statement.type + "}:" + statement.id + " (" + start + ", " + end + ") " + statement.getClass().getSimpleName());
++    if (statement.type == Statement.TYPE_DO) {
++        System.out.print(" t:"+((DoStatement)statement).getLooptype());
++    } else if (statement.type == Statement.TYPE_BASICBLOCK) {
++        System.out.print(" i:"+((BasicBlockStatement)statement).getBlock().toStringOldIndices().replaceAll("\n", ";"));
++    }
++    System.out.println();
+     for (StatEdge edge : statement.getAllSuccessorEdges())
+       System.out.println(indent + " Dest: " + edge.getDestination());
+ 
+@@ -323,6 +341,8 @@ public class MethodProcessorRunnable implements Runnable {
+         sb.append("{").append(printExprent(" ",assignmentExprent.getLeft(),varProc)).append(" =").append(printExprent(" ",assignmentExprent.getRight(),varProc)).append("}");
+       } else if (exp instanceof IfExprent) {
+         sb.append(" ").append(exp.toJava(0, new BytecodeMappingTracer()));
++      } else if (exp instanceof FunctionExprent) {
++        sb.append(" ").append(exp.toJava(0, new BytecodeMappingTracer()));
+       }
+       return sb.toString();
+   }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+index 11c7c59..c240daa 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+@@ -358,6 +358,8 @@ public class MergeHelper {
+         }
+         else {
+           preData = current.getNeighbours(StatEdge.TYPE_REGULAR, Statement.DIRECTION_BACKWARD).get(0);
++          // we're not a basic block, so we can't dive inside for exprents
++          if (preData.type != Statement.TYPE_BASICBLOCK) break;
+           preData = getLastDirectData(preData);
+           if (preData != null && !preData.getExprents().isEmpty()) {
+             initDoExprent = preData.getExprents().get(preData.getExprents().size() - 1);
+diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
+index d4771bb..fea37bc 100644
+--- a/test/org/jetbrains/java/decompiler/LVTTest.java
++++ b/test/org/jetbrains/java/decompiler/LVTTest.java
+@@ -38,11 +38,12 @@ public class LVTTest extends SingleClassesTestBase {
+ //  @Test public void testMatch1() { doTest("pkg/TestPPMM"); }
+ //  @Test public void testMatchLM() { doTest("pkg/TestLexManosLVT"); }
+ //  @Test public void testMatch1() { doTest("pkg/TestLVT"); }
++//  @Test public void testMatch1() { doTest("pkg/TestLoopMerging"); }
+ //  @Test public void testMatch2() { doTest("pkg/TestLVTScoping"); }
+ //  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
+ //  @Test public void testMCGuiCmdBlock() { doTest("net/minecraft/client/gui/GuiCommandBlock"); }
+ 
+-  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
++//  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
+ 
+ //  @Test public void testMCGuiCmdBlock() { doTest("net/minecraft/client/gui/GuiCommandBlock"); }
+ 
+@@ -51,4 +52,5 @@ public class LVTTest extends SingleClassesTestBase {
+ //  @Test public void testMCAbstractTexture() { doTest("net/minecraft/client/multiplayer/ServerAddress"); }
+ //  @Test public void testMCAbstractResourcePack() { doTest("net/minecraft/client/resources/AbstractResourcePack"); }
+ //  @Test public void testMCGuiShareToLan() { doTest("net/minecraft/client/gui/GuiShareToLan"); }
++//  @Test public void testMCContainerPlayer() { doTest("net/minecraft/inventory/ContainerPlayer"); }
+ }
+diff --git a/test/org/jetbrains/java/decompiler/LoopMergingTests.java b/test/org/jetbrains/java/decompiler/LoopMergingTests.java
+new file mode 100644
+index 0000000..ddc15d1
+--- /dev/null
++++ b/test/org/jetbrains/java/decompiler/LoopMergingTests.java
+@@ -0,0 +1,30 @@
++package org.jetbrains.java.decompiler;
++
++import java.io.IOException;
++import java.util.HashMap;
++import java.util.Map;
++
++import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
++import org.junit.Test;
++
++public class LoopMergingTests extends SingleClassesTestBase {
++    @SuppressWarnings("serial")
++    @Override
++    protected Map<String, Object> getDecompilerOptions() {
++      return new HashMap<String, Object>() {{
++        put(IFernflowerPreferences.USE_DEBUG_LINE_NUMBERS, "1");
++      }};
++    }
++
++    @Override
++      public void setUp() throws IOException {
++          super.setUp();
++          fixture.cleanup = false;
++      }
++
++    @Test
++    public void testLoopMerging() {
++        doTest("pkg/TestLoopMerging");
++    }
++
++}
+diff --git a/testData/classes/pkg/TestLoopMerging.class b/testData/classes/pkg/TestLoopMerging.class
+new file mode 100644
+index 0000000000000000000000000000000000000000..453837353833482c6abb1718c2900e2149662c1f
+GIT binary patch
+literal 1524
+zcmbu7OHUI~7>3`|nRZGUZY?brLGHJrR1u8<g%}J8Nl_6(L{`%>;BaY48BAQbz!3g{
+zZoI`6CMG5l&_oF#ap(VV!PXyOea|pZi!3l?a?Y7^``-6F-}mG9*IfYJ=+@v72rbRe
+z#>UNMJDyH2jhLBPD>bV@6)2rE9viU*BQ+blo0v0`wtz6$hS(AUz8hA`vik*;_Kpbw
+zbuc|`2B1LK;YWc$N!&`AcUBe?W@g+-ESLhpcsgk;Oc)tU&fP`Teq=2RgySdJ=wn!$
+z&K!-Q0tl4r(BM-Cw*Wb<(Bb9udk?73PM~PaHj?ur#*!P}EAMv~pcZu+&gVU9?8&li
+zF6yX90|nA6lnKY3H(Tl0y^NKz$Lx%0EcOM^gcc3WWOc%}j#jh@XiM_OLW-8#hdL(I
+zTlLb8BY#D}WAKfhsbQj<VH?)a>2CH21jf=UnWQ;nNl4|#Qqd(P(ZE;=lje~z;o~0_
+zozcrb@@604YK)`c=#73s;V0)p5qqDrsGykt`oRH|pp-L#G6dPn%TFmGFAr>>I6Aq7
+zP%u2RjZkz85w_4wu=2&r?0#-Dk+)g({8e^ep8d!W3Z!hY<5?qoKYHmgCqLlISM!t)
+zsuCy*Q2N}FmA9^y(P-f|A{(gKM2(F78I96eM5nei6$!S})6Y|$$}@MK03{7Stp+)^
+z(oz?hT;~|)O3v(PzFB{$EJU*%hh{~DW@Sp&m7PGmbF$aFdrejP$*Ia)+jVozBi0mA
+z8&=<Cf92TyH`vp0$a`Vb$!Y{DDiB5`zX}#oHTns93N=VFF^e2mQRlq2-bvTG`&t#x
+z5Je|n8s_>1Tx9XdbhX2uB_^K+p%IvHdIYir>2cS<bVekj*byV!WwdvU(fdP2XGSxc
+zE0HtA`nR|~9A@u9esOoRW`IW0Z6cv&(rv+2R?&U5;UOtavqDx$@D1miJoAkNWlbGW
+r-aDeab42;|UzBe{KY?<V8Fj&nL-0hclXqp7evT!D8Ms764=(=!{dE@Z
+
+literal 0
+HcmV?d00001
+
+diff --git a/testData/results/TestLoopMerging.dec b/testData/results/TestLoopMerging.dec
+new file mode 100644
+index 0000000..9f91437
+--- /dev/null
++++ b/testData/results/TestLoopMerging.dec
+@@ -0,0 +1,49 @@
++package pkg;
++
++public class TestLoopMerging {
++   public float a;
++   public float b;
++   public float test() {      while(this.a - this.b < -180.0F) {
++         this.b -= 360.0F;      }      while(this.a - this.b >= 180.0F) {
++         this.b += 360.0F;      }
++      return this.a;   }
++
++   public float test2() {
++      for(this.a = 0.0F; this.a < 10.0F; ++this.a) {
++         System.out.println(this.a);      }
++
++      for(this.a = 0.0F; this.a < 10.0F; ++this.a) {
++         System.out.println(this.a);      }
++
++      return this.a;
++   }
++
++   public float test3() {
++      int[] as = new int[0];
++      for(int f : as) {
++         ++f;      }
++
++      while(this.a - this.b < -180.0F) {         this.b -= 360.0F;      }
++      while(this.a - this.b >= 180.0F) {         this.b += 360.0F;
++      }
++      for(this.a = 0.0F; this.a < 10.0F; ++this.a) {
++         System.out.println(this.a);
++      }
++      return this.a;   }
++   public float test4() {
++      int[] as = new int[0];
++      for(int f : as) {
++         ++f;         while(this.a - this.b < -180.0F) {
++            this.b -= 360.0F;         }         while(this.a - this.b >= 180.0F) {
++            this.b += 360.0F;         }
++         for(this.a = 0.0F; this.a < 10.0F; ++this.a) {
++            System.out.println(this.a);            while(this.a - this.b < -180.0F) {
++               this.b -= 360.0F;            }            while(this.a - this.b >= 180.0F) {
++               this.b += 360.0F;
++            }
++         }
++      }
++
++      return this.a;
++   }
++}
+diff --git a/testData/src/pkg/TestLoopMerging.java b/testData/src/pkg/TestLoopMerging.java
+new file mode 100644
+index 0000000..c257b10
+--- /dev/null
++++ b/testData/src/pkg/TestLoopMerging.java
+@@ -0,0 +1,47 @@
++package pkg;
++
++public class TestLoopMerging {
++    public float a;
++    public float b;
++    public float test() {
++      while(a - b < -180) b -= 360;
++      while(a - b >= 180) b += 360;
++      return a;
++    }
++    public float test2() {
++        for (a = 0; a < 10; a++) {
++            System.out.println(a);
++        }
++        for (a = 0; a < 10; a++) {
++            System.out.println(a);
++        }
++        return a;
++      }
++
++    public float test3() {
++        int[] as = new int[0];
++        for (int f: as) {
++            f++;
++        }
++        while(this.a - this.b < -180) this.b -= 360;
++        while(this.a - this.b >= 180) this.b += 360;
++        for (a = 0; a < 10; a++) {
++            System.out.println(a);
++        }
++        return this.a;
++    }
++    public float test4() {
++        int[] as = new int[0];
++        for (int f: as) {
++            f++;
++            while(this.a - this.b < -180) this.b -= 360;
++            while(this.a - this.b >= 180) this.b += 360;
++            for (a = 0; a < 10; a++) {
++                System.out.println(a);
++                while(this.a - this.b < -180) this.b -= 360;
++                while(this.a - this.b >= 180) this.b += 360;
++            }
++        }
++        return this.a;
++    }
++}
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0078-Fix-IncludeEntireClasspath-so-it-doesn-t-dump-out-ra.patch b/FernFlower-Patches/0078-Fix-IncludeEntireClasspath-so-it-doesn-t-dump-out-ra.patch
new file mode 100644
index 0000000..82bce85
--- /dev/null
+++ b/FernFlower-Patches/0078-Fix-IncludeEntireClasspath-so-it-doesn-t-dump-out-ra.patch
@@ -0,0 +1,41 @@
+From cbc3d52186da0f3de950b1fcd1628a31ef46c3d7 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Mon, 12 Oct 2015 14:44:39 -0400
+Subject: [PATCH 078/122] Fix IncludeEntireClasspath so it doesn't dump out
+ random other files from the classpath. Also, it doesn't try and save
+ undecompiled additional classes too.
+
+---
+ src/org/jetbrains/java/decompiler/main/Fernflower.java    | 3 ++-
+ src/org/jetbrains/java/decompiler/struct/ContextUnit.java | 1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
+index 65733ac..6afe975 100644
+--- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
++++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
+@@ -113,7 +113,8 @@ public class Fernflower implements IDecompiledData {
+         if (found.contains(file.getAbsolutePath()))
+           continue;
+ 
+-        if (file.exists()) {
++        // only add .class files from classpath
++        if (file.exists() && (file.getName().endsWith(".class") || file.getName().endsWith(".jar"))) {
+           DecompilerContext.getLogger().writeMessage("Adding File to context from classpath: " + file, Severity.INFO);
+           structContext.addSpace(file, false);
+           found.add(file.getAbsolutePath());
+diff --git a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
+index 850c3d8..e304396 100644
+--- a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
++++ b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
+@@ -110,6 +110,7 @@ public class ContextUnit {
+         // classes
+         for (int i = 0; i < classes.size(); i++) {
+           StructClass cl = classes.get(i);
++          if (!cl.isOwn()) continue;
+           String entryName = decompiledData.getClassEntryName(cl, classEntries.get(i));
+           if (entryName != null) {
+             String content = decompiledData.getClassContent(cl);
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0079-Fixed-generic-type-parsing-of-inner-classes-with-gen.patch b/FernFlower-Patches/0079-Fixed-generic-type-parsing-of-inner-classes-with-gen.patch
new file mode 100644
index 0000000..8dc8f57
--- /dev/null
+++ b/FernFlower-Patches/0079-Fixed-generic-type-parsing-of-inner-classes-with-gen.patch
@@ -0,0 +1,34 @@
+From 6b4dc8d90d43ad16cc14df1cdff86f18dd8d0f4f Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Wed, 14 Oct 2015 13:20:13 -0700
+Subject: [PATCH 079/122] Fixed generic type parsing of inner classes with
+ generic outers.
+
+---
+ .../java/decompiler/struct/gen/generics/GenericType.java       | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
+index c45d47f..aeb786a 100644
+--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
++++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
+@@ -95,7 +95,7 @@ public class GenericType extends VarType {
+               }
+ 
+               if (name_buff.length() > 0) {
+-                name_buff.append('.');
++                name_buff.append('$');
+               }
+               name_buff.append(name);
+ 
+@@ -115,6 +115,7 @@ public class GenericType extends VarType {
+ 
+                 signature = signature.substring(cl.length() + 1);
+               }
++              cl = getNextClassSignature(signature);
+             }
+           }
+           break loop;
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0080-Foo.-Bar-baz-generation.patch b/FernFlower-Patches/0080-Foo.-Bar-baz-generation.patch
new file mode 100644
index 0000000..9dbc357
--- /dev/null
+++ b/FernFlower-Patches/0080-Foo.-Bar-baz-generation.patch
@@ -0,0 +1,351 @@
+From 6bced8fc859f3f9486d5554604387b4c5a5d34e5 Mon Sep 17 00:00:00 2001
+From: RainWarrior <rainwarrior@fry.su>
+Date: Mon, 12 Oct 2015 09:21:36 +0300
+Subject: [PATCH 080/122] Foo.<Bar>baz() generation
+
+---
+ .../modules/decompiler/ExprProcessor.java     |   2 +-
+ .../modules/decompiler/exps/Exprent.java      |   8 ++
+ .../modules/decompiler/exps/FieldExprent.java |  15 ++
+ .../decompiler/exps/InvocationExprent.java    | 136 ++++++++++++++++--
+ .../modules/decompiler/exps/VarExprent.java   |  15 ++
+ .../java/decompiler/struct/gen/VarType.java   |   9 ++
+ 6 files changed, 173 insertions(+), 12 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+index 162d9cb..2760f20 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+@@ -914,7 +914,7 @@ public class ExprProcessor implements CodeConstants {
+ 
+     VarType rightType = exprent.getExprType();
+ 
+-    TextBuffer res = exprent.toJava(indent, tracer);
++    TextBuffer res = exprent.toJava(indent, tracer, leftType);
+ 
+     boolean cast =
+       castAlways ||
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+index ca9c1ed..9d41ec2 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+@@ -74,6 +74,10 @@ public abstract class Exprent implements IMatchable {
+     return VarType.VARTYPE_VOID;
+   }
+ 
++  public VarType getGenericExprType() {
++    return getExprType();
++  }
++
+   public int getExprentUse() {
+     return 0;
+   }
+@@ -126,6 +130,10 @@ public abstract class Exprent implements IMatchable {
+     throw new RuntimeException("not implemented");
+   }
+ 
++  public TextBuffer toJava(int indent, BytecodeMappingTracer tracer, VarType expectedType) {
++    return toJava(indent, tracer);
++  }
++
+   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
+     throw new RuntimeException("not implemented");
+   }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
+index fdc9cec..d4bd68e 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
+@@ -23,6 +23,8 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+ import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
+ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
++import org.jetbrains.java.decompiler.struct.StructClass;
++import org.jetbrains.java.decompiler.struct.StructField;
+ import org.jetbrains.java.decompiler.struct.consts.LinkConstant;
+ import org.jetbrains.java.decompiler.struct.gen.FieldDescriptor;
+ import org.jetbrains.java.decompiler.struct.gen.VarType;
+@@ -65,6 +67,19 @@ public class FieldExprent extends Exprent {
+     return descriptor.type;
+   }
+ 
++  @Override
++  public VarType getGenericExprType() {
++    StructClass cl = DecompilerContext.getStructContext().getClass(classname);
++    while(cl != null) {
++      StructField ft = cl.getField(name, descriptor.descriptorString);
++      if(ft != null && ft.getSignature() != null) {
++        return ft.getSignature().type;
++      }
++      cl = DecompilerContext.getStructContext().getClass((String)cl.superClass.value);
++    }
++    return getExprType();
++  }
++
+   @Override
+   public int getExprentUse() {
+     return instance == null ? Exprent.MULTIPLE_USES : instance.getExprentUse() & Exprent.MULTIPLE_USES;
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+index 9d16de2..81b6f4e 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+@@ -19,7 +19,9 @@ import java.util.ArrayList;
+ import java.util.BitSet;
+ import java.util.Collections;
+ import java.util.List;
++import java.util.Map;
+ import java.util.Map.Entry;
++import java.util.HashMap;
+ 
+ import org.jetbrains.java.decompiler.code.CodeConstants;
+ import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
+@@ -37,6 +39,7 @@ import org.jetbrains.java.decompiler.struct.StructMethod;
+ import org.jetbrains.java.decompiler.struct.consts.LinkConstant;
+ import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
+ import org.jetbrains.java.decompiler.struct.gen.VarType;
++import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
+ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
+ import org.jetbrains.java.decompiler.struct.match.MatchNode;
+ import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
+@@ -194,6 +197,11 @@ public class InvocationExprent extends Exprent {
+ 
+   @Override
+   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
++    return toJava(indent, tracer, null);
++  }
++
++  @Override
++  public TextBuffer toJava(int indent, BytecodeMappingTracer tracer, VarType expectedType) {
+     TextBuffer buf = new TextBuffer();
+ 
+     String super_qualifier = null;
+@@ -268,6 +276,11 @@ public class InvocationExprent extends Exprent {
+       }
+     }
+ 
++    List<StructMethod> matches = getMatchedDescriptors();
++    BitSet setAmbiguousParameters = getAmbiguousParameters(matches);
++    StructMethod desc = null;
++    if(matches.size() == 1) desc = matches.get(0);
++
+     switch (functype) {
+       case TYP_GENERAL:
+         if (VarExprent.VAR_NAMELESS_ENCLOSURE.equals(buf.toString())) {
+@@ -276,8 +289,66 @@ public class InvocationExprent extends Exprent {
+ 
+         if (buf.length() > 0) {
+           buf.append(".");
+-        }
+ 
++          boolean add = false;
++          List<VarType> toAdd = new ArrayList<VarType>();
++          if(expectedType != null && expectedType.type == CodeConstants.TYPE_OBJECT && descriptor.ret.type == CodeConstants.TYPE_OBJECT) {
++            //System.out.println("0: " + isStatic + " " + desc + " " + expectedType + " " + descriptor.ret + " " + expectedType.isGeneric());
++            if(desc == null) {
++              // more harn than gain
++              // Object -> String
++              /*if(descriptor.ret.value.equals("java/lang/Object") && !descriptor.ret.equals(expectedType)) {
++                add = true;
++                toAdd.add(expectedType);
++                System.out.println("1: " + expectedType + " " + descriptor.ret);
++              }*/
++              // List -> List<String>
++              if(expectedType.isGeneric()) {
++                List<VarType> leftArgs = ((GenericType)expectedType).getArguments();
++                //System.out.println("22: " + expectedType + " " + leftArgs.get(0));
++                if(leftArgs.size() == 1 && descriptor.ret.equals(expectedType) && leftArgs.get(0).type == CodeConstants.TYPE_OBJECT) {
++                  add = true;
++                  toAdd.add(leftArgs.get(0));
++                  System.out.println("2: " + expectedType.type + " " + expectedType + " " + leftArgs.get(0).type + " " + leftArgs.get(0));
++                }
++              }
++            }
++            if(desc != null && desc.getSignature() != null) {
++              VarType ret = desc.getSignature().ret;
++              // more harm than gain
++              // T -> String
++              /*if(desc.getSignature().fparameters.size() == 1 && desc.getSignature().fparameters.get(0).equals(ret.value)) {
++                add = true;
++                toAdd.add(expectedType);
++                System.out.println("3: " + expectedType + " " + ret + " " + desc.getSignature().fparameters.get(0));
++              }
++              // List<T> -> List<String>
++              if(expectedType.isGeneric() && ret.isGeneric()) {
++                List<VarType> leftArgs = ((GenericType)expectedType).getArguments();
++                List<VarType> rightArgs = ((GenericType)ret).getArguments();
++                List<String> fparams = desc.getSignature().fparameters;
++                // trivial case only for now
++                if(leftArgs.size() == 1 && rightArgs.size() == 1 && fparams.size() == 1 &&
++                   !leftArgs.get(0).equals(rightArgs.get(0)) && rightArgs.get(0).value.equals(fparams.get(0))) {
++                  add = true;
++                  toAdd.add(leftArgs.get(0));
++                  System.out.println("4: " + leftArgs.get(0) + " " + rightArgs.get(0) + " " + fparams.get(0));
++                }
++              }*/
++            }
++            if(add && toAdd.size() != 0) {
++              buf.append("<");
++              for(int i = 0; i < toAdd.size(); i++) {
++                buf.append(ExprProcessor.getCastTypeName(toAdd.get(i)));
++                if(i + 1 < toAdd.size()) {
++                  buf.append(", ");
++                }
++              }
++              buf.append(">");
++            }
++          }
++
++        }
+         buf.append(name);
+         if (invocationTyp == INVOKE_DYNAMIC) {
+           buf.append("<invokedynamic>");
+@@ -318,8 +389,17 @@ public class InvocationExprent extends Exprent {
+       }
+     }
+ 
+-    BitSet setAmbiguousParameters = getAmbiguousParameters();
+-
++    /*StructClass cl = DecompilerContext.getStructContext().getClass(classname);
++    Map<VarType, VarType> genArgs = new HashMap<VarType, VarType>();
++    if(cl != null && cl.getSignature() != null && instance != null && instance.getGenericExprType().isGeneric()) {
++      GenericType genType = (GenericType)instance.getGenericExprType();
++      for(int i = 0; i < cl.getSignature().fparameters.size(); i++) {
++        VarType from = GenericType.parse("T" + cl.getSignature().fparameters.get(i) + ";");
++        VarType to = genType.getArguments().get(i);
++        //System.out.println("(" + from.type + " " + from.value + " -> " + to.type + " " + to.value + ")");
++        genArgs.put(from, to);
++      }
++    }*/
+     boolean firstParameter = true;
+     int start = isEnum ? 2 : 0;
+     for (int i = start; i < lstParameters.size(); i++) {
+@@ -330,7 +410,33 @@ public class InvocationExprent extends Exprent {
+ 
+         TextBuffer buff = new TextBuffer();
+         boolean ambiguous = setAmbiguousParameters.get(i);
+-        ExprProcessor.getCastedExprent(lstParameters.get(i), descriptor.params[i], buff, indent, true, ambiguous, tracer);
++        VarType type = descriptor.params[i];
++        if(desc != null && desc.getSignature() != null && desc.getSignature().params.size() == lstParameters.size()) {
++          VarType newType = desc.getSignature().params.get(i);
++          boolean free = false;
++          for(String param : desc.getSignature().fparameters) {
++            if(param.equals(newType.value)) {
++              free = true;
++              break;
++            }
++          }
++          if(!free && desc.getSignature().params.get(i).type == CodeConstants.TYPE_OBJECT) {
++            type = desc.getSignature().params.get(i);
++          }
++        }
++        /*if(genArgs.containsKey(type)) {
++          type = genArgs.get(type);
++        }
++        if(desc != null && desc.getSignature() != null) {
++          for(String ps: desc.getSignature().fparameters) {
++            VarType param = GenericType.parse("T" + ps + ";");
++            if(param.equals(type)) { // found free argument, need to infer it from the argument
++              type = lstParameters.get(i).getExprType();
++              break;
++            }
++          }
++        }*/
++        ExprProcessor.getCastedExprent(lstParameters.get(i), type, buff, indent, true, ambiguous, tracer);
+         buf.append(buff);
+ 
+         firstParameter = false;
+@@ -342,12 +448,12 @@ public class InvocationExprent extends Exprent {
+     return buf;
+   }
+ 
+-  private BitSet getAmbiguousParameters() {
++  private List<StructMethod> getMatchedDescriptors() {
++    List<StructMethod> matches = new ArrayList<StructMethod>();
++
+     StructClass cl = DecompilerContext.getStructContext().getClass(classname);
+-    if (cl == null) return EMPTY_BIT_SET;
++    if (cl == null) return matches;
+ 
+-    // check number of matches
+-    List<MethodDescriptor> matches = new ArrayList<MethodDescriptor>();
+     nextMethod:
+     for (StructMethod mt : cl.getMethods()) {
+       if (name.equals(mt.getName())) {
+@@ -358,10 +464,17 @@ public class InvocationExprent extends Exprent {
+               continue nextMethod;
+             }
+           }
+-          matches.add(md);
+-        }
++          matches.add(mt);
++       }
+       }
+     }
++    return matches;
++  }
++
++  private BitSet getAmbiguousParameters(List<StructMethod> matches) {
++    StructClass cl = DecompilerContext.getStructContext().getClass(classname);
++    if (cl == null) return EMPTY_BIT_SET;
++
+     if (matches.size() == 1) return EMPTY_BIT_SET;
+ 
+     // check if a call is unambiguous
+@@ -384,7 +497,8 @@ public class InvocationExprent extends Exprent {
+     BitSet ambiguous = new BitSet(descriptor.params.length);
+     for (int i = 0; i < descriptor.params.length; i++) {
+       VarType paramType = descriptor.params[i];
+-      for (MethodDescriptor md : matches) {
++      for (StructMethod mtt : matches) {
++        MethodDescriptor md = MethodDescriptor.parseDescriptor(mtt.getDescriptor());
+         if (!paramType.equals(md.params[i])) {
+           ambiguous.set(i);
+           break;
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+index 4784e03..3058e77 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+@@ -65,6 +65,21 @@ public class VarExprent extends Exprent {
+     return getVarType();
+   }
+ 
++  @Override
++  public VarType getGenericExprType() {
++    if (lvt != null && lvt.getSig() != null) {
++      // TODO; figure out why it's crashing, ugly fix for now
++      try {
++        return GenericType.parse(lvt.getSig());
++      } catch (StringIndexOutOfBoundsException ex) {
++      }
++    }
++    else if (lvt != null) {
++      return lvt.getVarType();
++    }
++    return getVarType();
++  }
++
+   @Override
+   public int getExprentUse() {
+     return Exprent.MULTIPLE_USES | Exprent.SIDE_EFFECTS_FREE;
+diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
+index 1b0df9d..af06b8e 100644
+--- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
++++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
+@@ -269,6 +269,15 @@ public class VarType {  // TODO: optimize switch
+     return res;
+   }
+ 
++  @Override
++  public int hashCode() {
++    int result = 1;
++    result = 37 * result + type;
++    result = 37 * result + arrayDim;
++    result = 37 * result + value == null ? 0 : value.hashCode();
++    return result;
++  }
++
+   @Override
+   public boolean equals(Object o) {
+     if (o == this) {
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0081-concentrated-changes-to-Exprent.getInferredExprType.patch b/FernFlower-Patches/0081-concentrated-changes-to-Exprent.getInferredExprType.patch
new file mode 100644
index 0000000..5c216ca
--- /dev/null
+++ b/FernFlower-Patches/0081-concentrated-changes-to-Exprent.getInferredExprType.patch
@@ -0,0 +1,448 @@
+From b84e34a3999001b3da2bed7766c1ed2a77bcd100 Mon Sep 17 00:00:00 2001
+From: RainWarrior <rainwarrior@fry.su>
+Date: Wed, 14 Oct 2015 05:45:41 +0300
+Subject: [PATCH 081/122] concentrated changes to Exprent.getInferredExprType
+
+---
+ .../java/decompiler/main/ClassWriter.java     |   1 +
+ .../modules/decompiler/ExprProcessor.java     |   4 +-
+ .../decompiler/exps/AssignmentExprent.java    |   8 +-
+ .../modules/decompiler/exps/Exprent.java      |   6 +-
+ .../modules/decompiler/exps/FieldExprent.java |   5 +-
+ .../decompiler/exps/InvocationExprent.java    | 189 ++++++++++--------
+ .../modules/decompiler/exps/VarExprent.java   |   2 +-
+ .../struct/gen/generics/GenericType.java      |  16 ++
+ .../MinecraftDecompilationTest.java           |   1 +
+ 9 files changed, 139 insertions(+), 93 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+index 4ec7fe9..7c8276c 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+@@ -435,6 +435,7 @@ public class ClassWriter {
+       else {
+         buffer.append(" = ");
+         // FIXME: special case field initializer. Can map to more than one method (constructor) and bytecode intruction.
++        initializer.getInferredExprType(descriptor == null? fieldType : descriptor.type);
+         buffer.append(initializer.toJava(indent, tracer));
+       }
+     }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+index 2760f20..3be3b6f 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+@@ -912,9 +912,9 @@ public class ExprProcessor implements CodeConstants {
+                                          boolean castAlways,
+                                          BytecodeMappingTracer tracer) {
+ 
+-    VarType rightType = exprent.getExprType();
++    VarType rightType = exprent.getInferredExprType(leftType);
+ 
+-    TextBuffer res = exprent.toJava(indent, tracer, leftType);
++    TextBuffer res = exprent.toJava(indent, tracer);
+ 
+     boolean cast =
+       castAlways ||
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
+index efc64b9..8276abd 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
+@@ -65,6 +65,12 @@ public class AssignmentExprent extends Exprent {
+     return left.getExprType();
+   }
+ 
++  @Override
++  public VarType getInferredExprType(VarType upperBound) {
++    //System.out.println("infer: " + upperBound + " = " + getExprType());
++    return getExprType();
++  }
++
+   @Override
+   public CheckTypesResult checkExprTypeBounds() {
+     CheckTypesResult result = new CheckTypesResult();
+@@ -106,7 +112,7 @@ public class AssignmentExprent extends Exprent {
+   @Override
+   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
+     VarType leftType = left.getExprType();
+-    VarType rightType = right.getExprType();
++    VarType rightType = right.getInferredExprType(leftType);
+ 
+     boolean fieldInClassInit = false, hiddenField = false;
+     if (left.type == Exprent.EXPRENT_FIELD) { // first assignment to a final field. Field name without "this" in front of it
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+index 9d41ec2..bda80a0 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+@@ -74,7 +74,7 @@ public abstract class Exprent implements IMatchable {
+     return VarType.VARTYPE_VOID;
+   }
+ 
+-  public VarType getGenericExprType() {
++  public VarType getInferredExprType(VarType upperBound) {
+     return getExprType();
+   }
+ 
+@@ -130,10 +130,6 @@ public abstract class Exprent implements IMatchable {
+     throw new RuntimeException("not implemented");
+   }
+ 
+-  public TextBuffer toJava(int indent, BytecodeMappingTracer tracer, VarType expectedType) {
+-    return toJava(indent, tracer);
+-  }
+-
+   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
+     throw new RuntimeException("not implemented");
+   }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
+index d4bd68e..be95dc1 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
+@@ -68,14 +68,15 @@ public class FieldExprent extends Exprent {
+   }
+ 
+   @Override
+-  public VarType getGenericExprType() {
++  public VarType getInferredExprType(VarType upperBound) {
+     StructClass cl = DecompilerContext.getStructContext().getClass(classname);
+     while(cl != null) {
+       StructField ft = cl.getField(name, descriptor.descriptorString);
+       if(ft != null && ft.getSignature() != null) {
+         return ft.getSignature().type;
+       }
+-      cl = DecompilerContext.getStructContext().getClass((String)cl.superClass.value);
++      if(cl.superClass == null) cl = null;
++      else cl = DecompilerContext.getStructContext().getClass((String)cl.superClass.value);
+     }
+     return getExprType();
+   }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+index 81b6f4e..ca5e077 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+@@ -72,6 +72,8 @@ public class InvocationExprent extends Exprent {
+   private int invocationTyp = INVOKE_VIRTUAL;
+   private List<Exprent> lstParameters = new ArrayList<Exprent>();
+ 
++  private List<VarType> genericArgs = new ArrayList<VarType>();
++
+   public InvocationExprent() {
+     super(EXPRENT_INVOCATION);
+   }
+@@ -163,6 +165,65 @@ public class InvocationExprent extends Exprent {
+     return descriptor.ret;
+   }
+ 
++  @Override
++  public VarType getInferredExprType(VarType upperBound) {
++    //System.out.println("infer: " + instance + " " + classname + "." + name + " " + getExprType() + " " + upperBound);
++    List<StructMethod> matches = getMatchedDescriptors();
++    StructMethod desc = null;
++    if(matches.size() == 1) desc = matches.get(0);
++
++    VarType type = getExprType();
++
++    List<VarType> toAdd = new ArrayList<VarType>();
++    if(upperBound != null/* && upperBound.type == CodeConstants.TYPE_OBJECT && descriptor.ret.type == CodeConstants.TYPE_OBJECT*/) {
++      genericArgs.clear();
++      //System.out.println("0: " + isStatic + " " + desc + " " + upperBound + " " + descriptor.ret + " " + upperBound.isGeneric());
++      /*if(desc == null) {
++        // more harn than gain
++        // Object -> String
++        if(descriptor.ret.value.equals("java/lang/Object") && !descriptor.ret.equals(upperBound)) {
++          genericArgs.add(upperBound);
++          System.out.println("1: " + upperBound + " " + descriptor.ret);
++        }
++        // List -> List<String>
++        if(upperBound.isGeneric()) {
++          List<VarType> leftArgs = ((GenericType)upperBound).getArguments();
++          //System.out.println("22: " + upperBound + " " + leftArgs.get(0));
++          if(leftArgs.size() == 1 && descriptor.ret.equals(upperBound) && leftArgs.get(0).type == CodeConstants.TYPE_OBJECT) {
++            genericArgs.add(leftArgs.get(0));
++            System.out.println("2: " + upperBound.type + " " + upperBound + " " + leftArgs.get(0).type + " " + leftArgs.get(0));
++          }
++        }
++      }*/
++      if(desc != null && desc.getSignature() != null) {
++        VarType ret = desc.getSignature().ret;
++        // more harm than gain
++        // T -> String
++        /*if(desc.getSignature().fparameters.size() == 1 && desc.getSignature().fparameters.get(0).equals(ret.value)) {
++          genericArgs.add(upperBound);
++          System.out.println("3: " + upperBound + " " + ret + " " + desc.getSignature().fparameters.get(0));
++        }*/
++        // List<T> -> List<String>
++        if(upperBound.isGeneric() && ret.isGeneric()) {
++          List<VarType> leftArgs = ((GenericType)upperBound).getArguments();
++          List<VarType> rightArgs = ((GenericType)ret).getArguments();
++          List<String> fparams = desc.getSignature().fparameters;
++          // trivial case only for now
++          if(leftArgs.size() == 1 && rightArgs.size() == 1 && fparams.size() == 1) {
++            VarType l = leftArgs.get(0);
++            VarType r = rightArgs.get(0);
++            if(l != null /*&& l.type == CodeConstants.TYPE_OBJECT && !l.equals(r)*/ && r.value.equals(fparams.get(0))) {
++              genericArgs.add(leftArgs.get(0));
++              //type = upperBound;
++              System.out.println("4: " + leftArgs.get(0) + " " + rightArgs.get(0) + " " + fparams.get(0));
++            }
++          }
++        }
++      }
++    }
++
++    return type;
++  }
+   @Override
+   public CheckTypesResult checkExprTypeBounds() {
+     CheckTypesResult result = new CheckTypesResult();
+@@ -197,11 +258,6 @@ public class InvocationExprent extends Exprent {
+ 
+   @Override
+   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
+-    return toJava(indent, tracer, null);
+-  }
+-
+-  @Override
+-  public TextBuffer toJava(int indent, BytecodeMappingTracer tracer, VarType expectedType) {
+     TextBuffer buf = new TextBuffer();
+ 
+     String super_qualifier = null;
+@@ -276,11 +332,6 @@ public class InvocationExprent extends Exprent {
+       }
+     }
+ 
+-    List<StructMethod> matches = getMatchedDescriptors();
+-    BitSet setAmbiguousParameters = getAmbiguousParameters(matches);
+-    StructMethod desc = null;
+-    if(matches.size() == 1) desc = matches.get(0);
+-
+     switch (functype) {
+       case TYP_GENERAL:
+         if (VarExprent.VAR_NAMELESS_ENCLOSURE.equals(buf.toString())) {
+@@ -290,64 +341,16 @@ public class InvocationExprent extends Exprent {
+         if (buf.length() > 0) {
+           buf.append(".");
+ 
+-          boolean add = false;
+-          List<VarType> toAdd = new ArrayList<VarType>();
+-          if(expectedType != null && expectedType.type == CodeConstants.TYPE_OBJECT && descriptor.ret.type == CodeConstants.TYPE_OBJECT) {
+-            //System.out.println("0: " + isStatic + " " + desc + " " + expectedType + " " + descriptor.ret + " " + expectedType.isGeneric());
+-            if(desc == null) {
+-              // more harn than gain
+-              // Object -> String
+-              /*if(descriptor.ret.value.equals("java/lang/Object") && !descriptor.ret.equals(expectedType)) {
+-                add = true;
+-                toAdd.add(expectedType);
+-                System.out.println("1: " + expectedType + " " + descriptor.ret);
+-              }*/
+-              // List -> List<String>
+-              if(expectedType.isGeneric()) {
+-                List<VarType> leftArgs = ((GenericType)expectedType).getArguments();
+-                //System.out.println("22: " + expectedType + " " + leftArgs.get(0));
+-                if(leftArgs.size() == 1 && descriptor.ret.equals(expectedType) && leftArgs.get(0).type == CodeConstants.TYPE_OBJECT) {
+-                  add = true;
+-                  toAdd.add(leftArgs.get(0));
+-                  System.out.println("2: " + expectedType.type + " " + expectedType + " " + leftArgs.get(0).type + " " + leftArgs.get(0));
+-                }
+-              }
+-            }
+-            if(desc != null && desc.getSignature() != null) {
+-              VarType ret = desc.getSignature().ret;
+-              // more harm than gain
+-              // T -> String
+-              /*if(desc.getSignature().fparameters.size() == 1 && desc.getSignature().fparameters.get(0).equals(ret.value)) {
+-                add = true;
+-                toAdd.add(expectedType);
+-                System.out.println("3: " + expectedType + " " + ret + " " + desc.getSignature().fparameters.get(0));
++          if(genericArgs.size() != 0) {
++            buf.append("<");
++            for(int i = 0; i < genericArgs.size(); i++) {
++              buf.append(ExprProcessor.getCastTypeName(genericArgs.get(i)));
++              if(i + 1 < genericArgs.size()) {
++                buf.append(", ");
+               }
+-              // List<T> -> List<String>
+-              if(expectedType.isGeneric() && ret.isGeneric()) {
+-                List<VarType> leftArgs = ((GenericType)expectedType).getArguments();
+-                List<VarType> rightArgs = ((GenericType)ret).getArguments();
+-                List<String> fparams = desc.getSignature().fparameters;
+-                // trivial case only for now
+-                if(leftArgs.size() == 1 && rightArgs.size() == 1 && fparams.size() == 1 &&
+-                   !leftArgs.get(0).equals(rightArgs.get(0)) && rightArgs.get(0).value.equals(fparams.get(0))) {
+-                  add = true;
+-                  toAdd.add(leftArgs.get(0));
+-                  System.out.println("4: " + leftArgs.get(0) + " " + rightArgs.get(0) + " " + fparams.get(0));
+-                }
+-              }*/
+-            }
+-            if(add && toAdd.size() != 0) {
+-              buf.append("<");
+-              for(int i = 0; i < toAdd.size(); i++) {
+-                buf.append(ExprProcessor.getCastTypeName(toAdd.get(i)));
+-                if(i + 1 < toAdd.size()) {
+-                  buf.append(", ");
+-                }
+-              }
+-              buf.append(">");
+             }
++            buf.append(">");
+           }
+-
+         }
+         buf.append(name);
+         if (invocationTyp == INVOKE_DYNAMIC) {
+@@ -389,17 +392,31 @@ public class InvocationExprent extends Exprent {
+       }
+     }
+ 
+-    /*StructClass cl = DecompilerContext.getStructContext().getClass(classname);
++    List<StructMethod> matches = getMatchedDescriptors();
++    BitSet setAmbiguousParameters = getAmbiguousParameters(matches);
++    StructMethod desc = null;
++    if(matches.size() == 1) desc = matches.get(0);
++
++    StructClass cl = DecompilerContext.getStructContext().getClass(classname);
+     Map<VarType, VarType> genArgs = new HashMap<VarType, VarType>();
+-    if(cl != null && cl.getSignature() != null && instance != null && instance.getGenericExprType().isGeneric()) {
+-      GenericType genType = (GenericType)instance.getGenericExprType();
+-      for(int i = 0; i < cl.getSignature().fparameters.size(); i++) {
+-        VarType from = GenericType.parse("T" + cl.getSignature().fparameters.get(i) + ";");
+-        VarType to = genType.getArguments().get(i);
+-        //System.out.println("(" + from.type + " " + from.value + " -> " + to.type + " " + to.value + ")");
+-        genArgs.put(from, to);
++
++    if(cl != null && cl.getSignature() != null && instance != null && instance.getInferredExprType(null).isGeneric()) {
++      GenericType genType = (GenericType)instance.getInferredExprType(null);
++      if(genType.getArguments().size() == cl.getSignature().fparameters.size()) {
++		/*System.out.println("remap: " + classname + "." + name);
++		if(instance instanceof FieldExprent) {
++			System.out.println(((FieldExprent)instance).getClassname() + "." + ((FieldExprent)instance).getName());
++		}*/
++        for(int i = 0; i < cl.getSignature().fparameters.size(); i++) {
++          VarType from = GenericType.parse("T" + cl.getSignature().fparameters.get(i) + ";");
++          VarType to = genType.getArguments().get(i);
++          //System.out.println("(" + from.type + " " + from.value + " -> " + to.type + " " + to.value + ")");
++          if(from != null && to != null && to.type == CodeConstants.TYPE_OBJECT) {
++            genArgs.put(from, to);
++          }
++        }
+       }
+-    }*/
++    }
+     boolean firstParameter = true;
+     int start = isEnum ? 2 : 0;
+     for (int i = start; i < lstParameters.size(); i++) {
+@@ -411,8 +428,9 @@ public class InvocationExprent extends Exprent {
+         TextBuffer buff = new TextBuffer();
+         boolean ambiguous = setAmbiguousParameters.get(i);
+         VarType type = descriptor.params[i];
+-        if(desc != null && desc.getSignature() != null && desc.getSignature().params.size() == lstParameters.size()) {
+-          VarType newType = desc.getSignature().params.get(i);
++		VarType newType = null;
++        /*if(desc != null && desc.getSignature() != null && desc.getSignature().params.size() == lstParameters.size()) {
++          newType = desc.getSignature().params.get(i);
+           boolean free = false;
+           for(String param : desc.getSignature().fparameters) {
+             if(param.equals(newType.value)) {
+@@ -420,14 +438,14 @@ public class InvocationExprent extends Exprent {
+               break;
+             }
+           }
+-          if(!free && desc.getSignature().params.get(i).type == CodeConstants.TYPE_OBJECT) {
+-            type = desc.getSignature().params.get(i);
++          if(!free) {
++            type = newType;
+           }
+-        }
+-        /*if(genArgs.containsKey(type)) {
++        }*/
++        if(genArgs.containsKey(type)) {
+           type = genArgs.get(type);
+         }
+-        if(desc != null && desc.getSignature() != null) {
++        /*if(desc != null && desc.getSignature() != null) {
+           for(String ps: desc.getSignature().fparameters) {
+             VarType param = GenericType.parse("T" + ps + ";");
+             if(param.equals(type)) { // found free argument, need to infer it from the argument
+@@ -436,6 +454,11 @@ public class InvocationExprent extends Exprent {
+             }
+           }
+         }*/
++		VarType exprType = lstParameters.get(i).getInferredExprType(type);
++		if(exprType != null && exprType.type != CodeConstants.TYPE_NULL && type != null && type.type == CodeConstants.TYPE_GENVAR) {
++		  type = exprType;
++		}
++		//System.out.println("param: " + i + " " + newType + " " + exprType + " " + type + " " + lstParameters.get(i));
+         ExprProcessor.getCastedExprent(lstParameters.get(i), type, buff, indent, true, ambiguous, tracer);
+         buf.append(buff);
+ 
+@@ -452,6 +475,7 @@ public class InvocationExprent extends Exprent {
+     List<StructMethod> matches = new ArrayList<StructMethod>();
+ 
+     StructClass cl = DecompilerContext.getStructContext().getClass(classname);
++    //System.out.println("m: " + classname + "." + name + " " + cl);
+     if (cl == null) return matches;
+ 
+     nextMethod:
+@@ -485,7 +509,8 @@ public class InvocationExprent extends Exprent {
+         boolean exact = true;
+         for (int i = 0; i < md.params.length; i++) {
+           if (!md.params[i].equals(lstParameters.get(i).getExprType())) {
+-            exact = false;
++            // FIXME
++            //exact = false;
+             break;
+           }
+         }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+index 3058e77..0d41725 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+@@ -66,7 +66,7 @@ public class VarExprent extends Exprent {
+   }
+ 
+   @Override
+-  public VarType getGenericExprType() {
++  public VarType getInferredExprType(VarType upperBound) {
+     if (lvt != null && lvt.getSig() != null) {
+       // TODO; figure out why it's crashing, ugly fix for now
+       try {
+diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
+index aeb786a..da04e00 100644
+--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
++++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
+@@ -318,4 +318,20 @@ public class GenericType extends VarType {
+     }
+     return buffer.toString();
+   }
++
++  @Override
++  public String toString() {
++    StringBuilder buf = new StringBuilder();
++	switch(getWildcard()) {
++      case GenericType.WILDCARD_EXTENDS:
++        buf.append("? extends ");
++        break;
++      case GenericType.WILDCARD_SUPER:
++        buf.append("? super ");
++      break;
++	}
++	buf.append(super.toString());
++    buf.append(getTypeArguments());
++	return buf.toString();
++  }
+ }
+diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
+index c7e781e..2afd2e6 100644
+--- a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
++++ b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
+@@ -47,6 +47,7 @@ public class MinecraftDecompilationTest {
+         put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES,"1");
+         put(IFernflowerPreferences.ASCII_STRING_CHARACTERS,"1");
+         put(IFernflowerPreferences.REMOVE_SYNTHETIC,"0");
++        put(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH, "1");
+     }};
+     fixture.setUp(mcFFOptions);
+     if (!new File(fixture.getTestDataDir(), MC_JAR).exists()) {
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0082-passing-information-from-InvocationExprent-s-inferre.patch b/FernFlower-Patches/0082-passing-information-from-InvocationExprent-s-inferre.patch
new file mode 100644
index 0000000..ac8e70c
--- /dev/null
+++ b/FernFlower-Patches/0082-passing-information-from-InvocationExprent-s-inferre.patch
@@ -0,0 +1,115 @@
+From 155a27086d2f5178ce4e981e208d69ce8e9a421d Mon Sep 17 00:00:00 2001
+From: RainWarrior <rainwarrior@fry.su>
+Date: Wed, 14 Oct 2015 09:26:05 +0300
+Subject: [PATCH 082/122] passing information from InvocationExprent's inferred
+ type arguments to the parameters
+
+---
+ .../decompiler/exps/InvocationExprent.java    | 42 +++++++++++++++++--
+ .../struct/gen/generics/GenericType.java      |  6 ++-
+ 2 files changed, 43 insertions(+), 5 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+index ca5e077..884a2d7 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+@@ -429,7 +429,7 @@ public class InvocationExprent extends Exprent {
+         boolean ambiguous = setAmbiguousParameters.get(i);
+         VarType type = descriptor.params[i];
+ 		VarType newType = null;
+-        /*if(desc != null && desc.getSignature() != null && desc.getSignature().params.size() == lstParameters.size()) {
++        if(desc != null && desc.getSignature() != null && genericArgs.size() != 0 && desc.getSignature().params.size() == lstParameters.size()) {
+           newType = desc.getSignature().params.get(i);
+           boolean free = false;
+           for(String param : desc.getSignature().fparameters) {
+@@ -441,10 +441,44 @@ public class InvocationExprent extends Exprent {
+           if(!free) {
+             type = newType;
+           }
+-        }*/
++        }
+         if(genArgs.containsKey(type)) {
+           type = genArgs.get(type);
+         }
++		else if(desc != null && desc.getSignature() != null && genericArgs.size() != 0) {
++			Map<VarType, VarType> genMap = new HashMap<VarType, VarType>();
++			for(int j = 0; j < genericArgs.size(); j++) {
++				VarType from = GenericType.parse("T" + desc.getSignature().fparameters.get(j) + ";");
++				VarType to = genericArgs.get(j);
++				genMap.put(from, to);
++				//System.out.println("map: (" + from + " -> " + to + ")");
++			}
++			if(genMap.containsKey(type)) {
++				type = genMap.get(type);
++			}
++			// this only checks 1 level deep right now
++			else if(type.isGeneric()) {
++				GenericType genType = (GenericType)type;
++				List<VarType> toArgs = new ArrayList<VarType>();
++				boolean changed = false;
++				VarType parent = genType.getParent();
++				if(genMap.containsKey(parent)) {
++					parent = genMap.get(parent);
++					changed = true;
++				}
++				for(VarType arg : genType.getArguments()) {
++					if(genMap.containsKey(arg)) {
++						toArgs.add(genMap.get(arg));
++						changed = true;
++					} else {
++						toArgs.add(arg);
++					}
++				}
++				if(changed) {
++					type = new GenericType(type.type, type.arrayDim, type.value, parent, toArgs, genType.getWildcard());
++				}
++			}
++		}
+         /*if(desc != null && desc.getSignature() != null) {
+           for(String ps: desc.getSignature().fparameters) {
+             VarType param = GenericType.parse("T" + ps + ";");
+@@ -509,8 +543,7 @@ public class InvocationExprent extends Exprent {
+         boolean exact = true;
+         for (int i = 0; i < md.params.length; i++) {
+           if (!md.params[i].equals(lstParameters.get(i).getExprType())) {
+-            // FIXME
+-            //exact = false;
++            exact = false;
+             break;
+           }
+         }
+@@ -523,6 +556,7 @@ public class InvocationExprent extends Exprent {
+     for (int i = 0; i < descriptor.params.length; i++) {
+       VarType paramType = descriptor.params[i];
+       for (StructMethod mtt : matches) {
++        if(mtt.getSignature() != null && mtt.getSignature().params.get(i).isGeneric()) break;
+         MethodDescriptor md = MethodDescriptor.parseDescriptor(mtt.getDescriptor());
+         if (!paramType.equals(md.params[i])) {
+           ambiguous.set(i);
+diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
+index da04e00..9319bf7 100644
+--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
++++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
+@@ -35,7 +35,7 @@ public class GenericType extends VarType {
+   private final List<VarType> arguments;
+   private final int wildcard;
+ 
+-  private GenericType(int type, int arrayDim, String value, VarType parent, List<VarType> arguments, int wildcard) {
++  public GenericType(int type, int arrayDim, String value, VarType parent, List<VarType> arguments, int wildcard) {
+     super(type, arrayDim, value, getFamily(type, arrayDim), getStackSize(type, arrayDim), false);
+     this.parent = parent;
+     this.arguments = arguments == null ? Collections.<VarType>emptyList() : arguments;
+@@ -256,6 +256,10 @@ public class GenericType extends VarType {
+     return new GenericType(type, arrayDim - 1, value, parent, arguments, wildcard);
+   }
+ 
++  public VarType getParent() {
++    return parent;
++  }
++
+   public List<VarType> getArguments() {
+     return arguments;
+   }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0083-pushed-remapping-to-the-VarType-added-type-inference.patch b/FernFlower-Patches/0083-pushed-remapping-to-the-VarType-added-type-inference.patch
new file mode 100644
index 0000000..03d1946
--- /dev/null
+++ b/FernFlower-Patches/0083-pushed-remapping-to-the-VarType-added-type-inference.patch
@@ -0,0 +1,294 @@
+From f8df185c9f5ecc896aac6f264196e1d842796b87 Mon Sep 17 00:00:00 2001
+From: RainWarrior <rainwarrior@fry.su>
+Date: Wed, 14 Oct 2015 14:18:10 +0300
+Subject: [PATCH 083/122] pushed remapping to the VarType, added type inference
+ to a couple more places
+
+---
+ .../modules/decompiler/ExprProcessor.java     |   1 +
+ .../decompiler/exps/AssignmentExprent.java    |   2 +-
+ .../decompiler/exps/InvocationExprent.java    | 114 ++++++++++--------
+ .../java/decompiler/struct/gen/VarType.java   |   9 ++
+ .../struct/gen/generics/GenericType.java      |  40 +++++-
+ 5 files changed, 108 insertions(+), 58 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+index 3be3b6f..60832d3 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+@@ -853,6 +853,7 @@ public class ExprProcessor implements CodeConstants {
+     lst = Exprent.sortIndexed(lst);
+ 
+     for (Exprent expr : lst) {
++      expr.getInferredExprType(null);
+       TextBuffer content = expr.toJava(indent, tracer);
+       if (content.length() > 0) {
+         if (expr.type != Exprent.EXPRENT_VAR || !((VarExprent)expr).isClassDef()) {
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
+index 8276abd..68f5830 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
+@@ -112,7 +112,7 @@ public class AssignmentExprent extends Exprent {
+   @Override
+   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
+     VarType leftType = left.getExprType();
+-    VarType rightType = right.getInferredExprType(leftType);
++    VarType rightType = right.getInferredExprType(left.getInferredExprType(null));
+ 
+     boolean fieldInClassInit = false, hiddenField = false;
+     if (left.type == Exprent.EXPRENT_FIELD) { // first assignment to a final field. Field name without "this" in front of it
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+index 884a2d7..4c4b898 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+@@ -167,10 +167,10 @@ public class InvocationExprent extends Exprent {
+ 
+   @Override
+   public VarType getInferredExprType(VarType upperBound) {
+-    //System.out.println("infer: " + instance + " " + classname + "." + name + " " + getExprType() + " " + upperBound);
+     List<StructMethod> matches = getMatchedDescriptors();
+     StructMethod desc = null;
+     if(matches.size() == 1) desc = matches.get(0);
++    //System.out.println("infer: " + instance + " " + classname + "." + name + " " + getExprType() + " " + upperBound + " " + desc);
+ 
+     VarType type = getExprType();
+ 
+@@ -403,15 +403,15 @@ public class InvocationExprent extends Exprent {
+     if(cl != null && cl.getSignature() != null && instance != null && instance.getInferredExprType(null).isGeneric()) {
+       GenericType genType = (GenericType)instance.getInferredExprType(null);
+       if(genType.getArguments().size() == cl.getSignature().fparameters.size()) {
+-		/*System.out.println("remap: " + classname + "." + name);
+-		if(instance instanceof FieldExprent) {
+-			System.out.println(((FieldExprent)instance).getClassname() + "." + ((FieldExprent)instance).getName());
+-		}*/
++        /*System.out.println("remap: " + classname + "." + name + " " + genType);
++        if(instance instanceof FieldExprent) {
++            System.out.println(((FieldExprent)instance).getClassname() + "." + ((FieldExprent)instance).getName());
++        }*/
+         for(int i = 0; i < cl.getSignature().fparameters.size(); i++) {
+           VarType from = GenericType.parse("T" + cl.getSignature().fparameters.get(i) + ";");
+           VarType to = genType.getArguments().get(i);
+-          //System.out.println("(" + from.type + " " + from.value + " -> " + to.type + " " + to.value + ")");
+-          if(from != null && to != null && to.type == CodeConstants.TYPE_OBJECT) {
++          if(from != null && to != null /*&& to.type == CodeConstants.TYPE_OBJECT*/) {
++            //System.out.println("(" + from.type + " " + from + " -> " + to.type + " " + to + ")");
+             genArgs.put(from, to);
+           }
+         }
+@@ -428,57 +428,65 @@ public class InvocationExprent extends Exprent {
+         TextBuffer buff = new TextBuffer();
+         boolean ambiguous = setAmbiguousParameters.get(i);
+         VarType type = descriptor.params[i];
+-		VarType newType = null;
+-        if(desc != null && desc.getSignature() != null && genericArgs.size() != 0 && desc.getSignature().params.size() == lstParameters.size()) {
++        VarType newType = null;
++        if(desc != null && desc.getSignature() != null && /*genericArgs.size() != 0 && */desc.getSignature().params.size() == lstParameters.size()) {
+           newType = desc.getSignature().params.get(i);
+-          boolean free = false;
++          /*boolean free = false;
+           for(String param : desc.getSignature().fparameters) {
+             if(param.equals(newType.value)) {
+               free = true;
+               break;
+             }
+           }
+-          if(!free) {
++
++          if(!free) {*/
+             type = newType;
+-          }
++          //}
+         }
+-        if(genArgs.containsKey(type)) {
++        //System.out.println("check: " + type + " " + type.remap(genArgs) + " " + type.isGeneric() + " " + type.remap(genArgs).isGeneric());
++        /*if(genArgs.containsKey(type)) {
+           type = genArgs.get(type);
++        }*/
++        VarType remappedType = type.remap(genArgs);
++        if(type != remappedType) {
++          type = remappedType;
++        }
++        else if(desc != null && desc.getSignature() != null && genericArgs.size() != 0) {
++          Map<VarType, VarType> genMap = new HashMap<VarType, VarType>();
++          for(int j = 0; j < genericArgs.size(); j++) {
++            VarType from = GenericType.parse("T" + desc.getSignature().fparameters.get(j) + ";");
++            VarType to = genericArgs.get(j);
++            genMap.put(from, to);
++            //System.out.println("map: (" + from + " -> " + to + ")");
++          }
++          type = type.remap(genMap);
++          /*if(genMap.containsKey(type)) {
++            type = genMap.get(type);
++          }
++          // this only checks 1 level deep right now
++          else if(type.isGeneric()) {
++            GenericType genType = (GenericType)type;
++            List<VarType> toArgs = new ArrayList<VarType>();
++            boolean changed = false;
++            VarType parent = genType.getParent();
++            if(genMap.containsKey(parent)) {
++              parent = genMap.get(parent);
++              changed = true;
++            }
++            for(VarType arg : genType.getArguments()) {
++              if(genMap.containsKey(arg)) {
++                toArgs.add(genMap.get(arg));
++                changed = true;
++              } else {
++                toArgs.add(arg);
++              }
++            }
++            System.out.println("gen: " + changed + " " + parent + " ");
++            if(changed) {
++              type = new GenericType(type.type, type.arrayDim, type.value, parent, toArgs, genType.getWildcard());
++            }
++          }*/
+         }
+-		else if(desc != null && desc.getSignature() != null && genericArgs.size() != 0) {
+-			Map<VarType, VarType> genMap = new HashMap<VarType, VarType>();
+-			for(int j = 0; j < genericArgs.size(); j++) {
+-				VarType from = GenericType.parse("T" + desc.getSignature().fparameters.get(j) + ";");
+-				VarType to = genericArgs.get(j);
+-				genMap.put(from, to);
+-				//System.out.println("map: (" + from + " -> " + to + ")");
+-			}
+-			if(genMap.containsKey(type)) {
+-				type = genMap.get(type);
+-			}
+-			// this only checks 1 level deep right now
+-			else if(type.isGeneric()) {
+-				GenericType genType = (GenericType)type;
+-				List<VarType> toArgs = new ArrayList<VarType>();
+-				boolean changed = false;
+-				VarType parent = genType.getParent();
+-				if(genMap.containsKey(parent)) {
+-					parent = genMap.get(parent);
+-					changed = true;
+-				}
+-				for(VarType arg : genType.getArguments()) {
+-					if(genMap.containsKey(arg)) {
+-						toArgs.add(genMap.get(arg));
+-						changed = true;
+-					} else {
+-						toArgs.add(arg);
+-					}
+-				}
+-				if(changed) {
+-					type = new GenericType(type.type, type.arrayDim, type.value, parent, toArgs, genType.getWildcard());
+-				}
+-			}
+-		}
+         /*if(desc != null && desc.getSignature() != null) {
+           for(String ps: desc.getSignature().fparameters) {
+             VarType param = GenericType.parse("T" + ps + ";");
+@@ -488,12 +496,12 @@ public class InvocationExprent extends Exprent {
+             }
+           }
+         }*/
+-		VarType exprType = lstParameters.get(i).getInferredExprType(type);
+-		if(exprType != null && exprType.type != CodeConstants.TYPE_NULL && type != null && type.type == CodeConstants.TYPE_GENVAR) {
+-		  type = exprType;
+-		}
+-		//System.out.println("param: " + i + " " + newType + " " + exprType + " " + type + " " + lstParameters.get(i));
+-        ExprProcessor.getCastedExprent(lstParameters.get(i), type, buff, indent, true, ambiguous, tracer);
++        VarType exprType = lstParameters.get(i).getInferredExprType(type);
++        if(exprType != null /*&& exprType.type != CodeConstants.TYPE_NULL*/ && type != null && type.type == CodeConstants.TYPE_GENVAR) {
++          type = exprType;
++        }
++        //System.out.println("param: " + i + " " + newType + " " + exprType + " " + type + " " + lstParameters.get(i));
++        ExprProcessor.getCastedExprent(lstParameters.get(i), type, buff, indent, type.type != CodeConstants.TYPE_NULL, ambiguous, tracer);
+         buf.append(buff);
+ 
+         firstParameter = false;
+diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
+index af06b8e..81342ed 100644
+--- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
++++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
+@@ -19,6 +19,8 @@ import org.jetbrains.java.decompiler.code.CodeConstants;
+ import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ 
++import java.util.Map;
++
+ public class VarType {  // TODO: optimize switch
+ 
+   public static final VarType[] EMPTY_ARRAY = {};
+@@ -428,4 +430,11 @@ public class VarType {  // TODO: optimize switch
+         throw new IllegalArgumentException("Invalid type: " + c);
+     }
+   }
++
++  public VarType remap(Map<VarType, VarType> map) {
++    if(map.containsKey(this)) {
++      return map.get(this);
++    }
++    return this;
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
+index 9319bf7..9ad5a1f 100644
+--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
++++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
+@@ -23,6 +23,7 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
+ import java.util.ArrayList;
+ import java.util.Collections;
+ import java.util.List;
++import java.util.Map;
+ 
+ public class GenericType extends VarType {
+ 
+@@ -326,16 +327,47 @@ public class GenericType extends VarType {
+   @Override
+   public String toString() {
+     StringBuilder buf = new StringBuilder();
+-	switch(getWildcard()) {
++    switch(getWildcard()) {
+       case GenericType.WILDCARD_EXTENDS:
+         buf.append("? extends ");
+         break;
+       case GenericType.WILDCARD_SUPER:
+         buf.append("? super ");
+       break;
+-	}
+-	buf.append(super.toString());
++    }
++    buf.append(super.toString());
+     buf.append(getTypeArguments());
+-	return buf.toString();
++    return buf.toString();
++  }
++
++  @Override
++  public VarType remap(Map<VarType, VarType> map) {
++    VarType main = super.remap(map);
++    if(main != this) {
++      return main;
++    }
++    boolean changed = false;
++    VarType parent = getParent();
++    if(map.containsKey(parent)) {
++      parent = map.get(parent);
++      changed = true;
++    }
++    List<VarType> newArgs = new ArrayList<VarType>();
++    for(VarType arg : getArguments()) {
++      VarType newArg = null;
++      if(arg != null) {
++        newArg = arg.remap(map);
++      }
++      if(newArg != arg) {
++        newArgs.add(newArg);
++        changed = true;
++      } else {
++        newArgs.add(arg);
++      }
++    }
++    if(changed) {
++      return new GenericType(main.type, main.arrayDim, main.value, parent, newArgs, getWildcard());
++    }
++    return this;
+   }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0084-handle-generic-lists-with-multiple-arguments-in-meth.patch b/FernFlower-Patches/0084-handle-generic-lists-with-multiple-arguments-in-meth.patch
new file mode 100644
index 0000000..d46acdf
--- /dev/null
+++ b/FernFlower-Patches/0084-handle-generic-lists-with-multiple-arguments-in-meth.patch
@@ -0,0 +1,45 @@
+From 497af514fd5c868021fc9be12acac2c387f5541d Mon Sep 17 00:00:00 2001
+From: RainWarrior <rainwarrior@fry.su>
+Date: Wed, 14 Oct 2015 15:30:51 +0300
+Subject: [PATCH 084/122] handle generic lists with multiple arguments in
+ method invocations
+
+---
+ .../decompiler/exps/InvocationExprent.java    | 21 ++++++++++++-------
+ 1 file changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+index 4c4b898..f98c822 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+@@ -208,14 +208,19 @@ public class InvocationExprent extends Exprent {
+           List<VarType> leftArgs = ((GenericType)upperBound).getArguments();
+           List<VarType> rightArgs = ((GenericType)ret).getArguments();
+           List<String> fparams = desc.getSignature().fparameters;
+-          // trivial case only for now
+-          if(leftArgs.size() == 1 && rightArgs.size() == 1 && fparams.size() == 1) {
+-            VarType l = leftArgs.get(0);
+-            VarType r = rightArgs.get(0);
+-            if(l != null /*&& l.type == CodeConstants.TYPE_OBJECT && !l.equals(r)*/ && r.value.equals(fparams.get(0))) {
+-              genericArgs.add(leftArgs.get(0));
+-              //type = upperBound;
+-              System.out.println("4: " + leftArgs.get(0) + " " + rightArgs.get(0) + " " + fparams.get(0));
++          if(leftArgs.size() == rightArgs.size() && rightArgs.size() == fparams.size()) {
++            for(int i = 0; i < leftArgs.size(); i++) {
++              VarType l = leftArgs.get(i);
++              VarType r = rightArgs.get(i);
++              if(l != null /*&& l.type == CodeConstants.TYPE_OBJECT && !l.equals(r)*/ && r.value.equals(fparams.get(i))) {
++                genericArgs.add(l);
++                //type = upperBound;
++                System.out.println("4: " + i + " " + l + " " + r + " " + fparams.get(i));
++              }
++              else {
++                genericArgs.clear();
++                break;
++              }
+             }
+           }
+         }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0085-using-the-generic-info-from-InvocationExprent-correc.patch b/FernFlower-Patches/0085-using-the-generic-info-from-InvocationExprent-correc.patch
new file mode 100644
index 0000000..8ac4d49
--- /dev/null
+++ b/FernFlower-Patches/0085-using-the-generic-info-from-InvocationExprent-correc.patch
@@ -0,0 +1,140 @@
+From b14e7fc85e9f8c07da66accb2f490175fbf054ed Mon Sep 17 00:00:00 2001
+From: RainWarrior <rainwarrior@fry.su>
+Date: Thu, 15 Oct 2015 01:00:20 +0300
+Subject: [PATCH 085/122] using the generic info from InvocationExprent
+ correctly, 1 more error down
+
+---
+ .../decompiler/exps/InvocationExprent.java    | 102 ++++++++++--------
+ 1 file changed, 55 insertions(+), 47 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+index f98c822..b2c3574 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+@@ -174,59 +174,67 @@ public class InvocationExprent extends Exprent {
+ 
+     VarType type = getExprType();
+ 
+-    List<VarType> toAdd = new ArrayList<VarType>();
+-    if(upperBound != null/* && upperBound.type == CodeConstants.TYPE_OBJECT && descriptor.ret.type == CodeConstants.TYPE_OBJECT*/) {
+-      genericArgs.clear();
+-      //System.out.println("0: " + isStatic + " " + desc + " " + upperBound + " " + descriptor.ret + " " + upperBound.isGeneric());
+-      /*if(desc == null) {
+-        // more harn than gain
+-        // Object -> String
+-        if(descriptor.ret.value.equals("java/lang/Object") && !descriptor.ret.equals(upperBound)) {
+-          genericArgs.add(upperBound);
+-          System.out.println("1: " + upperBound + " " + descriptor.ret);
+-        }
+-        // List -> List<String>
+-        if(upperBound.isGeneric()) {
+-          List<VarType> leftArgs = ((GenericType)upperBound).getArguments();
+-          //System.out.println("22: " + upperBound + " " + leftArgs.get(0));
+-          if(leftArgs.size() == 1 && descriptor.ret.equals(upperBound) && leftArgs.get(0).type == CodeConstants.TYPE_OBJECT) {
+-            genericArgs.add(leftArgs.get(0));
+-            System.out.println("2: " + upperBound.type + " " + upperBound + " " + leftArgs.get(0).type + " " + leftArgs.get(0));
+-          }
++    genericArgs.clear();
++
++    //System.out.println("0: " + isStatic + " " + desc + " " + upperBound + " " + descriptor.ret + " " + upperBound.isGeneric());
++    /*if(desc == null) {
++      // more harn than gain
++      // Object -> String
++      if(descriptor.ret.value.equals("java/lang/Object") && !descriptor.ret.equals(upperBound)) {
++        genericArgs.add(upperBound);
++        System.out.println("1: " + upperBound + " " + descriptor.ret);
++      }
++      // List -> List<String>
++      if(upperBound.isGeneric()) {
++        List<VarType> leftArgs = ((GenericType)upperBound).getArguments();
++        //System.out.println("22: " + upperBound + " " + leftArgs.get(0));
++        if(leftArgs.size() == 1 && descriptor.ret.equals(upperBound) && leftArgs.get(0).type == CodeConstants.TYPE_OBJECT) {
++          genericArgs.add(leftArgs.get(0));
++          System.out.println("2: " + upperBound.type + " " + upperBound + " " + leftArgs.get(0).type + " " + leftArgs.get(0));
+         }
++      }
++    }*/
++    if(desc != null && desc.getSignature() != null) {
++      VarType ret = desc.getSignature().ret;
++      Map<VarType, VarType> map = new HashMap<VarType, VarType>();
++      // more harm than gain
++      // T -> String
++      /*if(upperBound != null && desc.getSignature().fparameters.size() == 1 && desc.getSignature().fparameters.get(0).equals(ret.value)) {
++        genericArgs.add(upperBound);
++        System.out.println("3: " + upperBound + " " + ret + " " + desc.getSignature().fparameters.get(0));
+       }*/
+-      if(desc != null && desc.getSignature() != null) {
+-        VarType ret = desc.getSignature().ret;
+-        // more harm than gain
+-        // T -> String
+-        /*if(desc.getSignature().fparameters.size() == 1 && desc.getSignature().fparameters.get(0).equals(ret.value)) {
+-          genericArgs.add(upperBound);
+-          System.out.println("3: " + upperBound + " " + ret + " " + desc.getSignature().fparameters.get(0));
+-        }*/
+-        // List<T> -> List<String>
+-        if(upperBound.isGeneric() && ret.isGeneric()) {
+-          List<VarType> leftArgs = ((GenericType)upperBound).getArguments();
+-          List<VarType> rightArgs = ((GenericType)ret).getArguments();
+-          List<String> fparams = desc.getSignature().fparameters;
+-          if(leftArgs.size() == rightArgs.size() && rightArgs.size() == fparams.size()) {
+-            for(int i = 0; i < leftArgs.size(); i++) {
+-              VarType l = leftArgs.get(i);
+-              VarType r = rightArgs.get(i);
+-              if(l != null /*&& l.type == CodeConstants.TYPE_OBJECT && !l.equals(r)*/ && r.value.equals(fparams.get(i))) {
+-                genericArgs.add(l);
+-                //type = upperBound;
+-                System.out.println("4: " + i + " " + l + " " + r + " " + fparams.get(i));
+-              }
+-              else {
+-                genericArgs.clear();
+-                break;
+-              }
++      // List<T> -> List<String>
++      if(upperBound != null && upperBound.isGeneric() && ret.isGeneric()) {
++        List<VarType> leftArgs = ((GenericType)upperBound).getArguments();
++        List<VarType> rightArgs = ((GenericType)ret).getArguments();
++        List<String> fparams = desc.getSignature().fparameters;
++        if(leftArgs.size() == rightArgs.size() && rightArgs.size() == fparams.size()) {
++          for(int i = 0; i < leftArgs.size(); i++) {
++            VarType l = leftArgs.get(i);
++            VarType r = rightArgs.get(i);
++            if(l != null /*&& l.type == CodeConstants.TYPE_OBJECT && !l.equals(r)*/ && r.value.equals(fparams.get(i))) {
++              genericArgs.add(l);
++              map.put(r, l);
++              System.out.println("4: " + i + " " + l + " " + r + " " + fparams.get(i));
++            }
++            else {
++              genericArgs.clear();
++              map.clear();
++              break;
+             }
+           }
+         }
+       }
+-    }
+ 
++      //System.out.println("infer map: "+ ret + " -> " + ret.remap(map));
++
++      if(!map.isEmpty()) {
++        // remap and return generic type
++        VarType newType = ret.remap(map);
++        if(ret != newType) return newType;
++      }
++      return ret;
++    }
+     return type;
+   }
+   @Override
+@@ -505,7 +513,7 @@ public class InvocationExprent extends Exprent {
+         if(exprType != null /*&& exprType.type != CodeConstants.TYPE_NULL*/ && type != null && type.type == CodeConstants.TYPE_GENVAR) {
+           type = exprType;
+         }
+-        //System.out.println("param: " + i + " " + newType + " " + exprType + " " + type + " " + lstParameters.get(i));
++        //System.out.println("param: " + i + " " + exprType + " " + type + " " + lstParameters.get(i));
+         ExprProcessor.getCastedExprent(lstParameters.get(i), type, buff, indent, type.type != CodeConstants.TYPE_NULL, ambiguous, tracer);
+         buf.append(buff);
+ 
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0086-Itterator-enchanced-for-loops-can-also-have-a-copy-i.patch b/FernFlower-Patches/0086-Itterator-enchanced-for-loops-can-also-have-a-copy-i.patch
new file mode 100644
index 0000000..5dcf767
--- /dev/null
+++ b/FernFlower-Patches/0086-Itterator-enchanced-for-loops-can-also-have-a-copy-i.patch
@@ -0,0 +1,36 @@
+From c9699a02f50eaa677fc72201e6c4c3581a13744f Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Wed, 14 Oct 2015 16:07:14 -0700
+Subject: [PATCH 086/122] Itterator enchanced for loops can also have a 'copy'
+ instruction, so detect those as well.
+
+---
+ .../decompiler/modules/decompiler/MergeHelper.java   | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+index c240daa..d0158ab 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+@@ -491,6 +491,18 @@ public class MergeHelper {
+         stat.setIncExprent(holder.getInstance());
+         preData.getExprents().remove(initExprents[0]);
+         firstData.getExprents().remove(firstDoExprent);
++
++        if (initExprents[1] != null && initExprents[1].getLeft().type == Exprent.EXPRENT_VAR &&
++            holder.getInstance().type == Exprent.EXPRENT_VAR) {
++          VarExprent copy = (VarExprent)initExprents[1].getLeft();
++          VarExprent inc = (VarExprent)holder.getInstance();
++          if (copy.getIndex() == inc.getIndex() && copy.getVersion() == inc.getVersion() && !ExprentUtil.isVarReferenced(inc, stat, copy)) {
++            preData.getExprents().remove(initExprents[1]);
++            initExprents[1].getRight().addBytecodeOffsets(initExprents[1].bytecode);
++            initExprents[1].getRight().addBytecodeOffsets(stat.getIncExprent().bytecode);
++            stat.setIncExprent(initExprents[1].getRight());
++          }
++        }
+         return true;
+       }
+       else if (initExprents[0] != null && initExprents[1] != null && firstDoExprent != null) {
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0087-Be-a-bit-more-strict-in-detecting-copy-var-usage.patch b/FernFlower-Patches/0087-Be-a-bit-more-strict-in-detecting-copy-var-usage.patch
new file mode 100644
index 0000000..6fed600
--- /dev/null
+++ b/FernFlower-Patches/0087-Be-a-bit-more-strict-in-detecting-copy-var-usage.patch
@@ -0,0 +1,45 @@
+From 788d8fdb6346422ce9717694f957b970625072ec Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Wed, 14 Oct 2015 16:40:04 -0700
+Subject: [PATCH 087/122] Be a bit more strict in detecting copy var usage.
+
+---
+ .../java/decompiler/modules/decompiler/MergeHelper.java   | 2 +-
+ .../decompiler/modules/decompiler/stats/Statement.java    | 8 ++++++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+index d0158ab..3025737 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+@@ -496,7 +496,7 @@ public class MergeHelper {
+             holder.getInstance().type == Exprent.EXPRENT_VAR) {
+           VarExprent copy = (VarExprent)initExprents[1].getLeft();
+           VarExprent inc = (VarExprent)holder.getInstance();
+-          if (copy.getIndex() == inc.getIndex() && copy.getVersion() == inc.getVersion() && !ExprentUtil.isVarReferenced(inc, stat, copy)) {
++          if (copy.getIndex() == inc.getIndex() && copy.getVersion() == inc.getVersion() && !ExprentUtil.isVarReferenced(inc, stat.getTopParent(), copy)) {
+             preData.getExprents().remove(initExprents[1]);
+             initExprents[1].getRight().addBytecodeOffsets(initExprents[1].bytecode);
+             initExprents[1].getRight().addBytecodeOffsets(stat.getIncExprent().bytecode);
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+index f71ed84..686001d 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+@@ -837,6 +837,14 @@ public class Statement implements IMatchable {
+     this.parent = parent;
+   }
+ 
++  public Statement getTopParent() {
++    Statement ret = this;
++    while (ret.getParent() != null) {
++      ret = ret.getParent();
++    }
++    return ret;
++  }
++
+   public HashSet<StatEdge> getLabelEdges() {  // FIXME: why HashSet?
+     return labelEdges;
+   }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0088-Enhance-switches-on-enums.patch b/FernFlower-Patches/0088-Enhance-switches-on-enums.patch
new file mode 100644
index 0000000..5f70003
--- /dev/null
+++ b/FernFlower-Patches/0088-Enhance-switches-on-enums.patch
@@ -0,0 +1,310 @@
+From 7397a3a93f58c06def0180227486b7a23915b4b4 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Thu, 15 Oct 2015 00:15:50 -0700
+Subject: [PATCH 088/122] Enhance switches on enums.
+
+---
+ .../main/rels/MethodProcessorRunnable.java    |   2 +-
+ .../main/rels/NestedClassProcessor.java       | 129 ++++++++++++++++++
+ .../decompiler/stats/SwitchStatement.java     |  55 +++++++-
+ .../java/decompiler/struct/StructClass.java   |   3 +
+ 4 files changed, 186 insertions(+), 3 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+index 2e1668d..16d7788 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+@@ -296,7 +296,7 @@ public class MethodProcessorRunnable implements Runnable {
+     if (statement.type == Statement.TYPE_DO) {
+         System.out.print(" t:"+((DoStatement)statement).getLooptype());
+     } else if (statement.type == Statement.TYPE_BASICBLOCK) {
+-        System.out.print(" i:"+((BasicBlockStatement)statement).getBlock().toStringOldIndices().replaceAll("\n", ";"));
++        System.out.print(" i:"+((BasicBlockStatement)statement).getBlock().toStringOldIndices().replaceAll("\n", ";").replaceAll("\r", ""));
+     }
+     System.out.println();
+     for (StatEdge edge : statement.getAllSuccessorEdges())
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+index 3378549..12653a4 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+@@ -16,6 +16,7 @@
+ package org.jetbrains.java.decompiler.main.rels;
+ 
+ import org.jetbrains.java.decompiler.code.CodeConstants;
++import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
+ import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
+ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
+@@ -25,8 +26,11 @@ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.*;
+ import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph;
+ import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectNode;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatement;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.LVTVariable;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarTypeProcessor;
+@@ -39,6 +43,8 @@ import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
+ import org.jetbrains.java.decompiler.struct.gen.VarType;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ 
++import com.sun.xml.internal.ws.org.objectweb.asm.Opcodes;
++
+ import java.util.*;
+ import java.util.Map.Entry;
+ 
+@@ -59,6 +65,10 @@ public class NestedClassProcessor {
+       return;
+     }
+ 
++    if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_ENUM)) {
++      gatherEnumSwitchMaps(node);
++    }
++
+     if (node.type != ClassNode.CLASS_LAMBDA) {
+ 
+       computeLocalVarsAndDefinitions(node);
+@@ -102,6 +112,125 @@ public class NestedClassProcessor {
+     }
+   }
+ 
++  /**
++   * When Java introduced Enums they aded the ability to use them in Switch statements.
++   * This was done in a purely syntax sugar way using the old switch on int methods.
++   * The compiler creates a synthetic class with a static int array field.
++   * To support enums changing post compile, It initializes this field with a length of the current enum length.
++   * And then for every referenced enum value it adds a mapping in the form of:
++   *   try {
++   *     field[Enum.VALUE.ordinal()] = 1;
++   *   } catch (FieldNotFoundException e) {}
++   *
++   * If a class has multiple switches on multiple enums, the compiler adds the init and try list to the BEGINNING of the static initalizer.
++   * But they add the field to the END of the fields list.
++   */
++  private void gatherEnumSwitchMaps(ClassNode node) {
++    for (ClassNode child : node.nested) {
++      gatherEnumSwitchMaps(child);
++    }
++
++    MethodWrapper clinit = node.getWrapper().getMethodWrapper("<clinit>", "()V");
++    if (clinit == null || clinit.root == null || clinit.root.getFirst().type != Statement.TYPE_SEQUENCE) {
++      return;
++    }
++
++    final int STATIC_FINAL_SYNTHETIC = Opcodes.ACC_STATIC | Opcodes.ACC_FINAL | Opcodes.ACC_SYNTHETIC;
++    Set<String> potentialFields = new HashSet<String>();
++    for (StructField fd : node.classStruct.getFields()) {
++      if ((fd.getAccessFlags() & STATIC_FINAL_SYNTHETIC) == STATIC_FINAL_SYNTHETIC && "[I".equals(fd.getDescriptor())) {
++        potentialFields.add(fd.getName());
++      }
++    }
++
++    if (potentialFields.size() == 0) {
++      return;
++    }
++
++    SequenceStatement seq = (SequenceStatement)clinit.root.getFirst();
++    for (int x = 0; x < seq.getStats().size();) {
++      Statement stat = seq.getStats().get(x);
++      if (stat.type != Statement.TYPE_BASICBLOCK || stat.getExprents() == null || stat.getExprents().size() != 1 || stat.getExprents().get(0).type != Exprent.EXPRENT_ASSIGNMENT) {
++        break;
++      }
++      AssignmentExprent ass = (AssignmentExprent)stat.getExprents().get(0);
++      if (ass.getLeft().type != Exprent.EXPRENT_FIELD || ass.getRight().type != Exprent.EXPRENT_NEW) {
++        break;
++      }
++      FieldExprent mapField = (FieldExprent)ass.getLeft();
++      NewExprent _new = ((NewExprent)ass.getRight());
++      if (!mapField.getClassname().equals(node.classStruct.qualifiedName) || !potentialFields.contains(mapField.getName()) ||
++          _new.getNewType().type != CodeConstants.TYPE_INT || _new.getNewType().arrayDim != 1 ||
++          _new.getLstDims().size() != 1 || _new.getLstDims().get(0).type != Exprent.EXPRENT_FUNCTION) {
++        break;
++      }
++      FunctionExprent func = (FunctionExprent)_new.getLstDims().get(0);
++      if (func.getFuncType() != FunctionExprent.FUNCTION_ARRAY_LENGTH || func.getLstOperands().size() != 1 || func.getLstOperands().get(0).type != Exprent.EXPRENT_INVOCATION) {
++        break;
++      }
++      InvocationExprent invoc = (InvocationExprent)func.getLstOperands().get(0);
++      if (!"values".equals(invoc.getName()) || !("()[L" + invoc.getClassname() + ";").equals(invoc.getStringDescriptor())) {
++        break;
++      }
++
++      String fieldName = mapField.getName();
++      String enumName = invoc.getClassname();
++      Map<Integer, String> idToName = new HashMap<Integer, String>();
++
++      boolean replace = false;
++      int y = x;
++      while (++y < seq.getStats().size()) {
++        if (seq.getStats().get(y).type != Statement.TYPE_TRYCATCH) {
++          break;
++        }
++        CatchStatement _try = (CatchStatement)seq.getStats().get(y);
++        Statement first = _try.getFirst();
++        List<Exprent> exprents = first.getExprents();
++        if (_try.getVars().size() != 1 || !"java/lang/NoSuchFieldError".equals(_try.getVars().get(0).getVarType().value) ||
++            first.type != Statement.TYPE_BASICBLOCK || exprents == null || exprents.size() != 1 || exprents.get(0).type != Exprent.EXPRENT_ASSIGNMENT) {
++          break;
++        }
++        ass = (AssignmentExprent)exprents.get(0);
++        if (ass.getRight().type != Exprent.EXPRENT_CONST || (!(((ConstExprent)ass.getRight()).getValue() instanceof Integer)) ||
++            ass.getLeft().type != Exprent.EXPRENT_ARRAY){
++          break;
++        }
++        ArrayExprent array = (ArrayExprent)ass.getLeft();
++        if (array.getArray().type != Exprent.EXPRENT_FIELD || !array.getArray().equals(mapField) || array.getIndex().type != Exprent.EXPRENT_INVOCATION) {
++          break;
++        }
++        invoc = (InvocationExprent)array.getIndex();
++        if (!enumName.equals(invoc.getClassname()) || !"ordinal".equals(invoc.getName()) || !"()I".equals(invoc.getStringDescriptor()) ||
++            invoc.getInstance().type != Exprent.EXPRENT_FIELD) {
++          break;
++        }
++
++        FieldExprent enumField = (FieldExprent)invoc.getInstance();
++        if (!enumName.equals(enumField.getClassname()) || !enumField.isStatic()) {
++          break;
++        }
++
++        idToName.put((Integer)((ConstExprent)ass.getRight()).getValue(), enumField.getName());
++        seq.replaceStatement(_try, getNewEmptyStatement());
++        replace = true;
++      }
++
++      if (replace) {
++        seq.replaceStatement(seq.getStats().get(x), getNewEmptyStatement());
++        node.classStruct.enumSwitchMap.put(fieldName, idToName);
++        node.getWrapper().getHiddenMembers().add(InterpreterUtil.makeUniqueKey(fieldName, "[I"));
++      }
++      x = y;
++    }
++  }
++
++  private Statement getNewEmptyStatement() {
++    BasicBlockStatement bstat = new BasicBlockStatement(new BasicBlock(
++      DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.STATEMENT_COUNTER)));
++    bstat.setExprents(new ArrayList<Exprent>());
++    return bstat;
++  }
++
+   private static void setLambdaVars(ClassNode parent, ClassNode child) {
+ 
+     if (child.lambdaInformation.is_method_reference) { // method reference, no code and no parameters
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
+index 3e27201..f8eec64 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
+@@ -24,10 +24,14 @@ import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
+ import org.jetbrains.java.decompiler.modules.decompiler.DecHelper;
+ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
+ import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.ArrayExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.FieldExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.SwitchExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.StartEndPair;
++import org.jetbrains.java.decompiler.struct.StructClass;
+ import org.jetbrains.java.decompiler.struct.gen.VarType;
+ 
+ import java.util.*;
+@@ -118,7 +122,12 @@ public class SwitchStatement extends Statement {
+       tracer.incrementCurrentSourceLine();
+     }
+ 
+-    buf.appendIndent(indent).append(headexprent.get(0).toJava(indent, tracer)).append(" {").appendLineSeparator();
++    //Doesn't seem to be a better place to put it so enhance things here
++    Map<Integer, String> remaps = enhanceHead(headexprent.get(0), buf, indent, tracer);
++
++    if (remaps == null) {
++      buf.appendIndent(indent).append(headexprent.get(0).toJava(indent, tracer)).append(" {").appendLineSeparator();
++    }
+     tracer.incrementCurrentSourceLine();
+ 
+     VarType switch_type = headexprent.get(0).getExprType();
+@@ -138,7 +147,14 @@ public class SwitchStatement extends Statement {
+           ConstExprent value = (ConstExprent)values.get(j).copy();
+           value.setConstType(switch_type);
+ 
+-          buf.appendIndent(indent).append("case ").append(value.toJava(indent, tracer)).append(":").appendLineSeparator();
++          buf.appendIndent(indent).append("case ");
++          if (remaps == null) {
++            buf.append(value.toJava(indent, tracer));
++          }
++          else {
++            buf.append(remaps.get(value.getValue()));
++          }
++          buf.append(":").appendLineSeparator();
+           tracer.incrementCurrentSourceLine();
+         }
+       }
+@@ -152,6 +168,41 @@ public class SwitchStatement extends Statement {
+     return buf;
+   }
+ 
++  private Map<Integer, String> enhanceHead(Exprent exprent, TextBuffer buf, int indent, BytecodeMappingTracer tracer) {
++
++    if (exprent.type != Exprent.EXPRENT_SWITCH) return null;
++
++    SwitchExprent swtch = (SwitchExprent)exprent;
++    if (swtch.getValue().type != Exprent.EXPRENT_ARRAY) return null;
++
++    ArrayExprent array = (ArrayExprent)swtch.getValue();
++    if (array.getArray().type != Exprent.EXPRENT_FIELD || array.getIndex().type != Exprent.EXPRENT_INVOCATION) return null;
++
++    FieldExprent field = (FieldExprent)array.getArray();
++    InvocationExprent invoc = (InvocationExprent)array.getIndex();
++    StructClass cls = DecompilerContext.getStructContext().getClass(field.getClassname());
++    if (cls == null || !field.isStatic() || !"ordinal".equals(invoc.getName()) || !"()I".equals(invoc.getStringDescriptor())) return null;
++
++    Map<Integer, String> ret = cls.enumSwitchMap.get(field.getName());
++    if (ret == null) return null;
++
++    for (List<ConstExprent> lst : getCaseValues()) {
++      if (lst != null) {
++        for (ConstExprent cst : lst) {
++          if (cst != null && (!(cst.getValue() instanceof Integer) || !ret.containsKey(cst.getValue()))) {
++            return null;
++          }
++        }
++      }
++    }
++
++    tracer.addMapping(swtch.bytecode);
++    tracer.addMapping(field.bytecode);
++    tracer.addMapping(invoc.bytecode);
++    buf.appendIndent(indent).append((invoc.getInstance().toJava(indent, tracer).enclose("switch(", ")"))).append(" {").appendLineSeparator();
++    return ret;
++  }
++
+   public void initExprents() {
+     SwitchExprent swexpr = (SwitchExprent)first.getExprents().remove(first.getExprents().size() - 1);
+     swexpr.setCaseValues(caseValues);
+diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
+index c0683fc..ab0f118 100644
+--- a/src/org/jetbrains/java/decompiler/struct/StructClass.java
++++ b/src/org/jetbrains/java/decompiler/struct/StructClass.java
+@@ -30,6 +30,8 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ import org.jetbrains.java.decompiler.util.VBStyleCollection;
+ 
+ import java.io.IOException;
++import java.util.HashMap;
++import java.util.Map;
+ 
+ /*
+   class_file {
+@@ -65,6 +67,7 @@ public class StructClass extends StructMember {
+   private final VBStyleCollection<StructField, String> fields;
+   private final VBStyleCollection<StructMethod, String> methods;
+   private GenericClassDescriptor signature = null;
++  public final Map<String, Map<Integer, String>> enumSwitchMap = new HashMap<String, Map<Integer, String>>();
+ 
+   private ConstantPool pool;
+ 
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0089-Fixed-issue-where-inner-class-fields-would-not-be-re.patch b/FernFlower-Patches/0089-Fixed-issue-where-inner-class-fields-would-not-be-re.patch
new file mode 100644
index 0000000..1785286
--- /dev/null
+++ b/FernFlower-Patches/0089-Fixed-issue-where-inner-class-fields-would-not-be-re.patch
@@ -0,0 +1,98 @@
+From 32d7a1464e50520aa4e0c78fce84528448bca249 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Thu, 15 Oct 2015 01:10:03 -0700
+Subject: [PATCH 089/122] Fixed issue where inner class fields would not be
+ replaced by their parent method parameters.
+
+---
+ .../main/rels/NestedClassProcessor.java       | 51 ++++++++++++++++---
+ 1 file changed, 45 insertions(+), 6 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+index 12653a4..6d40b8a 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+@@ -706,8 +706,8 @@ public class NestedClassProcessor {
+ 
+         DirectGraph graph = meth.getOrBuildGraph();
+ 
+-        graph.iterateExprents(new DirectGraph.ExprentIterator() {
+-          public int processExprent(Exprent exprent) {
++        iterateExprents(graph, new ExprentIteratorWithReplace() {
++          public Exprent processExprent(Exprent exprent) {
+ 
+             if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
+               AssignmentExprent asexpr = (AssignmentExprent)exprent;
+@@ -718,7 +718,7 @@ public class NestedClassProcessor {
+                     mapFieldsToNewVars.containsKey(InterpreterUtil.makeUniqueKey(child.classStruct.qualifiedName,
+                                                                                  InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr
+                                                                                    .getDescriptor().descriptorString)))) {
+-                  return 2;
++                  return null;
+                 }
+ 
+                 //if(fexpr.getClassname().equals(child.classStruct.qualifiedName) &&
+@@ -734,13 +734,13 @@ public class NestedClassProcessor {
+               if (invexpr.getFunctype() == InvocationExprent.TYP_INIT) {
+                 // invocation of the super constructor in an anonymous class
+                 child.superInvocation = invexpr; // FIXME: save original names of parameters
+-                return 2;
++                return null;
+               }
+             }
+ 
+-            replaceExprent(exprent);
++            Exprent ret = replaceExprent(exprent);
+ 
+-            return 0;
++            return ret == null ? exprent : ret;
+           }
+ 
+           private Exprent replaceExprent(Exprent exprent) {
+@@ -1191,4 +1191,43 @@ public class NestedClassProcessor {
+       return keyfield.hashCode() + varpaar.hashCode();
+     }
+   }
++
++  private static interface ExprentIteratorWithReplace {
++    // null - remove exprent
++    // ret != exprent - replace exprent with ret
++    Exprent processExprent(Exprent exprent);
++  }
++
++
++
++  private static void iterateExprents(DirectGraph graph, ExprentIteratorWithReplace iter) {
++    LinkedList<DirectNode> stack = new LinkedList<DirectNode>();
++    stack.add(graph.first);
++
++    HashSet<DirectNode> setVisited = new HashSet<DirectNode>();
++
++    while (!stack.isEmpty()) {
++
++      DirectNode node = stack.removeFirst();
++
++      if (setVisited.contains(node)) {
++        continue;
++      }
++      setVisited.add(node);
++
++      for (int i = 0; i < node.exprents.size(); i++) {
++        Exprent res = iter.processExprent(node.exprents.get(i));
++
++        if (res == null) {
++          node.exprents.remove(i);
++          i--;
++        }
++        else if (res != node.exprents.get(i)) {
++          node.exprents.set(i, res);
++        }
++      }
++
++      stack.addAll(node.succs);
++    }
++  }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0090-Added-support-for-and-field-accessors-in-inner-class.patch b/FernFlower-Patches/0090-Added-support-for-and-field-accessors-in-inner-class.patch
new file mode 100644
index 0000000..46a9ea8
--- /dev/null
+++ b/FernFlower-Patches/0090-Added-support-for-and-field-accessors-in-inner-class.patch
@@ -0,0 +1,88 @@
+From cef8ac773526a830398ef753629b6b7611f7bcf9 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Thu, 15 Oct 2015 15:51:24 -0700
+Subject: [PATCH 090/122] Added support for ++ and -- field accessors in inner
+ classes. And fixed inner class type find issue.
+
+---
+ .../main/rels/NestedClassProcessor.java       |  4 +--
+ .../main/rels/NestedMemberAccess.java         | 27 +++++++++++++++++++
+ 2 files changed, 28 insertions(+), 3 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+index 6d40b8a..1e69d8d 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+@@ -1145,7 +1145,7 @@ public class NestedClassProcessor {
+           res = classname.equals(((InvocationExprent)expr).getClassname());
+           break;
+         case Exprent.EXPRENT_NEW:
+-          VarType newType = expr.getExprType();
++          VarType newType = ((NewExprent)expr).getNewType();
+           res = newType.type == CodeConstants.TYPE_OBJECT && classname.equals(newType.value);
+           break;
+         case Exprent.EXPRENT_VAR:
+@@ -1198,8 +1198,6 @@ public class NestedClassProcessor {
+     Exprent processExprent(Exprent exprent);
+   }
+ 
+-
+-
+   private static void iterateExprents(DirectGraph graph, ExprentIteratorWithReplace iter) {
+     LinkedList<DirectNode> stack = new LinkedList<DirectNode>();
+     stack.add(graph.first);
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java b/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
+index 3fa8128..b4856a6 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
+@@ -40,6 +40,7 @@ public class NestedMemberAccess {
+   private static final int METHOD_ACCESS_FIELD_GET = 2;
+   private static final int METHOD_ACCESS_FIELD_SET = 3;
+   private static final int METHOD_ACCESS_METHOD = 4;
++  private static final int METHOD_ACCESS_FIELD_INC = 5;
+ 
+   private boolean noSynthFlag;
+   private final Map<MethodWrapper, Integer> mapMethodType = new HashMap<MethodWrapper, Integer>();
+@@ -137,6 +138,24 @@ public class NestedMemberAccess {
+                     }
+                   }
+                 }
++                break;
++              case Exprent.EXPRENT_FUNCTION:
++                FunctionExprent func = (FunctionExprent)exprCore;
++                if (func.getLstOperands().size() == 1 && func.getLstOperands().get(0).type == Exprent.EXPRENT_FIELD) {
++                  FieldExprent field = (FieldExprent)func.getLstOperands().get(0);
++                  if ((parcount == 1 && !field.isStatic()) ||
++                      (parcount == 0 && field.isStatic())) {
++                    if (field.getClassname().equals(node.classStruct.qualifiedName)) {
++                      if (func.getFuncType() == FunctionExprent.FUNCTION_IPP ||
++                          func.getFuncType() == FunctionExprent.FUNCTION_PPI ||
++                          func.getFuncType() == FunctionExprent.FUNCTION_IMM ||
++                          func.getFuncType() == FunctionExprent.FUNCTION_MMI) {
++                        type = METHOD_ACCESS_FIELD_INC;
++                      }
++                    }
++                  }
++                }
++                break;
+             }
+ 
+ 
+@@ -426,6 +445,14 @@ public class NestedMemberAccess {
+         }
+ 
+         retexprent = invret;
++        break;
++      case METHOD_ACCESS_FIELD_INC:
++        FunctionExprent func = (FunctionExprent)((ExitExprent)source).getValue().copy();
++        FieldExprent field = (FieldExprent)func.getLstOperands().get(0);
++        if (!field.isStatic()) {
++          field.replaceExprent(field.getInstance(), invexpr.getLstParameters().get(0));
++        }
++        retexprent = func;
+     }
+ 
+ 
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0091-cleanup-of-InvocationExprent-changes.patch b/FernFlower-Patches/0091-cleanup-of-InvocationExprent-changes.patch
new file mode 100644
index 0000000..915f6d5
--- /dev/null
+++ b/FernFlower-Patches/0091-cleanup-of-InvocationExprent-changes.patch
@@ -0,0 +1,200 @@
+From 188b626d3d18755760de06dedf2c050abb03ed61 Mon Sep 17 00:00:00 2001
+From: RainWarrior <rainwarrior@fry.su>
+Date: Fri, 16 Oct 2015 02:06:25 +0300
+Subject: [PATCH 091/122] cleanup of InvocationExprent changes
+
+---
+ .../decompiler/exps/InvocationExprent.java    | 98 +++----------------
+ 1 file changed, 11 insertions(+), 87 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+index b2c3574..e615207 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+@@ -170,30 +170,11 @@ public class InvocationExprent extends Exprent {
+     List<StructMethod> matches = getMatchedDescriptors();
+     StructMethod desc = null;
+     if(matches.size() == 1) desc = matches.get(0);
+-    //System.out.println("infer: " + instance + " " + classname + "." + name + " " + getExprType() + " " + upperBound + " " + desc);
+ 
+     VarType type = getExprType();
+ 
+     genericArgs.clear();
+ 
+-    //System.out.println("0: " + isStatic + " " + desc + " " + upperBound + " " + descriptor.ret + " " + upperBound.isGeneric());
+-    /*if(desc == null) {
+-      // more harn than gain
+-      // Object -> String
+-      if(descriptor.ret.value.equals("java/lang/Object") && !descriptor.ret.equals(upperBound)) {
+-        genericArgs.add(upperBound);
+-        System.out.println("1: " + upperBound + " " + descriptor.ret);
+-      }
+-      // List -> List<String>
+-      if(upperBound.isGeneric()) {
+-        List<VarType> leftArgs = ((GenericType)upperBound).getArguments();
+-        //System.out.println("22: " + upperBound + " " + leftArgs.get(0));
+-        if(leftArgs.size() == 1 && descriptor.ret.equals(upperBound) && leftArgs.get(0).type == CodeConstants.TYPE_OBJECT) {
+-          genericArgs.add(leftArgs.get(0));
+-          System.out.println("2: " + upperBound.type + " " + upperBound + " " + leftArgs.get(0).type + " " + leftArgs.get(0));
+-        }
+-      }
+-    }*/
+     if(desc != null && desc.getSignature() != null) {
+       VarType ret = desc.getSignature().ret;
+       Map<VarType, VarType> map = new HashMap<VarType, VarType>();
+@@ -201,7 +182,6 @@ public class InvocationExprent extends Exprent {
+       // T -> String
+       /*if(upperBound != null && desc.getSignature().fparameters.size() == 1 && desc.getSignature().fparameters.get(0).equals(ret.value)) {
+         genericArgs.add(upperBound);
+-        System.out.println("3: " + upperBound + " " + ret + " " + desc.getSignature().fparameters.get(0));
+       }*/
+       // List<T> -> List<String>
+       if(upperBound != null && upperBound.isGeneric() && ret.isGeneric()) {
+@@ -212,10 +192,9 @@ public class InvocationExprent extends Exprent {
+           for(int i = 0; i < leftArgs.size(); i++) {
+             VarType l = leftArgs.get(i);
+             VarType r = rightArgs.get(i);
+-            if(l != null /*&& l.type == CodeConstants.TYPE_OBJECT && !l.equals(r)*/ && r.value.equals(fparams.get(i))) {
++            if(l != null && r.value.equals(fparams.get(i))) {
+               genericArgs.add(l);
+               map.put(r, l);
+-              System.out.println("4: " + i + " " + l + " " + r + " " + fparams.get(i));
+             }
+             else {
+               genericArgs.clear();
+@@ -226,8 +205,6 @@ public class InvocationExprent extends Exprent {
+         }
+       }
+ 
+-      //System.out.println("infer map: "+ ret + " -> " + ret.remap(map));
+-
+       if(!map.isEmpty()) {
+         // remap and return generic type
+         VarType newType = ret.remap(map);
+@@ -237,6 +214,7 @@ public class InvocationExprent extends Exprent {
+     }
+     return type;
+   }
++
+   @Override
+   public CheckTypesResult checkExprTypeBounds() {
+     CheckTypesResult result = new CheckTypesResult();
+@@ -413,18 +391,14 @@ public class InvocationExprent extends Exprent {
+     StructClass cl = DecompilerContext.getStructContext().getClass(classname);
+     Map<VarType, VarType> genArgs = new HashMap<VarType, VarType>();
+ 
++    // building generic info from the instance
+     if(cl != null && cl.getSignature() != null && instance != null && instance.getInferredExprType(null).isGeneric()) {
+       GenericType genType = (GenericType)instance.getInferredExprType(null);
+       if(genType.getArguments().size() == cl.getSignature().fparameters.size()) {
+-        /*System.out.println("remap: " + classname + "." + name + " " + genType);
+-        if(instance instanceof FieldExprent) {
+-            System.out.println(((FieldExprent)instance).getClassname() + "." + ((FieldExprent)instance).getName());
+-        }*/
+         for(int i = 0; i < cl.getSignature().fparameters.size(); i++) {
+           VarType from = GenericType.parse("T" + cl.getSignature().fparameters.get(i) + ";");
+           VarType to = genType.getArguments().get(i);
+-          if(from != null && to != null /*&& to.type == CodeConstants.TYPE_OBJECT*/) {
+-            //System.out.println("(" + from.type + " " + from + " -> " + to.type + " " + to + ")");
++          if(from != null && to != null) {
+             genArgs.put(from, to);
+           }
+         }
+@@ -441,79 +415,30 @@ public class InvocationExprent extends Exprent {
+         TextBuffer buff = new TextBuffer();
+         boolean ambiguous = setAmbiguousParameters.get(i);
+         VarType type = descriptor.params[i];
+-        VarType newType = null;
+-        if(desc != null && desc.getSignature() != null && /*genericArgs.size() != 0 && */desc.getSignature().params.size() == lstParameters.size()) {
+-          newType = desc.getSignature().params.get(i);
+-          /*boolean free = false;
+-          for(String param : desc.getSignature().fparameters) {
+-            if(param.equals(newType.value)) {
+-              free = true;
+-              break;
+-            }
+-          }
+-
+-          if(!free) {*/
+-            type = newType;
+-          //}
++        // using info from the generic signature
++        if(desc != null && desc.getSignature() != null && desc.getSignature().params.size() == lstParameters.size()) {
++          type = desc.getSignature().params.get(i);
+         }
+-        //System.out.println("check: " + type + " " + type.remap(genArgs) + " " + type.isGeneric() + " " + type.remap(genArgs).isGeneric());
+-        /*if(genArgs.containsKey(type)) {
+-          type = genArgs.get(type);
+-        }*/
++        // applying generic info from the signature
+         VarType remappedType = type.remap(genArgs);
+         if(type != remappedType) {
+           type = remappedType;
+         }
++        // and from the inferred generic arguments
+         else if(desc != null && desc.getSignature() != null && genericArgs.size() != 0) {
+           Map<VarType, VarType> genMap = new HashMap<VarType, VarType>();
+           for(int j = 0; j < genericArgs.size(); j++) {
+             VarType from = GenericType.parse("T" + desc.getSignature().fparameters.get(j) + ";");
+             VarType to = genericArgs.get(j);
+             genMap.put(from, to);
+-            //System.out.println("map: (" + from + " -> " + to + ")");
+           }
+           type = type.remap(genMap);
+-          /*if(genMap.containsKey(type)) {
+-            type = genMap.get(type);
+-          }
+-          // this only checks 1 level deep right now
+-          else if(type.isGeneric()) {
+-            GenericType genType = (GenericType)type;
+-            List<VarType> toArgs = new ArrayList<VarType>();
+-            boolean changed = false;
+-            VarType parent = genType.getParent();
+-            if(genMap.containsKey(parent)) {
+-              parent = genMap.get(parent);
+-              changed = true;
+-            }
+-            for(VarType arg : genType.getArguments()) {
+-              if(genMap.containsKey(arg)) {
+-                toArgs.add(genMap.get(arg));
+-                changed = true;
+-              } else {
+-                toArgs.add(arg);
+-              }
+-            }
+-            System.out.println("gen: " + changed + " " + parent + " ");
+-            if(changed) {
+-              type = new GenericType(type.type, type.arrayDim, type.value, parent, toArgs, genType.getWildcard());
+-            }
+-          }*/
+         }
+-        /*if(desc != null && desc.getSignature() != null) {
+-          for(String ps: desc.getSignature().fparameters) {
+-            VarType param = GenericType.parse("T" + ps + ";");
+-            if(param.equals(type)) { // found free argument, need to infer it from the argument
+-              type = lstParameters.get(i).getExprType();
+-              break;
+-            }
+-          }
+-        }*/
++        // not passing it along if what we get back is more specific
+         VarType exprType = lstParameters.get(i).getInferredExprType(type);
+-        if(exprType != null /*&& exprType.type != CodeConstants.TYPE_NULL*/ && type != null && type.type == CodeConstants.TYPE_GENVAR) {
++        if(exprType != null && type != null && type.type == CodeConstants.TYPE_GENVAR) {
+           type = exprType;
+         }
+-        //System.out.println("param: " + i + " " + exprType + " " + type + " " + lstParameters.get(i));
+         ExprProcessor.getCastedExprent(lstParameters.get(i), type, buff, indent, type.type != CodeConstants.TYPE_NULL, ambiguous, tracer);
+         buf.append(buff);
+ 
+@@ -530,7 +455,6 @@ public class InvocationExprent extends Exprent {
+     List<StructMethod> matches = new ArrayList<StructMethod>();
+ 
+     StructClass cl = DecompilerContext.getStructContext().getClass(classname);
+-    //System.out.println("m: " + classname + "." + name + " " + cl);
+     if (cl == null) return matches;
+ 
+     nextMethod:
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0092-Tweak-decompilation-test-to-new-settings-no-syntheti.patch b/FernFlower-Patches/0092-Tweak-decompilation-test-to-new-settings-no-syntheti.patch
new file mode 100644
index 0000000..7f85ff9
--- /dev/null
+++ b/FernFlower-Patches/0092-Tweak-decompilation-test-to-new-settings-no-syntheti.patch
@@ -0,0 +1,28 @@
+From 71f348d0c9b66b35db2c7a42d37d15ea7f2ea5d9 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Fri, 16 Oct 2015 21:39:10 -0400
+Subject: [PATCH 092/122] Tweak decompilation test to new settings (no
+ synthetics or bridge)
+
+---
+ .../jetbrains/java/decompiler/MinecraftDecompilationTest.java   | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
+index 2afd2e6..087c810 100644
+--- a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
++++ b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
+@@ -43,10 +43,8 @@ public class MinecraftDecompilationTest {
+     // -din=1 -rbr=0 -dgs=1 -asc=1 -rsy=0
+     Map<String,Object> mcFFOptions = new HashMap<String,Object>() {{
+         put(IFernflowerPreferences.DECOMPILE_INNER,"1");
+-        put(IFernflowerPreferences.REMOVE_BRIDGE, "0");
+         put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES,"1");
+         put(IFernflowerPreferences.ASCII_STRING_CHARACTERS,"1");
+-        put(IFernflowerPreferences.REMOVE_SYNTHETIC,"0");
+         put(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH, "1");
+     }};
+     fixture.setUp(mcFFOptions);
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0093-Fix-constants-with-trailing-zeros-and-incorrect-type.patch b/FernFlower-Patches/0093-Fix-constants-with-trailing-zeros-and-incorrect-type.patch
new file mode 100644
index 0000000..f874d9f
--- /dev/null
+++ b/FernFlower-Patches/0093-Fix-constants-with-trailing-zeros-and-incorrect-type.patch
@@ -0,0 +1,59 @@
+From ded50868b3d9d908540f9c895eca95f44bb0ce9f Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sat, 17 Oct 2015 00:50:20 -0400
+Subject: [PATCH 093/122] Fix constants with trailing zeros and incorrect
+ types.
+
+---
+ .../modules/decompiler/exps/ConstExprent.java    | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+index 3398924..0fc4055 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+@@ -182,16 +182,16 @@ public class ConstExprent extends Exprent {
+           String doublefield;
+           if (literal) {
+             if (Double.isNaN(dval)) {
+-              return new TextBuffer("0.0D / 0.0");
++              return new TextBuffer("0.0D / 0.0D");
+             }
+             else if (dval == Double.POSITIVE_INFINITY) {
+-              return new TextBuffer("1.0D / 0.0");
++              return new TextBuffer("1.0D / 0.0D");
+             }
+             else if (dval == Double.NEGATIVE_INFINITY) {
+-              return new TextBuffer("-1.0D / 0.0");
++              return new TextBuffer("-1.0D / 0.0D");
+             }
+             else {
+-              return new TextBuffer(value.toString()).append("D");
++              return new TextBuffer(trimZeros(value.toString())).append("D");
+             }
+           }
+           else if (Double.isNaN(dval)) {
+@@ -219,16 +219,16 @@ public class ConstExprent extends Exprent {
+           String floatfield;
+           if (literal) {
+             if (Double.isNaN(fval)) {
+-              return new TextBuffer("0.0F / 0.0");
++              return new TextBuffer("0.0F / 0.0F");
+             }
+             else if (fval == Double.POSITIVE_INFINITY) {
+-              return new TextBuffer("1.0F / 0.0");
++              return new TextBuffer("1.0F / 0.0F");
+             }
+             else if (fval == Double.NEGATIVE_INFINITY) {
+-              return new TextBuffer("-1.0F / 0.0");
++              return new TextBuffer("-1.0F / 0.0F");
+             }
+             else {
+-              return new TextBuffer(value.toString()).append("F");
++              return new TextBuffer(trimZeros(value.toString())).append("F");
+             }
+           }
+           else if (Float.isNaN(fval)) {
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0094-Deterministic-label-names-based-on-jvm-instruction-i.patch b/FernFlower-Patches/0094-Deterministic-label-names-based-on-jvm-instruction-i.patch
new file mode 100644
index 0000000..6ac2430
--- /dev/null
+++ b/FernFlower-Patches/0094-Deterministic-label-names-based-on-jvm-instruction-i.patch
@@ -0,0 +1,147 @@
+From 36ea9a310b443b45ecdc298060e3685f8541950a Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sat, 17 Oct 2015 00:51:19 -0400
+Subject: [PATCH 094/122] Deterministic label names based on jvm instruction #
+ instead of ID
+
+---
+ .../java/decompiler/modules/decompiler/ExprProcessor.java     | 2 +-
+ .../modules/decompiler/stats/CatchAllStatement.java           | 2 +-
+ .../decompiler/modules/decompiler/stats/CatchStatement.java   | 2 +-
+ .../java/decompiler/modules/decompiler/stats/DoStatement.java | 2 +-
+ .../decompiler/modules/decompiler/stats/GeneralStatement.java | 2 +-
+ .../java/decompiler/modules/decompiler/stats/IfStatement.java | 4 ++--
+ .../modules/decompiler/stats/SequenceStatement.java           | 2 +-
+ .../decompiler/modules/decompiler/stats/SwitchStatement.java  | 2 +-
+ .../modules/decompiler/stats/SynchronizedStatement.java       | 2 +-
+ 9 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+index 60832d3..c832772 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+@@ -815,7 +815,7 @@ public class ExprProcessor implements CodeConstants {
+         }
+ 
+         if (edge.labeled) {
+-          buf.append(" label").append(edge.closure.id.toString());
++          buf.append(" label").append(edge.closure.getStartEndRange().start);
+         }
+         buf.append(";").appendLineSeparator();
+         tracer.incrementCurrentSourceLine();
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
+index 812ed10..34dfa85 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
+@@ -120,7 +120,7 @@ public class CatchAllStatement extends Statement {
+ 
+     boolean labeled = isLabeled();
+     if (labeled) {
+-      buf.appendIndent(indent).append("label").append(this.id.toString()).append(":").appendLineSeparator();
++      buf.appendIndent(indent).append("label").append(this.getStartEndRange().start).append(":").appendLineSeparator();
+       tracer.incrementCurrentSourceLine();
+     }
+ 
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
+index 8d56042..9359fbb 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
+@@ -157,7 +157,7 @@ public class CatchStatement extends Statement {
+     buf.append(ExprProcessor.listToJava(varDefinitions, indent, tracer));
+ 
+     if (isLabeled()) {
+-      buf.appendIndent(indent).append("label").append(this.id.toString()).append(":").appendLineSeparator();
++      buf.appendIndent(indent).append("label").append(this.getStartEndRange().start).append(":").appendLineSeparator();
+       tracer.incrementCurrentSourceLine();
+     }
+ 
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
+index acc74a6..6636d1d 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
+@@ -100,7 +100,7 @@ public class DoStatement extends Statement {
+     buf.append(ExprProcessor.listToJava(varDefinitions, indent, tracer));
+ 
+     if (isLabeled()) {
+-      buf.appendIndent(indent).append("label").append(this.id.toString()).append(":").appendLineSeparator();
++      buf.appendIndent(indent).append("label").append(this.getStartEndRange().start).append(":").appendLineSeparator();
+       tracer.incrementCurrentSourceLine();
+     }
+ 
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
+index 4f22cf7..499894a 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
+@@ -57,7 +57,7 @@ public class GeneralStatement extends Statement {
+     TextBuffer buf = new TextBuffer();
+ 
+     if (isLabeled()) {
+-      buf.appendIndent(indent).append("label").append(this.id.toString()).append(":").appendLineSeparator();
++      buf.appendIndent(indent).append("label").append(this.getStartEndRange().start).append(":").appendLineSeparator();
+     }
+ 
+     buf.appendIndent(indent).append("abstract statement {").appendLineSeparator();
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
+index 8f3e467..6b0eb9a 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
+@@ -213,7 +213,7 @@ public class IfStatement extends Statement {
+     buf.append(first.toJava(indent, tracer));
+ 
+     if (isLabeled()) {
+-      buf.appendIndent(indent).append("label").append(this.id.toString()).append(":").appendLineSeparator();
++      buf.appendIndent(indent).append("label").append(this.getStartEndRange().start).append(":").appendLineSeparator();
+       tracer.incrementCurrentSourceLine();
+     }
+ 
+@@ -234,7 +234,7 @@ public class IfStatement extends Statement {
+         }
+ 
+         if (ifedge.labeled) {
+-          buf.append(" label").append(ifedge.closure.id.toString());
++          buf.append(" label").append(ifedge.closure.getStartEndRange().start);
+         }
+       }
+       buf.append(";").appendLineSeparator();
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
+index 7d2ee43..92588fe 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
+@@ -105,7 +105,7 @@ public class SequenceStatement extends Statement {
+     buf.append(ExprProcessor.listToJava(varDefinitions, indent, tracer));
+ 
+     if (islabeled) {
+-      buf.appendIndent(indent++).append("label").append(this.id.toString()).append(": {").appendLineSeparator();
++      buf.appendIndent(indent++).append("label").append(this.getStartEndRange().start).append(": {").appendLineSeparator();
+       tracer.incrementCurrentSourceLine();
+     }
+ 
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
+index f8eec64..2a29309 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
+@@ -118,7 +118,7 @@ public class SwitchStatement extends Statement {
+     buf.append(first.toJava(indent, tracer));
+ 
+     if (isLabeled()) {
+-      buf.appendIndent(indent).append("label").append(this.id.toString()).append(":").appendLineSeparator();
++      buf.appendIndent(indent).append("label").append(this.getStartEndRange().start).append(":").appendLineSeparator();
+       tracer.incrementCurrentSourceLine();
+     }
+ 
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
+index b71531f..aaafab9 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
+@@ -76,7 +76,7 @@ public class SynchronizedStatement extends Statement {
+     buf.append(first.toJava(indent, tracer));
+ 
+     if (isLabeled()) {
+-      buf.appendIndent(indent).append("label").append(this.id.toString()).append(":").appendLineSeparator();
++      buf.appendIndent(indent).append("label").append(this.getStartEndRange().start).append(":").appendLineSeparator();
+       tracer.incrementCurrentSourceLine();
+     }
+ 
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0095-Version-2.0.patch b/FernFlower-Patches/0095-Version-2.0.patch
new file mode 100644
index 0000000..1b2d119
--- /dev/null
+++ b/FernFlower-Patches/0095-Version-2.0.patch
@@ -0,0 +1,25 @@
+From c265002beef65c2264a9a9ed6550e022754f1bc1 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sat, 17 Oct 2015 01:11:19 -0400
+Subject: [PATCH 095/122] Version 2.0
+
+---
+ build.gradle | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.gradle b/build.gradle
+index 4ba85ee..5e14c25 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -3,7 +3,7 @@ apply plugin: 'idea'
+ apply plugin: 'maven'
+ apply plugin: 'java'
+ 
+-version = "1.0"
++version = "2.0"
+ group = "net.minecraftforge" //not sure if we shoulkd publish under this name, but it's our fork so meh
+ archivesBaseName = "fernflower"
+ 
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0096-Fixed-invalid-reference-to-ASM.-Oops.patch b/FernFlower-Patches/0096-Fixed-invalid-reference-to-ASM.-Oops.patch
new file mode 100644
index 0000000..a48e25b
--- /dev/null
+++ b/FernFlower-Patches/0096-Fixed-invalid-reference-to-ASM.-Oops.patch
@@ -0,0 +1,34 @@
+From 3b04e422ba4902bbaf7b058fc96326dc5c7d9458 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Mon, 19 Oct 2015 18:50:25 -0700
+Subject: [PATCH 096/122] Fixed invalid reference to ASM.. Oops..
+
+---
+ .../java/decompiler/main/rels/NestedClassProcessor.java       | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+index 1e69d8d..3975d8c 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+@@ -43,8 +43,6 @@ import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
+ import org.jetbrains.java.decompiler.struct.gen.VarType;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ 
+-import com.sun.xml.internal.ws.org.objectweb.asm.Opcodes;
+-
+ import java.util.*;
+ import java.util.Map.Entry;
+ 
+@@ -135,7 +133,7 @@ public class NestedClassProcessor {
+       return;
+     }
+ 
+-    final int STATIC_FINAL_SYNTHETIC = Opcodes.ACC_STATIC | Opcodes.ACC_FINAL | Opcodes.ACC_SYNTHETIC;
++    final int STATIC_FINAL_SYNTHETIC = CodeConstants.ACC_STATIC | CodeConstants.ACC_FINAL | CodeConstants.ACC_SYNTHETIC;
+     Set<String> potentialFields = new HashSet<String>();
+     for (StructField fd : node.classStruct.getFields()) {
+       if ((fd.getAccessFlags() & STATIC_FINAL_SYNTHETIC) == STATIC_FINAL_SYNTHETIC && "[I".equals(fd.getDescriptor())) {
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0097-Fixed-potential-NPE-in-lvt-propogation.patch b/FernFlower-Patches/0097-Fixed-potential-NPE-in-lvt-propogation.patch
new file mode 100644
index 0000000..bbcd255
--- /dev/null
+++ b/FernFlower-Patches/0097-Fixed-potential-NPE-in-lvt-propogation.patch
@@ -0,0 +1,28 @@
+From 13dd6a29fe1620f34613b872263b0a1107409d93 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Mon, 19 Oct 2015 18:51:10 -0700
+Subject: [PATCH 097/122] Fixed potential NPE in lvt propogation.
+
+---
+ .../modules/decompiler/vars/VarDefinitionHelper.java         | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index 0427e3b..aee11f6 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -434,7 +434,10 @@ public class VarDefinitionHelper {
+     }
+ 
+     for (VarType var : md.params) {
+-      types.put(new VarVersionPair(index, 0), varproc.getLVT().getCandidates(index).get(0));
++      List<LVTVariable> vars = varproc.getLVT().getCandidates(index);
++      if (vars != null) {
++        types.put(new VarVersionPair(index, 0), vars.get(0));
++      }
+       index += var.stackSize;
+     }
+ 
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0098-Fixed-nested-inner-generic-type-printing.patch b/FernFlower-Patches/0098-Fixed-nested-inner-generic-type-printing.patch
new file mode 100644
index 0000000..4e90412
--- /dev/null
+++ b/FernFlower-Patches/0098-Fixed-nested-inner-generic-type-printing.patch
@@ -0,0 +1,25 @@
+From 0d3f25d13d15a0204cf57f7cbc6e4c96f3b232d7 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Mon, 19 Oct 2015 18:51:39 -0700
+Subject: [PATCH 098/122] Fixed nested inner generic type printing.
+
+---
+ .../java/decompiler/struct/gen/generics/GenericType.java        | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
+index 9ad5a1f..9b111e5 100644
+--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
++++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
+@@ -280,7 +280,7 @@ public class GenericType extends VarType {
+       clsName = DecompilerContext.getImportCollector().getShortName(value.replace('/', '.'));
+     }
+     else if (parent.isGeneric()) {
+-      clsName = ((GenericType)parent).getCastName() + "." + value.substring(value.lastIndexOf('.') + 1);
++      clsName = ((GenericType)parent).getCastName() + "." + value.substring(parent.value.length() + 1);
+     }
+     else {
+       clsName = DecompilerContext.getImportCollector().getShortName(parent.value.replace('/', '.')) + "." + value.substring(value.lastIndexOf('.') + 1);
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0099-Fixed-JUint-tests.patch b/FernFlower-Patches/0099-Fixed-JUint-tests.patch
new file mode 100644
index 0000000..9b7d283
--- /dev/null
+++ b/FernFlower-Patches/0099-Fixed-JUint-tests.patch
@@ -0,0 +1,109 @@
+From 956c3db1c65161901df7a9872005857aa2b8f544 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Mon, 19 Oct 2015 18:54:52 -0700
+Subject: [PATCH 099/122] Fixed JUint tests. AmbiguousCallWithDebugInfo: Was
+ broken, our LVT changes fixed it Constants: cpw's type forcing changed output
+ ExtendsList: Added (T) typecast, tho not explicitly needed will address
+ later. InnerSignature: Original test had invalid arguments.
+
+---
+ test/org/jetbrains/java/decompiler/LVTTest.java     |  8 +++++++-
+ testData/results/TestAmbiguousCallWithDebugInfo.dec |  4 ++--
+ testData/results/TestConstants.dec                  | 12 ++++++------
+ testData/results/TestExtendsList.dec                |  4 ++--
+ testData/results/TestInnerSignature.dec             |  2 +-
+ 5 files changed, 18 insertions(+), 12 deletions(-)
+
+diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
+index fea37bc..368407e 100644
+--- a/test/org/jetbrains/java/decompiler/LVTTest.java
++++ b/test/org/jetbrains/java/decompiler/LVTTest.java
+@@ -26,7 +26,13 @@ public class LVTTest extends SingleClassesTestBase {
+   @Override
+   protected Map<String, Object> getDecompilerOptions() {
+     return new HashMap<String, Object>() {{
+-      put(IFernflowerPreferences.USE_DEBUG_LINE_NUMBERS, "1");
++      put(IFernflowerPreferences.DECOMPILE_INNER,"1");
++      put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES,"1");
++      put(IFernflowerPreferences.ASCII_STRING_CHARACTERS,"1");
++      put(IFernflowerPreferences.LOG_LEVEL, "TRACE");
++      put(IFernflowerPreferences.REMOVE_SYNTHETIC, "1");
++      put(IFernflowerPreferences.REMOVE_BRIDGE, "1");
++      put(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH, "1");
+     }};
+   }
+ 
+diff --git a/testData/results/TestAmbiguousCallWithDebugInfo.dec b/testData/results/TestAmbiguousCallWithDebugInfo.dec
+index 40f1eaf..3825b08 100644
+--- a/testData/results/TestAmbiguousCallWithDebugInfo.dec
++++ b/testData/results/TestAmbiguousCallWithDebugInfo.dec
+@@ -11,8 +11,8 @@ class TestAmbiguousCall {
+       IllegalArgumentException iae = new IllegalArgumentException();// 8
+       this.m1((RuntimeException)iae, "RE");// 9
+       this.m1(iae, "IAE");// 10
+-      IllegalArgumentException re = new IllegalArgumentException();// 12
+-      this.m1((RuntimeException)re, "RE");// 13
++      RuntimeException re = new IllegalArgumentException();// 12
++      this.m1(re, "RE");// 13
+       this.m1((IllegalArgumentException)re, "IAE");// 14
+    }// 15
+ }
+diff --git a/testData/results/TestConstants.dec b/testData/results/TestConstants.dec
+index 28df2c2..1170f1a 100644
+--- a/testData/results/TestConstants.dec
++++ b/testData/results/TestConstants.dec
+@@ -16,14 +16,14 @@ public class TestConstants {
+    static final int IMax = 2147483647;
+    static final long LMin = -9223372036854775808L;
+    static final long LMax = 9223372036854775807L;
+-   static final float FNan = 0.0F / 0.0;
+-   static final float FNeg = -1.0F / 0.0;
+-   static final float FPos = 1.0F / 0.0;
++   static final float FNan = 0.0F / 0.0F;
++   static final float FNeg = -1.0F / 0.0F;
++   static final float FPos = 1.0F / 0.0F;
+    static final float FMin = 1.4E-45F;
+    static final float FMax = 3.4028235E38F;
+-   static final double DNan = 0.0D / 0.0;
+-   static final double DNeg = -1.0D / 0.0;
+-   static final double DPos = 1.0D / 0.0;
++   static final double DNan = 0.0D / 0.0D;
++   static final double DNeg = -1.0D / 0.0D;
++   static final double DPos = 1.0D / 0.0D;
+    static final double DMin = 4.9E-324D;
+    static final double DMax = 1.7976931348623157E308D;
+ 
+diff --git a/testData/results/TestExtendsList.dec b/testData/results/TestExtendsList.dec
+index 6f116db..3f3dbea 100644
+--- a/testData/results/TestExtendsList.dec
++++ b/testData/results/TestExtendsList.dec
+@@ -2,11 +2,11 @@ package pkg;
+ 
+ public class TestExtendsList {
+    static <T extends Comparable<? super T>> T m1(T var0) {
+-      return null;// 20
++      return (T)null;// 20
+    }
+ 
+    static <T extends Object & Comparable<? super T>> T m2(T var0) {
+-      return null;// 24
++      return (T)null;// 24
+    }
+ }
+ 
+diff --git a/testData/results/TestInnerSignature.dec b/testData/results/TestInnerSignature.dec
+index 406e1f4..9acbef8 100644
+--- a/testData/results/TestInnerSignature.dec
++++ b/testData/results/TestInnerSignature.dec
+@@ -14,7 +14,7 @@ public class TestInnerSignature<A, B, C> {
+       B b;
+       C c;
+ 
+-      public Inner(A var1, B var2, C var3) {
++      public Inner(A var2, B var3, C var4) {
+          this.a = var2;// 34
+          this.b = var3;// 35
+          this.c = var4;// 36
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0100-Fixed-var-merging-not-propogating-type-data-to-var-d.patch b/FernFlower-Patches/0100-Fixed-var-merging-not-propogating-type-data-to-var-d.patch
new file mode 100644
index 0000000..a39299f
--- /dev/null
+++ b/FernFlower-Patches/0100-Fixed-var-merging-not-propogating-type-data-to-var-d.patch
@@ -0,0 +1,55 @@
+From 5b4bbacf01e3d69d86e0227a2ee17c7235f6396a Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Tue, 20 Oct 2015 04:04:12 -0700
+Subject: [PATCH 100/122] Fixed var merging not propogating type data to var
+ definitions.
+
+---
+ .../decompiler/vars/VarDefinitionHelper.java     | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index aee11f6..520b951 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -757,6 +757,18 @@ public class VarDefinitionHelper {
+           if (from.var == var.getIndex() && from.version == var.getVersion()) {
+             itr.remove();
+           }
++          else if (to.var == var.getIndex() && to.version == var.getVersion()) {
++            Map<VarVersionPair, VarType> mapExprentMinTypes = varproc.getVarVersions().getTypeProcessor().getMapExprentMinTypes();
++            Map<VarVersionPair, VarType> mapExprentMaxTypes = varproc.getVarVersions().getTypeProcessor().getMapExprentMaxTypes();
++            VarType merged = getMergedType(mapExprentMinTypes.get(from), mapExprentMinTypes.get(to),
++                                           mapExprentMaxTypes.get(from), mapExprentMaxTypes.get(to));
++
++            if (merged == null) { // Something went wrong.. This SHOULD be non-null
++              continue;
++            }
++
++            var.setVarType(merged);
++          }
+         }
+       }
+     }
+@@ -785,7 +797,7 @@ public class VarDefinitionHelper {
+ 
+           ConstExprent right = (ConstExprent)ass.getRight();
+           if (right.getConstType() == VarType.VARTYPE_NULL) {
+-              continue;
++            continue;
+           }
+           VarType merged = getMergedType(mapExprentMinTypes.get(from), mapExprentMinTypes.get(to),
+                                          mapExprentMaxTypes.get(from), mapExprentMaxTypes.get(to));
+@@ -865,7 +877,7 @@ public class VarDefinitionHelper {
+   }
+   private static class VPPEntry extends SimpleEntry<VarVersionPair, VarVersionPair> {
+     public VPPEntry(VarExprent key, VarVersionPair value) {
+-        super(new VarVersionPair(key), value);
++      super(new VarVersionPair(key), value);
+     }
+   }
+ }
+\ No newline at end of file
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0101-Snapshots-because-we-might-be-doing-a-bit-more-work-.patch b/FernFlower-Patches/0101-Snapshots-because-we-might-be-doing-a-bit-more-work-.patch
new file mode 100644
index 0000000..da3c454
--- /dev/null
+++ b/FernFlower-Patches/0101-Snapshots-because-we-might-be-doing-a-bit-more-work-.patch
@@ -0,0 +1,26 @@
+From 15a7d35628a5db31cbdf2f0ac8fc3b0686107d23 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Tue, 20 Oct 2015 19:20:44 -0400
+Subject: [PATCH 101/122] Snapshots because we might be doing a bit more work
+ yet
+
+---
+ build.gradle | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.gradle b/build.gradle
+index 5e14c25..bc211f2 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -3,7 +3,7 @@ apply plugin: 'idea'
+ apply plugin: 'maven'
+ apply plugin: 'java'
+ 
+-version = "2.0"
++version = "2.0-SNAPSHOT"
+ group = "net.minecraftforge" //not sure if we shoulkd publish under this name, but it's our fork so meh
+ archivesBaseName = "fernflower"
+ 
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0102-Sort-some-blocks-that-are-itterated-in-hash-sets-in-.patch b/FernFlower-Patches/0102-Sort-some-blocks-that-are-itterated-in-hash-sets-in-.patch
new file mode 100644
index 0000000..64c25a3
--- /dev/null
+++ b/FernFlower-Patches/0102-Sort-some-blocks-that-are-itterated-in-hash-sets-in-.patch
@@ -0,0 +1,53 @@
+From 68d13c5f3063b87c73c892f53f2adef199dba16d Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Tue, 20 Oct 2015 16:37:32 -0700
+Subject: [PATCH 102/122] Sort some blocks that are itterated in hash sets in
+ Finally Processor. SHOULD stabelize SOME of the finally's in decompiles.
+
+---
+ .../modules/decompiler/FinallyProcessor.java  | 19 +++++++++++++++++--
+ 1 file changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
+index 9f1c11b..ee8d4ce 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
+@@ -579,10 +579,17 @@ public class FinallyProcessor {
+     // so remove dummy exit
+     startBlocks.remove(graph.getLast());
+     startBlocks.removeAll(tryBlocks);
++    List<BasicBlock> starts = new ArrayList<BasicBlock>(startBlocks);
++    Collections.sort(starts, new Comparator<BasicBlock>() {
++      @Override
++      public int compare(BasicBlock o1, BasicBlock o2) {
++          return o2.id - o1.id;
++      }
++    });
+ 
+     List<Area> lstAreas = new ArrayList<Area>();
+ 
+-    for (BasicBlock start : startBlocks) {
++    for (BasicBlock start : starts) {
+ 
+       Area arr = compareSubgraphsEx(graph, start, catchBlocks, first, finallytype, mapLast, skippedFirst);
+       if (arr == null) {
+@@ -606,7 +613,15 @@ public class FinallyProcessor {
+     //		} catch(Exception ex){ex.printStackTrace();}
+ 
+     // INFO: empty basic blocks may remain in the graph!
+-    for (Entry<BasicBlock, Boolean> entry : mapLast.entrySet()) {
++    List<Entry<BasicBlock, Boolean>> lasts = new ArrayList<Entry<BasicBlock, Boolean>>(mapLast.entrySet());
++    // We must sort here to prevent decompile differences deriving from hash maps.
++    Collections.sort(lasts, new Comparator<Entry<BasicBlock, Boolean>>() {
++      @Override
++      public int compare(Entry<BasicBlock, Boolean> o1, Entry<BasicBlock, Boolean> o2) {
++        return o1.getKey().id - o2.getKey().id;
++      }
++    });
++    for (Entry<BasicBlock, Boolean> entry : lasts) {
+       BasicBlock last = entry.getKey();
+ 
+       if (entry.getValue()) {
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0103-Fixed-switch-cases-leaking-variables-incorrectly.patch b/FernFlower-Patches/0103-Fixed-switch-cases-leaking-variables-incorrectly.patch
new file mode 100644
index 0000000..d1b4b3b
--- /dev/null
+++ b/FernFlower-Patches/0103-Fixed-switch-cases-leaking-variables-incorrectly.patch
@@ -0,0 +1,26 @@
+From cf2bb43998a31ffa206193b9f0661df00bfbb6c0 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Thu, 22 Oct 2015 16:14:59 -0700
+Subject: [PATCH 103/122] Fixed switch cases leaking variables incorrectly.
+
+---
+ .../modules/decompiler/vars/VarDefinitionHelper.java           | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index 520b951..726edd7 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -648,6 +648,9 @@ public class VarDefinitionHelper {
+               if (obj == stat.getFirst()) {
+                 leaked.putAll(leaked_n); //First is outside the scope so leak!
+               }
++              else {
++                leaked_n.clear();
++              }
+             }
+             else if (stat.type == Statement.TYPE_TRYCATCH ||
+                      stat.type == Statement.TYPE_CATCHALL) {
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0104-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch b/FernFlower-Patches/0104-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch
new file mode 100644
index 0000000..1a2931d
--- /dev/null
+++ b/FernFlower-Patches/0104-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch
@@ -0,0 +1,207 @@
+From 2f1f8ef45192a1b474884cfc814d05448284b241 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Thu, 22 Oct 2015 16:15:46 -0700
+Subject: [PATCH 104/122] More move from HashSet to LinkedHashSet to stabelize
+ itteration. Fixed a try finally merge issue.
+
+---
+ .../modules/decompiler/DomHelper.java         | 23 +++++++++----------
+ .../modules/decompiler/LabelHelper.java       |  6 ++---
+ .../FastExtendedPostdominanceHelper.java      | 22 ++++++++++--------
+ 3 files changed, 26 insertions(+), 25 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
+index 67d16d5..c45f5e0 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
+@@ -213,12 +213,12 @@ public class DomHelper {
+   public static RootStatement parseGraph(ControlFlowGraph graph, StructMethod mt) {
+ 
+     RootStatement root = graphToStatement(graph);
+-    if (!processStatement(root, new HashMap<Integer, Set<Integer>>())) {
++    if (!processStatement(root, new HashMap<Integer, LinkedHashSet<Integer>>())) {
+       DotExporter.toDotFile(graph, mt, "parseGraphFail", true);
+       throw new RuntimeException("parsing failure!");
+     }
+ 
+-    LabelHelper.lowContinueLabels(root, new HashSet<StatEdge>());
++    LabelHelper.lowContinueLabels(root, new LinkedHashSet<StatEdge>());
+ 
+     SequenceHelper.condenseSequences(root);
+     root.buildMonitorFlags();
+@@ -309,7 +309,7 @@ public class DomHelper {
+     }
+   }
+ 
+-  private static boolean processStatement(Statement general, HashMap<Integer, Set<Integer>> mapExtPost) {
++  private static boolean processStatement(Statement general, HashMap<Integer, LinkedHashSet<Integer>> mapExtPost) {
+ 
+     if (general.type == Statement.TYPE_ROOT) {
+       Statement stat = general.getFirst();
+@@ -358,7 +358,7 @@ public class DomHelper {
+           //						DotExporter.toDotFile(general, new File("c:\\Temp\\stat1.dot"));
+           //					} catch(Exception ex) {ex.printStackTrace();}
+ 
+-          mapExtPost = new HashMap<Integer, Set<Integer>>();
++          mapExtPost = new HashMap<Integer, LinkedHashSet<Integer>>();
+           mapRefreshed = true;
+         }
+ 
+@@ -379,7 +379,7 @@ public class DomHelper {
+             Statement stat = findGeneralStatement(general, forceall, mapExtPost);
+ 
+             if (stat != null) {
+-              boolean complete = processStatement(stat, general.getFirst() == stat ? mapExtPost : new HashMap<Integer, Set<Integer>>());
++              boolean complete = processStatement(stat, general.getFirst() == stat ? mapExtPost : new HashMap<Integer, LinkedHashSet<Integer>>());
+ 
+               if (complete) {
+                 // replace general purpose statement with simple one
+@@ -389,7 +389,7 @@ public class DomHelper {
+                 return false;
+               }
+ 
+-              mapExtPost = new HashMap<Integer, Set<Integer>>();
++              mapExtPost = new HashMap<Integer, LinkedHashSet<Integer>>();
+               mapRefreshed = true;
+               reducibility = 0;
+             }
+@@ -410,14 +410,14 @@ public class DomHelper {
+         break;
+       }
+       else {
+-        mapExtPost = new HashMap<Integer, Set<Integer>>();
++        mapExtPost = new HashMap<Integer, LinkedHashSet<Integer>>();
+       }
+     }
+ 
+     return false;
+   }
+ 
+-  private static Statement findGeneralStatement(Statement stat, boolean forceall, HashMap<Integer, Set<Integer>> mapExtPost) {
++  private static Statement findGeneralStatement(Statement stat, boolean forceall, HashMap<Integer, LinkedHashSet<Integer>> mapExtPost) {
+ 
+     VBStyleCollection<Statement, Integer> stats = stat.getStats();
+     VBStyleCollection<List<Integer>, Integer> vbPost;
+@@ -595,7 +595,7 @@ public class DomHelper {
+     return true;
+   }
+ 
+-  private static boolean findSimpleStatements(Statement stat, HashMap<Integer, Set<Integer>> mapExtPost) {
++  private static boolean findSimpleStatements(Statement stat, HashMap<Integer, LinkedHashSet<Integer>> mapExtPost) {
+ 
+     boolean found, success = false;
+ 
+@@ -633,9 +633,9 @@ public class DomHelper {
+               set.removeAll(setOldNodes);
+ 
+               if (setOldNodes.contains(key)) {
+-                Set<Integer> setNew = mapExtPost.get(newid);
++                LinkedHashSet<Integer> setNew = mapExtPost.get(newid);
+                 if (setNew == null) {
+-                  mapExtPost.put(newid, setNew = new HashSet<Integer>());
++                  mapExtPost.put(newid, setNew = new LinkedHashSet<Integer>());
+                 }
+                 setNew.addAll(set);
+ 
+@@ -666,7 +666,6 @@ public class DomHelper {
+ 
+ 
+   private static Statement detectStatement(Statement head) {
+-
+     Statement res;
+ 
+     if ((res = DoStatement.isHead(head)) != null) {
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
+index 26cc638..9bf2935 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
+@@ -33,7 +33,7 @@ public class LabelHelper {
+ 
+     liftClosures(root);
+ 
+-    lowContinueLabels(root, new HashSet<StatEdge>());
++    lowContinueLabels(root, new LinkedHashSet<StatEdge>());
+ 
+     lowClosures(root);
+   }
+@@ -99,7 +99,7 @@ public class LabelHelper {
+     }
+   }
+ 
+-  public static void lowContinueLabels(Statement stat, HashSet<StatEdge> edges) {
++  public static void lowContinueLabels(Statement stat, LinkedHashSet<StatEdge> edges) {
+ 
+     boolean ok = (stat.type != Statement.TYPE_DO);
+     if (!ok) {
+@@ -131,7 +131,7 @@ public class LabelHelper {
+         lowContinueLabels(st, edges);
+       }
+       else {
+-        lowContinueLabels(st, new HashSet<StatEdge>());
++        lowContinueLabels(st, new LinkedHashSet<StatEdge>());
+       }
+     }
+   }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
+index 52338f9..eee7b15 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
+@@ -36,7 +36,7 @@ public class FastExtendedPostdominanceHelper {
+ 
+   private FastFixedSetFactory<Integer> factory;
+ 
+-  public HashMap<Integer, Set<Integer>> getExtendedPostdominators(Statement statement) {
++  public HashMap<Integer, LinkedHashSet<Integer>> getExtendedPostdominators(Statement statement) {
+ 
+     this.statement = statement;
+ 
+@@ -65,9 +65,11 @@ public class FastExtendedPostdominanceHelper {
+ 
+     filterOnDominance(filter);
+ 
+-    HashMap<Integer, Set<Integer>> res = new HashMap<Integer, Set<Integer>>();
++    HashMap<Integer, LinkedHashSet<Integer>> res = new HashMap<Integer, LinkedHashSet<Integer>>();
+     for (Entry<Integer, FastFixedSet<Integer>> entry : mapExtPostdominators.entrySet()) {
+-      res.put(entry.getKey(), entry.getValue().toPlainSet());
++      List<Integer> lst =  new ArrayList<Integer>(entry.getValue().toPlainSet());
++      Collections.sort(lst); // Order matters!
++      res.put(entry.getKey(), new LinkedHashSet<Integer>(lst));
+     }
+ 
+     return res;
+@@ -91,7 +93,7 @@ public class FastExtendedPostdominanceHelper {
+       Set<Statement> setVisited = new HashSet<Statement>();
+ 
+       setVisited.add(stack.getFirst());
+-      
++
+       while (!stack.isEmpty()) {
+ 
+         Statement stat = stack.removeFirst();
+@@ -109,17 +111,17 @@ public class FastExtendedPostdominanceHelper {
+           setPostdoms.complement(path);
+           continue;
+         }
+-        
++
+         for (StatEdge edge : stat.getSuccessorEdges(StatEdge.TYPE_REGULAR)) {
+-          
++
+           Statement edge_destination = edge.getDestination();
+-          
++
+           if(!setVisited.contains(edge_destination)) {
+-            
++
+             stack.add(edge_destination);
+             stackPath.add(path.getCopy());
+-            
+-            setVisited.add(edge_destination); 
++
++            setVisited.add(edge_destination);
+           }
+         }
+       }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0105-Bulk-test-for-MC.patch b/FernFlower-Patches/0105-Bulk-test-for-MC.patch
new file mode 100644
index 0000000..5f38453
--- /dev/null
+++ b/FernFlower-Patches/0105-Bulk-test-for-MC.patch
@@ -0,0 +1,256 @@
+From 50776ac962055d7228176238fc1b04a8a33736a7 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sun, 25 Oct 2015 10:29:37 -0400
+Subject: [PATCH 105/122] Bulk test for MC
+
+---
+ .../decompiler/DecompilerTestFixture.java     |  16 ++-
+ .../MinecraftDecompilationTest.java           | 127 ++++++++++++++----
+ 2 files changed, 109 insertions(+), 34 deletions(-)
+
+diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
+index f2c344a..77eda87 100644
+--- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
++++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
+@@ -46,23 +46,26 @@ public class DecompilerTestFixture {
+     assertTrue("current dir: " + new File("").getAbsolutePath(), isTestDataDir(testDataDir));
+ 
+     //noinspection SSBasedInspection
+-    tempDir = File.createTempFile("decompiler_test_", "_dir");
+-    assertTrue(tempDir.delete());
+-
++    tempDir = getRandomDir();
++    if (tempDir.exists()) tempDir.delete();
+     targetDir = new File(tempDir, "decompiled");
+-    assertTrue(targetDir.mkdirs());
++    targetDir.mkdirs();
+     decompiler = new ConsoleDecompiler(this.targetDir, new HashMap<String, Object>() {{
+       put(IFernflowerPreferences.LOG_LEVEL, "warn");
+       put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES, "1");
+       put(IFernflowerPreferences.REMOVE_SYNTHETIC, "1");
+       put(IFernflowerPreferences.REMOVE_BRIDGE, "1");
+       put(IFernflowerPreferences.LITERALS_AS_IS, "1");
+-      put(IFernflowerPreferences.UNIT_TEST_MODE, "1");
++      put(IFernflowerPreferences.MAX_PROCESSING_METHOD, "60000");
+       putAll(options);
+     }});
+   }
+ 
+-  public void tearDown() {
++  protected File getRandomDir() throws IOException {
++	  return File.createTempFile("decompiler_test_", "_dir");
++  }
++
++public void tearDown() {
+     if (tempDir != null && cleanup) {
+       delete(tempDir);
+     }
+@@ -95,6 +98,5 @@ public class DecompilerTestFixture {
+         for (File f : files) delete(f);
+       }
+     }
+-    assertTrue(file.delete());
+   }
+ }
+diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
+index 087c810..660d031 100644
+--- a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
++++ b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
+@@ -20,43 +20,54 @@ import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
+ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ import org.junit.After;
++import org.junit.Assert;
+ import org.junit.Before;
+ import org.junit.Test;
+ 
+ import java.io.*;
++import java.math.BigInteger;
++import java.security.MessageDigest;
++import java.security.NoSuchAlgorithmException;
+ import java.util.Enumeration;
+ import java.util.HashMap;
++import java.util.HashSet;
++import java.util.List;
+ import java.util.Map;
++import java.util.Map.Entry;
+ import java.util.zip.ZipEntry;
+ import java.util.zip.ZipFile;
+ 
+-import static org.junit.Assert.assertThat;
+-import static org.junit.Assert.assertTrue;
+-
+ public class MinecraftDecompilationTest {
+   private DecompilerTestFixture fixture;
+ 
+   private static final String MC_JAR = "minecraft_ff_in.jar";
+   @Before
+   public void setUp() throws IOException {
+-    fixture = new DecompilerTestFixture();
+-    // -din=1 -rbr=0 -dgs=1 -asc=1 -rsy=0
++    fixture = new DecompilerTestFixture() {
++      @Override
++      public File getRandomDir() {
++        return new File("/run/user/1000/fftest");
++      }
++    };
+     Map<String,Object> mcFFOptions = new HashMap<String,Object>() {{
+         put(IFernflowerPreferences.DECOMPILE_INNER,"1");
+         put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES,"1");
+         put(IFernflowerPreferences.ASCII_STRING_CHARACTERS,"1");
+         put(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH, "1");
++        put(IFernflowerPreferences.REMOVE_BRIDGE, "1");
++        put(IFernflowerPreferences.REMOVE_SYNTHETIC, "1");
++        put(IFernflowerPreferences.NEW_LINE_SEPARATOR, "0");
+     }};
+     fixture.setUp(mcFFOptions);
+     if (!new File(fixture.getTestDataDir(), MC_JAR).exists()) {
+-        throw new RuntimeException("Missing "+MC_JAR+" in testData dir - aborting");
++      throw new RuntimeException("Missing "+MC_JAR+" in testData dir - aborting");
+     }
+   }
+ 
+   @After
+   public void tearDown() {
+-//    fixture.tearDown();
+-//    fixture = null;
++    fixture.tearDown();
++    fixture = null;
+   }
+ 
+ //  @Test
+@@ -72,32 +83,97 @@ public class MinecraftDecompilationTest {
+ //  }
+ 
+   @Test
+-  public void testJar() {
++  public void testJar() throws IOException {
++    Map<String,String> md5s = new HashMap<String,String>();
++	MessageDigest md5;
++    try {
++	  md5 = MessageDigest.getInstance("MD5");
++	} catch (NoSuchAlgorithmException e1) {
++      md5 = null;
++	}
++
++    System.out.println("Decompiling base");
+     ConsoleDecompiler decompiler = fixture.getDecompiler();
+     decompiler.addSpace(new File(fixture.getTestDataDir(), MC_JAR), true);
+     decompiler.decompileContext();
+ 
+-    File unpacked = new File(fixture.getTempDir(), "unpacked");
+-    unpack(new File(fixture.getTargetDir(), "bulk.jar"), unpacked);
++    Map<String, HashSet<String>> variants = new HashMap<String, HashSet<String>>();
++
++    Map<String, String> valid = readJar(new File(fixture.getTargetDir(), MC_JAR),md5s,md5);
++    
++    File outRoot = new File("/run/user/1000/ffbulk");
++    outRoot.mkdirs();
++    for (int x = 0; x < 10000; x++) {
++      this.tearDown();
++      this.setUp();
++      System.out.println(x + "/10000 Starting Decompile");
++      decompiler = fixture.getDecompiler();
++      decompiler.addSpace(new File(fixture.getTestDataDir(), MC_JAR), true);
++      decompiler.decompileContext();
++      System.gc();
+ 
++      Map<String, String> data = readJar(new File(fixture.getTargetDir(), MC_JAR),null,null);
++
++      for (Entry<String, String> e : data.entrySet()) {
++        String found = e.getValue();
++        String expected = valid.get(e.getKey());
++        if (!found.equals(expected)) {
++          HashSet<String> set = variants.get(e.getKey());
++          if (set == null) {
++            set = new HashSet<String>();
++            set.add(expected);
++            variants.put(e.getKey(), set);
++          }
++          String md5digest = md5digest(found, md5);
++		if (!set.contains(found)) {
++            System.out.println("New Variant: " + e.getKey());
++            set.add(found);
++            System.out.println("Orig md5:"+md5s.get(e.getKey()));
++            System.out.println("Variant md5: "+md5digest);
++            writeFile(expected,e.getKey(),outRoot);
++            writeFile(found,e.getKey()+"."+md5digest,outRoot);
++          }
++          else
++          {
++            System.out.println("Existing Variant: " + e.getKey());
++            System.out.println("Variant md5: "+md5digest);
++          }
++        }
++      }
++    }
+ //    compareDirectories(new File(fixture.getTestDataDir(), "bulk"), unpacked);
+   }
+ 
+-  private static void unpack(File archive, File targetDir) {
++  private static void writeFile(String fl, String path, File outRoot) {
++	  File out = new File(outRoot,path);
++	  out.getParentFile().mkdirs();
++      try {
++		FileWriter fw = new FileWriter(out.getAbsoluteFile());
++		  fw.write(fl);
++		  fw.close();
++	} catch (IOException e) {
++		e.printStackTrace();
++	}
++  }
++  private static Map<String, String> readJar(File archive, Map<String, String> md5s, MessageDigest md5) {
++    Map<String, String> ret = new HashMap<String, String>();
+     try {
+       ZipFile zip = new ZipFile(archive);
+       try {
+         Enumeration<? extends ZipEntry> entries = zip.entries();
+         while (entries.hasMoreElements()) {
+           ZipEntry entry = entries.nextElement();
+-          if (!entry.isDirectory()) {
+-            File file = new File(targetDir, entry.getName());
+-            assertTrue(file.getParentFile().mkdirs() || file.getParentFile().isDirectory());
++          if (!entry.isDirectory() && entry.getName().endsWith(".java")) {
+             InputStream in = zip.getInputStream(entry);
+-            OutputStream out = new FileOutputStream(file);
++            ByteArrayOutputStream out = new ByteArrayOutputStream((int)entry.getSize());
+             InterpreterUtil.copyStream(in, out);
+             out.close();
+             in.close();
++            String fileContent = new String(out.toByteArray());
++			ret.put(entry.getName(), fileContent);
++			if (md5!=null && md5s != null) {
++				md5s.put(entry.getName(), md5digest(fileContent, md5));
++			}
+           }
+         }
+       }
+@@ -108,17 +184,14 @@ public class MinecraftDecompilationTest {
+     catch (IOException e) {
+       throw new RuntimeException(e);
+     }
++    return ret;
+   }
+-
+-  private static void compareDirectories(File expected, File actual) {
+-    String[] expectedList = expected.list();
+-    String[] actualList = actual.list();
+-    assertThat(actualList, Matchers.arrayContainingInAnyOrder(expectedList));
+-    for (String name : expectedList) {
+-      File child = new File(expected, name);
+-      if (child.isDirectory()) {
+-        compareDirectories(child, new File(actual, name));
+-      }
+-    }
++  private static String md5digest(String input, MessageDigest md5) {
++	  md5.reset();
++	  try {
++		return String.format("0%032x",new BigInteger(1,md5.digest(input.getBytes("UTF-8"))));
++	} catch (UnsupportedEncodingException e) {
++		return null;
++	}
+   }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0106-Add-a-parameter-renamer.patch b/FernFlower-Patches/0106-Add-a-parameter-renamer.patch
new file mode 100644
index 0000000..1a83eea
--- /dev/null
+++ b/FernFlower-Patches/0106-Add-a-parameter-renamer.patch
@@ -0,0 +1,64 @@
+From 879a4330a3b7e46d9b72a3418e1980138af6f53f Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sun, 25 Oct 2015 14:08:24 -0400
+Subject: [PATCH 106/122] Add a parameter renamer
+
+---
+ .../jetbrains/java/decompiler/main/ClassWriter.java  | 12 +++++++++++-
+ .../main/extern/IAbstractParameterRenamer.java       |  7 +++++++
+ 2 files changed, 18 insertions(+), 1 deletion(-)
+ create mode 100644 src/org/jetbrains/java/decompiler/main/extern/IAbstractParameterRenamer.java
+
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+index 7c8276c..808c5e1 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+@@ -18,6 +18,7 @@ package org.jetbrains.java.decompiler.main;
+ import org.jetbrains.java.decompiler.code.CodeConstants;
+ import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
+ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
++import org.jetbrains.java.decompiler.main.extern.IAbstractParameterRenamer;
+ import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
+ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+ import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
+@@ -730,6 +731,9 @@ public class ClassWriter {
+ 
+             buffer.append(' ');
+             String parameterName = methodWrapper.varproc.getVarName(new VarVersionPair(index, 0));
++            if ((flags & (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_NATIVE)) != 0) {
++                parameterName = renameParameterIfPossible(parameterName, index, methodWrapper, flags);
++            }
+             buffer.append(parameterName == null ? "param" + index : parameterName); // null iff decompiled with errors
+ 
+             firstParameter = false;
+@@ -835,7 +839,13 @@ public class ClassWriter {
+     return !hideMethod;
+   }
+ 
+-  private static void mapLines(TextBuffer code, StructLineNumberTableAttribute table, BytecodeMappingTracer tracer, int startLine) {
++  private String renameParameterIfPossible(String parameterName, int index, MethodWrapper methodWrapper, int flags) {
++    if (DecompilerContext.getProperty("abstractparamrenamer")==null) return parameterName;
++    IAbstractParameterRenamer property = (IAbstractParameterRenamer) DecompilerContext.getProperty("abstractparamrenamer");
++    return property.renameParameter(parameterName, index, methodWrapper, flags);
++}
++
++private static void mapLines(TextBuffer code, StructLineNumberTableAttribute table, BytecodeMappingTracer tracer, int startLine) {
+     // build line start offsets map
+     HashMap<Integer, Set<Integer>> lineStartOffsets = new HashMap<Integer, Set<Integer>>();
+     for (Map.Entry<Integer, Integer> entry : tracer.getMapping().entrySet()) {
+diff --git a/src/org/jetbrains/java/decompiler/main/extern/IAbstractParameterRenamer.java b/src/org/jetbrains/java/decompiler/main/extern/IAbstractParameterRenamer.java
+new file mode 100644
+index 0000000..4c509eb
+--- /dev/null
++++ b/src/org/jetbrains/java/decompiler/main/extern/IAbstractParameterRenamer.java
+@@ -0,0 +1,7 @@
++package org.jetbrains.java.decompiler.main.extern;
++
++import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
++
++public interface IAbstractParameterRenamer {
++  public String renameParameter(String orig, int index, MethodWrapper wrapper, int flags);
++}
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0107-Bulk-decompilation-test-for-all-to-use.patch b/FernFlower-Patches/0107-Bulk-decompilation-test-for-all-to-use.patch
new file mode 100644
index 0000000..da24ef0
--- /dev/null
+++ b/FernFlower-Patches/0107-Bulk-decompilation-test-for-all-to-use.patch
@@ -0,0 +1,317 @@
+From da700502cecd6e05622a5f61112f9c9ea0a7dc23 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sun, 25 Oct 2015 14:08:33 -0400
+Subject: [PATCH 107/122] Bulk decompilation test for all to use
+
+---
+ build.gradle                                  |  42 +++++
+ .../MinecraftDecompilationTest.java           | 154 +++++++++++-------
+ 2 files changed, 141 insertions(+), 55 deletions(-)
+
+diff --git a/build.gradle b/build.gradle
+index bc211f2..cf3d8ec 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -17,6 +17,11 @@ sourceSets {
+ 
+ repositories {
+     mavenCentral()
++   maven {
++       name = "mc"
++       url = "https://libraries.minecraft.net/"
++   }
++
+ }
+ 
+ configurations {
+@@ -28,10 +33,47 @@ dependencies {
+     testCompile 'org.hamcrest:hamcrest-core:1.3'
+     testCompile 'org.hamcrest:hamcrest-library:1.3'
+ 
++  // MC test only
++  testRuntime "oshi-project:oshi-core:1.1"
++  testRuntime "net.java.dev.jna:jna:3.4.0"
++  testRuntime "net.java.dev.jna:platform:3.4.0"
++  testRuntime "com.ibm.icu:icu4j-core-mojang:51.2"
++  testRuntime "net.sf.jopt-simple:jopt-simple:4.6"
++  testRuntime "com.paulscode:codecjorbis:20101023"
++  testRuntime "com.paulscode:codecwav:20101023"
++  testRuntime "com.paulscode:libraryjavasound:20101123"
++  testRuntime "com.paulscode:librarylwjglopenal:20100824"
++  testRuntime "com.paulscode:soundsystem:20120107"
++  testRuntime "io.netty:netty-all:4.0.23.Final"
++  testRuntime "com.google.guava:guava:17.0"
++  testRuntime "org.apache.commons:commons-lang3:3.3.2"
++  testRuntime "commons-io:commons-io:2.4"
++  testRuntime "commons-codec:commons-codec:1.9"
++  testRuntime "net.java.jinput:jinput:2.0.5"
++  testRuntime "net.java.jutils:jutils:1.0.0"
++  testRuntime "com.google.code.gson:gson:2.2.4"
++  testRuntime "com.mojang:authlib:1.5.21"
++  testRuntime "com.mojang:realms:1.7.39"
++  testRuntime "org.apache.commons:commons-compress:1.8.1"
++  testRuntime "org.apache.httpcomponents:httpclient:4.3.3"
++  testRuntime "commons-logging:commons-logging:1.1.3"
++  testRuntime "org.apache.httpcomponents:httpcore:4.3.2"
++  testRuntime "org.apache.logging.log4j:log4j-api:2.0-beta9"
++  testRuntime "org.apache.logging.log4j:log4j-core:2.0-beta9"
++  testRuntime "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209"
++  testRuntime "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209"
++  testRuntime "tv.twitch:twitch:6.5"
++
+     // maven deployment
+     deployerJars "org.apache.maven.wagon:wagon-ssh:2.2"
+ }
+ 
++test {
++    systemProperties System.properties
++	onOutput {
++		descriptor, event -> logger.lifecycle("TESTOUTPUT:" + event.message)
++	}
++}
+ compileJava.options.encoding = "utf-8"
+ compileJava.options.deprecation = true
+ 
+diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
+index 660d031..0d68e88 100644
+--- a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
++++ b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
+@@ -16,8 +16,12 @@
+ package org.jetbrains.java.decompiler;
+ 
+ import org.hamcrest.Matchers;
++import org.jetbrains.java.decompiler.code.CodeConstants;
++import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
++import org.jetbrains.java.decompiler.main.extern.IAbstractParameterRenamer;
+ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
++import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ import org.junit.After;
+ import org.junit.Assert;
+@@ -34,11 +38,17 @@ import java.util.HashSet;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.Map.Entry;
++import java.util.regex.Matcher;
++import java.util.regex.Pattern;
+ import java.util.zip.ZipEntry;
+ import java.util.zip.ZipFile;
+ 
+ public class MinecraftDecompilationTest {
++  public static final Pattern p = Pattern.compile("func_(\\d+)_.*");
+   private DecompilerTestFixture fixture;
++  public static final int LOOPS = Integer.parseInt(System.getProperty("fftestloops","50"));
++  public static final String OUTROOT = System.getProperty("fftestout","C:/TEMP/FFTEST");
++  public static final String MD5IN = System.getProperty("ffmd5in",null);
+ 
+   private static final String MC_JAR = "minecraft_ff_in.jar";
+   @Before
+@@ -46,7 +56,7 @@ public class MinecraftDecompilationTest {
+     fixture = new DecompilerTestFixture() {
+       @Override
+       public File getRandomDir() {
+-        return new File("/run/user/1000/fftest");
++        return new File(OUTROOT,"fftest");
+       }
+     };
+     Map<String,Object> mcFFOptions = new HashMap<String,Object>() {{
+@@ -56,9 +66,24 @@ public class MinecraftDecompilationTest {
+         put(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH, "1");
+         put(IFernflowerPreferences.REMOVE_BRIDGE, "1");
+         put(IFernflowerPreferences.REMOVE_SYNTHETIC, "1");
+-        put(IFernflowerPreferences.NEW_LINE_SEPARATOR, "0");
++        put(IFernflowerPreferences.NEW_LINE_SEPARATOR, "1");
++        put(IFernflowerPreferences.LITERALS_AS_IS, "0");
+     }};
+     fixture.setUp(mcFFOptions);
++    DecompilerContext.setProperty("abstractparamrenamer", new IAbstractParameterRenamer() {
++        @Override
++        public String renameParameter(String orig, int index, MethodWrapper wrapper, int flags) {
++            String result = orig;
++            if ((flags & CodeConstants.ACC_ABSTRACT) != 0) {
++                String methName = wrapper.methodStruct.getName();
++                Matcher m = p.matcher(methName);
++                if (m.matches()) {
++                    result = String.format("p_%s_%d_", m.group(1),index);
++                }
++            }
++            return result;
++        }
++    });
+     if (!new File(fixture.getTestDataDir(), MC_JAR).exists()) {
+       throw new RuntimeException("Missing "+MC_JAR+" in testData dir - aborting");
+     }
+@@ -85,28 +110,44 @@ public class MinecraftDecompilationTest {
+   @Test
+   public void testJar() throws IOException {
+     Map<String,String> md5s = new HashMap<String,String>();
+-	MessageDigest md5;
++    MessageDigest md5;
+     try {
+-	  md5 = MessageDigest.getInstance("MD5");
+-	} catch (NoSuchAlgorithmException e1) {
++      md5 = MessageDigest.getInstance("MD5");
++    } catch (NoSuchAlgorithmException e1) {
+       md5 = null;
+-	}
+-
+-    System.out.println("Decompiling base");
++    }
++    System.out.printf("TEST SETUP: MD5: %s, OUTPUT: %s, LOOPS %d\n",MD5IN, OUTROOT, LOOPS);
+     ConsoleDecompiler decompiler = fixture.getDecompiler();
+-    decompiler.addSpace(new File(fixture.getTestDataDir(), MC_JAR), true);
+-    decompiler.decompileContext();
++    Map<String, String> valid = new HashMap<String,String>();
++    if (MD5IN != null) {
++        byte[] bytes = InterpreterUtil.getBytes(new File(MD5IN));
++        String md5list = new String(bytes,"UTF-8");
++        for (String line : md5list.split("\n")) {
++            String[] parts = line.split(",");
++            md5s.put(parts[0],parts[1]);
++        }
++    } else {
+ 
+-    Map<String, HashSet<String>> variants = new HashMap<String, HashSet<String>>();
++        System.out.println("Decompiling base");
++        decompiler.addSpace(new File(fixture.getTestDataDir(), MC_JAR), true);
++        decompiler.decompileContext();
+ 
+-    Map<String, String> valid = readJar(new File(fixture.getTargetDir(), MC_JAR),md5s,md5);
+-    
+-    File outRoot = new File("/run/user/1000/ffbulk");
++
++        readJar(new File(fixture.getTargetDir(), MC_JAR),md5s,md5);
++        File outmd5 = new File(fixture.getRandomDir(),"md5s.csv");
++        FileWriter fos = new FileWriter(outmd5);
++        for (Entry<String, String> md5sum : md5s.entrySet()) {
++          fos.write(String.format("%s,%s\n", md5sum.getKey(),md5sum.getValue()));
++        }
++        fos.close();
++    }
++    Map<String, HashSet<String>> variants = new HashMap<String, HashSet<String>>();
++    File outRoot = new File(OUTROOT,"ffbulk");
+     outRoot.mkdirs();
+-    for (int x = 0; x < 10000; x++) {
++    for (int x = 0; x < LOOPS; x++) {
+       this.tearDown();
+       this.setUp();
+-      System.out.println(x + "/10000 Starting Decompile");
++      System.out.printf("%d/%s Starting Decompile",x,LOOPS);
+       decompiler = fixture.getDecompiler();
+       decompiler.addSpace(new File(fixture.getTestDataDir(), MC_JAR), true);
+       decompiler.decompileContext();
+@@ -115,29 +156,32 @@ public class MinecraftDecompilationTest {
+       Map<String, String> data = readJar(new File(fixture.getTargetDir(), MC_JAR),null,null);
+ 
+       for (Entry<String, String> e : data.entrySet()) {
++        String fname = e.getKey();
+         String found = e.getValue();
+-        String expected = valid.get(e.getKey());
+-        if (!found.equals(expected)) {
+-          HashSet<String> set = variants.get(e.getKey());
+-          if (set == null) {
+-            set = new HashSet<String>();
+-            set.add(expected);
+-            variants.put(e.getKey(), set);
+-          }
+-          String md5digest = md5digest(found, md5);
+-		if (!set.contains(found)) {
+-            System.out.println("New Variant: " + e.getKey());
+-            set.add(found);
+-            System.out.println("Orig md5:"+md5s.get(e.getKey()));
+-            System.out.println("Variant md5: "+md5digest);
+-            writeFile(expected,e.getKey(),outRoot);
+-            writeFile(found,e.getKey()+"."+md5digest,outRoot);
+-          }
+-          else
+-          {
+-            System.out.println("Existing Variant: " + e.getKey());
++        String md5digest = md5digest(found, md5);
++        String expected = null;
++        if (md5digest.equals(md5s.get(fname)) && !valid.containsKey(fname)) {
++          valid.put(fname, found);
++          expected = found;
++        } else if (valid.containsKey(fname)) {
++          expected = valid.get(fname);
++        }
++        HashSet<String> set = variants.get(fname);
++        if (set == null) {
++          set = new HashSet<String>();
++          set.add(md5s.get(fname));
++          variants.put(fname, set);
++        }
++        if (!set.contains(md5digest)) {
++            System.out.println("New Variant: " + fname);
++            set.add(md5digest);
++            System.out.println("Orig md5:"+md5s.get(fname));
+             System.out.println("Variant md5: "+md5digest);
+-          }
++            writeFile(expected,fname,outRoot);
++            writeFile(found,fname+"."+md5digest,outRoot);
++        } else if (!md5digest.equals(md5s.get(fname))) {
++          System.out.println("Existing Variant: " + fname);
++          System.out.println("Variant md5: "+md5digest);
+         }
+       }
+     }
+@@ -145,15 +189,15 @@ public class MinecraftDecompilationTest {
+   }
+ 
+   private static void writeFile(String fl, String path, File outRoot) {
+-	  File out = new File(outRoot,path);
+-	  out.getParentFile().mkdirs();
++      File out = new File(outRoot,path);
++      out.getParentFile().mkdirs();
+       try {
+-		FileWriter fw = new FileWriter(out.getAbsoluteFile());
+-		  fw.write(fl);
+-		  fw.close();
+-	} catch (IOException e) {
+-		e.printStackTrace();
+-	}
++        FileWriter fw = new FileWriter(out.getAbsoluteFile());
++          fw.write(fl);
++          fw.close();
++    } catch (IOException e) {
++        e.printStackTrace();
++    }
+   }
+   private static Map<String, String> readJar(File archive, Map<String, String> md5s, MessageDigest md5) {
+     Map<String, String> ret = new HashMap<String, String>();
+@@ -170,10 +214,10 @@ public class MinecraftDecompilationTest {
+             out.close();
+             in.close();
+             String fileContent = new String(out.toByteArray());
+-			ret.put(entry.getName(), fileContent);
+-			if (md5!=null && md5s != null) {
+-				md5s.put(entry.getName(), md5digest(fileContent, md5));
+-			}
++            ret.put(entry.getName(), fileContent);
++            if (md5!=null && md5s != null) {
++                md5s.put(entry.getName(), md5digest(fileContent, md5));
++            }
+           }
+         }
+       }
+@@ -187,11 +231,11 @@ public class MinecraftDecompilationTest {
+     return ret;
+   }
+   private static String md5digest(String input, MessageDigest md5) {
+-	  md5.reset();
+-	  try {
+-		return String.format("0%032x",new BigInteger(1,md5.digest(input.getBytes("UTF-8"))));
+-	} catch (UnsupportedEncodingException e) {
+-		return null;
+-	}
++      md5.reset();
++      try {
++        return String.format("0%032x",new BigInteger(1,md5.digest(input.getBytes("UTF-8"))));
++    } catch (UnsupportedEncodingException e) {
++        return null;
++    }
+   }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0108-Fix-NPE.patch b/FernFlower-Patches/0108-Fix-NPE.patch
new file mode 100644
index 0000000..0487fd0
--- /dev/null
+++ b/FernFlower-Patches/0108-Fix-NPE.patch
@@ -0,0 +1,25 @@
+From 72d20673f0ae872335858e728ff81532049422f0 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sun, 25 Oct 2015 14:26:33 -0400
+Subject: [PATCH 108/122] Fix NPE
+
+---
+ .../jetbrains/java/decompiler/MinecraftDecompilationTest.java   | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
+index 0d68e88..2ae6da5 100644
+--- a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
++++ b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
+@@ -177,7 +177,7 @@ public class MinecraftDecompilationTest {
+             set.add(md5digest);
+             System.out.println("Orig md5:"+md5s.get(fname));
+             System.out.println("Variant md5: "+md5digest);
+-            writeFile(expected,fname,outRoot);
++            if (expected != null) writeFile(expected,fname,outRoot);
+             writeFile(found,fname+"."+md5digest,outRoot);
+         } else if (!md5digest.equals(md5s.get(fname))) {
+           System.out.println("Existing Variant: " + fname);
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0109-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch b/FernFlower-Patches/0109-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch
new file mode 100644
index 0000000..2b17d1f
--- /dev/null
+++ b/FernFlower-Patches/0109-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch
@@ -0,0 +1,154 @@
+From 01e351e13f31deaa74035ceeda111ace834849a8 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Wed, 28 Oct 2015 23:45:40 -0700
+Subject: [PATCH 109/122] Stabelize a few areas on Java 8. Notibly the exit
+ mapper. Fixes the decompile differences between J6/7 and J8.
+
+---
+ .../decompiler/main/rels/MethodProcessorRunnable.java  |  6 ++++--
+ .../java/decompiler/modules/decompiler/DomHelper.java  |  4 ++--
+ .../decompose/DominatorTreeExceptionFilter.java        |  6 +++---
+ .../decompose/FastExtendedPostdominanceHelper.java     |  6 +++---
+ .../modules/decompiler/stats/GeneralStatement.java     |  3 ++-
+ .../modules/decompiler/stats/SwitchStatement.java      | 10 +++++++++-
+ 6 files changed, 23 insertions(+), 12 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+index 16d7788..9bcd3ba 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+@@ -253,8 +253,10 @@ public class MethodProcessorRunnable implements Runnable {
+     for (Object obj : root.getSequentialObjects()) {
+       if (obj instanceof Statement) {
+         printStatement((Statement)obj, "  ",varProc);
++      } else if (obj == null) {
++          System.out.println("  null");
+       } else {
+-        System.out.println("  " + obj.getClass().getSimpleName());
++          System.out.println("  " + obj.getClass().getSimpleName());
+       }
+     }
+     if (root instanceof RootStatement) {
+@@ -292,7 +294,7 @@ public class MethodProcessorRunnable implements Runnable {
+     int start = values.nextSetBit(0);
+     int end = values.length()-1;
+ 
+-    System.out.print(indent + "{" + statement.type + "}:" + statement.id + " (" + start + ", " + end + ") " + statement.getClass().getSimpleName());
++    System.out.print(indent + "{" + statement.getClass().getSimpleName() + "}:" + statement.id + " (" + start + ", " + end + ") " + statement.getClass().getSimpleName());
+     if (statement.type == Statement.TYPE_DO) {
+         System.out.print(" t:"+((DoStatement)statement).getLooptype());
+     } else if (statement.type == Statement.TYPE_BASICBLOCK) {
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
+index c45f5e0..e780bd6 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
+@@ -483,11 +483,11 @@ public class DomHelper {
+ 
+         boolean same = (post == head);
+ 
+-        HashSet<Statement> setNodes = new HashSet<Statement>();
++        LinkedHashSet<Statement> setNodes = new LinkedHashSet<Statement>();
+         HashSet<Statement> setPreds = new HashSet<Statement>();
+ 
+         // collect statement nodes
+-        HashSet<Statement> setHandlers = new HashSet<Statement>();
++        HashSet<Statement> setHandlers = new LinkedHashSet<Statement>();
+         setHandlers.add(head);
+         while (true) {
+ 
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
+index 89e6849..1c3a8e1 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
+@@ -27,10 +27,10 @@ public class DominatorTreeExceptionFilter {
+   private final Statement statement;
+ 
+   // idom, nodes
+-  private final Map<Integer, Set<Integer>> mapTreeBranches = new HashMap<Integer, Set<Integer>>();
++  private final Map<Integer, Set<Integer>> mapTreeBranches = new LinkedHashMap<Integer, Set<Integer>>();
+ 
+   // handler, range nodes
+-  private final Map<Integer, Set<Integer>> mapExceptionRanges = new HashMap<Integer, Set<Integer>>();
++  private final Map<Integer, Set<Integer>> mapExceptionRanges = new LinkedHashMap<Integer, Set<Integer>>();
+ 
+   // handler, head dom
+   private Map<Integer, Integer> mapExceptionDoms = new HashMap<Integer, Integer>();
+@@ -86,7 +86,7 @@ public class DominatorTreeExceptionFilter {
+ 
+       Set<Integer> set = mapTreeBranches.get(idom);
+       if (set == null) {
+-        mapTreeBranches.put(idom, set = new HashSet<Integer>());
++        mapTreeBranches.put(idom, set = new LinkedHashSet<Integer>());
+       }
+       set.add(key);
+     }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
+index eee7b15..349f522 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
+@@ -28,9 +28,9 @@ public class FastExtendedPostdominanceHelper {
+ 
+   private List<Statement> lstReversePostOrderList;
+ 
+-  private HashMap<Integer, FastFixedSet<Integer>> mapSupportPoints = new HashMap<Integer, FastFixedSet<Integer>>();
++  private HashMap<Integer, FastFixedSet<Integer>> mapSupportPoints = new LinkedHashMap<Integer, FastFixedSet<Integer>>();
+ 
+-  private final HashMap<Integer, FastFixedSet<Integer>> mapExtPostdominators = new HashMap<Integer, FastFixedSet<Integer>>();
++  private final HashMap<Integer, FastFixedSet<Integer>> mapExtPostdominators = new LinkedHashMap<Integer, FastFixedSet<Integer>>();
+ 
+   private Statement statement;
+ 
+@@ -40,7 +40,7 @@ public class FastExtendedPostdominanceHelper {
+ 
+     this.statement = statement;
+ 
+-    HashSet<Integer> set = new HashSet<Integer>();
++    HashSet<Integer> set = new LinkedHashSet<Integer>();
+     for (Statement st : statement.getStats()) {
+       set.add(st.id);
+     }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
+index 499894a..f7e0080 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
+@@ -20,6 +20,7 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+ 
+ import java.util.Collection;
+ import java.util.HashSet;
++import java.util.LinkedHashSet;
+ 
+ 
+ public class GeneralStatement extends Statement {
+@@ -39,7 +40,7 @@ public class GeneralStatement extends Statement {
+     first = head;
+     stats.addWithKey(head, head.id);
+ 
+-    HashSet<Statement> set = new HashSet<Statement>(statements);
++    LinkedHashSet<Statement> set = new LinkedHashSet<Statement>(statements);
+     set.remove(head);
+ 
+     for (Statement st : set) {
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
+index 2a29309..af522d9 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
+@@ -80,7 +80,15 @@ public class SwitchStatement extends Statement {
+ 
+     default_edge = head.getSuccessorEdges(Statement.STATEDGE_DIRECT_ALL).get(0);
+ 
+-    for (Statement st : lstNodes) {
++    //We need to use set above in case we have multiple edges to the same node. But HashSets iterator is not ordered, so sort
++    List<Statement> sorted = new ArrayList<Statement>(lstNodes);
++    Collections.sort(sorted, new Comparator<Statement>() {
++      @Override
++      public int compare(Statement o1, Statement o2) {
++        return o1.id - o2.id;
++      }
++    });
++    for (Statement st : sorted) {
+       stats.addWithKey(st, st.id);
+     }
+   }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0110-Gather-all-variable-declarations-including-those-wit.patch b/FernFlower-Patches/0110-Gather-all-variable-declarations-including-those-wit.patch
new file mode 100644
index 0000000..6eed6e6
--- /dev/null
+++ b/FernFlower-Patches/0110-Gather-all-variable-declarations-including-those-wit.patch
@@ -0,0 +1,135 @@
+From 360216c53673ce9f6aa83fd697123edd9637badb Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Thu, 5 Nov 2015 20:36:11 -0800
+Subject: [PATCH 110/122] Gather all variable declarations including those
+ without LVTs
+
+---
+ .../decompiler/vars/VarDefinitionHelper.java  | 56 +++++++++++++------
+ 1 file changed, 39 insertions(+), 17 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index 726edd7..164ddb5 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -18,6 +18,7 @@ package org.jetbrains.java.decompiler.modules.decompiler.vars;
+ import org.jetbrains.java.decompiler.code.CodeConstants;
+ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
++import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+@@ -31,6 +32,7 @@ import org.jetbrains.java.decompiler.struct.StructClass;
+ import org.jetbrains.java.decompiler.struct.StructMethod;
+ import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
+ import org.jetbrains.java.decompiler.struct.gen.VarType;
++import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
+ 
+ import java.util.*;
+ import java.util.Map.Entry;
+@@ -421,36 +423,43 @@ public class VarDefinitionHelper {
+   }
+ 
+   private void propogateLVTs(Statement stat) {
+-    if (varproc.getLVT() == null) {
+-      return;
+-    }
+-
+     MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
+-    Map<VarVersionPair, LVTVariable> types = new HashMap<VarVersionPair, LVTVariable>();
++    Map<VarVersionPair, VarInfo> types = new HashMap<VarVersionPair, VarInfo>();
+ 
+     int index = 0;
+     if (!mt.hasModifier(CodeConstants.ACC_STATIC)) {
+-      types.put(new VarVersionPair(index, 0), varproc.getLVT().getCandidates(index++).get(0));
++      types.put(new VarVersionPair(index, 0), new VarInfo(varproc.getLVT().getCandidates(index++).get(0), new VarType(mt.getClassStruct().qualifiedName)));
+     }
+ 
+     for (VarType var : md.params) {
+       List<LVTVariable> vars = varproc.getLVT().getCandidates(index);
+       if (vars != null) {
+-        types.put(new VarVersionPair(index, 0), vars.get(0));
++        types.put(new VarVersionPair(index, 0), new VarInfo(vars.get(0), var));
+       }
+       index += var.stackSize;
+     }
+ 
+     findTypes(stat, types);
+ 
+-    for (Entry<VarVersionPair, LVTVariable> e : types.entrySet()) {
+-      varproc.setVarLVT(e.getKey(), e.getValue());
++    //renameTypes(types);
++
++    for (Entry<VarVersionPair, VarInfo> e : types.entrySet()) {
++      if (e.getValue().lvt != null) {
++        varproc.setVarLVT(e.getKey(), e.getValue().lvt);
++      }
+     }
+ 
+-    applyTypes(stat, types);
++    Map<VarVersionPair, LVTVariable> lvts = new HashMap<VarVersionPair, LVTVariable>();
++    for (Entry<VarVersionPair, VarInfo> e : types.entrySet()) {
++      if (e.getValue().lvt != null) {
++        lvts.put(e.getKey(), e.getValue().lvt);
++      }
++    }
++
++    applyTypes(stat, lvts);
+   }
+ 
+-  private void findTypes(Statement stat, Map<VarVersionPair, LVTVariable> types) {
++  private void findTypes(Statement stat, Map<VarVersionPair, VarInfo> types) {
+     if (stat == null) {
+       return;
+     }
+@@ -476,27 +485,40 @@ public class VarDefinitionHelper {
+     }
+   }
+ 
+-  private void findTypes(Exprent exp, Map<VarVersionPair, LVTVariable> types) {
++  private void findTypes(Exprent exp, Map<VarVersionPair, VarInfo> types) {
+     List<Exprent> lst = exp.getAllExprents(true);
+     lst.add(exp);
+ 
+     for (Exprent exprent : lst) {
+       if (exprent.type == Exprent.EXPRENT_VAR) {
+         VarExprent var = (VarExprent)exprent;
+-        if (var.getLVT() == null) {
+-          continue;
+-        }
+         VarVersionPair ver = new VarVersionPair(var);
+         if (var.isDefinition()) {
+-          types.put(ver, var.getLVT());
++          types.put(ver, new VarInfo(var.getLVT(), var.getVarType()));
+         }
+         else if (!types.containsKey(ver)) {
+-          types.put(ver, var.getLVT());
++          types.put(ver, new VarInfo(var.getLVT(), var.getVarType()));
+         }
+       }
+     }
+   }
+ 
++  private static class VarInfo {
++    LVTVariable lvt;
++    String cast;
++    private VarInfo(LVTVariable lvt, VarType type) {
++      if (lvt != null && lvt.getSig() != null) {
++        cast = ExprProcessor.getCastTypeName(GenericType.parse(lvt.getSig()));
++      }
++      else if (lvt != null) {
++        cast = ExprProcessor.getCastTypeName(lvt.getVarType());
++      }
++      else {
++        cast = ExprProcessor.getCastTypeName(type);
++      }
++    }
++  }
++
+ 
+   private void applyTypes(Statement stat, Map<VarVersionPair, LVTVariable> types) {
+     if (stat == null || types.size() == 0) {
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0111-Renaming-thinger.patch b/FernFlower-Patches/0111-Renaming-thinger.patch
new file mode 100644
index 0000000..ee04c70
--- /dev/null
+++ b/FernFlower-Patches/0111-Renaming-thinger.patch
@@ -0,0 +1,846 @@
+From f02eb602c3f8d68e5842cc9dd65718aa9ab425cf Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Fri, 6 Nov 2015 01:36:47 -0500
+Subject: [PATCH 111/122] Renaming thinger
+
+---
+ .../java/decompiler/main/ClassWriter.java     |  10 +-
+ .../decompiler/main/DecompilerContext.java    |  19 ++
+ .../java/decompiler/main/Fernflower.java      |   1 +
+ .../main/IdentityRenamerFactory.java          |  28 +++
+ .../main/extern/IVariableNameProvider.java    |  11 +
+ .../main/extern/IVariableNamingFactory.java   |   7 +
+ .../decompiler/main/rels/MethodWrapper.java   |   2 +
+ .../main/rels/NestedClassProcessor.java       |   2 +-
+ .../decompiler/vars/VarDefinitionHelper.java  |  48 +++--
+ .../java/decompiler/struct/StructMethod.java  |   3 +
+ .../java/decompiler/util/JADNameProvider.java | 193 ++++++++++++++++++
+ .../decompiler/DecompilerTestFixture.java     |  16 +-
+ .../jetbrains/java/decompiler/LVTTest.java    |   1 +
+ .../MinecraftDecompilationTest.java           | 173 +++-------------
+ 14 files changed, 337 insertions(+), 177 deletions(-)
+ create mode 100644 src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java
+ create mode 100644 src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java
+ create mode 100644 src/org/jetbrains/java/decompiler/main/extern/IVariableNamingFactory.java
+ create mode 100644 src/org/jetbrains/java/decompiler/util/JADNameProvider.java
+
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+index 808c5e1..c515d2e 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+@@ -732,7 +732,7 @@ public class ClassWriter {
+             buffer.append(' ');
+             String parameterName = methodWrapper.varproc.getVarName(new VarVersionPair(index, 0));
+             if ((flags & (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_NATIVE)) != 0) {
+-                parameterName = renameParameterIfPossible(parameterName, index, methodWrapper, flags);
++                parameterName = methodWrapper.methodStruct.renamer.renameAbstractParameter(parameterName);
+             }
+             buffer.append(parameterName == null ? "param" + index : parameterName); // null iff decompiled with errors
+ 
+@@ -839,13 +839,7 @@ public class ClassWriter {
+     return !hideMethod;
+   }
+ 
+-  private String renameParameterIfPossible(String parameterName, int index, MethodWrapper methodWrapper, int flags) {
+-    if (DecompilerContext.getProperty("abstractparamrenamer")==null) return parameterName;
+-    IAbstractParameterRenamer property = (IAbstractParameterRenamer) DecompilerContext.getProperty("abstractparamrenamer");
+-    return property.renameParameter(parameterName, index, methodWrapper, flags);
+-}
+-
+-private static void mapLines(TextBuffer code, StructLineNumberTableAttribute table, BytecodeMappingTracer tracer, int startLine) {
++  private static void mapLines(TextBuffer code, StructLineNumberTableAttribute table, BytecodeMappingTracer tracer, int startLine) {
+     // build line start offsets map
+     HashMap<Integer, Set<Integer>> lineStartOffsets = new HashMap<Integer, Set<Integer>>();
+     for (Map.Entry<Integer, Integer> entry : tracer.getMapping().entrySet()) {
+diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
+index 15c6e40..8d4d403 100644
+--- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
++++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
+@@ -21,8 +21,10 @@ import org.jetbrains.java.decompiler.main.collectors.ImportCollector;
+ import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
+ import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
+ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
++import org.jetbrains.java.decompiler.main.extern.IVariableNamingFactory;
+ import org.jetbrains.java.decompiler.modules.renamer.PoolInterceptor;
+ import org.jetbrains.java.decompiler.struct.StructContext;
++import org.jetbrains.java.decompiler.util.JADNameProvider;
+ 
+ import java.util.HashMap;
+ import java.util.Locale;
+@@ -36,6 +38,7 @@ public class DecompilerContext {
+   public static final String CURRENT_METHOD_DESCRIPTOR = "CURRENT_METHOD_DESCRIPTOR";
+   public static final String CURRENT_METHOD_WRAPPER = "CURRENT_METHOD_WRAPPER";
+   public static final String CURRENT_VAR_PROCESSOR = "CURRENT_VAR_PROCESSOR";
++  public static final String RENAMER_FACTORY = "RENAMER_FACTORY";
+ 
+   private static final ThreadLocal<DecompilerContext> currentContext = new ThreadLocal<DecompilerContext>();
+ 
+@@ -48,6 +51,7 @@ public class DecompilerContext {
+   private PoolInterceptor poolInterceptor;
+   private IFernflowerLogger logger;
+   private BytecodeSourceMapper bytecodeSourceMapper;
++  private IVariableNamingFactory renamerFactory;
+ 
+   private DecompilerContext(Map<String, Object> properties) {
+     this.properties = properties;
+@@ -59,6 +63,17 @@ public class DecompilerContext {
+       properties.putAll(propertiesCustom);
+     }
+     currentContext.set(new DecompilerContext(properties));
++    // Default a no-op renamer factory if none is provided
++    if (DecompilerContext.getProperty(RENAMER_FACTORY) != null) {
++      try {
++        currentContext.get().renamerFactory = Class.forName((String) DecompilerContext.getProperty(RENAMER_FACTORY)).asSubclass(IVariableNamingFactory.class).newInstance();
++      } catch (Exception e) {
++
++      }
++    }
++    if (DecompilerContext.getNamingFactory() == null) {
++      currentContext.get().renamerFactory = new JADNameProvider.JADNameProviderFactory();
++    }
+   }
+ 
+   public static DecompilerContext getCurrentContext() {
+@@ -141,6 +156,10 @@ public class DecompilerContext {
+     return getCurrentContext().logger;
+   }
+ 
++  public static IVariableNamingFactory getNamingFactory() {
++      return getCurrentContext().renamerFactory;
++  }
++
+   public static void setLogger(IFernflowerLogger logger) {
+     if (logger != null) {
+       String level = (String)getProperty(IFernflowerPreferences.LOG_LEVEL);
+diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
+index 6afe975..91e70d3 100644
+--- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
++++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
+@@ -27,6 +27,7 @@ import org.jetbrains.java.decompiler.struct.IDecompiledData;
+ import org.jetbrains.java.decompiler.struct.StructClass;
+ import org.jetbrains.java.decompiler.struct.StructContext;
+ import org.jetbrains.java.decompiler.struct.lazy.LazyLoader;
++import org.jetbrains.java.decompiler.util.JADNameProvider;
+ 
+ import java.io.File;
+ import java.util.HashSet;
+diff --git a/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java b/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java
+new file mode 100644
+index 0000000..bc29407
+--- /dev/null
++++ b/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java
+@@ -0,0 +1,28 @@
++package org.jetbrains.java.decompiler.main;
++
++import java.util.Map;
++
++import org.jetbrains.java.decompiler.main.extern.IVariableNameProvider;
++import org.jetbrains.java.decompiler.main.extern.IVariableNamingFactory;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
++import org.jetbrains.java.decompiler.struct.StructMethod;
++
++public class IdentityRenamerFactory implements IVariableNamingFactory, IVariableNameProvider {
++  @Override
++  public IVariableNameProvider createFactory(StructMethod method) {
++    return this;
++  }
++
++  @Override
++  public String renameAbstractParameter(String abstractParam) {
++    return abstractParam;
++  }
++
++  @Override
++  public Map<VarVersionPair, String> rename(Map<VarVersionPair, String> variables) {
++    return null;
++  }
++  @Override
++  public void addParentContext(IVariableNameProvider renamer) {
++  }
++}
+diff --git a/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java b/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java
+new file mode 100644
+index 0000000..9d6b1a5
+--- /dev/null
++++ b/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java
+@@ -0,0 +1,11 @@
++package org.jetbrains.java.decompiler.main.extern;
++
++import java.util.Map;
++
++import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
++
++public interface IVariableNameProvider {
++  public Map<VarVersionPair,String> rename(Map<VarVersionPair,String> variables);
++  public String renameAbstractParameter(String abstractParam);
++  public void addParentContext(IVariableNameProvider renamer);
++}
+diff --git a/src/org/jetbrains/java/decompiler/main/extern/IVariableNamingFactory.java b/src/org/jetbrains/java/decompiler/main/extern/IVariableNamingFactory.java
+new file mode 100644
+index 0000000..2f6c3ec
+--- /dev/null
++++ b/src/org/jetbrains/java/decompiler/main/extern/IVariableNamingFactory.java
+@@ -0,0 +1,7 @@
++package org.jetbrains.java.decompiler.main.extern;
++
++import org.jetbrains.java.decompiler.struct.StructMethod;
++
++public interface IVariableNamingFactory {
++  public IVariableNameProvider createFactory(StructMethod structMethod);
++}
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
+index 0f44e42..c277392 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
+@@ -15,7 +15,9 @@
+  */
+ package org.jetbrains.java.decompiler.main.rels;
+ 
++import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
++import org.jetbrains.java.decompiler.main.extern.IVariableNameProvider;
+ import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph;
+ import org.jetbrains.java.decompiler.modules.decompiler.sforms.FlattenStatementsHelper;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+index 3975d8c..07ac606 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+@@ -577,7 +577,7 @@ public class NestedClassProcessor {
+     for (final MethodWrapper meth : child.getWrapper().getMethods()) {
+ 
+       if (meth.root != null) { // neither abstract nor native
+-
++        if (encmeth != null) { meth.methodStruct.renamer.addParentContext(encmeth.methodStruct.renamer); }
+         // local var names
+         HashMap<VarVersionPair, String> mapNewNames = new HashMap<VarVersionPair, String>();
+         // local var types
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index 164ddb5..59b1c42 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -18,6 +18,7 @@ package org.jetbrains.java.decompiler.modules.decompiler.vars;
+ import org.jetbrains.java.decompiler.code.CodeConstants;
+ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
++import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
+ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
+@@ -424,35 +425,47 @@ public class VarDefinitionHelper {
+ 
+   private void propogateLVTs(Statement stat) {
+     MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
+-    Map<VarVersionPair, VarInfo> types = new HashMap<VarVersionPair, VarInfo>();
++    Map<VarVersionPair, VarInfo> types = new LinkedHashMap<VarVersionPair, VarInfo>();
+ 
+     int index = 0;
+     if (!mt.hasModifier(CodeConstants.ACC_STATIC)) {
+-      types.put(new VarVersionPair(index, 0), new VarInfo(varproc.getLVT().getCandidates(index++).get(0), new VarType(mt.getClassStruct().qualifiedName)));
++      types.put(new VarVersionPair(index++, 0), new VarInfo(null,null));
+     }
+ 
+     for (VarType var : md.params) {
+       List<LVTVariable> vars = varproc.getLVT().getCandidates(index);
+       if (vars != null) {
+-        types.put(new VarVersionPair(index, 0), new VarInfo(vars.get(0), var));
++        types.put(new VarVersionPair(index, 0), new VarInfo(null,null));
+       }
+       index += var.stackSize;
+     }
+ 
+     findTypes(stat, types);
+ 
+-    //renameTypes(types);
+-
++    Map<VarVersionPair,String> typeNames = new LinkedHashMap<VarVersionPair,String>();
+     for (Entry<VarVersionPair, VarInfo> e : types.entrySet()) {
+-      if (e.getValue().lvt != null) {
+-        varproc.setVarLVT(e.getKey(), e.getValue().lvt);
+-      }
++      typeNames.put(e.getKey(), e.getValue().typeName());
+     }
+-
++    StructMethod current_meth = (StructMethod)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD);
++    Map<VarVersionPair, String> renames = current_meth.renamer.rename(typeNames);
+     Map<VarVersionPair, LVTVariable> lvts = new HashMap<VarVersionPair, LVTVariable>();
++
+     for (Entry<VarVersionPair, VarInfo> e : types.entrySet()) {
+-      if (e.getValue().lvt != null) {
+-        lvts.put(e.getKey(), e.getValue().lvt);
++      VarVersionPair idx = e.getKey();
++      // skip this. we can't rename it
++      if (idx.var == 0 && !mt.hasModifier(CodeConstants.ACC_STATIC)) {
++        continue;
++      }
++      LVTVariable lvt = e.getValue().lvt;
++      if (renames!=null) {
++        varproc.setVarName(idx, renames.get(idx));
++      }
++      if (lvt != null) {
++        if (renames!=null) {
++          lvt = lvt.rename(renames.get(idx));
++        }
++        varproc.setVarLVT(idx, lvt);
++        lvts.put(idx, lvt);
+       }
+     }
+ 
+@@ -508,14 +521,21 @@ public class VarDefinitionHelper {
+     String cast;
+     private VarInfo(LVTVariable lvt, VarType type) {
+       if (lvt != null && lvt.getSig() != null) {
+-        cast = ExprProcessor.getCastTypeName(GenericType.parse(lvt.getSig()));
++        cast = ExprProcessor.getCastTypeName(GenericType.parse(lvt.getSig()),false);
+       }
+       else if (lvt != null) {
+-        cast = ExprProcessor.getCastTypeName(lvt.getVarType());
++        cast = ExprProcessor.getCastTypeName(lvt.getVarType(),false);
++      }
++      else if (type != null) {
++        cast = ExprProcessor.getCastTypeName(type,false);
+       }
+       else {
+-        cast = ExprProcessor.getCastTypeName(type);
++        cast = "this";
+       }
++      this.lvt = lvt;
++    }
++    public String typeName() {
++      return cast;
+     }
+   }
+ 
+diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
+index 8f0da2b..7e7f758 100644
+--- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
++++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
+@@ -18,6 +18,7 @@ package org.jetbrains.java.decompiler.struct;
+ import org.jetbrains.java.decompiler.code.*;
+ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
++import org.jetbrains.java.decompiler.main.extern.IVariableNameProvider;
+ import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
+ import org.jetbrains.java.decompiler.struct.attr.StructGenericSignatureAttribute;
+ import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+@@ -60,6 +61,7 @@ public class StructMethod extends StructMember {
+   private InstructionSequence seq;
+   private boolean expanded = false;
+   private VBStyleCollection<StructGeneralAttribute, String> codeAttributes;
++  public final IVariableNameProvider renamer;
+ 
+   public StructMethod(DataInputFullStream in, StructClass clStruct) throws IOException {
+     classStruct = clStruct;
+@@ -78,6 +80,7 @@ public class StructMethod extends StructMember {
+       attributes.addAllWithKey(codeAttributes);
+       codeAttributes = null;
+     }
++    this.renamer = DecompilerContext.getNamingFactory().createFactory(this);
+   }
+ 
+   @Override
+diff --git a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
+new file mode 100644
+index 0000000..010ef5f
+--- /dev/null
++++ b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
+@@ -0,0 +1,193 @@
++package org.jetbrains.java.decompiler.util;
++
++import java.util.ArrayList;
++import java.util.Collections;
++import java.util.Comparator;
++import java.util.HashMap;
++import java.util.LinkedHashMap;
++import java.util.List;
++import java.util.Locale;
++import java.util.Map;
++import java.util.Map.Entry;
++import java.util.regex.Pattern;
++
++import org.jetbrains.java.decompiler.main.extern.IVariableNameProvider;
++import org.jetbrains.java.decompiler.main.extern.IVariableNamingFactory;
++import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
++import org.jetbrains.java.decompiler.struct.StructMethod;
++
++public class JADNameProvider implements IVariableNameProvider {
++    private HashMap<String, Holder> last = null;
++    private HashMap<String, String> remap = null;
++    private static final Pattern CAPS_START = Pattern.compile("^[A-Z]");
++    private static final Pattern ARRAY = Pattern.compile("(\\[|\\.\\.\\.)");
++
++    public JADNameProvider(StructMethod wrapper) {
++      last = new HashMap<String, Holder>();
++      last.put("int",       new Holder(0, true,  "i", "j", "k", "l"));
++      last.put("byte",       new Holder(0, false, "b"       ));
++      last.put("char",       new Holder(0, false, "c"       ));
++      last.put("short",       new Holder(1, false, "short"   ));
++      last.put("boolean",       new Holder(0, true,  "flag"    ));
++      last.put("double",       new Holder(0, false, "d"       ));
++      last.put("float",       new Holder(0, true,  "f"       ));
++      last.put("File",    new Holder(1, true,  "file"    ));
++      last.put("String",  new Holder(0, true,  "s"       ));
++      last.put("Class",   new Holder(0, true,  "oclass"  ));
++      last.put("Long",    new Holder(0, true,  "olong"   ));
++      last.put("Byte",    new Holder(0, true,  "obyte"   ));
++      last.put("Short",   new Holder(0, true,  "oshort"  ));
++      last.put("Boolean", new Holder(0, true,  "obool"   ));
++      last.put("Package", new Holder(0, true,  "opackage"));
++      last.put("Enum",    new Holder(0, true,  "oenum"   ));
++
++      remap = new HashMap<String, String>();
++      remap.put("long", "int");
++    }
++
++    public void addParentContext(IVariableNameProvider iparent) {
++        JADNameProvider parent = (JADNameProvider) iparent;
++        last = new HashMap<String, Holder>();
++        for (Entry<String, Holder> e : parent.last.entrySet()) {
++            Holder v = e.getValue();
++            last.put(e.getKey(), new Holder(v.id, v.skip_zero, v.names));
++        }
++
++        remap = new HashMap<String, String>();
++        for (Entry<String, String> e : parent.remap.entrySet()) {
++            remap.put(e.getKey(), e.getValue());
++        }
++    }
++
++    private static class Holder {
++      public int id;
++      public boolean skip_zero;
++      public final List<String> names = new ArrayList<String>();
++
++      public Holder(int t1, boolean skip_zero, String... names) {
++        this.id = t1;
++        this.skip_zero = skip_zero;
++        Collections.addAll(this.names, names);
++      }
++
++      public Holder(int t1, boolean skip_zero, List<String> names) {
++        this.id = t1;
++        this.skip_zero = skip_zero;
++        this.names.addAll(names);
++      }
++    }
++
++    public Map<VarVersionPair,String> rename(Map<VarVersionPair, String> entries) {
++      List<VarVersionPair> keys = new ArrayList<VarVersionPair>(entries.keySet());
++      Collections.sort(keys, new Comparator<VarVersionPair>(){
++        @Override
++        public int compare(VarVersionPair o1, VarVersionPair o2) {
++          if (o1.var != o2.var) return o1.var - o2.var;
++          return o1.version - o2.version;
++        }
++      });
++      Map<VarVersionPair,String> result = new LinkedHashMap<VarVersionPair,String>();
++      for (VarVersionPair ver : keys) {
++        String type = entries.get(ver);
++        if ("this".equals(type)) {
++          continue;
++        }
++        if (type.indexOf('<') != -1) {
++          type = type.substring(0, type.indexOf('<') - 1);
++        }
++        if (type.indexOf('.') != -1) {
++          type = type.substring(type.lastIndexOf('.')+1);
++        }
++        result.put(ver, getNewName(type));
++      }
++      return result;
++    }
++
++    protected String getNewName(String type) {
++        String index = null;
++        String findtype = type;
++
++        while (findtype.contains("[][]"))
++        {
++            findtype = findtype.replaceAll("\\[\\]\\[\\]", "[]");
++        }
++        if (last.containsKey(findtype))
++        {
++            index = findtype;
++        }
++        else if (last.containsKey(findtype.toLowerCase(Locale.ENGLISH)))
++        {
++            index = findtype.toLowerCase(Locale.ENGLISH);
++        }
++        else if (remap.containsKey(type))
++        {
++            index = remap.get(type);
++        }
++
++        if ((index == null || index.length() == 0) && (CAPS_START.matcher(type).find() || ARRAY.matcher(type).find()))
++        {
++            // replace multi things with arrays.
++            type = type.replace("...", "[]");
++
++            while (type.contains("[][]"))
++            {
++                type = type.replaceAll("\\[\\]\\[\\]", "[]");
++            }
++
++            String name = type.toLowerCase(Locale.ENGLISH);
++            // Strip single dots that might happen because of inner class references
++            name = name.replace(".", "");
++            boolean skip_zero = true;
++
++            if (Pattern.compile("\\[").matcher(type).find())
++            {
++                skip_zero = true;
++                name = "a" + name;
++                name = name.replace("[]", "").replace("...", "");
++            }
++
++            last.put(type.toLowerCase(Locale.ENGLISH), new Holder(0, skip_zero, name));
++            index = type.toLowerCase(Locale.ENGLISH);
++        }
++
++        if (index == null || index.length() == 0)
++        {
++            return type.toLowerCase(Locale.ENGLISH);
++        }
++
++        Holder holder = last.get(index);
++        int id = holder.id;
++        List<String> names = holder.names;
++
++        int ammount = names.size();
++
++        String name;
++        if (ammount == 1)
++        {
++            name = names.get(0) + (id == 0 && holder.skip_zero ? "" : id);
++        }
++        else
++        {
++            int num = id / ammount;
++            name = names.get(id % ammount) + (id < ammount && holder.skip_zero ? "" : num);
++        }
++
++        holder.id++;
++        return name;
++    }
++
++    @Override
++    public String renameAbstractParameter(String abstractParam) {
++      return abstractParam;
++    }
++
++
++    public static class JADNameProviderFactory implements IVariableNamingFactory {
++        @Override
++        public IVariableNameProvider createFactory(StructMethod method) {
++            return new JADNameProvider(method);
++        }
++
++    }
++}
+\ No newline at end of file
+diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
+index 77eda87..f2c344a 100644
+--- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
++++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
+@@ -46,26 +46,23 @@ public class DecompilerTestFixture {
+     assertTrue("current dir: " + new File("").getAbsolutePath(), isTestDataDir(testDataDir));
+ 
+     //noinspection SSBasedInspection
+-    tempDir = getRandomDir();
+-    if (tempDir.exists()) tempDir.delete();
++    tempDir = File.createTempFile("decompiler_test_", "_dir");
++    assertTrue(tempDir.delete());
++
+     targetDir = new File(tempDir, "decompiled");
+-    targetDir.mkdirs();
++    assertTrue(targetDir.mkdirs());
+     decompiler = new ConsoleDecompiler(this.targetDir, new HashMap<String, Object>() {{
+       put(IFernflowerPreferences.LOG_LEVEL, "warn");
+       put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES, "1");
+       put(IFernflowerPreferences.REMOVE_SYNTHETIC, "1");
+       put(IFernflowerPreferences.REMOVE_BRIDGE, "1");
+       put(IFernflowerPreferences.LITERALS_AS_IS, "1");
+-      put(IFernflowerPreferences.MAX_PROCESSING_METHOD, "60000");
++      put(IFernflowerPreferences.UNIT_TEST_MODE, "1");
+       putAll(options);
+     }});
+   }
+ 
+-  protected File getRandomDir() throws IOException {
+-	  return File.createTempFile("decompiler_test_", "_dir");
+-  }
+-
+-public void tearDown() {
++  public void tearDown() {
+     if (tempDir != null && cleanup) {
+       delete(tempDir);
+     }
+@@ -98,5 +95,6 @@ public void tearDown() {
+         for (File f : files) delete(f);
+       }
+     }
++    assertTrue(file.delete());
+   }
+ }
+diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
+index 368407e..ff2457b 100644
+--- a/test/org/jetbrains/java/decompiler/LVTTest.java
++++ b/test/org/jetbrains/java/decompiler/LVTTest.java
+@@ -59,4 +59,5 @@ public class LVTTest extends SingleClassesTestBase {
+ //  @Test public void testMCAbstractResourcePack() { doTest("net/minecraft/client/resources/AbstractResourcePack"); }
+ //  @Test public void testMCGuiShareToLan() { doTest("net/minecraft/client/gui/GuiShareToLan"); }
+ //  @Test public void testMCContainerPlayer() { doTest("net/minecraft/inventory/ContainerPlayer"); }
++  @Test public void testMCContainerPlayer() { doTest("net/minecraft/inventory/ContainerPlayer"); }
+ }
+diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
+index 2ae6da5..087c810 100644
+--- a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
++++ b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
+@@ -16,83 +16,47 @@
+ package org.jetbrains.java.decompiler;
+ 
+ import org.hamcrest.Matchers;
+-import org.jetbrains.java.decompiler.code.CodeConstants;
+-import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
+-import org.jetbrains.java.decompiler.main.extern.IAbstractParameterRenamer;
+ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+-import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ import org.junit.After;
+-import org.junit.Assert;
+ import org.junit.Before;
+ import org.junit.Test;
+ 
+ import java.io.*;
+-import java.math.BigInteger;
+-import java.security.MessageDigest;
+-import java.security.NoSuchAlgorithmException;
+ import java.util.Enumeration;
+ import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.List;
+ import java.util.Map;
+-import java.util.Map.Entry;
+-import java.util.regex.Matcher;
+-import java.util.regex.Pattern;
+ import java.util.zip.ZipEntry;
+ import java.util.zip.ZipFile;
+ 
++import static org.junit.Assert.assertThat;
++import static org.junit.Assert.assertTrue;
++
+ public class MinecraftDecompilationTest {
+-  public static final Pattern p = Pattern.compile("func_(\\d+)_.*");
+   private DecompilerTestFixture fixture;
+-  public static final int LOOPS = Integer.parseInt(System.getProperty("fftestloops","50"));
+-  public static final String OUTROOT = System.getProperty("fftestout","C:/TEMP/FFTEST");
+-  public static final String MD5IN = System.getProperty("ffmd5in",null);
+ 
+   private static final String MC_JAR = "minecraft_ff_in.jar";
+   @Before
+   public void setUp() throws IOException {
+-    fixture = new DecompilerTestFixture() {
+-      @Override
+-      public File getRandomDir() {
+-        return new File(OUTROOT,"fftest");
+-      }
+-    };
++    fixture = new DecompilerTestFixture();
++    // -din=1 -rbr=0 -dgs=1 -asc=1 -rsy=0
+     Map<String,Object> mcFFOptions = new HashMap<String,Object>() {{
+         put(IFernflowerPreferences.DECOMPILE_INNER,"1");
+         put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES,"1");
+         put(IFernflowerPreferences.ASCII_STRING_CHARACTERS,"1");
+         put(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH, "1");
+-        put(IFernflowerPreferences.REMOVE_BRIDGE, "1");
+-        put(IFernflowerPreferences.REMOVE_SYNTHETIC, "1");
+-        put(IFernflowerPreferences.NEW_LINE_SEPARATOR, "1");
+-        put(IFernflowerPreferences.LITERALS_AS_IS, "0");
+     }};
+     fixture.setUp(mcFFOptions);
+-    DecompilerContext.setProperty("abstractparamrenamer", new IAbstractParameterRenamer() {
+-        @Override
+-        public String renameParameter(String orig, int index, MethodWrapper wrapper, int flags) {
+-            String result = orig;
+-            if ((flags & CodeConstants.ACC_ABSTRACT) != 0) {
+-                String methName = wrapper.methodStruct.getName();
+-                Matcher m = p.matcher(methName);
+-                if (m.matches()) {
+-                    result = String.format("p_%s_%d_", m.group(1),index);
+-                }
+-            }
+-            return result;
+-        }
+-    });
+     if (!new File(fixture.getTestDataDir(), MC_JAR).exists()) {
+-      throw new RuntimeException("Missing "+MC_JAR+" in testData dir - aborting");
++        throw new RuntimeException("Missing "+MC_JAR+" in testData dir - aborting");
+     }
+   }
+ 
+   @After
+   public void tearDown() {
+-    fixture.tearDown();
+-    fixture = null;
++//    fixture.tearDown();
++//    fixture = null;
+   }
+ 
+ //  @Test
+@@ -108,116 +72,32 @@ public class MinecraftDecompilationTest {
+ //  }
+ 
+   @Test
+-  public void testJar() throws IOException {
+-    Map<String,String> md5s = new HashMap<String,String>();
+-    MessageDigest md5;
+-    try {
+-      md5 = MessageDigest.getInstance("MD5");
+-    } catch (NoSuchAlgorithmException e1) {
+-      md5 = null;
+-    }
+-    System.out.printf("TEST SETUP: MD5: %s, OUTPUT: %s, LOOPS %d\n",MD5IN, OUTROOT, LOOPS);
++  public void testJar() {
+     ConsoleDecompiler decompiler = fixture.getDecompiler();
+-    Map<String, String> valid = new HashMap<String,String>();
+-    if (MD5IN != null) {
+-        byte[] bytes = InterpreterUtil.getBytes(new File(MD5IN));
+-        String md5list = new String(bytes,"UTF-8");
+-        for (String line : md5list.split("\n")) {
+-            String[] parts = line.split(",");
+-            md5s.put(parts[0],parts[1]);
+-        }
+-    } else {
+-
+-        System.out.println("Decompiling base");
+-        decompiler.addSpace(new File(fixture.getTestDataDir(), MC_JAR), true);
+-        decompiler.decompileContext();
+-
+-
+-        readJar(new File(fixture.getTargetDir(), MC_JAR),md5s,md5);
+-        File outmd5 = new File(fixture.getRandomDir(),"md5s.csv");
+-        FileWriter fos = new FileWriter(outmd5);
+-        for (Entry<String, String> md5sum : md5s.entrySet()) {
+-          fos.write(String.format("%s,%s\n", md5sum.getKey(),md5sum.getValue()));
+-        }
+-        fos.close();
+-    }
+-    Map<String, HashSet<String>> variants = new HashMap<String, HashSet<String>>();
+-    File outRoot = new File(OUTROOT,"ffbulk");
+-    outRoot.mkdirs();
+-    for (int x = 0; x < LOOPS; x++) {
+-      this.tearDown();
+-      this.setUp();
+-      System.out.printf("%d/%s Starting Decompile",x,LOOPS);
+-      decompiler = fixture.getDecompiler();
+-      decompiler.addSpace(new File(fixture.getTestDataDir(), MC_JAR), true);
+-      decompiler.decompileContext();
+-      System.gc();
++    decompiler.addSpace(new File(fixture.getTestDataDir(), MC_JAR), true);
++    decompiler.decompileContext();
+ 
+-      Map<String, String> data = readJar(new File(fixture.getTargetDir(), MC_JAR),null,null);
++    File unpacked = new File(fixture.getTempDir(), "unpacked");
++    unpack(new File(fixture.getTargetDir(), "bulk.jar"), unpacked);
+ 
+-      for (Entry<String, String> e : data.entrySet()) {
+-        String fname = e.getKey();
+-        String found = e.getValue();
+-        String md5digest = md5digest(found, md5);
+-        String expected = null;
+-        if (md5digest.equals(md5s.get(fname)) && !valid.containsKey(fname)) {
+-          valid.put(fname, found);
+-          expected = found;
+-        } else if (valid.containsKey(fname)) {
+-          expected = valid.get(fname);
+-        }
+-        HashSet<String> set = variants.get(fname);
+-        if (set == null) {
+-          set = new HashSet<String>();
+-          set.add(md5s.get(fname));
+-          variants.put(fname, set);
+-        }
+-        if (!set.contains(md5digest)) {
+-            System.out.println("New Variant: " + fname);
+-            set.add(md5digest);
+-            System.out.println("Orig md5:"+md5s.get(fname));
+-            System.out.println("Variant md5: "+md5digest);
+-            if (expected != null) writeFile(expected,fname,outRoot);
+-            writeFile(found,fname+"."+md5digest,outRoot);
+-        } else if (!md5digest.equals(md5s.get(fname))) {
+-          System.out.println("Existing Variant: " + fname);
+-          System.out.println("Variant md5: "+md5digest);
+-        }
+-      }
+-    }
+ //    compareDirectories(new File(fixture.getTestDataDir(), "bulk"), unpacked);
+   }
+ 
+-  private static void writeFile(String fl, String path, File outRoot) {
+-      File out = new File(outRoot,path);
+-      out.getParentFile().mkdirs();
+-      try {
+-        FileWriter fw = new FileWriter(out.getAbsoluteFile());
+-          fw.write(fl);
+-          fw.close();
+-    } catch (IOException e) {
+-        e.printStackTrace();
+-    }
+-  }
+-  private static Map<String, String> readJar(File archive, Map<String, String> md5s, MessageDigest md5) {
+-    Map<String, String> ret = new HashMap<String, String>();
++  private static void unpack(File archive, File targetDir) {
+     try {
+       ZipFile zip = new ZipFile(archive);
+       try {
+         Enumeration<? extends ZipEntry> entries = zip.entries();
+         while (entries.hasMoreElements()) {
+           ZipEntry entry = entries.nextElement();
+-          if (!entry.isDirectory() && entry.getName().endsWith(".java")) {
++          if (!entry.isDirectory()) {
++            File file = new File(targetDir, entry.getName());
++            assertTrue(file.getParentFile().mkdirs() || file.getParentFile().isDirectory());
+             InputStream in = zip.getInputStream(entry);
+-            ByteArrayOutputStream out = new ByteArrayOutputStream((int)entry.getSize());
++            OutputStream out = new FileOutputStream(file);
+             InterpreterUtil.copyStream(in, out);
+             out.close();
+             in.close();
+-            String fileContent = new String(out.toByteArray());
+-            ret.put(entry.getName(), fileContent);
+-            if (md5!=null && md5s != null) {
+-                md5s.put(entry.getName(), md5digest(fileContent, md5));
+-            }
+           }
+         }
+       }
+@@ -228,14 +108,17 @@ public class MinecraftDecompilationTest {
+     catch (IOException e) {
+       throw new RuntimeException(e);
+     }
+-    return ret;
+   }
+-  private static String md5digest(String input, MessageDigest md5) {
+-      md5.reset();
+-      try {
+-        return String.format("0%032x",new BigInteger(1,md5.digest(input.getBytes("UTF-8"))));
+-    } catch (UnsupportedEncodingException e) {
+-        return null;
++
++  private static void compareDirectories(File expected, File actual) {
++    String[] expectedList = expected.list();
++    String[] actualList = actual.list();
++    assertThat(actualList, Matchers.arrayContainingInAnyOrder(expectedList));
++    for (String name : expectedList) {
++      File child = new File(expected, name);
++      if (child.isDirectory()) {
++        compareDirectories(child, new File(actual, name));
++      }
+     }
+   }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0112-Fix-up-some-name-issues.-Still-outstanding-propogati.patch b/FernFlower-Patches/0112-Fix-up-some-name-issues.-Still-outstanding-propogati.patch
new file mode 100644
index 0000000..2c31c04
--- /dev/null
+++ b/FernFlower-Patches/0112-Fix-up-some-name-issues.-Still-outstanding-propogati.patch
@@ -0,0 +1,103 @@
+From 59732c39518f9dc24da57d846df7adceaf806dbf Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Fri, 6 Nov 2015 02:30:26 -0500
+Subject: [PATCH 112/122] Fix up some name issues. Still outstanding:
+ propogating the parent context into child methods. Current placement in
+ insertLocalVars is too late.
+
+---
+ .../jetbrains/java/decompiler/main/ClassesProcessor.java  | 8 ++++++++
+ .../java/decompiler/main/rels/NestedClassProcessor.java   | 1 -
+ .../decompiler/modules/decompiler/vars/LVTVariable.java   | 4 +++-
+ .../jetbrains/java/decompiler/util/JADNameProvider.java   | 3 ++-
+ test/org/jetbrains/java/decompiler/LVTTest.java           | 2 +-
+ 5 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+index 0060021..b3bd44e 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+@@ -24,6 +24,7 @@ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+ import org.jetbrains.java.decompiler.main.extern.IIdentifierRenamer;
+ import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
+ import org.jetbrains.java.decompiler.main.rels.LambdaProcessor;
++import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
+ import org.jetbrains.java.decompiler.main.rels.NestedClassProcessor;
+ import org.jetbrains.java.decompiler.main.rels.NestedMemberAccess;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent;
+@@ -334,6 +335,13 @@ public class ClassesProcessor {
+     node.wrapper = wrapper;
+ 
+     for (ClassNode nd : node.nested) {
++      // Stuff the parent context into enclosed child methods
++      if (nd.enclosingMethod != null) {
++        MethodWrapper encmeth = wrapper.getMethods().getWithKey(nd.enclosingMethod);
++        for (final MethodWrapper meth : nd.getWrapper().getMethods()) {
++          meth.methodStruct.renamer.addParentContext(encmeth.methodStruct.renamer);
++        }
++      }
+       initWrappers(nd);
+     }
+   }
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+index 07ac606..9be9edb 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+@@ -577,7 +577,6 @@ public class NestedClassProcessor {
+     for (final MethodWrapper meth : child.getWrapper().getMethods()) {
+ 
+       if (meth.root != null) { // neither abstract nor native
+-        if (encmeth != null) { meth.methodStruct.renamer.addParentContext(encmeth.methodStruct.renamer); }
+         // local var names
+         HashMap<VarVersionPair, String> mapNewNames = new HashMap<VarVersionPair, String>();
+         // local var types
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
+index cb376d9..16f2bfb 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
+@@ -88,6 +88,8 @@ public class LVTVariable implements Comparable<LVTVariable> {
+   }
+ 
+   public LVTVariable rename(String newName) {
+-    return new LVTVariable(newName, desc, start, end, index, isLVTT);
++    LVTVariable lvtVariable = new LVTVariable(newName, desc, start, end, index, isLVTT);
++    lvtVariable.sig = this.sig;
++    return lvtVariable;
+   }
+ }
+\ No newline at end of file
+diff --git a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
+index 010ef5f..4c0c976 100644
+--- a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
++++ b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
+@@ -46,6 +46,7 @@ public class JADNameProvider implements IVariableNameProvider {
+       remap.put("long", "int");
+     }
+ 
++    @Override
+     public void addParentContext(IVariableNameProvider iparent) {
+         JADNameProvider parent = (JADNameProvider) iparent;
+         last = new HashMap<String, Holder>();
+@@ -94,7 +95,7 @@ public class JADNameProvider implements IVariableNameProvider {
+           continue;
+         }
+         if (type.indexOf('<') != -1) {
+-          type = type.substring(0, type.indexOf('<') - 1);
++          type = type.substring(0, type.indexOf('<'));
+         }
+         if (type.indexOf('.') != -1) {
+           type = type.substring(type.lastIndexOf('.')+1);
+diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
+index ff2457b..b4af1f7 100644
+--- a/test/org/jetbrains/java/decompiler/LVTTest.java
++++ b/test/org/jetbrains/java/decompiler/LVTTest.java
+@@ -59,5 +59,5 @@ public class LVTTest extends SingleClassesTestBase {
+ //  @Test public void testMCAbstractResourcePack() { doTest("net/minecraft/client/resources/AbstractResourcePack"); }
+ //  @Test public void testMCGuiShareToLan() { doTest("net/minecraft/client/gui/GuiShareToLan"); }
+ //  @Test public void testMCContainerPlayer() { doTest("net/minecraft/inventory/ContainerPlayer"); }
+-  @Test public void testMCContainerPlayer() { doTest("net/minecraft/inventory/ContainerPlayer"); }
++  @Test public void testMCContainerPlayer() { doTest("net/minecraft/command/PlayerSelector"); }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0113-Propogate-renamer-state-to-nested-classes.patch b/FernFlower-Patches/0113-Propogate-renamer-state-to-nested-classes.patch
new file mode 100644
index 0000000..44b0420
--- /dev/null
+++ b/FernFlower-Patches/0113-Propogate-renamer-state-to-nested-classes.patch
@@ -0,0 +1,191 @@
+From 2ab59c1d7153f83d74f4e82db8174429f9eb80ea Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Fri, 6 Nov 2015 03:13:00 -0800
+Subject: [PATCH 113/122] Propogate renamer state to nested classes.
+
+---
+ .../decompiler/main/ClassesProcessor.java     |  7 ---
+ .../decompiler/vars/VarDefinitionHelper.java  | 43 ++++++++++++++++---
+ .../java/decompiler/util/JADNameProvider.java | 14 +++---
+ .../decompiler/util/StatementIterator.java    | 43 +++++++++++++++++++
+ 4 files changed, 88 insertions(+), 19 deletions(-)
+ create mode 100644 src/org/jetbrains/java/decompiler/util/StatementIterator.java
+
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+index b3bd44e..f22baa0 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+@@ -335,13 +335,6 @@ public class ClassesProcessor {
+     node.wrapper = wrapper;
+ 
+     for (ClassNode nd : node.nested) {
+-      // Stuff the parent context into enclosed child methods
+-      if (nd.enclosingMethod != null) {
+-        MethodWrapper encmeth = wrapper.getMethods().getWithKey(nd.enclosingMethod);
+-        for (final MethodWrapper meth : nd.getWrapper().getMethods()) {
+-          meth.methodStruct.renamer.addParentContext(encmeth.methodStruct.renamer);
+-        }
+-      }
+       initWrappers(nd);
+     }
+   }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index 59b1c42..de4dbdc 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -16,14 +16,16 @@
+ package org.jetbrains.java.decompiler.modules.decompiler.vars;
+ 
+ import org.jetbrains.java.decompiler.code.CodeConstants;
++import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
+ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
+-import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
+ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.NewExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph.ExprentIterator;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchAllStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement;
+@@ -34,6 +36,7 @@ import org.jetbrains.java.decompiler.struct.StructMethod;
+ import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
+ import org.jetbrains.java.decompiler.struct.gen.VarType;
+ import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
++import org.jetbrains.java.decompiler.util.StatementIterator;
+ 
+ import java.util.*;
+ import java.util.Map.Entry;
+@@ -433,9 +436,11 @@ public class VarDefinitionHelper {
+     }
+ 
+     for (VarType var : md.params) {
+-      List<LVTVariable> vars = varproc.getLVT().getCandidates(index);
+-      if (vars != null) {
+-        types.put(new VarVersionPair(index, 0), new VarInfo(null,null));
++      if (varproc.getLVT() != null) {
++        List<LVTVariable> vars = varproc.getLVT().getCandidates(index);
++        if (vars != null) {
++          types.put(new VarVersionPair(index, 0), new VarInfo(null,null));
++        }
+       }
+       index += var.stackSize;
+     }
+@@ -446,8 +451,36 @@ public class VarDefinitionHelper {
+     for (Entry<VarVersionPair, VarInfo> e : types.entrySet()) {
+       typeNames.put(e.getKey(), e.getValue().typeName());
+     }
+-    StructMethod current_meth = (StructMethod)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD);
++    final StructMethod current_meth = (StructMethod)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD);
+     Map<VarVersionPair, String> renames = current_meth.renamer.rename(typeNames);
++
++    // Stuff the parent context into enclosed child methods
++    StatementIterator.iterate(root, new ExprentIterator(){
++      @Override
++      public int processExprent(Exprent exprent){
++        ClassNode child = null;
++        if (exprent.type == Exprent.EXPRENT_VAR) {
++          VarExprent var = (VarExprent)exprent;
++          if (var.isClassDef()) {
++            child = DecompilerContext.getClassProcessor().getMapRootClasses().get(var.getVarType().value);
++          }
++        }
++        else if (exprent.type == Exprent.EXPRENT_NEW) {
++          NewExprent _new = (NewExprent)exprent;
++          if (_new.isAnonymous()) { //TODO: Check for Lambda here?
++            child = DecompilerContext.getClassProcessor().getMapRootClasses().get(_new.getNewType().value);
++          }
++        }
++
++        if (child != null) {
++          for (StructMethod meth : child.classStruct.getMethods()) {
++            meth.renamer.addParentContext(current_meth.renamer);
++          }
++        }
++        return 0;
++      }
++    });
++
+     Map<VarVersionPair, LVTVariable> lvts = new HashMap<VarVersionPair, LVTVariable>();
+ 
+     for (Entry<VarVersionPair, VarInfo> e : types.entrySet()) {
+diff --git a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
+index 4c0c976..f2d2e3b 100644
+--- a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
++++ b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
+@@ -25,13 +25,13 @@ public class JADNameProvider implements IVariableNameProvider {
+ 
+     public JADNameProvider(StructMethod wrapper) {
+       last = new HashMap<String, Holder>();
+-      last.put("int",       new Holder(0, true,  "i", "j", "k", "l"));
+-      last.put("byte",       new Holder(0, false, "b"       ));
+-      last.put("char",       new Holder(0, false, "c"       ));
+-      last.put("short",       new Holder(1, false, "short"   ));
+-      last.put("boolean",       new Holder(0, true,  "flag"    ));
+-      last.put("double",       new Holder(0, false, "d"       ));
+-      last.put("float",       new Holder(0, true,  "f"       ));
++      last.put("int",     new Holder(0, true,  "i", "j", "k", "l"));
++      last.put("byte",    new Holder(0, false, "b"       ));
++      last.put("char",    new Holder(0, false, "c"       ));
++      last.put("short",   new Holder(1, false, "short"   ));
++      last.put("boolean", new Holder(0, true,  "flag"    ));
++      last.put("double",  new Holder(0, false, "d"       ));
++      last.put("float",   new Holder(0, true,  "f"       ));
+       last.put("File",    new Holder(1, true,  "file"    ));
+       last.put("String",  new Holder(0, true,  "s"       ));
+       last.put("Class",   new Holder(0, true,  "oclass"  ));
+diff --git a/src/org/jetbrains/java/decompiler/util/StatementIterator.java b/src/org/jetbrains/java/decompiler/util/StatementIterator.java
+new file mode 100644
+index 0000000..4e4c8b4
+--- /dev/null
++++ b/src/org/jetbrains/java/decompiler/util/StatementIterator.java
+@@ -0,0 +1,43 @@
++package org.jetbrains.java.decompiler.util;
++
++import java.util.List;
++
++import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
++import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph.ExprentIterator;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
++
++public class StatementIterator {
++  public static void iterate(Statement stat, ExprentIterator itr) {
++    if (stat == null) {
++      return;
++    }
++
++    for (Exprent exp : stat.getVarDefinitions()) {
++      iterate(exp, itr);
++    }
++
++    if (stat.getExprents() == null) {
++      for (Object obj : stat.getSequentialObjects()) {
++        if (obj instanceof Statement) {
++          iterate((Statement)obj, itr);
++        }
++        else if (obj instanceof Exprent) {
++          iterate((Exprent)obj, itr);
++        }
++      }
++    }
++    else {
++      for (Exprent exp : stat.getExprents()) {
++        iterate(exp, itr);
++      }
++    }
++  }
++
++  private static void iterate(Exprent exp, ExprentIterator itr) {
++    List<Exprent> lst = exp.getAllExprents(true);
++    lst.add(exp);
++    for (Exprent exprent : lst) {
++      itr.processExprent(exprent);
++    }
++  }
++}
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0114-Properly-implement-options-for-the-renamer-stuff.patch b/FernFlower-Patches/0114-Properly-implement-options-for-the-renamer-stuff.patch
new file mode 100644
index 0000000..6d8baad
--- /dev/null
+++ b/FernFlower-Patches/0114-Properly-implement-options-for-the-renamer-stuff.patch
@@ -0,0 +1,87 @@
+From da7239d27dd36ed264fad47e1051f0f82c9c17b0 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Fri, 6 Nov 2015 15:16:23 -0500
+Subject: [PATCH 114/122] Properly implement options for the renamer stuff.
+ "JVN" argument enables JAD style variable naming (int i, j, k etc). Can pass
+ a "RENAMER_FACTORY" to the decompiler context: this is the name of a class
+ implementing IVariableNamingFactory, that will be loaded and instantiated,
+ overriding other options.
+
+---
+ src/org/jetbrains/java/decompiler/main/ClassWriter.java   | 1 -
+ .../jetbrains/java/decompiler/main/DecompilerContext.java | 8 ++++++--
+ .../decompiler/main/extern/IAbstractParameterRenamer.java | 7 -------
+ .../decompiler/main/extern/IFernflowerPreferences.java    | 3 +++
+ 4 files changed, 9 insertions(+), 10 deletions(-)
+ delete mode 100644 src/org/jetbrains/java/decompiler/main/extern/IAbstractParameterRenamer.java
+
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+index c515d2e..1338a42 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+@@ -18,7 +18,6 @@ package org.jetbrains.java.decompiler.main;
+ import org.jetbrains.java.decompiler.code.CodeConstants;
+ import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
+ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+-import org.jetbrains.java.decompiler.main.extern.IAbstractParameterRenamer;
+ import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
+ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+ import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
+diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
+index 8d4d403..d66145a 100644
+--- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
++++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
+@@ -68,11 +68,15 @@ public class DecompilerContext {
+       try {
+         currentContext.get().renamerFactory = Class.forName((String) DecompilerContext.getProperty(RENAMER_FACTORY)).asSubclass(IVariableNamingFactory.class).newInstance();
+       } catch (Exception e) {
+-
++        getLogger().writeMessage("Error loading renamer factory class", e);
+       }
+     }
+     if (DecompilerContext.getNamingFactory() == null) {
+-      currentContext.get().renamerFactory = new JADNameProvider.JADNameProviderFactory();
++      if (DecompilerContext.getOption(IFernflowerPreferences.USE_JAD_VARNAMING)) {
++        currentContext.get().renamerFactory = new JADNameProvider.JADNameProviderFactory();
++      } else {
++        currentContext.get().renamerFactory = new IdentityRenamerFactory();
++      }
+     }
+   }
+ 
+diff --git a/src/org/jetbrains/java/decompiler/main/extern/IAbstractParameterRenamer.java b/src/org/jetbrains/java/decompiler/main/extern/IAbstractParameterRenamer.java
+deleted file mode 100644
+index 4c509eb..0000000
+--- a/src/org/jetbrains/java/decompiler/main/extern/IAbstractParameterRenamer.java
++++ /dev/null
+@@ -1,7 +0,0 @@
+-package org.jetbrains.java.decompiler.main.extern;
+-
+-import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
+-
+-public interface IAbstractParameterRenamer {
+-  public String renameParameter(String orig, int index, MethodWrapper wrapper, int flags);
+-}
+diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+index 79dd8e8..7940dcf 100644
+--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
++++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+@@ -62,6 +62,8 @@ public interface IFernflowerPreferences {
+ 
+   String INCLUDE_ENTIRE_CLASSPATH = "iec";
+ 
++  String USE_JAD_VARNAMING = "jvn";
++
+   Map<String, Object> DEFAULTS = Collections.unmodifiableMap(new HashMap<String, Object>() {{
+     put(REMOVE_BRIDGE, "1");
+     put(REMOVE_SYNTHETIC, "0");
+@@ -96,5 +98,6 @@ public interface IFernflowerPreferences {
+     put(UNIT_TEST_MODE, "0");
+     put(DUMP_ORIGINAL_LINES, "0");
+     put(INCLUDE_ENTIRE_CLASSPATH, "0");
++    put(USE_JAD_VARNAMING, "0");
+   }});
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0115-Add-the-index-to-the-param-renamer-needed-for-sane-p.patch b/FernFlower-Patches/0115-Add-the-index-to-the-param-renamer-needed-for-sane-p.patch
new file mode 100644
index 0000000..c997fcc
--- /dev/null
+++ b/FernFlower-Patches/0115-Add-the-index-to-the-param-renamer-needed-for-sane-p.patch
@@ -0,0 +1,67 @@
+From ba604f35f4e1abbba5a893c3eb031fb3c6720ebd Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sun, 8 Nov 2015 13:28:24 -0500
+Subject: [PATCH 115/122] Add the index to the param renamer, needed for sane
+ param name generation..
+
+---
+ src/org/jetbrains/java/decompiler/main/ClassWriter.java         | 2 +-
+ .../jetbrains/java/decompiler/main/IdentityRenamerFactory.java  | 2 +-
+ .../java/decompiler/main/extern/IVariableNameProvider.java      | 2 +-
+ src/org/jetbrains/java/decompiler/util/JADNameProvider.java     | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+index 1338a42..25d01e3 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+@@ -731,7 +731,7 @@ public class ClassWriter {
+             buffer.append(' ');
+             String parameterName = methodWrapper.varproc.getVarName(new VarVersionPair(index, 0));
+             if ((flags & (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_NATIVE)) != 0) {
+-                parameterName = methodWrapper.methodStruct.renamer.renameAbstractParameter(parameterName);
++                parameterName = methodWrapper.methodStruct.renamer.renameAbstractParameter(parameterName, index);
+             }
+             buffer.append(parameterName == null ? "param" + index : parameterName); // null iff decompiled with errors
+ 
+diff --git a/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java b/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java
+index bc29407..e8c3340 100644
+--- a/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java
++++ b/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java
+@@ -14,7 +14,7 @@ public class IdentityRenamerFactory implements IVariableNamingFactory, IVariable
+   }
+ 
+   @Override
+-  public String renameAbstractParameter(String abstractParam) {
++  public String renameAbstractParameter(String abstractParam, int index) {
+     return abstractParam;
+   }
+ 
+diff --git a/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java b/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java
+index 9d6b1a5..26f1071 100644
+--- a/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java
++++ b/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java
+@@ -6,6 +6,6 @@ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+ 
+ public interface IVariableNameProvider {
+   public Map<VarVersionPair,String> rename(Map<VarVersionPair,String> variables);
+-  public String renameAbstractParameter(String abstractParam);
++  public String renameAbstractParameter(String abstractParam, int index);
+   public void addParentContext(IVariableNameProvider renamer);
+ }
+diff --git a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
+index f2d2e3b..b588cec 100644
+--- a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
++++ b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
+@@ -179,7 +179,7 @@ public class JADNameProvider implements IVariableNameProvider {
+     }
+ 
+     @Override
+-    public String renameAbstractParameter(String abstractParam) {
++    public String renameAbstractParameter(String abstractParam, int index) {
+       return abstractParam;
+     }
+ 
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0116-Early-set-the-logger-so-that-it-can-be-used-during-i.patch b/FernFlower-Patches/0116-Early-set-the-logger-so-that-it-can-be-used-during-i.patch
new file mode 100644
index 0000000..48ed9fd
--- /dev/null
+++ b/FernFlower-Patches/0116-Early-set-the-logger-so-that-it-can-be-used-during-i.patch
@@ -0,0 +1,40 @@
+From 0d79d5adcf27840fcb93094b62bb04601b6eafd0 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sun, 8 Nov 2015 16:12:19 -0500
+Subject: [PATCH 116/122] Early set the logger so that it can be used during
+ init context without NPEs.
+
+---
+ src/org/jetbrains/java/decompiler/main/DecompilerContext.java | 3 ++-
+ src/org/jetbrains/java/decompiler/main/Fernflower.java        | 1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
+index d66145a..22ab9e0 100644
+--- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
++++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
+@@ -68,7 +68,8 @@ public class DecompilerContext {
+       try {
+         currentContext.get().renamerFactory = Class.forName((String) DecompilerContext.getProperty(RENAMER_FACTORY)).asSubclass(IVariableNamingFactory.class).newInstance();
+       } catch (Exception e) {
+-        getLogger().writeMessage("Error loading renamer factory class", e);
++        e.printStackTrace();
++        System.err.println("Error loading renamer factory class");
+       }
+     }
+     if (DecompilerContext.getNamingFactory() == null) {
+diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
+index 91e70d3..8319da8 100644
+--- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
++++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
+@@ -41,6 +41,7 @@ public class Fernflower implements IDecompiledData {
+ 
+   public Fernflower(IBytecodeProvider provider, IResultSaver saver, Map<String, Object> options, IFernflowerLogger logger) {
+     structContext = new StructContext(saver, this, new LazyLoader(provider));
++    DecompilerContext.setLogger(logger);
+     DecompilerContext.initContext(options);
+     DecompilerContext.setCounterContainer(new CounterContainer());
+     DecompilerContext.setLogger(logger);
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0117-More-fixage-to-the-way-init-happens.patch b/FernFlower-Patches/0117-More-fixage-to-the-way-init-happens.patch
new file mode 100644
index 0000000..33f6a6e
--- /dev/null
+++ b/FernFlower-Patches/0117-More-fixage-to-the-way-init-happens.patch
@@ -0,0 +1,56 @@
+From 7465233a204d2523968638a0275020cd84cdb571 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sun, 8 Nov 2015 16:18:49 -0500
+Subject: [PATCH 117/122] More fixage to the way init happens.
+
+---
+ .../jetbrains/java/decompiler/main/DecompilerContext.java   | 6 +++---
+ src/org/jetbrains/java/decompiler/main/Fernflower.java      | 4 +---
+ 2 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
+index 22ab9e0..f946bb4 100644
+--- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
++++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
+@@ -57,19 +57,19 @@ public class DecompilerContext {
+     this.properties = properties;
+   }
+ 
+-  public static void initContext(Map<String, Object> propertiesCustom) {
++  public static void initContext(Map<String, Object> propertiesCustom, IFernflowerLogger logger) {
+     Map<String, Object> properties = new HashMap<String, Object>(IFernflowerPreferences.DEFAULTS);
+     if (propertiesCustom != null) {
+       properties.putAll(propertiesCustom);
+     }
+     currentContext.set(new DecompilerContext(properties));
++    setLogger(logger);
+     // Default a no-op renamer factory if none is provided
+     if (DecompilerContext.getProperty(RENAMER_FACTORY) != null) {
+       try {
+         currentContext.get().renamerFactory = Class.forName((String) DecompilerContext.getProperty(RENAMER_FACTORY)).asSubclass(IVariableNamingFactory.class).newInstance();
+       } catch (Exception e) {
+-        e.printStackTrace();
+-        System.err.println("Error loading renamer factory class");
++        getLogger().writeMessage("Error loading renamer factory class", e);
+       }
+     }
+     if (DecompilerContext.getNamingFactory() == null) {
+diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
+index 8319da8..320e250 100644
+--- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
++++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
+@@ -41,10 +41,8 @@ public class Fernflower implements IDecompiledData {
+ 
+   public Fernflower(IBytecodeProvider provider, IResultSaver saver, Map<String, Object> options, IFernflowerLogger logger) {
+     structContext = new StructContext(saver, this, new LazyLoader(provider));
+-    DecompilerContext.setLogger(logger);
+-    DecompilerContext.initContext(options);
++    DecompilerContext.initContext(options,logger);
+     DecompilerContext.setCounterContainer(new CounterContainer());
+-    DecompilerContext.setLogger(logger);
+ 
+     if (DecompilerContext.getOption(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH)) {
+       addAllClasspath();
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0118-Try-and-release-the-renamer-after-we-re-done-with-th.patch b/FernFlower-Patches/0118-Try-and-release-the-renamer-after-we-re-done-with-th.patch
new file mode 100644
index 0000000..d72a5f5
--- /dev/null
+++ b/FernFlower-Patches/0118-Try-and-release-the-renamer-after-we-re-done-with-th.patch
@@ -0,0 +1,41 @@
+From f3c197fc7633ffc69ce33e711f542fc1b25d9b3d Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Mon, 23 Nov 2015 11:56:24 -0500
+Subject: [PATCH 118/122] Try and release the renamer after we're done with the
+ class. Should reduce memory footprint somewhat.
+
+---
+ src/org/jetbrains/java/decompiler/struct/StructClass.java  | 3 +++
+ src/org/jetbrains/java/decompiler/struct/StructMethod.java | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
+index ab0f118..7848606 100644
+--- a/src/org/jetbrains/java/decompiler/struct/StructClass.java
++++ b/src/org/jetbrains/java/decompiler/struct/StructClass.java
+@@ -147,6 +147,9 @@ public class StructClass extends StructMember {
+     if (loader != null) {
+       pool = null;
+     }
++    for (StructMethod m : methods) {
++        m.renamer = null;
++    }
+   }
+ 
+   public ConstantPool getPool() {
+diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
+index 7e7f758..68f5427 100644
+--- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
++++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
+@@ -61,7 +61,7 @@ public class StructMethod extends StructMember {
+   private InstructionSequence seq;
+   private boolean expanded = false;
+   private VBStyleCollection<StructGeneralAttribute, String> codeAttributes;
+-  public final IVariableNameProvider renamer;
++  public IVariableNameProvider renamer;
+ 
+   public StructMethod(DataInputFullStream in, StructClass clStruct) throws IOException {
+     classStruct = clStruct;
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0119-Try-to-release-resources-after-we-re-done-not-before.patch b/FernFlower-Patches/0119-Try-to-release-resources-after-we-re-done-not-before.patch
new file mode 100644
index 0000000..23e5e15
--- /dev/null
+++ b/FernFlower-Patches/0119-Try-to-release-resources-after-we-re-done-not-before.patch
@@ -0,0 +1,42 @@
+From 1cfbf4d63df1d352d611683366d7ec94b25951df Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Mon, 23 Nov 2015 14:01:47 -0500
+Subject: [PATCH 119/122] Try to release resources *after* we're done, not
+ before we've started
+
+---
+ src/org/jetbrains/java/decompiler/main/ClassesProcessor.java | 3 +++
+ src/org/jetbrains/java/decompiler/struct/StructClass.java    | 3 ---
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+index f22baa0..5feaf47 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+@@ -354,6 +354,9 @@ public class ClassesProcessor {
+ 
+     node.wrapper = null;
+     node.classStruct.releaseResources();
++    for (StructMethod m : node.classStruct.getMethods()) {
++        m.renamer = null;
++    }
+ 
+     for (ClassNode nd : node.nested) {
+       destroyWrappers(nd);
+diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
+index 7848606..ab0f118 100644
+--- a/src/org/jetbrains/java/decompiler/struct/StructClass.java
++++ b/src/org/jetbrains/java/decompiler/struct/StructClass.java
+@@ -147,9 +147,6 @@ public class StructClass extends StructMember {
+     if (loader != null) {
+       pool = null;
+     }
+-    for (StructMethod m : methods) {
+-        m.renamer = null;
+-    }
+   }
+ 
+   public ConstantPool getPool() {
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0120-Don-t-allocate-a-renamer-for-every-single-method-rea.patch b/FernFlower-Patches/0120-Don-t-allocate-a-renamer-for-every-single-method-rea.patch
new file mode 100644
index 0000000..3f4a48e
--- /dev/null
+++ b/FernFlower-Patches/0120-Don-t-allocate-a-renamer-for-every-single-method-rea.patch
@@ -0,0 +1,33 @@
+From fd28c848f1295a31d38e69f7f5dd7afec52f208f Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Mon, 23 Nov 2015 14:27:08 -0500
+Subject: [PATCH 120/122] Don't allocate a renamer for every single method
+ read. That should cut down the memory quite a lot.
+
+---
+ src/org/jetbrains/java/decompiler/struct/StructMethod.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
+index 68f5427..77fd181 100644
+--- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
++++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
+@@ -80,7 +80,6 @@ public class StructMethod extends StructMember {
+       attributes.addAllWithKey(codeAttributes);
+       codeAttributes = null;
+     }
+-    this.renamer = DecompilerContext.getNamingFactory().createFactory(this);
+   }
+ 
+   @Override
+@@ -121,6 +120,7 @@ public class StructMethod extends StructMember {
+     if (containsCode && !expanded) {
+       byte[] code = classStruct.getLoader().loadBytecode(this, codeFullLength);
+       seq = parseBytecode(new DataInputFullStream(code), codeLength, classStruct.getPool());
++      this.renamer = DecompilerContext.getNamingFactory().createFactory(this);
+       expanded = true;
+     }
+   }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0121-Clean-up-renamer-access-a-bit-ensure-it-s-loaded-for.patch b/FernFlower-Patches/0121-Clean-up-renamer-access-a-bit-ensure-it-s-loaded-for.patch
new file mode 100644
index 0000000..8738aa6
--- /dev/null
+++ b/FernFlower-Patches/0121-Clean-up-renamer-access-a-bit-ensure-it-s-loaded-for.patch
@@ -0,0 +1,110 @@
+From add9bf560f6db5cea287c95b2ee13575ba15c8f3 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Mon, 23 Nov 2015 14:56:19 -0500
+Subject: [PATCH 121/122] Clean up renamer access a bit- ensure it's loaded for
+ inner classes
+
+---
+ .../java/decompiler/main/ClassWriter.java     |  2 +-
+ .../decompiler/main/ClassesProcessor.java     |  2 +-
+ .../decompiler/vars/VarDefinitionHelper.java  |  4 ++--
+ .../java/decompiler/struct/StructMethod.java  | 19 +++++++++++++++++--
+ 4 files changed, 21 insertions(+), 6 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+index 25d01e3..b90f2ec 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+@@ -731,7 +731,7 @@ public class ClassWriter {
+             buffer.append(' ');
+             String parameterName = methodWrapper.varproc.getVarName(new VarVersionPair(index, 0));
+             if ((flags & (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_NATIVE)) != 0) {
+-                parameterName = methodWrapper.methodStruct.renamer.renameAbstractParameter(parameterName, index);
++                parameterName = methodWrapper.methodStruct.getRenamer().renameAbstractParameter(parameterName, index);
+             }
+             buffer.append(parameterName == null ? "param" + index : parameterName); // null iff decompiled with errors
+ 
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+index 5feaf47..e0fdaac 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+@@ -355,7 +355,7 @@ public class ClassesProcessor {
+     node.wrapper = null;
+     node.classStruct.releaseResources();
+     for (StructMethod m : node.classStruct.getMethods()) {
+-        m.renamer = null;
++        m.unloadRenamer();
+     }
+ 
+     for (ClassNode nd : node.nested) {
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index de4dbdc..fcd8c64 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -452,7 +452,7 @@ public class VarDefinitionHelper {
+       typeNames.put(e.getKey(), e.getValue().typeName());
+     }
+     final StructMethod current_meth = (StructMethod)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD);
+-    Map<VarVersionPair, String> renames = current_meth.renamer.rename(typeNames);
++    Map<VarVersionPair, String> renames = current_meth.getRenamer().rename(typeNames);
+ 
+     // Stuff the parent context into enclosed child methods
+     StatementIterator.iterate(root, new ExprentIterator(){
+@@ -474,7 +474,7 @@ public class VarDefinitionHelper {
+ 
+         if (child != null) {
+           for (StructMethod meth : child.classStruct.getMethods()) {
+-            meth.renamer.addParentContext(current_meth.renamer);
++            meth.getRenamer().addParentContext(current_meth.getRenamer());
+           }
+         }
+         return 0;
+diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
+index 77fd181..d7ede2e 100644
+--- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
++++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
+@@ -61,7 +61,7 @@ public class StructMethod extends StructMember {
+   private InstructionSequence seq;
+   private boolean expanded = false;
+   private VBStyleCollection<StructGeneralAttribute, String> codeAttributes;
+-  public IVariableNameProvider renamer;
++  private IVariableNameProvider renamer;
+ 
+   public StructMethod(DataInputFullStream in, StructClass clStruct) throws IOException {
+     classStruct = clStruct;
+@@ -120,11 +120,17 @@ public class StructMethod extends StructMember {
+     if (containsCode && !expanded) {
+       byte[] code = classStruct.getLoader().loadBytecode(this, codeFullLength);
+       seq = parseBytecode(new DataInputFullStream(code), codeLength, classStruct.getPool());
+-      this.renamer = DecompilerContext.getNamingFactory().createFactory(this);
++      loadRenamer();
+       expanded = true;
+     }
+   }
+ 
++  private void loadRenamer() {
++    if (this.renamer == null) {
++      this.renamer = DecompilerContext.getNamingFactory().createFactory(this);
++    }
++  }
++
+   public void releaseResources() throws IOException {
+     if (containsCode && expanded) {
+       seq = null;
+@@ -408,4 +414,13 @@ public class StructMethod extends StructMember {
+   public GenericMethodDescriptor getSignature() {
+     return signature;
+   }
++
++  public IVariableNameProvider getRenamer() {
++    loadRenamer();
++    return renamer;
++  }
++
++  public void unloadRenamer() {
++    this.renamer = null;
++  }
+ }
+-- 
+2.21.0.windows.1
+
diff --git a/FernFlower-Patches/0122-Do-not-merge-varaibles-when-the-to-target-is-read-fu.patch b/FernFlower-Patches/0122-Do-not-merge-varaibles-when-the-to-target-is-read-fu.patch
new file mode 100644
index 0000000..b13a84a
--- /dev/null
+++ b/FernFlower-Patches/0122-Do-not-merge-varaibles-when-the-to-target-is-read-fu.patch
@@ -0,0 +1,163 @@
+From 114aebe82cf40075c5c4f916c409b8aebf8096d5 Mon Sep 17 00:00:00 2001
+From: LexManos <LexManos@gmail.com>
+Date: Mon, 14 Dec 2015 02:09:28 -0800
+Subject: [PATCH 122/122] Do not merge varaibles when the to target is read
+ further in the method.
+
+---
+ .../decompiler/vars/VarDefinitionHelper.java  | 19 +++----
+ .../java/decompiler/util/ExprentUtil.java     | 57 +++++++++++++++++++
+ 2 files changed, 66 insertions(+), 10 deletions(-)
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+index fcd8c64..6566ca7 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+@@ -36,6 +36,7 @@ import org.jetbrains.java.decompiler.struct.StructMethod;
+ import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
+ import org.jetbrains.java.decompiler.struct.gen.VarType;
+ import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
++import org.jetbrains.java.decompiler.util.ExprentUtil;
+ import org.jetbrains.java.decompiler.util.StatementIterator;
+ 
+ import java.util.*;
+@@ -572,7 +573,6 @@ public class VarDefinitionHelper {
+     }
+   }
+ 
+-
+   private void applyTypes(Statement stat, Map<VarVersionPair, LVTVariable> types) {
+     if (stat == null || types.size() == 0) {
+       return;
+@@ -636,16 +636,12 @@ public class VarDefinitionHelper {
+ 
+     Map<VarVersionPair, VarVersionPair> blacklist = new HashMap<VarVersionPair, VarVersionPair>();
+     VPPEntry remap = mergeVars(stat, parent, new HashMap<Integer, VarVersionPair>(), blacklist);
+-    VPPEntry last = remap;
+     while (remap != null) {
+       //System.out.println("Remapping: " + remap.getKey() + " -> " + remap.getValue());
+       if (!remapVar(stat, remap.getKey(), remap.getValue())) {
+         blacklist.put(remap.getKey(), remap.getValue());
+       }
+       remap = mergeVars(stat, parent, new HashMap<Integer, VarVersionPair>(), blacklist);
+-      if (last.equals(remap)){
+-        System.currentTimeMillis();
+-      }
+     }
+     return null;
+   }
+@@ -681,7 +677,9 @@ public class VarDefinitionHelper {
+     }
+ 
+     if (stat.getExprents() == null) {
+-      for (Object obj : stat.getSequentialObjects()) {
++      List<Object> objs = stat.getSequentialObjects();
++      for (int i = 0; i < objs.size(); i++) {
++        Object obj = objs.get(i);
+         if (obj instanceof Statement) {
+           Statement st = (Statement)obj;
+ 
+@@ -736,16 +734,17 @@ public class VarDefinitionHelper {
+         }
+         else if (obj instanceof Exprent) {
+           VPPEntry ret = processExprent((Exprent)obj, this_vars, scoped, blacklist);
+-          if (ret != null) {
++          if (ret != null && !ExprentUtil.isVarReadFirst(ret.getValue(), stat, i + 1)) {
+             return ret;
+           }
+         }
+       }
+     }
+     else {
+-      for (Exprent exp : stat.getExprents()) {
+-        VPPEntry ret = processExprent(exp, this_vars, scoped, blacklist);
+-        if (ret != null) {
++      List<Exprent> exps = stat.getExprents();
++      for (int i = 0; i < exps.size(); i++) {
++        VPPEntry ret = processExprent(exps.get(i), this_vars, scoped, blacklist);
++        if (ret != null && !ExprentUtil.isVarReadFirst(ret.getValue(), stat, i + 1)) {
+           return ret;
+         }
+       }
+diff --git a/src/org/jetbrains/java/decompiler/util/ExprentUtil.java b/src/org/jetbrains/java/decompiler/util/ExprentUtil.java
+index 39ce7ff..cadf983 100644
+--- a/src/org/jetbrains/java/decompiler/util/ExprentUtil.java
++++ b/src/org/jetbrains/java/decompiler/util/ExprentUtil.java
+@@ -17,9 +17,11 @@ package org.jetbrains.java.decompiler.util;
+ 
+ import java.util.List;
+ 
++import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+ 
+ public class ExprentUtil {
+   public static boolean isVarReferenced(VarExprent var, Statement stat, VarExprent... whitelist) {
+@@ -59,7 +61,62 @@ public class ExprentUtil {
+             if (var == white) {
+               allowed = true;
+             }
++          }
++          if (!allowed) {
++            return true;
++          }
++        }
++      }
++    }
++    return false;
++  }
++
++  public static boolean isVarReadFirst(VarVersionPair var, Statement stat, int index, VarExprent... whitelist) {
++    if (stat.getExprents() == null) {
++      List<Object> objs = stat.getSequentialObjects();
++      for (int x = index; x < objs.size(); x++) {
++        Object obj = objs.get(x);
++        if (obj instanceof Statement) {
++          if (isVarReadFirst(var, (Statement)obj, 0, whitelist)) {
++            return true;
++          }
++        }
++        else if (obj instanceof Exprent) {
++          if (isVarReadFirst(var, (Exprent)obj, whitelist)) {
++            return true;
++          }
++        }
++      }
++    }
++    else {
++      for (int x = index; x < stat.getExprents().size(); x++) {
++        if (isVarReadFirst(var, stat.getExprents().get(x), whitelist)) {
++          return true;
++        }
++      }
++    }
++    return false;
++  }
++
++  private static boolean isVarReadFirst(VarVersionPair target, Exprent exp, VarExprent... whitelist) {
++    AssignmentExprent ass = exp.type == Exprent.EXPRENT_ASSIGNMENT ? (AssignmentExprent)exp : null;
++    List<Exprent> lst = exp.getAllExprents(true);
++    lst.add(exp);
++    for (Exprent ex : lst) {
++      if (ex.type == Exprent.EXPRENT_VAR) {
++        VarExprent var = (VarExprent)ex;
++        if (var.getIndex() == target.var && var.getVersion() == target.version) {
++          boolean allowed = false;
++          if (ass != null) {
++            if (var == ass.getLeft()) {
++              allowed = true;
++            }
++          }
++          for (VarExprent white : whitelist) {
++            if (var == white) {
++              allowed = true;
+             }
++          }
+           if (!allowed) {
+             return true;
+           }
+-- 
+2.21.0.windows.1
+

From abf989db6e22a3f80010366da67cff0790796afb Mon Sep 17 00:00:00 2001
From: Curle <curle@gemwire.uk>
Date: Fri, 23 Oct 2020 11:19:44 +0100
Subject: [PATCH 03/22] Minimise patches, fix gradle wrapper. Now compiles on
 all my computers

---
 ...ew-wrapper-and-deploy-to-Forge-Maven.patch |  32 +--
 ...eric-parametrs-for-anonymous-classes.patch |   9 +-
 ...ctions-on-field-initalizers-allowing.patch |  11 +-
 ...ixed-this-calls-not-having-arguments.patch |   9 +-
 ...-synthetic-classes-can-have-content-.patch |  13 +-
 ...-lists-to-produce-a-consistant-decom.patch |  18 +-
 ...so-we-can-quickly-iterate-LVT-hackin.patch |  20 +-
 ...and-LVTT-properly-into-some-structur.patch |  22 +-
 ...o-an-incoming-LVT-if-they-re-out-of-.patch |  11 +-
 ...10-Fix-tests-for-inner-class-sorting.patch |  21 +-
 ...e-field-initalizers-would-incorrectl.patch |  11 +-
 ...non-classes-are-being-detected-as-me.patch |  11 +-
 .../0013-Fixed-last-test-all-tests-pass.patch |   9 +-
 ...pes-are-determined-was-detecting-ano.patch |  14 +-
 ...ructors-with-anon-class-as-last-argu.patch |  14 +-
 ...ces-printing-floats-with-an-undefine.patch |  11 +-
 ...bles-and-variable-definitions.-Again.patch |  17 +-
 ...thetic-classes-allowed-in-parameters.patch |  12 +-
 ...hange-LVT-indexing-to-VarVersionPair.patch |  12 +-
 ...bytecode-to-a-BitMap-as-it-gives-bet.patch |  70 ++----
 ...-data-from-the-Struct-for-easier-abi.patch |  19 +-
 ...er-to-MethodProcessorRunnable-for-th.patch |  10 +-
 ...impler-than-the-complex-one-almost-p.patch |  17 +-
 .../0024-Add-the-test-to-the-harness.patch    |   9 +-
 ...ns-to-the-printout.-Also-fixed-a-fas.patch |  37 ++-
 ...the-varversionpair-in-the-oldnames-t.patch |  20 +-
 ...it-seems-that-it-increases-as-the-vi.patch |  23 +-
 ...-without-an-LVT-entry.-They-re-likel.patch |  24 +-
 ...nts-will-now-use-the-correct-variabl.patch |  33 +--
 ...Each-loop-detection-and-re-introduce.patch |  45 ++--
 ...-on-gradlew.-It-s-writeable-on-linux.patch |   8 +-
 ...-TryCatch-statements-will-now-use-th.patch |  22 +-
 ...-variables-that-seem-to-come-into-sc.patch |  15 +-
 ...o-VarExprent-and-print-generic-types.patch |  33 +--
 ...ement-retain-all-bytecode-data.-And-.patch |  11 +-
 ...efintionHelper-that-splits-variables.patch |  29 +--
 FernFlower-Patches/0037-Lex-s-tests.patch     |  27 +--
 .../0038-Fix-inverted-null-test.patch         |   9 +-
 .../0039-More-tweaks.-Closer.patch            |  39 +--
 ...e-tweaks-it-passes-the-TestLVT-tests.patch |  12 +-
 ...m-lex-merges-RHS-and-LHS-of-exprents.patch |   9 +-
 ...th-start-and-end-to-avoid-weirdness-.patch |  17 +-
 ...etter-remapping-of-assignment-merges.patch |   9 +-
 .../0044-PPMM-test-for-lex.patch              |  15 +-
 ...ange-begin-end-detection.-Less-derpy.patch |  33 +--
 ...PMM-helper-and-expand-PPMM-test-to-i.patch |  22 +-
 .../0047-Prevent-infinite-loops-in-PPMM.patch |   9 +-
 ...in-and-use-alternative-code-for-ppmm.patch | 225 ------------------
 ...ng-tracking-entirely-and-just-do-a-f.patch | 101 --------
 .../0050-Types-are-merged-properly-now.patch  |  27 +--
 ...-does-some-things-better.-But-still-.patch |  14 +-
 ...erging.-It-s-pretty-decent.-But-stil.patch |  11 +-
 ...erging-variables.-Use-top-down-manua.patch |  10 +-
 ...onstant-don-t-give-it-a-type.-Cleans.patch |  14 +-
 ...-the-time-we-create-the-exprents.-Th.patch |  23 +-
 .../0056-Some-code-cleanup-damn-cpw.patch     |  33 +--
 ...ta-post-merge.-And-fix-injected-var-.patch |  14 +-
 ...-LVT-first-and-fallback-to-other-typ.patch |  13 +-
 .../0059-NPE-protection-in-LVT-loading.patch  |   9 +-
 ...intions-in-IfStatement-s-headers-hav.patch |  10 +-
 ...terator-is-being-used-elseware-befor.patch |  11 +-
 ...0062-NPE-Protection-in-EnumProcessor.patch |   9 +-
 ...ed-variables-in-synchronized-headers.patch |  23 +-
 ...-Include-LVT-info-in-VarExprent.copy.patch |  15 +-
 ...etection-and-restore-do-loop-collaps.patch |  18 +-
 ...-to-before-MergeHelper-and-add-more-.patch |  14 +-
 ...tractHelper-to-include-break-edges-t.patch |  11 +-
 ...extracted-ifs-from-being-inlined-aga.patch |  26 +-
 ...source-vars-in-itteration-allows-for.patch |  11 +-
 ...-detection-to-be-before-For-detectio.patch |  12 +-
 ...0071-Propogate-LVTs-to-inner-classes.patch |  23 +-
 ...For-loops-would-be-enhanced-to-ForEa.patch |  10 +-
 ...arguments-for-non-static-inner-class.patch |  14 +-
 ...turn-generic-typevar-casting-support.patch |  21 +-
 ...er-option-iec-Include_Entire_Classpa.patch |  15 +-
 ...pe-to-be-subclass-of-VarType-and-con.patch |  50 ++--
 ...ing-for-an-init-exprent-not-to-look-.patch |  31 +--
 ...eClasspath-so-it-doesn-t-dump-out-ra.patch |  16 +-
 ...pe-parsing-of-inner-classes-with-gen.patch |  10 +-
 .../0080-Foo.-Bar-baz-generation.patch        |  24 +-
 ...anges-to-Exprent.getInferredExprType.patch |  33 +--
 ...ion-from-InvocationExprent-s-inferre.patch |  14 +-
 ...-to-the-VarType-added-type-inference.patch |  23 +-
 ...ists-with-multiple-arguments-in-meth.patch |  10 +-
 ...c-info-from-InvocationExprent-correc.patch |  11 +-
 ...ced-for-loops-can-also-have-a-copy-i.patch |  11 +-
 ...e-strict-in-detecting-copy-var-usage.patch |  12 +-
 .../0088-Enhance-switches-on-enums.patch      |  18 +-
 ...e-inner-class-fields-would-not-be-re.patch |  11 +-
 ...r-and-field-accessors-in-inner-class.patch |  14 +-
 ...cleanup-of-InvocationExprent-changes.patch |   9 +-
 ...ion-test-to-new-settings-no-syntheti.patch |  10 +-
 ...th-trailing-zeros-and-incorrect-type.patch |  10 +-
 ...bel-names-based-on-jvm-instruction-i.patch |  34 +--
 FernFlower-Patches/0095-Version-2.0.patch     |   9 +-
 ...Fixed-invalid-reference-to-ASM.-Oops.patch |   9 +-
 ...xed-potential-NPE-in-lvt-propogation.patch |   9 +-
 ...d-nested-inner-generic-type-printing.patch |   9 +-
 .../0099-Fixed-JUint-tests.patch              |  29 +--
 ...g-not-propogating-type-data-to-var-d.patch |  10 +-
 ...e-we-might-be-doing-a-bit-more-work-.patch |  10 +-
 ...-that-are-itterated-in-hash-sets-in-.patch |  11 +-
 ...-cases-leaking-variables-incorrectly.patch |   9 +-
 ...ashSet-to-LinkedHashSet-to-stabelize.patch |  17 +-
 .../0105-Bulk-test-for-MC.patch               |  12 +-
 .../0106-Add-a-parameter-renamer.patch        |  13 +-
 ...lk-decompilation-test-for-all-to-use.patch |  12 +-
 FernFlower-Patches/0108-Fix-NPE.patch         |   9 +-
 ...areas-on-Java-8.-Notibly-the-exit-ma.patch |  26 +-
 ...ble-declarations-including-those-wit.patch |  10 +-
 .../0111-Renaming-thinger.patch               |  52 ++--
 ...-issues.-Still-outstanding-propogati.patch |  24 +-
 ...gate-renamer-state-to-nested-classes.patch |  19 +-
 ...lement-options-for-the-renamer-stuff.patch |  29 +--
 ...-the-param-renamer-needed-for-sane-p.patch |  20 +-
 ...gger-so-that-it-can-be-used-during-i.patch |  14 +-
 ...-More-fixage-to-the-way-init-happens.patch |  12 +-
 ...the-renamer-after-we-re-done-with-th.patch |  14 +-
 ...esources-after-we-re-done-not-before.patch |  13 +-
 ...-renamer-for-every-single-method-rea.patch |  11 +-
 ...-access-a-bit-ensure-it-s-loaded-for.patch |  19 +-
 ...aibles-when-the-to-target-is-read-fu.patch |  14 +-
 ...name-to-reflect-the-update-to-ForgeF.patch |  25 ++
 123 files changed, 739 insertions(+), 1722 deletions(-)
 delete mode 100644 FernFlower-Patches/0048-Merge-in-and-use-alternative-code-for-ppmm.patch
 delete mode 100644 FernFlower-Patches/0049-Kill-the-remapping-tracking-entirely-and-just-do-a-f.patch
 create mode 100644 FernFlower-Patches/0123-Changed-archive-name-to-reflect-the-update-to-ForgeF.patch

diff --git a/FernFlower-Patches/0001-Add-Gradlew-wrapper-and-deploy-to-Forge-Maven.patch b/FernFlower-Patches/0001-Add-Gradlew-wrapper-and-deploy-to-Forge-Maven.patch
index cf55f70..440ce27 100644
--- a/FernFlower-Patches/0001-Add-Gradlew-wrapper-and-deploy-to-Forge-Maven.patch
+++ b/FernFlower-Patches/0001-Add-Gradlew-wrapper-and-deploy-to-Forge-Maven.patch
@@ -1,28 +1,12 @@
 From e8661f9befc8ce9b4422eb13de5bc2ffd370f1ed Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sat, 1 Aug 2015 11:35:52 -0700
-Subject: [PATCH 001/122] Add Gradlew wrapper and deploy to Forge Maven.
+Subject: Add Gradlew wrapper and deploy to Forge Maven.
 
----
- .gitignore                               |  19 +++
- build.gradle                             |  90 +++++++++++++
- gradle/wrapper/gradle-wrapper.jar        | Bin 0 -> 51018 bytes
- gradle/wrapper/gradle-wrapper.properties |   6 +
- gradlew                                  | 164 +++++++++++++++++++++++
- gradlew.bat                              |  90 +++++++++++++
- settings.gradle                          |   1 +
- 7 files changed, 370 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 build.gradle
- create mode 100644 gradle/wrapper/gradle-wrapper.jar
- create mode 100644 gradle/wrapper/gradle-wrapper.properties
- create mode 100644 gradlew
- create mode 100644 gradlew.bat
- create mode 100644 settings.gradle
 
 diff --git a/.gitignore b/.gitignore
 new file mode 100644
-index 0000000..f7284b5
+index 0000000000000000000000000000000000000000..f7284b5aab48e6a6430698fe3c0eb204e5ad5bb2
 --- /dev/null
 +++ b/.gitignore
 @@ -0,0 +1,19 @@
@@ -47,7 +31,7 @@ index 0000000..f7284b5
 +
 diff --git a/build.gradle b/build.gradle
 new file mode 100644
-index 0000000..4ba85ee
+index 0000000000000000000000000000000000000000..4ba85eec08fc56b667cb9d690a9ef46b8c389c82
 --- /dev/null
 +++ b/build.gradle
 @@ -0,0 +1,90 @@
@@ -1038,7 +1022,7 @@ HcmV?d00001
 
 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
 new file mode 100644
-index 0000000..6b29cc3
+index 0000000000000000000000000000000000000000..6b29cc3b32bbc645809e39aafc559bf3ffbbea70
 --- /dev/null
 +++ b/gradle/wrapper/gradle-wrapper.properties
 @@ -0,0 +1,6 @@
@@ -1050,7 +1034,7 @@ index 0000000..6b29cc3
 +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
 diff --git a/gradlew b/gradlew
 new file mode 100644
-index 0000000..91a7e26
+index 0000000000000000000000000000000000000000..91a7e269e19dfc62e27137a0b57ef3e430cee4fd
 --- /dev/null
 +++ b/gradlew
 @@ -0,0 +1,164 @@
@@ -1220,7 +1204,7 @@ index 0000000..91a7e26
 +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
 diff --git a/gradlew.bat b/gradlew.bat
 new file mode 100644
-index 0000000..8a0b282
+index 0000000000000000000000000000000000000000..8a0b282aa6885fb573c106b3551f7275c5f17e8e
 --- /dev/null
 +++ b/gradlew.bat
 @@ -0,0 +1,90 @@
@@ -1316,11 +1300,11 @@ index 0000000..8a0b282
 +:omega
 diff --git a/settings.gradle b/settings.gradle
 new file mode 100644
-index 0000000..7dfd6c3
+index 0000000000000000000000000000000000000000..7dfd6c3119638af25144f484e8bbb74b5f3beccd
 --- /dev/null
 +++ b/settings.gradle
 @@ -0,0 +1 @@
 +rootProject.name = "fernflower"
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0002-Output-generic-parametrs-for-anonymous-classes.patch b/FernFlower-Patches/0002-Output-generic-parametrs-for-anonymous-classes.patch
index 0492e45..fb05c4e 100644
--- a/FernFlower-Patches/0002-Output-generic-parametrs-for-anonymous-classes.patch
+++ b/FernFlower-Patches/0002-Output-generic-parametrs-for-anonymous-classes.patch
@@ -1,14 +1,11 @@
 From 87ede1c33768fd77ab480c2b60cea3b23de9f754 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sat, 1 Aug 2015 13:45:25 -0700
-Subject: [PATCH 002/122] Output generic parametrs for anonymous classes.
+Subject: Output generic parametrs for anonymous classes.
 
----
- .../modules/decompiler/exps/NewExprent.java     | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-index b5ecd9e..24facc9 100644
+index b5ecd9e66750f7f392c111e9254ad97430d780b1..24facc9d80857d3eacbc7b5aaf1ad9a62cd7fd91 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 @@ -26,7 +26,10 @@ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
@@ -44,5 +41,5 @@ index b5ecd9e..24facc9 100644
  
          if (enclosing != null) {
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0003-Loosen-up-restrictions-on-field-initalizers-allowing.patch b/FernFlower-Patches/0003-Loosen-up-restrictions-on-field-initalizers-allowing.patch
index 33d30c6..cf82a55 100644
--- a/FernFlower-Patches/0003-Loosen-up-restrictions-on-field-initalizers-allowing.patch
+++ b/FernFlower-Patches/0003-Loosen-up-restrictions-on-field-initalizers-allowing.patch
@@ -1,15 +1,12 @@
 From be53afc282317c377cf92433cf40b01dce77af77 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sat, 1 Aug 2015 15:10:28 -0700
-Subject: [PATCH 003/122] Loosen up restrictions on field initalizers allowing
- for some to be moved out of the <ini> and <cinit> functions.
+Subject: Loosen up restrictions on field initalizers allowing for some to be
+ moved out of the <ini> and <cinit> functions.
 
----
- .../decompiler/main/InitializerProcessor.java | 37 ++++++++++++-------
- 1 file changed, 23 insertions(+), 14 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
-index d9a0a3d..d916b19 100644
+index d9a0a3d828be573cf474d22d836c21ece546e424..d916b1951e026f239028e52f75199e784a7a9639 100644
 --- a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
 @@ -29,7 +29,10 @@ import org.jetbrains.java.decompiler.struct.StructField;
@@ -112,5 +109,5 @@ index d9a0a3d..d916b19 100644
      }
  
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0004-Fixed-this-calls-not-having-arguments.patch b/FernFlower-Patches/0004-Fixed-this-calls-not-having-arguments.patch
index 53bbdb6..0e03843 100644
--- a/FernFlower-Patches/0004-Fixed-this-calls-not-having-arguments.patch
+++ b/FernFlower-Patches/0004-Fixed-this-calls-not-having-arguments.patch
@@ -1,14 +1,11 @@
 From 723017cb1251c8f0ff9b09e97a8800109bc5375f Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sat, 1 Aug 2015 15:52:57 -0700
-Subject: [PATCH 004/122] Fixed this calls not having arguments.
+Subject: Fixed this calls not having arguments.
 
----
- .../modules/decompiler/exps/InvocationExprent.java   | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 294a115..4e73f06 100644
+index 294a115207d3c76ef0ae29e63556ec5de750889d..4e73f0649a7d85aa59756a3634bceae61e3d59fe 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 @@ -321,7 +321,7 @@ public class InvocationExprent extends Exprent {
@@ -53,5 +50,5 @@ index 294a115..4e73f06 100644
    }
  
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0005-NUll-constructor-synthetic-classes-can-have-content-.patch b/FernFlower-Patches/0005-NUll-constructor-synthetic-classes-can-have-content-.patch
index 0bdc67b..4b95ed0 100644
--- a/FernFlower-Patches/0005-NUll-constructor-synthetic-classes-can-have-content-.patch
+++ b/FernFlower-Patches/0005-NUll-constructor-synthetic-classes-can-have-content-.patch
@@ -1,16 +1,13 @@
 From 211a6f999cc0fc746ba73d6a9e4fd91be19a69e8 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sat, 1 Aug 2015 17:52:35 -0700
-Subject: [PATCH 005/122] NUll constructor synthetic classes can have content
- as well so don't rely on it being a stub, just being anonymous. You can't
- legitimatly have a anonymous argument.
+Subject: NUll constructor synthetic classes can have content as well so don't
+ rely on it being a stub, just being anonymous. You can't legitimatly have a
+ anonymous argument.
 
----
- .../java/decompiler/modules/decompiler/exps/NewExprent.java     | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-index 24facc9..6dad7c9 100644
+index 24facc9d80857d3eacbc7b5aaf1ad9a62cd7fd91..6dad7c98c8c6c9fe0714e63c24763d2eb111df4c 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 @@ -327,7 +327,7 @@ public class NewExprent extends Exprent {
@@ -23,5 +20,5 @@ index 24facc9..6dad7c9 100644
                    }
                  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0006-Sort-inner-class-lists-to-produce-a-consistant-decom.patch b/FernFlower-Patches/0006-Sort-inner-class-lists-to-produce-a-consistant-decom.patch
index 0afb25e..2f5113e 100644
--- a/FernFlower-Patches/0006-Sort-inner-class-lists-to-produce-a-consistant-decom.patch
+++ b/FernFlower-Patches/0006-Sort-inner-class-lists-to-produce-a-consistant-decom.patch
@@ -1,18 +1,12 @@
 From fdff6cfcb291cf7dcba48ce13e2aefcb7dae0d5b Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sat, 1 Aug 2015 18:40:43 -0700
-Subject: [PATCH 006/122] Sort inner class lists to produce a consistant
- decompile. Different JVMs sort HashSets differently causing inner classes to
- get shuffled.
+Subject: Sort inner class lists to produce a consistant decompile. Different
+ JVMs sort HashSets differently causing inner classes to get shuffled.
 
----
- .../jetbrains/java/decompiler/main/ClassesProcessor.java | 9 ++++++++-
- .../java/decompiler/main/rels/LambdaProcessor.java       | 2 ++
- .../java/decompiler/main/rels/NestedClassProcessor.java  | 1 +
- 3 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index 5a56641..b3e9d81 100644
+index 5a56641c6f614fdf677f8e1900f803f73397867c..b3e9d81eaa3a4d86e4714adf2f8e007af831d670 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 @@ -228,6 +228,7 @@ public class ClassesProcessor {
@@ -45,7 +39,7 @@ index 5a56641..b3e9d81 100644
    }
  }
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
-index 0704efd..809af6d 100644
+index 0704efd84bdbd29cb6c9f5db79337147ac0b2be7..809af6d88b5f7c232539e0dbc4c7c8d7c5e26e3b 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
 @@ -119,6 +119,7 @@ public class LambdaProcessor {
@@ -65,7 +59,7 @@ index 0704efd..809af6d 100644
        }
      }
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 798010e..9aedf22 100644
+index 798010e24206ffcfb76b1f4936f9b5d3709a7275..9aedf22af1f60b3e17752769462aee91cd9daeb0 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 @@ -248,6 +248,7 @@ public class NestedClassProcessor {
@@ -77,5 +71,5 @@ index 798010e..9aedf22 100644
          return true;
        }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0007-Add-an-LVT-test-so-we-can-quickly-iterate-LVT-hackin.patch b/FernFlower-Patches/0007-Add-an-LVT-test-so-we-can-quickly-iterate-LVT-hackin.patch
index 6fa1081..e199616 100644
--- a/FernFlower-Patches/0007-Add-an-LVT-test-so-we-can-quickly-iterate-LVT-hackin.patch
+++ b/FernFlower-Patches/0007-Add-an-LVT-test-so-we-can-quickly-iterate-LVT-hackin.patch
@@ -1,22 +1,12 @@
 From 213752acb3080ed6bff297f5a4e54b09998cf10a Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 2 Aug 2015 10:43:54 -0400
-Subject: [PATCH 007/122] Add an LVT test so we can quickly iterate LVT hacking
+Subject: Add an LVT test so we can quickly iterate LVT hacking
 
----
- .../jetbrains/java/decompiler/LVTTest.java    |  33 ++++++++++++++++++
- testData/classes/pkg/TestLVT.class            | Bin 0 -> 1672 bytes
- testData/results/TestLVT.dec                  |  29 +++++++++++++++
- testData/src/pkg/TestLVT.java                 |  27 ++++++++++++++
- 4 files changed, 89 insertions(+)
- create mode 100644 test/org/jetbrains/java/decompiler/LVTTest.java
- create mode 100644 testData/classes/pkg/TestLVT.class
- create mode 100644 testData/results/TestLVT.dec
- create mode 100644 testData/src/pkg/TestLVT.java
 
 diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
 new file mode 100644
-index 0000000..2d39827
+index 0000000000000000000000000000000000000000..2d39827fabef8a71133de494460a0c67f4ae9f8b
 --- /dev/null
 +++ b/test/org/jetbrains/java/decompiler/LVTTest.java
 @@ -0,0 +1,33 @@
@@ -82,7 +72,7 @@ HcmV?d00001
 
 diff --git a/testData/results/TestLVT.dec b/testData/results/TestLVT.dec
 new file mode 100644
-index 0000000..b1b7e2e
+index 0000000000000000000000000000000000000000..b1b7e2e3d96ae555cb0fec2901968fb1b366b2a5
 --- /dev/null
 +++ b/testData/results/TestLVT.dec
 @@ -0,0 +1,29 @@
@@ -117,7 +107,7 @@ index 0000000..b1b7e2e
 +
 diff --git a/testData/src/pkg/TestLVT.java b/testData/src/pkg/TestLVT.java
 new file mode 100644
-index 0000000..05b5228
+index 0000000000000000000000000000000000000000..05b5228e223eb20be14622126efdb7461c0e1bdf
 --- /dev/null
 +++ b/testData/src/pkg/TestLVT.java
 @@ -0,0 +1,27 @@
@@ -149,5 +139,5 @@ index 0000000..05b5228
 +    }
 +}
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0008-Capture-the-LVT-and-LVTT-properly-into-some-structur.patch b/FernFlower-Patches/0008-Capture-the-LVT-and-LVTT-properly-into-some-structur.patch
index 53068a6..f5b45d3 100644
--- a/FernFlower-Patches/0008-Capture-the-LVT-and-LVTT-properly-into-some-structur.patch
+++ b/FernFlower-Patches/0008-Capture-the-LVT-and-LVTT-properly-into-some-structur.patch
@@ -1,19 +1,15 @@
 From f83b43ba0aaf6e5fb17d17a9fcaa2420ab8aa0ff Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 2 Aug 2015 14:07:52 -0400
-Subject: [PATCH 008/122] Capture the LVT and LVTT properly, into some
- structured data. Ends seem to be the way to index the variable table. Next
- up, we need to capture the block ends in the var parsing code, so we can then
- match up later.
+Subject: =?UTF-8?q?Capture=20the=20LVT=20and=20LVTT=20properly,=20into=20s?=
+ =?UTF-8?q?ome=20structured=20data.=20Ends=20seem=20to=20be=20the=20way=20?=
+ =?UTF-8?q?to=20index=20the=20variable=0Atable.=20Next=20up,=20we=20need?=
+ =?UTF-8?q?=20to=20capture=20the=20block=20ends=20in=20the=20var=20parsing?=
+ =?UTF-8?q?=20code,=20so=20we=20can=20then=20match=20up=20later.?=
 
----
- .../java/decompiler/struct/StructMember.java  |  4 +-
- .../struct/attr/StructGeneralAttribute.java   |  3 +-
- .../StructLocalVariableTableAttribute.java    | 77 ++++++++++++++++++-
- 3 files changed, 79 insertions(+), 5 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/struct/StructMember.java b/src/org/jetbrains/java/decompiler/struct/StructMember.java
-index f681e19..724c0db 100644
+index f681e19604b34fdc130fe0b8ebfb697c07580f97..724c0db23d607d1e243f8cf278b0a61a9789e19d 100644
 --- a/src/org/jetbrains/java/decompiler/struct/StructMember.java
 +++ b/src/org/jetbrains/java/decompiler/struct/StructMember.java
 @@ -57,9 +57,9 @@ public class StructMember {
@@ -29,7 +25,7 @@ index f681e19..724c0db 100644
          }
          else {
 diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
-index dc0ebc6..87f5741 100644
+index dc0ebc6708a23899fff7c43a7df56ccf02954ec9..87f574193437cf322d002e8ff3120d245474fbcc 100644
 --- a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
 +++ b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
 @@ -42,6 +42,7 @@ public class StructGeneralAttribute {
@@ -50,7 +46,7 @@ index dc0ebc6..87f5741 100644
      }
      else if (ATTRIBUTE_BOOTSTRAP_METHODS.equals(name)) {
 diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-index fceae35..04f534e 100644
+index fceae359d8fa763b162851a43284e5f13b6c13ee..04f534ed5482d8778826437dafd6979085a3fb65 100644
 --- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
 +++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
 @@ -19,9 +19,14 @@ import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
@@ -168,5 +164,5 @@ index fceae35..04f534e 100644
  
    public Map<Integer, String> getMapVarNames() {
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0009-Merge-any-LVTT-to-an-incoming-LVT-if-they-re-out-of-.patch b/FernFlower-Patches/0009-Merge-any-LVTT-to-an-incoming-LVT-if-they-re-out-of-.patch
index ff0ca23..a3db91d 100644
--- a/FernFlower-Patches/0009-Merge-any-LVTT-to-an-incoming-LVT-if-they-re-out-of-.patch
+++ b/FernFlower-Patches/0009-Merge-any-LVTT-to-an-incoming-LVT-if-they-re-out-of-.patch
@@ -1,15 +1,12 @@
 From 7d5770f2462f354c4663f77818ae718062689d7b Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 2 Aug 2015 20:56:16 -0400
-Subject: [PATCH 009/122] Merge any LVTT to an incoming LVT (if they're out of
- sequence), and merge LVTTs together if there's no LVT yet.
+Subject: Merge any LVTT to an incoming LVT (if they're out of sequence), and
+ merge LVTTs together if there's no LVT yet.
 
----
- .../jetbrains/java/decompiler/struct/StructMember.java   | 9 +++++++++
- 1 file changed, 9 insertions(+)
 
 diff --git a/src/org/jetbrains/java/decompiler/struct/StructMember.java b/src/org/jetbrains/java/decompiler/struct/StructMember.java
-index 724c0db..af1df05 100644
+index 724c0db23d607d1e243f8cf278b0a61a9789e19d..af1df05e4120b1053ad0d1e74da88810c3b97487 100644
 --- a/src/org/jetbrains/java/decompiler/struct/StructMember.java
 +++ b/src/org/jetbrains/java/decompiler/struct/StructMember.java
 @@ -62,6 +62,15 @@ public class StructMember {
@@ -29,5 +26,5 @@ index 724c0db..af1df05 100644
            attributes.addWithKey(attribute, attribute.getName());
          }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0010-Fix-tests-for-inner-class-sorting.patch b/FernFlower-Patches/0010-Fix-tests-for-inner-class-sorting.patch
index 4af74c8..bf9a50d 100644
--- a/FernFlower-Patches/0010-Fix-tests-for-inner-class-sorting.patch
+++ b/FernFlower-Patches/0010-Fix-tests-for-inner-class-sorting.patch
@@ -1,18 +1,11 @@
 From 4c12c7a453ab63d9b966d8247ed88e4873fe7d29 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 2 Aug 2015 19:22:15 -0700
-Subject: [PATCH 010/122] Fix tests for inner class sorting.
+Subject: Fix tests for inner class sorting.
 
----
- testData/results/TestAnonymousClass.dec   | 60 ++++++++++-----------
- testData/results/TestInnerLocal.dec       | 50 +++++++++---------
- testData/results/TestInnerLocalPkg.dec    | 50 +++++++++---------
- testData/results/TestInnerSignature.dec   | 64 +++++++++++------------
- testData/results/TestMethodParameters.dec | 48 ++++++++---------
- 5 files changed, 136 insertions(+), 136 deletions(-)
 
 diff --git a/testData/results/TestAnonymousClass.dec b/testData/results/TestAnonymousClass.dec
-index 75d1df2..fdce110 100644
+index 75d1df239bb56bc0a4be42a1310957721146ece2..fdce11007ba778eaaeb4081e1a11041b2573feca 100644
 --- a/testData/results/TestAnonymousClass.dec
 +++ b/testData/results/TestAnonymousClass.dec
 @@ -67,15 +67,8 @@ public abstract class TestAnonymousClass {
@@ -116,7 +109,7 @@ index 75d1df2..fdce110 100644
  18
  104
 diff --git a/testData/results/TestInnerLocal.dec b/testData/results/TestInnerLocal.dec
-index 6ca3a7e..e5aba7d 100644
+index 6ca3a7e1053087d91543ce588eb81e19c9f3432d..e5aba7da20b0b57a4c796a36c24960f38c6eac31 100644
 --- a/testData/results/TestInnerLocal.dec
 +++ b/testData/results/TestInnerLocal.dec
 @@ -28,6 +28,14 @@ public class TestInnerLocal {
@@ -205,7 +198,7 @@ index 6ca3a7e..e5aba7d 100644
  21
  33
 diff --git a/testData/results/TestInnerLocalPkg.dec b/testData/results/TestInnerLocalPkg.dec
-index 7cafa41..7ddb0ce 100644
+index 7cafa415f9b6212b593d0c0940cc16c277cf5e2f..7ddb0ce6ad8adf326a51e145f419e23eed8779dd 100644
 --- a/testData/results/TestInnerLocalPkg.dec
 +++ b/testData/results/TestInnerLocalPkg.dec
 @@ -30,6 +30,14 @@ public class TestInnerLocalPkg {
@@ -294,7 +287,7 @@ index 7cafa41..7ddb0ce 100644
  23
  35
 diff --git a/testData/results/TestInnerSignature.dec b/testData/results/TestInnerSignature.dec
-index 3087a40..406e1f4 100644
+index 3087a40dc63251ee1444ef4924050413f39221d5..406e1f41d8f0a084a986f683bf7ecb3b44c37429 100644
 --- a/testData/results/TestInnerSignature.dec
 +++ b/testData/results/TestInnerSignature.dec
 @@ -9,18 +9,6 @@ public class TestInnerSignature<A, B, C> {
@@ -393,7 +386,7 @@ index 3087a40..406e1f4 100644
  22
  33
 diff --git a/testData/results/TestMethodParameters.dec b/testData/results/TestMethodParameters.dec
-index 21f0f12..af7ce86 100644
+index 21f0f129d1bc260e2dbc7ce77f07ece57711bf75..af7ce865f5d946980010ee02c3e5be384a041064 100644
 --- a/testData/results/TestMethodParameters.dec
 +++ b/testData/results/TestMethodParameters.dec
 @@ -21,6 +21,14 @@ public class TestMethodParameters {
@@ -482,5 +475,5 @@ index 21f0f12..af7ce86 100644
  37 <-> 19
  39 <-> 22
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0011-Fixed-issue-where-field-initalizers-would-incorrectl.patch b/FernFlower-Patches/0011-Fixed-issue-where-field-initalizers-would-incorrectl.patch
index f0e621b..e7abd97 100644
--- a/FernFlower-Patches/0011-Fixed-issue-where-field-initalizers-would-incorrectl.patch
+++ b/FernFlower-Patches/0011-Fixed-issue-where-field-initalizers-would-incorrectl.patch
@@ -1,15 +1,12 @@
 From f8a4b88e87510d194781b14ed6c4dba40425422b Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 2 Aug 2015 19:49:30 -0700
-Subject: [PATCH 011/122] Fixed issue where field initalizers would incorrectly
- be inlined when they relied on fields initalized later.
+Subject: Fixed issue where field initalizers would incorrectly be inlined when
+ they relied on fields initalized later.
 
----
- .../decompiler/main/InitializerProcessor.java     | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
-index d916b19..e64feea 100644
+index d916b1951e026f239028e52f75199e784a7a9639..e64feea59b43cd41ad42ace70ebf78dec4ffb54e 100644
 --- a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
 @@ -142,9 +142,8 @@ public class InitializerProcessor {
@@ -58,5 +55,5 @@ index d916b19..e64feea 100644
            else if (!fexpr.isStatic()) {
              return false;
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0012-Some-synthetic-anon-classes-are-being-detected-as-me.patch b/FernFlower-Patches/0012-Some-synthetic-anon-classes-are-being-detected-as-me.patch
index def67bb..4ae3b5e 100644
--- a/FernFlower-Patches/0012-Some-synthetic-anon-classes-are-being-detected-as-me.patch
+++ b/FernFlower-Patches/0012-Some-synthetic-anon-classes-are-being-detected-as-me.patch
@@ -1,15 +1,12 @@
 From 4e2882cb40ea460cb1f4a22c85a017cd853b308c Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 2 Aug 2015 21:14:56 -0700
-Subject: [PATCH 012/122] Some synthetic anon classes are being detected as
- member classes. Unknown why, however this fixes the consturctor argument.
+Subject: Some synthetic anon classes are being detected as member classes.
+ Unknown why, however this fixes the consturctor argument.
 
----
- .../java/decompiler/modules/decompiler/exps/NewExprent.java     | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-index 6dad7c9..0297a55 100644
+index 6dad7c98c8c6c9fe0714e63c24763d2eb111df4c..0297a55fc16eb3eddc0e458bfa49325f563fd613 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 @@ -327,7 +327,7 @@ public class NewExprent extends Exprent {
@@ -22,5 +19,5 @@ index 6dad7c9..0297a55 100644
                    }
                  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0013-Fixed-last-test-all-tests-pass.patch b/FernFlower-Patches/0013-Fixed-last-test-all-tests-pass.patch
index bde73fa..a332f30 100644
--- a/FernFlower-Patches/0013-Fixed-last-test-all-tests-pass.patch
+++ b/FernFlower-Patches/0013-Fixed-last-test-all-tests-pass.patch
@@ -1,14 +1,11 @@
 From 089ba9f7ecc59787de6f28b51cbfc8ee077caf6c Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 2 Aug 2015 21:20:47 -0700
-Subject: [PATCH 013/122] Fixed last test, all tests pass.
+Subject: Fixed last test, all tests pass.
 
----
- .../TestClassSimpleBytecodeMapping.dec        | 24 +++++++++----------
- 1 file changed, 12 insertions(+), 12 deletions(-)
 
 diff --git a/testData/results/TestClassSimpleBytecodeMapping.dec b/testData/results/TestClassSimpleBytecodeMapping.dec
-index a48375a..1a2532f 100644
+index a48375ae4a8f7bbe75a5db9b94ff1b023043faa7..1a2532f0b736a3d1a2db4f7ba3645e48e419189f 100644
 --- a/testData/results/TestClassSimpleBytecodeMapping.dec
 +++ b/testData/results/TestClassSimpleBytecodeMapping.dec
 @@ -33,17 +33,17 @@ public class TestClassSimpleBytecodeMapping {
@@ -70,5 +67,5 @@ index a48375a..1a2532f 100644
  Not mapped:
  39
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0014-Fix-how-class-types-are-determined-was-detecting-ano.patch b/FernFlower-Patches/0014-Fix-how-class-types-are-determined-was-detecting-ano.patch
index eb7efd6..2d85f05 100644
--- a/FernFlower-Patches/0014-Fix-how-class-types-are-determined-was-detecting-ano.patch
+++ b/FernFlower-Patches/0014-Fix-how-class-types-are-determined-was-detecting-ano.patch
@@ -1,16 +1,12 @@
 From eeabc2fd9d388a3361b0ec89733add20e4ade8a6 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Mon, 3 Aug 2015 15:07:46 -0700
-Subject: [PATCH 014/122] Fix how class types are determined, was detecting
- anon classes as member classes.
+Subject: Fix how class types are determined, was detecting anon classes as
+ member classes.
 
----
- .../decompiler/main/ClassesProcessor.java     | 48 ++++++++++----
- .../attr/StructInnerClassesAttribute.java     | 62 +++++++++++--------
- 2 files changed, 70 insertions(+), 40 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index b3e9d81..7f75a0c 100644
+index b3e9d81eaa3a4d86e4714adf2f8e007af831d670..7f75a0cf9dd0e58fcf8c3e3c6bfa56678f7b1dfe 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 @@ -31,7 +31,10 @@ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
@@ -103,7 +99,7 @@ index b3e9d81..7f75a0c 100644
                    continue;
                  }
 diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
-index 5969487..ecef558 100644
+index 5969487904608fb01550965dedfa43e4184c22c4..ecef5588a52318a40849f9ac4ae27e2bb1723000 100644
 --- a/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
 +++ b/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
 @@ -23,10 +23,21 @@ import java.util.ArrayList;
@@ -193,5 +189,5 @@ index 5969487..ecef558 100644
    }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0015-Force-hide-constructors-with-anon-class-as-last-argu.patch b/FernFlower-Patches/0015-Force-hide-constructors-with-anon-class-as-last-argu.patch
index 50aecaf..b36b1b1 100644
--- a/FernFlower-Patches/0015-Force-hide-constructors-with-anon-class-as-last-argu.patch
+++ b/FernFlower-Patches/0015-Force-hide-constructors-with-anon-class-as-last-argu.patch
@@ -1,16 +1,12 @@
 From 289fb0b9bab3589bef077b002eca23e33fcd1e16 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Mon, 3 Aug 2015 15:08:26 -0700
-Subject: [PATCH 015/122] Force hide constructors with anon class as last
- argument. Java adds these for unknown resons.
+Subject: Force hide constructors with anon class as last argument. Java adds
+ these for unknown resons.
 
----
- .../java/decompiler/main/ClassWriter.java     |  1 +
- .../decompiler/main/InitializerProcessor.java | 28 +++++++++++++++++++
- 2 files changed, 29 insertions(+)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index afa2473..3e5789d 100644
+index afa24735825cccf22f2ed911df78f6d2c2289331..3e5789da9240c8b59cb914bd5fd94a78b13ddc61 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 @@ -60,6 +60,7 @@ public class ClassWriter {
@@ -22,7 +18,7 @@ index afa2473..3e5789d 100644
      if (node.type == ClassNode.CLASS_ROOT && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_CLASS_1_4)) {
        ref14processor.processClassReferences(node);
 diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
-index e64feea..85d580d 100644
+index e64feea59b43cd41ad42ace70ebf78dec4ffb54e..85d580d6ced6b14889453ab92689b13b1986da01 100644
 --- a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
 @@ -25,7 +25,11 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
@@ -67,5 +63,5 @@ index e64feea..85d580d 100644
 +  }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0016-Fix-JVM-differences-printing-floats-with-an-undefine.patch b/FernFlower-Patches/0016-Fix-JVM-differences-printing-floats-with-an-undefine.patch
index 1de4c1c..657d46d 100644
--- a/FernFlower-Patches/0016-Fix-JVM-differences-printing-floats-with-an-undefine.patch
+++ b/FernFlower-Patches/0016-Fix-JVM-differences-printing-floats-with-an-undefine.patch
@@ -1,15 +1,12 @@
 From b44392c8602fca4597fc52d98955a3be4d32ee77 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Mon, 3 Aug 2015 15:43:39 -0700
-Subject: [PATCH 016/122] Fix JVM differences printing floats with an undefined
- number of trailing zeros. (Some JVMs do 0.1F and some do 0.10F)
+Subject: Fix JVM differences printing floats with an undefined number of
+ trailing zeros. (Some JVMs do 0.1F and some do 0.10F)
 
----
- .../modules/decompiler/exps/ConstExprent.java | 28 +++++++++++++------
- 1 file changed, 19 insertions(+), 9 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-index 4b9b687..5a751f9 100644
+index 4b9b687382d96886a1a954e0fa179211843d45a8..5a751f91d28558268fc18f6f4630338c1e751f9b 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 @@ -210,7 +210,7 @@ public class ConstExprent extends Exprent {
@@ -89,5 +86,5 @@ index 4b9b687..5a751f9 100644
 +
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0017-Sort-local-variables-and-variable-definitions.-Again.patch b/FernFlower-Patches/0017-Sort-local-variables-and-variable-definitions.-Again.patch
index 58b407a..c171f85 100644
--- a/FernFlower-Patches/0017-Sort-local-variables-and-variable-definitions.-Again.patch
+++ b/FernFlower-Patches/0017-Sort-local-variables-and-variable-definitions.-Again.patch
@@ -1,17 +1,12 @@
 From 0ecec99fee439f1f018c51826f4105c7753af7f2 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Mon, 3 Aug 2015 17:26:00 -0700
-Subject: [PATCH 017/122] Sort local variables and variable definitions. Again,
- different JVMs sort hash sets differently causing different variable names.
+Subject: Sort local variables and variable definitions. Again, different JVMs
+ sort hash sets differently causing different variable names.
 
----
- .../modules/decompiler/ExprProcessor.java     |  1 +
- .../modules/decompiler/exps/Exprent.java      | 53 +++++++++++++++----
- .../decompiler/vars/VarVersionsProcessor.java | 11 +++-
- 3 files changed, 53 insertions(+), 12 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-index 9296bb3..205b187 100644
+index 9296bb3f6007bda9647e2f0d919cdfd311567222..205b1876758155132600148f61f641b64e42369c 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
 @@ -833,6 +833,7 @@ public class ExprProcessor implements CodeConstants {
@@ -23,7 +18,7 @@ index 9296bb3..205b187 100644
      for (Exprent expr : lst) {
        TextBuffer content = expr.toJava(indent, tracer);
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-index fbd146e..5f2cb56 100644
+index fbd146eca6b7efc4d56e96121a7c6d91748d077c..5f2cb56a85b9ac61141de1c17b457e5847eb8fff 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
 @@ -17,6 +17,8 @@ package org.jetbrains.java.decompiler.modules.decompiler.exps;
@@ -124,7 +119,7 @@ index fbd146e..5f2cb56 100644
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-index 31f0f86..4751052 100644
+index 31f0f86d4423ac537faf31b7f16833f263801b23..4751052a5468ffc469d7166bce648d5b658e040d 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
 @@ -235,8 +235,15 @@ public class VarVersionsProcessor {
@@ -146,5 +141,5 @@ index 31f0f86..4751052 100644
        if (pair.version >= 0) {
          int newIndex = pair.version == 1 ? pair.var : counters.getCounterAndIncrement(CounterContainer.VAR_COUNTER);
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0018-No-Synthetic-classes-allowed-in-parameters.patch b/FernFlower-Patches/0018-No-Synthetic-classes-allowed-in-parameters.patch
index c222ee8..b5eb772 100644
--- a/FernFlower-Patches/0018-No-Synthetic-classes-allowed-in-parameters.patch
+++ b/FernFlower-Patches/0018-No-Synthetic-classes-allowed-in-parameters.patch
@@ -1,15 +1,11 @@
 From f373923f5a6d05f0c6d2f42ad4a8d00af6fefd1c Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Mon, 3 Aug 2015 21:20:43 -0700
-Subject: [PATCH 018/122] No Synthetic classes allowed in parameters -.-
+Subject: No Synthetic classes allowed in parameters -.-
 
----
- .../jetbrains/java/decompiler/main/InitializerProcessor.java    | 2 +-
- .../java/decompiler/modules/decompiler/exps/NewExprent.java     | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
-index 85d580d..0438fd4 100644
+index 85d580d6ced6b14889453ab92689b13b1986da01..0438fd435d70c34265d4a8d5a86dd58a9daea2f3 100644
 --- a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
 @@ -349,7 +349,7 @@ public class InitializerProcessor {
@@ -22,7 +18,7 @@ index 85d580d..0438fd4 100644
                wrapper.getHiddenMembers().add(InterpreterUtil.makeUniqueKey(name, desc));
              }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-index 0297a55..51137cc 100644
+index 0297a55fc16eb3eddc0e458bfa49325f563fd613..51137cc3c2f5756e688d910ed405cccb935ab0d8 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 @@ -327,7 +327,7 @@ public class NewExprent extends Exprent {
@@ -35,5 +31,5 @@ index 0297a55..51137cc 100644
                    }
                  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0019-Change-LVT-indexing-to-VarVersionPair.patch b/FernFlower-Patches/0019-Change-LVT-indexing-to-VarVersionPair.patch
index 8a72e3c..1604b06 100644
--- a/FernFlower-Patches/0019-Change-LVT-indexing-to-VarVersionPair.patch
+++ b/FernFlower-Patches/0019-Change-LVT-indexing-to-VarVersionPair.patch
@@ -1,15 +1,11 @@
 From f3b023e5db4654cb1201528f0633545592f2f610 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Tue, 4 Aug 2015 21:50:19 -0700
-Subject: [PATCH 019/122] Change LVT indexing to VarVersionPair
+Subject: Change LVT indexing to VarVersionPair
 
----
- .../modules/decompiler/vars/VarProcessor.java |  9 ++--
- .../StructLocalVariableTableAttribute.java    | 51 +++++++++++++++----
- 2 files changed, 46 insertions(+), 14 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-index ce81474..fbd3455 100644
+index ce81474ef8291e0a4fbf59bed8b0902de1731921..fbd3455dae324f21854b6374448c0c50f0c1e1ce 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 @@ -44,7 +44,7 @@ public class VarProcessor {
@@ -36,7 +32,7 @@ index ce81474..fbd3455 100644
  
        Integer counter = mapNames.get(name);
 diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-index 04f534e..5f55537 100644
+index 04f534ed5482d8778826437dafd6979085a3fb65..5f55537fc80d50a1b22919165eb117f51f0b86b8 100644
 --- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
 +++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
 @@ -15,12 +15,14 @@
@@ -138,5 +134,5 @@ index 04f534e..5f55537 100644
    }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0020-Convert-Exprent.bytecode-to-a-BitMap-as-it-gives-bet.patch b/FernFlower-Patches/0020-Convert-Exprent.bytecode-to-a-BitMap-as-it-gives-bet.patch
index cbf9b9e..431cde6 100644
--- a/FernFlower-Patches/0020-Convert-Exprent.bytecode-to-a-BitMap-as-it-gives-bet.patch
+++ b/FernFlower-Patches/0020-Convert-Exprent.bytecode-to-a-BitMap-as-it-gives-bet.patch
@@ -1,35 +1,15 @@
 From 814dc4a3267ceceb892d6fa84de99f2311274400 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 6 Aug 2015 12:18:10 -0700
-Subject: [PATCH 020/122] Convert Exprent.bytecode to a BitMap, as it gives
- better speed and functionality. Added method to gather bytecode markers for
- every exporession. Allows us to get the bytecode offsets for an entire block
- of code.
+Subject: =?UTF-8?q?Convert=20Exprent.bytecode=20to=20a=20BitMap,=20as=20it?=
+ =?UTF-8?q?=20gives=20better=20speed=20and=20functionality.=0AAdded=20meth?=
+ =?UTF-8?q?od=20to=20gather=20bytecode=20markers=20for=20every=20exporessi?=
+ =?UTF-8?q?on.=20Allows=20us=20to=20get=20the=20bytecode=20offsets=20for?=
+ =?UTF-8?q?=20an=20entire=20block=20of=20code.?=
 
----
- .../collectors/BytecodeMappingTracer.java     |  6 ++--
- .../modules/decompiler/ExprProcessor.java     |  6 +++-
- .../decompiler/SimplifyExprentsHelper.java    | 27 ++++++++--------
- .../decompiler/exps/AnnotationExprent.java    |  7 ++++
- .../modules/decompiler/exps/ArrayExprent.java | 11 +++++--
- .../decompiler/exps/AssertExprent.java        |  7 ++++
- .../decompiler/exps/AssignmentExprent.java    | 12 +++++--
- .../modules/decompiler/exps/ConstExprent.java | 11 +++++--
- .../modules/decompiler/exps/ExitExprent.java  | 20 ++++++++----
- .../modules/decompiler/exps/Exprent.java      | 32 ++++++++++++++-----
- .../modules/decompiler/exps/FieldExprent.java | 24 ++++++++------
- .../decompiler/exps/FunctionExprent.java      | 22 ++++++++-----
- .../modules/decompiler/exps/IfExprent.java    | 10 ++++--
- .../decompiler/exps/InvocationExprent.java    | 10 ++++--
- .../decompiler/exps/MonitorExprent.java       | 10 ++++--
- .../modules/decompiler/exps/NewExprent.java   | 14 ++++++--
- .../decompiler/exps/SwitchExprent.java        | 20 ++++++++++--
- .../modules/decompiler/exps/VarExprent.java   | 18 +++++++----
- .../decompiler/stats/DummyExitStatement.java  | 11 +++----
- 19 files changed, 199 insertions(+), 79 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
-index e25cca2..f847784 100644
+index e25cca2cba4c642d1068d61555f53b51185c72e5..f84778424e5591c31809e1a50bce1263a1390f08 100644
 --- a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
 +++ b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
 @@ -55,10 +55,10 @@ public class BytecodeMappingTracer {
@@ -47,7 +27,7 @@ index e25cca2..f847784 100644
      }
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-index 205b187..f33e438 100644
+index 205b1876758155132600148f61f641b64e42369c..f33e438c8297887d41b7438402efe4974412265a 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
 @@ -336,7 +336,11 @@ public class ExprProcessor implements CodeConstants {
@@ -64,7 +44,7 @@ index 205b187..f33e438 100644
        switch (instr.opcode) {
          case opc_aconst_null:
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
-index ddf6865..106a904 100644
+index ddf68652e6f09ca7d333e1383406b9f49bb783d7..106a90493d2bb5a2c442caa64a63f69bb8999f85 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
 @@ -17,6 +17,7 @@ package org.jetbrains.java.decompiler.modules.decompiler;
@@ -153,7 +133,7 @@ index ddf6865..106a904 100644
 +
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
-index 905bc21..0560ae6 100644
+index 905bc212fcb375c98f4ee8a7fefc7a20a1450664..0560ae60b9bde48d503f439461fa2f6cfdafc10a 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
 @@ -21,6 +21,7 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
@@ -176,7 +156,7 @@ index 905bc21..0560ae6 100644
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
-index 8f7269b..ebbcab0 100644
+index 8f7269b63e0329f39d43ab80e8d67dadd93c48e9..ebbcab0c33258846968279eccb49c9675d3e2974 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
 @@ -23,8 +23,8 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
@@ -211,7 +191,7 @@ index 8f7269b..ebbcab0 100644
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
-index af95d15..82305f3 100644
+index af95d15ac9eb41fc13c15b08397a0db55548792d..82305f3df4267a7a01511681530c9714bb9111d5 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
 @@ -18,6 +18,7 @@ package org.jetbrains.java.decompiler.modules.decompiler.exps;
@@ -234,7 +214,7 @@ index af95d15..82305f3 100644
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
-index 95ebdc5..efc64b9 100644
+index 95ebdc5d1bd967c32eb4c7bd34e701de699afd1c..efc64b9d98005572eb9752e36d472f7a65358203 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
 @@ -27,8 +27,8 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
@@ -272,7 +252,7 @@ index 95ebdc5..efc64b9 100644
    // getter and setter methods
    // *****************************************************************************
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-index 5a751f9..312f6c8 100644
+index 5a751f91d28558268fc18f6f4630338c1e751f9b..312f6c8a51e96e8f1a8dc27b509716022e22cc39 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 @@ -48,15 +48,15 @@ public class ConstExprent extends Exprent {
@@ -307,7 +287,7 @@ index 5a751f9..312f6c8 100644
    // IMatchable implementation
    // *****************************************************************************
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
-index 7b4a5ac..fd1491f 100644
+index 7b4a5ac4750ed627d1db5ae735eaa2acca5f3ac6..fd1491f3b31fc17716d715b8b2b76cf3b846bdc6 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
 @@ -31,8 +31,8 @@ import org.jetbrains.java.decompiler.struct.match.IMatchable.MatchProperties;
@@ -367,7 +347,7 @@ index 7b4a5ac..fd1491f 100644
 +
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-index 5f2cb56..db839fe 100644
+index 5f2cb56a85b9ac61141de1c17b457e5847eb8fff..db839fe5e35da590ce5ebae6cb4122f60e89219d 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
 @@ -16,6 +16,7 @@
@@ -433,7 +413,7 @@ index 5f2cb56..db839fe 100644
    }
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-index 4ac8123..fdc9cec 100644
+index 4ac8123ddc7cbef7771ea0a06c425193614bcd95..fdc9cec54252976b63964d039875e0229ff93172 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
 @@ -34,8 +34,8 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil;
@@ -505,7 +485,7 @@ index 4ac8123..fdc9cec 100644
 +
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-index 48206a7..e8edbd5 100644
+index 48206a7b2cc49aa710eb4f8754a0d01e8e9d2924..e8edbd5f0cfa8c61b3af2a1b1b2256fbe6a7aa00 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
 @@ -198,7 +198,7 @@ public class FunctionExprent extends Exprent {
@@ -580,7 +560,7 @@ index 48206a7..e8edbd5 100644
 +
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
-index 059270f..84ac9e7 100644
+index 059270fe5c7532cf7d30045cb30b02fc78954aa4..84ac9e7bcdd6b05fd1d39c12c34d6dfd281a4f64 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
 @@ -75,7 +75,7 @@ public class IfExprent extends Exprent {
@@ -613,7 +593,7 @@ index 059270f..84ac9e7 100644
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 4e73f06..7cf83be 100644
+index 4e73f0649a7d85aa59756a3634bceae61e3d59fe..7cf83bedc432341a0af7ed0d895abdea919bee75 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 @@ -20,7 +20,6 @@ import java.util.BitSet;
@@ -648,7 +628,7 @@ index 4e73f06..7cf83be 100644
      return lstParameters;
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
-index 0ece9aa..bd9207f 100644
+index 0ece9aa0fb30c42b9942c3a14bb280ee32f57a29..bd9207fe85915240d5626e2be88923fc08f042d1 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
 @@ -20,8 +20,8 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
@@ -684,7 +664,7 @@ index 0ece9aa..bd9207f 100644
      return monType;
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-index 51137cc..1e87201 100644
+index 51137cc3c2f5756e688d910ed405cccb935ab0d8..1e87201c8322b8c9d6db16a89ecab56fdb0df85d 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 @@ -34,9 +34,9 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil;
@@ -728,7 +708,7 @@ index 51137cc..1e87201 100644
      return constructor;
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
-index fd77112..c2065c1 100644
+index fd7711231a0dfa49697f2908852bea89a33ebeb9..c2065c1673f3a86cee9c2e707d328becb3d90100 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
 @@ -22,15 +22,15 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
@@ -773,7 +753,7 @@ index fd77112..c2065c1 100644
      return value;
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index 4436cb5..f071933 100644
+index 4436cb50105342836d5bf278477efd43bbafefde..f0719331904f4db44a7ff8b1db2ad6f80512b01f 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 @@ -33,6 +33,7 @@ import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
@@ -835,7 +815,7 @@ index 4436cb5..f071933 100644
 +
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java
-index ba82182..30a7a8f 100644
+index ba8218263a2b293825c4875f972c67d36baeba80..30a7a8ff1ba852dbe1b522c4b99e5efd638ac1da 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java
 @@ -15,6 +15,7 @@
@@ -872,5 +852,5 @@ index ba82182..30a7a8f 100644
    }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0021-Seperate-the-LVT-data-from-the-Struct-for-easier-abi.patch b/FernFlower-Patches/0021-Seperate-the-LVT-data-from-the-Struct-for-easier-abi.patch
index f7b5782..45b1fe2 100644
--- a/FernFlower-Patches/0021-Seperate-the-LVT-data-from-the-Struct-for-easier-abi.patch
+++ b/FernFlower-Patches/0021-Seperate-the-LVT-data-from-the-Struct-for-easier-abi.patch
@@ -1,20 +1,13 @@
 From 635b7b9fccfa0208ecb581cda039124cdd50eb9c Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 6 Aug 2015 13:52:24 -0700
-Subject: [PATCH 021/122] Seperate the LVT data from the Struct for easier
- ability to pass around.
+Subject: Seperate the LVT data from the Struct for easier ability to pass
+ around.
 
----
- .../modules/decompiler/vars/LVTVariable.java  |  70 +++++++++++
- .../decompiler/vars/LocalVariableTable.java   |  72 +++++++++++
- .../StructLocalVariableTableAttribute.java    | 116 ++----------------
- 3 files changed, 151 insertions(+), 107 deletions(-)
- create mode 100644 src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
- create mode 100644 src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
 new file mode 100644
-index 0000000..0533981
+index 0000000000000000000000000000000000000000..0533981f9da54787c55fd9b54e1f1d555bdbed12
 --- /dev/null
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
 @@ -0,0 +1,70 @@
@@ -91,7 +84,7 @@ index 0000000..0533981
 \ No newline at end of file
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 new file mode 100644
-index 0000000..75f144d
+index 0000000000000000000000000000000000000000..75f144dccacee0a214fad16f9cde138ec64de256
 --- /dev/null
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 @@ -0,0 +1,72 @@
@@ -169,7 +162,7 @@ index 0000000..75f144d
 +}
 \ No newline at end of file
 diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-index 5f55537..4455785 100644
+index 5f55537fc80d50a1b22919165eb117f51f0b86b8..44557858b5cf5ef1a6b05c79c34bb41f6ae6e5eb 100644
 --- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
 +++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
 @@ -15,20 +15,15 @@
@@ -331,5 +324,5 @@ index 5f55537..4455785 100644
    }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0022-Aded-debug-printer-to-MethodProcessorRunnable-for-th.patch b/FernFlower-Patches/0022-Aded-debug-printer-to-MethodProcessorRunnable-for-th.patch
index 0665cce..66aa87e 100644
--- a/FernFlower-Patches/0022-Aded-debug-printer-to-MethodProcessorRunnable-for-th.patch
+++ b/FernFlower-Patches/0022-Aded-debug-printer-to-MethodProcessorRunnable-for-th.patch
@@ -1,15 +1,11 @@
 From 7f9bb7d21c105347ab987df050eb7458ac8ab1f5 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 6 Aug 2015 17:01:25 -0700
-Subject: [PATCH 022/122] Aded debug printer to MethodProcessorRunnable for the
- method outline.
+Subject: Aded debug printer to MethodProcessorRunnable for the method outline.
 
----
- .../main/rels/MethodProcessorRunnable.java    | 123 +++++++++++++++++-
- 1 file changed, 122 insertions(+), 1 deletion(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index 1c90fb6..dc6f2f0 100644
+index 1c90fb6fc41b20e8b295201cfdb69abb63463bd0..dc6f2f0e61563f8132d99b70d3d81278f224da04 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 @@ -17,6 +17,7 @@ package org.jetbrains.java.decompiler.main.rels;
@@ -175,5 +171,5 @@ index 1c90fb6..dc6f2f0 100644
 +  }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0023-A-scoping-test-simpler-than-the-complex-one-almost-p.patch b/FernFlower-Patches/0023-A-scoping-test-simpler-than-the-complex-one-almost-p.patch
index 52fdd9c..953e3e4 100644
--- a/FernFlower-Patches/0023-A-scoping-test-simpler-than-the-complex-one-almost-p.patch
+++ b/FernFlower-Patches/0023-A-scoping-test-simpler-than-the-complex-one-almost-p.patch
@@ -1,17 +1,8 @@
 From d72455431b4c610f5c9768a2f27c7adffcc7f086 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sat, 8 Aug 2015 13:37:49 -0400
-Subject: [PATCH 023/122] A scoping test, simpler than the complex one, almost
- passes.
+Subject: A scoping test, simpler than the complex one, almost passes.
 
----
- testData/classes/pkg/TestLVTScoping.class | Bin 0 -> 1024 bytes
- testData/results/TestLVTScoping.dec       |  35 ++++++++++++++++++++++
- testData/src/pkg/TestLVTScoping.java      |  34 +++++++++++++++++++++
- 3 files changed, 69 insertions(+)
- create mode 100644 testData/classes/pkg/TestLVTScoping.class
- create mode 100644 testData/results/TestLVTScoping.dec
- create mode 100644 testData/src/pkg/TestLVTScoping.java
 
 diff --git a/testData/classes/pkg/TestLVTScoping.class b/testData/classes/pkg/TestLVTScoping.class
 new file mode 100644
@@ -36,7 +27,7 @@ HcmV?d00001
 
 diff --git a/testData/results/TestLVTScoping.dec b/testData/results/TestLVTScoping.dec
 new file mode 100644
-index 0000000..7bbf624
+index 0000000000000000000000000000000000000000..7bbf62484e40f9f00b4028029c6c0862d08e750c
 --- /dev/null
 +++ b/testData/results/TestLVTScoping.dec
 @@ -0,0 +1,35 @@
@@ -77,7 +68,7 @@ index 0000000..7bbf624
 +}
 diff --git a/testData/src/pkg/TestLVTScoping.java b/testData/src/pkg/TestLVTScoping.java
 new file mode 100644
-index 0000000..ab57832
+index 0000000000000000000000000000000000000000..ab57832c2f3df13a4ae9da2af193c2d6a79067ab
 --- /dev/null
 +++ b/testData/src/pkg/TestLVTScoping.java
 @@ -0,0 +1,34 @@
@@ -116,5 +107,5 @@ index 0000000..ab57832
 +    }
 +}
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0024-Add-the-test-to-the-harness.patch b/FernFlower-Patches/0024-Add-the-test-to-the-harness.patch
index bff8191..eb06b45 100644
--- a/FernFlower-Patches/0024-Add-the-test-to-the-harness.patch
+++ b/FernFlower-Patches/0024-Add-the-test-to-the-harness.patch
@@ -1,14 +1,11 @@
 From 1314b694ee1457fd6e9a91adcfa910ef9549faf0 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sat, 8 Aug 2015 13:43:47 -0400
-Subject: [PATCH 024/122] Add the test to the harness
+Subject: Add the test to the harness
 
----
- test/org/jetbrains/java/decompiler/LVTTest.java | 1 +
- 1 file changed, 1 insertion(+)
 
 diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
-index 2d39827..983368c 100644
+index 2d39827fabef8a71133de494460a0c67f4ae9f8b..983368c25695ab8bbf090fa01e6d8df9a302bc91 100644
 --- a/test/org/jetbrains/java/decompiler/LVTTest.java
 +++ b/test/org/jetbrains/java/decompiler/LVTTest.java
 @@ -30,4 +30,5 @@ public class LVTTest extends SingleClassesTestBase {
@@ -18,5 +15,5 @@ index 2d39827..983368c 100644
 +  @Test public void testMatch2() { doTest("pkg/TestLVTScoping"); }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0025-Some-modifications-to-the-printout.-Also-fixed-a-fas.patch b/FernFlower-Patches/0025-Some-modifications-to-the-printout.-Also-fixed-a-fas.patch
index 3e6a8a4..0b083cf 100644
--- a/FernFlower-Patches/0025-Some-modifications-to-the-printout.-Also-fixed-a-fas.patch
+++ b/FernFlower-Patches/0025-Some-modifications-to-the-printout.-Also-fixed-a-fas.patch
@@ -1,24 +1,17 @@
 From cca06e0f3dd96dd8f0412628e2ee33359c461179 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sat, 8 Aug 2015 16:13:27 -0400
-Subject: [PATCH 025/122] Some modifications to the printout. Also, fixed a
- fascinating bug in VarVersionsProcessor where it dumped the original indexes
- because setVarVersions is called multiple times (seems to be some sort of
- reparse loop). Preserving an existing origvarstable across the that method
- seems to have improved accuracy a LOT.
+Subject: =?UTF-8?q?Some=20modifications=20to=20the=20printout.=20Also,=20f?=
+ =?UTF-8?q?ixed=20a=20fascinating=20bug=20in=20VarVersionsProcessor=20wher?=
+ =?UTF-8?q?e=20it=20dumped=20the=20original=20indexes=20because=0AsetVarVe?=
+ =?UTF-8?q?rsions=20is=20called=20multiple=20times=20(seems=20to=20be=20so?=
+ =?UTF-8?q?me=20sort=20of=20reparse=20loop).=20Preserving=20an=20existing?=
+ =?UTF-8?q?=20origvarstable=20across=20the=0Athat=20method=20seems=20to=20?=
+ =?UTF-8?q?have=20improved=20accuracy=20a=20LOT.?=
 
----
- .../decompiler/main/rels/ClassWrapper.java    |  4 ++
- .../main/rels/MethodProcessorRunnable.java    | 42 +++++++++++++++----
- .../modules/decompiler/vars/LVTVariable.java  |  4 ++
- .../decompiler/vars/LocalVariableTable.java   | 12 ++++++
- .../modules/decompiler/vars/VarProcessor.java | 21 ++++++++++
- .../decompiler/vars/VarVersionsProcessor.java |  1 +
- .../StructLocalVariableTableAttribute.java    |  4 ++
- 7 files changed, 79 insertions(+), 9 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
-index 18f05a3..4e86556 100644
+index 18f05a34329a4750249225ce7fbe44e4870d2469..4e865569886a79b208df09e2449106bea16ba87b 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
 @@ -170,9 +170,13 @@ public class ClassWrapper {
@@ -36,7 +29,7 @@ index 18f05a3..4e86556 100644
      }
  
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index dc6f2f0..f0b17a5 100644
+index dc6f2f0e61563f8132d99b70d3d81278f224da04..f0b17a55f189e6dd356a3188bb6e2ce01074393d 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 @@ -26,16 +26,20 @@ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
@@ -144,7 +137,7 @@ index dc6f2f0..f0b17a5 100644
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
-index 0533981..13cfa70 100644
+index 0533981f9da54787c55fd9b54e1f1d555bdbed12..13cfa70a586a82cbcea81553680e8d59b5bfd343 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
 @@ -67,4 +67,8 @@ public class LVTVariable implements Comparable<LVTVariable> {
@@ -158,7 +151,7 @@ index 0533981..13cfa70 100644
  }
 \ No newline at end of file
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-index 75f144d..027e816 100644
+index 75f144dccacee0a214fad16f9cde138ec64de256..027e81652438e7648ec02c49feb2afcb1e2f234c 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 @@ -10,6 +10,7 @@ public class LocalVariableTable {
@@ -197,7 +190,7 @@ index 75f144d..027e816 100644
  }
 \ No newline at end of file
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-index fbd3455..07b5398 100644
+index fbd3455dae324f21854b6374448c0c50f0c1e1ce..07b5398d4ccd7b6a06e91056a88b2b6e0df94291 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 @@ -31,10 +31,18 @@ public class VarProcessor {
@@ -238,7 +231,7 @@ index fbd3455..07b5398 100644
 +}
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-index 4751052..0de789a 100644
+index 4751052a5468ffc469d7166bce648d5b658e040d..0de789a6f2278edc1e327d741b800fdba4a9dfcc 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
 @@ -233,6 +233,7 @@ public class VarVersionsProcessor {
@@ -250,7 +243,7 @@ index 4751052..0de789a 100644
      // map var-version pairs on new var indexes
      List<VarVersionPair> lst = new ArrayList<VarVersionPair>(mapExprentMinTypes.keySet());
 diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-index 4455785..4b00061 100644
+index 44557858b5cf5ef1a6b05c79c34bb41f6ae6e5eb..4b00061fcee269a40b24f80b6147d4940caa9db6 100644
 --- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
 +++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
 @@ -68,4 +68,8 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
@@ -263,5 +256,5 @@ index 4455785..4b00061 100644
 +}
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0026-Change-to-track-the-varversionpair-in-the-oldnames-t.patch b/FernFlower-Patches/0026-Change-to-track-the-varversionpair-in-the-oldnames-t.patch
index 7016ea9..97c4198 100644
--- a/FernFlower-Patches/0026-Change-to-track-the-varversionpair-in-the-oldnames-t.patch
+++ b/FernFlower-Patches/0026-Change-to-track-the-varversionpair-in-the-oldnames-t.patch
@@ -1,18 +1,14 @@
 From 67a6f1d47bd5780221f7a545e899430cfc82e9be Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sat, 8 Aug 2015 17:22:07 -0400
-Subject: [PATCH 026/122] Change to track the varversionpair in the "oldnames"
- table. Track if we have an lvt entry when generating names and trust it's
- name exactly.
+Subject: =?UTF-8?q?Change=20to=20track=20the=20varversionpair=20in=20the?=
+ =?UTF-8?q?=20"oldnames"=20table.=20Track=20if=20we=20have=20an=20lvt=20en?=
+ =?UTF-8?q?try=20when=20generating=20names=0Aand=20trust=20it's=20name=20e?=
+ =?UTF-8?q?xactly.?=
 
----
- .../decompiler/vars/LocalVariableTable.java     |  2 +-
- .../modules/decompiler/vars/VarProcessor.java   | 17 +++++++++--------
- .../decompiler/vars/VarVersionsProcessor.java   |  8 ++++----
- 3 files changed, 14 insertions(+), 13 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-index 027e816..99025a5 100644
+index 027e81652438e7648ec02c49feb2afcb1e2f234c..99025a511b670f1bf84493afb1ac43f3cd394600 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 @@ -64,7 +64,7 @@ private Map<Integer, List<LVTVariable>> mapLVT;
@@ -25,7 +21,7 @@ index 027e816..99025a5 100644
          idx++;
        versions.put(lvt.index, idx);
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-index 07b5398..a2a79f5 100644
+index 07b5398d4ccd7b6a06e91056a88b2b6e0df94291..a2a79f581baeb57597f8a69c9701b8c35ac4e2dc 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 @@ -34,7 +34,7 @@ public class VarProcessor {
@@ -82,7 +78,7 @@ index 07b5398..a2a79f5 100644
  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-index 0de789a..eae4cba 100644
+index 0de789a6f2278edc1e327d741b800fdba4a9dfcc..eae4cbac7b5074685e16cb6738434e1124528d57 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
 @@ -34,7 +34,7 @@ import java.util.Map.Entry;
@@ -122,5 +118,5 @@ index 0de789a..eae4cba 100644
    }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0027-Sort-by-version-it-seems-that-it-increases-as-the-vi.patch b/FernFlower-Patches/0027-Sort-by-version-it-seems-that-it-increases-as-the-vi.patch
index 6a7c158..8488a6b 100644
--- a/FernFlower-Patches/0027-Sort-by-version-it-seems-that-it-increases-as-the-vi.patch
+++ b/FernFlower-Patches/0027-Sort-by-version-it-seems-that-it-increases-as-the-vi.patch
@@ -1,19 +1,16 @@
 From b75a7c5fc84e6da8582a01e6a772572eaf1dcdc4 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sat, 8 Aug 2015 19:43:37 -0400
-Subject: [PATCH 027/122] Sort by version (it seems that it increases as the
- visitors visit the various methods), and use that to align versions with
- different instances of the same variable. Still some tweaks need to be made,
- but it's starting to look promising.
+Subject: =?UTF-8?q?Sort=20by=20version=20(it=20seems=20that=20it=20increas?=
+ =?UTF-8?q?es=20as=20the=20visitors=20visit=20the=20various=20methods),=20?=
+ =?UTF-8?q?and=20use=20that=20to=0Aalign=20versions=20with=20different=20i?=
+ =?UTF-8?q?nstances=20of=20the=20same=20variable.=20Still=20some=20tweaks?=
+ =?UTF-8?q?=20need=20to=20be=20made,=20but=0Ait's=20starting=20to=20look?=
+ =?UTF-8?q?=20promising.?=
 
----
- .../decompiler/vars/LocalVariableTable.java   | 11 +++----
- .../modules/decompiler/vars/VarProcessor.java | 29 +++++++++++++++----
- .../StructLocalVariableTableAttribute.java    |  5 ++--
- 3 files changed, 31 insertions(+), 14 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-index 99025a5..e5fbec8 100644
+index 99025a511b670f1bf84493afb1ac43f3cd394600..e5fbec84cfe40111f8cb93154f99904bcef8d20a 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 @@ -9,7 +9,6 @@ import java.util.Set;
@@ -61,7 +58,7 @@ index 99025a5..e5fbec8 100644
    }
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-index a2a79f5..ccd1bd6 100644
+index a2a79f581baeb57597f8a69c9701b8c35ac4e2dc..ccd1bd64ac0c5e721806fc2b9b423561976c7fe9 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 @@ -52,7 +52,7 @@ private LocalVariableTable lvt;
@@ -114,7 +111,7 @@ index a2a79f5..ccd1bd6 100644
        }
  
 diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-index 4b00061..a983b27 100644
+index 4b00061fcee269a40b24f80b6147d4940caa9db6..a983b2788c5ccb570539a28eca0acf4c627f0595 100644
 --- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
 +++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
 @@ -23,6 +23,7 @@ import org.jetbrains.java.decompiler.util.DataInputFullStream;
@@ -144,5 +141,5 @@ index 4b00061..a983b27 100644
    }
  
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0028-Ignore-variables-without-an-LVT-entry.-They-re-likel.patch b/FernFlower-Patches/0028-Ignore-variables-without-an-LVT-entry.-They-re-likel.patch
index 5c00daa..0f7a51e 100644
--- a/FernFlower-Patches/0028-Ignore-variables-without-an-LVT-entry.-They-re-likel.patch
+++ b/FernFlower-Patches/0028-Ignore-variables-without-an-LVT-entry.-They-re-likel.patch
@@ -1,20 +1,14 @@
 From 1f19690b00959c237600d3fac5ae0a28d8e4045f Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 9 Aug 2015 11:58:54 -0400
-Subject: [PATCH 028/122] Ignore variables without an LVT entry. They're likely
- dummy vars generated by FF for exceptions, little info is missing. Also,
- don't exception on empty blocks, they're just empty blocks!
+Subject: =?UTF-8?q?Ignore=20variables=20without=20an=20LVT=20entry.=20They?=
+ =?UTF-8?q?'re=20likely=20dummy=20vars=20generated=20by=20FF=20for=20excep?=
+ =?UTF-8?q?tions,=20little=20info=20is=20missing.=0AAlso,=20don't=20except?=
+ =?UTF-8?q?ion=20on=20empty=20blocks,=20they're=20just=20empty=20blocks!?=
 
----
- .../decompiler/main/rels/ClassWrapper.java    |   2 +-
- .../main/rels/MethodProcessorRunnable.java    |   5 +-
- .../modules/decompiler/vars/VarProcessor.java |   4 +-
- .../MinecraftDecompilationTest.java           | 125 ++++++++++++++++++
- 4 files changed, 133 insertions(+), 3 deletions(-)
- create mode 100644 test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
-index 4e86556..5a35cc8 100644
+index 4e865569886a79b208df09e2449106bea16ba87b..5a35cc8f05f06ca0e9726ff830eccff46da99b6b 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
 @@ -169,8 +169,8 @@ public class ClassWrapper {
@@ -28,7 +22,7 @@ index 4e86556..5a35cc8 100644
        }
  
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index f0b17a5..388e76a 100644
+index f0b17a55f189e6dd356a3188bb6e2ce01074393d..388e76a7a8270d81d03b661ddbfef5ed9fb53fe4 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 @@ -229,7 +229,10 @@ public class MethodProcessorRunnable implements Runnable {
@@ -44,7 +38,7 @@ index f0b17a5..388e76a 100644
        if (obj instanceof Statement) {
          printStatement((Statement)obj, "  ",varProc);
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-index ccd1bd6..6b15a12 100644
+index ccd1bd64ac0c5e721806fc2b9b423561976c7fe9..6b15a12069348463463c60b541b38a355fb27e91 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 @@ -93,9 +93,11 @@ private LocalVariableTable lvt;
@@ -62,7 +56,7 @@ index ccd1bd6..6b15a12 100644
        }
 diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
 new file mode 100644
-index 0000000..c7e781e
+index 0000000000000000000000000000000000000000..c7e781e4172f736a831b857ca7fd3060d95e6186
 --- /dev/null
 +++ b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
 @@ -0,0 +1,125 @@
@@ -192,5 +186,5 @@ index 0000000..c7e781e
 +  }
 +}
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0029-TryCatch-statements-will-now-use-the-correct-variabl.patch b/FernFlower-Patches/0029-TryCatch-statements-will-now-use-the-correct-variabl.patch
index c6aba77..197a521 100644
--- a/FernFlower-Patches/0029-TryCatch-statements-will-now-use-the-correct-variabl.patch
+++ b/FernFlower-Patches/0029-TryCatch-statements-will-now-use-the-correct-variabl.patch
@@ -1,22 +1,13 @@
 From 5f699acc70d8e40f758737ae88aeddecc07edc8c Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 9 Aug 2015 15:04:04 -0700
-Subject: [PATCH 029/122] TryCatch statements will now use the correct variable
- index for their exception variable. Some small cleanups and NPE fix.
+Subject: =?UTF-8?q?TryCatch=20statements=20will=20now=20use=20the=20correc?=
+ =?UTF-8?q?t=20variable=20index=20for=20their=20exception=20variable.=0ASo?=
+ =?UTF-8?q?me=20small=20cleanups=20and=20NPE=20fix.?=
 
----
- .../decompiler/main/ClassesProcessor.java     |  1 -
- .../main/rels/MethodProcessorRunnable.java    | 63 +------------------
- .../decompiler/stats/CatchAllStatement.java   | 11 +++-
- .../decompiler/stats/CatchStatement.java      | 10 ++-
- .../modules/decompiler/vars/VarProcessor.java | 13 ++--
- .../StructLocalVariableTableAttribute.java    |  1 -
- .../TestClassSimpleBytecodeMapping.dec        |  4 +-
- testData/results/TestTryCatchFinally.dec      | 12 ++--
- 8 files changed, 37 insertions(+), 78 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index 7f75a0c..0060021 100644
+index 7f75a0cf9dd0e58fcf8c3e3c6bfa56678f7b1dfe..00600213ac4a4a39de72131a9cc6dc22424dc7a0 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 @@ -32,7 +32,6 @@ import org.jetbrains.java.decompiler.struct.StructClass;
@@ -28,7 +19,7 @@ index 7f75a0c..0060021 100644
  import org.jetbrains.java.decompiler.struct.attr.StructInnerClassesAttribute.InnerClassInfo;
  import org.jetbrains.java.decompiler.struct.gen.VarType;
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index 388e76a..9542a80 100644
+index 388e76a7a8270d81d03b661ddbfef5ed9fb53fe4..9542a8025136f7416c2c806f52d5c990613604bc 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 @@ -17,7 +17,6 @@ package org.jetbrains.java.decompiler.main.rels;
@@ -116,7 +107,7 @@ index 388e76a..9542a80 100644
            AssignmentExprent assignmentExprent = (AssignmentExprent)exp;
          sb.append("{").append(printExprent(" ",assignmentExprent.getLeft(),varProc)).append(" =").append(printExprent(" ",assignmentExprent.getRight(),varProc)).append("}");
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
-index 812ed10..d5b432c 100644
+index 812ed10b00ba6224ef947be953bc8d88bd72e2f7..d5b432c4fe852fff994e03fed0398da7e22997bd 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
 @@ -16,6 +16,7 @@
@@ -145,7 +136,7 @@ index 812ed10..d5b432c 100644
                              (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR)));
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
-index 8d56042..fda5ed3 100644
+index 8d56042e3667eb6843cdea18d01536f90ea59e50..fda5ed373d94f875ba6450d361bda722086e03d0 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
 @@ -60,7 +60,15 @@ public class CatchStatement extends Statement {
@@ -166,7 +157,7 @@ index 8d56042..fda5ed3 100644
                                  // FIXME: for now simply the first type. Should get the first common superclass when possible.
                                  (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR)));
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-index 6b15a12..ef07c6b 100644
+index 6b15a12069348463463c60b541b38a355fb27e91..ef07c6bc838bb597d27598351b545343e8a725c5 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 @@ -152,16 +152,17 @@ private LocalVariableTable lvt;
@@ -194,7 +185,7 @@ index 6b15a12..ef07c6b 100644
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-index a983b27..a654359 100644
+index a983b2788c5ccb570539a28eca0acf4c627f0595..a654359296bac48d1cc7316987849bd7bd5b8be5 100644
 --- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
 +++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
 @@ -17,7 +17,6 @@ package org.jetbrains.java.decompiler.struct.attr;
@@ -206,7 +197,7 @@ index a983b27..a654359 100644
  import org.jetbrains.java.decompiler.util.DataInputFullStream;
  
 diff --git a/testData/results/TestClassSimpleBytecodeMapping.dec b/testData/results/TestClassSimpleBytecodeMapping.dec
-index 1a2532f..4a2f333 100644
+index 1a2532f0b736a3d1a2db4f7ba3645e48e419189f..4a2f333d257cb2a56dddd0b5ae2887537b01bd86 100644
 --- a/testData/results/TestClassSimpleBytecodeMapping.dec
 +++ b/testData/results/TestClassSimpleBytecodeMapping.dec
 @@ -21,8 +21,8 @@ public class TestClassSimpleBytecodeMapping {
@@ -221,7 +212,7 @@ index 1a2532f..4a2f333 100644
           System.out.println("Finally");// 38
        }
 diff --git a/testData/results/TestTryCatchFinally.dec b/testData/results/TestTryCatchFinally.dec
-index 772a76e..fbe5782 100644
+index 772a76e8a850ff853ef51acb29d82a1ba95dfee6..fbe5782266c4dbcdb4d5558b3173625228f71038 100644
 --- a/testData/results/TestTryCatchFinally.dec
 +++ b/testData/results/TestTryCatchFinally.dec
 @@ -4,10 +4,10 @@ public class TestTryCatchFinally {
@@ -253,5 +244,5 @@ index 772a76e..fbe5782 100644
           System.out.println("Finally");// 55
        }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0030-Add-enhanced-ForEach-loop-detection-and-re-introduce.patch b/FernFlower-Patches/0030-Add-enhanced-ForEach-loop-detection-and-re-introduce.patch
index aec6678..db467fe 100644
--- a/FernFlower-Patches/0030-Add-enhanced-ForEach-loop-detection-and-re-introduce.patch
+++ b/FernFlower-Patches/0030-Add-enhanced-ForEach-loop-detection-and-re-introduce.patch
@@ -1,27 +1,12 @@
 From 143b1e688e6e73e0f54be08e2c381c740c75fd13 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 13 Aug 2015 16:03:24 -0700
-Subject: [PATCH 030/122] Add enhanced ForEach loop detection and re-introduce
- the DotExporter for debugging.
+Subject: Add enhanced ForEach loop detection and re-introduce the DotExporter
+ for debugging.
 
----
- .../decompiler/main/rels/ClassWrapper.java    |   1 -
- .../main/rels/NestedClassProcessor.java       |   2 +
- .../modules/decompiler/MergeHelper.java       | 210 +++++++++++++++-
- .../modules/decompiler/exps/VarExprent.java   |   5 +
- .../sforms/FlattenStatementsHelper.java       |   7 +-
- .../sforms/SSAConstructorSparseEx.java        |  17 +-
- .../sforms/SSAUConstructorSparseEx.java       |  16 +-
- .../modules/decompiler/stats/DoStatement.java |  12 +
- .../decompiler/vars/VarDefinitionHelper.java  |  10 +
- .../modules/decompiler/vars/VarProcessor.java |   2 +-
- .../decompiler/vars/VarVersionsProcessor.java |   2 +
- .../java/decompiler/util/DotExporter.java     | 238 ++++++++++++++++++
- 12 files changed, 498 insertions(+), 24 deletions(-)
- create mode 100644 src/org/jetbrains/java/decompiler/util/DotExporter.java
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
-index 5a35cc8..01b9292 100644
+index 5a35cc8f05f06ca0e9726ff830eccff46da99b6b..01b92922b005d29cdc66cbf1c55e087ff1b1e205 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
 @@ -176,7 +176,6 @@ public class ClassWrapper {
@@ -33,7 +18,7 @@ index 5a35cc8..01b9292 100644
      }
  
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 9aedf22..c6eda1b 100644
+index 9aedf22af1f60b3e17752769462aee91cd9daeb0..c6eda1b630480cdec964a3571fc44e1c90626b24 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 @@ -301,6 +301,8 @@ public class NestedClassProcessor {
@@ -46,7 +31,7 @@ index 9aedf22..c6eda1b 100644
              public int processExprent(Exprent exprent) {
                List<Exprent> lst = exprent.getAllExprents(true);
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-index 71d3d79..d994c26 100644
+index 71d3d7991287bcfc163fb0a5229e8f2595a20dc3..d994c26c65b45e18e54622865e3bc454b22feb0a 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
 @@ -18,8 +18,13 @@ package org.jetbrains.java.decompiler.modules.decompiler;
@@ -301,7 +286,7 @@ index 71d3d79..d994c26 100644
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index f071933..969a03e 100644
+index f0719331904f4db44a7ff8b1db2ad6f80512b01f..969a03e6b1c096f6efbfc5a761459db61eee85f0 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 @@ -217,4 +217,9 @@ public class VarExprent extends Exprent {
@@ -315,7 +300,7 @@ index f071933..969a03e 100644
 +
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
-index 971ace5..d88480e 100644
+index 971ace503b1289a07195289a8e951ae192d9123a..d88480ef7133b0c27ff18518599127ecf3e54df6 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
 @@ -16,8 +16,12 @@
@@ -349,7 +334,7 @@ index 971ace5..d88480e 100644
  
                  DirectNode nodeinc = new DirectNode(DirectNode.NODE_INCREMENT, stat, stat.id + "_inc");
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
-index 76a973f..7f4118c 100644
+index 76a973f9d5813db6c4422b588ec910662dc634a2..7f4118cd58c31d58c3715e67bbe2ad8f227da8b8 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
 @@ -59,6 +59,7 @@ public class SSAConstructorSparseEx {
@@ -408,7 +393,7 @@ index 76a973f..7f4118c 100644
      return startVars;
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
-index 95cefcf..9ba8195 100644
+index 95cefcfeef4cbbd2c6e863ae31efd74ee48cd724..9ba8195cd90a7d7c78fca7fa28cf7370d319768c 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
 @@ -88,7 +88,9 @@ public class SSAUConstructorSparseEx {
@@ -455,7 +440,7 @@ index 95cefcf..9ba8195 100644
      for (DirectNode node : dgraph.nodes) {
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
-index ef5ea76..8359284 100644
+index ef5ea764d6e5d7d6372c21593613ba2b1f98d108..8359284281d3c3e02c15ed407ab4dfacf9eae478 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
 @@ -19,6 +19,7 @@ import org.jetbrains.java.decompiler.main.TextBuffer;
@@ -499,7 +484,7 @@ index ef5ea76..8359284 100644
  
      lst.add(first);
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 23b1c5e..aa2ef6e 100644
+index 23b1c5ef242202d74775a5588a3fbbce9670fafa..aa2ef6ef9701257f03fcfec1cacee9b03d24bc84 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -154,6 +154,15 @@ public class VarDefinitionHelper {
@@ -527,7 +512,7 @@ index 23b1c5e..aa2ef6e 100644
                currVars.add(dost.getConditionExprent());
              }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-index ef07c6b..0f530f9 100644
+index ef07c6bc838bb597d27598351b545343e8a725c5..0f530f92a5ccf150bc7640f3fdcd41f5cb9a4582 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 @@ -31,7 +31,7 @@ public class VarProcessor {
@@ -540,7 +525,7 @@ index ef07c6b..0f530f9 100644
    public void setVarVersions(RootStatement root) {
      Map<Integer, VarVersionPair> mapOriginalVarIndices = null;
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-index eae4cba..cb37d4d 100644
+index eae4cbac7b5074685e16cb6738434e1124528d57..cb37d4d220ee2f513c9c3458cda95c933d1ea267 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
 @@ -46,6 +46,8 @@ public class VarVersionsProcessor {
@@ -554,7 +539,7 @@ index eae4cba..cb37d4d 100644
      typeProcessor = new VarTypeProcessor();
 diff --git a/src/org/jetbrains/java/decompiler/util/DotExporter.java b/src/org/jetbrains/java/decompiler/util/DotExporter.java
 new file mode 100644
-index 0000000..0d41718
+index 0000000000000000000000000000000000000000..0d417185f4cc38e8c9804120a31c7cbc38e0d2de
 --- /dev/null
 +++ b/src/org/jetbrains/java/decompiler/util/DotExporter.java
 @@ -0,0 +1,238 @@
@@ -798,5 +783,5 @@ index 0000000..0d41718
 +}
 \ No newline at end of file
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0031-Fix-permissions-on-gradlew.-It-s-writeable-on-linux.patch b/FernFlower-Patches/0031-Fix-permissions-on-gradlew.-It-s-writeable-on-linux.patch
index f70dafe..e5a9493 100644
--- a/FernFlower-Patches/0031-Fix-permissions-on-gradlew.-It-s-writeable-on-linux.patch
+++ b/FernFlower-Patches/0031-Fix-permissions-on-gradlew.-It-s-writeable-on-linux.patch
@@ -1,16 +1,12 @@
 From 1326398474ddba2211b73412ca7be68ba9c32342 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Thu, 13 Aug 2015 17:06:24 -0700
-Subject: [PATCH 031/122] Fix permissions on gradlew. It's writeable on linux.
+Subject: Fix permissions on gradlew. It's writeable on linux.
 
----
- gradlew | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 gradlew
 
 diff --git a/gradlew b/gradlew
 old mode 100644
 new mode 100755
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0032-Partially-revert-TryCatch-statements-will-now-use-th.patch b/FernFlower-Patches/0032-Partially-revert-TryCatch-statements-will-now-use-th.patch
index bdfe7e3..4becf27 100644
--- a/FernFlower-Patches/0032-Partially-revert-TryCatch-statements-will-now-use-th.patch
+++ b/FernFlower-Patches/0032-Partially-revert-TryCatch-statements-will-now-use-th.patch
@@ -1,20 +1,14 @@
 From 52c5082cd65ed6436412b97c742edf08878890f8 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Thu, 13 Aug 2015 21:45:39 -0700
-Subject: [PATCH 032/122] Partially revert "TryCatch statements will now use
- the correct variable index for their exception variable." (rolled back catch
- changes)
+Subject: =?UTF-8?q?Partially=20revert=20"TryCatch=20statements=20will=20no?=
+ =?UTF-8?q?w=20use=20the=20correct=20variable=20index=20for=20their=20exce?=
+ =?UTF-8?q?ption=20variable."=0A(rolled=20back=20catch=20changes)?=
 
 This reverts commit 5f699acc70d8e40f758737ae88aeddecc07edc8c.
----
- .../modules/decompiler/stats/CatchAllStatement.java  | 11 +----------
- .../modules/decompiler/stats/CatchStatement.java     | 10 +---------
- testData/results/TestClassSimpleBytecodeMapping.dec  |  4 ++--
- testData/results/TestTryCatchFinally.dec             | 12 ++++++------
- 4 files changed, 10 insertions(+), 27 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
-index d5b432c..812ed10 100644
+index d5b432c4fe852fff994e03fed0398da7e22997bd..812ed10b00ba6224ef947be953bc8d88bd72e2f7 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
 @@ -16,7 +16,6 @@
@@ -43,7 +37,7 @@ index d5b432c..812ed10 100644
                              (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR)));
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
-index fda5ed3..8d56042 100644
+index fda5ed373d94f875ba6450d361bda722086e03d0..8d56042e3667eb6843cdea18d01536f90ea59e50 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
 @@ -60,15 +60,7 @@ public class CatchStatement extends Statement {
@@ -64,7 +58,7 @@ index fda5ed3..8d56042 100644
                                  // FIXME: for now simply the first type. Should get the first common superclass when possible.
                                  (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR)));
 diff --git a/testData/results/TestClassSimpleBytecodeMapping.dec b/testData/results/TestClassSimpleBytecodeMapping.dec
-index 4a2f333..1a2532f 100644
+index 4a2f333d257cb2a56dddd0b5ae2887537b01bd86..1a2532f0b736a3d1a2db4f7ba3645e48e419189f 100644
 --- a/testData/results/TestClassSimpleBytecodeMapping.dec
 +++ b/testData/results/TestClassSimpleBytecodeMapping.dec
 @@ -21,8 +21,8 @@ public class TestClassSimpleBytecodeMapping {
@@ -79,7 +73,7 @@ index 4a2f333..1a2532f 100644
           System.out.println("Finally");// 38
        }
 diff --git a/testData/results/TestTryCatchFinally.dec b/testData/results/TestTryCatchFinally.dec
-index fbe5782..772a76e 100644
+index fbe5782266c4dbcdb4d5558b3173625228f71038..772a76e8a850ff853ef51acb29d82a1ba95dfee6 100644
 --- a/testData/results/TestTryCatchFinally.dec
 +++ b/testData/results/TestTryCatchFinally.dec
 @@ -4,10 +4,10 @@ public class TestTryCatchFinally {
@@ -111,5 +105,5 @@ index fbe5782..772a76e 100644
           System.out.println("Finally");// 55
        }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0033-Added-a-test-for-variables-that-seem-to-come-into-sc.patch b/FernFlower-Patches/0033-Added-a-test-for-variables-that-seem-to-come-into-sc.patch
index deeb63f..b37cdb5 100644
--- a/FernFlower-Patches/0033-Added-a-test-for-variables-that-seem-to-come-into-sc.patch
+++ b/FernFlower-Patches/0033-Added-a-test-for-variables-that-seem-to-come-into-sc.patch
@@ -1,14 +1,9 @@
 From 1d9d7cdb8476a39a10b588465f749347b9d1c713 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Thu, 13 Aug 2015 22:57:55 -0700
-Subject: [PATCH 033/122] Added a test for variables that seem to come into
- scope if we remove VarVersionsProcessor.simpleMerge
+Subject: Added a test for variables that seem to come into scope if we remove
+ VarVersionsProcessor.simpleMerge
 
----
- testData/classes/pkg/TestLVT.class | Bin 1672 -> 1860 bytes
- testData/results/TestLVT.dec       |  11 +++++++++--
- testData/src/pkg/TestLVT.java      |   9 +++++++++
- 3 files changed, 18 insertions(+), 2 deletions(-)
 
 diff --git a/testData/classes/pkg/TestLVT.class b/testData/classes/pkg/TestLVT.class
 index d8a5829d4f6504567ecf46bf65167047e41cd291..1cf6286f2a679368b301d408c928d93ed4eecf48 100644
@@ -23,7 +18,7 @@ delta 36
 scmX@Y*TKtm>ff$?3=9lL4AC38v{@$Sv8XaKZJxrS!NkhIz{C&*0Mu#;EC2ui
 
 diff --git a/testData/results/TestLVT.dec b/testData/results/TestLVT.dec
-index b1b7e2e..d161f07 100644
+index b1b7e2e3d96ae555cb0fec2901968fb1b366b2a5..d161f07ae5441548e45707f96b8a7c485be0aeee 100644
 --- a/testData/results/TestLVT.dec
 +++ b/testData/results/TestLVT.dec
 @@ -23,7 +23,14 @@ public class TestLVT {
@@ -44,7 +39,7 @@ index b1b7e2e..d161f07 100644
 +   }
 +}
 diff --git a/testData/src/pkg/TestLVT.java b/testData/src/pkg/TestLVT.java
-index 05b5228..9a46272 100644
+index 05b5228e223eb20be14622126efdb7461c0e1bdf..9a462728bd07fca82b96a7511882523f4a172b55 100644
 --- a/testData/src/pkg/TestLVT.java
 +++ b/testData/src/pkg/TestLVT.java
 @@ -24,4 +24,13 @@ public class TestLVT {
@@ -62,5 +57,5 @@ index 05b5228..9a46272 100644
 +    }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0034-Hook-in-LVT-to-VarExprent-and-print-generic-types.patch b/FernFlower-Patches/0034-Hook-in-LVT-to-VarExprent-and-print-generic-types.patch
index 4b129ff..37cf545 100644
--- a/FernFlower-Patches/0034-Hook-in-LVT-to-VarExprent-and-print-generic-types.patch
+++ b/FernFlower-Patches/0034-Hook-in-LVT-to-VarExprent-and-print-generic-types.patch
@@ -1,22 +1,11 @@
 From c45318da6da9d2d073e1979350e67042d03d4b81 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Fri, 14 Aug 2015 15:56:08 -0700
-Subject: [PATCH 034/122] Hook in LVT to VarExprent and print generic types.
+Subject: Hook in LVT to VarExprent and print generic types.
 
----
- .../decompiler/main/rels/ClassWrapper.java    | 13 ++++++++--
- .../modules/decompiler/ExprProcessor.java     |  7 ++++++
- .../decompiler/exps/InvocationExprent.java    |  3 +++
- .../modules/decompiler/exps/VarExprent.java   | 24 +++++++++++++++----
- .../modules/decompiler/vars/LVTVariable.java  | 14 ++++++++---
- .../decompiler/vars/LocalVariableTable.java   | 11 ++++-----
- .../decompiler/vars/VarDefinitionHelper.java  | 10 ++++++++
- .../modules/decompiler/vars/VarProcessor.java |  4 ++++
- .../StructLocalVariableTableAttribute.java    |  4 ++--
- 9 files changed, 73 insertions(+), 17 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
-index 01b9292..c302cfc 100644
+index 01b92922b005d29cdc66cbf1c55e087ff1b1e205..c302cfc2b51466f6c34ab1cfd54df73f08b6b57f 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
 @@ -81,6 +81,16 @@ public class ClassWrapper {
@@ -51,7 +40,7 @@ index 01b9292..c302cfc 100644
        DecompilerContext.getLogger().endMethod();
      }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-index f33e438..0425fbc 100644
+index f33e438c8297887d41b7438402efe4974412265a..0425fbc336f5318514d09849e9910171aa46d8f9 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
 @@ -38,6 +38,8 @@ import org.jetbrains.java.decompiler.struct.consts.PooledConstant;
@@ -76,7 +65,7 @@ index f33e438..0425fbc 100644
        if (getShort) {
          ret = DecompilerContext.getImportCollector().getShortName(ret);
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 7cf83be..9d16de2 100644
+index 7cf83bedc432341a0af7ed0d895abdea919bee75..9d16de2d5ab160c76a9a3efff83b4e0f011f5a12 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 @@ -241,6 +241,9 @@ public class InvocationExprent extends Exprent {
@@ -90,7 +79,7 @@ index 7cf83be..9d16de2 100644
            TextBuffer res = instance.toJava(indent, tracer);
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index 969a03e..6c973af 100644
+index 969a03e6b1c096f6efbfc5a761459db61eee85f0..6c973af9d01a92e1977022aa28324a0fcbbcf5be 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 @@ -22,13 +22,15 @@ import org.jetbrains.java.decompiler.main.DecompilerContext;
@@ -168,7 +157,7 @@ index 969a03e..6c973af 100644
  
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
-index 13cfa70..dc7783c 100644
+index 13cfa70a586a82cbcea81553680e8d59b5bfd343..dc7783cdc1266ab91bf49cbe66f11bcd433d0837 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
 @@ -68,7 +68,15 @@ public class LVTVariable implements Comparable<LVTVariable> {
@@ -192,7 +181,7 @@ index 13cfa70..dc7783c 100644
  }
 \ No newline at end of file
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-index e5fbec8..270def3 100644
+index e5fbec84cfe40111f8cb93154f99904bcef8d20a..270def3a9ba906e3cce7df1c8feed1b9d9fd6b51 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 @@ -9,7 +9,7 @@ import java.util.Set;
@@ -234,7 +223,7 @@ index e5fbec8..270def3 100644
  }
 \ No newline at end of file
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index aa2ef6e..53201ed 100644
+index aa2ef6ef9701257f03fcfec1cacee9b03d24bc84..53201ede8047b09f76fd8ebfee3eeb9d2149327c 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -185,6 +185,16 @@ public class VarDefinitionHelper {
@@ -255,7 +244,7 @@ index aa2ef6e..53201ed 100644
            defset = true;
            break;
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-index 0f530f9..0a619d0 100644
+index 0f530f92a5ccf150bc7640f3fdcd41f5cb9a4582..0a619d023d4413f969517f8a60ef816be1173fb7 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 @@ -160,6 +160,10 @@ public class VarProcessor {
@@ -270,7 +259,7 @@ index 0f530f9..0a619d0 100644
      VarVersionPair res = varVersions.getMapOriginalVarIndices().get(index);
      if (res == null) return index;
 diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-index a654359..771ec7a 100644
+index a654359296bac48d1cc7316987849bd7bd5b8be5..771ec7add154d7897fa54ac46d91e66e6ad2ecc5 100644
 --- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
 +++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
 @@ -69,7 +69,7 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
@@ -284,5 +273,5 @@ index a654359..771ec7a 100644
 +  }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0035-Make-Loop-Enhancement-retain-all-bytecode-data.-And-.patch b/FernFlower-Patches/0035-Make-Loop-Enhancement-retain-all-bytecode-data.-And-.patch
index 0afa242..78e050b 100644
--- a/FernFlower-Patches/0035-Make-Loop-Enhancement-retain-all-bytecode-data.-And-.patch
+++ b/FernFlower-Patches/0035-Make-Loop-Enhancement-retain-all-bytecode-data.-And-.patch
@@ -1,15 +1,12 @@
 From fff1261eeb1e19a8f57fea9b1a81bce7894f9aef Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Tue, 25 Aug 2015 12:03:36 -0700
-Subject: [PATCH 035/122] Make Loop Enhancement retain all bytecode data. And
- support iterator/listIterator.
+Subject: Make Loop Enhancement retain all bytecode data. And support
+ iterator/listIterator.
 
----
- .../modules/decompiler/MergeHelper.java       | 147 ++++++++++++++----
- 1 file changed, 115 insertions(+), 32 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-index d994c26..3172b5e 100644
+index d994c26c65b45e18e54622865e3bc454b22feb0a..3172b5e6754fc9e2d5570f1d7110dc452b77b510 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
 @@ -118,6 +118,10 @@ public class MergeHelper {
@@ -270,5 +267,5 @@ index d994c26..3172b5e 100644
 +  }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0036-Add-step-to-VarDefintionHelper-that-splits-variables.patch b/FernFlower-Patches/0036-Add-step-to-VarDefintionHelper-that-splits-variables.patch
index 584ee1a..83cbbb0 100644
--- a/FernFlower-Patches/0036-Add-step-to-VarDefintionHelper-that-splits-variables.patch
+++ b/FernFlower-Patches/0036-Add-step-to-VarDefintionHelper-that-splits-variables.patch
@@ -1,22 +1,13 @@
 From 5d42ed490c525d168d6d2f9d727610aa6262237c Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Tue, 25 Aug 2015 12:05:24 -0700
-Subject: [PATCH 036/122] Add step to VarDefintionHelper that splits variables
- out as best it can. For now ForEach loops are forced to seperate variables.
- Also attempt to attach LVT information EVERY VarExprent in the method not
- just in head.
+Subject: Add step to VarDefintionHelper that splits variables out as best it
+ can. For now ForEach loops are forced to seperate variables. Also attempt to
+ attach LVT information EVERY VarExprent in the method not just in head.
 
----
- .../main/rels/MethodProcessorRunnable.java    |   2 +-
- .../modules/decompiler/exps/Exprent.java      |   1 -
- .../sforms/FlattenStatementsHelper.java       |   4 +-
- .../decompiler/vars/LocalVariableTable.java   |  64 ++++-
- .../decompiler/vars/VarDefinitionHelper.java  | 248 +++++++++++++++++-
- .../modules/decompiler/vars/VarProcessor.java |  11 +-
- 6 files changed, 304 insertions(+), 26 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index 9542a80..54a77e1 100644
+index 9542a8025136f7416c2c806f52d5c990613604bc..54a77e19ac62d4a198f4943a19af1887c3843ab1 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 @@ -243,7 +243,7 @@ public class MethodProcessorRunnable implements Runnable {
@@ -29,7 +20,7 @@ index 9542a80..54a77e1 100644
        values.or(((DummyExitStatement)st).bytecode);
      if (st.getExprents() != null) {
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-index db839fe..ca9c1ed 100644
+index db839fe5e35da590ce5ebae6cb4122f60e89219d..ca9c1ed566e423e9169e2b7f72bfec128010f68f 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
 @@ -17,7 +17,6 @@ package org.jetbrains.java.decompiler.modules.decompiler.exps;
@@ -41,7 +32,7 @@ index db839fe..ca9c1ed 100644
  import java.util.Comparator;
  import java.util.HashSet;
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
-index d88480e..abc0f67 100644
+index d88480ef7133b0c27ff18518599127ecf3e54df6..abc0f670715204a5b8e1f6f168d136fa65292b8d 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
 @@ -227,7 +227,9 @@ public class FlattenStatementsHelper {
@@ -56,7 +47,7 @@ index d88480e..abc0f67 100644
  
                  DirectNode nodeinc = new DirectNode(DirectNode.NODE_INCREMENT, stat, stat.id + "_inc");
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-index 270def3..cd56bac 100644
+index 270def3a9ba906e3cce7df1c8feed1b9d9fd6b51..cd56bacb1d0d337f3d33b0eb7b87779cefd3d347 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 @@ -1,11 +1,16 @@
@@ -151,7 +142,7 @@ index 270def3..cd56bac 100644
  }
 \ No newline at end of file
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 53201ed..1e1a4a7 100644
+index 53201ede8047b09f76fd8ebfee3eeb9d2149327c..1e1a4a7987545d00460cd7e7e17c3bcde6a75df1 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -17,7 +17,9 @@ package org.jetbrains.java.decompiler.modules.decompiler.vars;
@@ -470,7 +461,7 @@ index 53201ed..1e1a4a7 100644
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-index 0a619d0..a8ad019 100644
+index 0a619d023d4413f969517f8a60ef816be1173fb7..a8ad01909d5ccd56cdadbd7ecab087a63e1e3d09 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 @@ -160,8 +160,8 @@ public class VarProcessor {
@@ -497,5 +488,5 @@ index 0a619d0..a8ad019 100644
 +  }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0037-Lex-s-tests.patch b/FernFlower-Patches/0037-Lex-s-tests.patch
index dcaad26..c878b13 100644
--- a/FernFlower-Patches/0037-Lex-s-tests.patch
+++ b/FernFlower-Patches/0037-Lex-s-tests.patch
@@ -1,24 +1,11 @@
 From 9f908e30826e71247955a0c38f1154d8065073ec Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Thu, 27 Aug 2015 15:39:39 -0400
-Subject: [PATCH 037/122] Lex's tests
+Subject: Lex's tests
 
----
- .../decompiler/DecompilerTestFixture.java     |   3 +-
- .../jetbrains/java/decompiler/LVTTest.java    |   7 ++
- .../decompiler/SingleClassesTestBase.java     |   2 +-
- .../classes/pkg/TestLexManosLVT$Bob.class     | Bin 0 -> 1472 bytes
- testData/classes/pkg/TestLexManosLVT.class    | Bin 0 -> 1967 bytes
- testData/results/TestLexManosLVT.dec          |  64 ++++++++++++++++++
- testData/src/pkg/TestLexManosLVT.java         |  64 ++++++++++++++++++
- 7 files changed, 138 insertions(+), 2 deletions(-)
- create mode 100644 testData/classes/pkg/TestLexManosLVT$Bob.class
- create mode 100644 testData/classes/pkg/TestLexManosLVT.class
- create mode 100644 testData/results/TestLexManosLVT.dec
- create mode 100644 testData/src/pkg/TestLexManosLVT.java
 
 diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
-index d0d869c..f2c344a 100644
+index d0d869c04400e25a9191dd6fdfee78b2ee64dd25..f2c344a925dda9d1081aa867987147fd3fb3664e 100644
 --- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
 +++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
 @@ -31,6 +31,7 @@ public class DecompilerTestFixture {
@@ -39,7 +26,7 @@ index d0d869c..f2c344a 100644
      }
    }
 diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
-index 983368c..f4d869c 100644
+index 983368c25695ab8bbf090fa01e6d8df9a302bc91..f4d869c4f04fef50aa1bcf64cb61ce0d2b02bfb9 100644
 --- a/test/org/jetbrains/java/decompiler/LVTTest.java
 +++ b/test/org/jetbrains/java/decompiler/LVTTest.java
 @@ -18,6 +18,7 @@ package org.jetbrains.java.decompiler;
@@ -64,7 +51,7 @@ index 983368c..f4d869c 100644
    @Test public void testMatch2() { doTest("pkg/TestLVTScoping"); }
  }
 diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java b/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
-index 165f695..064ca5c 100644
+index 165f695e0f4b04fe5ff3dc58e88d28f29dc150ae..064ca5c1c1eaacf2d2cf70eac8071d3c93cf625f 100644
 --- a/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
 +++ b/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
 @@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals;
@@ -136,7 +123,7 @@ HcmV?d00001
 
 diff --git a/testData/results/TestLexManosLVT.dec b/testData/results/TestLexManosLVT.dec
 new file mode 100644
-index 0000000..9ef5e62
+index 0000000000000000000000000000000000000000..9ef5e62bd10b5818a60bf1842c2daa446c84d9d3
 --- /dev/null
 +++ b/testData/results/TestLexManosLVT.dec
 @@ -0,0 +1,64 @@
@@ -206,7 +193,7 @@ index 0000000..9ef5e62
 +}
 diff --git a/testData/src/pkg/TestLexManosLVT.java b/testData/src/pkg/TestLexManosLVT.java
 new file mode 100644
-index 0000000..e04de1e
+index 0000000000000000000000000000000000000000..e04de1e8d82f6162e49d4735b6e4335595e321b7
 --- /dev/null
 +++ b/testData/src/pkg/TestLexManosLVT.java
 @@ -0,0 +1,64 @@
@@ -275,5 +262,5 @@ index 0000000..e04de1e
 +    }
 +}
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0038-Fix-inverted-null-test.patch b/FernFlower-Patches/0038-Fix-inverted-null-test.patch
index 8cb7f05..6305ca5 100644
--- a/FernFlower-Patches/0038-Fix-inverted-null-test.patch
+++ b/FernFlower-Patches/0038-Fix-inverted-null-test.patch
@@ -1,14 +1,11 @@
 From f023a4410692d9e353b0ddd61d3072df16fdd18a Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Thu, 27 Aug 2015 15:41:47 -0400
-Subject: [PATCH 038/122] Fix inverted null test
+Subject: Fix inverted null test
 
----
- .../decompiler/modules/decompiler/vars/VarDefinitionHelper.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 1e1a4a7..d24813f 100644
+index 1e1a4a7987545d00460cd7e7e17c3bcde6a75df1..d24813f0d9962ed8b0d6efacd251c175721e33d0 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -556,7 +556,7 @@ public class VarDefinitionHelper {
@@ -21,5 +18,5 @@ index 1e1a4a7..d24813f 100644
      }
  
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0039-More-tweaks.-Closer.patch b/FernFlower-Patches/0039-More-tweaks.-Closer.patch
index 14f9688..d0622dd 100644
--- a/FernFlower-Patches/0039-More-tweaks.-Closer.patch
+++ b/FernFlower-Patches/0039-More-tweaks.-Closer.patch
@@ -1,24 +1,11 @@
 From de3a686365bc75c89bf8a1cf47d8c9cb9266b7df Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Fri, 11 Sep 2015 21:57:09 -0400
-Subject: [PATCH 039/122] More tweaks. Closer!
+Subject: More tweaks. Closer!
 
----
- .../java/decompiler/code/cfg/BasicBlock.java  | 15 +++++
- .../main/rels/MethodProcessorRunnable.java    |  2 +-
- .../modules/decompiler/PPandMMHelper.java     | 65 ++++++++++++++++++-
- .../modules/decompiler/stats/Statement.java   | 10 ++-
- .../modules/decompiler/vars/LVTVariable.java  | 22 +++----
- .../decompiler/vars/LocalVariableTable.java   | 61 ++++++++---------
- .../decompiler/vars/VarDefinitionHelper.java  | 60 ++++++++++++-----
- .../decompiler/vars/VarVersionsProcessor.java |  4 +-
- testData/results/TestLVT.dec                  |  6 +-
- testData/results/TestLVTScoping.dec           |  6 +-
- testData/results/TestLexManosLVT.dec          | 14 ++--
- 11 files changed, 187 insertions(+), 78 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
-index 2e29529..a36047b 100644
+index 2e29529da63d2d83c975945bc4a17f409a7dbff3..a36047be9d5aaafd1e37ea1fc4ed861b7e26e5c9 100644
 --- a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
 +++ b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
 @@ -262,4 +262,19 @@ public class BasicBlock implements IGraphNode {
@@ -42,7 +29,7 @@ index 2e29529..a36047b 100644
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index 54a77e1..5844b93 100644
+index 54a77e19ac62d4a198f4943a19af1887c3843ab1..5844b931ca6c6f2634455d2d91c6eca0680bcc5b 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 @@ -153,7 +153,7 @@ public class MethodProcessorRunnable implements Runnable {
@@ -55,7 +42,7 @@ index 54a77e1..5844b93 100644
        }
      }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
-index 4eb366b..d93bad6 100644
+index 4eb366b466da3c9384f5ae6807b790aa8fd1d477..d93bad6bd760a6de8e546411b1f2798b4bbd03ad 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
 @@ -19,19 +19,31 @@ import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
@@ -169,7 +156,7 @@ index 4eb366b..d93bad6 100644
 +}
 \ No newline at end of file
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
-index ced701f..5a44fcf 100644
+index ced701f998a28521bf39ad0cf977eb7ea4006c14..5a44fcfa1fff73ae00d869781ebcba27cccb186b 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
 @@ -862,9 +862,9 @@ public class Statement implements IMatchable {
@@ -196,7 +183,7 @@ index ced701f..5a44fcf 100644
 +
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
-index dc7783c..bc7ba23 100644
+index dc7783cdc1266ab91bf49cbe66f11bcd433d0837..bc7ba23f14806acf42ec1765c0e3831c1f7aa27d 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
 @@ -42,34 +42,34 @@ public class LVTVariable implements Comparable<LVTVariable> {
@@ -246,7 +233,7 @@ index dc7783c..bc7ba23 100644
  
    public String getDesc() {
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-index cd56bac..f7e1858 100644
+index cd56bacb1d0d337f3d33b0eb7b87779cefd3d347..f7e185839a37c353cbc63da9d26128d0dd44355c 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 @@ -1,29 +1,37 @@
@@ -352,7 +339,7 @@ index cd56bac..f7e1858 100644
  }
 \ No newline at end of file
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index d24813f..d68ee36 100644
+index d24813f0d9962ed8b0d6efacd251c175721e33d0..d68ee3605d37d09a125facde48f3b3e48d3921bf 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -16,6 +16,7 @@
@@ -507,7 +494,7 @@ index d24813f..d68ee36 100644
        for (Object obj : stat.getSequentialObjects()) {
          if (obj instanceof Statement) {
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-index cb37d4d..d56c778 100644
+index cb37d4d220ee2f513c9c3458cda95c933d1ea267..d56c778820770b52016900cef6d1753ba5f1d814 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
 @@ -53,7 +53,7 @@ public class VarVersionsProcessor {
@@ -529,7 +516,7 @@ index cb37d4d..d56c778 100644
        @Override
        public int processExprent(Exprent exprent) {
 diff --git a/testData/results/TestLVT.dec b/testData/results/TestLVT.dec
-index d161f07..aed09b4 100644
+index d161f07ae5441548e45707f96b8a7c485be0aeee..aed09b402ba8f79e0260d8eaa98e638097341b05 100644
 --- a/testData/results/TestLVT.dec
 +++ b/testData/results/TestLVT.dec
 @@ -14,9 +14,9 @@ public class TestLVT {
@@ -546,7 +533,7 @@ index d161f07..aed09b4 100644
           String scope2a = "scope2+1a";
           HashMap noise = new HashMap();
 diff --git a/testData/results/TestLVTScoping.dec b/testData/results/TestLVTScoping.dec
-index 7bbf624..2949d31 100644
+index 7bbf62484e40f9f00b4028029c6c0862d08e750c..2949d31b4ab29159fd9523b63da9ee30574a8486 100644
 --- a/testData/results/TestLVTScoping.dec
 +++ b/testData/results/TestLVTScoping.dec
 @@ -12,11 +12,11 @@ public class TestLVTScoping {
@@ -565,7 +552,7 @@ index 7bbf624..2949d31 100644
        }   }
  
 diff --git a/testData/results/TestLexManosLVT.dec b/testData/results/TestLexManosLVT.dec
-index 9ef5e62..285cb14 100644
+index 9ef5e62bd10b5818a60bf1842c2daa446c84d9d3..285cb14b2b56200d6d9951eb6c8ba7266e3961dd 100644
 --- a/testData/results/TestLexManosLVT.dec
 +++ b/testData/results/TestLexManosLVT.dec
 @@ -29,26 +29,28 @@ public class TestLexManosLVT {
@@ -604,5 +591,5 @@ index 9ef5e62..285cb14 100644
              for(TestLexManosLVT.Bob c : values()) {
                 for(TestLexManosLVT.Bob d : values()) {
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0040-More-tweaks-it-passes-the-TestLVT-tests.patch b/FernFlower-Patches/0040-More-tweaks-it-passes-the-TestLVT-tests.patch
index 83d5772..36dfbb1 100644
--- a/FernFlower-Patches/0040-More-tweaks-it-passes-the-TestLVT-tests.patch
+++ b/FernFlower-Patches/0040-More-tweaks-it-passes-the-TestLVT-tests.patch
@@ -1,15 +1,11 @@
 From d828cac2aee189062bac3731431f33e2a6ba30ca Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Fri, 11 Sep 2015 23:42:09 -0400
-Subject: [PATCH 040/122] More tweaks, it passes the TestLVT tests
+Subject: More tweaks, it passes the TestLVT tests
 
----
- .../modules/decompiler/stats/Statement.java   | 20 ++++++++------
- .../decompiler/vars/VarDefinitionHelper.java  | 27 ++++++++++++-------
- 2 files changed, 29 insertions(+), 18 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
-index 5a44fcf..c126050 100644
+index 5a44fcfa1fff73ae00d869781ebcba27cccb186b..c12605070b1de0bd65ebed44eacb25467666efbc 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
 @@ -868,11 +868,11 @@ public class Statement implements IMatchable {
@@ -64,7 +60,7 @@ index 5a44fcf..c126050 100644
  
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index d68ee36..db41fb8 100644
+index d68ee3605d37d09a125facde48f3b3e48d3921bf..db41fb8a8ebfb8981c390f6782ca02d974792f95 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -30,6 +30,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatemen
@@ -156,5 +152,5 @@ index d68ee36..db41fb8 100644
          }
        }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0041-Another-fix-from-lex-merges-RHS-and-LHS-of-exprents.patch b/FernFlower-Patches/0041-Another-fix-from-lex-merges-RHS-and-LHS-of-exprents.patch
index fd23024..81516a6 100644
--- a/FernFlower-Patches/0041-Another-fix-from-lex-merges-RHS-and-LHS-of-exprents.patch
+++ b/FernFlower-Patches/0041-Another-fix-from-lex-merges-RHS-and-LHS-of-exprents.patch
@@ -1,14 +1,11 @@
 From 9ac4c6fcc3a1c13833ad17c41d6c6218ec9059bb Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sat, 12 Sep 2015 00:00:42 -0400
-Subject: [PATCH 041/122] Another fix from lex, merges RHS and LHS of exprents
+Subject: Another fix from lex, merges RHS and LHS of exprents
 
----
- .../decompiler/vars/VarDefinitionHelper.java  | 241 +++++-------------
- 1 file changed, 61 insertions(+), 180 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index db41fb8..5a276cd 100644
+index db41fb8a8ebfb8981c390f6782ca02d974792f95..5a276cdb7e6fcef6c06280edf6080af7b5a71d63 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -16,21 +16,14 @@
@@ -378,5 +375,5 @@ index db41fb8..5a276cd 100644
 +}
 \ No newline at end of file
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0042-need-to-match-both-start-and-end-to-avoid-weirdness-.patch b/FernFlower-Patches/0042-need-to-match-both-start-and-end-to-avoid-weirdness-.patch
index 8444a55..aba7e1a 100644
--- a/FernFlower-Patches/0042-need-to-match-both-start-and-end-to-avoid-weirdness-.patch
+++ b/FernFlower-Patches/0042-need-to-match-both-start-and-end-to-avoid-weirdness-.patch
@@ -1,18 +1,11 @@
 From 09209954680f314ed735818b7f22ca1e81080509 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sat, 12 Sep 2015 00:48:02 -0400
-Subject: [PATCH 042/122] need to match both start and end, to avoid weirdness
- sometimes
+Subject: need to match both start and end, to avoid weirdness sometimes
 
----
- .../modules/decompiler/vars/LVTVariable.java   |  7 ++++---
- .../decompiler/vars/LocalVariableTable.java    | 17 +++++------------
- .../modules/decompiler/vars/StartEndPair.java  | 18 ++++++++++++++++++
- 3 files changed, 27 insertions(+), 15 deletions(-)
- create mode 100644 src/org/jetbrains/java/decompiler/modules/decompiler/vars/StartEndPair.java
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
-index bc7ba23..59dee69 100644
+index bc7ba23f14806acf42ec1765c0e3831c1f7aa27d..59dee69e92d414371f9212d6c1b05a042ffadd92 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
 @@ -50,11 +50,12 @@ public class LVTVariable implements Comparable<LVTVariable> {
@@ -32,7 +25,7 @@ index bc7ba23..59dee69 100644
      ends.add(this);
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-index f7e1858..1de7181 100644
+index f7e185839a37c353cbc63da9d26128d0dd44355c..1de71812af2089eb1445f9b8448c1a8086b1d435 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 @@ -1,31 +1,23 @@
@@ -84,7 +77,7 @@ index f7e1858..1de7181 100644
      }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/StartEndPair.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/StartEndPair.java
 new file mode 100644
-index 0000000..23a3929
+index 0000000000000000000000000000000000000000..23a3929a12446772fb3e35196223925853b28ec3
 --- /dev/null
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/StartEndPair.java
 @@ -0,0 +1,18 @@
@@ -107,5 +100,5 @@ index 0000000..23a3929
 +    }
 +}
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0043-Better-remapping-of-assignment-merges.patch b/FernFlower-Patches/0043-Better-remapping-of-assignment-merges.patch
index e8f9cf9..903380e 100644
--- a/FernFlower-Patches/0043-Better-remapping-of-assignment-merges.patch
+++ b/FernFlower-Patches/0043-Better-remapping-of-assignment-merges.patch
@@ -1,14 +1,11 @@
 From fcb5e35a68f7155018b1330846e9fe8222f9e39d Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Fri, 11 Sep 2015 21:50:11 -0700
-Subject: [PATCH 043/122] Better remapping of assignment merges.
+Subject: Better remapping of assignment merges.
 
----
- .../decompiler/vars/VarDefinitionHelper.java  | 56 +++++++++++--------
- 1 file changed, 34 insertions(+), 22 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 5a276cd..2436d6d 100644
+index 5a276cdb7e6fcef6c06280edf6080af7b5a71d63..2436d6d6bcf284bede78fb2e31a9f4efd2578d20 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -427,51 +427,61 @@ public class VarDefinitionHelper {
@@ -127,5 +124,5 @@ index 5a276cd..2436d6d 100644
        }
      }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0044-PPMM-test-for-lex.patch b/FernFlower-Patches/0044-PPMM-test-for-lex.patch
index 01051b7..aa9a2fa 100644
--- a/FernFlower-Patches/0044-PPMM-test-for-lex.patch
+++ b/FernFlower-Patches/0044-PPMM-test-for-lex.patch
@@ -1,18 +1,11 @@
 From ab0b5409d7cacdc6d9c208de4657377a4a259c05 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 13 Sep 2015 18:25:07 -0400
-Subject: [PATCH 044/122] PPMM test for lex
+Subject: PPMM test for lex
 
----
- test/org/jetbrains/java/decompiler/LVTTest.java |   9 ++++++---
- testData/classes/pkg/TestPPMM.class             | Bin 0 -> 371 bytes
- testData/src/pkg/TestPPMM.java                  |  11 +++++++++++
- 3 files changed, 17 insertions(+), 3 deletions(-)
- create mode 100644 testData/classes/pkg/TestPPMM.class
- create mode 100644 testData/src/pkg/TestPPMM.java
 
 diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
-index f4d869c..d2a8f1c 100644
+index f4d869c4f04fef50aa1bcf64cb61ce0d2b02bfb9..d2a8f1c20c8a7954d4ba22d17fc1584d3bd4a3ca 100644
 --- a/test/org/jetbrains/java/decompiler/LVTTest.java
 +++ b/test/org/jetbrains/java/decompiler/LVTTest.java
 @@ -35,7 +35,10 @@ public class LVTTest extends SingleClassesTestBase {
@@ -46,7 +39,7 @@ HcmV?d00001
 
 diff --git a/testData/src/pkg/TestPPMM.java b/testData/src/pkg/TestPPMM.java
 new file mode 100644
-index 0000000..02eecf4
+index 0000000000000000000000000000000000000000..02eecf4b565584b5644ad5898565593494aad285
 --- /dev/null
 +++ b/testData/src/pkg/TestPPMM.java
 @@ -0,0 +1,11 @@
@@ -63,5 +56,5 @@ index 0000000..02eecf4
 +}
 \ No newline at end of file
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0045-Change-begin-end-detection.-Less-derpy.patch b/FernFlower-Patches/0045-Change-begin-end-detection.-Less-derpy.patch
index ac2f62e..8c9d51a 100644
--- a/FernFlower-Patches/0045-Change-begin-end-detection.-Less-derpy.patch
+++ b/FernFlower-Patches/0045-Change-begin-end-detection.-Less-derpy.patch
@@ -1,22 +1,11 @@
 From 78afb4580567df9f7d1e6245dc9735eba714a3b2 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 13 Sep 2015 18:26:04 -0400
-Subject: [PATCH 045/122] Change begin/end detection. Less derpy.
+Subject: Change begin/end detection. Less derpy.
 
----
- .../modules/decompiler/stats/DoStatement.java |  6 +++++
- .../modules/decompiler/stats/IfStatement.java | 15 ++++++++-----
- .../decompiler/stats/RootStatement.java       |  6 +++++
- .../decompiler/stats/SequenceStatement.java   |  6 +++++
- .../modules/decompiler/stats/Statement.java   | 22 ++++++++++++-------
- .../decompiler/stats/SwitchStatement.java     | 12 ++++++++++
- .../decompiler/vars/LocalVariableTable.java   | 17 +++++---------
- .../modules/decompiler/vars/StartEndPair.java | 15 +++++++++++++
- .../decompiler/vars/VarDefinitionHelper.java  | 14 +++++++-----
- 9 files changed, 82 insertions(+), 31 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
-index 8359284..0768912 100644
+index 8359284281d3c3e02c15ed407ab4dfacf9eae478..0768912fe41d5d60580029e640cfaab07e6447bb 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
 @@ -21,6 +21,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
@@ -38,7 +27,7 @@ index 8359284..0768912 100644
 +    }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
-index 8be0dcc..f216b73 100644
+index 8be0dcc0ca2e0e3a9da1f5f92d625ee25f7d7e7a..f216b73fe7480b9425608a1b19b48ef6de6424bc 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
 @@ -22,6 +22,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
@@ -87,7 +76,7 @@ index 8be0dcc..f216b73 100644
 +    }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
-index 7193f9a..0a1e798 100644
+index 7193f9a787a2b849aac667354b6931e4ed2816d8..0a1e798299c913755fd7b99a8afe10ca34e27d20 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
 @@ -18,6 +18,7 @@ package org.jetbrains.java.decompiler.modules.decompiler.stats;
@@ -109,7 +98,7 @@ index 7193f9a..0a1e798 100644
 +    }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
-index 7d2ee43..b3785fb 100644
+index 7d2ee435ce1c153b6da410d825d697d9790e35fe..b3785fb3235dd593ce293d0c6677546a361fb489 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
 @@ -20,6 +20,7 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
@@ -131,7 +120,7 @@ index 7d2ee43..b3785fb 100644
 +    }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
-index c126050..806c4d5 100644
+index c12605070b1de0bd65ebed44eacb25467666efbc..806c4d57423605f5b11b33f8647734646473b00c 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
 @@ -24,6 +24,7 @@ import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
@@ -169,7 +158,7 @@ index c126050..806c4d5 100644
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
-index 5916490..8d7127c 100644
+index 59164900d91a1d02526de1ab32958fac7083357b..8d7127cc348720d35f161c5c92c7fb66c2bd7ddb 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
 @@ -27,6 +27,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
@@ -197,7 +186,7 @@ index 5916490..8d7127c 100644
 +    }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-index 1de7181..fe45b11 100644
+index 1de71812af2089eb1445f9b8448c1a8086b1d435..fe45b111874c303e7a0e839e1ef358131bc320a2 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 @@ -3,6 +3,7 @@ package org.jetbrains.java.decompiler.modules.decompiler.vars;
@@ -232,7 +221,7 @@ index 1de7181..fe45b11 100644
          for (LVTVariable lvt : endpoints.get(sepair)) {
              ret.put(lvt.index,lvt);
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/StartEndPair.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/StartEndPair.java
-index 23a3929..32c8799 100644
+index 23a3929a12446772fb3e35196223925853b28ec3..32c87996ea629302559202e7cd39c9e345a67398 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/StartEndPair.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/StartEndPair.java
 @@ -15,4 +15,19 @@ public class StartEndPair {
@@ -256,7 +245,7 @@ index 23a3929..32c8799 100644
 +    }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 2436d6d..56061fe 100644
+index 2436d6d6bcf284bede78fb2e31a9f4efd2578d20..56061fe881f6c9f0e78a27ac62613136fd0277c3 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -127,13 +127,13 @@ public class VarDefinitionHelper {
@@ -305,5 +294,5 @@ index 2436d6d..56061fe 100644
        }
      }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0046-Fixup-NPE-from-PPMM-helper-and-expand-PPMM-test-to-i.patch b/FernFlower-Patches/0046-Fixup-NPE-from-PPMM-helper-and-expand-PPMM-test-to-i.patch
index 790d095..86a6fc7 100644
--- a/FernFlower-Patches/0046-Fixup-NPE-from-PPMM-helper-and-expand-PPMM-test-to-i.patch
+++ b/FernFlower-Patches/0046-Fixup-NPE-from-PPMM-helper-and-expand-PPMM-test-to-i.patch
@@ -1,20 +1,12 @@
 From 7e027aef8ba2caaee9f3e93412274b7073b8f6a7 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 13 Sep 2015 17:49:00 -0700
-Subject: [PATCH 046/122] Fixup NPE from PPMM helper, and expand PPMM test to
- include more edge cases.
+Subject: Fixup NPE from PPMM helper, and expand PPMM test to include more edge
+ cases.
 
----
- .../modules/decompiler/PPandMMHelper.java     |  15 +++-
- .../modules/decompiler/exps/ConstExprent.java |   5 ++
- testData/classes/pkg/TestPPMM.class           | Bin 371 -> 936 bytes
- testData/results/TestPPMM.dec                 |  70 ++++++++++++++++++
- testData/src/pkg/TestPPMM.java                |  69 +++++++++++++++--
- 5 files changed, 150 insertions(+), 9 deletions(-)
- create mode 100644 testData/results/TestPPMM.dec
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
-index d93bad6..f39946d 100644
+index d93bad6bd760a6de8e546411b1f2798b4bbd03ad..f39946d1c839333a69c91521f6714b183028567d 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
 @@ -34,6 +34,7 @@ import java.util.HashSet;
@@ -52,7 +44,7 @@ index d93bad6..f39946d 100644
        @Override
        public int processExprent(Exprent exprent) {
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-index 312f6c8..3398924 100644
+index 312f6c8a51e96e8f1a8dc27b509716022e22cc39..3398924fabb57daddb0f6b51daafdd266cc371b6 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 @@ -416,6 +416,11 @@ public class ConstExprent extends Exprent {
@@ -89,7 +81,7 @@ E0NOq`X8-^I
 
 diff --git a/testData/results/TestPPMM.dec b/testData/results/TestPPMM.dec
 new file mode 100644
-index 0000000..ba3a5fc
+index 0000000000000000000000000000000000000000..ba3a5fc1b4a29798078399358a7e560326aa2044
 --- /dev/null
 +++ b/testData/results/TestPPMM.dec
 @@ -0,0 +1,70 @@
@@ -164,7 +156,7 @@ index 0000000..ba3a5fc
 +   }
 +}
 diff --git a/testData/src/pkg/TestPPMM.java b/testData/src/pkg/TestPPMM.java
-index 02eecf4..21c7f2e 100644
+index 02eecf4b565584b5644ad5898565593494aad285..21c7f2eab8296554f3fdb5d23efba4832e42e745 100644
 --- a/testData/src/pkg/TestPPMM.java
 +++ b/testData/src/pkg/TestPPMM.java
 @@ -1,11 +1,66 @@
@@ -243,5 +235,5 @@ index 02eecf4..21c7f2e 100644
  }
 \ No newline at end of file
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0047-Prevent-infinite-loops-in-PPMM.patch b/FernFlower-Patches/0047-Prevent-infinite-loops-in-PPMM.patch
index a3056d9..676e71e 100644
--- a/FernFlower-Patches/0047-Prevent-infinite-loops-in-PPMM.patch
+++ b/FernFlower-Patches/0047-Prevent-infinite-loops-in-PPMM.patch
@@ -1,14 +1,11 @@
 From 613a1873954a310ee5ee18be6db5790e6ec74ba0 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 13 Sep 2015 18:19:20 -0700
-Subject: [PATCH 047/122] Prevent infinite loops in PPMM.
+Subject: Prevent infinite loops in PPMM.
 
----
- .../java/decompiler/modules/decompiler/PPandMMHelper.java   | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
-index f39946d..db70f64 100644
+index f39946d1c839333a69c91521f6714b183028567d..db70f64a91a21c04b1277b6da9b38ef7f60c1cf4 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
 @@ -157,7 +157,11 @@ public class PPandMMHelper {
@@ -25,5 +22,5 @@ index f39946d..db70f64 100644
                return ret;
              }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0048-Merge-in-and-use-alternative-code-for-ppmm.patch b/FernFlower-Patches/0048-Merge-in-and-use-alternative-code-for-ppmm.patch
deleted file mode 100644
index ec2e151..0000000
--- a/FernFlower-Patches/0048-Merge-in-and-use-alternative-code-for-ppmm.patch
+++ /dev/null
@@ -1,225 +0,0 @@
-From 5f3e0ca392561ae4c3a9a4ec50eeb1a1aacf72b5 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Sun, 13 Sep 2015 21:52:45 -0400
-Subject: [PATCH 048/122] Merge in and use alternative code for ppmm
-
----
- .../modules/decompiler/PPandMMHelper.java     |   6 +-
- .../modules/decompiler/exps/ConstExprent.java |   5 ++
- testData/classes/pkg/TestPPMM.class           | Bin 371 -> 936 bytes
- testData/results/TestPPMM.dec                 |  70 ++++++++++++++++++
- testData/src/pkg/TestPPMM.java                |  69 +++++++++++++++--
- 5 files changed, 141 insertions(+), 9 deletions(-)
- create mode 100644 testData/results/TestPPMM.dec
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
-index d93bad6..cbde16f 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
-@@ -183,8 +183,10 @@ public class PPandMMHelper {
- 
-     VarExprent v1 = (VarExprent)e1;
-     VarExprent v2 = (VarExprent)e2;
--    return varProc.getRemapped(v1.getIndex()) == varProc.getRemapped(v2.getIndex())
--            && InterpreterUtil.equalObjects(v1.getVarType(), v2.getVarType());
-+    if (remaps.containsKey(new VarVersionPair(v1.getIndex(),v1.getVersion())) || remaps.containsKey(new VarVersionPair(v2.getIndex(),v2.getVersion()))) {
-+        return false;
-+    }
-+    return varProc.getRemapped(v1.getIndex()) == varProc.getRemapped(v2.getIndex());
-   }
- 
- 
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-index 312f6c8..3398924 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-@@ -416,6 +416,11 @@ public class ConstExprent extends Exprent {
-     measureBytecode(values);
-   }
- 
-+  @Override
-+  public String toString() {
-+    return "const(" + toJava(0, new BytecodeMappingTracer()) + ")";
-+  }
-+
-   // *****************************************************************************
-   // IMatchable implementation
-   // *****************************************************************************
-diff --git a/testData/classes/pkg/TestPPMM.class b/testData/classes/pkg/TestPPMM.class
-index e493a99dbb742f1f20c3cb134d7366db47c5d4b4..38580c978dbdec1baf1fe2a0d4c7bbb11e2d2a11 100644
-GIT binary patch
-literal 936
-zcmb`F&rZTX5XQfuMYI+{RQ!X67%%9Bg9i^1FCGjDL=J@ef)$Gt8flCVzzccOc<=#y
-zDDhiMiqR%=pxMs1JJb2?bTS{GZ|?w3v2Ve|js*j|DeR?C5G+;Pfg4;1jM8ySU|tSy
-z96_!&?5KWAJ-DjfcbeKT7Tmcb!CK9~@0Od+C}=e5^>b#rzAq5Px5|_6yV~b@w4TSk
-z$@ndW0WFMZVTd9Dx23ASTApkqv1DTld4c`&5<#}79#y%o2Ho;?yXSNQ9P%$r{uN+B
-zbRunvrz5IRlP52bXKn<`w07vk3P0Dr)hOYNrv!Z&qcRqW)+{w2hNr0sqzOwiiLF=!
-zBohyrjAgp!sU*7y$a)01n)ak<R0{0KD-yBtyRu@`ql2hNxi~191wvzG9_U6KlqF8W
-oO8?3{(9Jj~nPH_d@;}tl!^~dl!7P5y9cOQr77nFgoAboy3oV9k<p2Nx
-
-literal 371
-zcmYjL%}&BV7@V&yEtFyr6A#|JsRx^Qm3T2RF)2zS!Sl9maIv;cDL#QO<jKT?58y)?
-zr+{d7cfS38X1@9Q{`drNhCL6KASj<^(L^um@pv@y;0XG2^`fFo<+JEEnd`I`xI>eh
-z`a)nI9Zv<$W$~bW*ysdk!4-tD$@R_hInmWbC7Bis;v!YqR8^+QH$|s@Gz-B_{D0@U
-zz$#0DD86ffe^)H4R9~4!ruXaYv@wN4&;rc^7Jpn#^q57A!q_@_NBeEn_K8g!By@?v
-zdVsOVj3&0^duA4Ep*?&R+1@{y1CCOgLoU%no2QEoCH$52{+hm#wzwcfpQ3_Y@+=H~
-E0NOq`X8-^I
-
-diff --git a/testData/results/TestPPMM.dec b/testData/results/TestPPMM.dec
-new file mode 100644
-index 0000000..ba3a5fc
---- /dev/null
-+++ b/testData/results/TestPPMM.dec
-@@ -0,0 +1,70 @@
-+package pkg;
-+
-+public class TestPPMM {
-+   public void ipp() {
-+      int a = 0;
-+      ++a;
-+      ++a;
-+      ++a;
-+      ++a;
-+   }
-+
-+   public void ppi() {
-+      int a = 0;
-+      ++a;
-+      ++a;
-+      ++a;
-+      ++a;
-+   }
-+
-+   public void imm() {
-+      int a = 0;
-+      --a;
-+      --a;
-+      --a;
-+      --a;
-+   }
-+
-+   public void mmi() {
-+      int a = 0;
-+      --a;
-+      --a;
-+      --a;
-+      --a;
-+   }
-+
-+   public void ippf() {
-+      int a = 0;
-+      t(a++);
-+      t(a++);
-+      t(a++);
-+      t(a++);
-+   }
-+
-+   public void ppif() {
-+      int a = 0;
-+      t(++a);
-+      t(++a);
-+      t(++a);
-+      t(++a);
-+   }
-+
-+   public void immf() {
-+      int a = 0;
-+      t(a--);
-+      t(a--);
-+      t(a--);
-+      t(a--);
-+   }
-+
-+   public void mmif() {
-+      int a = 0;
-+      t(--a);
-+      t(--a);
-+      t(--a);
-+      t(--a);
-+   }
-+
-+   private static void t(int x) {
-+   }
-+}
-diff --git a/testData/src/pkg/TestPPMM.java b/testData/src/pkg/TestPPMM.java
-index 02eecf4..21c7f2e 100644
---- a/testData/src/pkg/TestPPMM.java
-+++ b/testData/src/pkg/TestPPMM.java
-@@ -1,11 +1,66 @@
- package pkg;
- 
- public class TestPPMM {
--    public void pp() {
--        int a = 0;
--        a++;
--        a++;
--        a++;
--        a++;
--    }
-+   // Bytecode wise ipp and ppi are identical when not using the intermediate value. 
-+   // We keep these seperate tests just to see the bytecode.
-+   public void ipp() {
-+      int a = 0;
-+      a++;
-+      a++;
-+      a++;
-+      a++;
-+   }
-+   public void ppi() {
-+      int a = 0;
-+      ++a;
-+      ++a;
-+      ++a;
-+      ++a;
-+   }
-+   public void imm() {
-+      int a = 0;
-+      a--;
-+      a--;
-+      a--;
-+      a--;
-+   }
-+   public void mmi() {
-+      int a = 0;
-+      --a;
-+      --a;
-+      --a;
-+      --a;
-+   }
-+   
-+   // These versions actually use the intermediate value
-+   public void ippf() {
-+      int a = 0;
-+      t(a++);
-+      t(a++);
-+      t(a++);
-+      t(a++);
-+   }
-+   public void ppif() {
-+      int a = 0;
-+      t(++a);
-+      t(++a);
-+      t(++a);
-+      t(++a);
-+   }
-+   public void immf() {
-+      int a = 0;
-+      t(a--);
-+      t(a--);
-+      t(a--);
-+      t(a--);
-+   }
-+   public void mmif() {
-+      int a = 0;
-+      t(--a);
-+      t(--a);
-+      t(--a);
-+      t(--a);
-+   }
-+   private static void t(int x){
-+   }
- }
-\ No newline at end of file
--- 
-2.21.0.windows.1
-
diff --git a/FernFlower-Patches/0049-Kill-the-remapping-tracking-entirely-and-just-do-a-f.patch b/FernFlower-Patches/0049-Kill-the-remapping-tracking-entirely-and-just-do-a-f.patch
deleted file mode 100644
index 9ff1ec0..0000000
--- a/FernFlower-Patches/0049-Kill-the-remapping-tracking-entirely-and-just-do-a-f.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 58f09199efda8b5923200b57f1e7c22c63f61b4d Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Sun, 13 Sep 2015 22:34:26 -0400
-Subject: [PATCH 049/122] Kill the remapping tracking entirely, and just do a
- full graph replace on contraction. Not as efficient, but guaranteed to work..
-
----
- .../modules/decompiler/PPandMMHelper.java     | 24 +++++++------------
- 1 file changed, 8 insertions(+), 16 deletions(-)
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
-index cbde16f..99d22bd 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
-@@ -39,7 +39,7 @@ public class PPandMMHelper {
- 
-   private boolean exprentReplaced;
-   private VarProcessor varProc;
--  private Map<VarVersionPair, VarVersionPair> remaps = new HashMap<VarVersionPair, VarVersionPair>();
-+  private DirectGraph dgraph;
- 
-   public PPandMMHelper(VarProcessor varProc) {
-     this.varProc = varProc;
-@@ -48,7 +48,7 @@ public class PPandMMHelper {
-   public boolean findPPandMM(RootStatement root) {
- 
-     FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
--    DirectGraph dgraph = flatthelper.buildDirectGraph(root);
-+    dgraph = flatthelper.buildDirectGraph(root);
- 
-     LinkedList<DirectNode> stack = new LinkedList<DirectNode>();
-     stack.add(dgraph.first);
-@@ -71,8 +71,6 @@ public class PPandMMHelper {
-       stack.addAll(node.succs);
-     }
- 
--    updateVersions(dgraph);
--
-     return res;
-   }
- 
-@@ -99,7 +97,6 @@ public class PPandMMHelper {
-   }
- 
-   private Exprent processExprentRecursive(Exprent exprent) {
--
-     boolean replaced = true;
-     while (replaced) {
-       replaced = false;
-@@ -147,7 +144,7 @@ public class PPandMMHelper {
-           if (econst.type == Exprent.EXPRENT_CONST && ((ConstExprent)econst).hasValueOne()) {
-             Exprent left = as.getLeft();
- 
--            VarType condtype = econd.getExprType();
-+            VarType condtype = left.getExprType();
-             if (exprsEqual(left, econd) && (midlayer == null || midlayer.equals(condtype))) {
-               FunctionExprent ret = new FunctionExprent(
-                 func.getFuncType() == FunctionExprent.FUNCTION_ADD ? FunctionExprent.FUNCTION_PPI : FunctionExprent.FUNCTION_MMI,
-@@ -156,7 +153,7 @@ public class PPandMMHelper {
- 
-               exprentReplaced = true;
-               if (!left.equals(econd)) {
--                remaps.put(new VarVersionPair((VarExprent)left), new VarVersionPair((VarExprent)econd));
-+                updateVersions(dgraph, new VarVersionPair((VarExprent) left), new VarVersionPair((VarExprent) econd));
-               }
-               return ret;
-             }
-@@ -183,15 +180,11 @@ public class PPandMMHelper {
- 
-     VarExprent v1 = (VarExprent)e1;
-     VarExprent v2 = (VarExprent)e2;
--    if (remaps.containsKey(new VarVersionPair(v1.getIndex(),v1.getVersion())) || remaps.containsKey(new VarVersionPair(v2.getIndex(),v2.getVersion()))) {
--        return false;
--    }
-     return varProc.getRemapped(v1.getIndex()) == varProc.getRemapped(v2.getIndex());
-   }
- 
- 
--  private void updateVersions(DirectGraph graph) {
--    if (remaps.isEmpty()) return;
-+  private void updateVersions(DirectGraph graph, final VarVersionPair oldVVP, final VarVersionPair newVVP) {
-     graph.iterateExprents(new DirectGraph.ExprentIterator() {
-       @Override
-       public int processExprent(Exprent exprent) {
-@@ -201,10 +194,9 @@ public class PPandMMHelper {
-         for (Exprent expr : lst) {
-           if (expr.type == Exprent.EXPRENT_VAR) {
-             VarExprent var = (VarExprent)expr;
--            VarVersionPair nvar = remaps.get(new VarVersionPair(var));
--            if (nvar != null) {
--              var.setIndex(nvar.var);
--              var.setVersion(nvar.version);
-+            if (var.getIndex() == oldVVP.var && var.getVersion() == oldVVP.version) {
-+              var.setIndex(newVVP.var);
-+              var.setVersion(newVVP.version);
-             }
-           }
-         }
--- 
-2.21.0.windows.1
-
diff --git a/FernFlower-Patches/0050-Types-are-merged-properly-now.patch b/FernFlower-Patches/0050-Types-are-merged-properly-now.patch
index 638c659..da2896d 100644
--- a/FernFlower-Patches/0050-Types-are-merged-properly-now.patch
+++ b/FernFlower-Patches/0050-Types-are-merged-properly-now.patch
@@ -1,22 +1,11 @@
 From 38305edba97b6b5ae23d451ffb9d5dee9dc4bcf4 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Mon, 14 Sep 2015 00:42:17 -0400
-Subject: [PATCH 050/122] Types are merged properly now
+Subject: Types are merged properly now
 
----
- .../modules/decompiler/exps/VarExprent.java       |   3 +++
- .../modules/decompiler/vars/LVTVariable.java      |   6 ++++++
- .../decompiler/vars/VarDefinitionHelper.java      |  11 +++++++++--
- .../modules/decompiler/vars/VarProcessor.java     |   4 ++++
- .../decompiler/vars/VarVersionsProcessor.java     |   3 +++
- testData/classes/pkg/TestVarType.class            | Bin 0 -> 375 bytes
- testData/src/pkg/TestVarType.java                 |   9 +++++++++
- 7 files changed, 34 insertions(+), 2 deletions(-)
- create mode 100644 testData/classes/pkg/TestVarType.class
- create mode 100644 testData/src/pkg/TestVarType.java
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index 6c973af..3d5f03b 100644
+index 6c973af9d01a92e1977022aa28324a0fcbbcf5be..3d5f03b67d07b54d305c16e1dce4d10a93c5b26d 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 @@ -231,6 +231,9 @@ public class VarExprent extends Exprent {
@@ -30,7 +19,7 @@ index 6c973af..3d5f03b 100644
  
    @Override
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
-index 59dee69..209d3e0 100644
+index 59dee69e92d414371f9212d6c1b05a042ffadd92..209d3e081f58e2d54b231dbe2c90fe11c319f66c 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
 @@ -5,6 +5,8 @@ import java.util.HashSet;
@@ -53,7 +42,7 @@ index 59dee69..209d3e0 100644
  }
 \ No newline at end of file
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 56061fe..7abcec8 100644
+index 56061fe881f6c9f0e78a27ac62613136fd0277c3..7abcec8a356fa92f2bc18bf2dc24fc3defac3a38 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -24,11 +24,13 @@ import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
@@ -108,7 +97,7 @@ index 56061fe..7abcec8 100644
        }
      }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-index a8ad019..691797e 100644
+index a8ad01909d5ccd56cdadbd7ecab087a63e1e3d09..691797e5bb69b95b1883be1c52f0822823f4a452 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 @@ -176,4 +176,8 @@ public class VarProcessor {
@@ -121,7 +110,7 @@ index a8ad019..691797e 100644
 +}
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-index d56c778..d201157 100644
+index d56c778820770b52016900cef6d1753ba5f1d814..d201157f241a77410bbd495ed43c5a54540ee59c 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
 @@ -321,4 +321,7 @@ public class VarVersionsProcessor {
@@ -149,7 +138,7 @@ HcmV?d00001
 
 diff --git a/testData/src/pkg/TestVarType.java b/testData/src/pkg/TestVarType.java
 new file mode 100644
-index 0000000..1847aa2
+index 0000000000000000000000000000000000000000..1847aa2fba0c10776a33ee85c2bb0be6025bfd2d
 --- /dev/null
 +++ b/testData/src/pkg/TestVarType.java
 @@ -0,0 +1,9 @@
@@ -163,5 +152,5 @@ index 0000000..1847aa2
 +    }
 +}
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0051-More-merging.-It-does-some-things-better.-But-still-.patch b/FernFlower-Patches/0051-More-merging.-It-does-some-things-better.-But-still-.patch
index 4f39f6f..aa4723d 100644
--- a/FernFlower-Patches/0051-More-merging.-It-does-some-things-better.-But-still-.patch
+++ b/FernFlower-Patches/0051-More-merging.-It-does-some-things-better.-But-still-.patch
@@ -1,16 +1,12 @@
 From f88735d87e1dc889676151707ce066420475da78 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Wed, 16 Sep 2015 00:49:12 -0400
-Subject: [PATCH 051/122] More merging. It does some things better. But still
- not anywhere near good enough :(
+Subject: More merging. It does some things better. But still not anywhere near
+ good enough :(
 
----
- .../decompiler/stats/BasicBlockStatement.java | 10 ++++
- .../decompiler/vars/VarDefinitionHelper.java  | 54 +++++++++++++++----
- 2 files changed, 55 insertions(+), 9 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
-index 762fd01..ea7e611 100644
+index 762fd011314ca3f5c7fdc370ffe2bccdbb01a509..ea7e6110cf1e5eeb4d3f13d98527d53e85dd60fe 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
 @@ -24,6 +24,7 @@ import org.jetbrains.java.decompiler.main.TextBuffer;
@@ -36,7 +32,7 @@ index 762fd01..ea7e611 100644
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 7abcec8..8c42c0c 100644
+index 7abcec8a356fa92f2bc18bf2dc24fc3defac3a38..8c42c0c192cd73d7aef3632e22eaa74a3fff20e1 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -19,6 +19,7 @@ import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -139,5 +135,5 @@ index 7abcec8..8c42c0c 100644
        }
      }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0052-More-tweaks-to-merging.-It-s-pretty-decent.-But-stil.patch b/FernFlower-Patches/0052-More-tweaks-to-merging.-It-s-pretty-decent.-But-stil.patch
index 93dddd0..9894794 100644
--- a/FernFlower-Patches/0052-More-tweaks-to-merging.-It-s-pretty-decent.-But-stil.patch
+++ b/FernFlower-Patches/0052-More-tweaks-to-merging.-It-s-pretty-decent.-But-stil.patch
@@ -1,15 +1,12 @@
 From 8ac9ea89c0f38c0fd16568424e3ae274f709ca5f Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Thu, 17 Sep 2015 17:13:17 -0400
-Subject: [PATCH 052/122] More tweaks to merging. It's pretty decent. But still
- no where near good enough.
+Subject: More tweaks to merging. It's pretty decent. But still no where near
+ good enough.
 
----
- .../decompiler/vars/VarDefinitionHelper.java  | 21 +++++++++++++++----
- 1 file changed, 17 insertions(+), 4 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 8c42c0c..ca27e47 100644
+index 8c42c0c192cd73d7aef3632e22eaa74a3fff20e1..ca27e4718c556a478242a60df896f6f61db6e915 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -550,10 +550,18 @@ public class VarDefinitionHelper {
@@ -48,5 +45,5 @@ index 8c42c0c..ca27e47 100644
        }
      }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0053-New-aproach-to-merging-variables.-Use-top-down-manua.patch b/FernFlower-Patches/0053-New-aproach-to-merging-variables.-Use-top-down-manua.patch
index 6de8aae..bef0d0b 100644
--- a/FernFlower-Patches/0053-New-aproach-to-merging-variables.-Use-top-down-manua.patch
+++ b/FernFlower-Patches/0053-New-aproach-to-merging-variables.-Use-top-down-manua.patch
@@ -1,15 +1,11 @@
 From 42cf0ce83e1c02a459430065811093cd923073b4 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Fri, 18 Sep 2015 14:36:48 -0700
-Subject: [PATCH 053/122] New aproach to merging variables. Use top down manual
- scoping. 341
+Subject: New aproach to merging variables. Use top down manual scoping. 341
 
----
- .../decompiler/vars/VarDefinitionHelper.java  | 378 ++++++++++++------
- 1 file changed, 258 insertions(+), 120 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index ca27e47..0c03cd5 100644
+index ca27e4718c556a478242a60df896f6f61db6e915..0c03cd52d3ab4b664545ebf8c57faa9381a7ac65 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -25,8 +25,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
@@ -531,5 +527,5 @@ index ca27e47..0c03cd5 100644
  }
 \ No newline at end of file
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0054-If-it-s-a-null-constant-don-t-give-it-a-type.-Cleans.patch b/FernFlower-Patches/0054-If-it-s-a-null-constant-don-t-give-it-a-type.-Cleans.patch
index af31d8e..b74f34c 100644
--- a/FernFlower-Patches/0054-If-it-s-a-null-constant-don-t-give-it-a-type.-Cleans.patch
+++ b/FernFlower-Patches/0054-If-it-s-a-null-constant-don-t-give-it-a-type.-Cleans.patch
@@ -1,16 +1,12 @@
 From a0351b03097955eeac9fc6cba0e22242365280b5 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Thu, 24 Sep 2015 00:00:19 -0400
-Subject: [PATCH 054/122] If it's a null constant, don't give it a type. Cleans
- up some more errors.
+Subject: If it's a null constant, don't give it a type. Cleans up some more
+ errors.
 
----
- .../modules/decompiler/vars/VarDefinitionHelper.java |  3 +++
- test/org/jetbrains/java/decompiler/LVTTest.java      | 12 +++++++++++-
- 2 files changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 0c03cd5..9ecb28b 100644
+index 0c03cd52d3ab4b664545ebf8c57faa9381a7ac65..9ecb28bffa6dc6159370823066d8f189a3f1a83b 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -637,6 +637,9 @@ if (mt.getName().equals("func_180655_c")){
@@ -24,7 +20,7 @@ index 0c03cd5..9ecb28b 100644
                                           mapExprentMaxTypes.get(from), mapExprentMaxTypes.get(to));
  
 diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
-index d2a8f1c..52428c7 100644
+index d2a8f1c20c8a7954d4ba22d17fc1584d3bd4a3ca..52428c70df9fe4166129c11eacd4d19c2d7196e3 100644
 --- a/test/org/jetbrains/java/decompiler/LVTTest.java
 +++ b/test/org/jetbrains/java/decompiler/LVTTest.java
 @@ -35,10 +35,20 @@ public class LVTTest extends SingleClassesTestBase {
@@ -50,5 +46,5 @@ index d2a8f1c..52428c7 100644
 +  @Test public void testMCGuiShareToLan() { doTest("net/minecraft/client/gui/GuiShareToLan"); }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0055-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch b/FernFlower-Patches/0055-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch
index 9c6ffeb..dc7fe6b 100644
--- a/FernFlower-Patches/0055-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch
+++ b/FernFlower-Patches/0055-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch
@@ -1,19 +1,12 @@
 From b065f7aef331543501429be47e0f36a22933c617 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Thu, 24 Sep 2015 12:48:31 -0400
-Subject: [PATCH 055/122] Bind the LVTs at the time we create the exprents. The
- offset is absolute at that point, and won't be incorrect.
+Subject: Bind the LVTs at the time we create the exprents. The offset is
+ absolute at that point, and won't be incorrect.
 
----
- .../decompiler/modules/decompiler/ExprProcessor.java | 10 +++++++---
- .../modules/decompiler/vars/LocalVariableTable.java  |  8 ++------
- .../modules/decompiler/vars/VarDefinitionHelper.java |  3 +--
- .../modules/decompiler/vars/VarProcessor.java        | 12 +++++++++---
- test/org/jetbrains/java/decompiler/LVTTest.java      |  6 +++---
- 5 files changed, 22 insertions(+), 17 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-index 0425fbc..7b94e5b 100644
+index 0425fbc336f5318514d09849e9910171aa46d8f9..7b94e5b4af7a6618e46f078bcec596e972cef4d1 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
 @@ -382,7 +382,9 @@ public class ExprProcessor implements CodeConstants {
@@ -48,7 +41,7 @@ index 0425fbc..7b94e5b 100644
              instr.getOperand(1) < 0 ? FunctionExprent.FUNCTION_SUB : FunctionExprent.FUNCTION_ADD, Arrays
              .asList(vevar.copy(), new ConstExprent(VarType.VARTYPE_INT, Math.abs(instr.getOperand(1)), null)),
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-index fe45b11..4193f56 100644
+index fe45b111874c303e7a0e839e1ef358131bc320a2..4193f563d90c2fdfee692cf272fb3d3886f72e5b 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 @@ -41,11 +41,7 @@ public class LocalVariableTable {
@@ -74,7 +67,7 @@ index fe45b11..4193f56 100644
        }
      }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 9ecb28b..6d8ab12 100644
+index 9ecb28bffa6dc6159370823066d8f189a3f1a83b..6d8ab120af2261fa02eccfcced62fdcb5cec79ae 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -133,7 +133,7 @@ public class VarDefinitionHelper {
@@ -95,7 +88,7 @@ index 9ecb28b..6d8ab12 100644
      Map<Integer, VarVersionPair> this_vars = new HashMap<Integer, VarVersionPair>();
      if (parent.size() > 0)
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-index 691797e..bbf17ad 100644
+index 691797e5bb69b95b1883be1c52f0822823f4a452..bbf17adc460d22b1c91fd54ba88d0e2624c625c4 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 @@ -17,6 +17,7 @@ package org.jetbrains.java.decompiler.modules.decompiler.vars;
@@ -132,7 +125,7 @@ index 691797e..bbf17ad 100644
  
    public int getRemapped(int index) {
 diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
-index 52428c7..d4771bb 100644
+index 52428c70df9fe4166129c11eacd4d19c2d7196e3..d4771bb0b063154fd4e38ac3d68ed3c0b27c8938 100644
 --- a/test/org/jetbrains/java/decompiler/LVTTest.java
 +++ b/test/org/jetbrains/java/decompiler/LVTTest.java
 @@ -42,13 +42,13 @@ public class LVTTest extends SingleClassesTestBase {
@@ -153,5 +146,5 @@ index 52428c7..d4771bb 100644
 +//  @Test public void testMCGuiShareToLan() { doTest("net/minecraft/client/gui/GuiShareToLan"); }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0056-Some-code-cleanup-damn-cpw.patch b/FernFlower-Patches/0056-Some-code-cleanup-damn-cpw.patch
index 46e26c6..2b27a21 100644
--- a/FernFlower-Patches/0056-Some-code-cleanup-damn-cpw.patch
+++ b/FernFlower-Patches/0056-Some-code-cleanup-damn-cpw.patch
@@ -1,22 +1,11 @@
 From 97779c0a2088cb5153b21f1b3f4f7459cc9c4ec0 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 27 Sep 2015 21:17:03 -0700
-Subject: [PATCH 056/122] Some code cleanup damn cpw
+Subject: Some code cleanup damn cpw
 
----
- .../java/decompiler/code/cfg/BasicBlock.java  | 18 +++++------
- .../decompiler/stats/BasicBlockStatement.java |  8 ++---
- .../modules/decompiler/stats/DoStatement.java |  5 ---
- .../modules/decompiler/stats/IfStatement.java |  8 +++--
- .../decompiler/stats/RootStatement.java       |  6 ++--
- .../decompiler/stats/SequenceStatement.java   |  5 ---
- .../modules/decompiler/stats/Statement.java   | 18 +++++------
- .../decompiler/stats/SwitchStatement.java     | 16 +++++-----
- .../decompiler/vars/LocalVariableTable.java   | 32 ++++++-------------
- 9 files changed, 48 insertions(+), 68 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
-index a36047b..407aaa9 100644
+index a36047be9d5aaafd1e37ea1fc4ed861b7e26e5c9..407aaa96659637e8a746a5e21e6a30d07e09aa31 100644
 --- a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
 +++ b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
 @@ -264,17 +264,17 @@ public class BasicBlock implements IGraphNode {
@@ -47,7 +36,7 @@ index a36047b..407aaa9 100644
    }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
-index ea7e611..e68cb97 100644
+index ea7e6110cf1e5eeb4d3f13d98527d53e85dd60fe..e68cb97ea66761387a6d05a8b38f0f1bf0e1225e 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
 @@ -97,11 +97,11 @@ public class BasicBlockStatement extends Statement {
@@ -67,7 +56,7 @@ index ea7e611..e68cb97 100644
    }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
-index 0768912..36cd7fb 100644
+index 0768912fe41d5d60580029e640cfaab07e6447bb..36cd7fb229ea03784017336da4dd1cb0fd528fa4 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
 @@ -242,9 +242,4 @@ public class DoStatement extends Statement {
@@ -81,7 +70,7 @@ index 0768912..36cd7fb 100644
 -    }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
-index f216b73..8f3e467 100644
+index f216b73fe7480b9425608a1b19b48ef6de6424bc..8f3e4679be0d5821df94253a9f58082aa4f236d4 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
 @@ -465,7 +465,9 @@ public class IfStatement extends Statement {
@@ -98,7 +87,7 @@ index f216b73..8f3e467 100644
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
-index 0a1e798..d8329ff 100644
+index 0a1e798299c913755fd7b99a8afe10ca34e27d20..d8329ff22605f0ef278cefc29483eb760b90a02f 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
 @@ -49,7 +49,7 @@ public class RootStatement extends Statement {
@@ -113,7 +102,7 @@ index 0a1e798..d8329ff 100644
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
-index b3785fb..81d31a5 100644
+index b3785fb3235dd593ce293d0c6677546a361fb489..81d31a58f6a913ddc4f5a89ae22fe69f98c63f3e 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
 @@ -138,9 +138,4 @@ public class SequenceStatement extends Statement {
@@ -127,7 +116,7 @@ index b3785fb..81d31a5 100644
 -    }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
-index 806c4d5..f71ed84 100644
+index 806c4d57423605f5b11b33f8647734646473b00c..f71ed84bc4ad195a97b4c535f21b55a9568cac62 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
 @@ -941,15 +941,15 @@ public class Statement implements IMatchable {
@@ -156,7 +145,7 @@ index 806c4d5..f71ed84 100644
    }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
-index 8d7127c..3e27201 100644
+index 8d7127cc348720d35f161c5c92c7fb66c2bd7ddb..3e272016903de00ee47c55fad62db4b0687a04b5 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
 @@ -368,13 +368,13 @@ public class SwitchStatement extends Statement {
@@ -182,7 +171,7 @@ index 8d7127c..3e27201 100644
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-index 4193f56..729a3d2 100644
+index 4193f563d90c2fdfee692cf272fb3d3886f72e5b..729a3d2129c0d6765ad7b415bd4bee6cc40a09d2 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 @@ -1,15 +1,11 @@
@@ -247,5 +236,5 @@ index 4193f56..729a3d2 100644
  }
 \ No newline at end of file
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0057-Propogate-LVT-data-post-merge.-And-fix-injected-var-.patch b/FernFlower-Patches/0057-Propogate-LVT-data-post-merge.-And-fix-injected-var-.patch
index f999684..0f735ac 100644
--- a/FernFlower-Patches/0057-Propogate-LVT-data-post-merge.-And-fix-injected-var-.patch
+++ b/FernFlower-Patches/0057-Propogate-LVT-data-post-merge.-And-fix-injected-var-.patch
@@ -1,16 +1,12 @@
 From ec3558a5473045e647365b39187c259e1690042d Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 27 Sep 2015 21:17:47 -0700
-Subject: [PATCH 057/122] Propogate LVT data post merge. And fix injected var
- defs LVT association.
+Subject: Propogate LVT data post merge. And fix injected var defs LVT
+ association.
 
----
- .../modules/decompiler/exps/VarExprent.java   |   6 +-
- .../decompiler/vars/VarDefinitionHelper.java  | 155 +++++++++++++++---
- 2 files changed, 140 insertions(+), 21 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index 3d5f03b..05a4f79 100644
+index 3d5f03b67d07b54d305c16e1dce4d10a93c5b26d..05a4f79e80f9ac6023ff66996e3fda0e9640db18 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 @@ -232,10 +232,14 @@ public class VarExprent extends Exprent {
@@ -30,7 +26,7 @@ index 3d5f03b..05a4f79 100644
    public String toString() {
      return lvt != null ? lvt.name :  "var_" + index + "_" + version;
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 6d8ab12..cc5e5e4 100644
+index 6d8ab120af2261fa02eccfcced62fdcb5cec79ae..cc5e5e427125ab4673f9aef2a7b56de37f0ab113 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -133,7 +133,6 @@ public class VarDefinitionHelper {
@@ -269,5 +265,5 @@ index 6d8ab12..cc5e5e4 100644
      Map<Integer, VarVersionPair> this_vars = new HashMap<Integer, VarVersionPair>();
      if (parent.size() > 0)
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0058-Fix-types-to-use-LVT-first-and-fallback-to-other-typ.patch b/FernFlower-Patches/0058-Fix-types-to-use-LVT-first-and-fallback-to-other-typ.patch
index 3cd2c06..3abaee8 100644
--- a/FernFlower-Patches/0058-Fix-types-to-use-LVT-first-and-fallback-to-other-typ.patch
+++ b/FernFlower-Patches/0058-Fix-types-to-use-LVT-first-and-fallback-to-other-typ.patch
@@ -1,16 +1,11 @@
 From f6acdf7dd26df4eebb27b2561f62f44e643c5f89 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Mon, 28 Sep 2015 01:26:23 -0400
-Subject: [PATCH 058/122] Fix types to use LVT first, and fallback to other
- type bounds
+Subject: Fix types to use LVT first, and fallback to other type bounds
 
----
- .../modules/decompiler/exps/VarExprent.java       | 15 ++++++++++++++-
- .../modules/decompiler/vars/VarTypeProcessor.java |  7 ++++++-
- 2 files changed, 20 insertions(+), 2 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index 05a4f79..933b046 100644
+index 05a4f79e80f9ac6023ff66996e3fda0e9640db18..933b0467478a4315a6d8dbdb7ae067f57046a8bc 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 @@ -22,6 +22,7 @@ import org.jetbrains.java.decompiler.main.DecompilerContext;
@@ -55,7 +50,7 @@ index 05a4f79..933b046 100644
 +
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
-index d6c746b..4a2cb8f 100644
+index d6c746b405f2655725b87e719f885c916818c7e3..4a2cb8f56fd0133cea5c1a7fe52abcbaa8345115 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
 @@ -108,7 +108,12 @@ public class VarTypeProcessor {
@@ -73,5 +68,5 @@ index d6c746b..4a2cb8f 100644
            else if (expr.type == Exprent.EXPRENT_CONST) {
              ConstExprent constExpr = (ConstExprent)expr;
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0059-NPE-protection-in-LVT-loading.patch b/FernFlower-Patches/0059-NPE-protection-in-LVT-loading.patch
index 73d20e3..646bc0e 100644
--- a/FernFlower-Patches/0059-NPE-protection-in-LVT-loading.patch
+++ b/FernFlower-Patches/0059-NPE-protection-in-LVT-loading.patch
@@ -1,14 +1,11 @@
 From 1dfe3bcf3f09d6595a5dbd0bac11056ebad79b4e Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 1 Oct 2015 18:03:36 -0700
-Subject: [PATCH 059/122] NPE protection in LVT loading.
+Subject: NPE protection in LVT loading.
 
----
- .../struct/attr/StructLocalVariableTableAttribute.java   | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-index 771ec7a..a95870f 100644
+index 771ec7add154d7897fa54ac46d91e66e6ad2ecc5..a95870f4b9de4b87eff9a15b88492e8cc051cbdd 100644
 --- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
 +++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
 @@ -61,8 +61,13 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
@@ -28,5 +25,5 @@ index 771ec7a..a95870f 100644
  
    public Map<Integer, List<LVTVariable>> getMapVarNames() {
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0060-Fix-variable-defintions-in-IfStatement-s-headers-hav.patch b/FernFlower-Patches/0060-Fix-variable-defintions-in-IfStatement-s-headers-hav.patch
index b054feb..ed9f56a 100644
--- a/FernFlower-Patches/0060-Fix-variable-defintions-in-IfStatement-s-headers-hav.patch
+++ b/FernFlower-Patches/0060-Fix-variable-defintions-in-IfStatement-s-headers-hav.patch
@@ -1,15 +1,11 @@
 From 8ea51a091a3d0fa64dbf8fd39d70391c7b7d5f80 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 1 Oct 2015 18:04:09 -0700
-Subject: [PATCH 060/122] Fix variable defintions in IfStatement's headers
- having wrong scope.
+Subject: Fix variable defintions in IfStatement's headers having wrong scope.
 
----
- .../modules/decompiler/vars/VarDefinitionHelper.java         | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index cc5e5e4..560328a 100644
+index cc5e5e427125ab4673f9aef2a7b56de37f0ab113..560328a405e5860dba08daf85f0e957a21fc91d1 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -531,7 +531,7 @@ public class VarDefinitionHelper {
@@ -32,5 +28,5 @@ index cc5e5e4..560328a 100644
              this_vars.putAll(leaked_n);
            }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0061-Detect-if-the-itterator-is-being-used-elseware-befor.patch b/FernFlower-Patches/0061-Detect-if-the-itterator-is-being-used-elseware-befor.patch
index f4cb113..9fa9014 100644
--- a/FernFlower-Patches/0061-Detect-if-the-itterator-is-being-used-elseware-befor.patch
+++ b/FernFlower-Patches/0061-Detect-if-the-itterator-is-being-used-elseware-befor.patch
@@ -1,15 +1,12 @@
 From de52ba808f928bd138c8cbf29baee707ecf469d3 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 1 Oct 2015 20:00:53 -0700
-Subject: [PATCH 061/122] Detect if the itterator is being used elseware before
- creating an enhanced for loop.
+Subject: Detect if the itterator is being used elseware before creating an
+ enhanced for loop.
 
----
- .../modules/decompiler/MergeHelper.java       | 73 +++++++++++++++++++
- 1 file changed, 73 insertions(+)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-index 3172b5e..5ba4dcd 100644
+index 3172b5e6754fc9e2d5570f1d7110dc452b77b510..5ba4dcd0944696d200a8a5857d7afccc3737e5fb 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
 @@ -458,6 +458,14 @@ public class MergeHelper {
@@ -121,5 +118,5 @@ index 3172b5e..5ba4dcd 100644
      return exp != null && exp.type == type;
    }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0062-NPE-Protection-in-EnumProcessor.patch b/FernFlower-Patches/0062-NPE-Protection-in-EnumProcessor.patch
index bc876df..1301f8c 100644
--- a/FernFlower-Patches/0062-NPE-Protection-in-EnumProcessor.patch
+++ b/FernFlower-Patches/0062-NPE-Protection-in-EnumProcessor.patch
@@ -1,14 +1,11 @@
 From 950b975082f6252b0b3aedf6674f6af9b2951c33 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Fri, 2 Oct 2015 01:32:57 -0700
-Subject: [PATCH 062/122] NPE Protection in EnumProcessor
+Subject: NPE Protection in EnumProcessor
 
----
- src/org/jetbrains/java/decompiler/main/EnumProcessor.java | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/EnumProcessor.java b/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
-index 37a3384..8956e0e 100644
+index 37a3384c390209bdbcf46843a4c1a771a24dde18..8956e0ebbe08c761ab14ed61850d767b46642a99 100644
 --- a/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
 @@ -74,7 +74,9 @@ public class EnumProcessor {
@@ -23,5 +20,5 @@ index 37a3384..8956e0e 100644
        return stat;
      }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0063-Cleanup-unwanted-variables-in-synchronized-headers.patch b/FernFlower-Patches/0063-Cleanup-unwanted-variables-in-synchronized-headers.patch
index 459640e..0ee653f 100644
--- a/FernFlower-Patches/0063-Cleanup-unwanted-variables-in-synchronized-headers.patch
+++ b/FernFlower-Patches/0063-Cleanup-unwanted-variables-in-synchronized-headers.patch
@@ -1,20 +1,11 @@
 From 280f466fb5135e0612b0afed08741a0925ee1936 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Fri, 2 Oct 2015 01:34:53 -0700
-Subject: [PATCH 063/122] Cleanup unwanted variables in synchronized headers.
+Subject: Cleanup unwanted variables in synchronized headers.
 
----
- .../main/rels/MethodProcessorRunnable.java    |  2 +
- .../modules/decompiler/MergeHelper.java       | 54 ++------------
- .../decompiler/SynchronizedHelper.java        | 51 +++++++++++++
- .../decompiler/vars/VarDefinitionHelper.java  |  6 ++
- .../java/decompiler/util/ExprentUtil.java     | 71 +++++++++++++++++++
- 5 files changed, 134 insertions(+), 50 deletions(-)
- create mode 100644 src/org/jetbrains/java/decompiler/modules/decompiler/SynchronizedHelper.java
- create mode 100644 src/org/jetbrains/java/decompiler/util/ExprentUtil.java
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index 5844b93..a22d269 100644
+index 5844b931ca6c6f2634455d2d91c6eca0680bcc5b..a22d269e7e2609576be0c7fb3752ac0c710d3158 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 @@ -205,6 +205,8 @@ public class MethodProcessorRunnable implements Runnable {
@@ -27,7 +18,7 @@ index 5844b93..a22d269 100644
  
      // must be the last invocation, because it makes the statement structure inconsistent
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-index 5ba4dcd..5adf323 100644
+index 5ba4dcd0944696d200a8a5857d7afccc3737e5fb..5adf32354b34abd479184f162ea22d45a342a271 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
 @@ -26,6 +26,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.exps.IfExprent;
@@ -121,7 +112,7 @@ index 5ba4dcd..5adf323 100644
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SynchronizedHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SynchronizedHelper.java
 new file mode 100644
-index 0000000..371fc5a
+index 0000000000000000000000000000000000000000..371fc5aafff4dd8f7dc86bc476e97f8e199366b2
 --- /dev/null
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SynchronizedHelper.java
 @@ -0,0 +1,51 @@
@@ -177,7 +168,7 @@ index 0000000..371fc5a
 +  }
 +}
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 560328a..e294648 100644
+index 560328a405e5860dba08daf85f0e957a21fc91d1..e294648ca0e77864f3827b94bd6846440b139a30 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -635,6 +635,12 @@ public class VarDefinitionHelper {
@@ -195,7 +186,7 @@ index 560328a..e294648 100644
          }
 diff --git a/src/org/jetbrains/java/decompiler/util/ExprentUtil.java b/src/org/jetbrains/java/decompiler/util/ExprentUtil.java
 new file mode 100644
-index 0000000..39ce7ff
+index 0000000000000000000000000000000000000000..39ce7ff03344f2c0dc9a23e85663af003e312fc6
 --- /dev/null
 +++ b/src/org/jetbrains/java/decompiler/util/ExprentUtil.java
 @@ -0,0 +1,71 @@
@@ -271,5 +262,5 @@ index 0000000..39ce7ff
 +  }
 +}
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0064-Include-LVT-info-in-VarExprent.copy.patch b/FernFlower-Patches/0064-Include-LVT-info-in-VarExprent.copy.patch
index 2f020b9..a85213c 100644
--- a/FernFlower-Patches/0064-Include-LVT-info-in-VarExprent.copy.patch
+++ b/FernFlower-Patches/0064-Include-LVT-info-in-VarExprent.copy.patch
@@ -1,16 +1,11 @@
 From 19773bf44e7d8f1ddbf06fe60ede5677ad698e03 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Fri, 2 Oct 2015 03:10:28 -0700
-Subject: [PATCH 064/122] Include LVT info in VarExprent.copy
+Subject: Include LVT info in VarExprent.copy
 
----
- .../modules/decompiler/exps/VarExprent.java      |  1 +
- .../decompiler/vars/VarDefinitionHelper.java     | 16 ++++++----------
- .../modules/decompiler/vars/VarProcessor.java    |  2 +-
- 3 files changed, 8 insertions(+), 11 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index 933b046..c85d889 100644
+index 933b0467478a4315a6d8dbdb7ae067f57046a8bc..c85d889d96073327a5ea08a9d986621dd8792e26 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 @@ -82,6 +82,7 @@ public class VarExprent extends Exprent {
@@ -22,7 +17,7 @@ index 933b046..c85d889 100644
    }
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index e294648..88dae4d 100644
+index e294648ca0e77864f3827b94bd6846440b139a30..88dae4d81ca4ebc059cc575cf5e97d9f5bfe0fee 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -260,22 +260,18 @@ public class VarDefinitionHelper {
@@ -55,7 +50,7 @@ index e294648..88dae4d 100644
    }
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-index bbf17ad..89f24f3 100644
+index bbf17adc460d22b1c91fd54ba88d0e2624c625c4..89f24f365a7c01b7920fd8002dda2ec0b955f96c 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 @@ -166,7 +166,7 @@ public class VarProcessor {
@@ -68,5 +63,5 @@ index bbf17ad..89f24f3 100644
    }
  
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0065-Remove-dowhile-detection-and-restore-do-loop-collaps.patch b/FernFlower-Patches/0065-Remove-dowhile-detection-and-restore-do-loop-collaps.patch
index 8dc15fd..43a43a2 100644
--- a/FernFlower-Patches/0065-Remove-dowhile-detection-and-restore-do-loop-collaps.patch
+++ b/FernFlower-Patches/0065-Remove-dowhile-detection-and-restore-do-loop-collaps.patch
@@ -1,17 +1,13 @@
 From 89ea238257bbf10339409978ea26f982fd497090 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Fri, 2 Oct 2015 21:02:44 -0400
-Subject: [PATCH 065/122] Remove dowhile detection, and restore do loop
- collapsing code. Seems to eliminate a lot of derpy loop smashage.
+Subject: =?UTF-8?q?Remove=20dowhile=20detection,=20and=20restore=20do=20lo?=
+ =?UTF-8?q?op=20collapsing=20code.=20Seems=20to=20eliminate=20a=20lot=20of?=
+ =?UTF-8?q?=0Aderpy=20loop=20smashage.?=
 
----
- .../main/rels/MethodProcessorRunnable.java    | 10 +++---
- .../decompiler/EliminateLoopsHelper.java      | 36 ++++++++++---------
- .../modules/decompiler/MergeHelper.java       |  2 +-
- 3 files changed, 26 insertions(+), 22 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index a22d269..ef7e97a 100644
+index a22d269e7e2609576be0c7fb3752ac0c710d3158..ef7e97a5e99899896b11376fd31e3511fb5b06b5 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 @@ -162,15 +162,17 @@ public class MethodProcessorRunnable implements Runnable {
@@ -37,7 +33,7 @@ index a22d269..ef7e97a 100644
  
        if (DecompilerContext.getOption(IFernflowerPreferences.IDEA_NOT_NULL_ANNOTATION)) {
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
-index 16f7da0..823e561 100644
+index 16f7da0845344d017c3f2b4354bcca6a243b9fe8..823e561264e4fe3482c10dd9bf40f13593ad1ec8 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
 @@ -17,32 +17,34 @@ package org.jetbrains.java.decompiler.modules.decompiler;
@@ -93,7 +89,7 @@ index 16f7da0..823e561 100644
    private static boolean eliminateLoopsRec(Statement stat) {
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-index 5adf323..0e7f1ab 100644
+index 5adf32354b34abd479184f162ea22d45a342a271..0e7f1ab7fe6fe4ca716cdcc0fc182dcfa59c3b7b 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
 @@ -74,7 +74,7 @@ public class MergeHelper {
@@ -106,5 +102,5 @@ index 5adf323..0e7f1ab 100644
  
          break;
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0066-Move-LoopExtract-to-before-MergeHelper-and-add-more-.patch b/FernFlower-Patches/0066-Move-LoopExtract-to-before-MergeHelper-and-add-more-.patch
index 058fa9a..fc53527 100644
--- a/FernFlower-Patches/0066-Move-LoopExtract-to-before-MergeHelper-and-add-more-.patch
+++ b/FernFlower-Patches/0066-Move-LoopExtract-to-before-MergeHelper-and-add-more-.patch
@@ -1,16 +1,12 @@
 From 34a7253e7b3997dda29ae47f63151c976c9275a4 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sat, 3 Oct 2015 22:54:34 -0700
-Subject: [PATCH 066/122] Move LoopExtract to before MergeHelper and add more
- debug information to printMethod.
+Subject: Move LoopExtract to before MergeHelper and add more debug information
+ to printMethod.
 
----
- .../main/rels/MethodProcessorRunnable.java    | 46 +++++++++++++------
- .../modules/decompiler/DomHelper.java         | 13 ++----
- 2 files changed, 36 insertions(+), 23 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index ef7e97a..eca3413 100644
+index ef7e97a5e99899896b11376fd31e3511fb5b06b5..eca34134bf72cb0ddc9e3b245ca3847478f3a39f 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 @@ -19,6 +19,7 @@ import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -141,7 +137,7 @@ index ef7e97a..eca3413 100644
        return sb.toString();
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
-index c93be38..67d16d5 100644
+index c93be38f6abaabfe2704a3fd7c8f0d17a1b9ff52..67d16d5c139033d4774acc22c54b8866594c3ec5 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
 @@ -20,9 +20,12 @@ import org.jetbrains.java.decompiler.code.cfg.ControlFlowGraph;
@@ -178,5 +174,5 @@ index c93be38..67d16d5 100644
      }
  
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0067-Loosen-up-LoopExtractHelper-to-include-break-edges-t.patch b/FernFlower-Patches/0067-Loosen-up-LoopExtractHelper-to-include-break-edges-t.patch
index b7cb1af..5ad0f2f 100644
--- a/FernFlower-Patches/0067-Loosen-up-LoopExtractHelper-to-include-break-edges-t.patch
+++ b/FernFlower-Patches/0067-Loosen-up-LoopExtractHelper-to-include-break-edges-t.patch
@@ -1,15 +1,12 @@
 From 751b2227a9b40757f0c01008882263e0c4acbd1d Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sat, 3 Oct 2015 22:55:00 -0700
-Subject: [PATCH 067/122] Loosen up LoopExtractHelper to include break edges
- that can be extracted.
+Subject: Loosen up LoopExtractHelper to include break edges that can be
+ extracted.
 
----
- .../modules/decompiler/LoopExtractHelper.java | 27 +++++++++++++++----
- 1 file changed, 22 insertions(+), 5 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
-index d5c9e8f..93bc21d 100644
+index d5c9e8f20aee82846a0d92f1c80b9d75a5984f8f..93bc21dd17add5a854450a034ed69a0a961808ee 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
 @@ -22,6 +22,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
@@ -86,5 +83,5 @@ index d5c9e8f..93bc21d 100644
              return true;
            }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0068-Hack-to-prevent-extracted-ifs-from-being-inlined-aga.patch b/FernFlower-Patches/0068-Hack-to-prevent-extracted-ifs-from-being-inlined-aga.patch
index 9a82739..e728829 100644
--- a/FernFlower-Patches/0068-Hack-to-prevent-extracted-ifs-from-being-inlined-aga.patch
+++ b/FernFlower-Patches/0068-Hack-to-prevent-extracted-ifs-from-being-inlined-aga.patch
@@ -1,20 +1,12 @@
 From 3be7e213dcd0be08189ca0207b54c600a0ff4602 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 4 Oct 2015 02:10:44 -0700
-Subject: [PATCH 068/122] Hack to prevent extracted ifs from being inlined
- again in infinite loop. MC decompiles much better!
+Subject: Hack to prevent extracted ifs from being inlined again in infinite
+ loop. MC decompiles much better!
 
----
- .../main/rels/MethodProcessorRunnable.java        |  2 --
- .../decompiler/modules/decompiler/ExitHelper.java |  2 +-
- .../decompiler/InlineSingleBlockHelper.java       |  5 ++++-
- .../modules/decompiler/LoopExtractHelper.java     | 15 +++++++++++++--
- .../decompiler/modules/decompiler/StatEdge.java   |  2 ++
- .../decompiler/stats/SequenceStatement.java       |  1 -
- 6 files changed, 20 insertions(+), 7 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index eca3413..62d5297 100644
+index eca34134bf72cb0ddc9e3b245ca3847478f3a39f..62d52975708c5a8126bdc73824fe575b14dea108 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 @@ -33,14 +33,12 @@ import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
@@ -33,7 +25,7 @@ index eca3413..62d5297 100644
  public class MethodProcessorRunnable implements Runnable {
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
-index d467cdc..df2cb4a 100644
+index d467cdcc200f5b0547a94d7276e00dc8521f31fa..df2cb4a554931467d7feccaf1c0393192eeb3bc2 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
 @@ -206,7 +206,7 @@ public class ExitHelper {
@@ -46,7 +38,7 @@ index d467cdc..df2cb4a 100644
  
        if (data != null && data.size() == 1) {
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
-index adeda02..1c468c8 100644
+index adeda024151b030fe94e7ab4b224dc51dc6e8ea8..1c468c818be14ab4a92392b48db98f0ff72bb2b2 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
 @@ -132,7 +132,10 @@ public class InlineSingleBlockHelper {
@@ -62,7 +54,7 @@ index adeda02..1c468c8 100644
          }
          else {
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
-index 93bc21d..f09dd3c 100644
+index 93bc21dd17add5a854450a034ed69a0a961808ee..f09dd3c0a4251b0a7c792fff20635704f4c8784a 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
 @@ -92,8 +92,14 @@ public class LoopExtractHelper {
@@ -94,7 +86,7 @@ index 93bc21d..f09dd3c 100644
    }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
-index 26d427b..7902069 100644
+index 26d427b9377097653912b624ad76bd78563d5718..7902069a9fe823f4873c2fb00b0f4b308dfc454a 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
 @@ -52,6 +52,8 @@ public class StatEdge {
@@ -107,7 +99,7 @@ index 26d427b..7902069 100644
      this(type, source, destination);
      this.closure = closure;
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
-index 81d31a5..7d2ee43 100644
+index 81d31a58f6a913ddc4f5a89ae22fe69f98c63f3e..7d2ee435ce1c153b6da410d825d697d9790e35fe 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
 @@ -20,7 +20,6 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
@@ -119,5 +111,5 @@ index 81d31a5..7d2ee43 100644
  import java.util.Arrays;
  import java.util.List;
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0069-Include-ForEach-source-vars-in-itteration-allows-for.patch b/FernFlower-Patches/0069-Include-ForEach-source-vars-in-itteration-allows-for.patch
index 993d286..00cf95a 100644
--- a/FernFlower-Patches/0069-Include-ForEach-source-vars-in-itteration-allows-for.patch
+++ b/FernFlower-Patches/0069-Include-ForEach-source-vars-in-itteration-allows-for.patch
@@ -1,15 +1,12 @@
 From 7dec35b37bbeb3c785e142980718e799d25c618a Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 4 Oct 2015 04:22:34 -0700
-Subject: [PATCH 069/122] Include ForEach source vars in itteration, allows for
- remapping in merge.
+Subject: Include ForEach source vars in itteration, allows for remapping in
+ merge.
 
----
- .../java/decompiler/modules/decompiler/stats/DoStatement.java    | 1 +
- 1 file changed, 1 insertion(+)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
-index 36cd7fb..acc74a6 100644
+index 36cd7fb229ea03784017336da4dd1cb0fd528fa4..acc74a60fd6a90ad15959f6c3164757390542ada 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
 @@ -164,6 +164,7 @@ public class DoStatement extends Statement {
@@ -21,5 +18,5 @@ index 36cd7fb..acc74a6 100644
  
      lst.add(first);
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0070-Re-write-ForEach-detection-to-be-before-For-detectio.patch b/FernFlower-Patches/0070-Re-write-ForEach-detection-to-be-before-For-detectio.patch
index 5f8e9df..8ebfed4 100644
--- a/FernFlower-Patches/0070-Re-write-ForEach-detection-to-be-before-For-detectio.patch
+++ b/FernFlower-Patches/0070-Re-write-ForEach-detection-to-be-before-For-detectio.patch
@@ -1,16 +1,12 @@
 From fd8b2a3bfada12e9d371230cb329f64ab801544e Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 4 Oct 2015 04:23:24 -0700
-Subject: [PATCH 070/122] Re-write ForEach detection to be before For
- detection. Fixes issues where incrementors would be added back in
- incorrectly.
+Subject: Re-write ForEach detection to be before For detection. Fixes issues
+ where incrementors would be added back in incorrectly.
 
----
- .../modules/decompiler/MergeHelper.java       | 159 ++++++------------
- 1 file changed, 56 insertions(+), 103 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-index 0e7f1ab..f354f06 100644
+index 0e7f1ab7fe6fe4ca716cdcc0fc182dcfa59c3b7b..f354f0684b4d16e8dcd08b2ce6db76210249b571 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
 @@ -20,6 +20,7 @@ import org.jetbrains.java.decompiler.main.DecompilerContext;
@@ -269,5 +265,5 @@ index 0e7f1ab..f354f06 100644
  
    private static boolean isType(Exprent exp, int type) { //This is just a helper macro, Wish java had real macros.
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0071-Propogate-LVTs-to-inner-classes.patch b/FernFlower-Patches/0071-Propogate-LVTs-to-inner-classes.patch
index 3afd93a..bba7cc7 100644
--- a/FernFlower-Patches/0071-Propogate-LVTs-to-inner-classes.patch
+++ b/FernFlower-Patches/0071-Propogate-LVTs-to-inner-classes.patch
@@ -1,19 +1,12 @@
 From bf26fb1390f668dcadb5dc15cdf9cbfc12b84d81 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 4 Oct 2015 16:52:33 -0700
-Subject: [PATCH 071/122] Propogate LVTs to inner classes. Fix improper var
- merging in var handlers.
+Subject: =?UTF-8?q?Propogate=20LVTs=20to=20inner=20classes.=0AFix=20improp?=
+ =?UTF-8?q?er=20var=20merging=20in=20var=20handlers.?=
 
----
- .../main/rels/NestedClassProcessor.java       | 37 +++++++++++--
- .../modules/decompiler/vars/LVTVariable.java  |  8 ++-
- .../decompiler/vars/VarDefinitionHelper.java  | 53 ++++++++++++++-----
- .../modules/decompiler/vars/VarProcessor.java | 13 ++++-
- .../decompiler/vars/VarVersionsProcessor.java |  2 +-
- 5 files changed, 90 insertions(+), 23 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index c6eda1b..3378549 100644
+index c6eda1b630480cdec964a3571fc44e1c90626b24..33785497b358346846ce58824ce3c2f0aa2be815 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 @@ -28,6 +28,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectNode;
@@ -151,7 +144,7 @@ index c6eda1b..3378549 100644
              }
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
-index 209d3e0..cb376d9 100644
+index 209d3e081f58e2d54b231dbe2c90fe11c319f66c..cb376d9b480f06971c71647037a17a166764e805 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
 @@ -83,7 +83,11 @@ public class LVTVariable implements Comparable<LVTVariable> {
@@ -170,7 +163,7 @@ index 209d3e0..cb376d9 100644
  }
 \ No newline at end of file
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 88dae4d..0427e3b 100644
+index 88dae4d81ca4ebc059cc575cf5e97d9f5bfe0fee..0427e3b329d4599d42ef5f8ac35fd84581c5f8c6 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -440,6 +440,10 @@ public class VarDefinitionHelper {
@@ -265,7 +258,7 @@ index 88dae4d..0427e3b 100644
    }
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-index 89f24f3..04ee48f 100644
+index 89f24f365a7c01b7920fd8002dda2ec0b955f96c..04ee48f75b4d78b117e6fe1e70cf41fa0073b99d 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 @@ -29,6 +29,7 @@ import java.util.Map.Entry;
@@ -301,7 +294,7 @@ index 89f24f3..04ee48f 100644
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-index d201157..a1acd19 100644
+index d201157f241a77410bbd495ed43c5a54540ee59c..a1acd195bb107e423f2ed29c1e1554a7fa63442f 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
 @@ -323,5 +323,5 @@ public class VarVersionsProcessor {
@@ -312,5 +305,5 @@ index d201157..a1acd19 100644
 +  }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0072-Fix-issue-where-For-loops-would-be-enhanced-to-ForEa.patch b/FernFlower-Patches/0072-Fix-issue-where-For-loops-would-be-enhanced-to-ForEa.patch
index aeac5a6..543d64b 100644
--- a/FernFlower-Patches/0072-Fix-issue-where-For-loops-would-be-enhanced-to-ForEa.patch
+++ b/FernFlower-Patches/0072-Fix-issue-where-For-loops-would-be-enhanced-to-ForEa.patch
@@ -1,15 +1,11 @@
 From 08cf2eed89abfcfed52fbcaac9ee4c4b172b465a Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 4 Oct 2015 18:14:24 -0700
-Subject: [PATCH 072/122] Fix issue where For loops would be enhanced to
- ForEach incorrectly.
+Subject: Fix issue where For loops would be enhanced to ForEach incorrectly.
 
----
- .../java/decompiler/modules/decompiler/MergeHelper.java    | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-index f354f06..11c7c59 100644
+index f354f0684b4d16e8dcd08b2ce6db76210249b571..11c7c599d4413cb46b58906f4b7fdbe4a019e1f0 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
 @@ -501,10 +501,12 @@ public class MergeHelper {
@@ -37,5 +33,5 @@ index f354f06..11c7c59 100644
          funcRight.getLstOperands().get(0).addBytecodeOffsets(initExprents[0].bytecode);
          funcRight.getLstOperands().get(0).addBytecodeOffsets(initExprents[1].bytecode);
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0073-Fix-constructor-arguments-for-non-static-inner-class.patch b/FernFlower-Patches/0073-Fix-constructor-arguments-for-non-static-inner-class.patch
index 7e7edcc..407b633 100644
--- a/FernFlower-Patches/0073-Fix-constructor-arguments-for-non-static-inner-class.patch
+++ b/FernFlower-Patches/0073-Fix-constructor-arguments-for-non-static-inner-class.patch
@@ -1,16 +1,12 @@
 From af6a44bafd270347d61481d9d3b97ef3c263a42b Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 4 Oct 2015 19:29:55 -0700
-Subject: [PATCH 073/122] Fix constructor arguments for non-static inner
- classes with generic signatures.
+Subject: Fix constructor arguments for non-static inner classes with generic
+ signatures.
 
----
- .../java/decompiler/main/ClassWriter.java     |  8 +++++++-
- .../struct/gen/generics/GenericType.java      | 20 +++++++++++++++++++
- 2 files changed, 27 insertions(+), 1 deletion(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index 3e5789d..daf3444 100644
+index 3e5789da9240c8b59cb914bd5fd94a78b13ddc61..daf3444f9bc3c0811af2f2370fcb218dc84ce42b 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 @@ -725,6 +725,12 @@ public class ClassWriter {
@@ -36,7 +32,7 @@ index 3e5789d..daf3444 100644
  
          buffer.append(')');
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-index d3b3896..9305bf9 100644
+index d3b38960a05cb9102bff5ae3aa305acd1111e6dc..9305bf93cf68b9f87b6d765b25494bcb2813c2aa 100644
 --- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
 +++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
 @@ -31,6 +31,7 @@ public class GenericType {
@@ -88,5 +84,5 @@ index d3b3896..9305bf9 100644
      assert arrayDim > 0 : this;
      return new GenericType(type, arrayDim - 1, value);
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0074-Return-generic-typevar-casting-support.patch b/FernFlower-Patches/0074-Return-generic-typevar-casting-support.patch
index 50b27a5..b8cdda6 100644
--- a/FernFlower-Patches/0074-Return-generic-typevar-casting-support.patch
+++ b/FernFlower-Patches/0074-Return-generic-typevar-casting-support.patch
@@ -1,18 +1,11 @@
 From e083cb151d05afd2e06431fb24443e381c03b361 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Mon, 5 Oct 2015 00:12:38 -0400
-Subject: [PATCH 074/122] Return generic typevar casting support
+Subject: Return generic typevar casting support
 
----
- .../jetbrains/java/decompiler/main/ClassWriter.java  |  5 ++++-
- .../decompiler/modules/decompiler/ExprProcessor.java |  7 +++----
- .../modules/decompiler/exps/ExitExprent.java         | 12 +++++++++++-
- .../java/decompiler/struct/gen/MethodDescriptor.java |  5 +++++
- .../java/decompiler/struct/gen/VarType.java          |  7 ++++++-
- 5 files changed, 29 insertions(+), 7 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index daf3444..404265f 100644
+index daf3444f9bc3c0811af2f2370fcb218dc84ce42b..404265fb49a5f2cd599af38dafb8b1d0551105c8 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 @@ -607,6 +607,7 @@ public class ClassWriter {
@@ -35,7 +28,7 @@ index daf3444..404265f 100644
        int paramCount = 0;
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-index 7b94e5b..1abd093 100644
+index 7b94e5b4af7a6618e46f078bcec596e972cef4d1..1abd0934cada3c90b1ee0d24ffbf0fa5e0d1fad9 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
 @@ -731,10 +731,9 @@ public class ExprProcessor implements CodeConstants {
@@ -53,7 +46,7 @@ index 7b94e5b..1abd093 100644
        String ret = buildJavaClassName(type.value);
        if (getShort) {
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
-index fd1491f..bbf1458 100644
+index fd1491f3b31fc17716d715b8b2b76cf3b846bdc6..bbf14584e481d48a7feb9b5bb324efb47684c9f5 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
 @@ -24,7 +24,10 @@ import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
@@ -90,7 +83,7 @@ index fd1491f..bbf1458 100644
  
        return buffer.prepend("return");
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
-index 2465382..0ab555f 100644
+index 24653823d944d460c79906527cff1b70c781e945..0ab555fe617a0e6d2c72b29caa31122a149457ae 100644
 --- a/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
 +++ b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
 @@ -16,6 +16,7 @@
@@ -120,7 +113,7 @@ index 2465382..0ab555f 100644
      boolean updated = false;
  
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
-index 1eb177f..45fd289 100644
+index 1eb177fd1b9e8e445ab122c78e2145a70f2bffd3..45fd2896cf946747b4a04e47ec54d99eae900d82 100644
 --- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
 +++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
 @@ -16,6 +16,7 @@
@@ -152,5 +145,5 @@ index 1eb177f..45fd289 100644
      this(type, arrayDim, value, getFamily(type, arrayDim), getStackSize(type, arrayDim), false);
    }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0075-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch b/FernFlower-Patches/0075-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch
index 0a25207..ea7ba34 100644
--- a/FernFlower-Patches/0075-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch
+++ b/FernFlower-Patches/0075-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch
@@ -1,17 +1,12 @@
 From a88b1c06f60850be429ebdba20e5e6ba507936bb Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Fri, 9 Oct 2015 13:22:13 -0700
-Subject: [PATCH 075/122] Add new decompiler option -iec
- Include_Entire_Classpath which will read the current JVM's classpath and
- parse all libraries for metadata.
+Subject: Add new decompiler option -iec Include_Entire_Classpath which will
+ read the current JVM's classpath and parse all libraries for metadata.
 
----
- .../java/decompiler/main/Fernflower.java      | 29 +++++++++++++++++++
- .../main/extern/IFernflowerPreferences.java   |  3 ++
- 2 files changed, 32 insertions(+)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-index e355ee9..65733ac 100644
+index e355ee9ff5bc6e5c3a9dd2262c1c33b2dc826f83..65733ac2c8ea53277e5a2ffe54ea7e91e0c6fc97 100644
 --- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
 +++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
 @@ -19,6 +19,7 @@ import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
@@ -71,7 +66,7 @@ index e355ee9..65733ac 100644
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-index 31871c5..79dd8e8 100644
+index 31871c5d945034a810fa9f866446e14c40cd9b18..79dd8e890cd37e88bfbe9f0c22c825b3c2549bb8 100644
 --- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
 +++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
 @@ -60,6 +60,8 @@ public interface IFernflowerPreferences {
@@ -91,5 +86,5 @@ index 31871c5..79dd8e8 100644
    }});
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0076-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch b/FernFlower-Patches/0076-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch
index df0ca76..66329e3 100644
--- a/FernFlower-Patches/0076-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch
+++ b/FernFlower-Patches/0076-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch
@@ -1,28 +1,12 @@
 From 676f9ba6584df07224d713698aca89eae71b44e4 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Fri, 9 Oct 2015 13:29:20 -0700
-Subject: [PATCH 076/122] Rework GenericType to be subclass of VarType and
- contain all data needed to be treated as such.
+Subject: Rework GenericType to be subclass of VarType and contain all data
+ needed to be treated as such.
 
----
- .../java/decompiler/main/ClassWriter.java     | 148 ++++---------
- .../modules/decompiler/ExprProcessor.java     |   7 +-
- .../modules/decompiler/exps/ExitExprent.java  |   6 +-
- .../modules/decompiler/exps/NewExprent.java   |  20 +-
- .../modules/decompiler/exps/VarExprent.java   |   2 +-
- .../java/decompiler/struct/StructClass.java   |  21 ++
- .../java/decompiler/struct/StructField.java   |  21 ++
- .../java/decompiler/struct/StructMethod.java  |  18 +-
- .../java/decompiler/struct/gen/VarType.java   |  15 +-
- .../gen/generics/GenericClassDescriptor.java  |   8 +-
- .../gen/generics/GenericFieldDescriptor.java  |   4 +-
- .../struct/gen/generics/GenericMain.java      |  82 ++-----
- .../gen/generics/GenericMethodDescriptor.java |  10 +-
- .../struct/gen/generics/GenericType.java      | 204 ++++++++++++------
- 14 files changed, 288 insertions(+), 278 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index 404265f..4ec7fe9 100644
+index 404265fb49a5f2cd599af38dafb8b1d0551105c8..4ec7fe9d7d34fe35fcd379d608a102d8f40e1734 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 @@ -342,13 +342,7 @@ public class ClassWriter {
@@ -260,7 +244,7 @@ index 404265f..4ec7fe9 100644
        }
      }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-index 1abd093..162d9cb 100644
+index 1abd0934cada3c90b1ee0d24ffbf0fa5e0d1fad9..162d9cb6953a6501771750e82f7de0a6b855c75c 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
 @@ -730,9 +730,12 @@ public class ExprProcessor implements CodeConstants {
@@ -279,7 +263,7 @@ index 1abd093..162d9cb 100644
  
        String ret = buildJavaClassName(type.value);
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
-index bbf1458..3b5f0ba 100644
+index bbf14584e481d48a7feb9b5bb324efb47684c9f5..3b5f0babb1c13152d2935024c07e924676935fae 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
 @@ -26,11 +26,8 @@ import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
@@ -305,7 +289,7 @@ index bbf1458..3b5f0ba 100644
          buffer.append(" ");
          ExprProcessor.getCastedExprent(value, ret, buffer, indent, false, force, tracer);
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-index 1e87201..56e6771 100644
+index 1e87201c8322b8c9d6db16a89ecab56fdb0df85d..56e67715de8e9fa7c7bf7e341e50d37b0b6b1382 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 @@ -238,19 +238,17 @@ public class NewExprent extends Exprent {
@@ -338,7 +322,7 @@ index 1e87201..56e6771 100644
  
          if (enclosing != null) {
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index c85d889..4784e03 100644
+index c85d889d96073327a5ea08a9d986621dd8792e26..4784e030332e1ea0ce87a4bfa69432cfa0906b73 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 @@ -111,7 +111,7 @@ public class VarExprent extends Exprent {
@@ -351,7 +335,7 @@ index c85d889..4784e03 100644
          else if (lvt != null) {
            buffer.append(ExprProcessor.getCastTypeName(lvt.getVarType())).append(" ");
 diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
-index cb24ff6..c0683fc 100644
+index cb24ff65db631feeb2206ddf0fe18244eabdc788..c0683fc0c33773d1f96a2eda2dbf6ca7c4e935c2 100644
 --- a/src/org/jetbrains/java/decompiler/struct/StructClass.java
 +++ b/src/org/jetbrains/java/decompiler/struct/StructClass.java
 @@ -16,8 +16,14 @@
@@ -397,7 +381,7 @@ index cb24ff6..c0683fc 100644
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/struct/StructField.java b/src/org/jetbrains/java/decompiler/struct/StructField.java
-index 796d77f..cde19f1 100644
+index 796d77f1c9a3f78740e1a536eac4eddd2f7ed527..cde19f1efeb7bd771f2c3d8c54b88114ae187f31 100644
 --- a/src/org/jetbrains/java/decompiler/struct/StructField.java
 +++ b/src/org/jetbrains/java/decompiler/struct/StructField.java
 @@ -15,7 +15,13 @@
@@ -442,7 +426,7 @@ index 796d77f..cde19f1 100644
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-index 2b5249f..8f0da2b 100644
+index 2b5249f59d5a5e4bf43c2f8515adcaa31df88813..8f0da2b8eeed9428133834dbf4bd8be3f6e38ee5 100644
 --- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
 +++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
 @@ -16,8 +16,13 @@
@@ -492,7 +476,7 @@ index 2b5249f..8f0da2b 100644
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
-index 45fd289..1b0df9d 100644
+index 45fd2896cf946747b4a04e47ec54d99eae900d82..1b0df9d2e710cb6d1bee94eb1dddfe2c06135941 100644
 --- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
 +++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
 @@ -47,7 +47,6 @@ public class VarType {  // TODO: optimize switch
@@ -550,7 +534,7 @@ index 45fd289..1b0df9d 100644
    public static VarType getCommonMinType(VarType type1, VarType type2) {
      if (type1.type == CodeConstants.TYPE_BOOLEAN && type2.type == CodeConstants.TYPE_BOOLEAN) { // special case booleans
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java
-index 2ff2954..9418bb8 100644
+index 2ff295461e5234ad5877ed87f77046cc84ae5dcc..9418bb890763d0da30a2af93770f2d4e3be813b1 100644
 --- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java
 +++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java
 @@ -18,13 +18,15 @@ package org.jetbrains.java.decompiler.struct.gen.generics;
@@ -573,7 +557,7 @@ index 2ff2954..9418bb8 100644
 +  public final List<List<VarType>> fbounds = new ArrayList<List<VarType>>();
  }
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java
-index 598d17b..9857f60 100644
+index 598d17bef2d00d938146dc75fa296c54848e31bf..9857f608088d254188a58b92857e486e8b1026bc 100644
 --- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java
 +++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java
 @@ -15,7 +15,9 @@
@@ -588,7 +572,7 @@ index 598d17b..9857f60 100644
 +  public VarType type;
  }
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
-index 0a3f9d3..cffd008 100644
+index 0a3f9d33c9e6649af3520c4b99bbd2fcb278642b..cffd0089a659148d803bf18364de4e22c487f268 100644
 --- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
 +++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
 @@ -18,6 +18,8 @@ package org.jetbrains.java.decompiler.struct.gen.generics;
@@ -746,7 +730,7 @@ index 0a3f9d3..cffd008 100644
 -  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
-index 7ef9399..5c2ff05 100644
+index 7ef93995cb08d8bc8f88603c16907740a6b09b57..5c2ff051baebf27af879a6e01a4bd855989e9bda 100644
 --- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
 +++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
 @@ -18,15 +18,17 @@ package org.jetbrains.java.decompiler.struct.gen.generics;
@@ -772,7 +756,7 @@ index 7ef9399..5c2ff05 100644
 +  public final List<VarType> exceptions = new ArrayList<VarType>();
  }
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-index 9305bf9..c45d47f 100644
+index 9305bf93cf68b9f87b6d765b25494bcb2813c2aa..c45d47f7e7efbd28e5bbddb02441299306518733 100644
 --- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
 +++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
 @@ -16,38 +16,43 @@
@@ -1064,5 +1048,5 @@ index 9305bf9..c45d47f 100644
    }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0077-Fix-up-the-scouting-for-an-init-exprent-not-to-look-.patch b/FernFlower-Patches/0077-Fix-up-the-scouting-for-an-init-exprent-not-to-look-.patch
index 1f71998..c276199 100644
--- a/FernFlower-Patches/0077-Fix-up-the-scouting-for-an-init-exprent-not-to-look-.patch
+++ b/FernFlower-Patches/0077-Fix-up-the-scouting-for-an-init-exprent-not-to-look-.patch
@@ -1,25 +1,12 @@
 From 0fac2512ae858770015e5bc2f3d84448ac5031c5 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 11 Oct 2015 12:51:22 -0400
-Subject: [PATCH 077/122] Fix up the scouting for an init exprent, not to look
- inside loops for it. Fixes the broken loops. Added tests for it.
+Subject: Fix up the scouting for an init exprent, not to look inside loops for
+ it. Fixes the broken loops. Added tests for it.
 
----
- .../main/rels/MethodProcessorRunnable.java    |  24 ++++++++-
- .../modules/decompiler/MergeHelper.java       |   2 +
- .../jetbrains/java/decompiler/LVTTest.java    |   4 +-
- .../java/decompiler/LoopMergingTests.java     |  30 +++++++++++
- testData/classes/pkg/TestLoopMerging.class    | Bin 0 -> 1524 bytes
- testData/results/TestLoopMerging.dec          |  49 ++++++++++++++++++
- testData/src/pkg/TestLoopMerging.java         |  47 +++++++++++++++++
- 7 files changed, 153 insertions(+), 3 deletions(-)
- create mode 100644 test/org/jetbrains/java/decompiler/LoopMergingTests.java
- create mode 100644 testData/classes/pkg/TestLoopMerging.class
- create mode 100644 testData/results/TestLoopMerging.dec
- create mode 100644 testData/src/pkg/TestLoopMerging.java
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index 62d5297..2e1668d 100644
+index 62d52975708c5a8126bdc73824fe575b14dea108..2e1668de1af3414bfbed0bf72461688246303931 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 @@ -28,9 +28,13 @@ import org.jetbrains.java.decompiler.modules.decompiler.*;
@@ -92,7 +79,7 @@ index 62d5297..2e1668d 100644
        return sb.toString();
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-index 11c7c59..c240daa 100644
+index 11c7c599d4413cb46b58906f4b7fdbe4a019e1f0..c240daa740a7766b1541dc8aea73025cb9486ac7 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
 @@ -358,6 +358,8 @@ public class MergeHelper {
@@ -105,7 +92,7 @@ index 11c7c59..c240daa 100644
            if (preData != null && !preData.getExprents().isEmpty()) {
              initDoExprent = preData.getExprents().get(preData.getExprents().size() - 1);
 diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
-index d4771bb..fea37bc 100644
+index d4771bb0b063154fd4e38ac3d68ed3c0b27c8938..fea37bceb36c964966c7772c8911f9aa63ae119e 100644
 --- a/test/org/jetbrains/java/decompiler/LVTTest.java
 +++ b/test/org/jetbrains/java/decompiler/LVTTest.java
 @@ -38,11 +38,12 @@ public class LVTTest extends SingleClassesTestBase {
@@ -130,7 +117,7 @@ index d4771bb..fea37bc 100644
  }
 diff --git a/test/org/jetbrains/java/decompiler/LoopMergingTests.java b/test/org/jetbrains/java/decompiler/LoopMergingTests.java
 new file mode 100644
-index 0000000..ddc15d1
+index 0000000000000000000000000000000000000000..ddc15d14e9efaca03115795dbce9266d361b565e
 --- /dev/null
 +++ b/test/org/jetbrains/java/decompiler/LoopMergingTests.java
 @@ -0,0 +1,30 @@
@@ -190,7 +177,7 @@ HcmV?d00001
 
 diff --git a/testData/results/TestLoopMerging.dec b/testData/results/TestLoopMerging.dec
 new file mode 100644
-index 0000000..9f91437
+index 0000000000000000000000000000000000000000..9f91437231e714f985a1f44aa1a7e3df82cb1e5a
 --- /dev/null
 +++ b/testData/results/TestLoopMerging.dec
 @@ -0,0 +1,49 @@
@@ -245,7 +232,7 @@ index 0000000..9f91437
 +}
 diff --git a/testData/src/pkg/TestLoopMerging.java b/testData/src/pkg/TestLoopMerging.java
 new file mode 100644
-index 0000000..c257b10
+index 0000000000000000000000000000000000000000..c257b10446cf1cc23c6c9408e8f5660d30906b29
 --- /dev/null
 +++ b/testData/src/pkg/TestLoopMerging.java
 @@ -0,0 +1,47 @@
@@ -297,5 +284,5 @@ index 0000000..c257b10
 +    }
 +}
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0078-Fix-IncludeEntireClasspath-so-it-doesn-t-dump-out-ra.patch b/FernFlower-Patches/0078-Fix-IncludeEntireClasspath-so-it-doesn-t-dump-out-ra.patch
index 82bce85..fff99db 100644
--- a/FernFlower-Patches/0078-Fix-IncludeEntireClasspath-so-it-doesn-t-dump-out-ra.patch
+++ b/FernFlower-Patches/0078-Fix-IncludeEntireClasspath-so-it-doesn-t-dump-out-ra.patch
@@ -1,17 +1,13 @@
 From cbc3d52186da0f3de950b1fcd1628a31ef46c3d7 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Mon, 12 Oct 2015 14:44:39 -0400
-Subject: [PATCH 078/122] Fix IncludeEntireClasspath so it doesn't dump out
- random other files from the classpath. Also, it doesn't try and save
- undecompiled additional classes too.
+Subject: Fix IncludeEntireClasspath so it doesn't dump out random other files
+ from the classpath. Also, it doesn't try and save undecompiled additional
+ classes too.
 
----
- src/org/jetbrains/java/decompiler/main/Fernflower.java    | 3 ++-
- src/org/jetbrains/java/decompiler/struct/ContextUnit.java | 1 +
- 2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-index 65733ac..6afe975 100644
+index 65733ac2c8ea53277e5a2ffe54ea7e91e0c6fc97..6afe975fe2034ad25b7810a0bdc59ebcff8453e1 100644
 --- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
 +++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
 @@ -113,7 +113,8 @@ public class Fernflower implements IDecompiledData {
@@ -25,7 +21,7 @@ index 65733ac..6afe975 100644
            structContext.addSpace(file, false);
            found.add(file.getAbsolutePath());
 diff --git a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
-index 850c3d8..e304396 100644
+index 850c3d84888d95343abd8a3c297baac58783a8c3..e3043962de86e4823458766ff2afda4eb3e71e5f 100644
 --- a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
 +++ b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
 @@ -110,6 +110,7 @@ public class ContextUnit {
@@ -37,5 +33,5 @@ index 850c3d8..e304396 100644
            if (entryName != null) {
              String content = decompiledData.getClassContent(cl);
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0079-Fixed-generic-type-parsing-of-inner-classes-with-gen.patch b/FernFlower-Patches/0079-Fixed-generic-type-parsing-of-inner-classes-with-gen.patch
index 8dc8f57..366bd02 100644
--- a/FernFlower-Patches/0079-Fixed-generic-type-parsing-of-inner-classes-with-gen.patch
+++ b/FernFlower-Patches/0079-Fixed-generic-type-parsing-of-inner-classes-with-gen.patch
@@ -1,15 +1,11 @@
 From 6b4dc8d90d43ad16cc14df1cdff86f18dd8d0f4f Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Wed, 14 Oct 2015 13:20:13 -0700
-Subject: [PATCH 079/122] Fixed generic type parsing of inner classes with
- generic outers.
+Subject: Fixed generic type parsing of inner classes with generic outers.
 
----
- .../java/decompiler/struct/gen/generics/GenericType.java       | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-index c45d47f..aeb786a 100644
+index c45d47f7e7efbd28e5bbddb02441299306518733..aeb786a7b26864424c5b730ef3f954b9bfb583be 100644
 --- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
 +++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
 @@ -95,7 +95,7 @@ public class GenericType extends VarType {
@@ -30,5 +26,5 @@ index c45d47f..aeb786a 100644
            }
            break loop;
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0080-Foo.-Bar-baz-generation.patch b/FernFlower-Patches/0080-Foo.-Bar-baz-generation.patch
index 9dbc357..f96fac8 100644
--- a/FernFlower-Patches/0080-Foo.-Bar-baz-generation.patch
+++ b/FernFlower-Patches/0080-Foo.-Bar-baz-generation.patch
@@ -1,19 +1,11 @@
 From 6bced8fc859f3f9486d5554604387b4c5a5d34e5 Mon Sep 17 00:00:00 2001
 From: RainWarrior <rainwarrior@fry.su>
 Date: Mon, 12 Oct 2015 09:21:36 +0300
-Subject: [PATCH 080/122] Foo.<Bar>baz() generation
+Subject: Foo.<Bar>baz() generation
 
----
- .../modules/decompiler/ExprProcessor.java     |   2 +-
- .../modules/decompiler/exps/Exprent.java      |   8 ++
- .../modules/decompiler/exps/FieldExprent.java |  15 ++
- .../decompiler/exps/InvocationExprent.java    | 136 ++++++++++++++++--
- .../modules/decompiler/exps/VarExprent.java   |  15 ++
- .../java/decompiler/struct/gen/VarType.java   |   9 ++
- 6 files changed, 173 insertions(+), 12 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-index 162d9cb..2760f20 100644
+index 162d9cb6953a6501771750e82f7de0a6b855c75c..2760f202f5d1b04570ad3eb59f89c829f050b6ab 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
 @@ -914,7 +914,7 @@ public class ExprProcessor implements CodeConstants {
@@ -26,7 +18,7 @@ index 162d9cb..2760f20 100644
      boolean cast =
        castAlways ||
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-index ca9c1ed..9d41ec2 100644
+index ca9c1ed566e423e9169e2b7f72bfec128010f68f..9d41ec2900c7cbdddfb591598526c009f69148ae 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
 @@ -74,6 +74,10 @@ public abstract class Exprent implements IMatchable {
@@ -52,7 +44,7 @@ index ca9c1ed..9d41ec2 100644
      throw new RuntimeException("not implemented");
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-index fdc9cec..d4bd68e 100644
+index fdc9cec54252976b63964d039875e0229ff93172..d4bd68ef9fd192a67843e14504a226250aaf7a85 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
 @@ -23,6 +23,8 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
@@ -85,7 +77,7 @@ index fdc9cec..d4bd68e 100644
    public int getExprentUse() {
      return instance == null ? Exprent.MULTIPLE_USES : instance.getExprentUse() & Exprent.MULTIPLE_USES;
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 9d16de2..81b6f4e 100644
+index 9d16de2d5ab160c76a9a3efff83b4e0f011f5a12..81b6f4e5108eb3e7b73b4962b5695337e5a1e726 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 @@ -19,7 +19,9 @@ import java.util.ArrayList;
@@ -301,7 +293,7 @@ index 9d16de2..81b6f4e 100644
            ambiguous.set(i);
            break;
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index 4784e03..3058e77 100644
+index 4784e030332e1ea0ce87a4bfa69432cfa0906b73..3058e7724f20f48309683af8c16b7bf19e124820 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 @@ -65,6 +65,21 @@ public class VarExprent extends Exprent {
@@ -327,7 +319,7 @@ index 4784e03..3058e77 100644
    public int getExprentUse() {
      return Exprent.MULTIPLE_USES | Exprent.SIDE_EFFECTS_FREE;
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
-index 1b0df9d..af06b8e 100644
+index 1b0df9d2e710cb6d1bee94eb1dddfe2c06135941..af06b8e0d37763abcbabbca680dee2539831f978 100644
 --- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
 +++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
 @@ -269,6 +269,15 @@ public class VarType {  // TODO: optimize switch
@@ -347,5 +339,5 @@ index 1b0df9d..af06b8e 100644
    public boolean equals(Object o) {
      if (o == this) {
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0081-concentrated-changes-to-Exprent.getInferredExprType.patch b/FernFlower-Patches/0081-concentrated-changes-to-Exprent.getInferredExprType.patch
index 5c216ca..9325748 100644
--- a/FernFlower-Patches/0081-concentrated-changes-to-Exprent.getInferredExprType.patch
+++ b/FernFlower-Patches/0081-concentrated-changes-to-Exprent.getInferredExprType.patch
@@ -1,22 +1,11 @@
 From b84e34a3999001b3da2bed7766c1ed2a77bcd100 Mon Sep 17 00:00:00 2001
 From: RainWarrior <rainwarrior@fry.su>
 Date: Wed, 14 Oct 2015 05:45:41 +0300
-Subject: [PATCH 081/122] concentrated changes to Exprent.getInferredExprType
+Subject: concentrated changes to Exprent.getInferredExprType
 
----
- .../java/decompiler/main/ClassWriter.java     |   1 +
- .../modules/decompiler/ExprProcessor.java     |   4 +-
- .../decompiler/exps/AssignmentExprent.java    |   8 +-
- .../modules/decompiler/exps/Exprent.java      |   6 +-
- .../modules/decompiler/exps/FieldExprent.java |   5 +-
- .../decompiler/exps/InvocationExprent.java    | 189 ++++++++++--------
- .../modules/decompiler/exps/VarExprent.java   |   2 +-
- .../struct/gen/generics/GenericType.java      |  16 ++
- .../MinecraftDecompilationTest.java           |   1 +
- 9 files changed, 139 insertions(+), 93 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index 4ec7fe9..7c8276c 100644
+index 4ec7fe9d7d34fe35fcd379d608a102d8f40e1734..7c8276c8dd60eac7022378d4b0700d272a333705 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 @@ -435,6 +435,7 @@ public class ClassWriter {
@@ -28,7 +17,7 @@ index 4ec7fe9..7c8276c 100644
        }
      }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-index 2760f20..3be3b6f 100644
+index 2760f202f5d1b04570ad3eb59f89c829f050b6ab..3be3b6fb3db44ef1320c3106e7d432dd1579e335 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
 @@ -912,9 +912,9 @@ public class ExprProcessor implements CodeConstants {
@@ -44,7 +33,7 @@ index 2760f20..3be3b6f 100644
      boolean cast =
        castAlways ||
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
-index efc64b9..8276abd 100644
+index efc64b9d98005572eb9752e36d472f7a65358203..8276abdbc032467bcff47d2be07729c0f0e53d44 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
 @@ -65,6 +65,12 @@ public class AssignmentExprent extends Exprent {
@@ -70,7 +59,7 @@ index efc64b9..8276abd 100644
      boolean fieldInClassInit = false, hiddenField = false;
      if (left.type == Exprent.EXPRENT_FIELD) { // first assignment to a final field. Field name without "this" in front of it
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-index 9d41ec2..bda80a0 100644
+index 9d41ec2900c7cbdddfb591598526c009f69148ae..bda80a0333129fd0e1d476e00cd1e6dee18ce98b 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
 @@ -74,7 +74,7 @@ public abstract class Exprent implements IMatchable {
@@ -94,7 +83,7 @@ index 9d41ec2..bda80a0 100644
      throw new RuntimeException("not implemented");
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-index d4bd68e..be95dc1 100644
+index d4bd68ef9fd192a67843e14504a226250aaf7a85..be95dc1f6242dc3a12cc433384d34700d8c602b3 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
 @@ -68,14 +68,15 @@ public class FieldExprent extends Exprent {
@@ -116,7 +105,7 @@ index d4bd68e..be95dc1 100644
      return getExprType();
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 81b6f4e..ca5e077 100644
+index 81b6f4e5108eb3e7b73b4962b5695337e5a1e726..ca5e0778987e633aaf5c4f54a63fefe28cb356e0 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 @@ -72,6 +72,8 @@ public class InvocationExprent extends Exprent {
@@ -394,7 +383,7 @@ index 81b6f4e..ca5e077 100644
            }
          }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index 3058e77..0d41725 100644
+index 3058e7724f20f48309683af8c16b7bf19e124820..0d417258f78e649b034a680374610a961ed21257 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
 @@ -66,7 +66,7 @@ public class VarExprent extends Exprent {
@@ -407,7 +396,7 @@ index 3058e77..0d41725 100644
        // TODO; figure out why it's crashing, ugly fix for now
        try {
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-index aeb786a..da04e00 100644
+index aeb786a7b26864424c5b730ef3f954b9bfb583be..da04e009a8b3ef883536cf117faee2f6dfe3b417 100644
 --- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
 +++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
 @@ -318,4 +318,20 @@ public class GenericType extends VarType {
@@ -432,7 +421,7 @@ index aeb786a..da04e00 100644
 +  }
  }
 diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
-index c7e781e..2afd2e6 100644
+index c7e781e4172f736a831b857ca7fd3060d95e6186..2afd2e6f60ee5cc191b6eaf535e0fa12f25ea275 100644
 --- a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
 +++ b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
 @@ -47,6 +47,7 @@ public class MinecraftDecompilationTest {
@@ -444,5 +433,5 @@ index c7e781e..2afd2e6 100644
      fixture.setUp(mcFFOptions);
      if (!new File(fixture.getTestDataDir(), MC_JAR).exists()) {
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0082-passing-information-from-InvocationExprent-s-inferre.patch b/FernFlower-Patches/0082-passing-information-from-InvocationExprent-s-inferre.patch
index ac8e70c..6e6ec41 100644
--- a/FernFlower-Patches/0082-passing-information-from-InvocationExprent-s-inferre.patch
+++ b/FernFlower-Patches/0082-passing-information-from-InvocationExprent-s-inferre.patch
@@ -1,16 +1,12 @@
 From 155a27086d2f5178ce4e981e208d69ce8e9a421d Mon Sep 17 00:00:00 2001
 From: RainWarrior <rainwarrior@fry.su>
 Date: Wed, 14 Oct 2015 09:26:05 +0300
-Subject: [PATCH 082/122] passing information from InvocationExprent's inferred
- type arguments to the parameters
+Subject: passing information from InvocationExprent's inferred type arguments
+ to the parameters
 
----
- .../decompiler/exps/InvocationExprent.java    | 42 +++++++++++++++++--
- .../struct/gen/generics/GenericType.java      |  6 ++-
- 2 files changed, 43 insertions(+), 5 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index ca5e077..884a2d7 100644
+index ca5e0778987e633aaf5c4f54a63fefe28cb356e0..884a2d7ed927eb6f402b05a169ca772764bf9c61 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 @@ -429,7 +429,7 @@ public class InvocationExprent extends Exprent {
@@ -87,7 +83,7 @@ index ca5e077..884a2d7 100644
          if (!paramType.equals(md.params[i])) {
            ambiguous.set(i);
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-index da04e00..9319bf7 100644
+index da04e009a8b3ef883536cf117faee2f6dfe3b417..9319bf76366d189afd5bdb98b018c8e0425a58b0 100644
 --- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
 +++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
 @@ -35,7 +35,7 @@ public class GenericType extends VarType {
@@ -111,5 +107,5 @@ index da04e00..9319bf7 100644
      return arguments;
    }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0083-pushed-remapping-to-the-VarType-added-type-inference.patch b/FernFlower-Patches/0083-pushed-remapping-to-the-VarType-added-type-inference.patch
index 03d1946..9963112 100644
--- a/FernFlower-Patches/0083-pushed-remapping-to-the-VarType-added-type-inference.patch
+++ b/FernFlower-Patches/0083-pushed-remapping-to-the-VarType-added-type-inference.patch
@@ -1,19 +1,12 @@
 From f8df185c9f5ecc896aac6f264196e1d842796b87 Mon Sep 17 00:00:00 2001
 From: RainWarrior <rainwarrior@fry.su>
 Date: Wed, 14 Oct 2015 14:18:10 +0300
-Subject: [PATCH 083/122] pushed remapping to the VarType, added type inference
- to a couple more places
+Subject: pushed remapping to the VarType, added type inference to a couple
+ more places
 
----
- .../modules/decompiler/ExprProcessor.java     |   1 +
- .../decompiler/exps/AssignmentExprent.java    |   2 +-
- .../decompiler/exps/InvocationExprent.java    | 114 ++++++++++--------
- .../java/decompiler/struct/gen/VarType.java   |   9 ++
- .../struct/gen/generics/GenericType.java      |  40 +++++-
- 5 files changed, 108 insertions(+), 58 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-index 3be3b6f..60832d3 100644
+index 3be3b6fb3db44ef1320c3106e7d432dd1579e335..60832d3af2925a806c852e72209e676fb293d882 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
 @@ -853,6 +853,7 @@ public class ExprProcessor implements CodeConstants {
@@ -25,7 +18,7 @@ index 3be3b6f..60832d3 100644
        if (content.length() > 0) {
          if (expr.type != Exprent.EXPRENT_VAR || !((VarExprent)expr).isClassDef()) {
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
-index 8276abd..68f5830 100644
+index 8276abdbc032467bcff47d2be07729c0f0e53d44..68f58305f21314d969c79cd0bdcdc14c5b0ae003 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
 @@ -112,7 +112,7 @@ public class AssignmentExprent extends Exprent {
@@ -38,7 +31,7 @@ index 8276abd..68f5830 100644
      boolean fieldInClassInit = false, hiddenField = false;
      if (left.type == Exprent.EXPRENT_FIELD) { // first assignment to a final field. Field name without "this" in front of it
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 884a2d7..4c4b898 100644
+index 884a2d7ed927eb6f402b05a169ca772764bf9c61..4c4b8981d0e7b3e12d7024e5dc7e05c31476ea8d 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 @@ -167,10 +167,10 @@ public class InvocationExprent extends Exprent {
@@ -201,7 +194,7 @@ index 884a2d7..4c4b898 100644
  
          firstParameter = false;
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
-index af06b8e..81342ed 100644
+index af06b8e0d37763abcbabbca680dee2539831f978..81342ed8f18463360e9c31f77e5091aa68ec7cdb 100644
 --- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
 +++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
 @@ -19,6 +19,8 @@ import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -226,7 +219,7 @@ index af06b8e..81342ed 100644
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-index 9319bf7..9ad5a1f 100644
+index 9319bf76366d189afd5bdb98b018c8e0425a58b0..9ad5a1fe83d6f2e43f257bad5982e1b524e9d3af 100644
 --- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
 +++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
 @@ -23,6 +23,7 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
@@ -290,5 +283,5 @@ index 9319bf7..9ad5a1f 100644
    }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0084-handle-generic-lists-with-multiple-arguments-in-meth.patch b/FernFlower-Patches/0084-handle-generic-lists-with-multiple-arguments-in-meth.patch
index d46acdf..61e5969 100644
--- a/FernFlower-Patches/0084-handle-generic-lists-with-multiple-arguments-in-meth.patch
+++ b/FernFlower-Patches/0084-handle-generic-lists-with-multiple-arguments-in-meth.patch
@@ -1,15 +1,11 @@
 From 497af514fd5c868021fc9be12acac2c387f5541d Mon Sep 17 00:00:00 2001
 From: RainWarrior <rainwarrior@fry.su>
 Date: Wed, 14 Oct 2015 15:30:51 +0300
-Subject: [PATCH 084/122] handle generic lists with multiple arguments in
- method invocations
+Subject: handle generic lists with multiple arguments in method invocations
 
----
- .../decompiler/exps/InvocationExprent.java    | 21 ++++++++++++-------
- 1 file changed, 13 insertions(+), 8 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 4c4b898..f98c822 100644
+index 4c4b8981d0e7b3e12d7024e5dc7e05c31476ea8d..f98c822f58aa151185507a7fd7dc2cb0198f72b8 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 @@ -208,14 +208,19 @@ public class InvocationExprent extends Exprent {
@@ -41,5 +37,5 @@ index 4c4b898..f98c822 100644
            }
          }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0085-using-the-generic-info-from-InvocationExprent-correc.patch b/FernFlower-Patches/0085-using-the-generic-info-from-InvocationExprent-correc.patch
index 8ac4d49..e533fdf 100644
--- a/FernFlower-Patches/0085-using-the-generic-info-from-InvocationExprent-correc.patch
+++ b/FernFlower-Patches/0085-using-the-generic-info-from-InvocationExprent-correc.patch
@@ -1,15 +1,12 @@
 From b14e7fc85e9f8c07da66accb2f490175fbf054ed Mon Sep 17 00:00:00 2001
 From: RainWarrior <rainwarrior@fry.su>
 Date: Thu, 15 Oct 2015 01:00:20 +0300
-Subject: [PATCH 085/122] using the generic info from InvocationExprent
- correctly, 1 more error down
+Subject: using the generic info from InvocationExprent correctly, 1 more error
+ down
 
----
- .../decompiler/exps/InvocationExprent.java    | 102 ++++++++++--------
- 1 file changed, 55 insertions(+), 47 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index f98c822..b2c3574 100644
+index f98c822f58aa151185507a7fd7dc2cb0198f72b8..b2c3574dec9dcc67e8af5c94c4f2e6c2cb078214 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 @@ -174,59 +174,67 @@ public class InvocationExprent extends Exprent {
@@ -136,5 +133,5 @@ index f98c822..b2c3574 100644
          buf.append(buff);
  
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0086-Itterator-enchanced-for-loops-can-also-have-a-copy-i.patch b/FernFlower-Patches/0086-Itterator-enchanced-for-loops-can-also-have-a-copy-i.patch
index 5dcf767..fac1b9d 100644
--- a/FernFlower-Patches/0086-Itterator-enchanced-for-loops-can-also-have-a-copy-i.patch
+++ b/FernFlower-Patches/0086-Itterator-enchanced-for-loops-can-also-have-a-copy-i.patch
@@ -1,15 +1,12 @@
 From c9699a02f50eaa677fc72201e6c4c3581a13744f Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Wed, 14 Oct 2015 16:07:14 -0700
-Subject: [PATCH 086/122] Itterator enchanced for loops can also have a 'copy'
- instruction, so detect those as well.
+Subject: Itterator enchanced for loops can also have a 'copy' instruction, so
+ detect those as well.
 
----
- .../decompiler/modules/decompiler/MergeHelper.java   | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-index c240daa..d0158ab 100644
+index c240daa740a7766b1541dc8aea73025cb9486ac7..d0158aba3e732e854494bfbe80b128f47a70fc24 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
 @@ -491,6 +491,18 @@ public class MergeHelper {
@@ -32,5 +29,5 @@ index c240daa..d0158ab 100644
        }
        else if (initExprents[0] != null && initExprents[1] != null && firstDoExprent != null) {
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0087-Be-a-bit-more-strict-in-detecting-copy-var-usage.patch b/FernFlower-Patches/0087-Be-a-bit-more-strict-in-detecting-copy-var-usage.patch
index 6fed600..aa981c0 100644
--- a/FernFlower-Patches/0087-Be-a-bit-more-strict-in-detecting-copy-var-usage.patch
+++ b/FernFlower-Patches/0087-Be-a-bit-more-strict-in-detecting-copy-var-usage.patch
@@ -1,15 +1,11 @@
 From 788d8fdb6346422ce9717694f957b970625072ec Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Wed, 14 Oct 2015 16:40:04 -0700
-Subject: [PATCH 087/122] Be a bit more strict in detecting copy var usage.
+Subject: Be a bit more strict in detecting copy var usage.
 
----
- .../java/decompiler/modules/decompiler/MergeHelper.java   | 2 +-
- .../decompiler/modules/decompiler/stats/Statement.java    | 8 ++++++++
- 2 files changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-index d0158ab..3025737 100644
+index d0158aba3e732e854494bfbe80b128f47a70fc24..3025737508432bebbbd645908852f93d44dd384f 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
 @@ -496,7 +496,7 @@ public class MergeHelper {
@@ -22,7 +18,7 @@ index d0158ab..3025737 100644
              initExprents[1].getRight().addBytecodeOffsets(initExprents[1].bytecode);
              initExprents[1].getRight().addBytecodeOffsets(stat.getIncExprent().bytecode);
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
-index f71ed84..686001d 100644
+index f71ed84bc4ad195a97b4c535f21b55a9568cac62..686001d878d4204c439e6a4b6d140c155eadbb97 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
 @@ -837,6 +837,14 @@ public class Statement implements IMatchable {
@@ -41,5 +37,5 @@ index f71ed84..686001d 100644
      return labelEdges;
    }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0088-Enhance-switches-on-enums.patch b/FernFlower-Patches/0088-Enhance-switches-on-enums.patch
index 5f70003..8507430 100644
--- a/FernFlower-Patches/0088-Enhance-switches-on-enums.patch
+++ b/FernFlower-Patches/0088-Enhance-switches-on-enums.patch
@@ -1,17 +1,11 @@
 From 7397a3a93f58c06def0180227486b7a23915b4b4 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 15 Oct 2015 00:15:50 -0700
-Subject: [PATCH 088/122] Enhance switches on enums.
+Subject: Enhance switches on enums.
 
----
- .../main/rels/MethodProcessorRunnable.java    |   2 +-
- .../main/rels/NestedClassProcessor.java       | 129 ++++++++++++++++++
- .../decompiler/stats/SwitchStatement.java     |  55 +++++++-
- .../java/decompiler/struct/StructClass.java   |   3 +
- 4 files changed, 186 insertions(+), 3 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index 2e1668d..16d7788 100644
+index 2e1668de1af3414bfbed0bf72461688246303931..16d778867677249c16b38fcfbca16618b1fa4ac0 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 @@ -296,7 +296,7 @@ public class MethodProcessorRunnable implements Runnable {
@@ -24,7 +18,7 @@ index 2e1668d..16d7788 100644
      System.out.println();
      for (StatEdge edge : statement.getAllSuccessorEdges())
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 3378549..12653a4 100644
+index 33785497b358346846ce58824ce3c2f0aa2be815..12653a4836d4f864154310b6115369e943f36fd7 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 @@ -16,6 +16,7 @@
@@ -194,7 +188,7 @@ index 3378549..12653a4 100644
  
      if (child.lambdaInformation.is_method_reference) { // method reference, no code and no parameters
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
-index 3e27201..f8eec64 100644
+index 3e272016903de00ee47c55fad62db4b0687a04b5..f8eec64ce7edbb2ff9e4d76c7d9e59c42060e57f 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
 @@ -24,10 +24,14 @@ import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
@@ -285,7 +279,7 @@ index 3e27201..f8eec64 100644
      SwitchExprent swexpr = (SwitchExprent)first.getExprents().remove(first.getExprents().size() - 1);
      swexpr.setCaseValues(caseValues);
 diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
-index c0683fc..ab0f118 100644
+index c0683fc0c33773d1f96a2eda2dbf6ca7c4e935c2..ab0f118debc0d7dee08f79a12c3558909e652482 100644
 --- a/src/org/jetbrains/java/decompiler/struct/StructClass.java
 +++ b/src/org/jetbrains/java/decompiler/struct/StructClass.java
 @@ -30,6 +30,8 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil;
@@ -306,5 +300,5 @@ index c0683fc..ab0f118 100644
    private ConstantPool pool;
  
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0089-Fixed-issue-where-inner-class-fields-would-not-be-re.patch b/FernFlower-Patches/0089-Fixed-issue-where-inner-class-fields-would-not-be-re.patch
index 1785286..a1dde51 100644
--- a/FernFlower-Patches/0089-Fixed-issue-where-inner-class-fields-would-not-be-re.patch
+++ b/FernFlower-Patches/0089-Fixed-issue-where-inner-class-fields-would-not-be-re.patch
@@ -1,15 +1,12 @@
 From 32d7a1464e50520aa4e0c78fce84528448bca249 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 15 Oct 2015 01:10:03 -0700
-Subject: [PATCH 089/122] Fixed issue where inner class fields would not be
- replaced by their parent method parameters.
+Subject: Fixed issue where inner class fields would not be replaced by their
+ parent method parameters.
 
----
- .../main/rels/NestedClassProcessor.java       | 51 ++++++++++++++++---
- 1 file changed, 45 insertions(+), 6 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 12653a4..6d40b8a 100644
+index 12653a4836d4f864154310b6115369e943f36fd7..6d40b8a1dc102b0cdf90aed615e74c10cbd08ffa 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 @@ -706,8 +706,8 @@ public class NestedClassProcessor {
@@ -94,5 +91,5 @@ index 12653a4..6d40b8a 100644
 +  }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0090-Added-support-for-and-field-accessors-in-inner-class.patch b/FernFlower-Patches/0090-Added-support-for-and-field-accessors-in-inner-class.patch
index 46a9ea8..a44a24e 100644
--- a/FernFlower-Patches/0090-Added-support-for-and-field-accessors-in-inner-class.patch
+++ b/FernFlower-Patches/0090-Added-support-for-and-field-accessors-in-inner-class.patch
@@ -1,16 +1,12 @@
 From cef8ac773526a830398ef753629b6b7611f7bcf9 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 15 Oct 2015 15:51:24 -0700
-Subject: [PATCH 090/122] Added support for ++ and -- field accessors in inner
- classes. And fixed inner class type find issue.
+Subject: Added support for ++ and -- field accessors in inner classes. And
+ fixed inner class type find issue.
 
----
- .../main/rels/NestedClassProcessor.java       |  4 +--
- .../main/rels/NestedMemberAccess.java         | 27 +++++++++++++++++++
- 2 files changed, 28 insertions(+), 3 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 6d40b8a..1e69d8d 100644
+index 6d40b8a1dc102b0cdf90aed615e74c10cbd08ffa..1e69d8d4c01f89a1703a8e40424e8cb3c4ba62d3 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 @@ -1145,7 +1145,7 @@ public class NestedClassProcessor {
@@ -32,7 +28,7 @@ index 6d40b8a..1e69d8d 100644
      LinkedList<DirectNode> stack = new LinkedList<DirectNode>();
      stack.add(graph.first);
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java b/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
-index 3fa8128..b4856a6 100644
+index 3fa8128a4e7f607770d592033588e716f49f12f0..b4856a6fabd1b06c2f8a12d9d11f62f2b2e408ec 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
 @@ -40,6 +40,7 @@ public class NestedMemberAccess {
@@ -84,5 +80,5 @@ index 3fa8128..b4856a6 100644
  
  
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0091-cleanup-of-InvocationExprent-changes.patch b/FernFlower-Patches/0091-cleanup-of-InvocationExprent-changes.patch
index 915f6d5..0ddfba3 100644
--- a/FernFlower-Patches/0091-cleanup-of-InvocationExprent-changes.patch
+++ b/FernFlower-Patches/0091-cleanup-of-InvocationExprent-changes.patch
@@ -1,14 +1,11 @@
 From 188b626d3d18755760de06dedf2c050abb03ed61 Mon Sep 17 00:00:00 2001
 From: RainWarrior <rainwarrior@fry.su>
 Date: Fri, 16 Oct 2015 02:06:25 +0300
-Subject: [PATCH 091/122] cleanup of InvocationExprent changes
+Subject: cleanup of InvocationExprent changes
 
----
- .../decompiler/exps/InvocationExprent.java    | 98 +++----------------
- 1 file changed, 11 insertions(+), 87 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index b2c3574..e615207 100644
+index b2c3574dec9dcc67e8af5c94c4f2e6c2cb078214..e6152070d2b155d98fc0b8155db12c12ca3864e0 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
 @@ -170,30 +170,11 @@ public class InvocationExprent extends Exprent {
@@ -196,5 +193,5 @@ index b2c3574..e615207 100644
  
      nextMethod:
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0092-Tweak-decompilation-test-to-new-settings-no-syntheti.patch b/FernFlower-Patches/0092-Tweak-decompilation-test-to-new-settings-no-syntheti.patch
index 7f85ff9..f6f58fa 100644
--- a/FernFlower-Patches/0092-Tweak-decompilation-test-to-new-settings-no-syntheti.patch
+++ b/FernFlower-Patches/0092-Tweak-decompilation-test-to-new-settings-no-syntheti.patch
@@ -1,15 +1,11 @@
 From 71f348d0c9b66b35db2c7a42d37d15ea7f2ea5d9 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Fri, 16 Oct 2015 21:39:10 -0400
-Subject: [PATCH 092/122] Tweak decompilation test to new settings (no
- synthetics or bridge)
+Subject: Tweak decompilation test to new settings (no synthetics or bridge)
 
----
- .../jetbrains/java/decompiler/MinecraftDecompilationTest.java   | 2 --
- 1 file changed, 2 deletions(-)
 
 diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
-index 2afd2e6..087c810 100644
+index 2afd2e6f60ee5cc191b6eaf535e0fa12f25ea275..087c8102c11b1258d8e3f1615fe64f745b8587d6 100644
 --- a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
 +++ b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
 @@ -43,10 +43,8 @@ public class MinecraftDecompilationTest {
@@ -24,5 +20,5 @@ index 2afd2e6..087c810 100644
      }};
      fixture.setUp(mcFFOptions);
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0093-Fix-constants-with-trailing-zeros-and-incorrect-type.patch b/FernFlower-Patches/0093-Fix-constants-with-trailing-zeros-and-incorrect-type.patch
index f874d9f..c8620f0 100644
--- a/FernFlower-Patches/0093-Fix-constants-with-trailing-zeros-and-incorrect-type.patch
+++ b/FernFlower-Patches/0093-Fix-constants-with-trailing-zeros-and-incorrect-type.patch
@@ -1,15 +1,11 @@
 From ded50868b3d9d908540f9c895eca95f44bb0ce9f Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sat, 17 Oct 2015 00:50:20 -0400
-Subject: [PATCH 093/122] Fix constants with trailing zeros and incorrect
- types.
+Subject: Fix constants with trailing zeros and incorrect types.
 
----
- .../modules/decompiler/exps/ConstExprent.java    | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-index 3398924..0fc4055 100644
+index 3398924fabb57daddb0f6b51daafdd266cc371b6..0fc40559457cfc425bced3a536b862a963a466e5 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 @@ -182,16 +182,16 @@ public class ConstExprent extends Exprent {
@@ -55,5 +51,5 @@ index 3398924..0fc4055 100644
            }
            else if (Float.isNaN(fval)) {
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0094-Deterministic-label-names-based-on-jvm-instruction-i.patch b/FernFlower-Patches/0094-Deterministic-label-names-based-on-jvm-instruction-i.patch
index 6ac2430..bdc2e0f 100644
--- a/FernFlower-Patches/0094-Deterministic-label-names-based-on-jvm-instruction-i.patch
+++ b/FernFlower-Patches/0094-Deterministic-label-names-based-on-jvm-instruction-i.patch
@@ -1,23 +1,11 @@
 From 36ea9a310b443b45ecdc298060e3685f8541950a Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sat, 17 Oct 2015 00:51:19 -0400
-Subject: [PATCH 094/122] Deterministic label names based on jvm instruction #
- instead of ID
+Subject: Deterministic label names based on jvm instruction # instead of ID
 
----
- .../java/decompiler/modules/decompiler/ExprProcessor.java     | 2 +-
- .../modules/decompiler/stats/CatchAllStatement.java           | 2 +-
- .../decompiler/modules/decompiler/stats/CatchStatement.java   | 2 +-
- .../java/decompiler/modules/decompiler/stats/DoStatement.java | 2 +-
- .../decompiler/modules/decompiler/stats/GeneralStatement.java | 2 +-
- .../java/decompiler/modules/decompiler/stats/IfStatement.java | 4 ++--
- .../modules/decompiler/stats/SequenceStatement.java           | 2 +-
- .../decompiler/modules/decompiler/stats/SwitchStatement.java  | 2 +-
- .../modules/decompiler/stats/SynchronizedStatement.java       | 2 +-
- 9 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-index 60832d3..c832772 100644
+index 60832d3af2925a806c852e72209e676fb293d882..c83277288453cb286014d926dfcb2e1b5198e338 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
 @@ -815,7 +815,7 @@ public class ExprProcessor implements CodeConstants {
@@ -30,7 +18,7 @@ index 60832d3..c832772 100644
          buf.append(";").appendLineSeparator();
          tracer.incrementCurrentSourceLine();
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
-index 812ed10..34dfa85 100644
+index 812ed10b00ba6224ef947be953bc8d88bd72e2f7..34dfa85eb134ed1bb59a3bee9de0fbb0f35b392a 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
 @@ -120,7 +120,7 @@ public class CatchAllStatement extends Statement {
@@ -43,7 +31,7 @@ index 812ed10..34dfa85 100644
      }
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
-index 8d56042..9359fbb 100644
+index 8d56042e3667eb6843cdea18d01536f90ea59e50..9359fbb134065e51b1e9c437b0dc4de55b734713 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
 @@ -157,7 +157,7 @@ public class CatchStatement extends Statement {
@@ -56,7 +44,7 @@ index 8d56042..9359fbb 100644
      }
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
-index acc74a6..6636d1d 100644
+index acc74a60fd6a90ad15959f6c3164757390542ada..6636d1dab67c0ad87b98fd6b9ebfeca708fd0139 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
 @@ -100,7 +100,7 @@ public class DoStatement extends Statement {
@@ -69,7 +57,7 @@ index acc74a6..6636d1d 100644
      }
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
-index 4f22cf7..499894a 100644
+index 4f22cf710a67e5f0d69951fb4bee6fa194e5a4ea..499894a572629a0e14aba0ebfae4929d6e0eec18 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
 @@ -57,7 +57,7 @@ public class GeneralStatement extends Statement {
@@ -82,7 +70,7 @@ index 4f22cf7..499894a 100644
  
      buf.appendIndent(indent).append("abstract statement {").appendLineSeparator();
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
-index 8f3e467..6b0eb9a 100644
+index 8f3e4679be0d5821df94253a9f58082aa4f236d4..6b0eb9acf5065cdc67af212f14422fd07ec148c0 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
 @@ -213,7 +213,7 @@ public class IfStatement extends Statement {
@@ -104,7 +92,7 @@ index 8f3e467..6b0eb9a 100644
        }
        buf.append(";").appendLineSeparator();
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
-index 7d2ee43..92588fe 100644
+index 7d2ee435ce1c153b6da410d825d697d9790e35fe..92588febd470b2cf9db2d9f7ff3ae4e240187ca2 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
 @@ -105,7 +105,7 @@ public class SequenceStatement extends Statement {
@@ -117,7 +105,7 @@ index 7d2ee43..92588fe 100644
      }
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
-index f8eec64..2a29309 100644
+index f8eec64ce7edbb2ff9e4d76c7d9e59c42060e57f..2a2930908a9051cea5f590d0a6e66d38689d1753 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
 @@ -118,7 +118,7 @@ public class SwitchStatement extends Statement {
@@ -130,7 +118,7 @@ index f8eec64..2a29309 100644
      }
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
-index b71531f..aaafab9 100644
+index b71531f51d77724ca78e0271290ca592539b23a7..aaafab989518417c429221f40ff8fe392daf6b53 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
 @@ -76,7 +76,7 @@ public class SynchronizedStatement extends Statement {
@@ -143,5 +131,5 @@ index b71531f..aaafab9 100644
      }
  
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0095-Version-2.0.patch b/FernFlower-Patches/0095-Version-2.0.patch
index 1b2d119..1315120 100644
--- a/FernFlower-Patches/0095-Version-2.0.patch
+++ b/FernFlower-Patches/0095-Version-2.0.patch
@@ -1,14 +1,11 @@
 From c265002beef65c2264a9a9ed6550e022754f1bc1 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sat, 17 Oct 2015 01:11:19 -0400
-Subject: [PATCH 095/122] Version 2.0
+Subject: Version 2.0
 
----
- build.gradle | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/build.gradle b/build.gradle
-index 4ba85ee..5e14c25 100644
+index 4ba85eec08fc56b667cb9d690a9ef46b8c389c82..5e14c2528a26cc50323d2d408cd16c2506d6b6c1 100644
 --- a/build.gradle
 +++ b/build.gradle
 @@ -3,7 +3,7 @@ apply plugin: 'idea'
@@ -21,5 +18,5 @@ index 4ba85ee..5e14c25 100644
  archivesBaseName = "fernflower"
  
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0096-Fixed-invalid-reference-to-ASM.-Oops.patch b/FernFlower-Patches/0096-Fixed-invalid-reference-to-ASM.-Oops.patch
index a48e25b..0398769 100644
--- a/FernFlower-Patches/0096-Fixed-invalid-reference-to-ASM.-Oops.patch
+++ b/FernFlower-Patches/0096-Fixed-invalid-reference-to-ASM.-Oops.patch
@@ -1,14 +1,11 @@
 From 3b04e422ba4902bbaf7b058fc96326dc5c7d9458 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Mon, 19 Oct 2015 18:50:25 -0700
-Subject: [PATCH 096/122] Fixed invalid reference to ASM.. Oops..
+Subject: Fixed invalid reference to ASM.. Oops..
 
----
- .../java/decompiler/main/rels/NestedClassProcessor.java       | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 1e69d8d..3975d8c 100644
+index 1e69d8d4c01f89a1703a8e40424e8cb3c4ba62d3..3975d8cf93f8a2ce22b57ca3a666f3be77b5dcb4 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 @@ -43,8 +43,6 @@ import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
@@ -30,5 +27,5 @@ index 1e69d8d..3975d8c 100644
      for (StructField fd : node.classStruct.getFields()) {
        if ((fd.getAccessFlags() & STATIC_FINAL_SYNTHETIC) == STATIC_FINAL_SYNTHETIC && "[I".equals(fd.getDescriptor())) {
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0097-Fixed-potential-NPE-in-lvt-propogation.patch b/FernFlower-Patches/0097-Fixed-potential-NPE-in-lvt-propogation.patch
index bbcd255..980eac0 100644
--- a/FernFlower-Patches/0097-Fixed-potential-NPE-in-lvt-propogation.patch
+++ b/FernFlower-Patches/0097-Fixed-potential-NPE-in-lvt-propogation.patch
@@ -1,14 +1,11 @@
 From 13dd6a29fe1620f34613b872263b0a1107409d93 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Mon, 19 Oct 2015 18:51:10 -0700
-Subject: [PATCH 097/122] Fixed potential NPE in lvt propogation.
+Subject: Fixed potential NPE in lvt propogation.
 
----
- .../modules/decompiler/vars/VarDefinitionHelper.java         | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 0427e3b..aee11f6 100644
+index 0427e3b329d4599d42ef5f8ac35fd84581c5f8c6..aee11f60aab5e1f790a607e78675ba23f774fb47 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -434,7 +434,10 @@ public class VarDefinitionHelper {
@@ -24,5 +21,5 @@ index 0427e3b..aee11f6 100644
      }
  
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0098-Fixed-nested-inner-generic-type-printing.patch b/FernFlower-Patches/0098-Fixed-nested-inner-generic-type-printing.patch
index 4e90412..90dd617 100644
--- a/FernFlower-Patches/0098-Fixed-nested-inner-generic-type-printing.patch
+++ b/FernFlower-Patches/0098-Fixed-nested-inner-generic-type-printing.patch
@@ -1,14 +1,11 @@
 From 0d3f25d13d15a0204cf57f7cbc6e4c96f3b232d7 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Mon, 19 Oct 2015 18:51:39 -0700
-Subject: [PATCH 098/122] Fixed nested inner generic type printing.
+Subject: Fixed nested inner generic type printing.
 
----
- .../java/decompiler/struct/gen/generics/GenericType.java        | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-index 9ad5a1f..9b111e5 100644
+index 9ad5a1fe83d6f2e43f257bad5982e1b524e9d3af..9b111e572b474328818f044002d50dc22e946c5c 100644
 --- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
 +++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
 @@ -280,7 +280,7 @@ public class GenericType extends VarType {
@@ -21,5 +18,5 @@ index 9ad5a1f..9b111e5 100644
      else {
        clsName = DecompilerContext.getImportCollector().getShortName(parent.value.replace('/', '.')) + "." + value.substring(value.lastIndexOf('.') + 1);
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0099-Fixed-JUint-tests.patch b/FernFlower-Patches/0099-Fixed-JUint-tests.patch
index 9b7d283..7191703 100644
--- a/FernFlower-Patches/0099-Fixed-JUint-tests.patch
+++ b/FernFlower-Patches/0099-Fixed-JUint-tests.patch
@@ -1,21 +1,16 @@
 From 956c3db1c65161901df7a9872005857aa2b8f544 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Mon, 19 Oct 2015 18:54:52 -0700
-Subject: [PATCH 099/122] Fixed JUint tests. AmbiguousCallWithDebugInfo: Was
- broken, our LVT changes fixed it Constants: cpw's type forcing changed output
- ExtendsList: Added (T) typecast, tho not explicitly needed will address
- later. InnerSignature: Original test had invalid arguments.
+Subject: =?UTF-8?q?Fixed=20JUint=20tests.=0AAmbiguousCallWithDebugInfo:=20?=
+ =?UTF-8?q?Was=20broken,=20our=20LVT=20changes=20fixed=20it=0AConstants:?=
+ =?UTF-8?q?=20cpw's=20type=20forcing=20changed=20output=0AExtendsList:=20A?=
+ =?UTF-8?q?dded=20(T)=20typecast,=20tho=20not=20explicitly=20needed=20will?=
+ =?UTF-8?q?=20address=20later.=0AInnerSignature:=20Original=20test=20had?=
+ =?UTF-8?q?=20invalid=20arguments.?=
 
----
- test/org/jetbrains/java/decompiler/LVTTest.java     |  8 +++++++-
- testData/results/TestAmbiguousCallWithDebugInfo.dec |  4 ++--
- testData/results/TestConstants.dec                  | 12 ++++++------
- testData/results/TestExtendsList.dec                |  4 ++--
- testData/results/TestInnerSignature.dec             |  2 +-
- 5 files changed, 18 insertions(+), 12 deletions(-)
 
 diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
-index fea37bc..368407e 100644
+index fea37bceb36c964966c7772c8911f9aa63ae119e..368407ef017b524f7e26940606e7b50714c7d96a 100644
 --- a/test/org/jetbrains/java/decompiler/LVTTest.java
 +++ b/test/org/jetbrains/java/decompiler/LVTTest.java
 @@ -26,7 +26,13 @@ public class LVTTest extends SingleClassesTestBase {
@@ -34,7 +29,7 @@ index fea37bc..368407e 100644
    }
  
 diff --git a/testData/results/TestAmbiguousCallWithDebugInfo.dec b/testData/results/TestAmbiguousCallWithDebugInfo.dec
-index 40f1eaf..3825b08 100644
+index 40f1eaf68c9b0ca7a1a9744b157827ca89684478..3825b0816ba5140dfcebde9f37b70e28c20b83eb 100644
 --- a/testData/results/TestAmbiguousCallWithDebugInfo.dec
 +++ b/testData/results/TestAmbiguousCallWithDebugInfo.dec
 @@ -11,8 +11,8 @@ class TestAmbiguousCall {
@@ -49,7 +44,7 @@ index 40f1eaf..3825b08 100644
     }// 15
  }
 diff --git a/testData/results/TestConstants.dec b/testData/results/TestConstants.dec
-index 28df2c2..1170f1a 100644
+index 28df2c294ca1c0818ffad43052919c61c262c16a..1170f1a5876121e55bc5c58a2d10afeac8d1527f 100644
 --- a/testData/results/TestConstants.dec
 +++ b/testData/results/TestConstants.dec
 @@ -16,14 +16,14 @@ public class TestConstants {
@@ -74,7 +69,7 @@ index 28df2c2..1170f1a 100644
     static final double DMax = 1.7976931348623157E308D;
  
 diff --git a/testData/results/TestExtendsList.dec b/testData/results/TestExtendsList.dec
-index 6f116db..3f3dbea 100644
+index 6f116dbad41c3ce71fd5c79ee639ddbff3f1b39f..3f3dbea1836b9acaa8626c029bfe40dc0ee3c751 100644
 --- a/testData/results/TestExtendsList.dec
 +++ b/testData/results/TestExtendsList.dec
 @@ -2,11 +2,11 @@ package pkg;
@@ -92,7 +87,7 @@ index 6f116db..3f3dbea 100644
  }
  
 diff --git a/testData/results/TestInnerSignature.dec b/testData/results/TestInnerSignature.dec
-index 406e1f4..9acbef8 100644
+index 406e1f41d8f0a084a986f683bf7ecb3b44c37429..9acbef8495cbdb99cccee5d1e766eb153c39331c 100644
 --- a/testData/results/TestInnerSignature.dec
 +++ b/testData/results/TestInnerSignature.dec
 @@ -14,7 +14,7 @@ public class TestInnerSignature<A, B, C> {
@@ -105,5 +100,5 @@ index 406e1f4..9acbef8 100644
           this.b = var3;// 35
           this.c = var4;// 36
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0100-Fixed-var-merging-not-propogating-type-data-to-var-d.patch b/FernFlower-Patches/0100-Fixed-var-merging-not-propogating-type-data-to-var-d.patch
index a39299f..90467d0 100644
--- a/FernFlower-Patches/0100-Fixed-var-merging-not-propogating-type-data-to-var-d.patch
+++ b/FernFlower-Patches/0100-Fixed-var-merging-not-propogating-type-data-to-var-d.patch
@@ -1,15 +1,11 @@
 From 5b4bbacf01e3d69d86e0227a2ee17c7235f6396a Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Tue, 20 Oct 2015 04:04:12 -0700
-Subject: [PATCH 100/122] Fixed var merging not propogating type data to var
- definitions.
+Subject: Fixed var merging not propogating type data to var definitions.
 
----
- .../decompiler/vars/VarDefinitionHelper.java     | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index aee11f6..520b951 100644
+index aee11f60aab5e1f790a607e78675ba23f774fb47..520b951dd96e4cc70a1800af58aa7a9b43ac1d9f 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -757,6 +757,18 @@ public class VarDefinitionHelper {
@@ -51,5 +47,5 @@ index aee11f6..520b951 100644
  }
 \ No newline at end of file
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0101-Snapshots-because-we-might-be-doing-a-bit-more-work-.patch b/FernFlower-Patches/0101-Snapshots-because-we-might-be-doing-a-bit-more-work-.patch
index da3c454..812130e 100644
--- a/FernFlower-Patches/0101-Snapshots-because-we-might-be-doing-a-bit-more-work-.patch
+++ b/FernFlower-Patches/0101-Snapshots-because-we-might-be-doing-a-bit-more-work-.patch
@@ -1,15 +1,11 @@
 From 15a7d35628a5db31cbdf2f0ac8fc3b0686107d23 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Tue, 20 Oct 2015 19:20:44 -0400
-Subject: [PATCH 101/122] Snapshots because we might be doing a bit more work
- yet
+Subject: Snapshots because we might be doing a bit more work yet
 
----
- build.gradle | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/build.gradle b/build.gradle
-index 5e14c25..bc211f2 100644
+index 5e14c2528a26cc50323d2d408cd16c2506d6b6c1..bc211f2219fbcef72a0acca7b79f5c41fcf0affa 100644
 --- a/build.gradle
 +++ b/build.gradle
 @@ -3,7 +3,7 @@ apply plugin: 'idea'
@@ -22,5 +18,5 @@ index 5e14c25..bc211f2 100644
  archivesBaseName = "fernflower"
  
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0102-Sort-some-blocks-that-are-itterated-in-hash-sets-in-.patch b/FernFlower-Patches/0102-Sort-some-blocks-that-are-itterated-in-hash-sets-in-.patch
index 64c25a3..25e2197 100644
--- a/FernFlower-Patches/0102-Sort-some-blocks-that-are-itterated-in-hash-sets-in-.patch
+++ b/FernFlower-Patches/0102-Sort-some-blocks-that-are-itterated-in-hash-sets-in-.patch
@@ -1,15 +1,12 @@
 From 68d13c5f3063b87c73c892f53f2adef199dba16d Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Tue, 20 Oct 2015 16:37:32 -0700
-Subject: [PATCH 102/122] Sort some blocks that are itterated in hash sets in
- Finally Processor. SHOULD stabelize SOME of the finally's in decompiles.
+Subject: Sort some blocks that are itterated in hash sets in Finally
+ Processor. SHOULD stabelize SOME of the finally's in decompiles.
 
----
- .../modules/decompiler/FinallyProcessor.java  | 19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
-index 9f1c11b..ee8d4ce 100644
+index 9f1c11b318b128a3bf8dc17e3a6d343ef07800d7..ee8d4cee6cbb439907fb9d9c3f7f61a1b068b70f 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
 @@ -579,10 +579,17 @@ public class FinallyProcessor {
@@ -49,5 +46,5 @@ index 9f1c11b..ee8d4ce 100644
  
        if (entry.getValue()) {
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0103-Fixed-switch-cases-leaking-variables-incorrectly.patch b/FernFlower-Patches/0103-Fixed-switch-cases-leaking-variables-incorrectly.patch
index d1b4b3b..9ee8d14 100644
--- a/FernFlower-Patches/0103-Fixed-switch-cases-leaking-variables-incorrectly.patch
+++ b/FernFlower-Patches/0103-Fixed-switch-cases-leaking-variables-incorrectly.patch
@@ -1,14 +1,11 @@
 From cf2bb43998a31ffa206193b9f0661df00bfbb6c0 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 22 Oct 2015 16:14:59 -0700
-Subject: [PATCH 103/122] Fixed switch cases leaking variables incorrectly.
+Subject: Fixed switch cases leaking variables incorrectly.
 
----
- .../modules/decompiler/vars/VarDefinitionHelper.java           | 3 +++
- 1 file changed, 3 insertions(+)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 520b951..726edd7 100644
+index 520b951dd96e4cc70a1800af58aa7a9b43ac1d9f..726edd7aeab41647414952e0a0a6c8cb52674816 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -648,6 +648,9 @@ public class VarDefinitionHelper {
@@ -22,5 +19,5 @@ index 520b951..726edd7 100644
              else if (stat.type == Statement.TYPE_TRYCATCH ||
                       stat.type == Statement.TYPE_CATCHALL) {
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0104-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch b/FernFlower-Patches/0104-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch
index 1a2931d..76921eb 100644
--- a/FernFlower-Patches/0104-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch
+++ b/FernFlower-Patches/0104-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch
@@ -1,17 +1,12 @@
 From 2f1f8ef45192a1b474884cfc814d05448284b241 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 22 Oct 2015 16:15:46 -0700
-Subject: [PATCH 104/122] More move from HashSet to LinkedHashSet to stabelize
- itteration. Fixed a try finally merge issue.
+Subject: More move from HashSet to LinkedHashSet to stabelize itteration.
+ Fixed a try finally merge issue.
 
----
- .../modules/decompiler/DomHelper.java         | 23 +++++++++----------
- .../modules/decompiler/LabelHelper.java       |  6 ++---
- .../FastExtendedPostdominanceHelper.java      | 22 ++++++++++--------
- 3 files changed, 26 insertions(+), 25 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
-index 67d16d5..c45f5e0 100644
+index 67d16d5c139033d4774acc22c54b8866594c3ec5..c45f5e06dba0607232dd1fac4c089a22ceeede7b 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
 @@ -213,12 +213,12 @@ public class DomHelper {
@@ -112,7 +107,7 @@ index 67d16d5..c45f5e0 100644
  
      if ((res = DoStatement.isHead(head)) != null) {
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
-index 26cc638..9bf2935 100644
+index 26cc638aacb1ae120a4f0000bf224eb01cefe1f1..9bf29358c5c3c36c1fa69198ad17587a21d66823 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
 @@ -33,7 +33,7 @@ public class LabelHelper {
@@ -143,7 +138,7 @@ index 26cc638..9bf2935 100644
      }
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
-index 52338f9..eee7b15 100644
+index 52338f909228f21a19a2a6e31cc734bdbcd024ff..eee7b15dc347c9582f49f13c41106f76ff14b064 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
 @@ -36,7 +36,7 @@ public class FastExtendedPostdominanceHelper {
@@ -203,5 +198,5 @@ index 52338f9..eee7b15 100644
          }
        }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0105-Bulk-test-for-MC.patch b/FernFlower-Patches/0105-Bulk-test-for-MC.patch
index 5f38453..aee7660 100644
--- a/FernFlower-Patches/0105-Bulk-test-for-MC.patch
+++ b/FernFlower-Patches/0105-Bulk-test-for-MC.patch
@@ -1,15 +1,11 @@
 From 50776ac962055d7228176238fc1b04a8a33736a7 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 25 Oct 2015 10:29:37 -0400
-Subject: [PATCH 105/122] Bulk test for MC
+Subject: Bulk test for MC
 
----
- .../decompiler/DecompilerTestFixture.java     |  16 ++-
- .../MinecraftDecompilationTest.java           | 127 ++++++++++++++----
- 2 files changed, 109 insertions(+), 34 deletions(-)
 
 diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
-index f2c344a..77eda87 100644
+index f2c344a925dda9d1081aa867987147fd3fb3664e..77eda8797ac72262d0c6dabbbd06a0ed0f481596 100644
 --- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
 +++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
 @@ -46,23 +46,26 @@ public class DecompilerTestFixture {
@@ -53,7 +49,7 @@ index f2c344a..77eda87 100644
    }
  }
 diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
-index 087c810..660d031 100644
+index 087c8102c11b1258d8e3f1615fe64f745b8587d6..660d0313e68f87b72b694b886ab321792fb5a8bc 100644
 --- a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
 +++ b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
 @@ -20,43 +20,54 @@ import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
@@ -252,5 +248,5 @@ index 087c810..660d031 100644
    }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0106-Add-a-parameter-renamer.patch b/FernFlower-Patches/0106-Add-a-parameter-renamer.patch
index 1a83eea..fdcab58 100644
--- a/FernFlower-Patches/0106-Add-a-parameter-renamer.patch
+++ b/FernFlower-Patches/0106-Add-a-parameter-renamer.patch
@@ -1,16 +1,11 @@
 From 879a4330a3b7e46d9b72a3418e1980138af6f53f Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 25 Oct 2015 14:08:24 -0400
-Subject: [PATCH 106/122] Add a parameter renamer
+Subject: Add a parameter renamer
 
----
- .../jetbrains/java/decompiler/main/ClassWriter.java  | 12 +++++++++++-
- .../main/extern/IAbstractParameterRenamer.java       |  7 +++++++
- 2 files changed, 18 insertions(+), 1 deletion(-)
- create mode 100644 src/org/jetbrains/java/decompiler/main/extern/IAbstractParameterRenamer.java
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index 7c8276c..808c5e1 100644
+index 7c8276c8dd60eac7022378d4b0700d272a333705..808c5e1bb2c32a5f85eaac548040522697e60fc8 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 @@ -18,6 +18,7 @@ package org.jetbrains.java.decompiler.main;
@@ -48,7 +43,7 @@ index 7c8276c..808c5e1 100644
      for (Map.Entry<Integer, Integer> entry : tracer.getMapping().entrySet()) {
 diff --git a/src/org/jetbrains/java/decompiler/main/extern/IAbstractParameterRenamer.java b/src/org/jetbrains/java/decompiler/main/extern/IAbstractParameterRenamer.java
 new file mode 100644
-index 0000000..4c509eb
+index 0000000000000000000000000000000000000000..4c509eb6633f575b4f7cc93ad781885e8581be70
 --- /dev/null
 +++ b/src/org/jetbrains/java/decompiler/main/extern/IAbstractParameterRenamer.java
 @@ -0,0 +1,7 @@
@@ -60,5 +55,5 @@ index 0000000..4c509eb
 +  public String renameParameter(String orig, int index, MethodWrapper wrapper, int flags);
 +}
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0107-Bulk-decompilation-test-for-all-to-use.patch b/FernFlower-Patches/0107-Bulk-decompilation-test-for-all-to-use.patch
index da24ef0..418abbd 100644
--- a/FernFlower-Patches/0107-Bulk-decompilation-test-for-all-to-use.patch
+++ b/FernFlower-Patches/0107-Bulk-decompilation-test-for-all-to-use.patch
@@ -1,15 +1,11 @@
 From da700502cecd6e05622a5f61112f9c9ea0a7dc23 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 25 Oct 2015 14:08:33 -0400
-Subject: [PATCH 107/122] Bulk decompilation test for all to use
+Subject: Bulk decompilation test for all to use
 
----
- build.gradle                                  |  42 +++++
- .../MinecraftDecompilationTest.java           | 154 +++++++++++-------
- 2 files changed, 141 insertions(+), 55 deletions(-)
 
 diff --git a/build.gradle b/build.gradle
-index bc211f2..cf3d8ec 100644
+index bc211f2219fbcef72a0acca7b79f5c41fcf0affa..cf3d8ec6b2fe4260b788b46643e8a397e5d63e18 100644
 --- a/build.gradle
 +++ b/build.gradle
 @@ -17,6 +17,11 @@ sourceSets {
@@ -73,7 +69,7 @@ index bc211f2..cf3d8ec 100644
  compileJava.options.deprecation = true
  
 diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
-index 660d031..0d68e88 100644
+index 660d0313e68f87b72b694b886ab321792fb5a8bc..0d68e8886c6f6584c4514e9b95f320fb05b9e941 100644
 --- a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
 +++ b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
 @@ -16,8 +16,12 @@
@@ -313,5 +309,5 @@ index 660d031..0d68e88 100644
    }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0108-Fix-NPE.patch b/FernFlower-Patches/0108-Fix-NPE.patch
index 0487fd0..fa98100 100644
--- a/FernFlower-Patches/0108-Fix-NPE.patch
+++ b/FernFlower-Patches/0108-Fix-NPE.patch
@@ -1,14 +1,11 @@
 From 72d20673f0ae872335858e728ff81532049422f0 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 25 Oct 2015 14:26:33 -0400
-Subject: [PATCH 108/122] Fix NPE
+Subject: Fix NPE
 
----
- .../jetbrains/java/decompiler/MinecraftDecompilationTest.java   | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
-index 0d68e88..2ae6da5 100644
+index 0d68e8886c6f6584c4514e9b95f320fb05b9e941..2ae6da55e0d8ecb2fbdb39a6e42d1f179ac32203 100644
 --- a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
 +++ b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
 @@ -177,7 +177,7 @@ public class MinecraftDecompilationTest {
@@ -21,5 +18,5 @@ index 0d68e88..2ae6da5 100644
          } else if (!md5digest.equals(md5s.get(fname))) {
            System.out.println("Existing Variant: " + fname);
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0109-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch b/FernFlower-Patches/0109-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch
index 2b17d1f..8fc8975 100644
--- a/FernFlower-Patches/0109-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch
+++ b/FernFlower-Patches/0109-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch
@@ -1,20 +1,12 @@
 From 01e351e13f31deaa74035ceeda111ace834849a8 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Wed, 28 Oct 2015 23:45:40 -0700
-Subject: [PATCH 109/122] Stabelize a few areas on Java 8. Notibly the exit
- mapper. Fixes the decompile differences between J6/7 and J8.
+Subject: Stabelize a few areas on Java 8. Notibly the exit mapper. Fixes the
+ decompile differences between J6/7 and J8.
 
----
- .../decompiler/main/rels/MethodProcessorRunnable.java  |  6 ++++--
- .../java/decompiler/modules/decompiler/DomHelper.java  |  4 ++--
- .../decompose/DominatorTreeExceptionFilter.java        |  6 +++---
- .../decompose/FastExtendedPostdominanceHelper.java     |  6 +++---
- .../modules/decompiler/stats/GeneralStatement.java     |  3 ++-
- .../modules/decompiler/stats/SwitchStatement.java      | 10 +++++++++-
- 6 files changed, 23 insertions(+), 12 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index 16d7788..9bcd3ba 100644
+index 16d778867677249c16b38fcfbca16618b1fa4ac0..9bcd3ba461d73cb139bca4fc0756130d0e20a6de 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 @@ -253,8 +253,10 @@ public class MethodProcessorRunnable implements Runnable {
@@ -39,7 +31,7 @@ index 16d7788..9bcd3ba 100644
          System.out.print(" t:"+((DoStatement)statement).getLooptype());
      } else if (statement.type == Statement.TYPE_BASICBLOCK) {
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
-index c45f5e0..e780bd6 100644
+index c45f5e06dba0607232dd1fac4c089a22ceeede7b..e780bd6642f5ebca0af8971bb209630e44bb3b0a 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
 @@ -483,11 +483,11 @@ public class DomHelper {
@@ -57,7 +49,7 @@ index c45f5e0..e780bd6 100644
          while (true) {
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
-index 89e6849..1c3a8e1 100644
+index 89e684930084f603339ce2cb067ec9719532110c..1c3a8e13df680240d0a6638115bf9a7f6982b5c9 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
 @@ -27,10 +27,10 @@ public class DominatorTreeExceptionFilter {
@@ -83,7 +75,7 @@ index 89e6849..1c3a8e1 100644
        set.add(key);
      }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
-index eee7b15..349f522 100644
+index eee7b15dc347c9582f49f13c41106f76ff14b064..349f522b2fe170c57b55d4812cbc56086f6a1502 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
 @@ -28,9 +28,9 @@ public class FastExtendedPostdominanceHelper {
@@ -108,7 +100,7 @@ index eee7b15..349f522 100644
        set.add(st.id);
      }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
-index 499894a..f7e0080 100644
+index 499894a572629a0e14aba0ebfae4929d6e0eec18..f7e00804a046ad4992f918396b9ca53c6872b01c 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
 @@ -20,6 +20,7 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
@@ -129,7 +121,7 @@ index 499894a..f7e0080 100644
  
      for (Statement st : set) {
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
-index 2a29309..af522d9 100644
+index 2a2930908a9051cea5f590d0a6e66d38689d1753..af522d97a6198ba50a5eae7b69232d9e4ac5eec6 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
 @@ -80,7 +80,15 @@ public class SwitchStatement extends Statement {
@@ -150,5 +142,5 @@ index 2a29309..af522d9 100644
      }
    }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0110-Gather-all-variable-declarations-including-those-wit.patch b/FernFlower-Patches/0110-Gather-all-variable-declarations-including-those-wit.patch
index 6eed6e6..f7ac846 100644
--- a/FernFlower-Patches/0110-Gather-all-variable-declarations-including-those-wit.patch
+++ b/FernFlower-Patches/0110-Gather-all-variable-declarations-including-those-wit.patch
@@ -1,15 +1,11 @@
 From 360216c53673ce9f6aa83fd697123edd9637badb Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 5 Nov 2015 20:36:11 -0800
-Subject: [PATCH 110/122] Gather all variable declarations including those
- without LVTs
+Subject: Gather all variable declarations including those without LVTs
 
----
- .../decompiler/vars/VarDefinitionHelper.java  | 56 +++++++++++++------
- 1 file changed, 39 insertions(+), 17 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 726edd7..164ddb5 100644
+index 726edd7aeab41647414952e0a0a6c8cb52674816..164ddb5639ed92ae8bcab25a62713211d2e904fe 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -18,6 +18,7 @@ package org.jetbrains.java.decompiler.modules.decompiler.vars;
@@ -131,5 +127,5 @@ index 726edd7..164ddb5 100644
    private void applyTypes(Statement stat, Map<VarVersionPair, LVTVariable> types) {
      if (stat == null || types.size() == 0) {
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0111-Renaming-thinger.patch b/FernFlower-Patches/0111-Renaming-thinger.patch
index ee04c70..3dbf236 100644
--- a/FernFlower-Patches/0111-Renaming-thinger.patch
+++ b/FernFlower-Patches/0111-Renaming-thinger.patch
@@ -1,31 +1,11 @@
 From f02eb602c3f8d68e5842cc9dd65718aa9ab425cf Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Fri, 6 Nov 2015 01:36:47 -0500
-Subject: [PATCH 111/122] Renaming thinger
+Subject: Renaming thinger
 
----
- .../java/decompiler/main/ClassWriter.java     |  10 +-
- .../decompiler/main/DecompilerContext.java    |  19 ++
- .../java/decompiler/main/Fernflower.java      |   1 +
- .../main/IdentityRenamerFactory.java          |  28 +++
- .../main/extern/IVariableNameProvider.java    |  11 +
- .../main/extern/IVariableNamingFactory.java   |   7 +
- .../decompiler/main/rels/MethodWrapper.java   |   2 +
- .../main/rels/NestedClassProcessor.java       |   2 +-
- .../decompiler/vars/VarDefinitionHelper.java  |  48 +++--
- .../java/decompiler/struct/StructMethod.java  |   3 +
- .../java/decompiler/util/JADNameProvider.java | 193 ++++++++++++++++++
- .../decompiler/DecompilerTestFixture.java     |  16 +-
- .../jetbrains/java/decompiler/LVTTest.java    |   1 +
- .../MinecraftDecompilationTest.java           | 173 +++-------------
- 14 files changed, 337 insertions(+), 177 deletions(-)
- create mode 100644 src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java
- create mode 100644 src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java
- create mode 100644 src/org/jetbrains/java/decompiler/main/extern/IVariableNamingFactory.java
- create mode 100644 src/org/jetbrains/java/decompiler/util/JADNameProvider.java
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index 808c5e1..c515d2e 100644
+index 808c5e1bb2c32a5f85eaac548040522697e60fc8..c515d2e60e0917d2588a359c1d52a5345e8747ca 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 @@ -732,7 +732,7 @@ public class ClassWriter {
@@ -53,7 +33,7 @@ index 808c5e1..c515d2e 100644
      HashMap<Integer, Set<Integer>> lineStartOffsets = new HashMap<Integer, Set<Integer>>();
      for (Map.Entry<Integer, Integer> entry : tracer.getMapping().entrySet()) {
 diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-index 15c6e40..8d4d403 100644
+index 15c6e406640315e5fbe82d48006b1a15f97020c8..8d4d403773a861191083e2b2f6e469ec9ace45f2 100644
 --- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
 +++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
 @@ -21,8 +21,10 @@ import org.jetbrains.java.decompiler.main.collectors.ImportCollector;
@@ -113,7 +93,7 @@ index 15c6e40..8d4d403 100644
      if (logger != null) {
        String level = (String)getProperty(IFernflowerPreferences.LOG_LEVEL);
 diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-index 6afe975..91e70d3 100644
+index 6afe975fe2034ad25b7810a0bdc59ebcff8453e1..91e70d3132095281338593d2166eedbcbd09e5d6 100644
 --- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
 +++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
 @@ -27,6 +27,7 @@ import org.jetbrains.java.decompiler.struct.IDecompiledData;
@@ -126,7 +106,7 @@ index 6afe975..91e70d3 100644
  import java.util.HashSet;
 diff --git a/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java b/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java
 new file mode 100644
-index 0000000..bc29407
+index 0000000000000000000000000000000000000000..bc29407ea2503b16a1eff3b49a6579189eccd14f
 --- /dev/null
 +++ b/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java
 @@ -0,0 +1,28 @@
@@ -160,7 +140,7 @@ index 0000000..bc29407
 +}
 diff --git a/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java b/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java
 new file mode 100644
-index 0000000..9d6b1a5
+index 0000000000000000000000000000000000000000..9d6b1a5cdff732d251e078750b2a26243f93463e
 --- /dev/null
 +++ b/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java
 @@ -0,0 +1,11 @@
@@ -177,7 +157,7 @@ index 0000000..9d6b1a5
 +}
 diff --git a/src/org/jetbrains/java/decompiler/main/extern/IVariableNamingFactory.java b/src/org/jetbrains/java/decompiler/main/extern/IVariableNamingFactory.java
 new file mode 100644
-index 0000000..2f6c3ec
+index 0000000000000000000000000000000000000000..2f6c3ec033f37a1ff88c1fb0ab75413144867ddc
 --- /dev/null
 +++ b/src/org/jetbrains/java/decompiler/main/extern/IVariableNamingFactory.java
 @@ -0,0 +1,7 @@
@@ -189,7 +169,7 @@ index 0000000..2f6c3ec
 +  public IVariableNameProvider createFactory(StructMethod structMethod);
 +}
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
-index 0f44e42..c277392 100644
+index 0f44e42c44c68b178fced0d0c362fe6a027b5a8a..c277392bd6bace5efee52426204b6eeb61e35964 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
 @@ -15,7 +15,9 @@
@@ -203,7 +183,7 @@ index 0f44e42..c277392 100644
  import org.jetbrains.java.decompiler.modules.decompiler.sforms.FlattenStatementsHelper;
  import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 3975d8c..07ac606 100644
+index 3975d8cf93f8a2ce22b57ca3a666f3be77b5dcb4..07ac606e43cdb7d21467d72ce32fb89e9d09a61f 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 @@ -577,7 +577,7 @@ public class NestedClassProcessor {
@@ -216,7 +196,7 @@ index 3975d8c..07ac606 100644
          HashMap<VarVersionPair, String> mapNewNames = new HashMap<VarVersionPair, String>();
          // local var types
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 164ddb5..59b1c42 100644
+index 164ddb5639ed92ae8bcab25a62713211d2e904fe..59b1c42717441f6bce853aa4ce9d710c15d723b6 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -18,6 +18,7 @@ package org.jetbrains.java.decompiler.modules.decompiler.vars;
@@ -312,7 +292,7 @@ index 164ddb5..59b1c42 100644
    }
  
 diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-index 8f0da2b..7e7f758 100644
+index 8f0da2b8eeed9428133834dbf4bd8be3f6e38ee5..7e7f7580f5301ea94b4bf97440a471caa3f62c50 100644
 --- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
 +++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
 @@ -18,6 +18,7 @@ package org.jetbrains.java.decompiler.struct;
@@ -341,7 +321,7 @@ index 8f0da2b..7e7f758 100644
    @Override
 diff --git a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
 new file mode 100644
-index 0000000..010ef5f
+index 0000000000000000000000000000000000000000..010ef5fdc0137798ca8a7097222cbc67ba5101ec
 --- /dev/null
 +++ b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
 @@ -0,0 +1,193 @@
@@ -540,7 +520,7 @@ index 0000000..010ef5f
 +}
 \ No newline at end of file
 diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
-index 77eda87..f2c344a 100644
+index 77eda8797ac72262d0c6dabbbd06a0ed0f481596..f2c344a925dda9d1081aa867987147fd3fb3664e 100644
 --- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
 +++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
 @@ -46,26 +46,23 @@ public class DecompilerTestFixture {
@@ -584,7 +564,7 @@ index 77eda87..f2c344a 100644
    }
  }
 diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
-index 368407e..ff2457b 100644
+index 368407ef017b524f7e26940606e7b50714c7d96a..ff2457b4e38f5cec0854d21a15ca4bc5551bbda3 100644
 --- a/test/org/jetbrains/java/decompiler/LVTTest.java
 +++ b/test/org/jetbrains/java/decompiler/LVTTest.java
 @@ -59,4 +59,5 @@ public class LVTTest extends SingleClassesTestBase {
@@ -594,7 +574,7 @@ index 368407e..ff2457b 100644
 +  @Test public void testMCContainerPlayer() { doTest("net/minecraft/inventory/ContainerPlayer"); }
  }
 diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
-index 2ae6da5..087c810 100644
+index 2ae6da55e0d8ecb2fbdb39a6e42d1f179ac32203..087c8102c11b1258d8e3f1615fe64f745b8587d6 100644
 --- a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
 +++ b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
 @@ -16,83 +16,47 @@
@@ -842,5 +822,5 @@ index 2ae6da5..087c810 100644
    }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0112-Fix-up-some-name-issues.-Still-outstanding-propogati.patch b/FernFlower-Patches/0112-Fix-up-some-name-issues.-Still-outstanding-propogati.patch
index 2c31c04..fbaf17f 100644
--- a/FernFlower-Patches/0112-Fix-up-some-name-issues.-Still-outstanding-propogati.patch
+++ b/FernFlower-Patches/0112-Fix-up-some-name-issues.-Still-outstanding-propogati.patch
@@ -1,20 +1,12 @@
 From 59732c39518f9dc24da57d846df7adceaf806dbf Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Fri, 6 Nov 2015 02:30:26 -0500
-Subject: [PATCH 112/122] Fix up some name issues. Still outstanding:
- propogating the parent context into child methods. Current placement in
- insertLocalVars is too late.
+Subject: Fix up some name issues. Still outstanding: propogating the parent
+ context into child methods. Current placement in insertLocalVars is too late.
 
----
- .../jetbrains/java/decompiler/main/ClassesProcessor.java  | 8 ++++++++
- .../java/decompiler/main/rels/NestedClassProcessor.java   | 1 -
- .../decompiler/modules/decompiler/vars/LVTVariable.java   | 4 +++-
- .../jetbrains/java/decompiler/util/JADNameProvider.java   | 3 ++-
- test/org/jetbrains/java/decompiler/LVTTest.java           | 2 +-
- 5 files changed, 14 insertions(+), 4 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index 0060021..b3bd44e 100644
+index 00600213ac4a4a39de72131a9cc6dc22424dc7a0..b3bd44e5c7276d33eecd4cf4287d77864568f927 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 @@ -24,6 +24,7 @@ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
@@ -40,7 +32,7 @@ index 0060021..b3bd44e 100644
      }
    }
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 07ac606..9be9edb 100644
+index 07ac606e43cdb7d21467d72ce32fb89e9d09a61f..9be9edbb36ecd3082cb15f5ff5a6ba8a627f3d89 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 @@ -577,7 +577,6 @@ public class NestedClassProcessor {
@@ -52,7 +44,7 @@ index 07ac606..9be9edb 100644
          HashMap<VarVersionPair, String> mapNewNames = new HashMap<VarVersionPair, String>();
          // local var types
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
-index cb376d9..16f2bfb 100644
+index cb376d9b480f06971c71647037a17a166764e805..16f2bfb5fbc04312c21d10d26441786ac0604657 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
 @@ -88,6 +88,8 @@ public class LVTVariable implements Comparable<LVTVariable> {
@@ -67,7 +59,7 @@ index cb376d9..16f2bfb 100644
  }
 \ No newline at end of file
 diff --git a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
-index 010ef5f..4c0c976 100644
+index 010ef5fdc0137798ca8a7097222cbc67ba5101ec..4c0c9762f5f59e858f49e6bd093df00eff0cdaac 100644
 --- a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
 +++ b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
 @@ -46,6 +46,7 @@ public class JADNameProvider implements IVariableNameProvider {
@@ -88,7 +80,7 @@ index 010ef5f..4c0c976 100644
          if (type.indexOf('.') != -1) {
            type = type.substring(type.lastIndexOf('.')+1);
 diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
-index ff2457b..b4af1f7 100644
+index ff2457b4e38f5cec0854d21a15ca4bc5551bbda3..b4af1f7cfd661fe456121f999a495c89dffb1d0f 100644
 --- a/test/org/jetbrains/java/decompiler/LVTTest.java
 +++ b/test/org/jetbrains/java/decompiler/LVTTest.java
 @@ -59,5 +59,5 @@ public class LVTTest extends SingleClassesTestBase {
@@ -99,5 +91,5 @@ index ff2457b..b4af1f7 100644
 +  @Test public void testMCContainerPlayer() { doTest("net/minecraft/command/PlayerSelector"); }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0113-Propogate-renamer-state-to-nested-classes.patch b/FernFlower-Patches/0113-Propogate-renamer-state-to-nested-classes.patch
index 44b0420..0092af5 100644
--- a/FernFlower-Patches/0113-Propogate-renamer-state-to-nested-classes.patch
+++ b/FernFlower-Patches/0113-Propogate-renamer-state-to-nested-classes.patch
@@ -1,18 +1,11 @@
 From 2ab59c1d7153f83d74f4e82db8174429f9eb80ea Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Fri, 6 Nov 2015 03:13:00 -0800
-Subject: [PATCH 113/122] Propogate renamer state to nested classes.
+Subject: Propogate renamer state to nested classes.
 
----
- .../decompiler/main/ClassesProcessor.java     |  7 ---
- .../decompiler/vars/VarDefinitionHelper.java  | 43 ++++++++++++++++---
- .../java/decompiler/util/JADNameProvider.java | 14 +++---
- .../decompiler/util/StatementIterator.java    | 43 +++++++++++++++++++
- 4 files changed, 88 insertions(+), 19 deletions(-)
- create mode 100644 src/org/jetbrains/java/decompiler/util/StatementIterator.java
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index b3bd44e..f22baa0 100644
+index b3bd44e5c7276d33eecd4cf4287d77864568f927..f22baa00bfcb99aa8e05ee323fdecacdf8cf177a 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 @@ -335,13 +335,6 @@ public class ClassesProcessor {
@@ -30,7 +23,7 @@ index b3bd44e..f22baa0 100644
      }
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 59b1c42..de4dbdc 100644
+index 59b1c42717441f6bce853aa4ce9d710c15d723b6..de4dbdc7b84cc6bcb95faa3ba05e6e2290922cf5 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -16,14 +16,16 @@
@@ -113,7 +106,7 @@ index 59b1c42..de4dbdc 100644
  
      for (Entry<VarVersionPair, VarInfo> e : types.entrySet()) {
 diff --git a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
-index 4c0c976..f2d2e3b 100644
+index 4c0c9762f5f59e858f49e6bd093df00eff0cdaac..f2d2e3baf14f3004b1d377b9cb7a882741885d23 100644
 --- a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
 +++ b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
 @@ -25,13 +25,13 @@ public class JADNameProvider implements IVariableNameProvider {
@@ -139,7 +132,7 @@ index 4c0c976..f2d2e3b 100644
        last.put("Class",   new Holder(0, true,  "oclass"  ));
 diff --git a/src/org/jetbrains/java/decompiler/util/StatementIterator.java b/src/org/jetbrains/java/decompiler/util/StatementIterator.java
 new file mode 100644
-index 0000000..4e4c8b4
+index 0000000000000000000000000000000000000000..4e4c8b475a4fdf4d6452ebe57621fc36bc2a2e38
 --- /dev/null
 +++ b/src/org/jetbrains/java/decompiler/util/StatementIterator.java
 @@ -0,0 +1,43 @@
@@ -187,5 +180,5 @@ index 0000000..4e4c8b4
 +  }
 +}
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0114-Properly-implement-options-for-the-renamer-stuff.patch b/FernFlower-Patches/0114-Properly-implement-options-for-the-renamer-stuff.patch
index 6d8baad..43b4fab 100644
--- a/FernFlower-Patches/0114-Properly-implement-options-for-the-renamer-stuff.patch
+++ b/FernFlower-Patches/0114-Properly-implement-options-for-the-renamer-stuff.patch
@@ -1,22 +1,17 @@
 From da7239d27dd36ed264fad47e1051f0f82c9c17b0 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Fri, 6 Nov 2015 15:16:23 -0500
-Subject: [PATCH 114/122] Properly implement options for the renamer stuff.
- "JVN" argument enables JAD style variable naming (int i, j, k etc). Can pass
- a "RENAMER_FACTORY" to the decompiler context: this is the name of a class
- implementing IVariableNamingFactory, that will be loaded and instantiated,
- overriding other options.
+Subject: =?UTF-8?q?Properly=20implement=20options=20for=20the=20renamer=20?=
+ =?UTF-8?q?stuff.=0A"JVN"=20argument=20enables=20JAD=20style=20variable=20?=
+ =?UTF-8?q?naming=20(int=20i,=20j,=20k=20etc).=0ACan=20pass=20a=20"RENAMER?=
+ =?UTF-8?q?=5FFACTORY"=20to=20the=20decompiler=20context:=20this=20is=20th?=
+ =?UTF-8?q?e=20name=20of=20a=20class=20implementing=20IVariableNamingFacto?=
+ =?UTF-8?q?ry,=20that=20will=20be=20loaded=20and=20instantiated,=20overrid?=
+ =?UTF-8?q?ing=0Aother=20options.?=
 
----
- src/org/jetbrains/java/decompiler/main/ClassWriter.java   | 1 -
- .../jetbrains/java/decompiler/main/DecompilerContext.java | 8 ++++++--
- .../decompiler/main/extern/IAbstractParameterRenamer.java | 7 -------
- .../decompiler/main/extern/IFernflowerPreferences.java    | 3 +++
- 4 files changed, 9 insertions(+), 10 deletions(-)
- delete mode 100644 src/org/jetbrains/java/decompiler/main/extern/IAbstractParameterRenamer.java
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index c515d2e..1338a42 100644
+index c515d2e60e0917d2588a359c1d52a5345e8747ca..1338a42a36f02f479a7efbb280f2826a2948bb03 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 @@ -18,7 +18,6 @@ package org.jetbrains.java.decompiler.main;
@@ -28,7 +23,7 @@ index c515d2e..1338a42 100644
  import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
  import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
 diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-index 8d4d403..d66145a 100644
+index 8d4d403773a861191083e2b2f6e469ec9ace45f2..d66145aef50938051b6a21f5d089b40cf9e8ef9f 100644
 --- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
 +++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
 @@ -68,11 +68,15 @@ public class DecompilerContext {
@@ -51,7 +46,7 @@ index 8d4d403..d66145a 100644
  
 diff --git a/src/org/jetbrains/java/decompiler/main/extern/IAbstractParameterRenamer.java b/src/org/jetbrains/java/decompiler/main/extern/IAbstractParameterRenamer.java
 deleted file mode 100644
-index 4c509eb..0000000
+index 4c509eb6633f575b4f7cc93ad781885e8581be70..0000000000000000000000000000000000000000
 --- a/src/org/jetbrains/java/decompiler/main/extern/IAbstractParameterRenamer.java
 +++ /dev/null
 @@ -1,7 +0,0 @@
@@ -63,7 +58,7 @@ index 4c509eb..0000000
 -  public String renameParameter(String orig, int index, MethodWrapper wrapper, int flags);
 -}
 diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-index 79dd8e8..7940dcf 100644
+index 79dd8e890cd37e88bfbe9f0c22c825b3c2549bb8..7940dcfbd89ec1427459aeeac1aebaea30db1899 100644
 --- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
 +++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
 @@ -62,6 +62,8 @@ public interface IFernflowerPreferences {
@@ -83,5 +78,5 @@ index 79dd8e8..7940dcf 100644
    }});
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0115-Add-the-index-to-the-param-renamer-needed-for-sane-p.patch b/FernFlower-Patches/0115-Add-the-index-to-the-param-renamer-needed-for-sane-p.patch
index c997fcc..06c5a2b 100644
--- a/FernFlower-Patches/0115-Add-the-index-to-the-param-renamer-needed-for-sane-p.patch
+++ b/FernFlower-Patches/0115-Add-the-index-to-the-param-renamer-needed-for-sane-p.patch
@@ -1,18 +1,12 @@
 From ba604f35f4e1abbba5a893c3eb031fb3c6720ebd Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 8 Nov 2015 13:28:24 -0500
-Subject: [PATCH 115/122] Add the index to the param renamer, needed for sane
- param name generation..
+Subject: Add the index to the param renamer, needed for sane param name
+ generation..
 
----
- src/org/jetbrains/java/decompiler/main/ClassWriter.java         | 2 +-
- .../jetbrains/java/decompiler/main/IdentityRenamerFactory.java  | 2 +-
- .../java/decompiler/main/extern/IVariableNameProvider.java      | 2 +-
- src/org/jetbrains/java/decompiler/util/JADNameProvider.java     | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index 1338a42..25d01e3 100644
+index 1338a42a36f02f479a7efbb280f2826a2948bb03..25d01e38f0c006411e0a6c5c053b16d188b0c9a1 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 @@ -731,7 +731,7 @@ public class ClassWriter {
@@ -25,7 +19,7 @@ index 1338a42..25d01e3 100644
              buffer.append(parameterName == null ? "param" + index : parameterName); // null iff decompiled with errors
  
 diff --git a/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java b/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java
-index bc29407..e8c3340 100644
+index bc29407ea2503b16a1eff3b49a6579189eccd14f..e8c33402d6b7e0c07dbe2aacf73c2f8f500fc8c3 100644
 --- a/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java
 +++ b/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java
 @@ -14,7 +14,7 @@ public class IdentityRenamerFactory implements IVariableNamingFactory, IVariable
@@ -38,7 +32,7 @@ index bc29407..e8c3340 100644
    }
  
 diff --git a/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java b/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java
-index 9d6b1a5..26f1071 100644
+index 9d6b1a5cdff732d251e078750b2a26243f93463e..26f10715a8d594f00480a80e9c94c8b3bf011998 100644
 --- a/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java
 +++ b/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java
 @@ -6,6 +6,6 @@ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
@@ -50,7 +44,7 @@ index 9d6b1a5..26f1071 100644
    public void addParentContext(IVariableNameProvider renamer);
  }
 diff --git a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
-index f2d2e3b..b588cec 100644
+index f2d2e3baf14f3004b1d377b9cb7a882741885d23..b588cec7b138dfffeb1d57a11aeb7e4b41fa5a38 100644
 --- a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
 +++ b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
 @@ -179,7 +179,7 @@ public class JADNameProvider implements IVariableNameProvider {
@@ -63,5 +57,5 @@ index f2d2e3b..b588cec 100644
      }
  
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0116-Early-set-the-logger-so-that-it-can-be-used-during-i.patch b/FernFlower-Patches/0116-Early-set-the-logger-so-that-it-can-be-used-during-i.patch
index 48ed9fd..8831353 100644
--- a/FernFlower-Patches/0116-Early-set-the-logger-so-that-it-can-be-used-during-i.patch
+++ b/FernFlower-Patches/0116-Early-set-the-logger-so-that-it-can-be-used-during-i.patch
@@ -1,16 +1,12 @@
 From 0d79d5adcf27840fcb93094b62bb04601b6eafd0 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 8 Nov 2015 16:12:19 -0500
-Subject: [PATCH 116/122] Early set the logger so that it can be used during
- init context without NPEs.
+Subject: Early set the logger so that it can be used during init context
+ without NPEs.
 
----
- src/org/jetbrains/java/decompiler/main/DecompilerContext.java | 3 ++-
- src/org/jetbrains/java/decompiler/main/Fernflower.java        | 1 +
- 2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-index d66145a..22ab9e0 100644
+index d66145aef50938051b6a21f5d089b40cf9e8ef9f..22ab9e0fd0f4571f360492221a619f9419d8812a 100644
 --- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
 +++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
 @@ -68,7 +68,8 @@ public class DecompilerContext {
@@ -24,7 +20,7 @@ index d66145a..22ab9e0 100644
      }
      if (DecompilerContext.getNamingFactory() == null) {
 diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-index 91e70d3..8319da8 100644
+index 91e70d3132095281338593d2166eedbcbd09e5d6..8319da8a08838b77508269bf44fe2209bcf4a328 100644
 --- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
 +++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
 @@ -41,6 +41,7 @@ public class Fernflower implements IDecompiledData {
@@ -36,5 +32,5 @@ index 91e70d3..8319da8 100644
      DecompilerContext.setCounterContainer(new CounterContainer());
      DecompilerContext.setLogger(logger);
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0117-More-fixage-to-the-way-init-happens.patch b/FernFlower-Patches/0117-More-fixage-to-the-way-init-happens.patch
index 33f6a6e..5b0493e 100644
--- a/FernFlower-Patches/0117-More-fixage-to-the-way-init-happens.patch
+++ b/FernFlower-Patches/0117-More-fixage-to-the-way-init-happens.patch
@@ -1,15 +1,11 @@
 From 7465233a204d2523968638a0275020cd84cdb571 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 8 Nov 2015 16:18:49 -0500
-Subject: [PATCH 117/122] More fixage to the way init happens.
+Subject: More fixage to the way init happens.
 
----
- .../jetbrains/java/decompiler/main/DecompilerContext.java   | 6 +++---
- src/org/jetbrains/java/decompiler/main/Fernflower.java      | 4 +---
- 2 files changed, 4 insertions(+), 6 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-index 22ab9e0..f946bb4 100644
+index 22ab9e0fd0f4571f360492221a619f9419d8812a..f946bb46ab04b018786a72371af431d42f65cf1c 100644
 --- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
 +++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
 @@ -57,19 +57,19 @@ public class DecompilerContext {
@@ -36,7 +32,7 @@ index 22ab9e0..f946bb4 100644
      }
      if (DecompilerContext.getNamingFactory() == null) {
 diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-index 8319da8..320e250 100644
+index 8319da8a08838b77508269bf44fe2209bcf4a328..320e250ce1fe0eeca0194b296a3944cc710127bc 100644
 --- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
 +++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
 @@ -41,10 +41,8 @@ public class Fernflower implements IDecompiledData {
@@ -52,5 +48,5 @@ index 8319da8..320e250 100644
      if (DecompilerContext.getOption(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH)) {
        addAllClasspath();
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0118-Try-and-release-the-renamer-after-we-re-done-with-th.patch b/FernFlower-Patches/0118-Try-and-release-the-renamer-after-we-re-done-with-th.patch
index d72a5f5..35d9b0d 100644
--- a/FernFlower-Patches/0118-Try-and-release-the-renamer-after-we-re-done-with-th.patch
+++ b/FernFlower-Patches/0118-Try-and-release-the-renamer-after-we-re-done-with-th.patch
@@ -1,16 +1,12 @@
 From f3c197fc7633ffc69ce33e711f542fc1b25d9b3d Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Mon, 23 Nov 2015 11:56:24 -0500
-Subject: [PATCH 118/122] Try and release the renamer after we're done with the
- class. Should reduce memory footprint somewhat.
+Subject: Try and release the renamer after we're done with the class. Should
+ reduce memory footprint somewhat.
 
----
- src/org/jetbrains/java/decompiler/struct/StructClass.java  | 3 +++
- src/org/jetbrains/java/decompiler/struct/StructMethod.java | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
-index ab0f118..7848606 100644
+index ab0f118debc0d7dee08f79a12c3558909e652482..784860620c1c07884c28ac26d431396960312f19 100644
 --- a/src/org/jetbrains/java/decompiler/struct/StructClass.java
 +++ b/src/org/jetbrains/java/decompiler/struct/StructClass.java
 @@ -147,6 +147,9 @@ public class StructClass extends StructMember {
@@ -24,7 +20,7 @@ index ab0f118..7848606 100644
  
    public ConstantPool getPool() {
 diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-index 7e7f758..68f5427 100644
+index 7e7f7580f5301ea94b4bf97440a471caa3f62c50..68f5427e95ffd45a0fd925b8912c79d07a999d17 100644
 --- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
 +++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
 @@ -61,7 +61,7 @@ public class StructMethod extends StructMember {
@@ -37,5 +33,5 @@ index 7e7f758..68f5427 100644
    public StructMethod(DataInputFullStream in, StructClass clStruct) throws IOException {
      classStruct = clStruct;
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0119-Try-to-release-resources-after-we-re-done-not-before.patch b/FernFlower-Patches/0119-Try-to-release-resources-after-we-re-done-not-before.patch
index 23e5e15..69c5a37 100644
--- a/FernFlower-Patches/0119-Try-to-release-resources-after-we-re-done-not-before.patch
+++ b/FernFlower-Patches/0119-Try-to-release-resources-after-we-re-done-not-before.patch
@@ -1,16 +1,11 @@
 From 1cfbf4d63df1d352d611683366d7ec94b25951df Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Mon, 23 Nov 2015 14:01:47 -0500
-Subject: [PATCH 119/122] Try to release resources *after* we're done, not
- before we've started
+Subject: Try to release resources *after* we're done, not before we've started
 
----
- src/org/jetbrains/java/decompiler/main/ClassesProcessor.java | 3 +++
- src/org/jetbrains/java/decompiler/struct/StructClass.java    | 3 ---
- 2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index f22baa0..5feaf47 100644
+index f22baa00bfcb99aa8e05ee323fdecacdf8cf177a..5feaf475b6e1100d40a907d1b42bb602f1db7984 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 @@ -354,6 +354,9 @@ public class ClassesProcessor {
@@ -24,7 +19,7 @@ index f22baa0..5feaf47 100644
      for (ClassNode nd : node.nested) {
        destroyWrappers(nd);
 diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
-index 7848606..ab0f118 100644
+index 784860620c1c07884c28ac26d431396960312f19..ab0f118debc0d7dee08f79a12c3558909e652482 100644
 --- a/src/org/jetbrains/java/decompiler/struct/StructClass.java
 +++ b/src/org/jetbrains/java/decompiler/struct/StructClass.java
 @@ -147,9 +147,6 @@ public class StructClass extends StructMember {
@@ -38,5 +33,5 @@ index 7848606..ab0f118 100644
  
    public ConstantPool getPool() {
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0120-Don-t-allocate-a-renamer-for-every-single-method-rea.patch b/FernFlower-Patches/0120-Don-t-allocate-a-renamer-for-every-single-method-rea.patch
index 3f4a48e..2728621 100644
--- a/FernFlower-Patches/0120-Don-t-allocate-a-renamer-for-every-single-method-rea.patch
+++ b/FernFlower-Patches/0120-Don-t-allocate-a-renamer-for-every-single-method-rea.patch
@@ -1,15 +1,12 @@
 From fd28c848f1295a31d38e69f7f5dd7afec52f208f Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Mon, 23 Nov 2015 14:27:08 -0500
-Subject: [PATCH 120/122] Don't allocate a renamer for every single method
- read. That should cut down the memory quite a lot.
+Subject: Don't allocate a renamer for every single method read. That should
+ cut down the memory quite a lot.
 
----
- src/org/jetbrains/java/decompiler/struct/StructMethod.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-index 68f5427..77fd181 100644
+index 68f5427e95ffd45a0fd925b8912c79d07a999d17..77fd181a17eb566fa0f0330c0c21fb08f787922f 100644
 --- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
 +++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
 @@ -80,7 +80,6 @@ public class StructMethod extends StructMember {
@@ -29,5 +26,5 @@ index 68f5427..77fd181 100644
      }
    }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0121-Clean-up-renamer-access-a-bit-ensure-it-s-loaded-for.patch b/FernFlower-Patches/0121-Clean-up-renamer-access-a-bit-ensure-it-s-loaded-for.patch
index 8738aa6..b8a9804 100644
--- a/FernFlower-Patches/0121-Clean-up-renamer-access-a-bit-ensure-it-s-loaded-for.patch
+++ b/FernFlower-Patches/0121-Clean-up-renamer-access-a-bit-ensure-it-s-loaded-for.patch
@@ -1,18 +1,11 @@
 From add9bf560f6db5cea287c95b2ee13575ba15c8f3 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Mon, 23 Nov 2015 14:56:19 -0500
-Subject: [PATCH 121/122] Clean up renamer access a bit- ensure it's loaded for
- inner classes
+Subject: Clean up renamer access a bit- ensure it's loaded for inner classes
 
----
- .../java/decompiler/main/ClassWriter.java     |  2 +-
- .../decompiler/main/ClassesProcessor.java     |  2 +-
- .../decompiler/vars/VarDefinitionHelper.java  |  4 ++--
- .../java/decompiler/struct/StructMethod.java  | 19 +++++++++++++++++--
- 4 files changed, 21 insertions(+), 6 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index 25d01e3..b90f2ec 100644
+index 25d01e38f0c006411e0a6c5c053b16d188b0c9a1..b90f2ec58cc54cdd9b72257824ec6ceaefbc536e 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 @@ -731,7 +731,7 @@ public class ClassWriter {
@@ -25,7 +18,7 @@ index 25d01e3..b90f2ec 100644
              buffer.append(parameterName == null ? "param" + index : parameterName); // null iff decompiled with errors
  
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index 5feaf47..e0fdaac 100644
+index 5feaf475b6e1100d40a907d1b42bb602f1db7984..e0fdaacc5d6f16c5eea148540b2c90758779deae 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 @@ -355,7 +355,7 @@ public class ClassesProcessor {
@@ -38,7 +31,7 @@ index 5feaf47..e0fdaac 100644
  
      for (ClassNode nd : node.nested) {
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index de4dbdc..fcd8c64 100644
+index de4dbdc7b84cc6bcb95faa3ba05e6e2290922cf5..fcd8c64de9c7d3af4e9ce943c41dd58ced598014 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -452,7 +452,7 @@ public class VarDefinitionHelper {
@@ -60,7 +53,7 @@ index de4dbdc..fcd8c64 100644
          }
          return 0;
 diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-index 77fd181..d7ede2e 100644
+index 77fd181a17eb566fa0f0330c0c21fb08f787922f..d7ede2e3ab1f542a7223cc79e2f139d29c29cec4 100644
 --- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
 +++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
 @@ -61,7 +61,7 @@ public class StructMethod extends StructMember {
@@ -106,5 +99,5 @@ index 77fd181..d7ede2e 100644
 +  }
  }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0122-Do-not-merge-varaibles-when-the-to-target-is-read-fu.patch b/FernFlower-Patches/0122-Do-not-merge-varaibles-when-the-to-target-is-read-fu.patch
index b13a84a..1df3e11 100644
--- a/FernFlower-Patches/0122-Do-not-merge-varaibles-when-the-to-target-is-read-fu.patch
+++ b/FernFlower-Patches/0122-Do-not-merge-varaibles-when-the-to-target-is-read-fu.patch
@@ -1,16 +1,12 @@
 From 114aebe82cf40075c5c4f916c409b8aebf8096d5 Mon Sep 17 00:00:00 2001
 From: LexManos <LexManos@gmail.com>
 Date: Mon, 14 Dec 2015 02:09:28 -0800
-Subject: [PATCH 122/122] Do not merge varaibles when the to target is read
- further in the method.
+Subject: Do not merge varaibles when the to target is read further in the
+ method.
 
----
- .../decompiler/vars/VarDefinitionHelper.java  | 19 +++----
- .../java/decompiler/util/ExprentUtil.java     | 57 +++++++++++++++++++
- 2 files changed, 66 insertions(+), 10 deletions(-)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index fcd8c64..6566ca7 100644
+index fcd8c64de9c7d3af4e9ce943c41dd58ced598014..6566ca75db19a863a54b69ededffc31a2ab3ea55 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -36,6 +36,7 @@ import org.jetbrains.java.decompiler.struct.StructMethod;
@@ -80,7 +76,7 @@ index fcd8c64..6566ca7 100644
          }
        }
 diff --git a/src/org/jetbrains/java/decompiler/util/ExprentUtil.java b/src/org/jetbrains/java/decompiler/util/ExprentUtil.java
-index 39ce7ff..cadf983 100644
+index 39ce7ff03344f2c0dc9a23e85663af003e312fc6..cadf983d316055b1c5f3d822b8f32d808d23cb6c 100644
 --- a/src/org/jetbrains/java/decompiler/util/ExprentUtil.java
 +++ b/src/org/jetbrains/java/decompiler/util/ExprentUtil.java
 @@ -17,9 +17,11 @@ package org.jetbrains.java.decompiler.util;
@@ -159,5 +155,5 @@ index 39ce7ff..cadf983 100644
              return true;
            }
 -- 
-2.21.0.windows.1
+2.28.0.windows.1
 
diff --git a/FernFlower-Patches/0123-Changed-archive-name-to-reflect-the-update-to-ForgeF.patch b/FernFlower-Patches/0123-Changed-archive-name-to-reflect-the-update-to-ForgeF.patch
new file mode 100644
index 0000000..f7fc00a
--- /dev/null
+++ b/FernFlower-Patches/0123-Changed-archive-name-to-reflect-the-update-to-ForgeF.patch
@@ -0,0 +1,25 @@
+From 732aa7d1cf9a3e08cedd57a08cbac026c2826068 Mon Sep 17 00:00:00 2001
+From: Curle <curle@gemwire.uk>
+Date: Tue, 21 Apr 2020 14:00:05 +0000
+Subject: Changed archive name to reflect the update to ForgeFlower
+
+
+diff --git a/build.gradle b/build.gradle
+index cf3d8ec6b2fe4260b788b46643e8a397e5d63e18..a57d56edcb30c9e9c72293274158cf2137e23e83 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -3,9 +3,9 @@ apply plugin: 'idea'
+ apply plugin: 'maven'
+ apply plugin: 'java'
+ 
+-version = "2.0-SNAPSHOT"
++version = "0.2.3-SNAPSHOT"
+ group = "net.minecraftforge" //not sure if we shoulkd publish under this name, but it's our fork so meh
+-archivesBaseName = "fernflower"
++archivesBaseName = "forgeflower"
+ 
+ sourceCompatibility = '1.6'
+ targetCompatibility = '1.6'
+-- 
+2.28.0.windows.1
+

From 9b9ac46439df99294e3e454d760f0137aecda5b1 Mon Sep 17 00:00:00 2001
From: Curle <curle@gemwire.uk>
Date: Wed, 16 Dec 2020 01:39:20 +0000
Subject: [PATCH 04/22] Fixes and adjustments

---
 ...ew-wrapper-and-deploy-to-Forge-Maven.patch |   7 +-
 ...eric-parametrs-for-anonymous-classes.patch |   7 +-
 ...ctions-on-field-initalizers-allowing.patch |   9 +-
 ...ixed-this-calls-not-having-arguments.patch |   7 +-
 ...-synthetic-classes-can-have-content-.patch |  11 +-
 ...-lists-to-produce-a-consistant-decom.patch |  10 +-
 ...so-we-can-quickly-iterate-LVT-hackin.patch |   7 +-
 ...and-LVTT-properly-into-some-structur.patch |  14 +-
 ...o-an-incoming-LVT-if-they-re-out-of-.patch |   9 +-
 ...10-Fix-tests-for-inner-class-sorting.patch |   7 +-
 ...e-field-initalizers-would-incorrectl.patch |   9 +-
 ...non-classes-are-being-detected-as-me.patch |   9 +-
 .../0013-Fixed-last-test-all-tests-pass.patch |   7 +-
 ...pes-are-determined-was-detecting-ano.patch |   9 +-
 ...ructors-with-anon-class-as-last-argu.patch |   9 +-
 ...ces-printing-floats-with-an-undefine.patch |   9 +-
 ...bles-and-variable-definitions.-Again.patch |   9 +-
 ...thetic-classes-allowed-in-parameters.patch |   7 +-
 ...hange-LVT-indexing-to-VarVersionPair.patch |   7 +-
 ...bytecode-to-a-BitMap-as-it-gives-bet.patch |  14 +-
 ...-data-from-the-Struct-for-easier-abi.patch |   9 +-
 ...er-to-MethodProcessorRunnable-for-th.patch |   8 +-
 ...impler-than-the-complex-one-almost-p.patch |   7 +-
 .../0024-Add-the-test-to-the-harness.patch    |   7 +-
 ...ns-to-the-printout.-Also-fixed-a-fas.patch |  17 +-
 ...the-varversionpair-in-the-oldnames-t.patch |  12 +-
 ...it-seems-that-it-increases-as-the-vi.patch |  15 +-
 ...-without-an-LVT-entry.-They-re-likel.patch |  12 +-
 ...nts-will-now-use-the-correct-variabl.patch |  10 +-
 ...Each-loop-detection-and-re-introduce.patch |   9 +-
 ...-on-gradlew.-It-s-writeable-on-linux.patch |   7 +-
 ...-TryCatch-statements-will-now-use-th.patch |  11 +-
 ...-variables-that-seem-to-come-into-sc.patch |   9 +-
 ...o-VarExprent-and-print-generic-types.patch |   7 +-
 ...ement-retain-all-bytecode-data.-And-.patch |   7 +-
 ...efintionHelper-that-splits-variables.patch |  12 +-
 FernFlower-Patches/0037-Lex-s-tests.patch     |   7 +-
 .../0038-Fix-inverted-null-test.patch         |   7 +-
 .../0039-More-tweaks.-Closer.patch            |   7 +-
 ...e-tweaks-it-passes-the-TestLVT-tests.patch |   7 +-
 ...m-lex-merges-RHS-and-LHS-of-exprents.patch |   7 +-
 ...th-start-and-end-to-avoid-weirdness-.patch |   8 +-
 ...etter-remapping-of-assignment-merges.patch |   7 +-
 .../0044-PPMM-test-for-lex.patch              |   7 +-
 ...ange-begin-end-detection.-Less-derpy.patch |   7 +-
 ...PMM-helper-and-expand-PPMM-test-to-i.patch |   9 +-
 .../0047-Prevent-infinite-loops-in-PPMM.patch |   7 +-
 ... 0048-Types-are-merged-properly-now.patch} |   7 +-
 ...does-some-things-better.-But-still-.patch} |   9 +-
 ...rging.-It-s-pretty-decent.-But-stil.patch} |   9 +-
 ...rging-variables.-Use-top-down-manua.patch} |   8 +-
 ...nstant-don-t-give-it-a-type.-Cleans.patch} |   9 +-
 ...the-time-we-create-the-exprents.-Th.patch} |   9 +-
 ... => 0054-Some-code-cleanup-damn-cpw.patch} |   7 +-
 ...a-post-merge.-And-fix-injected-var-.patch} |   7 +-
 ...LVT-first-and-fallback-to-other-typ.patch} |   7 +-
 ... 0057-NPE-protection-in-LVT-loading.patch} |   7 +-
 ...ntions-in-IfStatement-s-headers-hav.patch} |   8 +-
 ...erator-is-being-used-elseware-befor.patch} |   9 +-
 ...060-NPE-Protection-in-EnumProcessor.patch} |   7 +-
 ...d-variables-in-synchronized-headers.patch} |   7 +-
 ...Include-LVT-info-in-VarExprent.copy.patch} |   7 +-
 ...tection-and-restore-do-loop-collaps.patch} |  10 +-
 ...to-before-MergeHelper-and-add-more-.patch} |   9 +-
 ...ractHelper-to-include-break-edges-t.patch} |   9 +-
 ...xtracted-ifs-from-being-inlined-aga.patch} |   9 +-
 ...ource-vars-in-itteration-allows-for.patch} |   9 +-
 ...detection-to-be-before-For-detectio.patch} |   9 +-
 ...-inner-classes.-Fix-improper-var-me.patch} |   9 +-
 ...or-loops-would-be-enhanced-to-ForEa.patch} |   8 +-
 ...rguments-for-non-static-inner-class.patch} |   9 +-
 ...urn-generic-typevar-casting-support.patch} |   7 +-
 ...r-option-iec-Include_Entire_Classpa.patch} |   9 +-
 ...e-to-be-subclass-of-VarType-and-con.patch} |   9 +-
 ...ng-for-an-init-exprent-not-to-look-.patch} |   9 +-
 ...Classpath-so-it-doesn-t-dump-out-ra.patch} |  11 +-
 ...e-parsing-of-inner-classes-with-gen.patch} |   8 +-
 ...tch => 0078-Foo.-Bar-baz-generation.patch} |   7 +-
 ...nges-to-Exprent.getInferredExprType.patch} |   7 +-
 ...on-from-InvocationExprent-s-inferre.patch} |   9 +-
 ...to-the-VarType-added-type-inference.patch} |   9 +-
 ...sts-with-multiple-arguments-in-meth.patch} |   8 +-
 ...-info-from-InvocationExprent-correc.patch} |   9 +-
 ...ed-for-loops-can-also-have-a-copy-i.patch} |   9 +-
 ...-strict-in-detecting-copy-var-usage.patch} |   7 +-
 ...h => 0086-Enhance-switches-on-enums.patch} |   7 +-
 ...-inner-class-fields-would-not-be-re.patch} |   9 +-
 ...-and-field-accessors-in-inner-class.patch} |   9 +-
 ...leanup-of-InvocationExprent-changes.patch} |   7 +-
 ...on-test-to-new-settings-no-syntheti.patch} |   8 +-
 ...h-trailing-zeros-and-incorrect-type.patch} |   7 +-
 ...el-names-based-on-jvm-instruction-i.patch} |   8 +-
 ...rsion-2.0.patch => 0093-Version-2.0.patch} |   7 +-
 ...ixed-invalid-reference-to-ASM.-Oops.patch} |   7 +-
 ...ed-potential-NPE-in-lvt-propogation.patch} |   7 +-
 ...-nested-inner-generic-type-printing.patch} |   7 +-
 ....-AmbiguousCallWithDebugInfo-Was-br.patch} |  15 +-
 ...-not-propogating-type-data-to-var-d.patch} |   8 +-
 ...-we-might-be-doing-a-bit-more-work-.patch} |   7 +-
 ...that-are-itterated-in-hash-sets-in-.patch} |   7 +-
 ...cases-leaking-variables-incorrectly.patch} |   7 +-
 ...shSet-to-LinkedHashSet-to-stabelize.patch} |   9 +-
 ...r-MC.patch => 0103-Bulk-test-for-MC.patch} |   7 +-
 ...tch => 0104-Add-a-parameter-renamer.patch} |   7 +-
 ...k-decompilation-test-for-all-to-use.patch} |   7 +-
 ...{0108-Fix-NPE.patch => 0106-Fix-NPE.patch} |   7 +-
 ...reas-on-Java-8.-Notibly-the-exit-ma.patch} |   9 +-
 ...le-declarations-including-those-wit.patch} |   7 +-
 ...nger.patch => 0109-Renaming-thinger.patch} |   7 +-
 ...issues.-Still-outstanding-propogati.patch} |  10 +-
 ...ate-renamer-state-to-nested-classes.patch} |   7 +-
 ...t-options-for-the-renamer-stuff.-JV.patch} |  17 +-
 ...the-param-renamer-needed-for-sane-p.patch} |   9 +-
 ...ger-so-that-it-can-be-used-during-i.patch} |   9 +-
 ...More-fixage-to-the-way-init-happens.patch} |   7 +-
 ...he-renamer-after-we-re-done-with-th.patch} |   9 +-
 ...sources-after-we-re-done-not-before.patch} |   8 +-
 ...renamer-for-every-single-method-rea.patch} |   9 +-
 ...access-a-bit-ensure-it-s-loaded-for.patch} |   8 +-
 ...ibles-when-the-to-target-is-read-fu.patch} |   9 +-
 ...ame-to-reflect-the-update-to-ForgeF.patch} |  11 +-
 .../0122-Allow-saving-to-JAR.patch            | 153 ++++++++++++++++++
 122 files changed, 488 insertions(+), 697 deletions(-)
 rename FernFlower-Patches/{0050-Types-are-merged-properly-now.patch => 0048-Types-are-merged-properly-now.patch} (98%)
 rename FernFlower-Patches/{0051-More-merging.-It-does-some-things-better.-But-still-.patch => 0049-More-merging.-It-does-some-things-better.-But-still-.patch} (97%)
 rename FernFlower-Patches/{0052-More-tweaks-to-merging.-It-s-pretty-decent.-But-stil.patch => 0050-More-tweaks-to-merging.-It-s-pretty-decent.-But-stil.patch} (92%)
 rename FernFlower-Patches/{0053-New-aproach-to-merging-variables.-Use-top-down-manua.patch => 0051-New-aproach-to-merging-variables.-Use-top-down-manua.patch} (99%)
 rename FernFlower-Patches/{0054-If-it-s-a-null-constant-don-t-give-it-a-type.-Cleans.patch => 0052-If-it-s-a-null-constant-don-t-give-it-a-type.-Cleans.patch} (93%)
 rename FernFlower-Patches/{0055-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch => 0053-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch} (97%)
 rename FernFlower-Patches/{0056-Some-code-cleanup-damn-cpw.patch => 0054-Some-code-cleanup-damn-cpw.patch} (98%)
 rename FernFlower-Patches/{0057-Propogate-LVT-data-post-merge.-And-fix-injected-var-.patch => 0055-Propogate-LVT-data-post-merge.-And-fix-injected-var-.patch} (98%)
 rename FernFlower-Patches/{0058-Fix-types-to-use-LVT-first-and-fallback-to-other-typ.patch => 0056-Fix-types-to-use-LVT-first-and-fallback-to-other-typ.patch} (95%)
 rename FernFlower-Patches/{0059-NPE-protection-in-LVT-loading.patch => 0057-NPE-protection-in-LVT-loading.patch} (88%)
 rename FernFlower-Patches/{0060-Fix-variable-defintions-in-IfStatement-s-headers-hav.patch => 0058-Fix-variable-defintions-in-IfStatement-s-headers-hav.patch} (88%)
 rename FernFlower-Patches/{0061-Detect-if-the-itterator-is-being-used-elseware-befor.patch => 0059-Detect-if-the-itterator-is-being-used-elseware-befor.patch} (96%)
 rename FernFlower-Patches/{0062-NPE-Protection-in-EnumProcessor.patch => 0060-NPE-Protection-in-EnumProcessor.patch} (85%)
 rename FernFlower-Patches/{0063-Cleanup-unwanted-variables-in-synchronized-headers.patch => 0061-Cleanup-unwanted-variables-in-synchronized-headers.patch} (98%)
 rename FernFlower-Patches/{0064-Include-LVT-info-in-VarExprent.copy.patch => 0062-Include-LVT-info-in-VarExprent.copy.patch} (95%)
 rename FernFlower-Patches/{0065-Remove-dowhile-detection-and-restore-do-loop-collaps.patch => 0063-Remove-dowhile-detection-and-restore-do-loop-collaps.patch} (92%)
 rename FernFlower-Patches/{0066-Move-LoopExtract-to-before-MergeHelper-and-add-more-.patch => 0064-Move-LoopExtract-to-before-MergeHelper-and-add-more-.patch} (97%)
 rename FernFlower-Patches/{0067-Loosen-up-LoopExtractHelper-to-include-break-edges-t.patch => 0065-Loosen-up-LoopExtractHelper-to-include-break-edges-t.patch} (94%)
 rename FernFlower-Patches/{0068-Hack-to-prevent-extracted-ifs-from-being-inlined-aga.patch => 0066-Hack-to-prevent-extracted-ifs-from-being-inlined-aga.patch} (96%)
 rename FernFlower-Patches/{0069-Include-ForEach-source-vars-in-itteration-allows-for.patch => 0067-Include-ForEach-source-vars-in-itteration-allows-for.patch} (80%)
 rename FernFlower-Patches/{0070-Re-write-ForEach-detection-to-be-before-For-detectio.patch => 0068-Re-write-ForEach-detection-to-be-before-For-detectio.patch} (98%)
 rename FernFlower-Patches/{0071-Propogate-LVTs-to-inner-classes.patch => 0069-Propogate-LVTs-to-inner-classes.-Fix-improper-var-me.patch} (98%)
 rename FernFlower-Patches/{0072-Fix-issue-where-For-loops-would-be-enhanced-to-ForEa.patch => 0070-Fix-issue-where-For-loops-would-be-enhanced-to-ForEa.patch} (91%)
 rename FernFlower-Patches/{0073-Fix-constructor-arguments-for-non-static-inner-class.patch => 0071-Fix-constructor-arguments-for-non-static-inner-class.patch} (94%)
 rename FernFlower-Patches/{0074-Return-generic-typevar-casting-support.patch => 0072-Return-generic-typevar-casting-support.patch} (98%)
 rename FernFlower-Patches/{0075-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch => 0073-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch} (93%)
 rename FernFlower-Patches/{0076-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch => 0074-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch} (99%)
 rename FernFlower-Patches/{0077-Fix-up-the-scouting-for-an-init-exprent-not-to-look-.patch => 0075-Fix-up-the-scouting-for-an-init-exprent-not-to-look-.patch} (98%)
 rename FernFlower-Patches/{0078-Fix-IncludeEntireClasspath-so-it-doesn-t-dump-out-ra.patch => 0076-Fix-IncludeEntireClasspath-so-it-doesn-t-dump-out-ra.patch} (87%)
 rename FernFlower-Patches/{0079-Fixed-generic-type-parsing-of-inner-classes-with-gen.patch => 0077-Fixed-generic-type-parsing-of-inner-classes-with-gen.patch} (86%)
 rename FernFlower-Patches/{0080-Foo.-Bar-baz-generation.patch => 0078-Foo.-Bar-baz-generation.patch} (99%)
 rename FernFlower-Patches/{0081-concentrated-changes-to-Exprent.getInferredExprType.patch => 0079-concentrated-changes-to-Exprent.getInferredExprType.patch} (99%)
 rename FernFlower-Patches/{0082-passing-information-from-InvocationExprent-s-inferre.patch => 0080-passing-information-from-InvocationExprent-s-inferre.patch} (96%)
 rename FernFlower-Patches/{0083-pushed-remapping-to-the-VarType-added-type-inference.patch => 0081-pushed-remapping-to-the-VarType-added-type-inference.patch} (98%)
 rename FernFlower-Patches/{0084-handle-generic-lists-with-multiple-arguments-in-meth.patch => 0082-handle-generic-lists-with-multiple-arguments-in-meth.patch} (92%)
 rename FernFlower-Patches/{0085-using-the-generic-info-from-InvocationExprent-correc.patch => 0083-using-the-generic-info-from-InvocationExprent-correc.patch} (97%)
 rename FernFlower-Patches/{0086-Itterator-enchanced-for-loops-can-also-have-a-copy-i.patch => 0084-Itterator-enchanced-for-loops-can-also-have-a-copy-i.patch} (89%)
 rename FernFlower-Patches/{0087-Be-a-bit-more-strict-in-detecting-copy-var-usage.patch => 0085-Be-a-bit-more-strict-in-detecting-copy-var-usage.patch} (93%)
 rename FernFlower-Patches/{0088-Enhance-switches-on-enums.patch => 0086-Enhance-switches-on-enums.patch} (99%)
 rename FernFlower-Patches/{0089-Fixed-issue-where-inner-class-fields-would-not-be-re.patch => 0087-Fixed-issue-where-inner-class-fields-would-not-be-re.patch} (94%)
 rename FernFlower-Patches/{0090-Added-support-for-and-field-accessors-in-inner-class.patch => 0088-Added-support-for-and-field-accessors-in-inner-class.patch} (94%)
 rename FernFlower-Patches/{0091-cleanup-of-InvocationExprent-changes.patch => 0089-cleanup-of-InvocationExprent-changes.patch} (98%)
 rename FernFlower-Patches/{0092-Tweak-decompilation-test-to-new-settings-no-syntheti.patch => 0090-Tweak-decompilation-test-to-new-settings-no-syntheti.patch} (86%)
 rename FernFlower-Patches/{0093-Fix-constants-with-trailing-zeros-and-incorrect-type.patch => 0091-Fix-constants-with-trailing-zeros-and-incorrect-type.patch} (93%)
 rename FernFlower-Patches/{0094-Deterministic-label-names-based-on-jvm-instruction-i.patch => 0092-Deterministic-label-names-based-on-jvm-instruction-i.patch} (98%)
 rename FernFlower-Patches/{0095-Version-2.0.patch => 0093-Version-2.0.patch} (82%)
 rename FernFlower-Patches/{0096-Fixed-invalid-reference-to-ASM.-Oops.patch => 0094-Fixed-invalid-reference-to-ASM.-Oops.patch} (90%)
 rename FernFlower-Patches/{0097-Fixed-potential-NPE-in-lvt-propogation.patch => 0095-Fixed-potential-NPE-in-lvt-propogation.patch} (87%)
 rename FernFlower-Patches/{0098-Fixed-nested-inner-generic-type-printing.patch => 0096-Fixed-nested-inner-generic-type-printing.patch} (88%)
 rename FernFlower-Patches/{0099-Fixed-JUint-tests.patch => 0097-Fixed-JUint-tests.-AmbiguousCallWithDebugInfo-Was-br.patch} (89%)
 rename FernFlower-Patches/{0100-Fixed-var-merging-not-propogating-type-data-to-var-d.patch => 0098-Fixed-var-merging-not-propogating-type-data-to-var-d.patch} (93%)
 rename FernFlower-Patches/{0101-Snapshots-because-we-might-be-doing-a-bit-more-work-.patch => 0099-Snapshots-because-we-might-be-doing-a-bit-more-work-.patch} (77%)
 rename FernFlower-Patches/{0102-Sort-some-blocks-that-are-itterated-in-hash-sets-in-.patch => 0100-Sort-some-blocks-that-are-itterated-in-hash-sets-in-.patch} (93%)
 rename FernFlower-Patches/{0103-Fixed-switch-cases-leaking-variables-incorrectly.patch => 0101-Fixed-switch-cases-leaking-variables-incorrectly.patch} (86%)
 rename FernFlower-Patches/{0104-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch => 0102-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch} (97%)
 rename FernFlower-Patches/{0105-Bulk-test-for-MC.patch => 0103-Bulk-test-for-MC.patch} (98%)
 rename FernFlower-Patches/{0106-Add-a-parameter-renamer.patch => 0104-Add-a-parameter-renamer.patch} (96%)
 rename FernFlower-Patches/{0107-Bulk-decompilation-test-for-all-to-use.patch => 0105-Bulk-decompilation-test-for-all-to-use.patch} (98%)
 rename FernFlower-Patches/{0108-Fix-NPE.patch => 0106-Fix-NPE.patch} (90%)
 rename FernFlower-Patches/{0109-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch => 0107-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch} (97%)
 rename FernFlower-Patches/{0110-Gather-all-variable-declarations-including-those-wit.patch => 0108-Gather-all-variable-declarations-including-those-wit.patch} (96%)
 rename FernFlower-Patches/{0111-Renaming-thinger.patch => 0109-Renaming-thinger.patch} (99%)
 rename FernFlower-Patches/{0112-Fix-up-some-name-issues.-Still-outstanding-propogati.patch => 0110-Fix-up-some-name-issues.-Still-outstanding-propogati.patch} (95%)
 rename FernFlower-Patches/{0113-Propogate-renamer-state-to-nested-classes.patch => 0111-Propogate-renamer-state-to-nested-classes.patch} (98%)
 rename FernFlower-Patches/{0114-Properly-implement-options-for-the-renamer-stuff.patch => 0112-Properly-implement-options-for-the-renamer-stuff.-JV.patch} (86%)
 rename FernFlower-Patches/{0115-Add-the-index-to-the-param-renamer-needed-for-sane-p.patch => 0113-Add-the-index-to-the-param-renamer-needed-for-sane-p.patch} (94%)
 rename FernFlower-Patches/{0116-Early-set-the-logger-so-that-it-can-be-used-during-i.patch => 0114-Early-set-the-logger-so-that-it-can-be-used-during-i.patch} (91%)
 rename FernFlower-Patches/{0117-More-fixage-to-the-way-init-happens.patch => 0115-More-fixage-to-the-way-init-happens.patch} (95%)
 rename FernFlower-Patches/{0118-Try-and-release-the-renamer-after-we-re-done-with-th.patch => 0116-Try-and-release-the-renamer-after-we-re-done-with-th.patch} (88%)
 rename FernFlower-Patches/{0119-Try-to-release-resources-after-we-re-done-not-before.patch => 0117-Try-to-release-resources-after-we-re-done-not-before.patch} (88%)
 rename FernFlower-Patches/{0120-Don-t-allocate-a-renamer-for-every-single-method-rea.patch => 0118-Don-t-allocate-a-renamer-for-every-single-method-rea.patch} (84%)
 rename FernFlower-Patches/{0121-Clean-up-renamer-access-a-bit-ensure-it-s-loaded-for.patch => 0119-Clean-up-renamer-access-a-bit-ensure-it-s-loaded-for.patch} (96%)
 rename FernFlower-Patches/{0122-Do-not-merge-varaibles-when-the-to-target-is-read-fu.patch => 0120-Do-not-merge-varaibles-when-the-to-target-is-read-fu.patch} (97%)
 rename FernFlower-Patches/{0123-Changed-archive-name-to-reflect-the-update-to-ForgeF.patch => 0121-Changed-archive-name-to-reflect-the-update-to-ForgeF.patch} (64%)
 create mode 100644 FernFlower-Patches/0122-Allow-saving-to-JAR.patch

diff --git a/FernFlower-Patches/0001-Add-Gradlew-wrapper-and-deploy-to-Forge-Maven.patch b/FernFlower-Patches/0001-Add-Gradlew-wrapper-and-deploy-to-Forge-Maven.patch
index 440ce27..9b46475 100644
--- a/FernFlower-Patches/0001-Add-Gradlew-wrapper-and-deploy-to-Forge-Maven.patch
+++ b/FernFlower-Patches/0001-Add-Gradlew-wrapper-and-deploy-to-Forge-Maven.patch
@@ -1,7 +1,7 @@
-From e8661f9befc8ce9b4422eb13de5bc2ffd370f1ed Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sat, 1 Aug 2015 11:35:52 -0700
-Subject: Add Gradlew wrapper and deploy to Forge Maven.
+Subject: [PATCH] Add Gradlew wrapper and deploy to Forge Maven.
 
 
 diff --git a/.gitignore b/.gitignore
@@ -1305,6 +1305,3 @@ index 0000000000000000000000000000000000000000..7dfd6c3119638af25144f484e8bbb74b
 +++ b/settings.gradle
 @@ -0,0 +1 @@
 +rootProject.name = "fernflower"
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0002-Output-generic-parametrs-for-anonymous-classes.patch b/FernFlower-Patches/0002-Output-generic-parametrs-for-anonymous-classes.patch
index fb05c4e..58f024f 100644
--- a/FernFlower-Patches/0002-Output-generic-parametrs-for-anonymous-classes.patch
+++ b/FernFlower-Patches/0002-Output-generic-parametrs-for-anonymous-classes.patch
@@ -1,7 +1,7 @@
-From 87ede1c33768fd77ab480c2b60cea3b23de9f754 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sat, 1 Aug 2015 13:45:25 -0700
-Subject: Output generic parametrs for anonymous classes.
+Subject: [PATCH] Output generic parametrs for anonymous classes.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -40,6 +40,3 @@ index b5ecd9e66750f7f392c111e9254ad97430d780b1..24facc9d80857d3eacbc7b5aaf1ad9a6
          buf.prepend("new " + typename);
  
          if (enclosing != null) {
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0003-Loosen-up-restrictions-on-field-initalizers-allowing.patch b/FernFlower-Patches/0003-Loosen-up-restrictions-on-field-initalizers-allowing.patch
index cf82a55..0bc9acd 100644
--- a/FernFlower-Patches/0003-Loosen-up-restrictions-on-field-initalizers-allowing.patch
+++ b/FernFlower-Patches/0003-Loosen-up-restrictions-on-field-initalizers-allowing.patch
@@ -1,8 +1,8 @@
-From be53afc282317c377cf92433cf40b01dce77af77 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sat, 1 Aug 2015 15:10:28 -0700
-Subject: Loosen up restrictions on field initalizers allowing for some to be
- moved out of the <ini> and <cinit> functions.
+Subject: [PATCH] Loosen up restrictions on field initalizers allowing for some
+ to be moved out of the <ini> and <cinit> functions.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
@@ -108,6 +108,3 @@ index d9a0a3d828be573cf474d22d836c21ece546e424..d916b1951e026f239028e52f75199e78
        }
      }
  
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0004-Fixed-this-calls-not-having-arguments.patch b/FernFlower-Patches/0004-Fixed-this-calls-not-having-arguments.patch
index 0e03843..afabd5a 100644
--- a/FernFlower-Patches/0004-Fixed-this-calls-not-having-arguments.patch
+++ b/FernFlower-Patches/0004-Fixed-this-calls-not-having-arguments.patch
@@ -1,7 +1,7 @@
-From 723017cb1251c8f0ff9b09e97a8800109bc5375f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sat, 1 Aug 2015 15:52:57 -0700
-Subject: Fixed this calls not having arguments.
+Subject: [PATCH] Fixed this calls not having arguments.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -49,6 +49,3 @@ index 294a115207d3c76ef0ae29e63556ec5de750889d..4e73f0649a7d85aa59756a3634bceae6
      return true;
    }
  
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0005-NUll-constructor-synthetic-classes-can-have-content-.patch b/FernFlower-Patches/0005-NUll-constructor-synthetic-classes-can-have-content-.patch
index 4b95ed0..d9d6968 100644
--- a/FernFlower-Patches/0005-NUll-constructor-synthetic-classes-can-have-content-.patch
+++ b/FernFlower-Patches/0005-NUll-constructor-synthetic-classes-can-have-content-.patch
@@ -1,9 +1,9 @@
-From 211a6f999cc0fc746ba73d6a9e4fd91be19a69e8 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sat, 1 Aug 2015 17:52:35 -0700
-Subject: NUll constructor synthetic classes can have content as well so don't
- rely on it being a stub, just being anonymous. You can't legitimatly have a
- anonymous argument.
+Subject: [PATCH] NUll constructor synthetic classes can have content as well
+ so don't rely on it being a stub, just being anonymous. You can't legitimatly
+ have a anonymous argument.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -19,6 +19,3 @@ index 24facc9d80857d3eacbc7b5aaf1ad9a62cd7fd91..6dad7c98c8c6c9fe0714e63c24763d2e
                      break;  // skip last parameter of synthetic constructor call
                    }
                  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0006-Sort-inner-class-lists-to-produce-a-consistant-decom.patch b/FernFlower-Patches/0006-Sort-inner-class-lists-to-produce-a-consistant-decom.patch
index 2f5113e..b9c1b8c 100644
--- a/FernFlower-Patches/0006-Sort-inner-class-lists-to-produce-a-consistant-decom.patch
+++ b/FernFlower-Patches/0006-Sort-inner-class-lists-to-produce-a-consistant-decom.patch
@@ -1,8 +1,9 @@
-From fdff6cfcb291cf7dcba48ce13e2aefcb7dae0d5b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sat, 1 Aug 2015 18:40:43 -0700
-Subject: Sort inner class lists to produce a consistant decompile. Different
- JVMs sort HashSets differently causing inner classes to get shuffled.
+Subject: [PATCH] Sort inner class lists to produce a consistant decompile.
+ Different JVMs sort HashSets differently causing inner classes to get
+ shuffled.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -70,6 +71,3 @@ index 798010e24206ffcfb76b1f4936f9b5d3709a7275..9aedf22af1f60b3e17752769462aee91
  
          return true;
        }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0007-Add-an-LVT-test-so-we-can-quickly-iterate-LVT-hackin.patch b/FernFlower-Patches/0007-Add-an-LVT-test-so-we-can-quickly-iterate-LVT-hackin.patch
index e199616..7adf27f 100644
--- a/FernFlower-Patches/0007-Add-an-LVT-test-so-we-can-quickly-iterate-LVT-hackin.patch
+++ b/FernFlower-Patches/0007-Add-an-LVT-test-so-we-can-quickly-iterate-LVT-hackin.patch
@@ -1,7 +1,7 @@
-From 213752acb3080ed6bff297f5a4e54b09998cf10a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 2 Aug 2015 10:43:54 -0400
-Subject: Add an LVT test so we can quickly iterate LVT hacking
+Subject: [PATCH] Add an LVT test so we can quickly iterate LVT hacking
 
 
 diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
@@ -138,6 +138,3 @@ index 0000000000000000000000000000000000000000..05b5228e223eb20be14622126efdb746
 +        }
 +    }
 +}
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0008-Capture-the-LVT-and-LVTT-properly-into-some-structur.patch b/FernFlower-Patches/0008-Capture-the-LVT-and-LVTT-properly-into-some-structur.patch
index f5b45d3..4af6037 100644
--- a/FernFlower-Patches/0008-Capture-the-LVT-and-LVTT-properly-into-some-structur.patch
+++ b/FernFlower-Patches/0008-Capture-the-LVT-and-LVTT-properly-into-some-structur.patch
@@ -1,11 +1,10 @@
-From f83b43ba0aaf6e5fb17d17a9fcaa2420ab8aa0ff Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 2 Aug 2015 14:07:52 -0400
-Subject: =?UTF-8?q?Capture=20the=20LVT=20and=20LVTT=20properly,=20into=20s?=
- =?UTF-8?q?ome=20structured=20data.=20Ends=20seem=20to=20be=20the=20way=20?=
- =?UTF-8?q?to=20index=20the=20variable=0Atable.=20Next=20up,=20we=20need?=
- =?UTF-8?q?=20to=20capture=20the=20block=20ends=20in=20the=20var=20parsing?=
- =?UTF-8?q?=20code,=20so=20we=20can=20then=20match=20up=20later.?=
+Subject: [PATCH] Capture the LVT and LVTT properly, into some structured data.
+ Ends seem to be the way to index the variable table. Next up, we need to
+ capture the block ends in the var parsing code, so we can then match up
+ later.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/struct/StructMember.java b/src/org/jetbrains/java/decompiler/struct/StructMember.java
@@ -163,6 +162,3 @@ index fceae359d8fa763b162851a43284e5f13b6c13ee..04f534ed5482d8778826437dafd69790
    }
  
    public Map<Integer, String> getMapVarNames() {
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0009-Merge-any-LVTT-to-an-incoming-LVT-if-they-re-out-of-.patch b/FernFlower-Patches/0009-Merge-any-LVTT-to-an-incoming-LVT-if-they-re-out-of-.patch
index a3db91d..f581025 100644
--- a/FernFlower-Patches/0009-Merge-any-LVTT-to-an-incoming-LVT-if-they-re-out-of-.patch
+++ b/FernFlower-Patches/0009-Merge-any-LVTT-to-an-incoming-LVT-if-they-re-out-of-.patch
@@ -1,8 +1,8 @@
-From 7d5770f2462f354c4663f77818ae718062689d7b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 2 Aug 2015 20:56:16 -0400
-Subject: Merge any LVTT to an incoming LVT (if they're out of sequence), and
- merge LVTTs together if there's no LVT yet.
+Subject: [PATCH] Merge any LVTT to an incoming LVT (if they're out of
+ sequence), and merge LVTTs together if there's no LVT yet.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/struct/StructMember.java b/src/org/jetbrains/java/decompiler/struct/StructMember.java
@@ -25,6 +25,3 @@ index 724c0db23d607d1e243f8cf278b0a61a9789e19d..af1df05e4120b1053ad0d1e74da88810
          else {
            attributes.addWithKey(attribute, attribute.getName());
          }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0010-Fix-tests-for-inner-class-sorting.patch b/FernFlower-Patches/0010-Fix-tests-for-inner-class-sorting.patch
index bf9a50d..cbc51d7 100644
--- a/FernFlower-Patches/0010-Fix-tests-for-inner-class-sorting.patch
+++ b/FernFlower-Patches/0010-Fix-tests-for-inner-class-sorting.patch
@@ -1,7 +1,7 @@
-From 4c12c7a453ab63d9b966d8247ed88e4873fe7d29 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 2 Aug 2015 19:22:15 -0700
-Subject: Fix tests for inner class sorting.
+Subject: [PATCH] Fix tests for inner class sorting.
 
 
 diff --git a/testData/results/TestAnonymousClass.dec b/testData/results/TestAnonymousClass.dec
@@ -474,6 +474,3 @@ index 21f0f129d1bc260e2dbc7ce77f07ece57711bf75..af7ce865f5d946980010ee02c3e5be38
  36 <-> 16
  37 <-> 19
  39 <-> 22
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0011-Fixed-issue-where-field-initalizers-would-incorrectl.patch b/FernFlower-Patches/0011-Fixed-issue-where-field-initalizers-would-incorrectl.patch
index e7abd97..58fbb96 100644
--- a/FernFlower-Patches/0011-Fixed-issue-where-field-initalizers-would-incorrectl.patch
+++ b/FernFlower-Patches/0011-Fixed-issue-where-field-initalizers-would-incorrectl.patch
@@ -1,8 +1,8 @@
-From f8a4b88e87510d194781b14ed6c4dba40425422b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 2 Aug 2015 19:49:30 -0700
-Subject: Fixed issue where field initalizers would incorrectly be inlined when
- they relied on fields initalized later.
+Subject: [PATCH] Fixed issue where field initalizers would incorrectly be
+ inlined when they relied on fields initalized later.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
@@ -54,6 +54,3 @@ index d916b1951e026f239028e52f75199e784a7a9639..e64feea59b43cd41ad42ace70ebf78de
            }
            else if (!fexpr.isStatic()) {
              return false;
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0012-Some-synthetic-anon-classes-are-being-detected-as-me.patch b/FernFlower-Patches/0012-Some-synthetic-anon-classes-are-being-detected-as-me.patch
index 4ae3b5e..9063d87 100644
--- a/FernFlower-Patches/0012-Some-synthetic-anon-classes-are-being-detected-as-me.patch
+++ b/FernFlower-Patches/0012-Some-synthetic-anon-classes-are-being-detected-as-me.patch
@@ -1,8 +1,8 @@
-From 4e2882cb40ea460cb1f4a22c85a017cd853b308c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 2 Aug 2015 21:14:56 -0700
-Subject: Some synthetic anon classes are being detected as member classes.
- Unknown why, however this fixes the consturctor argument.
+Subject: [PATCH] Some synthetic anon classes are being detected as member
+ classes. Unknown why, however this fixes the consturctor argument.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -18,6 +18,3 @@ index 6dad7c98c8c6c9fe0714e63c24763d2eb111df4c..0297a55fc16eb3eddc0e458bfa49325f
                      break;  // skip last parameter of synthetic constructor call
                    }
                  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0013-Fixed-last-test-all-tests-pass.patch b/FernFlower-Patches/0013-Fixed-last-test-all-tests-pass.patch
index a332f30..5f1f918 100644
--- a/FernFlower-Patches/0013-Fixed-last-test-all-tests-pass.patch
+++ b/FernFlower-Patches/0013-Fixed-last-test-all-tests-pass.patch
@@ -1,7 +1,7 @@
-From 089ba9f7ecc59787de6f28b51cbfc8ee077caf6c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 2 Aug 2015 21:20:47 -0700
-Subject: Fixed last test, all tests pass.
+Subject: [PATCH] Fixed last test, all tests pass.
 
 
 diff --git a/testData/results/TestClassSimpleBytecodeMapping.dec b/testData/results/TestClassSimpleBytecodeMapping.dec
@@ -66,6 +66,3 @@ index a48375ae4a8f7bbe75a5db9b94ff1b023043faa7..1a2532f0b736a3d1a2db4f7ba3645e48
 +55 <-> 45
  Not mapped:
  39
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0014-Fix-how-class-types-are-determined-was-detecting-ano.patch b/FernFlower-Patches/0014-Fix-how-class-types-are-determined-was-detecting-ano.patch
index 2d85f05..8dfaa87 100644
--- a/FernFlower-Patches/0014-Fix-how-class-types-are-determined-was-detecting-ano.patch
+++ b/FernFlower-Patches/0014-Fix-how-class-types-are-determined-was-detecting-ano.patch
@@ -1,8 +1,8 @@
-From eeabc2fd9d388a3361b0ec89733add20e4ade8a6 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Mon, 3 Aug 2015 15:07:46 -0700
-Subject: Fix how class types are determined, was detecting anon classes as
- member classes.
+Subject: [PATCH] Fix how class types are determined, was detecting anon
+ classes as member classes.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -188,6 +188,3 @@ index 5969487904608fb01550965dedfa43e4184c22c4..ecef5588a52318a40849f9ac4ae27e2b
 +    }
    }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0015-Force-hide-constructors-with-anon-class-as-last-argu.patch b/FernFlower-Patches/0015-Force-hide-constructors-with-anon-class-as-last-argu.patch
index b36b1b1..b4b4f06 100644
--- a/FernFlower-Patches/0015-Force-hide-constructors-with-anon-class-as-last-argu.patch
+++ b/FernFlower-Patches/0015-Force-hide-constructors-with-anon-class-as-last-argu.patch
@@ -1,8 +1,8 @@
-From 289fb0b9bab3589bef077b002eca23e33fcd1e16 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Mon, 3 Aug 2015 15:08:26 -0700
-Subject: Force hide constructors with anon class as last argument. Java adds
- these for unknown resons.
+Subject: [PATCH] Force hide constructors with anon class as last argument.
+ Java adds these for unknown resons.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -62,6 +62,3 @@ index e64feea59b43cd41ad42ace70ebf78dec4ffb54e..85d580d6ced6b14889453ab92689b13b
 +    }
 +  }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0016-Fix-JVM-differences-printing-floats-with-an-undefine.patch b/FernFlower-Patches/0016-Fix-JVM-differences-printing-floats-with-an-undefine.patch
index 657d46d..ec21eb4 100644
--- a/FernFlower-Patches/0016-Fix-JVM-differences-printing-floats-with-an-undefine.patch
+++ b/FernFlower-Patches/0016-Fix-JVM-differences-printing-floats-with-an-undefine.patch
@@ -1,8 +1,8 @@
-From b44392c8602fca4597fc52d98955a3be4d32ee77 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Mon, 3 Aug 2015 15:43:39 -0700
-Subject: Fix JVM differences printing floats with an undefined number of
- trailing zeros. (Some JVMs do 0.1F and some do 0.10F)
+Subject: [PATCH] Fix JVM differences printing floats with an undefined number
+ of trailing zeros. (Some JVMs do 0.1F and some do 0.10F)
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
@@ -85,6 +85,3 @@ index 4b9b687382d96886a1a954e0fa179211843d45a8..5a751f91d28558268fc18f6f4630338c
 -  
 +
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0017-Sort-local-variables-and-variable-definitions.-Again.patch b/FernFlower-Patches/0017-Sort-local-variables-and-variable-definitions.-Again.patch
index c171f85..22eb2ae 100644
--- a/FernFlower-Patches/0017-Sort-local-variables-and-variable-definitions.-Again.patch
+++ b/FernFlower-Patches/0017-Sort-local-variables-and-variable-definitions.-Again.patch
@@ -1,8 +1,8 @@
-From 0ecec99fee439f1f018c51826f4105c7753af7f2 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Mon, 3 Aug 2015 17:26:00 -0700
-Subject: Sort local variables and variable definitions. Again, different JVMs
- sort hash sets differently causing different variable names.
+Subject: [PATCH] Sort local variables and variable definitions. Again,
+ different JVMs sort hash sets differently causing different variable names.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -140,6 +140,3 @@ index 31f0f86d4423ac537faf31b7f16833f263801b23..4751052a5468ffc469d7166bce648d5b
  
        if (pair.version >= 0) {
          int newIndex = pair.version == 1 ? pair.var : counters.getCounterAndIncrement(CounterContainer.VAR_COUNTER);
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0018-No-Synthetic-classes-allowed-in-parameters.patch b/FernFlower-Patches/0018-No-Synthetic-classes-allowed-in-parameters.patch
index b5eb772..01d3071 100644
--- a/FernFlower-Patches/0018-No-Synthetic-classes-allowed-in-parameters.patch
+++ b/FernFlower-Patches/0018-No-Synthetic-classes-allowed-in-parameters.patch
@@ -1,7 +1,7 @@
-From f373923f5a6d05f0c6d2f42ad4a8d00af6fefd1c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Mon, 3 Aug 2015 21:20:43 -0700
-Subject: No Synthetic classes allowed in parameters -.-
+Subject: [PATCH] No Synthetic classes allowed in parameters -.-
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
@@ -30,6 +30,3 @@ index 0297a55fc16eb3eddc0e458bfa49325f563fd613..51137cc3c2f5756e688d910ed405cccb
                      break;  // skip last parameter of synthetic constructor call
                    }
                  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0019-Change-LVT-indexing-to-VarVersionPair.patch b/FernFlower-Patches/0019-Change-LVT-indexing-to-VarVersionPair.patch
index 1604b06..12bed9a 100644
--- a/FernFlower-Patches/0019-Change-LVT-indexing-to-VarVersionPair.patch
+++ b/FernFlower-Patches/0019-Change-LVT-indexing-to-VarVersionPair.patch
@@ -1,7 +1,7 @@
-From f3b023e5db4654cb1201528f0633545592f2f610 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Tue, 4 Aug 2015 21:50:19 -0700
-Subject: Change LVT indexing to VarVersionPair
+Subject: [PATCH] Change LVT indexing to VarVersionPair
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
@@ -133,6 +133,3 @@ index 04f534ed5482d8778826437dafd6979085a3fb65..5f55537fc80d50a1b22919165eb117f5
      return mapVarNames;
    }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0020-Convert-Exprent.bytecode-to-a-BitMap-as-it-gives-bet.patch b/FernFlower-Patches/0020-Convert-Exprent.bytecode-to-a-BitMap-as-it-gives-bet.patch
index 431cde6..c2d7eed 100644
--- a/FernFlower-Patches/0020-Convert-Exprent.bytecode-to-a-BitMap-as-it-gives-bet.patch
+++ b/FernFlower-Patches/0020-Convert-Exprent.bytecode-to-a-BitMap-as-it-gives-bet.patch
@@ -1,11 +1,10 @@
-From 814dc4a3267ceceb892d6fa84de99f2311274400 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 6 Aug 2015 12:18:10 -0700
-Subject: =?UTF-8?q?Convert=20Exprent.bytecode=20to=20a=20BitMap,=20as=20it?=
- =?UTF-8?q?=20gives=20better=20speed=20and=20functionality.=0AAdded=20meth?=
- =?UTF-8?q?od=20to=20gather=20bytecode=20markers=20for=20every=20exporessi?=
- =?UTF-8?q?on.=20Allows=20us=20to=20get=20the=20bytecode=20offsets=20for?=
- =?UTF-8?q?=20an=20entire=20block=20of=20code.?=
+Subject: [PATCH] Convert Exprent.bytecode to a BitMap, as it gives better
+ speed and functionality. Added method to gather bytecode markers for every
+ exporession. Allows us to get the bytecode offsets for an entire block of
+ code.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
@@ -851,6 +850,3 @@ index ba8218263a2b293825c4875f972c67d36baeba80..30a7a8ff1ba852dbe1b522c4b99e5efd
      }
    }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0021-Seperate-the-LVT-data-from-the-Struct-for-easier-abi.patch b/FernFlower-Patches/0021-Seperate-the-LVT-data-from-the-Struct-for-easier-abi.patch
index 45b1fe2..6a6d369 100644
--- a/FernFlower-Patches/0021-Seperate-the-LVT-data-from-the-Struct-for-easier-abi.patch
+++ b/FernFlower-Patches/0021-Seperate-the-LVT-data-from-the-Struct-for-easier-abi.patch
@@ -1,8 +1,8 @@
-From 635b7b9fccfa0208ecb581cda039124cdd50eb9c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 6 Aug 2015 13:52:24 -0700
-Subject: Seperate the LVT data from the Struct for easier ability to pass
- around.
+Subject: [PATCH] Seperate the LVT data from the Struct for easier ability to
+ pass around.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
@@ -323,6 +323,3 @@ index 5f55537fc80d50a1b22919165eb117f51f0b86b8..44557858b5cf5ef1a6b05c79c34bb41f
 +    return lvt == null ? EMPTY_LVT : lvt.getMapVarNames();
    }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0022-Aded-debug-printer-to-MethodProcessorRunnable-for-th.patch b/FernFlower-Patches/0022-Aded-debug-printer-to-MethodProcessorRunnable-for-th.patch
index 66aa87e..55dc412 100644
--- a/FernFlower-Patches/0022-Aded-debug-printer-to-MethodProcessorRunnable-for-th.patch
+++ b/FernFlower-Patches/0022-Aded-debug-printer-to-MethodProcessorRunnable-for-th.patch
@@ -1,7 +1,8 @@
-From 7f9bb7d21c105347ab987df050eb7458ac8ab1f5 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 6 Aug 2015 17:01:25 -0700
-Subject: Aded debug printer to MethodProcessorRunnable for the method outline.
+Subject: [PATCH] Aded debug printer to MethodProcessorRunnable for the method
+ outline.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
@@ -170,6 +171,3 @@ index 1c90fb6fc41b20e8b295201cfdb69abb63463bd0..dc6f2f0e61563f8132d99b70d3d81278
 +    }
 +  }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0023-A-scoping-test-simpler-than-the-complex-one-almost-p.patch b/FernFlower-Patches/0023-A-scoping-test-simpler-than-the-complex-one-almost-p.patch
index 953e3e4..8ebdb2e 100644
--- a/FernFlower-Patches/0023-A-scoping-test-simpler-than-the-complex-one-almost-p.patch
+++ b/FernFlower-Patches/0023-A-scoping-test-simpler-than-the-complex-one-almost-p.patch
@@ -1,7 +1,7 @@
-From d72455431b4c610f5c9768a2f27c7adffcc7f086 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sat, 8 Aug 2015 13:37:49 -0400
-Subject: A scoping test, simpler than the complex one, almost passes.
+Subject: [PATCH] A scoping test, simpler than the complex one, almost passes.
 
 
 diff --git a/testData/classes/pkg/TestLVTScoping.class b/testData/classes/pkg/TestLVTScoping.class
@@ -106,6 +106,3 @@ index 0000000000000000000000000000000000000000..ab57832c2f3df13a4ae9da2af193c2d6
 +        }
 +    }
 +}
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0024-Add-the-test-to-the-harness.patch b/FernFlower-Patches/0024-Add-the-test-to-the-harness.patch
index eb06b45..4daad76 100644
--- a/FernFlower-Patches/0024-Add-the-test-to-the-harness.patch
+++ b/FernFlower-Patches/0024-Add-the-test-to-the-harness.patch
@@ -1,7 +1,7 @@
-From 1314b694ee1457fd6e9a91adcfa910ef9549faf0 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sat, 8 Aug 2015 13:43:47 -0400
-Subject: Add the test to the harness
+Subject: [PATCH] Add the test to the harness
 
 
 diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
@@ -14,6 +14,3 @@ index 2d39827fabef8a71133de494460a0c67f4ae9f8b..983368c25695ab8bbf090fa01e6d8df9
    @Test public void testMatch1() { doTest("pkg/TestLVT"); }
 +  @Test public void testMatch2() { doTest("pkg/TestLVTScoping"); }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0025-Some-modifications-to-the-printout.-Also-fixed-a-fas.patch b/FernFlower-Patches/0025-Some-modifications-to-the-printout.-Also-fixed-a-fas.patch
index 0b083cf..ee45722 100644
--- a/FernFlower-Patches/0025-Some-modifications-to-the-printout.-Also-fixed-a-fas.patch
+++ b/FernFlower-Patches/0025-Some-modifications-to-the-printout.-Also-fixed-a-fas.patch
@@ -1,13 +1,11 @@
-From cca06e0f3dd96dd8f0412628e2ee33359c461179 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sat, 8 Aug 2015 16:13:27 -0400
-Subject: =?UTF-8?q?Some=20modifications=20to=20the=20printout.=20Also,=20f?=
- =?UTF-8?q?ixed=20a=20fascinating=20bug=20in=20VarVersionsProcessor=20wher?=
- =?UTF-8?q?e=20it=20dumped=20the=20original=20indexes=20because=0AsetVarVe?=
- =?UTF-8?q?rsions=20is=20called=20multiple=20times=20(seems=20to=20be=20so?=
- =?UTF-8?q?me=20sort=20of=20reparse=20loop).=20Preserving=20an=20existing?=
- =?UTF-8?q?=20origvarstable=20across=20the=0Athat=20method=20seems=20to=20?=
- =?UTF-8?q?have=20improved=20accuracy=20a=20LOT.?=
+Subject: [PATCH] Some modifications to the printout. Also, fixed a fascinating
+ bug in VarVersionsProcessor where it dumped the original indexes because
+ setVarVersions is called multiple times (seems to be some sort of reparse
+ loop). Preserving an existing origvarstable across the that method seems to
+ have improved accuracy a LOT.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
@@ -255,6 +253,3 @@ index 44557858b5cf5ef1a6b05c79c34bb41f6ae6e5eb..4b00061fcee269a40b24f80b6147d494
 +    return lvt;
 +}
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0026-Change-to-track-the-varversionpair-in-the-oldnames-t.patch b/FernFlower-Patches/0026-Change-to-track-the-varversionpair-in-the-oldnames-t.patch
index 97c4198..c6652e3 100644
--- a/FernFlower-Patches/0026-Change-to-track-the-varversionpair-in-the-oldnames-t.patch
+++ b/FernFlower-Patches/0026-Change-to-track-the-varversionpair-in-the-oldnames-t.patch
@@ -1,10 +1,9 @@
-From 67a6f1d47bd5780221f7a545e899430cfc82e9be Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sat, 8 Aug 2015 17:22:07 -0400
-Subject: =?UTF-8?q?Change=20to=20track=20the=20varversionpair=20in=20the?=
- =?UTF-8?q?=20"oldnames"=20table.=20Track=20if=20we=20have=20an=20lvt=20en?=
- =?UTF-8?q?try=20when=20generating=20names=0Aand=20trust=20it's=20name=20e?=
- =?UTF-8?q?xactly.?=
+Subject: [PATCH] Change to track the varversionpair in the "oldnames" table.
+ Track if we have an lvt entry when generating names and trust it's name
+ exactly.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
@@ -117,6 +116,3 @@ index 0de789a6f2278edc1e327d741b800fdba4a9dfcc..eae4cbac7b5074685e16cb6738434e11
      return mapOriginalVarIndices;
    }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0027-Sort-by-version-it-seems-that-it-increases-as-the-vi.patch b/FernFlower-Patches/0027-Sort-by-version-it-seems-that-it-increases-as-the-vi.patch
index 8488a6b..4834c57 100644
--- a/FernFlower-Patches/0027-Sort-by-version-it-seems-that-it-increases-as-the-vi.patch
+++ b/FernFlower-Patches/0027-Sort-by-version-it-seems-that-it-increases-as-the-vi.patch
@@ -1,12 +1,10 @@
-From b75a7c5fc84e6da8582a01e6a772572eaf1dcdc4 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sat, 8 Aug 2015 19:43:37 -0400
-Subject: =?UTF-8?q?Sort=20by=20version=20(it=20seems=20that=20it=20increas?=
- =?UTF-8?q?es=20as=20the=20visitors=20visit=20the=20various=20methods),=20?=
- =?UTF-8?q?and=20use=20that=20to=0Aalign=20versions=20with=20different=20i?=
- =?UTF-8?q?nstances=20of=20the=20same=20variable.=20Still=20some=20tweaks?=
- =?UTF-8?q?=20need=20to=20be=20made,=20but=0Ait's=20starting=20to=20look?=
- =?UTF-8?q?=20promising.?=
+Subject: [PATCH] Sort by version (it seems that it increases as the visitors
+ visit the various methods), and use that to align versions with different
+ instances of the same variable. Still some tweaks need to be made, but it's
+ starting to look promising.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
@@ -140,6 +138,3 @@ index 4b00061fcee269a40b24f80b6147d4940caa9db6..a983b2788c5ccb570539a28eca0acf4c
      return lvt == null ? EMPTY_LVT : lvt.getMapVarNames();
    }
  
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0028-Ignore-variables-without-an-LVT-entry.-They-re-likel.patch b/FernFlower-Patches/0028-Ignore-variables-without-an-LVT-entry.-They-re-likel.patch
index 0f7a51e..f7921c2 100644
--- a/FernFlower-Patches/0028-Ignore-variables-without-an-LVT-entry.-They-re-likel.patch
+++ b/FernFlower-Patches/0028-Ignore-variables-without-an-LVT-entry.-They-re-likel.patch
@@ -1,10 +1,9 @@
-From 1f19690b00959c237600d3fac5ae0a28d8e4045f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 9 Aug 2015 11:58:54 -0400
-Subject: =?UTF-8?q?Ignore=20variables=20without=20an=20LVT=20entry.=20They?=
- =?UTF-8?q?'re=20likely=20dummy=20vars=20generated=20by=20FF=20for=20excep?=
- =?UTF-8?q?tions,=20little=20info=20is=20missing.=0AAlso,=20don't=20except?=
- =?UTF-8?q?ion=20on=20empty=20blocks,=20they're=20just=20empty=20blocks!?=
+Subject: [PATCH] Ignore variables without an LVT entry. They're likely dummy
+ vars generated by FF for exceptions, little info is missing. Also, don't
+ exception on empty blocks, they're just empty blocks!
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
@@ -185,6 +184,3 @@ index 0000000000000000000000000000000000000000..c7e781e4172f736a831b857ca7fd3060
 +    }
 +  }
 +}
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0029-TryCatch-statements-will-now-use-the-correct-variabl.patch b/FernFlower-Patches/0029-TryCatch-statements-will-now-use-the-correct-variabl.patch
index 197a521..cb1ef4d 100644
--- a/FernFlower-Patches/0029-TryCatch-statements-will-now-use-the-correct-variabl.patch
+++ b/FernFlower-Patches/0029-TryCatch-statements-will-now-use-the-correct-variabl.patch
@@ -1,9 +1,8 @@
-From 5f699acc70d8e40f758737ae88aeddecc07edc8c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 9 Aug 2015 15:04:04 -0700
-Subject: =?UTF-8?q?TryCatch=20statements=20will=20now=20use=20the=20correc?=
- =?UTF-8?q?t=20variable=20index=20for=20their=20exception=20variable.=0ASo?=
- =?UTF-8?q?me=20small=20cleanups=20and=20NPE=20fix.?=
+Subject: [PATCH] TryCatch statements will now use the correct variable index
+ for their exception variable. Some small cleanups and NPE fix.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -243,6 +242,3 @@ index 772a76e8a850ff853ef51acb29d82a1ba95dfee6..fbe5782266c4dbcdb4d5558b31736252
        } finally {
           System.out.println("Finally");// 55
        }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0030-Add-enhanced-ForEach-loop-detection-and-re-introduce.patch b/FernFlower-Patches/0030-Add-enhanced-ForEach-loop-detection-and-re-introduce.patch
index db467fe..e0a902d 100644
--- a/FernFlower-Patches/0030-Add-enhanced-ForEach-loop-detection-and-re-introduce.patch
+++ b/FernFlower-Patches/0030-Add-enhanced-ForEach-loop-detection-and-re-introduce.patch
@@ -1,8 +1,8 @@
-From 143b1e688e6e73e0f54be08e2c381c740c75fd13 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 13 Aug 2015 16:03:24 -0700
-Subject: Add enhanced ForEach loop detection and re-introduce the DotExporter
- for debugging.
+Subject: [PATCH] Add enhanced ForEach loop detection and re-introduce the
+ DotExporter for debugging.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
@@ -782,6 +782,3 @@ index 0000000000000000000000000000000000000000..0d417185f4cc38e8c9804120a31c7cbc
 +  }
 +}
 \ No newline at end of file
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0031-Fix-permissions-on-gradlew.-It-s-writeable-on-linux.patch b/FernFlower-Patches/0031-Fix-permissions-on-gradlew.-It-s-writeable-on-linux.patch
index e5a9493..b017e58 100644
--- a/FernFlower-Patches/0031-Fix-permissions-on-gradlew.-It-s-writeable-on-linux.patch
+++ b/FernFlower-Patches/0031-Fix-permissions-on-gradlew.-It-s-writeable-on-linux.patch
@@ -1,12 +1,9 @@
-From 1326398474ddba2211b73412ca7be68ba9c32342 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Thu, 13 Aug 2015 17:06:24 -0700
-Subject: Fix permissions on gradlew. It's writeable on linux.
+Subject: [PATCH] Fix permissions on gradlew. It's writeable on linux.
 
 
 diff --git a/gradlew b/gradlew
 old mode 100644
 new mode 100755
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0032-Partially-revert-TryCatch-statements-will-now-use-th.patch b/FernFlower-Patches/0032-Partially-revert-TryCatch-statements-will-now-use-th.patch
index 4becf27..096f5c6 100644
--- a/FernFlower-Patches/0032-Partially-revert-TryCatch-statements-will-now-use-th.patch
+++ b/FernFlower-Patches/0032-Partially-revert-TryCatch-statements-will-now-use-th.patch
@@ -1,9 +1,9 @@
-From 52c5082cd65ed6436412b97c742edf08878890f8 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Thu, 13 Aug 2015 21:45:39 -0700
-Subject: =?UTF-8?q?Partially=20revert=20"TryCatch=20statements=20will=20no?=
- =?UTF-8?q?w=20use=20the=20correct=20variable=20index=20for=20their=20exce?=
- =?UTF-8?q?ption=20variable."=0A(rolled=20back=20catch=20changes)?=
+Subject: [PATCH] Partially revert "TryCatch statements will now use the
+ correct variable index for their exception variable." (rolled back catch
+ changes)
 
 This reverts commit 5f699acc70d8e40f758737ae88aeddecc07edc8c.
 
@@ -104,6 +104,3 @@ index fbe5782266c4dbcdb4d5558b3173625228f71038..772a76e8a850ff853ef51acb29d82a1b
        } finally {
           System.out.println("Finally");// 55
        }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0033-Added-a-test-for-variables-that-seem-to-come-into-sc.patch b/FernFlower-Patches/0033-Added-a-test-for-variables-that-seem-to-come-into-sc.patch
index b37cdb5..05829ff 100644
--- a/FernFlower-Patches/0033-Added-a-test-for-variables-that-seem-to-come-into-sc.patch
+++ b/FernFlower-Patches/0033-Added-a-test-for-variables-that-seem-to-come-into-sc.patch
@@ -1,8 +1,8 @@
-From 1d9d7cdb8476a39a10b588465f749347b9d1c713 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Thu, 13 Aug 2015 22:57:55 -0700
-Subject: Added a test for variables that seem to come into scope if we remove
- VarVersionsProcessor.simpleMerge
+Subject: [PATCH] Added a test for variables that seem to come into scope if we
+ remove VarVersionsProcessor.simpleMerge
 
 
 diff --git a/testData/classes/pkg/TestLVT.class b/testData/classes/pkg/TestLVT.class
@@ -56,6 +56,3 @@ index 05b5228e223eb20be14622126efdb7461c0e1bdf..9a462728bd07fca82b96a7511882523f
 +    	System.out.println(a+b);
 +    }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0034-Hook-in-LVT-to-VarExprent-and-print-generic-types.patch b/FernFlower-Patches/0034-Hook-in-LVT-to-VarExprent-and-print-generic-types.patch
index 37cf545..eb50505 100644
--- a/FernFlower-Patches/0034-Hook-in-LVT-to-VarExprent-and-print-generic-types.patch
+++ b/FernFlower-Patches/0034-Hook-in-LVT-to-VarExprent-and-print-generic-types.patch
@@ -1,7 +1,7 @@
-From c45318da6da9d2d073e1979350e67042d03d4b81 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Fri, 14 Aug 2015 15:56:08 -0700
-Subject: Hook in LVT to VarExprent and print generic types.
+Subject: [PATCH] Hook in LVT to VarExprent and print generic types.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
@@ -272,6 +272,3 @@ index a654359296bac48d1cc7316987849bd7bd5b8be5..771ec7add154d7897fa54ac46d91e66e
 -}
 +  }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0035-Make-Loop-Enhancement-retain-all-bytecode-data.-And-.patch b/FernFlower-Patches/0035-Make-Loop-Enhancement-retain-all-bytecode-data.-And-.patch
index 78e050b..86f430c 100644
--- a/FernFlower-Patches/0035-Make-Loop-Enhancement-retain-all-bytecode-data.-And-.patch
+++ b/FernFlower-Patches/0035-Make-Loop-Enhancement-retain-all-bytecode-data.-And-.patch
@@ -1,7 +1,7 @@
-From fff1261eeb1e19a8f57fea9b1a81bce7894f9aef Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Tue, 25 Aug 2015 12:03:36 -0700
-Subject: Make Loop Enhancement retain all bytecode data. And support
+Subject: [PATCH] Make Loop Enhancement retain all bytecode data. And support
  iterator/listIterator.
 
 
@@ -266,6 +266,3 @@ index d994c26c65b45e18e54622865e3bc454b22feb0a..3172b5e6754fc9e2d5570f1d7110dc45
 +           isInvoke(exp, "java/util/ListIterator", "next", "()Ljava/lang/Object;");
 +  }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0036-Add-step-to-VarDefintionHelper-that-splits-variables.patch b/FernFlower-Patches/0036-Add-step-to-VarDefintionHelper-that-splits-variables.patch
index 83cbbb0..fd00d3b 100644
--- a/FernFlower-Patches/0036-Add-step-to-VarDefintionHelper-that-splits-variables.patch
+++ b/FernFlower-Patches/0036-Add-step-to-VarDefintionHelper-that-splits-variables.patch
@@ -1,9 +1,10 @@
-From 5d42ed490c525d168d6d2f9d727610aa6262237c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Tue, 25 Aug 2015 12:05:24 -0700
-Subject: Add step to VarDefintionHelper that splits variables out as best it
- can. For now ForEach loops are forced to seperate variables. Also attempt to
- attach LVT information EVERY VarExprent in the method not just in head.
+Subject: [PATCH] Add step to VarDefintionHelper that splits variables out as
+ best it can. For now ForEach loops are forced to seperate variables. Also
+ attempt to attach LVT information EVERY VarExprent in the method not just in
+ head.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
@@ -487,6 +488,3 @@ index 0a619d023d4413f969517f8a60ef816be1173fb7..a8ad01909d5ccd56cdadbd7ecab087a6
 +    varVersions.getMapOriginalVarIndices().put(to.var, varVersions.getMapOriginalVarIndices().get(from.var));
 +  }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0037-Lex-s-tests.patch b/FernFlower-Patches/0037-Lex-s-tests.patch
index c878b13..5b908ba 100644
--- a/FernFlower-Patches/0037-Lex-s-tests.patch
+++ b/FernFlower-Patches/0037-Lex-s-tests.patch
@@ -1,7 +1,7 @@
-From 9f908e30826e71247955a0c38f1154d8065073ec Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Thu, 27 Aug 2015 15:39:39 -0400
-Subject: Lex's tests
+Subject: [PATCH] Lex's tests
 
 
 diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
@@ -261,6 +261,3 @@ index 0000000000000000000000000000000000000000..e04de1e8d82f6162e49d4735b6e43355
 +        };
 +    }
 +}
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0038-Fix-inverted-null-test.patch b/FernFlower-Patches/0038-Fix-inverted-null-test.patch
index 6305ca5..76155e8 100644
--- a/FernFlower-Patches/0038-Fix-inverted-null-test.patch
+++ b/FernFlower-Patches/0038-Fix-inverted-null-test.patch
@@ -1,7 +1,7 @@
-From f023a4410692d9e353b0ddd61d3072df16fdd18a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Thu, 27 Aug 2015 15:41:47 -0400
-Subject: Fix inverted null test
+Subject: [PATCH] Fix inverted null test
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
@@ -17,6 +17,3 @@ index 1e1a4a7987545d00460cd7e7e17c3bcde6a75df1..d24813f0d9962ed8b0d6efacd251c175
        return;
      }
  
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0039-More-tweaks.-Closer.patch b/FernFlower-Patches/0039-More-tweaks.-Closer.patch
index d0622dd..9143af9 100644
--- a/FernFlower-Patches/0039-More-tweaks.-Closer.patch
+++ b/FernFlower-Patches/0039-More-tweaks.-Closer.patch
@@ -1,7 +1,7 @@
-From de3a686365bc75c89bf8a1cf47d8c9cb9266b7df Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Fri, 11 Sep 2015 21:57:09 -0400
-Subject: More tweaks. Closer!
+Subject: [PATCH] More tweaks. Closer!
 
 
 diff --git a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
@@ -590,6 +590,3 @@ index 9ef5e62bd10b5818a60bf1842c2daa446c84d9d3..285cb14b2b56200d6d9951eb6c8ba726
           for(TestLexManosLVT.Bob b : values()) {
              for(TestLexManosLVT.Bob c : values()) {
                 for(TestLexManosLVT.Bob d : values()) {
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0040-More-tweaks-it-passes-the-TestLVT-tests.patch b/FernFlower-Patches/0040-More-tweaks-it-passes-the-TestLVT-tests.patch
index 36dfbb1..c88e525 100644
--- a/FernFlower-Patches/0040-More-tweaks-it-passes-the-TestLVT-tests.patch
+++ b/FernFlower-Patches/0040-More-tweaks-it-passes-the-TestLVT-tests.patch
@@ -1,7 +1,7 @@
-From d828cac2aee189062bac3731431f33e2a6ba30ca Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Fri, 11 Sep 2015 23:42:09 -0400
-Subject: More tweaks, it passes the TestLVT tests
+Subject: [PATCH] More tweaks, it passes the TestLVT tests
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
@@ -151,6 +151,3 @@ index d68ee3605d37d09a125facde48f3b3e48d3921bf..db41fb8a8ebfb8981c390f6782ca02d9
            return true;
          }
        }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0041-Another-fix-from-lex-merges-RHS-and-LHS-of-exprents.patch b/FernFlower-Patches/0041-Another-fix-from-lex-merges-RHS-and-LHS-of-exprents.patch
index 81516a6..0aa18ed 100644
--- a/FernFlower-Patches/0041-Another-fix-from-lex-merges-RHS-and-LHS-of-exprents.patch
+++ b/FernFlower-Patches/0041-Another-fix-from-lex-merges-RHS-and-LHS-of-exprents.patch
@@ -1,7 +1,7 @@
-From 9ac4c6fcc3a1c13833ad17c41d6c6218ec9059bb Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sat, 12 Sep 2015 00:00:42 -0400
-Subject: Another fix from lex, merges RHS and LHS of exprents
+Subject: [PATCH] Another fix from lex, merges RHS and LHS of exprents
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
@@ -374,6 +374,3 @@ index db41fb8a8ebfb8981c390f6782ca02d974792f95..5a276cdb7e6fcef6c06280edf6080af7
 -}
 +}
 \ No newline at end of file
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0042-need-to-match-both-start-and-end-to-avoid-weirdness-.patch b/FernFlower-Patches/0042-need-to-match-both-start-and-end-to-avoid-weirdness-.patch
index aba7e1a..79fb83a 100644
--- a/FernFlower-Patches/0042-need-to-match-both-start-and-end-to-avoid-weirdness-.patch
+++ b/FernFlower-Patches/0042-need-to-match-both-start-and-end-to-avoid-weirdness-.patch
@@ -1,7 +1,8 @@
-From 09209954680f314ed735818b7f22ca1e81080509 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sat, 12 Sep 2015 00:48:02 -0400
-Subject: need to match both start and end, to avoid weirdness sometimes
+Subject: [PATCH] need to match both start and end, to avoid weirdness
+ sometimes
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
@@ -99,6 +100,3 @@ index 0000000000000000000000000000000000000000..23a3929a12446772fb3e351962239258
 +        return start * 31 + end;
 +    }
 +}
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0043-Better-remapping-of-assignment-merges.patch b/FernFlower-Patches/0043-Better-remapping-of-assignment-merges.patch
index 903380e..e62976e 100644
--- a/FernFlower-Patches/0043-Better-remapping-of-assignment-merges.patch
+++ b/FernFlower-Patches/0043-Better-remapping-of-assignment-merges.patch
@@ -1,7 +1,7 @@
-From fcb5e35a68f7155018b1330846e9fe8222f9e39d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Fri, 11 Sep 2015 21:50:11 -0700
-Subject: Better remapping of assignment merges.
+Subject: [PATCH] Better remapping of assignment merges.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
@@ -123,6 +123,3 @@ index 5a276cdb7e6fcef6c06280edf6080af7b5a71d63..2436d6d6bcf284bede78fb2e31a9f4ef
          }
        }
      }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0044-PPMM-test-for-lex.patch b/FernFlower-Patches/0044-PPMM-test-for-lex.patch
index aa9a2fa..1c9514c 100644
--- a/FernFlower-Patches/0044-PPMM-test-for-lex.patch
+++ b/FernFlower-Patches/0044-PPMM-test-for-lex.patch
@@ -1,7 +1,7 @@
-From ab0b5409d7cacdc6d9c208de4657377a4a259c05 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 13 Sep 2015 18:25:07 -0400
-Subject: PPMM test for lex
+Subject: [PATCH] PPMM test for lex
 
 
 diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
@@ -55,6 +55,3 @@ index 0000000000000000000000000000000000000000..02eecf4b565584b5644ad58985655934
 +    }
 +}
 \ No newline at end of file
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0045-Change-begin-end-detection.-Less-derpy.patch b/FernFlower-Patches/0045-Change-begin-end-detection.-Less-derpy.patch
index 8c9d51a..f55ca2a 100644
--- a/FernFlower-Patches/0045-Change-begin-end-detection.-Less-derpy.patch
+++ b/FernFlower-Patches/0045-Change-begin-end-detection.-Less-derpy.patch
@@ -1,7 +1,7 @@
-From 78afb4580567df9f7d1e6245dc9735eba714a3b2 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 13 Sep 2015 18:26:04 -0400
-Subject: Change begin/end detection. Less derpy.
+Subject: [PATCH] Change begin/end detection. Less derpy.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
@@ -293,6 +293,3 @@ index 2436d6d6bcf284bede78fb2e31a9f4efd2578d20..56061fe881f6c9f0e78a27ac62613136
          }
        }
      }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0046-Fixup-NPE-from-PPMM-helper-and-expand-PPMM-test-to-i.patch b/FernFlower-Patches/0046-Fixup-NPE-from-PPMM-helper-and-expand-PPMM-test-to-i.patch
index 86a6fc7..c0f2a3f 100644
--- a/FernFlower-Patches/0046-Fixup-NPE-from-PPMM-helper-and-expand-PPMM-test-to-i.patch
+++ b/FernFlower-Patches/0046-Fixup-NPE-from-PPMM-helper-and-expand-PPMM-test-to-i.patch
@@ -1,8 +1,8 @@
-From 7e027aef8ba2caaee9f3e93412274b7073b8f6a7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 13 Sep 2015 17:49:00 -0700
-Subject: Fixup NPE from PPMM helper, and expand PPMM test to include more edge
- cases.
+Subject: [PATCH] Fixup NPE from PPMM helper, and expand PPMM test to include
+ more edge cases.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
@@ -234,6 +234,3 @@ index 02eecf4b565584b5644ad5898565593494aad285..21c7f2eab8296554f3fdb5d23efba483
 +   }
  }
 \ No newline at end of file
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0047-Prevent-infinite-loops-in-PPMM.patch b/FernFlower-Patches/0047-Prevent-infinite-loops-in-PPMM.patch
index 676e71e..7877368 100644
--- a/FernFlower-Patches/0047-Prevent-infinite-loops-in-PPMM.patch
+++ b/FernFlower-Patches/0047-Prevent-infinite-loops-in-PPMM.patch
@@ -1,7 +1,7 @@
-From 613a1873954a310ee5ee18be6db5790e6ec74ba0 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 13 Sep 2015 18:19:20 -0700
-Subject: Prevent infinite loops in PPMM.
+Subject: [PATCH] Prevent infinite loops in PPMM.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
@@ -21,6 +21,3 @@ index f39946d1c839333a69c91521f6714b183028567d..db70f64a91a21c04b1277b6da9b38ef7
                }
                return ret;
              }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0050-Types-are-merged-properly-now.patch b/FernFlower-Patches/0048-Types-are-merged-properly-now.patch
similarity index 98%
rename from FernFlower-Patches/0050-Types-are-merged-properly-now.patch
rename to FernFlower-Patches/0048-Types-are-merged-properly-now.patch
index da2896d..7aebca2 100644
--- a/FernFlower-Patches/0050-Types-are-merged-properly-now.patch
+++ b/FernFlower-Patches/0048-Types-are-merged-properly-now.patch
@@ -1,7 +1,7 @@
-From 38305edba97b6b5ae23d451ffb9d5dee9dc4bcf4 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Mon, 14 Sep 2015 00:42:17 -0400
-Subject: Types are merged properly now
+Subject: [PATCH] Types are merged properly now
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
@@ -151,6 +151,3 @@ index 0000000000000000000000000000000000000000..1847aa2fba0c10776a33ee85c2bb0be6
 +        i+=500;
 +    }
 +}
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0051-More-merging.-It-does-some-things-better.-But-still-.patch b/FernFlower-Patches/0049-More-merging.-It-does-some-things-better.-But-still-.patch
similarity index 97%
rename from FernFlower-Patches/0051-More-merging.-It-does-some-things-better.-But-still-.patch
rename to FernFlower-Patches/0049-More-merging.-It-does-some-things-better.-But-still-.patch
index aa4723d..55ca90b 100644
--- a/FernFlower-Patches/0051-More-merging.-It-does-some-things-better.-But-still-.patch
+++ b/FernFlower-Patches/0049-More-merging.-It-does-some-things-better.-But-still-.patch
@@ -1,8 +1,8 @@
-From f88735d87e1dc889676151707ce066420475da78 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Wed, 16 Sep 2015 00:49:12 -0400
-Subject: More merging. It does some things better. But still not anywhere near
- good enough :(
+Subject: [PATCH] More merging. It does some things better. But still not
+ anywhere near good enough :(
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
@@ -134,6 +134,3 @@ index 7abcec8a356fa92f2bc18bf2dc24fc3defac3a38..8c42c0c192cd73d7aef3632e22eaa74a
          }
        }
      }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0052-More-tweaks-to-merging.-It-s-pretty-decent.-But-stil.patch b/FernFlower-Patches/0050-More-tweaks-to-merging.-It-s-pretty-decent.-But-stil.patch
similarity index 92%
rename from FernFlower-Patches/0052-More-tweaks-to-merging.-It-s-pretty-decent.-But-stil.patch
rename to FernFlower-Patches/0050-More-tweaks-to-merging.-It-s-pretty-decent.-But-stil.patch
index 9894794..6923ebe 100644
--- a/FernFlower-Patches/0052-More-tweaks-to-merging.-It-s-pretty-decent.-But-stil.patch
+++ b/FernFlower-Patches/0050-More-tweaks-to-merging.-It-s-pretty-decent.-But-stil.patch
@@ -1,8 +1,8 @@
-From 8ac9ea89c0f38c0fd16568424e3ae274f709ca5f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Thu, 17 Sep 2015 17:13:17 -0400
-Subject: More tweaks to merging. It's pretty decent. But still no where near
- good enough.
+Subject: [PATCH] More tweaks to merging. It's pretty decent. But still no
+ where near good enough.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
@@ -44,6 +44,3 @@ index 8c42c0c192cd73d7aef3632e22eaa74a3fff20e1..ca27e4718c556a478242a60df896f6f6
          }
        }
      }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0053-New-aproach-to-merging-variables.-Use-top-down-manua.patch b/FernFlower-Patches/0051-New-aproach-to-merging-variables.-Use-top-down-manua.patch
similarity index 99%
rename from FernFlower-Patches/0053-New-aproach-to-merging-variables.-Use-top-down-manua.patch
rename to FernFlower-Patches/0051-New-aproach-to-merging-variables.-Use-top-down-manua.patch
index bef0d0b..4864bc9 100644
--- a/FernFlower-Patches/0053-New-aproach-to-merging-variables.-Use-top-down-manua.patch
+++ b/FernFlower-Patches/0051-New-aproach-to-merging-variables.-Use-top-down-manua.patch
@@ -1,7 +1,8 @@
-From 42cf0ce83e1c02a459430065811093cd923073b4 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Fri, 18 Sep 2015 14:36:48 -0700
-Subject: New aproach to merging variables. Use top down manual scoping. 341
+Subject: [PATCH] New aproach to merging variables. Use top down manual
+ scoping. 341
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
@@ -526,6 +527,3 @@ index ca27e4718c556a478242a60df896f6f61db6e915..0c03cd52d3ab4b664545ebf8c57faa93
    }
  }
 \ No newline at end of file
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0054-If-it-s-a-null-constant-don-t-give-it-a-type.-Cleans.patch b/FernFlower-Patches/0052-If-it-s-a-null-constant-don-t-give-it-a-type.-Cleans.patch
similarity index 93%
rename from FernFlower-Patches/0054-If-it-s-a-null-constant-don-t-give-it-a-type.-Cleans.patch
rename to FernFlower-Patches/0052-If-it-s-a-null-constant-don-t-give-it-a-type.-Cleans.patch
index b74f34c..98a17cd 100644
--- a/FernFlower-Patches/0054-If-it-s-a-null-constant-don-t-give-it-a-type.-Cleans.patch
+++ b/FernFlower-Patches/0052-If-it-s-a-null-constant-don-t-give-it-a-type.-Cleans.patch
@@ -1,8 +1,8 @@
-From a0351b03097955eeac9fc6cba0e22242365280b5 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Thu, 24 Sep 2015 00:00:19 -0400
-Subject: If it's a null constant, don't give it a type. Cleans up some more
- errors.
+Subject: [PATCH] If it's a null constant, don't give it a type. Cleans up some
+ more errors.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
@@ -45,6 +45,3 @@ index d2a8f1c20c8a7954d4ba22d17fc1584d3bd4a3ca..52428c70df9fe4166129c11eacd4d19c
 +//  @Test public void testMCAbstractTexture() { doTest("net/minecraft/client/resources/AbstractResourcePack"); }
 +  @Test public void testMCGuiShareToLan() { doTest("net/minecraft/client/gui/GuiShareToLan"); }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0055-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch b/FernFlower-Patches/0053-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch
similarity index 97%
rename from FernFlower-Patches/0055-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch
rename to FernFlower-Patches/0053-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch
index dc7fe6b..63d7e0b 100644
--- a/FernFlower-Patches/0055-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch
+++ b/FernFlower-Patches/0053-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch
@@ -1,8 +1,8 @@
-From b065f7aef331543501429be47e0f36a22933c617 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Thu, 24 Sep 2015 12:48:31 -0400
-Subject: Bind the LVTs at the time we create the exprents. The offset is
- absolute at that point, and won't be incorrect.
+Subject: [PATCH] Bind the LVTs at the time we create the exprents. The offset
+ is absolute at that point, and won't be incorrect.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -145,6 +145,3 @@ index 52428c70df9fe4166129c11eacd4d19c2d7196e3..d4771bb0b063154fd4e38ac3d68ed3c0
 +//  @Test public void testMCAbstractResourcePack() { doTest("net/minecraft/client/resources/AbstractResourcePack"); }
 +//  @Test public void testMCGuiShareToLan() { doTest("net/minecraft/client/gui/GuiShareToLan"); }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0056-Some-code-cleanup-damn-cpw.patch b/FernFlower-Patches/0054-Some-code-cleanup-damn-cpw.patch
similarity index 98%
rename from FernFlower-Patches/0056-Some-code-cleanup-damn-cpw.patch
rename to FernFlower-Patches/0054-Some-code-cleanup-damn-cpw.patch
index 2b27a21..a51718f 100644
--- a/FernFlower-Patches/0056-Some-code-cleanup-damn-cpw.patch
+++ b/FernFlower-Patches/0054-Some-code-cleanup-damn-cpw.patch
@@ -1,7 +1,7 @@
-From 97779c0a2088cb5153b21f1b3f4f7459cc9c4ec0 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 27 Sep 2015 21:17:03 -0700
-Subject: Some code cleanup damn cpw
+Subject: [PATCH] Some code cleanup damn cpw
 
 
 diff --git a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
@@ -235,6 +235,3 @@ index 4193f563d90c2fdfee692cf272fb3d3886f72e5b..729a3d2129c0d6765ad7b415bd4bee6c
    }
  }
 \ No newline at end of file
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0057-Propogate-LVT-data-post-merge.-And-fix-injected-var-.patch b/FernFlower-Patches/0055-Propogate-LVT-data-post-merge.-And-fix-injected-var-.patch
similarity index 98%
rename from FernFlower-Patches/0057-Propogate-LVT-data-post-merge.-And-fix-injected-var-.patch
rename to FernFlower-Patches/0055-Propogate-LVT-data-post-merge.-And-fix-injected-var-.patch
index 0f735ac..93905f8 100644
--- a/FernFlower-Patches/0057-Propogate-LVT-data-post-merge.-And-fix-injected-var-.patch
+++ b/FernFlower-Patches/0055-Propogate-LVT-data-post-merge.-And-fix-injected-var-.patch
@@ -1,7 +1,7 @@
-From ec3558a5473045e647365b39187c259e1690042d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 27 Sep 2015 21:17:47 -0700
-Subject: Propogate LVT data post merge. And fix injected var defs LVT
+Subject: [PATCH] Propogate LVT data post merge. And fix injected var defs LVT
  association.
 
 
@@ -264,6 +264,3 @@ index 6d8ab120af2261fa02eccfcced62fdcb5cec79ae..cc5e5e427125ab4673f9aef2a7b56de3
    private VPPEntry mergeVars(Statement stat, Map<Integer, VarVersionPair> parent, Map<Integer, VarVersionPair> leaked, Map<VarVersionPair, VarVersionPair> blacklist) {
      Map<Integer, VarVersionPair> this_vars = new HashMap<Integer, VarVersionPair>();
      if (parent.size() > 0)
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0058-Fix-types-to-use-LVT-first-and-fallback-to-other-typ.patch b/FernFlower-Patches/0056-Fix-types-to-use-LVT-first-and-fallback-to-other-typ.patch
similarity index 95%
rename from FernFlower-Patches/0058-Fix-types-to-use-LVT-first-and-fallback-to-other-typ.patch
rename to FernFlower-Patches/0056-Fix-types-to-use-LVT-first-and-fallback-to-other-typ.patch
index 3abaee8..9820ca4 100644
--- a/FernFlower-Patches/0058-Fix-types-to-use-LVT-first-and-fallback-to-other-typ.patch
+++ b/FernFlower-Patches/0056-Fix-types-to-use-LVT-first-and-fallback-to-other-typ.patch
@@ -1,7 +1,7 @@
-From f6acdf7dd26df4eebb27b2561f62f44e643c5f89 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Mon, 28 Sep 2015 01:26:23 -0400
-Subject: Fix types to use LVT first, and fallback to other type bounds
+Subject: [PATCH] Fix types to use LVT first, and fallback to other type bounds
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
@@ -67,6 +67,3 @@ index d6c746b405f2655725b87e719f885c916818c7e3..4a2cb8f56fd0133cea5c1a7fe52abcba
            }
            else if (expr.type == Exprent.EXPRENT_CONST) {
              ConstExprent constExpr = (ConstExprent)expr;
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0059-NPE-protection-in-LVT-loading.patch b/FernFlower-Patches/0057-NPE-protection-in-LVT-loading.patch
similarity index 88%
rename from FernFlower-Patches/0059-NPE-protection-in-LVT-loading.patch
rename to FernFlower-Patches/0057-NPE-protection-in-LVT-loading.patch
index 646bc0e..a61e292 100644
--- a/FernFlower-Patches/0059-NPE-protection-in-LVT-loading.patch
+++ b/FernFlower-Patches/0057-NPE-protection-in-LVT-loading.patch
@@ -1,7 +1,7 @@
-From 1dfe3bcf3f09d6595a5dbd0bac11056ebad79b4e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 1 Oct 2015 18:03:36 -0700
-Subject: NPE protection in LVT loading.
+Subject: [PATCH] NPE protection in LVT loading.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
@@ -24,6 +24,3 @@ index 771ec7add154d7897fa54ac46d91e66e6ad2ecc5..a95870f4b9de4b87eff9a15b88492e8c
    }
  
    public Map<Integer, List<LVTVariable>> getMapVarNames() {
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0060-Fix-variable-defintions-in-IfStatement-s-headers-hav.patch b/FernFlower-Patches/0058-Fix-variable-defintions-in-IfStatement-s-headers-hav.patch
similarity index 88%
rename from FernFlower-Patches/0060-Fix-variable-defintions-in-IfStatement-s-headers-hav.patch
rename to FernFlower-Patches/0058-Fix-variable-defintions-in-IfStatement-s-headers-hav.patch
index ed9f56a..c597b68 100644
--- a/FernFlower-Patches/0060-Fix-variable-defintions-in-IfStatement-s-headers-hav.patch
+++ b/FernFlower-Patches/0058-Fix-variable-defintions-in-IfStatement-s-headers-hav.patch
@@ -1,7 +1,8 @@
-From 8ea51a091a3d0fa64dbf8fd39d70391c7b7d5f80 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 1 Oct 2015 18:04:09 -0700
-Subject: Fix variable defintions in IfStatement's headers having wrong scope.
+Subject: [PATCH] Fix variable defintions in IfStatement's headers having wrong
+ scope.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
@@ -27,6 +28,3 @@ index cc5e5e427125ab4673f9aef2a7b56de37f0ab113..560328a405e5860dba08daf85f0e957a
              }
              this_vars.putAll(leaked_n);
            }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0061-Detect-if-the-itterator-is-being-used-elseware-befor.patch b/FernFlower-Patches/0059-Detect-if-the-itterator-is-being-used-elseware-befor.patch
similarity index 96%
rename from FernFlower-Patches/0061-Detect-if-the-itterator-is-being-used-elseware-befor.patch
rename to FernFlower-Patches/0059-Detect-if-the-itterator-is-being-used-elseware-befor.patch
index 9fa9014..0ee841e 100644
--- a/FernFlower-Patches/0061-Detect-if-the-itterator-is-being-used-elseware-befor.patch
+++ b/FernFlower-Patches/0059-Detect-if-the-itterator-is-being-used-elseware-befor.patch
@@ -1,8 +1,8 @@
-From de52ba808f928bd138c8cbf29baee707ecf469d3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 1 Oct 2015 20:00:53 -0700
-Subject: Detect if the itterator is being used elseware before creating an
- enhanced for loop.
+Subject: [PATCH] Detect if the itterator is being used elseware before
+ creating an enhanced for loop.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
@@ -117,6 +117,3 @@ index 3172b5e6754fc9e2d5570f1d7110dc452b77b510..5ba4dcd0944696d200a8a5857d7afccc
    private static boolean isType(Exprent exp, int type) { //This is just a helper macro, Wish java had real macros.
      return exp != null && exp.type == type;
    }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0062-NPE-Protection-in-EnumProcessor.patch b/FernFlower-Patches/0060-NPE-Protection-in-EnumProcessor.patch
similarity index 85%
rename from FernFlower-Patches/0062-NPE-Protection-in-EnumProcessor.patch
rename to FernFlower-Patches/0060-NPE-Protection-in-EnumProcessor.patch
index 1301f8c..bdc0032 100644
--- a/FernFlower-Patches/0062-NPE-Protection-in-EnumProcessor.patch
+++ b/FernFlower-Patches/0060-NPE-Protection-in-EnumProcessor.patch
@@ -1,7 +1,7 @@
-From 950b975082f6252b0b3aedf6674f6af9b2951c33 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Fri, 2 Oct 2015 01:32:57 -0700
-Subject: NPE Protection in EnumProcessor
+Subject: [PATCH] NPE Protection in EnumProcessor
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/EnumProcessor.java b/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
@@ -19,6 +19,3 @@ index 37a3384c390209bdbcf46843a4c1a771a24dde18..8956e0ebbe08c761ab14ed61850d767b
      if (stat.getExprents() != null) {
        return stat;
      }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0063-Cleanup-unwanted-variables-in-synchronized-headers.patch b/FernFlower-Patches/0061-Cleanup-unwanted-variables-in-synchronized-headers.patch
similarity index 98%
rename from FernFlower-Patches/0063-Cleanup-unwanted-variables-in-synchronized-headers.patch
rename to FernFlower-Patches/0061-Cleanup-unwanted-variables-in-synchronized-headers.patch
index 0ee653f..ecfb77e 100644
--- a/FernFlower-Patches/0063-Cleanup-unwanted-variables-in-synchronized-headers.patch
+++ b/FernFlower-Patches/0061-Cleanup-unwanted-variables-in-synchronized-headers.patch
@@ -1,7 +1,7 @@
-From 280f466fb5135e0612b0afed08741a0925ee1936 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Fri, 2 Oct 2015 01:34:53 -0700
-Subject: Cleanup unwanted variables in synchronized headers.
+Subject: [PATCH] Cleanup unwanted variables in synchronized headers.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
@@ -261,6 +261,3 @@ index 0000000000000000000000000000000000000000..39ce7ff03344f2c0dc9a23e85663af00
 +    return false;
 +  }
 +}
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0064-Include-LVT-info-in-VarExprent.copy.patch b/FernFlower-Patches/0062-Include-LVT-info-in-VarExprent.copy.patch
similarity index 95%
rename from FernFlower-Patches/0064-Include-LVT-info-in-VarExprent.copy.patch
rename to FernFlower-Patches/0062-Include-LVT-info-in-VarExprent.copy.patch
index a85213c..0168b82 100644
--- a/FernFlower-Patches/0064-Include-LVT-info-in-VarExprent.copy.patch
+++ b/FernFlower-Patches/0062-Include-LVT-info-in-VarExprent.copy.patch
@@ -1,7 +1,7 @@
-From 19773bf44e7d8f1ddbf06fe60ede5677ad698e03 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Fri, 2 Oct 2015 03:10:28 -0700
-Subject: Include LVT info in VarExprent.copy
+Subject: [PATCH] Include LVT info in VarExprent.copy
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
@@ -62,6 +62,3 @@ index bbf17adc460d22b1c91fd54ba88d0e2624c625c4..89f24f365a7c01b7920fd8002dda2ec0
      }
    }
  
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0065-Remove-dowhile-detection-and-restore-do-loop-collaps.patch b/FernFlower-Patches/0063-Remove-dowhile-detection-and-restore-do-loop-collaps.patch
similarity index 92%
rename from FernFlower-Patches/0065-Remove-dowhile-detection-and-restore-do-loop-collaps.patch
rename to FernFlower-Patches/0063-Remove-dowhile-detection-and-restore-do-loop-collaps.patch
index 43a43a2..8793962 100644
--- a/FernFlower-Patches/0065-Remove-dowhile-detection-and-restore-do-loop-collaps.patch
+++ b/FernFlower-Patches/0063-Remove-dowhile-detection-and-restore-do-loop-collaps.patch
@@ -1,9 +1,8 @@
-From 89ea238257bbf10339409978ea26f982fd497090 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Fri, 2 Oct 2015 21:02:44 -0400
-Subject: =?UTF-8?q?Remove=20dowhile=20detection,=20and=20restore=20do=20lo?=
- =?UTF-8?q?op=20collapsing=20code.=20Seems=20to=20eliminate=20a=20lot=20of?=
- =?UTF-8?q?=0Aderpy=20loop=20smashage.?=
+Subject: [PATCH] Remove dowhile detection, and restore do loop collapsing
+ code. Seems to eliminate a lot of derpy loop smashage.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
@@ -101,6 +100,3 @@ index 5adf32354b34abd479184f162ea22d45a342a271..0e7f1ab7fe6fe4ca716cdcc0fc182dcf
          }
  
          break;
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0066-Move-LoopExtract-to-before-MergeHelper-and-add-more-.patch b/FernFlower-Patches/0064-Move-LoopExtract-to-before-MergeHelper-and-add-more-.patch
similarity index 97%
rename from FernFlower-Patches/0066-Move-LoopExtract-to-before-MergeHelper-and-add-more-.patch
rename to FernFlower-Patches/0064-Move-LoopExtract-to-before-MergeHelper-and-add-more-.patch
index fc53527..6fb1fce 100644
--- a/FernFlower-Patches/0066-Move-LoopExtract-to-before-MergeHelper-and-add-more-.patch
+++ b/FernFlower-Patches/0064-Move-LoopExtract-to-before-MergeHelper-and-add-more-.patch
@@ -1,8 +1,8 @@
-From 34a7253e7b3997dda29ae47f63151c976c9275a4 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sat, 3 Oct 2015 22:54:34 -0700
-Subject: Move LoopExtract to before MergeHelper and add more debug information
- to printMethod.
+Subject: [PATCH] Move LoopExtract to before MergeHelper and add more debug
+ information to printMethod.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
@@ -173,6 +173,3 @@ index c93be38f6abaabfe2704a3fd7c8f0d17a1b9ff52..67d16d5c139033d4774acc22c54b8866
        throw new RuntimeException("parsing failure!");
      }
  
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0067-Loosen-up-LoopExtractHelper-to-include-break-edges-t.patch b/FernFlower-Patches/0065-Loosen-up-LoopExtractHelper-to-include-break-edges-t.patch
similarity index 94%
rename from FernFlower-Patches/0067-Loosen-up-LoopExtractHelper-to-include-break-edges-t.patch
rename to FernFlower-Patches/0065-Loosen-up-LoopExtractHelper-to-include-break-edges-t.patch
index 5ad0f2f..1e27b9b 100644
--- a/FernFlower-Patches/0067-Loosen-up-LoopExtractHelper-to-include-break-edges-t.patch
+++ b/FernFlower-Patches/0065-Loosen-up-LoopExtractHelper-to-include-break-edges-t.patch
@@ -1,8 +1,8 @@
-From 751b2227a9b40757f0c01008882263e0c4acbd1d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sat, 3 Oct 2015 22:55:00 -0700
-Subject: Loosen up LoopExtractHelper to include break edges that can be
- extracted.
+Subject: [PATCH] Loosen up LoopExtractHelper to include break edges that can
+ be extracted.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
@@ -82,6 +82,3 @@ index d5c9e8f20aee82846a0d92f1c80b9d75a5984f8f..93bc21dd17add5a854450a034ed69a0a
              extractIfBlock(stat, firstif);
              return true;
            }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0068-Hack-to-prevent-extracted-ifs-from-being-inlined-aga.patch b/FernFlower-Patches/0066-Hack-to-prevent-extracted-ifs-from-being-inlined-aga.patch
similarity index 96%
rename from FernFlower-Patches/0068-Hack-to-prevent-extracted-ifs-from-being-inlined-aga.patch
rename to FernFlower-Patches/0066-Hack-to-prevent-extracted-ifs-from-being-inlined-aga.patch
index e728829..af43a59 100644
--- a/FernFlower-Patches/0068-Hack-to-prevent-extracted-ifs-from-being-inlined-aga.patch
+++ b/FernFlower-Patches/0066-Hack-to-prevent-extracted-ifs-from-being-inlined-aga.patch
@@ -1,8 +1,8 @@
-From 3be7e213dcd0be08189ca0207b54c600a0ff4602 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 4 Oct 2015 02:10:44 -0700
-Subject: Hack to prevent extracted ifs from being inlined again in infinite
- loop. MC decompiles much better!
+Subject: [PATCH] Hack to prevent extracted ifs from being inlined again in
+ infinite loop. MC decompiles much better!
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
@@ -110,6 +110,3 @@ index 81d31a58f6a913ddc4f5a89ae22fe69f98c63f3e..7d2ee435ce1c153b6da410d825d697d9
  
  import java.util.Arrays;
  import java.util.List;
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0069-Include-ForEach-source-vars-in-itteration-allows-for.patch b/FernFlower-Patches/0067-Include-ForEach-source-vars-in-itteration-allows-for.patch
similarity index 80%
rename from FernFlower-Patches/0069-Include-ForEach-source-vars-in-itteration-allows-for.patch
rename to FernFlower-Patches/0067-Include-ForEach-source-vars-in-itteration-allows-for.patch
index 00cf95a..a15d934 100644
--- a/FernFlower-Patches/0069-Include-ForEach-source-vars-in-itteration-allows-for.patch
+++ b/FernFlower-Patches/0067-Include-ForEach-source-vars-in-itteration-allows-for.patch
@@ -1,8 +1,8 @@
-From 7dec35b37bbeb3c785e142980718e799d25c618a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 4 Oct 2015 04:22:34 -0700
-Subject: Include ForEach source vars in itteration, allows for remapping in
- merge.
+Subject: [PATCH] Include ForEach source vars in itteration, allows for
+ remapping in merge.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
@@ -17,6 +17,3 @@ index 36cd7fb229ea03784017336da4dd1cb0fd528fa4..acc74a60fd6a90ad15959f6c31647573
      }
  
      lst.add(first);
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0070-Re-write-ForEach-detection-to-be-before-For-detectio.patch b/FernFlower-Patches/0068-Re-write-ForEach-detection-to-be-before-For-detectio.patch
similarity index 98%
rename from FernFlower-Patches/0070-Re-write-ForEach-detection-to-be-before-For-detectio.patch
rename to FernFlower-Patches/0068-Re-write-ForEach-detection-to-be-before-For-detectio.patch
index 8ebfed4..810793c 100644
--- a/FernFlower-Patches/0070-Re-write-ForEach-detection-to-be-before-For-detectio.patch
+++ b/FernFlower-Patches/0068-Re-write-ForEach-detection-to-be-before-For-detectio.patch
@@ -1,8 +1,8 @@
-From fd8b2a3bfada12e9d371230cb329f64ab801544e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 4 Oct 2015 04:23:24 -0700
-Subject: Re-write ForEach detection to be before For detection. Fixes issues
- where incrementors would be added back in incorrectly.
+Subject: [PATCH] Re-write ForEach detection to be before For detection. Fixes
+ issues where incrementors would be added back in incorrectly.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
@@ -264,6 +264,3 @@ index 0e7f1ab7fe6fe4ca716cdcc0fc182dcfa59c3b7b..f354f0684b4d16e8dcd08b2ce6db7621
    }
  
    private static boolean isType(Exprent exp, int type) { //This is just a helper macro, Wish java had real macros.
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0071-Propogate-LVTs-to-inner-classes.patch b/FernFlower-Patches/0069-Propogate-LVTs-to-inner-classes.-Fix-improper-var-me.patch
similarity index 98%
rename from FernFlower-Patches/0071-Propogate-LVTs-to-inner-classes.patch
rename to FernFlower-Patches/0069-Propogate-LVTs-to-inner-classes.-Fix-improper-var-me.patch
index bba7cc7..5ff8c5a 100644
--- a/FernFlower-Patches/0071-Propogate-LVTs-to-inner-classes.patch
+++ b/FernFlower-Patches/0069-Propogate-LVTs-to-inner-classes.-Fix-improper-var-me.patch
@@ -1,8 +1,8 @@
-From bf26fb1390f668dcadb5dc15cdf9cbfc12b84d81 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 4 Oct 2015 16:52:33 -0700
-Subject: =?UTF-8?q?Propogate=20LVTs=20to=20inner=20classes.=0AFix=20improp?=
- =?UTF-8?q?er=20var=20merging=20in=20var=20handlers.?=
+Subject: [PATCH] Propogate LVTs to inner classes. Fix improper var merging in
+ var handlers.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -304,6 +304,3 @@ index d201157f241a77410bbd495ed43c5a54540ee59c..a1acd195bb107e423f2ed29c1e1554a7
 -}
 +  }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0072-Fix-issue-where-For-loops-would-be-enhanced-to-ForEa.patch b/FernFlower-Patches/0070-Fix-issue-where-For-loops-would-be-enhanced-to-ForEa.patch
similarity index 91%
rename from FernFlower-Patches/0072-Fix-issue-where-For-loops-would-be-enhanced-to-ForEa.patch
rename to FernFlower-Patches/0070-Fix-issue-where-For-loops-would-be-enhanced-to-ForEa.patch
index 543d64b..962c063 100644
--- a/FernFlower-Patches/0072-Fix-issue-where-For-loops-would-be-enhanced-to-ForEa.patch
+++ b/FernFlower-Patches/0070-Fix-issue-where-For-loops-would-be-enhanced-to-ForEa.patch
@@ -1,7 +1,8 @@
-From 08cf2eed89abfcfed52fbcaac9ee4c4b172b465a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 4 Oct 2015 18:14:24 -0700
-Subject: Fix issue where For loops would be enhanced to ForEach incorrectly.
+Subject: [PATCH] Fix issue where For loops would be enhanced to ForEach
+ incorrectly.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
@@ -32,6 +33,3 @@ index f354f0684b4d16e8dcd08b2ce6db76210249b571..11c7c599d4413cb46b58906f4b7fdbe4
  
          funcRight.getLstOperands().get(0).addBytecodeOffsets(initExprents[0].bytecode);
          funcRight.getLstOperands().get(0).addBytecodeOffsets(initExprents[1].bytecode);
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0073-Fix-constructor-arguments-for-non-static-inner-class.patch b/FernFlower-Patches/0071-Fix-constructor-arguments-for-non-static-inner-class.patch
similarity index 94%
rename from FernFlower-Patches/0073-Fix-constructor-arguments-for-non-static-inner-class.patch
rename to FernFlower-Patches/0071-Fix-constructor-arguments-for-non-static-inner-class.patch
index 407b633..526b973 100644
--- a/FernFlower-Patches/0073-Fix-constructor-arguments-for-non-static-inner-class.patch
+++ b/FernFlower-Patches/0071-Fix-constructor-arguments-for-non-static-inner-class.patch
@@ -1,8 +1,8 @@
-From af6a44bafd270347d61481d9d3b97ef3c263a42b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 4 Oct 2015 19:29:55 -0700
-Subject: Fix constructor arguments for non-static inner classes with generic
- signatures.
+Subject: [PATCH] Fix constructor arguments for non-static inner classes with
+ generic signatures.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -83,6 +83,3 @@ index d3b38960a05cb9102bff5ae3aa305acd1111e6dc..9305bf93cf68b9f87b6d765b25494bcb
    public GenericType decreaseArrayDim() {
      assert arrayDim > 0 : this;
      return new GenericType(type, arrayDim - 1, value);
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0074-Return-generic-typevar-casting-support.patch b/FernFlower-Patches/0072-Return-generic-typevar-casting-support.patch
similarity index 98%
rename from FernFlower-Patches/0074-Return-generic-typevar-casting-support.patch
rename to FernFlower-Patches/0072-Return-generic-typevar-casting-support.patch
index b8cdda6..f0698e1 100644
--- a/FernFlower-Patches/0074-Return-generic-typevar-casting-support.patch
+++ b/FernFlower-Patches/0072-Return-generic-typevar-casting-support.patch
@@ -1,7 +1,7 @@
-From e083cb151d05afd2e06431fb24443e381c03b361 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Mon, 5 Oct 2015 00:12:38 -0400
-Subject: Return generic typevar casting support
+Subject: [PATCH] Return generic typevar casting support
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -144,6 +144,3 @@ index 1eb177fd1b9e8e445ab122c78e2145a70f2bffd3..45fd2896cf946747b4a04e47ec54d99e
    public VarType(int type, int arrayDim, String value) {
      this(type, arrayDim, value, getFamily(type, arrayDim), getStackSize(type, arrayDim), false);
    }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0075-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch b/FernFlower-Patches/0073-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch
similarity index 93%
rename from FernFlower-Patches/0075-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch
rename to FernFlower-Patches/0073-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch
index ea7ba34..ede42bb 100644
--- a/FernFlower-Patches/0075-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch
+++ b/FernFlower-Patches/0073-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch
@@ -1,8 +1,8 @@
-From a88b1c06f60850be429ebdba20e5e6ba507936bb Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Fri, 9 Oct 2015 13:22:13 -0700
-Subject: Add new decompiler option -iec Include_Entire_Classpath which will
- read the current JVM's classpath and parse all libraries for metadata.
+Subject: [PATCH] Add new decompiler option -iec Include_Entire_Classpath which
+ will read the current JVM's classpath and parse all libraries for metadata.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
@@ -85,6 +85,3 @@ index 31871c5d945034a810fa9f866446e14c40cd9b18..79dd8e890cd37e88bfbe9f0c22c825b3
 +    put(INCLUDE_ENTIRE_CLASSPATH, "0");
    }});
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0076-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch b/FernFlower-Patches/0074-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch
similarity index 99%
rename from FernFlower-Patches/0076-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch
rename to FernFlower-Patches/0074-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch
index 66329e3..5a83e98 100644
--- a/FernFlower-Patches/0076-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch
+++ b/FernFlower-Patches/0074-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch
@@ -1,8 +1,8 @@
-From 676f9ba6584df07224d713698aca89eae71b44e4 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Fri, 9 Oct 2015 13:29:20 -0700
-Subject: Rework GenericType to be subclass of VarType and contain all data
- needed to be treated as such.
+Subject: [PATCH] Rework GenericType to be subclass of VarType and contain all
+ data needed to be treated as such.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -1047,6 +1047,3 @@ index 9305bf93cf68b9f87b6d765b25494bcb2813c2aa..c45d47f7e7efbd28e5bbddb024412993
 +    return buffer.toString();
    }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0077-Fix-up-the-scouting-for-an-init-exprent-not-to-look-.patch b/FernFlower-Patches/0075-Fix-up-the-scouting-for-an-init-exprent-not-to-look-.patch
similarity index 98%
rename from FernFlower-Patches/0077-Fix-up-the-scouting-for-an-init-exprent-not-to-look-.patch
rename to FernFlower-Patches/0075-Fix-up-the-scouting-for-an-init-exprent-not-to-look-.patch
index c276199..821779a 100644
--- a/FernFlower-Patches/0077-Fix-up-the-scouting-for-an-init-exprent-not-to-look-.patch
+++ b/FernFlower-Patches/0075-Fix-up-the-scouting-for-an-init-exprent-not-to-look-.patch
@@ -1,8 +1,8 @@
-From 0fac2512ae858770015e5bc2f3d84448ac5031c5 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 11 Oct 2015 12:51:22 -0400
-Subject: Fix up the scouting for an init exprent, not to look inside loops for
- it. Fixes the broken loops. Added tests for it.
+Subject: [PATCH] Fix up the scouting for an init exprent, not to look inside
+ loops for it. Fixes the broken loops. Added tests for it.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
@@ -283,6 +283,3 @@ index 0000000000000000000000000000000000000000..c257b10446cf1cc23c6c9408e8f5660d
 +        return this.a;
 +    }
 +}
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0078-Fix-IncludeEntireClasspath-so-it-doesn-t-dump-out-ra.patch b/FernFlower-Patches/0076-Fix-IncludeEntireClasspath-so-it-doesn-t-dump-out-ra.patch
similarity index 87%
rename from FernFlower-Patches/0078-Fix-IncludeEntireClasspath-so-it-doesn-t-dump-out-ra.patch
rename to FernFlower-Patches/0076-Fix-IncludeEntireClasspath-so-it-doesn-t-dump-out-ra.patch
index fff99db..a051c2c 100644
--- a/FernFlower-Patches/0078-Fix-IncludeEntireClasspath-so-it-doesn-t-dump-out-ra.patch
+++ b/FernFlower-Patches/0076-Fix-IncludeEntireClasspath-so-it-doesn-t-dump-out-ra.patch
@@ -1,9 +1,9 @@
-From cbc3d52186da0f3de950b1fcd1628a31ef46c3d7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Mon, 12 Oct 2015 14:44:39 -0400
-Subject: Fix IncludeEntireClasspath so it doesn't dump out random other files
- from the classpath. Also, it doesn't try and save undecompiled additional
- classes too.
+Subject: [PATCH] Fix IncludeEntireClasspath so it doesn't dump out random
+ other files from the classpath. Also, it doesn't try and save undecompiled
+ additional classes too.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
@@ -32,6 +32,3 @@ index 850c3d84888d95343abd8a3c297baac58783a8c3..e3043962de86e4823458766ff2afda4e
            String entryName = decompiledData.getClassEntryName(cl, classEntries.get(i));
            if (entryName != null) {
              String content = decompiledData.getClassContent(cl);
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0079-Fixed-generic-type-parsing-of-inner-classes-with-gen.patch b/FernFlower-Patches/0077-Fixed-generic-type-parsing-of-inner-classes-with-gen.patch
similarity index 86%
rename from FernFlower-Patches/0079-Fixed-generic-type-parsing-of-inner-classes-with-gen.patch
rename to FernFlower-Patches/0077-Fixed-generic-type-parsing-of-inner-classes-with-gen.patch
index 366bd02..63fb7c7 100644
--- a/FernFlower-Patches/0079-Fixed-generic-type-parsing-of-inner-classes-with-gen.patch
+++ b/FernFlower-Patches/0077-Fixed-generic-type-parsing-of-inner-classes-with-gen.patch
@@ -1,7 +1,8 @@
-From 6b4dc8d90d43ad16cc14df1cdff86f18dd8d0f4f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Wed, 14 Oct 2015 13:20:13 -0700
-Subject: Fixed generic type parsing of inner classes with generic outers.
+Subject: [PATCH] Fixed generic type parsing of inner classes with generic
+ outers.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
@@ -25,6 +26,3 @@ index c45d47f7e7efbd28e5bbddb02441299306518733..aeb786a7b26864424c5b730ef3f954b9
              }
            }
            break loop;
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0080-Foo.-Bar-baz-generation.patch b/FernFlower-Patches/0078-Foo.-Bar-baz-generation.patch
similarity index 99%
rename from FernFlower-Patches/0080-Foo.-Bar-baz-generation.patch
rename to FernFlower-Patches/0078-Foo.-Bar-baz-generation.patch
index f96fac8..00983f0 100644
--- a/FernFlower-Patches/0080-Foo.-Bar-baz-generation.patch
+++ b/FernFlower-Patches/0078-Foo.-Bar-baz-generation.patch
@@ -1,7 +1,7 @@
-From 6bced8fc859f3f9486d5554604387b4c5a5d34e5 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: RainWarrior <rainwarrior@fry.su>
 Date: Mon, 12 Oct 2015 09:21:36 +0300
-Subject: Foo.<Bar>baz() generation
+Subject: [PATCH] Foo.<Bar>baz() generation
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -338,6 +338,3 @@ index 1b0df9d2e710cb6d1bee94eb1dddfe2c06135941..af06b8e0d37763abcbabbca680dee253
    @Override
    public boolean equals(Object o) {
      if (o == this) {
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0081-concentrated-changes-to-Exprent.getInferredExprType.patch b/FernFlower-Patches/0079-concentrated-changes-to-Exprent.getInferredExprType.patch
similarity index 99%
rename from FernFlower-Patches/0081-concentrated-changes-to-Exprent.getInferredExprType.patch
rename to FernFlower-Patches/0079-concentrated-changes-to-Exprent.getInferredExprType.patch
index 9325748..e6ce0e9 100644
--- a/FernFlower-Patches/0081-concentrated-changes-to-Exprent.getInferredExprType.patch
+++ b/FernFlower-Patches/0079-concentrated-changes-to-Exprent.getInferredExprType.patch
@@ -1,7 +1,7 @@
-From b84e34a3999001b3da2bed7766c1ed2a77bcd100 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: RainWarrior <rainwarrior@fry.su>
 Date: Wed, 14 Oct 2015 05:45:41 +0300
-Subject: concentrated changes to Exprent.getInferredExprType
+Subject: [PATCH] concentrated changes to Exprent.getInferredExprType
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -432,6 +432,3 @@ index c7e781e4172f736a831b857ca7fd3060d95e6186..2afd2e6f60ee5cc191b6eaf535e0fa12
      }};
      fixture.setUp(mcFFOptions);
      if (!new File(fixture.getTestDataDir(), MC_JAR).exists()) {
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0082-passing-information-from-InvocationExprent-s-inferre.patch b/FernFlower-Patches/0080-passing-information-from-InvocationExprent-s-inferre.patch
similarity index 96%
rename from FernFlower-Patches/0082-passing-information-from-InvocationExprent-s-inferre.patch
rename to FernFlower-Patches/0080-passing-information-from-InvocationExprent-s-inferre.patch
index 6e6ec41..0963240 100644
--- a/FernFlower-Patches/0082-passing-information-from-InvocationExprent-s-inferre.patch
+++ b/FernFlower-Patches/0080-passing-information-from-InvocationExprent-s-inferre.patch
@@ -1,8 +1,8 @@
-From 155a27086d2f5178ce4e981e208d69ce8e9a421d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: RainWarrior <rainwarrior@fry.su>
 Date: Wed, 14 Oct 2015 09:26:05 +0300
-Subject: passing information from InvocationExprent's inferred type arguments
- to the parameters
+Subject: [PATCH] passing information from InvocationExprent's inferred type
+ arguments to the parameters
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -106,6 +106,3 @@ index da04e009a8b3ef883536cf117faee2f6dfe3b417..9319bf76366d189afd5bdb98b018c8e0
    public List<VarType> getArguments() {
      return arguments;
    }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0083-pushed-remapping-to-the-VarType-added-type-inference.patch b/FernFlower-Patches/0081-pushed-remapping-to-the-VarType-added-type-inference.patch
similarity index 98%
rename from FernFlower-Patches/0083-pushed-remapping-to-the-VarType-added-type-inference.patch
rename to FernFlower-Patches/0081-pushed-remapping-to-the-VarType-added-type-inference.patch
index 9963112..78ff39a 100644
--- a/FernFlower-Patches/0083-pushed-remapping-to-the-VarType-added-type-inference.patch
+++ b/FernFlower-Patches/0081-pushed-remapping-to-the-VarType-added-type-inference.patch
@@ -1,8 +1,8 @@
-From f8df185c9f5ecc896aac6f264196e1d842796b87 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: RainWarrior <rainwarrior@fry.su>
 Date: Wed, 14 Oct 2015 14:18:10 +0300
-Subject: pushed remapping to the VarType, added type inference to a couple
- more places
+Subject: [PATCH] pushed remapping to the VarType, added type inference to a
+ couple more places
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -282,6 +282,3 @@ index 9319bf76366d189afd5bdb98b018c8e0425a58b0..9ad5a1fe83d6f2e43f257bad5982e1b5
 +    return this;
    }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0084-handle-generic-lists-with-multiple-arguments-in-meth.patch b/FernFlower-Patches/0082-handle-generic-lists-with-multiple-arguments-in-meth.patch
similarity index 92%
rename from FernFlower-Patches/0084-handle-generic-lists-with-multiple-arguments-in-meth.patch
rename to FernFlower-Patches/0082-handle-generic-lists-with-multiple-arguments-in-meth.patch
index 61e5969..1b5377a 100644
--- a/FernFlower-Patches/0084-handle-generic-lists-with-multiple-arguments-in-meth.patch
+++ b/FernFlower-Patches/0082-handle-generic-lists-with-multiple-arguments-in-meth.patch
@@ -1,7 +1,8 @@
-From 497af514fd5c868021fc9be12acac2c387f5541d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: RainWarrior <rainwarrior@fry.su>
 Date: Wed, 14 Oct 2015 15:30:51 +0300
-Subject: handle generic lists with multiple arguments in method invocations
+Subject: [PATCH] handle generic lists with multiple arguments in method
+ invocations
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -36,6 +37,3 @@ index 4c4b8981d0e7b3e12d7024e5dc7e05c31476ea8d..f98c822f58aa151185507a7fd7dc2cb0
              }
            }
          }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0085-using-the-generic-info-from-InvocationExprent-correc.patch b/FernFlower-Patches/0083-using-the-generic-info-from-InvocationExprent-correc.patch
similarity index 97%
rename from FernFlower-Patches/0085-using-the-generic-info-from-InvocationExprent-correc.patch
rename to FernFlower-Patches/0083-using-the-generic-info-from-InvocationExprent-correc.patch
index e533fdf..3ce1b81 100644
--- a/FernFlower-Patches/0085-using-the-generic-info-from-InvocationExprent-correc.patch
+++ b/FernFlower-Patches/0083-using-the-generic-info-from-InvocationExprent-correc.patch
@@ -1,8 +1,8 @@
-From b14e7fc85e9f8c07da66accb2f490175fbf054ed Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: RainWarrior <rainwarrior@fry.su>
 Date: Thu, 15 Oct 2015 01:00:20 +0300
-Subject: using the generic info from InvocationExprent correctly, 1 more error
- down
+Subject: [PATCH] using the generic info from InvocationExprent correctly, 1
+ more error down
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -132,6 +132,3 @@ index f98c822f58aa151185507a7fd7dc2cb0198f72b8..b2c3574dec9dcc67e8af5c94c4f2e6c2
          ExprProcessor.getCastedExprent(lstParameters.get(i), type, buff, indent, type.type != CodeConstants.TYPE_NULL, ambiguous, tracer);
          buf.append(buff);
  
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0086-Itterator-enchanced-for-loops-can-also-have-a-copy-i.patch b/FernFlower-Patches/0084-Itterator-enchanced-for-loops-can-also-have-a-copy-i.patch
similarity index 89%
rename from FernFlower-Patches/0086-Itterator-enchanced-for-loops-can-also-have-a-copy-i.patch
rename to FernFlower-Patches/0084-Itterator-enchanced-for-loops-can-also-have-a-copy-i.patch
index fac1b9d..f9f4a41 100644
--- a/FernFlower-Patches/0086-Itterator-enchanced-for-loops-can-also-have-a-copy-i.patch
+++ b/FernFlower-Patches/0084-Itterator-enchanced-for-loops-can-also-have-a-copy-i.patch
@@ -1,8 +1,8 @@
-From c9699a02f50eaa677fc72201e6c4c3581a13744f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Wed, 14 Oct 2015 16:07:14 -0700
-Subject: Itterator enchanced for loops can also have a 'copy' instruction, so
- detect those as well.
+Subject: [PATCH] Itterator enchanced for loops can also have a 'copy'
+ instruction, so detect those as well.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
@@ -28,6 +28,3 @@ index c240daa740a7766b1541dc8aea73025cb9486ac7..d0158aba3e732e854494bfbe80b128f4
          return true;
        }
        else if (initExprents[0] != null && initExprents[1] != null && firstDoExprent != null) {
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0087-Be-a-bit-more-strict-in-detecting-copy-var-usage.patch b/FernFlower-Patches/0085-Be-a-bit-more-strict-in-detecting-copy-var-usage.patch
similarity index 93%
rename from FernFlower-Patches/0087-Be-a-bit-more-strict-in-detecting-copy-var-usage.patch
rename to FernFlower-Patches/0085-Be-a-bit-more-strict-in-detecting-copy-var-usage.patch
index aa981c0..585e443 100644
--- a/FernFlower-Patches/0087-Be-a-bit-more-strict-in-detecting-copy-var-usage.patch
+++ b/FernFlower-Patches/0085-Be-a-bit-more-strict-in-detecting-copy-var-usage.patch
@@ -1,7 +1,7 @@
-From 788d8fdb6346422ce9717694f957b970625072ec Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Wed, 14 Oct 2015 16:40:04 -0700
-Subject: Be a bit more strict in detecting copy var usage.
+Subject: [PATCH] Be a bit more strict in detecting copy var usage.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
@@ -36,6 +36,3 @@ index f71ed84bc4ad195a97b4c535f21b55a9568cac62..686001d878d4204c439e6a4b6d140c15
    public HashSet<StatEdge> getLabelEdges() {  // FIXME: why HashSet?
      return labelEdges;
    }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0088-Enhance-switches-on-enums.patch b/FernFlower-Patches/0086-Enhance-switches-on-enums.patch
similarity index 99%
rename from FernFlower-Patches/0088-Enhance-switches-on-enums.patch
rename to FernFlower-Patches/0086-Enhance-switches-on-enums.patch
index 8507430..28fd09a 100644
--- a/FernFlower-Patches/0088-Enhance-switches-on-enums.patch
+++ b/FernFlower-Patches/0086-Enhance-switches-on-enums.patch
@@ -1,7 +1,7 @@
-From 7397a3a93f58c06def0180227486b7a23915b4b4 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 15 Oct 2015 00:15:50 -0700
-Subject: Enhance switches on enums.
+Subject: [PATCH] Enhance switches on enums.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
@@ -299,6 +299,3 @@ index c0683fc0c33773d1f96a2eda2dbf6ca7c4e935c2..ab0f118debc0d7dee08f79a12c355890
  
    private ConstantPool pool;
  
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0089-Fixed-issue-where-inner-class-fields-would-not-be-re.patch b/FernFlower-Patches/0087-Fixed-issue-where-inner-class-fields-would-not-be-re.patch
similarity index 94%
rename from FernFlower-Patches/0089-Fixed-issue-where-inner-class-fields-would-not-be-re.patch
rename to FernFlower-Patches/0087-Fixed-issue-where-inner-class-fields-would-not-be-re.patch
index a1dde51..7203308 100644
--- a/FernFlower-Patches/0089-Fixed-issue-where-inner-class-fields-would-not-be-re.patch
+++ b/FernFlower-Patches/0087-Fixed-issue-where-inner-class-fields-would-not-be-re.patch
@@ -1,8 +1,8 @@
-From 32d7a1464e50520aa4e0c78fce84528448bca249 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 15 Oct 2015 01:10:03 -0700
-Subject: Fixed issue where inner class fields would not be replaced by their
- parent method parameters.
+Subject: [PATCH] Fixed issue where inner class fields would not be replaced by
+ their parent method parameters.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -90,6 +90,3 @@ index 12653a4836d4f864154310b6115369e943f36fd7..6d40b8a1dc102b0cdf90aed615e74c10
 +    }
 +  }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0090-Added-support-for-and-field-accessors-in-inner-class.patch b/FernFlower-Patches/0088-Added-support-for-and-field-accessors-in-inner-class.patch
similarity index 94%
rename from FernFlower-Patches/0090-Added-support-for-and-field-accessors-in-inner-class.patch
rename to FernFlower-Patches/0088-Added-support-for-and-field-accessors-in-inner-class.patch
index a44a24e..157b030 100644
--- a/FernFlower-Patches/0090-Added-support-for-and-field-accessors-in-inner-class.patch
+++ b/FernFlower-Patches/0088-Added-support-for-and-field-accessors-in-inner-class.patch
@@ -1,8 +1,8 @@
-From cef8ac773526a830398ef753629b6b7611f7bcf9 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 15 Oct 2015 15:51:24 -0700
-Subject: Added support for ++ and -- field accessors in inner classes. And
- fixed inner class type find issue.
+Subject: [PATCH] Added support for ++ and -- field accessors in inner classes.
+ And fixed inner class type find issue.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -79,6 +79,3 @@ index 3fa8128a4e7f607770d592033588e716f49f12f0..b4856a6fabd1b06c2f8a12d9d11f62f2
      }
  
  
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0091-cleanup-of-InvocationExprent-changes.patch b/FernFlower-Patches/0089-cleanup-of-InvocationExprent-changes.patch
similarity index 98%
rename from FernFlower-Patches/0091-cleanup-of-InvocationExprent-changes.patch
rename to FernFlower-Patches/0089-cleanup-of-InvocationExprent-changes.patch
index 0ddfba3..d3a2ca6 100644
--- a/FernFlower-Patches/0091-cleanup-of-InvocationExprent-changes.patch
+++ b/FernFlower-Patches/0089-cleanup-of-InvocationExprent-changes.patch
@@ -1,7 +1,7 @@
-From 188b626d3d18755760de06dedf2c050abb03ed61 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: RainWarrior <rainwarrior@fry.su>
 Date: Fri, 16 Oct 2015 02:06:25 +0300
-Subject: cleanup of InvocationExprent changes
+Subject: [PATCH] cleanup of InvocationExprent changes
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -192,6 +192,3 @@ index b2c3574dec9dcc67e8af5c94c4f2e6c2cb078214..e6152070d2b155d98fc0b8155db12c12
      if (cl == null) return matches;
  
      nextMethod:
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0092-Tweak-decompilation-test-to-new-settings-no-syntheti.patch b/FernFlower-Patches/0090-Tweak-decompilation-test-to-new-settings-no-syntheti.patch
similarity index 86%
rename from FernFlower-Patches/0092-Tweak-decompilation-test-to-new-settings-no-syntheti.patch
rename to FernFlower-Patches/0090-Tweak-decompilation-test-to-new-settings-no-syntheti.patch
index f6f58fa..50733e3 100644
--- a/FernFlower-Patches/0092-Tweak-decompilation-test-to-new-settings-no-syntheti.patch
+++ b/FernFlower-Patches/0090-Tweak-decompilation-test-to-new-settings-no-syntheti.patch
@@ -1,7 +1,8 @@
-From 71f348d0c9b66b35db2c7a42d37d15ea7f2ea5d9 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Fri, 16 Oct 2015 21:39:10 -0400
-Subject: Tweak decompilation test to new settings (no synthetics or bridge)
+Subject: [PATCH] Tweak decompilation test to new settings (no synthetics or
+ bridge)
 
 
 diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
@@ -19,6 +20,3 @@ index 2afd2e6f60ee5cc191b6eaf535e0fa12f25ea275..087c8102c11b1258d8e3f1615fe64f74
          put(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH, "1");
      }};
      fixture.setUp(mcFFOptions);
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0093-Fix-constants-with-trailing-zeros-and-incorrect-type.patch b/FernFlower-Patches/0091-Fix-constants-with-trailing-zeros-and-incorrect-type.patch
similarity index 93%
rename from FernFlower-Patches/0093-Fix-constants-with-trailing-zeros-and-incorrect-type.patch
rename to FernFlower-Patches/0091-Fix-constants-with-trailing-zeros-and-incorrect-type.patch
index c8620f0..c9ac86f 100644
--- a/FernFlower-Patches/0093-Fix-constants-with-trailing-zeros-and-incorrect-type.patch
+++ b/FernFlower-Patches/0091-Fix-constants-with-trailing-zeros-and-incorrect-type.patch
@@ -1,7 +1,7 @@
-From ded50868b3d9d908540f9c895eca95f44bb0ce9f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sat, 17 Oct 2015 00:50:20 -0400
-Subject: Fix constants with trailing zeros and incorrect types.
+Subject: [PATCH] Fix constants with trailing zeros and incorrect types.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
@@ -50,6 +50,3 @@ index 3398924fabb57daddb0f6b51daafdd266cc371b6..0fc40559457cfc425bced3a536b862a9
              }
            }
            else if (Float.isNaN(fval)) {
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0094-Deterministic-label-names-based-on-jvm-instruction-i.patch b/FernFlower-Patches/0092-Deterministic-label-names-based-on-jvm-instruction-i.patch
similarity index 98%
rename from FernFlower-Patches/0094-Deterministic-label-names-based-on-jvm-instruction-i.patch
rename to FernFlower-Patches/0092-Deterministic-label-names-based-on-jvm-instruction-i.patch
index bdc2e0f..9879ec6 100644
--- a/FernFlower-Patches/0094-Deterministic-label-names-based-on-jvm-instruction-i.patch
+++ b/FernFlower-Patches/0092-Deterministic-label-names-based-on-jvm-instruction-i.patch
@@ -1,7 +1,8 @@
-From 36ea9a310b443b45ecdc298060e3685f8541950a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sat, 17 Oct 2015 00:51:19 -0400
-Subject: Deterministic label names based on jvm instruction # instead of ID
+Subject: [PATCH] Deterministic label names based on jvm instruction # instead
+ of ID
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -130,6 +131,3 @@ index b71531f51d77724ca78e0271290ca592539b23a7..aaafab989518417c429221f40ff8fe39
        tracer.incrementCurrentSourceLine();
      }
  
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0095-Version-2.0.patch b/FernFlower-Patches/0093-Version-2.0.patch
similarity index 82%
rename from FernFlower-Patches/0095-Version-2.0.patch
rename to FernFlower-Patches/0093-Version-2.0.patch
index 1315120..1958b85 100644
--- a/FernFlower-Patches/0095-Version-2.0.patch
+++ b/FernFlower-Patches/0093-Version-2.0.patch
@@ -1,7 +1,7 @@
-From c265002beef65c2264a9a9ed6550e022754f1bc1 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sat, 17 Oct 2015 01:11:19 -0400
-Subject: Version 2.0
+Subject: [PATCH] Version 2.0
 
 
 diff --git a/build.gradle b/build.gradle
@@ -17,6 +17,3 @@ index 4ba85eec08fc56b667cb9d690a9ef46b8c389c82..5e14c2528a26cc50323d2d408cd16c25
  group = "net.minecraftforge" //not sure if we shoulkd publish under this name, but it's our fork so meh
  archivesBaseName = "fernflower"
  
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0096-Fixed-invalid-reference-to-ASM.-Oops.patch b/FernFlower-Patches/0094-Fixed-invalid-reference-to-ASM.-Oops.patch
similarity index 90%
rename from FernFlower-Patches/0096-Fixed-invalid-reference-to-ASM.-Oops.patch
rename to FernFlower-Patches/0094-Fixed-invalid-reference-to-ASM.-Oops.patch
index 0398769..515dde9 100644
--- a/FernFlower-Patches/0096-Fixed-invalid-reference-to-ASM.-Oops.patch
+++ b/FernFlower-Patches/0094-Fixed-invalid-reference-to-ASM.-Oops.patch
@@ -1,7 +1,7 @@
-From 3b04e422ba4902bbaf7b058fc96326dc5c7d9458 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Mon, 19 Oct 2015 18:50:25 -0700
-Subject: Fixed invalid reference to ASM.. Oops..
+Subject: [PATCH] Fixed invalid reference to ASM.. Oops..
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -26,6 +26,3 @@ index 1e69d8d4c01f89a1703a8e40424e8cb3c4ba62d3..3975d8cf93f8a2ce22b57ca3a666f3be
      Set<String> potentialFields = new HashSet<String>();
      for (StructField fd : node.classStruct.getFields()) {
        if ((fd.getAccessFlags() & STATIC_FINAL_SYNTHETIC) == STATIC_FINAL_SYNTHETIC && "[I".equals(fd.getDescriptor())) {
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0097-Fixed-potential-NPE-in-lvt-propogation.patch b/FernFlower-Patches/0095-Fixed-potential-NPE-in-lvt-propogation.patch
similarity index 87%
rename from FernFlower-Patches/0097-Fixed-potential-NPE-in-lvt-propogation.patch
rename to FernFlower-Patches/0095-Fixed-potential-NPE-in-lvt-propogation.patch
index 980eac0..4ec7430 100644
--- a/FernFlower-Patches/0097-Fixed-potential-NPE-in-lvt-propogation.patch
+++ b/FernFlower-Patches/0095-Fixed-potential-NPE-in-lvt-propogation.patch
@@ -1,7 +1,7 @@
-From 13dd6a29fe1620f34613b872263b0a1107409d93 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Mon, 19 Oct 2015 18:51:10 -0700
-Subject: Fixed potential NPE in lvt propogation.
+Subject: [PATCH] Fixed potential NPE in lvt propogation.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
@@ -20,6 +20,3 @@ index 0427e3b329d4599d42ef5f8ac35fd84581c5f8c6..aee11f60aab5e1f790a607e78675ba23
        index += var.stackSize;
      }
  
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0098-Fixed-nested-inner-generic-type-printing.patch b/FernFlower-Patches/0096-Fixed-nested-inner-generic-type-printing.patch
similarity index 88%
rename from FernFlower-Patches/0098-Fixed-nested-inner-generic-type-printing.patch
rename to FernFlower-Patches/0096-Fixed-nested-inner-generic-type-printing.patch
index 90dd617..da5dfc5 100644
--- a/FernFlower-Patches/0098-Fixed-nested-inner-generic-type-printing.patch
+++ b/FernFlower-Patches/0096-Fixed-nested-inner-generic-type-printing.patch
@@ -1,7 +1,7 @@
-From 0d3f25d13d15a0204cf57f7cbc6e4c96f3b232d7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Mon, 19 Oct 2015 18:51:39 -0700
-Subject: Fixed nested inner generic type printing.
+Subject: [PATCH] Fixed nested inner generic type printing.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
@@ -17,6 +17,3 @@ index 9ad5a1fe83d6f2e43f257bad5982e1b524e9d3af..9b111e572b474328818f044002d50dc2
      }
      else {
        clsName = DecompilerContext.getImportCollector().getShortName(parent.value.replace('/', '.')) + "." + value.substring(value.lastIndexOf('.') + 1);
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0099-Fixed-JUint-tests.patch b/FernFlower-Patches/0097-Fixed-JUint-tests.-AmbiguousCallWithDebugInfo-Was-br.patch
similarity index 89%
rename from FernFlower-Patches/0099-Fixed-JUint-tests.patch
rename to FernFlower-Patches/0097-Fixed-JUint-tests.-AmbiguousCallWithDebugInfo-Was-br.patch
index 7191703..28a7005 100644
--- a/FernFlower-Patches/0099-Fixed-JUint-tests.patch
+++ b/FernFlower-Patches/0097-Fixed-JUint-tests.-AmbiguousCallWithDebugInfo-Was-br.patch
@@ -1,12 +1,10 @@
-From 956c3db1c65161901df7a9872005857aa2b8f544 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Mon, 19 Oct 2015 18:54:52 -0700
-Subject: =?UTF-8?q?Fixed=20JUint=20tests.=0AAmbiguousCallWithDebugInfo:=20?=
- =?UTF-8?q?Was=20broken,=20our=20LVT=20changes=20fixed=20it=0AConstants:?=
- =?UTF-8?q?=20cpw's=20type=20forcing=20changed=20output=0AExtendsList:=20A?=
- =?UTF-8?q?dded=20(T)=20typecast,=20tho=20not=20explicitly=20needed=20will?=
- =?UTF-8?q?=20address=20later.=0AInnerSignature:=20Original=20test=20had?=
- =?UTF-8?q?=20invalid=20arguments.?=
+Subject: [PATCH] Fixed JUint tests. AmbiguousCallWithDebugInfo: Was broken,
+ our LVT changes fixed it Constants: cpw's type forcing changed output
+ ExtendsList: Added (T) typecast, tho not explicitly needed will address
+ later. InnerSignature: Original test had invalid arguments.
 
 
 diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
@@ -99,6 +97,3 @@ index 406e1f41d8f0a084a986f683bf7ecb3b44c37429..9acbef8495cbdb99cccee5d1e766eb15
           this.a = var2;// 34
           this.b = var3;// 35
           this.c = var4;// 36
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0100-Fixed-var-merging-not-propogating-type-data-to-var-d.patch b/FernFlower-Patches/0098-Fixed-var-merging-not-propogating-type-data-to-var-d.patch
similarity index 93%
rename from FernFlower-Patches/0100-Fixed-var-merging-not-propogating-type-data-to-var-d.patch
rename to FernFlower-Patches/0098-Fixed-var-merging-not-propogating-type-data-to-var-d.patch
index 90467d0..fe4c505 100644
--- a/FernFlower-Patches/0100-Fixed-var-merging-not-propogating-type-data-to-var-d.patch
+++ b/FernFlower-Patches/0098-Fixed-var-merging-not-propogating-type-data-to-var-d.patch
@@ -1,7 +1,8 @@
-From 5b4bbacf01e3d69d86e0227a2ee17c7235f6396a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Tue, 20 Oct 2015 04:04:12 -0700
-Subject: Fixed var merging not propogating type data to var definitions.
+Subject: [PATCH] Fixed var merging not propogating type data to var
+ definitions.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
@@ -46,6 +47,3 @@ index aee11f60aab5e1f790a607e78675ba23f774fb47..520b951dd96e4cc70a1800af58aa7a9b
    }
  }
 \ No newline at end of file
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0101-Snapshots-because-we-might-be-doing-a-bit-more-work-.patch b/FernFlower-Patches/0099-Snapshots-because-we-might-be-doing-a-bit-more-work-.patch
similarity index 77%
rename from FernFlower-Patches/0101-Snapshots-because-we-might-be-doing-a-bit-more-work-.patch
rename to FernFlower-Patches/0099-Snapshots-because-we-might-be-doing-a-bit-more-work-.patch
index 812130e..1237cc1 100644
--- a/FernFlower-Patches/0101-Snapshots-because-we-might-be-doing-a-bit-more-work-.patch
+++ b/FernFlower-Patches/0099-Snapshots-because-we-might-be-doing-a-bit-more-work-.patch
@@ -1,7 +1,7 @@
-From 15a7d35628a5db31cbdf2f0ac8fc3b0686107d23 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Tue, 20 Oct 2015 19:20:44 -0400
-Subject: Snapshots because we might be doing a bit more work yet
+Subject: [PATCH] Snapshots because we might be doing a bit more work yet
 
 
 diff --git a/build.gradle b/build.gradle
@@ -17,6 +17,3 @@ index 5e14c2528a26cc50323d2d408cd16c2506d6b6c1..bc211f2219fbcef72a0acca7b79f5c41
  group = "net.minecraftforge" //not sure if we shoulkd publish under this name, but it's our fork so meh
  archivesBaseName = "fernflower"
  
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0102-Sort-some-blocks-that-are-itterated-in-hash-sets-in-.patch b/FernFlower-Patches/0100-Sort-some-blocks-that-are-itterated-in-hash-sets-in-.patch
similarity index 93%
rename from FernFlower-Patches/0102-Sort-some-blocks-that-are-itterated-in-hash-sets-in-.patch
rename to FernFlower-Patches/0100-Sort-some-blocks-that-are-itterated-in-hash-sets-in-.patch
index 25e2197..4c3c9ce 100644
--- a/FernFlower-Patches/0102-Sort-some-blocks-that-are-itterated-in-hash-sets-in-.patch
+++ b/FernFlower-Patches/0100-Sort-some-blocks-that-are-itterated-in-hash-sets-in-.patch
@@ -1,7 +1,7 @@
-From 68d13c5f3063b87c73c892f53f2adef199dba16d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Tue, 20 Oct 2015 16:37:32 -0700
-Subject: Sort some blocks that are itterated in hash sets in Finally
+Subject: [PATCH] Sort some blocks that are itterated in hash sets in Finally
  Processor. SHOULD stabelize SOME of the finally's in decompiles.
 
 
@@ -45,6 +45,3 @@ index 9f1c11b318b128a3bf8dc17e3a6d343ef07800d7..ee8d4cee6cbb439907fb9d9c3f7f61a1
        BasicBlock last = entry.getKey();
  
        if (entry.getValue()) {
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0103-Fixed-switch-cases-leaking-variables-incorrectly.patch b/FernFlower-Patches/0101-Fixed-switch-cases-leaking-variables-incorrectly.patch
similarity index 86%
rename from FernFlower-Patches/0103-Fixed-switch-cases-leaking-variables-incorrectly.patch
rename to FernFlower-Patches/0101-Fixed-switch-cases-leaking-variables-incorrectly.patch
index 9ee8d14..a268f97 100644
--- a/FernFlower-Patches/0103-Fixed-switch-cases-leaking-variables-incorrectly.patch
+++ b/FernFlower-Patches/0101-Fixed-switch-cases-leaking-variables-incorrectly.patch
@@ -1,7 +1,7 @@
-From cf2bb43998a31ffa206193b9f0661df00bfbb6c0 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 22 Oct 2015 16:14:59 -0700
-Subject: Fixed switch cases leaking variables incorrectly.
+Subject: [PATCH] Fixed switch cases leaking variables incorrectly.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
@@ -18,6 +18,3 @@ index 520b951dd96e4cc70a1800af58aa7a9b43ac1d9f..726edd7aeab41647414952e0a0a6c8cb
              }
              else if (stat.type == Statement.TYPE_TRYCATCH ||
                       stat.type == Statement.TYPE_CATCHALL) {
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0104-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch b/FernFlower-Patches/0102-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch
similarity index 97%
rename from FernFlower-Patches/0104-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch
rename to FernFlower-Patches/0102-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch
index 76921eb..06e4f77 100644
--- a/FernFlower-Patches/0104-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch
+++ b/FernFlower-Patches/0102-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch
@@ -1,8 +1,8 @@
-From 2f1f8ef45192a1b474884cfc814d05448284b241 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 22 Oct 2015 16:15:46 -0700
-Subject: More move from HashSet to LinkedHashSet to stabelize itteration.
- Fixed a try finally merge issue.
+Subject: [PATCH] More move from HashSet to LinkedHashSet to stabelize
+ itteration. Fixed a try finally merge issue.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
@@ -197,6 +197,3 @@ index 52338f909228f21a19a2a6e31cc734bdbcd024ff..eee7b15dc347c9582f49f13c41106f76
            }
          }
        }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0105-Bulk-test-for-MC.patch b/FernFlower-Patches/0103-Bulk-test-for-MC.patch
similarity index 98%
rename from FernFlower-Patches/0105-Bulk-test-for-MC.patch
rename to FernFlower-Patches/0103-Bulk-test-for-MC.patch
index aee7660..64c2b4a 100644
--- a/FernFlower-Patches/0105-Bulk-test-for-MC.patch
+++ b/FernFlower-Patches/0103-Bulk-test-for-MC.patch
@@ -1,7 +1,7 @@
-From 50776ac962055d7228176238fc1b04a8a33736a7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 25 Oct 2015 10:29:37 -0400
-Subject: Bulk test for MC
+Subject: [PATCH] Bulk test for MC
 
 
 diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
@@ -247,6 +247,3 @@ index 087c8102c11b1258d8e3f1615fe64f745b8587d6..660d0313e68f87b72b694b886ab32179
 +	}
    }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0106-Add-a-parameter-renamer.patch b/FernFlower-Patches/0104-Add-a-parameter-renamer.patch
similarity index 96%
rename from FernFlower-Patches/0106-Add-a-parameter-renamer.patch
rename to FernFlower-Patches/0104-Add-a-parameter-renamer.patch
index fdcab58..91d5c1c 100644
--- a/FernFlower-Patches/0106-Add-a-parameter-renamer.patch
+++ b/FernFlower-Patches/0104-Add-a-parameter-renamer.patch
@@ -1,7 +1,7 @@
-From 879a4330a3b7e46d9b72a3418e1980138af6f53f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 25 Oct 2015 14:08:24 -0400
-Subject: Add a parameter renamer
+Subject: [PATCH] Add a parameter renamer
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -54,6 +54,3 @@ index 0000000000000000000000000000000000000000..4c509eb6633f575b4f7cc93ad781885e
 +public interface IAbstractParameterRenamer {
 +  public String renameParameter(String orig, int index, MethodWrapper wrapper, int flags);
 +}
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0107-Bulk-decompilation-test-for-all-to-use.patch b/FernFlower-Patches/0105-Bulk-decompilation-test-for-all-to-use.patch
similarity index 98%
rename from FernFlower-Patches/0107-Bulk-decompilation-test-for-all-to-use.patch
rename to FernFlower-Patches/0105-Bulk-decompilation-test-for-all-to-use.patch
index 418abbd..1254da5 100644
--- a/FernFlower-Patches/0107-Bulk-decompilation-test-for-all-to-use.patch
+++ b/FernFlower-Patches/0105-Bulk-decompilation-test-for-all-to-use.patch
@@ -1,7 +1,7 @@
-From da700502cecd6e05622a5f61112f9c9ea0a7dc23 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 25 Oct 2015 14:08:33 -0400
-Subject: Bulk decompilation test for all to use
+Subject: [PATCH] Bulk decompilation test for all to use
 
 
 diff --git a/build.gradle b/build.gradle
@@ -308,6 +308,3 @@ index 660d0313e68f87b72b694b886ab321792fb5a8bc..0d68e8886c6f6584c4514e9b95f320fb
 +    }
    }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0108-Fix-NPE.patch b/FernFlower-Patches/0106-Fix-NPE.patch
similarity index 90%
rename from FernFlower-Patches/0108-Fix-NPE.patch
rename to FernFlower-Patches/0106-Fix-NPE.patch
index fa98100..ac9cfe7 100644
--- a/FernFlower-Patches/0108-Fix-NPE.patch
+++ b/FernFlower-Patches/0106-Fix-NPE.patch
@@ -1,7 +1,7 @@
-From 72d20673f0ae872335858e728ff81532049422f0 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 25 Oct 2015 14:26:33 -0400
-Subject: Fix NPE
+Subject: [PATCH] Fix NPE
 
 
 diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
@@ -17,6 +17,3 @@ index 0d68e8886c6f6584c4514e9b95f320fb05b9e941..2ae6da55e0d8ecb2fbdb39a6e42d1f17
              writeFile(found,fname+"."+md5digest,outRoot);
          } else if (!md5digest.equals(md5s.get(fname))) {
            System.out.println("Existing Variant: " + fname);
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0109-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch b/FernFlower-Patches/0107-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch
similarity index 97%
rename from FernFlower-Patches/0109-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch
rename to FernFlower-Patches/0107-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch
index 8fc8975..bce4a6a 100644
--- a/FernFlower-Patches/0109-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch
+++ b/FernFlower-Patches/0107-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch
@@ -1,8 +1,8 @@
-From 01e351e13f31deaa74035ceeda111ace834849a8 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Wed, 28 Oct 2015 23:45:40 -0700
-Subject: Stabelize a few areas on Java 8. Notibly the exit mapper. Fixes the
- decompile differences between J6/7 and J8.
+Subject: [PATCH] Stabelize a few areas on Java 8. Notibly the exit mapper.
+ Fixes the decompile differences between J6/7 and J8.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
@@ -141,6 +141,3 @@ index 2a2930908a9051cea5f590d0a6e66d38689d1753..af522d97a6198ba50a5eae7b69232d9e
        stats.addWithKey(st, st.id);
      }
    }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0110-Gather-all-variable-declarations-including-those-wit.patch b/FernFlower-Patches/0108-Gather-all-variable-declarations-including-those-wit.patch
similarity index 96%
rename from FernFlower-Patches/0110-Gather-all-variable-declarations-including-those-wit.patch
rename to FernFlower-Patches/0108-Gather-all-variable-declarations-including-those-wit.patch
index f7ac846..08e3a14 100644
--- a/FernFlower-Patches/0110-Gather-all-variable-declarations-including-those-wit.patch
+++ b/FernFlower-Patches/0108-Gather-all-variable-declarations-including-those-wit.patch
@@ -1,7 +1,7 @@
-From 360216c53673ce9f6aa83fd697123edd9637badb Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 5 Nov 2015 20:36:11 -0800
-Subject: Gather all variable declarations including those without LVTs
+Subject: [PATCH] Gather all variable declarations including those without LVTs
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
@@ -126,6 +126,3 @@ index 726edd7aeab41647414952e0a0a6c8cb52674816..164ddb5639ed92ae8bcab25a62713211
  
    private void applyTypes(Statement stat, Map<VarVersionPair, LVTVariable> types) {
      if (stat == null || types.size() == 0) {
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0111-Renaming-thinger.patch b/FernFlower-Patches/0109-Renaming-thinger.patch
similarity index 99%
rename from FernFlower-Patches/0111-Renaming-thinger.patch
rename to FernFlower-Patches/0109-Renaming-thinger.patch
index 3dbf236..3094bac 100644
--- a/FernFlower-Patches/0111-Renaming-thinger.patch
+++ b/FernFlower-Patches/0109-Renaming-thinger.patch
@@ -1,7 +1,7 @@
-From f02eb602c3f8d68e5842cc9dd65718aa9ab425cf Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Fri, 6 Nov 2015 01:36:47 -0500
-Subject: Renaming thinger
+Subject: [PATCH] Renaming thinger
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -821,6 +821,3 @@ index 2ae6da55e0d8ecb2fbdb39a6e42d1f179ac32203..087c8102c11b1258d8e3f1615fe64f74
      }
    }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0112-Fix-up-some-name-issues.-Still-outstanding-propogati.patch b/FernFlower-Patches/0110-Fix-up-some-name-issues.-Still-outstanding-propogati.patch
similarity index 95%
rename from FernFlower-Patches/0112-Fix-up-some-name-issues.-Still-outstanding-propogati.patch
rename to FernFlower-Patches/0110-Fix-up-some-name-issues.-Still-outstanding-propogati.patch
index fbaf17f..b0d35ff 100644
--- a/FernFlower-Patches/0112-Fix-up-some-name-issues.-Still-outstanding-propogati.patch
+++ b/FernFlower-Patches/0110-Fix-up-some-name-issues.-Still-outstanding-propogati.patch
@@ -1,8 +1,9 @@
-From 59732c39518f9dc24da57d846df7adceaf806dbf Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Fri, 6 Nov 2015 02:30:26 -0500
-Subject: Fix up some name issues. Still outstanding: propogating the parent
- context into child methods. Current placement in insertLocalVars is too late.
+Subject: [PATCH] Fix up some name issues. Still outstanding: propogating the
+ parent context into child methods. Current placement in insertLocalVars is
+ too late.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -90,6 +91,3 @@ index ff2457b4e38f5cec0854d21a15ca4bc5551bbda3..b4af1f7cfd661fe456121f999a495c89
 -  @Test public void testMCContainerPlayer() { doTest("net/minecraft/inventory/ContainerPlayer"); }
 +  @Test public void testMCContainerPlayer() { doTest("net/minecraft/command/PlayerSelector"); }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0113-Propogate-renamer-state-to-nested-classes.patch b/FernFlower-Patches/0111-Propogate-renamer-state-to-nested-classes.patch
similarity index 98%
rename from FernFlower-Patches/0113-Propogate-renamer-state-to-nested-classes.patch
rename to FernFlower-Patches/0111-Propogate-renamer-state-to-nested-classes.patch
index 0092af5..eba3546 100644
--- a/FernFlower-Patches/0113-Propogate-renamer-state-to-nested-classes.patch
+++ b/FernFlower-Patches/0111-Propogate-renamer-state-to-nested-classes.patch
@@ -1,7 +1,7 @@
-From 2ab59c1d7153f83d74f4e82db8174429f9eb80ea Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Fri, 6 Nov 2015 03:13:00 -0800
-Subject: Propogate renamer state to nested classes.
+Subject: [PATCH] Propogate renamer state to nested classes.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -179,6 +179,3 @@ index 0000000000000000000000000000000000000000..4e4c8b475a4fdf4d6452ebe57621fc36
 +    }
 +  }
 +}
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0114-Properly-implement-options-for-the-renamer-stuff.patch b/FernFlower-Patches/0112-Properly-implement-options-for-the-renamer-stuff.-JV.patch
similarity index 86%
rename from FernFlower-Patches/0114-Properly-implement-options-for-the-renamer-stuff.patch
rename to FernFlower-Patches/0112-Properly-implement-options-for-the-renamer-stuff.-JV.patch
index 43b4fab..1b6be1d 100644
--- a/FernFlower-Patches/0114-Properly-implement-options-for-the-renamer-stuff.patch
+++ b/FernFlower-Patches/0112-Properly-implement-options-for-the-renamer-stuff.-JV.patch
@@ -1,13 +1,11 @@
-From da7239d27dd36ed264fad47e1051f0f82c9c17b0 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Fri, 6 Nov 2015 15:16:23 -0500
-Subject: =?UTF-8?q?Properly=20implement=20options=20for=20the=20renamer=20?=
- =?UTF-8?q?stuff.=0A"JVN"=20argument=20enables=20JAD=20style=20variable=20?=
- =?UTF-8?q?naming=20(int=20i,=20j,=20k=20etc).=0ACan=20pass=20a=20"RENAMER?=
- =?UTF-8?q?=5FFACTORY"=20to=20the=20decompiler=20context:=20this=20is=20th?=
- =?UTF-8?q?e=20name=20of=20a=20class=20implementing=20IVariableNamingFacto?=
- =?UTF-8?q?ry,=20that=20will=20be=20loaded=20and=20instantiated,=20overrid?=
- =?UTF-8?q?ing=0Aother=20options.?=
+Subject: [PATCH] Properly implement options for the renamer stuff. "JVN"
+ argument enables JAD style variable naming (int i, j, k etc). Can pass a
+ "RENAMER_FACTORY" to the decompiler context: this is the name of a class
+ implementing IVariableNamingFactory, that will be loaded and instantiated,
+ overriding other options.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -77,6 +75,3 @@ index 79dd8e890cd37e88bfbe9f0c22c825b3c2549bb8..7940dcfbd89ec1427459aeeac1aebaea
 +    put(USE_JAD_VARNAMING, "0");
    }});
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0115-Add-the-index-to-the-param-renamer-needed-for-sane-p.patch b/FernFlower-Patches/0113-Add-the-index-to-the-param-renamer-needed-for-sane-p.patch
similarity index 94%
rename from FernFlower-Patches/0115-Add-the-index-to-the-param-renamer-needed-for-sane-p.patch
rename to FernFlower-Patches/0113-Add-the-index-to-the-param-renamer-needed-for-sane-p.patch
index 06c5a2b..6a46ba3 100644
--- a/FernFlower-Patches/0115-Add-the-index-to-the-param-renamer-needed-for-sane-p.patch
+++ b/FernFlower-Patches/0113-Add-the-index-to-the-param-renamer-needed-for-sane-p.patch
@@ -1,8 +1,8 @@
-From ba604f35f4e1abbba5a893c3eb031fb3c6720ebd Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 8 Nov 2015 13:28:24 -0500
-Subject: Add the index to the param renamer, needed for sane param name
- generation..
+Subject: [PATCH] Add the index to the param renamer, needed for sane param
+ name generation..
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -56,6 +56,3 @@ index f2d2e3baf14f3004b1d377b9cb7a882741885d23..b588cec7b138dfffeb1d57a11aeb7e4b
        return abstractParam;
      }
  
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0116-Early-set-the-logger-so-that-it-can-be-used-during-i.patch b/FernFlower-Patches/0114-Early-set-the-logger-so-that-it-can-be-used-during-i.patch
similarity index 91%
rename from FernFlower-Patches/0116-Early-set-the-logger-so-that-it-can-be-used-during-i.patch
rename to FernFlower-Patches/0114-Early-set-the-logger-so-that-it-can-be-used-during-i.patch
index 8831353..9e89f65 100644
--- a/FernFlower-Patches/0116-Early-set-the-logger-so-that-it-can-be-used-during-i.patch
+++ b/FernFlower-Patches/0114-Early-set-the-logger-so-that-it-can-be-used-during-i.patch
@@ -1,8 +1,8 @@
-From 0d79d5adcf27840fcb93094b62bb04601b6eafd0 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 8 Nov 2015 16:12:19 -0500
-Subject: Early set the logger so that it can be used during init context
- without NPEs.
+Subject: [PATCH] Early set the logger so that it can be used during init
+ context without NPEs.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
@@ -31,6 +31,3 @@ index 91e70d3132095281338593d2166eedbcbd09e5d6..8319da8a08838b77508269bf44fe2209
      DecompilerContext.initContext(options);
      DecompilerContext.setCounterContainer(new CounterContainer());
      DecompilerContext.setLogger(logger);
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0117-More-fixage-to-the-way-init-happens.patch b/FernFlower-Patches/0115-More-fixage-to-the-way-init-happens.patch
similarity index 95%
rename from FernFlower-Patches/0117-More-fixage-to-the-way-init-happens.patch
rename to FernFlower-Patches/0115-More-fixage-to-the-way-init-happens.patch
index 5b0493e..8117cb1 100644
--- a/FernFlower-Patches/0117-More-fixage-to-the-way-init-happens.patch
+++ b/FernFlower-Patches/0115-More-fixage-to-the-way-init-happens.patch
@@ -1,7 +1,7 @@
-From 7465233a204d2523968638a0275020cd84cdb571 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Sun, 8 Nov 2015 16:18:49 -0500
-Subject: More fixage to the way init happens.
+Subject: [PATCH] More fixage to the way init happens.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
@@ -47,6 +47,3 @@ index 8319da8a08838b77508269bf44fe2209bcf4a328..320e250ce1fe0eeca0194b296a3944cc
  
      if (DecompilerContext.getOption(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH)) {
        addAllClasspath();
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0118-Try-and-release-the-renamer-after-we-re-done-with-th.patch b/FernFlower-Patches/0116-Try-and-release-the-renamer-after-we-re-done-with-th.patch
similarity index 88%
rename from FernFlower-Patches/0118-Try-and-release-the-renamer-after-we-re-done-with-th.patch
rename to FernFlower-Patches/0116-Try-and-release-the-renamer-after-we-re-done-with-th.patch
index 35d9b0d..aefe430 100644
--- a/FernFlower-Patches/0118-Try-and-release-the-renamer-after-we-re-done-with-th.patch
+++ b/FernFlower-Patches/0116-Try-and-release-the-renamer-after-we-re-done-with-th.patch
@@ -1,8 +1,8 @@
-From f3c197fc7633ffc69ce33e711f542fc1b25d9b3d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Mon, 23 Nov 2015 11:56:24 -0500
-Subject: Try and release the renamer after we're done with the class. Should
- reduce memory footprint somewhat.
+Subject: [PATCH] Try and release the renamer after we're done with the class.
+ Should reduce memory footprint somewhat.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
@@ -32,6 +32,3 @@ index 7e7f7580f5301ea94b4bf97440a471caa3f62c50..68f5427e95ffd45a0fd925b8912c79d0
  
    public StructMethod(DataInputFullStream in, StructClass clStruct) throws IOException {
      classStruct = clStruct;
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0119-Try-to-release-resources-after-we-re-done-not-before.patch b/FernFlower-Patches/0117-Try-to-release-resources-after-we-re-done-not-before.patch
similarity index 88%
rename from FernFlower-Patches/0119-Try-to-release-resources-after-we-re-done-not-before.patch
rename to FernFlower-Patches/0117-Try-to-release-resources-after-we-re-done-not-before.patch
index 69c5a37..b4f4457 100644
--- a/FernFlower-Patches/0119-Try-to-release-resources-after-we-re-done-not-before.patch
+++ b/FernFlower-Patches/0117-Try-to-release-resources-after-we-re-done-not-before.patch
@@ -1,7 +1,8 @@
-From 1cfbf4d63df1d352d611683366d7ec94b25951df Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Mon, 23 Nov 2015 14:01:47 -0500
-Subject: Try to release resources *after* we're done, not before we've started
+Subject: [PATCH] Try to release resources *after* we're done, not before we've
+ started
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -32,6 +33,3 @@ index 784860620c1c07884c28ac26d431396960312f19..ab0f118debc0d7dee08f79a12c355890
    }
  
    public ConstantPool getPool() {
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0120-Don-t-allocate-a-renamer-for-every-single-method-rea.patch b/FernFlower-Patches/0118-Don-t-allocate-a-renamer-for-every-single-method-rea.patch
similarity index 84%
rename from FernFlower-Patches/0120-Don-t-allocate-a-renamer-for-every-single-method-rea.patch
rename to FernFlower-Patches/0118-Don-t-allocate-a-renamer-for-every-single-method-rea.patch
index 2728621..65b761c 100644
--- a/FernFlower-Patches/0120-Don-t-allocate-a-renamer-for-every-single-method-rea.patch
+++ b/FernFlower-Patches/0118-Don-t-allocate-a-renamer-for-every-single-method-rea.patch
@@ -1,8 +1,8 @@
-From fd28c848f1295a31d38e69f7f5dd7afec52f208f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Mon, 23 Nov 2015 14:27:08 -0500
-Subject: Don't allocate a renamer for every single method read. That should
- cut down the memory quite a lot.
+Subject: [PATCH] Don't allocate a renamer for every single method read. That
+ should cut down the memory quite a lot.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
@@ -25,6 +25,3 @@ index 68f5427e95ffd45a0fd925b8912c79d07a999d17..77fd181a17eb566fa0f0330c0c21fb08
        expanded = true;
      }
    }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0121-Clean-up-renamer-access-a-bit-ensure-it-s-loaded-for.patch b/FernFlower-Patches/0119-Clean-up-renamer-access-a-bit-ensure-it-s-loaded-for.patch
similarity index 96%
rename from FernFlower-Patches/0121-Clean-up-renamer-access-a-bit-ensure-it-s-loaded-for.patch
rename to FernFlower-Patches/0119-Clean-up-renamer-access-a-bit-ensure-it-s-loaded-for.patch
index b8a9804..bc8f308 100644
--- a/FernFlower-Patches/0121-Clean-up-renamer-access-a-bit-ensure-it-s-loaded-for.patch
+++ b/FernFlower-Patches/0119-Clean-up-renamer-access-a-bit-ensure-it-s-loaded-for.patch
@@ -1,7 +1,8 @@
-From add9bf560f6db5cea287c95b2ee13575ba15c8f3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Mon, 23 Nov 2015 14:56:19 -0500
-Subject: Clean up renamer access a bit- ensure it's loaded for inner classes
+Subject: [PATCH] Clean up renamer access a bit- ensure it's loaded for inner
+ classes
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -98,6 +99,3 @@ index 77fd181a17eb566fa0f0330c0c21fb08f787922f..d7ede2e3ab1f542a7223cc79e2f139d2
 +    this.renamer = null;
 +  }
  }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0122-Do-not-merge-varaibles-when-the-to-target-is-read-fu.patch b/FernFlower-Patches/0120-Do-not-merge-varaibles-when-the-to-target-is-read-fu.patch
similarity index 97%
rename from FernFlower-Patches/0122-Do-not-merge-varaibles-when-the-to-target-is-read-fu.patch
rename to FernFlower-Patches/0120-Do-not-merge-varaibles-when-the-to-target-is-read-fu.patch
index 1df3e11..5b70abc 100644
--- a/FernFlower-Patches/0122-Do-not-merge-varaibles-when-the-to-target-is-read-fu.patch
+++ b/FernFlower-Patches/0120-Do-not-merge-varaibles-when-the-to-target-is-read-fu.patch
@@ -1,8 +1,8 @@
-From 114aebe82cf40075c5c4f916c409b8aebf8096d5 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: LexManos <LexManos@gmail.com>
 Date: Mon, 14 Dec 2015 02:09:28 -0800
-Subject: Do not merge varaibles when the to target is read further in the
- method.
+Subject: [PATCH] Do not merge varaibles when the to target is read further in
+ the method.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
@@ -154,6 +154,3 @@ index 39ce7ff03344f2c0dc9a23e85663af003e312fc6..cadf983d316055b1c5f3d822b8f32d80
            if (!allowed) {
              return true;
            }
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0123-Changed-archive-name-to-reflect-the-update-to-ForgeF.patch b/FernFlower-Patches/0121-Changed-archive-name-to-reflect-the-update-to-ForgeF.patch
similarity index 64%
rename from FernFlower-Patches/0123-Changed-archive-name-to-reflect-the-update-to-ForgeF.patch
rename to FernFlower-Patches/0121-Changed-archive-name-to-reflect-the-update-to-ForgeF.patch
index f7fc00a..5385e04 100644
--- a/FernFlower-Patches/0123-Changed-archive-name-to-reflect-the-update-to-ForgeF.patch
+++ b/FernFlower-Patches/0121-Changed-archive-name-to-reflect-the-update-to-ForgeF.patch
@@ -1,11 +1,11 @@
-From 732aa7d1cf9a3e08cedd57a08cbac026c2826068 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Curle <curle@gemwire.uk>
 Date: Tue, 21 Apr 2020 14:00:05 +0000
-Subject: Changed archive name to reflect the update to ForgeFlower
+Subject: [PATCH] Changed archive name to reflect the update to ForgeFlower
 
 
 diff --git a/build.gradle b/build.gradle
-index cf3d8ec6b2fe4260b788b46643e8a397e5d63e18..a57d56edcb30c9e9c72293274158cf2137e23e83 100644
+index cf3d8ec6b2fe4260b788b46643e8a397e5d63e18..7dec9ec6fb04c6cd2081f2e452d072f7451ddcad 100644
 --- a/build.gradle
 +++ b/build.gradle
 @@ -3,9 +3,9 @@ apply plugin: 'idea'
@@ -13,13 +13,10 @@ index cf3d8ec6b2fe4260b788b46643e8a397e5d63e18..a57d56edcb30c9e9c72293274158cf21
  apply plugin: 'java'
  
 -version = "2.0-SNAPSHOT"
-+version = "0.2.3-SNAPSHOT"
++version = "0.2.3"
  group = "net.minecraftforge" //not sure if we shoulkd publish under this name, but it's our fork so meh
 -archivesBaseName = "fernflower"
 +archivesBaseName = "forgeflower"
  
  sourceCompatibility = '1.6'
  targetCompatibility = '1.6'
--- 
-2.28.0.windows.1
-
diff --git a/FernFlower-Patches/0122-Allow-saving-to-JAR.patch b/FernFlower-Patches/0122-Allow-saving-to-JAR.patch
new file mode 100644
index 0000000..393d45a
--- /dev/null
+++ b/FernFlower-Patches/0122-Allow-saving-to-JAR.patch
@@ -0,0 +1,153 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Curle <curle@gemwire.uk>
+Date: Wed, 16 Dec 2020 01:09:12 +0000
+Subject: [PATCH] Allow saving to JAR
+
+
+diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+index 7924b1cf82106991a411300ee7754567a4d199e1..06f3b1d3b135a30441cb68e2a7a33eddeaa40a1c 100644
+--- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
++++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+@@ -78,7 +78,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
+     }
+ 
+     File destination = new File(args[args.length - 1]);
+-    if (!destination.isDirectory()) {
++    if (!destination.isDirectory() && (lstSources.size() > 1 || !lstSources.get(0).isFile())) {
+       System.out.println("error: destination '" + destination + "' is not a directory");
+       return;
+     }
+@@ -123,7 +123,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
+ 
+   protected ConsoleDecompiler(File destination, Map<String, Object> options, IFernflowerLogger logger) {
+     root = destination;
+-    fernflower = new Fernflower(this, this, options, logger);
++    fernflower = new Fernflower(this, root.isDirectory() ? this : new SingleFileSaver(destination), options, logger);
+   }
+ 
+   public void addSpace(File file, boolean isOwn) {
+diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/SingleFileSaver.java b/src/org/jetbrains/java/decompiler/main/decompiler/SingleFileSaver.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..21ac54addc58f53d79914aab42db0eae985a7dc1
+--- /dev/null
++++ b/src/org/jetbrains/java/decompiler/main/decompiler/SingleFileSaver.java
+@@ -0,0 +1,118 @@
++package org.jetbrains.java.decompiler.main.decompiler;
++
++import java.io.File;
++import java.io.FileOutputStream;
++import java.io.IOException;
++import java.io.InputStream;
++import java.util.HashSet;
++import java.util.Set;
++import java.util.jar.JarOutputStream;
++import java.util.jar.Manifest;
++import java.util.zip.ZipEntry;
++import java.util.zip.ZipFile;
++import java.util.zip.ZipOutputStream;
++
++import org.jetbrains.java.decompiler.main.DecompilerContext;
++import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
++import org.jetbrains.java.decompiler.main.extern.IResultSaver;
++import org.jetbrains.java.decompiler.util.InterpreterUtil;
++
++public class SingleFileSaver implements IResultSaver {
++  private final File target;
++  private ZipOutputStream output;
++  private Set<String> entries = new HashSet<>();
++
++  public SingleFileSaver(File target) {
++    this.target = target;
++  }
++
++  @Override
++  public void saveFolder(String path) {
++    if (!"".equals(path))
++      throw new UnsupportedOperationException("Targeted a single output, but tried to create a directory");
++  }
++
++  @Override
++  public void copyFile(String source, String path, String entryName) {
++    throw new UnsupportedOperationException("Targeted a single output, but tried to copy file");
++  }
++
++  @Override
++  public void saveClassFile(String path, String qualifiedName, String entryName, String content, int[] mapping) {
++    throw new UnsupportedOperationException("Targeted a single output, but tried to save a class file");
++  }
++
++  @Override
++  public void createArchive(String path, String archiveName, Manifest manifest) {
++    if (output != null)
++      throw new UnsupportedOperationException("Attempted to write multiple archives at the same time");
++    try {
++      FileOutputStream stream = new FileOutputStream(target);
++      output = manifest != null ? new JarOutputStream(stream, manifest) : new ZipOutputStream(stream);
++    } catch (IOException e) {
++      DecompilerContext.getLogger().writeMessage("Cannot create archive " + target, e);
++    }
++  }
++
++  @Override
++  public void saveDirEntry(String path, String archiveName, String entryName) {
++    saveClassEntry(path, archiveName, null, entryName, null);
++  }
++
++  @Override
++  public void copyEntry(String source, String path, String archiveName, String entryName) {
++    if (!checkEntry(entryName))
++      return;
++
++    try (ZipFile srcArchive = new ZipFile(new File(source))) {
++      ZipEntry entry = srcArchive.getEntry(entryName);
++      if (entry != null) {
++        try (InputStream in = srcArchive.getInputStream(entry)) {
++          output.putNextEntry(new ZipEntry(entryName));
++          InterpreterUtil.copyStream(in, output);
++        }
++      }
++    }
++    catch (IOException ex) {
++      String message = "Cannot copy entry " + entryName + " from " + source + " to " + target;
++      DecompilerContext.getLogger().writeMessage(message, ex);
++    }
++  }
++
++  @Override
++  public void saveClassEntry(String path, String archiveName, String qualifiedName, String entryName, String content) {
++    if (!checkEntry(entryName))
++        return;
++
++    try {
++      output.putNextEntry(new ZipEntry(entryName));
++      if (content != null)
++          output.write(content.getBytes("UTF-8"));
++    }
++    catch (IOException ex) {
++      String message = "Cannot write entry " + entryName + " to " + target;
++      DecompilerContext.getLogger().writeMessage(message, ex);
++    }
++  }
++
++  @Override
++  public void closeArchive(String path, String archiveName) {
++    try {
++      output.close();
++      entries.clear();
++      output = null;
++    }
++    catch (IOException ex) {
++      DecompilerContext.getLogger().writeMessage("Cannot close " + target, IFernflowerLogger.Severity.WARN);
++    }
++  }
++
++  private boolean checkEntry(String entryName) {
++    boolean added = entries.add(entryName);
++    if (!added) {
++      String message = "Zip entry " + entryName + " already exists in " + target;
++      DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
++    }
++    return added;
++  }
++}
+\ No newline at end of file

From 1056f3b7dbb98c021c054df9365e33e76b067713 Mon Sep 17 00:00:00 2001
From: sciwhiz12 <sciwhiz12@sciwhiz12.tk>
Date: Sun, 7 Feb 2021 01:21:51 +0800
Subject: [PATCH 05/22] Consolidate patches

Thanks to Sciwhiz12
---
 ...tch => 0001-Repository-meta-changes.patch} |   12 +-
 ...eric-parametrs-for-anonymous-classes.patch |   14 +-
 ...ctions-on-field-initalizers-allowing.patch |   31 +-
 ...-synthetic-classes-can-have-content-.patch |   21 -
 ...-lists-local-variables-variable-defi.patch |  780 +++++++++++++
 .../0006-LVT-and-LVTT-changes.patch           | 1028 +++++++++++++++++
 ...-lists-to-produce-a-consistant-decom.patch |   73 --
 ...so-we-can-quickly-iterate-LVT-hackin.patch |  140 ---
 ...es-are-determined-was-detecting-ano.patch} |    0
 ...and-LVTT-properly-into-some-structur.patch |  164 ---
 ...uctors-with-anon-class-as-last-argu.patch} |    0
 ...es-printing-floats-and-constants-wi.patch} |   49 +-
 ...o-an-incoming-LVT-if-they-re-out-of-.patch |   27 -
 ...10-Fix-tests-for-inner-class-sorting.patch |  476 --------
 ...hetic-classes-allowed-in-parameters.patch} |    0
 ...ytecode-to-a-BitMap-as-it-gives-bet.patch} |    2 +-
 ...e-field-initalizers-would-incorrectl.patch |   56 -
 ...non-classes-are-being-detected-as-me.patch |   20 -
 ...ll-now-use-the-correct-variable-ind.patch} |  101 +-
 ...each-loop-detection-re-introduce-Do.patch} |  284 ++++-
 .../0013-Fixed-last-test-all-tests-pass.patch |   68 --
 ...variables-that-seem-to-come-into-sc.patch} |    0
 ...-VarExprent-and-print-generic-types.patch} |    0
 ...fintionHelper-that-splits-variables.patch} |    4 +-
 ...x-s-tests.patch => 0017-Lex-s-tests.patch} |    0
 ...bles-and-variable-definitions.-Again.patch |  142 ---
 ...r.patch => 0018-More-tweaks.-Closer.patch} |    0
 ...hange-LVT-indexing-to-VarVersionPair.patch |  135 ---
 ...-tweaks-it-passes-the-TestLVT-tests.patch} |    0
 ...-lex-merges-RHS-and-LHS-of-exprents.patch} |    0
 ...-data-from-the-Struct-for-easier-abi.patch |  325 ------
 ...h-start-and-end-to-avoid-weirdness-.patch} |    0
 ...er-to-MethodProcessorRunnable-for-th.patch |  173 ---
 ...tter-remapping-of-assignment-merges.patch} |    0
 ...impler-than-the-complex-one-almost-p.patch |  108 --
 ...nge-begin-end-detection.-Less-derpy.patch} |  206 ++--
 ...up-NPE-from-PPMM-helper-prevent-inf.patch} |   79 +-
 .../0024-Add-the-test-to-the-harness.patch    |   16 -
 ...ns-to-the-printout.-Also-fixed-a-fas.patch |  255 ----
 ... 0025-Types-are-merged-properly-now.patch} |    0
 ...the-varversionpair-in-the-oldnames-t.patch |  118 --
 ...anual-scoping-for-merging-variables.patch} |  198 ++--
 ...the-time-we-create-the-exprents.-Th.patch} |    8 +-
 ...it-seems-that-it-increases-as-the-vi.patch |  140 ---
 ...-without-an-LVT-entry.-They-re-likel.patch |  186 ---
 ...a-post-merge-fix-injected-var-defs-.patch} |  101 +-
 ...LVT-first-and-fallback-to-other-typ.patch} |    0
 ...on-in-LVT-loading-and-EnumProcessor.patch} |   17 +-
 ...variables-in-synchronized-headers-f.patch} |   10 +-
 ...-on-gradlew.-It-s-writeable-on-linux.patch |    9 -
 ...Include-LVT-info-in-VarExprent.copy.patch} |    2 +-
 ...-TryCatch-statements-will-now-use-th.patch |  106 --
 ...tection-and-restore-do-loop-collaps.patch} |    0
 ...ractHelper-to-include-extractable-b.patch} |   82 +-
 ...xtracted-ifs-from-being-inlined-aga.patch} |    0
 ...ement-retain-all-bytecode-data.-And-.patch |  268 -----
 ...-detection-to-be-before-for-detectio.patch |  576 +++++++++
 ...-inner-classes.-Fix-improper-var-me.patch} |   45 +-
 ...rguments-for-non-static-inner-class.patch} |    0
 .../0038-Fix-inverted-null-test.patch         |   19 -
 ...urn-generic-typevar-casting-support.patch} |    0
 ...r-option-iec-Include_Entire_Classpa.patch} |   19 +-
 ...e-to-be-subclass-of-VarType-and-con.patch} |   17 +-
 ...Improve-generation-of-type-inference.patch |  502 ++++++++
 ...h => 0043-Enhance-switches-on-enums.patch} |   17 +-
 ...-inner-class-fields-would-not-be-re.patch} |   21 +-
 .../0044-PPMM-test-for-lex.patch              |   57 -
 ...nd-field-accessors-in-inner-classes.patch} |   25 +-
 ...on-test-to-new-settings-no-syntheti.patch} |    0
 ...el-names-based-on-jvm-instruction-i.patch} |    0
 .../0047-Prevent-infinite-loops-in-PPMM.patch |   23 -
 ....-AmbiguousCallWithDebugInfo-Was-br.patch} |    0
 ...-does-some-things-better.-But-still-.patch |  136 ---
 ...shSet-to-LinkedHashSet-to-stabelize.patch} |    0
 ...tch => 0050-Add-a-parameter-renamer.patch} |    0
 ...erging.-It-s-pretty-decent.-But-stil.patch |   46 -
 ...-use.patch => 0051-Bulk-test-for-MC.patch} |  264 +++--
 ...onstant-don-t-give-it-a-type.-Cleans.patch |   47 -
 ...reas-on-Java-8.-Notibly-the-exit-ma.patch} |    0
 ...le-declarations-including-those-wit.patch} |    0
 ...iable-renaming-option-and-interface.patch} |  328 +++++-
 .../0054-Some-code-cleanup-damn-cpw.patch     |  237 ----
 ...ibles-when-the-to-target-is-read-fu.patch} |    0
 ...R.patch => 0056-Allow-saving-to-JAR.patch} |    0
 ...intions-in-IfStatement-s-headers-hav.patch |   30 -
 ...terator-is-being-used-elseware-befor.patch |  119 --
 ...0060-NPE-Protection-in-EnumProcessor.patch |   21 -
 ...tractHelper-to-include-break-edges-t.patch |   84 --
 ...source-vars-in-itteration-allows-for.patch |   19 -
 ...-detection-to-be-before-For-detectio.patch |  266 -----
 ...For-loops-would-be-enhanced-to-ForEa.patch |   35 -
 ...ing-for-an-init-exprent-not-to-look-.patch |  285 -----
 ...eClasspath-so-it-doesn-t-dump-out-ra.patch |   34 -
 ...pe-parsing-of-inner-classes-with-gen.patch |   28 -
 .../0078-Foo.-Bar-baz-generation.patch        |  340 ------
 ...anges-to-Exprent.getInferredExprType.patch |  434 -------
 ...ion-from-InvocationExprent-s-inferre.patch |  108 --
 ...-to-the-VarType-added-type-inference.patch |  284 -----
 ...ists-with-multiple-arguments-in-meth.patch |   39 -
 ...c-info-from-InvocationExprent-correc.patch |  134 ---
 ...ced-for-loops-can-also-have-a-copy-i.patch |   30 -
 ...e-strict-in-detecting-copy-var-usage.patch |   38 -
 ...cleanup-of-InvocationExprent-changes.patch |  194 ----
 ...th-trailing-zeros-and-incorrect-type.patch |   52 -
 FernFlower-Patches/0093-Version-2.0.patch     |   19 -
 ...Fixed-invalid-reference-to-ASM.-Oops.patch |   28 -
 ...xed-potential-NPE-in-lvt-propogation.patch |   22 -
 ...d-nested-inner-generic-type-printing.patch |   19 -
 ...g-not-propogating-type-data-to-var-d.patch |   49 -
 ...e-we-might-be-doing-a-bit-more-work-.patch |   19 -
 ...-that-are-itterated-in-hash-sets-in-.patch |   47 -
 ...-cases-leaking-variables-incorrectly.patch |   20 -
 .../0103-Bulk-test-for-MC.patch               |  249 ----
 FernFlower-Patches/0106-Fix-NPE.patch         |   19 -
 ...-issues.-Still-outstanding-propogati.patch |   93 --
 ...gate-renamer-state-to-nested-classes.patch |  181 ---
 ...nt-options-for-the-renamer-stuff.-JV.patch |   77 --
 ...-the-param-renamer-needed-for-sane-p.patch |   58 -
 ...gger-so-that-it-can-be-used-during-i.patch |   33 -
 ...-More-fixage-to-the-way-init-happens.patch |   49 -
 ...the-renamer-after-we-re-done-with-th.patch |   34 -
 ...esources-after-we-re-done-not-before.patch |   35 -
 ...-renamer-for-every-single-method-rea.patch |   27 -
 ...-access-a-bit-ensure-it-s-loaded-for.patch |  101 --
 ...name-to-reflect-the-update-to-ForgeF.patch |   22 -
 125 files changed, 4181 insertions(+), 8007 deletions(-)
 rename FernFlower-Patches/{0001-Add-Gradlew-wrapper-and-deploy-to-Forge-Maven.patch => 0001-Repository-meta-changes.patch} (99%)
 delete mode 100644 FernFlower-Patches/0005-NUll-constructor-synthetic-classes-can-have-content-.patch
 create mode 100644 FernFlower-Patches/0005-Sort-inner-class-lists-local-variables-variable-defi.patch
 create mode 100644 FernFlower-Patches/0006-LVT-and-LVTT-changes.patch
 delete mode 100644 FernFlower-Patches/0006-Sort-inner-class-lists-to-produce-a-consistant-decom.patch
 delete mode 100644 FernFlower-Patches/0007-Add-an-LVT-test-so-we-can-quickly-iterate-LVT-hackin.patch
 rename FernFlower-Patches/{0014-Fix-how-class-types-are-determined-was-detecting-ano.patch => 0007-Fix-how-class-types-are-determined-was-detecting-ano.patch} (100%)
 delete mode 100644 FernFlower-Patches/0008-Capture-the-LVT-and-LVTT-properly-into-some-structur.patch
 rename FernFlower-Patches/{0015-Force-hide-constructors-with-anon-class-as-last-argu.patch => 0008-Force-hide-constructors-with-anon-class-as-last-argu.patch} (100%)
 rename FernFlower-Patches/{0016-Fix-JVM-differences-printing-floats-with-an-undefine.patch => 0009-Fix-JVM-differences-printing-floats-and-constants-wi.patch} (60%)
 delete mode 100644 FernFlower-Patches/0009-Merge-any-LVTT-to-an-incoming-LVT-if-they-re-out-of-.patch
 delete mode 100644 FernFlower-Patches/0010-Fix-tests-for-inner-class-sorting.patch
 rename FernFlower-Patches/{0018-No-Synthetic-classes-allowed-in-parameters.patch => 0010-No-Synthetic-classes-allowed-in-parameters.patch} (100%)
 rename FernFlower-Patches/{0020-Convert-Exprent.bytecode-to-a-BitMap-as-it-gives-bet.patch => 0011-Convert-Exprent.bytecode-to-a-BitMap-as-it-gives-bet.patch} (99%)
 delete mode 100644 FernFlower-Patches/0011-Fixed-issue-where-field-initalizers-would-incorrectl.patch
 delete mode 100644 FernFlower-Patches/0012-Some-synthetic-anon-classes-are-being-detected-as-me.patch
 rename FernFlower-Patches/{0029-TryCatch-statements-will-now-use-the-correct-variabl.patch => 0012-Try-statements-will-now-use-the-correct-variable-ind.patch} (56%)
 rename FernFlower-Patches/{0030-Add-enhanced-ForEach-loop-detection-and-re-introduce.patch => 0013-Add-enhanced-for-each-loop-detection-re-introduce-Do.patch} (75%)
 delete mode 100644 FernFlower-Patches/0013-Fixed-last-test-all-tests-pass.patch
 rename FernFlower-Patches/{0033-Added-a-test-for-variables-that-seem-to-come-into-sc.patch => 0014-Added-a-test-for-variables-that-seem-to-come-into-sc.patch} (100%)
 rename FernFlower-Patches/{0034-Hook-in-LVT-to-VarExprent-and-print-generic-types.patch => 0015-Hook-in-LVT-to-VarExprent-and-print-generic-types.patch} (100%)
 rename FernFlower-Patches/{0036-Add-step-to-VarDefintionHelper-that-splits-variables.patch => 0016-Add-step-to-VarDefintionHelper-that-splits-variables.patch} (99%)
 rename FernFlower-Patches/{0037-Lex-s-tests.patch => 0017-Lex-s-tests.patch} (100%)
 delete mode 100644 FernFlower-Patches/0017-Sort-local-variables-and-variable-definitions.-Again.patch
 rename FernFlower-Patches/{0039-More-tweaks.-Closer.patch => 0018-More-tweaks.-Closer.patch} (100%)
 delete mode 100644 FernFlower-Patches/0019-Change-LVT-indexing-to-VarVersionPair.patch
 rename FernFlower-Patches/{0040-More-tweaks-it-passes-the-TestLVT-tests.patch => 0019-More-tweaks-it-passes-the-TestLVT-tests.patch} (100%)
 rename FernFlower-Patches/{0041-Another-fix-from-lex-merges-RHS-and-LHS-of-exprents.patch => 0020-Another-fix-from-lex-merges-RHS-and-LHS-of-exprents.patch} (100%)
 delete mode 100644 FernFlower-Patches/0021-Seperate-the-LVT-data-from-the-Struct-for-easier-abi.patch
 rename FernFlower-Patches/{0042-need-to-match-both-start-and-end-to-avoid-weirdness-.patch => 0021-need-to-match-both-start-and-end-to-avoid-weirdness-.patch} (100%)
 delete mode 100644 FernFlower-Patches/0022-Aded-debug-printer-to-MethodProcessorRunnable-for-th.patch
 rename FernFlower-Patches/{0043-Better-remapping-of-assignment-merges.patch => 0022-Better-remapping-of-assignment-merges.patch} (100%)
 delete mode 100644 FernFlower-Patches/0023-A-scoping-test-simpler-than-the-complex-one-almost-p.patch
 rename FernFlower-Patches/{0045-Change-begin-end-detection.-Less-derpy.patch => 0023-Change-begin-end-detection.-Less-derpy.patch} (67%)
 rename FernFlower-Patches/{0046-Fixup-NPE-from-PPMM-helper-and-expand-PPMM-test-to-i.patch => 0024-Add-PPMM-test-fixup-NPE-from-PPMM-helper-prevent-inf.patch} (68%)
 delete mode 100644 FernFlower-Patches/0024-Add-the-test-to-the-harness.patch
 delete mode 100644 FernFlower-Patches/0025-Some-modifications-to-the-printout.-Also-fixed-a-fas.patch
 rename FernFlower-Patches/{0048-Types-are-merged-properly-now.patch => 0025-Types-are-merged-properly-now.patch} (100%)
 delete mode 100644 FernFlower-Patches/0026-Change-to-track-the-varversionpair-in-the-oldnames-t.patch
 rename FernFlower-Patches/{0051-New-aproach-to-merging-variables.-Use-top-down-manua.patch => 0026-Use-top-down-manual-scoping-for-merging-variables.patch} (81%)
 rename FernFlower-Patches/{0053-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch => 0027-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch} (96%)
 delete mode 100644 FernFlower-Patches/0027-Sort-by-version-it-seems-that-it-increases-as-the-vi.patch
 delete mode 100644 FernFlower-Patches/0028-Ignore-variables-without-an-LVT-entry.-They-re-likel.patch
 rename FernFlower-Patches/{0055-Propogate-LVT-data-post-merge.-And-fix-injected-var-.patch => 0028-Propagate-LVT-data-post-merge-fix-injected-var-defs-.patch} (93%)
 rename FernFlower-Patches/{0056-Fix-types-to-use-LVT-first-and-fallback-to-other-typ.patch => 0029-Fix-types-to-use-LVT-first-and-fallback-to-other-typ.patch} (100%)
 rename FernFlower-Patches/{0057-NPE-protection-in-LVT-loading.patch => 0030-NPE-protection-in-LVT-loading-and-EnumProcessor.patch} (59%)
 rename FernFlower-Patches/{0061-Cleanup-unwanted-variables-in-synchronized-headers.patch => 0031-Cleanup-unwanted-variables-in-synchronized-headers-f.patch} (97%)
 delete mode 100644 FernFlower-Patches/0031-Fix-permissions-on-gradlew.-It-s-writeable-on-linux.patch
 rename FernFlower-Patches/{0062-Include-LVT-info-in-VarExprent.copy.patch => 0032-Include-LVT-info-in-VarExprent.copy.patch} (96%)
 delete mode 100644 FernFlower-Patches/0032-Partially-revert-TryCatch-statements-will-now-use-th.patch
 rename FernFlower-Patches/{0063-Remove-dowhile-detection-and-restore-do-loop-collaps.patch => 0033-Remove-dowhile-detection-and-restore-do-loop-collaps.patch} (100%)
 rename FernFlower-Patches/{0064-Move-LoopExtract-to-before-MergeHelper-and-add-more-.patch => 0034-Loosen-up-LoopExtractHelper-to-include-extractable-b.patch} (74%)
 rename FernFlower-Patches/{0066-Hack-to-prevent-extracted-ifs-from-being-inlined-aga.patch => 0035-Hack-to-prevent-extracted-ifs-from-being-inlined-aga.patch} (100%)
 delete mode 100644 FernFlower-Patches/0035-Make-Loop-Enhancement-retain-all-bytecode-data.-And-.patch
 create mode 100644 FernFlower-Patches/0036-Rewrite-for-each-detection-to-be-before-for-detectio.patch
 rename FernFlower-Patches/{0069-Propogate-LVTs-to-inner-classes.-Fix-improper-var-me.patch => 0037-Propogate-LVTs-to-inner-classes.-Fix-improper-var-me.patch} (86%)
 rename FernFlower-Patches/{0071-Fix-constructor-arguments-for-non-static-inner-class.patch => 0038-Fix-constructor-arguments-for-non-static-inner-class.patch} (100%)
 delete mode 100644 FernFlower-Patches/0038-Fix-inverted-null-test.patch
 rename FernFlower-Patches/{0072-Return-generic-typevar-casting-support.patch => 0039-Return-generic-typevar-casting-support.patch} (100%)
 rename FernFlower-Patches/{0073-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch => 0040-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch} (77%)
 rename FernFlower-Patches/{0074-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch => 0041-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch} (98%)
 create mode 100644 FernFlower-Patches/0042-Improve-generation-of-type-inference.patch
 rename FernFlower-Patches/{0086-Enhance-switches-on-enums.patch => 0043-Enhance-switches-on-enums.patch} (95%)
 rename FernFlower-Patches/{0087-Fixed-issue-where-inner-class-fields-would-not-be-re.patch => 0044-Fixed-issue-where-inner-class-fields-would-not-be-re.patch} (80%)
 delete mode 100644 FernFlower-Patches/0044-PPMM-test-for-lex.patch
 rename FernFlower-Patches/{0088-Added-support-for-and-field-accessors-in-inner-class.patch => 0045-Add-support-for-and-field-accessors-in-inner-classes.patch} (67%)
 rename FernFlower-Patches/{0090-Tweak-decompilation-test-to-new-settings-no-syntheti.patch => 0046-Tweak-decompilation-test-to-new-settings-no-syntheti.patch} (100%)
 rename FernFlower-Patches/{0092-Deterministic-label-names-based-on-jvm-instruction-i.patch => 0047-Deterministic-label-names-based-on-jvm-instruction-i.patch} (100%)
 delete mode 100644 FernFlower-Patches/0047-Prevent-infinite-loops-in-PPMM.patch
 rename FernFlower-Patches/{0097-Fixed-JUint-tests.-AmbiguousCallWithDebugInfo-Was-br.patch => 0048-Fixed-JUint-tests.-AmbiguousCallWithDebugInfo-Was-br.patch} (100%)
 delete mode 100644 FernFlower-Patches/0049-More-merging.-It-does-some-things-better.-But-still-.patch
 rename FernFlower-Patches/{0102-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch => 0049-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch} (100%)
 rename FernFlower-Patches/{0104-Add-a-parameter-renamer.patch => 0050-Add-a-parameter-renamer.patch} (100%)
 delete mode 100644 FernFlower-Patches/0050-More-tweaks-to-merging.-It-s-pretty-decent.-But-stil.patch
 rename FernFlower-Patches/{0105-Bulk-decompilation-test-for-all-to-use.patch => 0051-Bulk-test-for-MC.patch} (57%)
 delete mode 100644 FernFlower-Patches/0052-If-it-s-a-null-constant-don-t-give-it-a-type.-Cleans.patch
 rename FernFlower-Patches/{0107-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch => 0052-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch} (100%)
 rename FernFlower-Patches/{0108-Gather-all-variable-declarations-including-those-wit.patch => 0053-Gather-all-variable-declarations-including-those-wit.patch} (100%)
 rename FernFlower-Patches/{0109-Renaming-thinger.patch => 0054-Add-variable-renaming-option-and-interface.patch} (71%)
 delete mode 100644 FernFlower-Patches/0054-Some-code-cleanup-damn-cpw.patch
 rename FernFlower-Patches/{0120-Do-not-merge-varaibles-when-the-to-target-is-read-fu.patch => 0055-Do-not-merge-varaibles-when-the-to-target-is-read-fu.patch} (100%)
 rename FernFlower-Patches/{0122-Allow-saving-to-JAR.patch => 0056-Allow-saving-to-JAR.patch} (100%)
 delete mode 100644 FernFlower-Patches/0058-Fix-variable-defintions-in-IfStatement-s-headers-hav.patch
 delete mode 100644 FernFlower-Patches/0059-Detect-if-the-itterator-is-being-used-elseware-befor.patch
 delete mode 100644 FernFlower-Patches/0060-NPE-Protection-in-EnumProcessor.patch
 delete mode 100644 FernFlower-Patches/0065-Loosen-up-LoopExtractHelper-to-include-break-edges-t.patch
 delete mode 100644 FernFlower-Patches/0067-Include-ForEach-source-vars-in-itteration-allows-for.patch
 delete mode 100644 FernFlower-Patches/0068-Re-write-ForEach-detection-to-be-before-For-detectio.patch
 delete mode 100644 FernFlower-Patches/0070-Fix-issue-where-For-loops-would-be-enhanced-to-ForEa.patch
 delete mode 100644 FernFlower-Patches/0075-Fix-up-the-scouting-for-an-init-exprent-not-to-look-.patch
 delete mode 100644 FernFlower-Patches/0076-Fix-IncludeEntireClasspath-so-it-doesn-t-dump-out-ra.patch
 delete mode 100644 FernFlower-Patches/0077-Fixed-generic-type-parsing-of-inner-classes-with-gen.patch
 delete mode 100644 FernFlower-Patches/0078-Foo.-Bar-baz-generation.patch
 delete mode 100644 FernFlower-Patches/0079-concentrated-changes-to-Exprent.getInferredExprType.patch
 delete mode 100644 FernFlower-Patches/0080-passing-information-from-InvocationExprent-s-inferre.patch
 delete mode 100644 FernFlower-Patches/0081-pushed-remapping-to-the-VarType-added-type-inference.patch
 delete mode 100644 FernFlower-Patches/0082-handle-generic-lists-with-multiple-arguments-in-meth.patch
 delete mode 100644 FernFlower-Patches/0083-using-the-generic-info-from-InvocationExprent-correc.patch
 delete mode 100644 FernFlower-Patches/0084-Itterator-enchanced-for-loops-can-also-have-a-copy-i.patch
 delete mode 100644 FernFlower-Patches/0085-Be-a-bit-more-strict-in-detecting-copy-var-usage.patch
 delete mode 100644 FernFlower-Patches/0089-cleanup-of-InvocationExprent-changes.patch
 delete mode 100644 FernFlower-Patches/0091-Fix-constants-with-trailing-zeros-and-incorrect-type.patch
 delete mode 100644 FernFlower-Patches/0093-Version-2.0.patch
 delete mode 100644 FernFlower-Patches/0094-Fixed-invalid-reference-to-ASM.-Oops.patch
 delete mode 100644 FernFlower-Patches/0095-Fixed-potential-NPE-in-lvt-propogation.patch
 delete mode 100644 FernFlower-Patches/0096-Fixed-nested-inner-generic-type-printing.patch
 delete mode 100644 FernFlower-Patches/0098-Fixed-var-merging-not-propogating-type-data-to-var-d.patch
 delete mode 100644 FernFlower-Patches/0099-Snapshots-because-we-might-be-doing-a-bit-more-work-.patch
 delete mode 100644 FernFlower-Patches/0100-Sort-some-blocks-that-are-itterated-in-hash-sets-in-.patch
 delete mode 100644 FernFlower-Patches/0101-Fixed-switch-cases-leaking-variables-incorrectly.patch
 delete mode 100644 FernFlower-Patches/0103-Bulk-test-for-MC.patch
 delete mode 100644 FernFlower-Patches/0106-Fix-NPE.patch
 delete mode 100644 FernFlower-Patches/0110-Fix-up-some-name-issues.-Still-outstanding-propogati.patch
 delete mode 100644 FernFlower-Patches/0111-Propogate-renamer-state-to-nested-classes.patch
 delete mode 100644 FernFlower-Patches/0112-Properly-implement-options-for-the-renamer-stuff.-JV.patch
 delete mode 100644 FernFlower-Patches/0113-Add-the-index-to-the-param-renamer-needed-for-sane-p.patch
 delete mode 100644 FernFlower-Patches/0114-Early-set-the-logger-so-that-it-can-be-used-during-i.patch
 delete mode 100644 FernFlower-Patches/0115-More-fixage-to-the-way-init-happens.patch
 delete mode 100644 FernFlower-Patches/0116-Try-and-release-the-renamer-after-we-re-done-with-th.patch
 delete mode 100644 FernFlower-Patches/0117-Try-to-release-resources-after-we-re-done-not-before.patch
 delete mode 100644 FernFlower-Patches/0118-Don-t-allocate-a-renamer-for-every-single-method-rea.patch
 delete mode 100644 FernFlower-Patches/0119-Clean-up-renamer-access-a-bit-ensure-it-s-loaded-for.patch
 delete mode 100644 FernFlower-Patches/0121-Changed-archive-name-to-reflect-the-update-to-ForgeF.patch

diff --git a/FernFlower-Patches/0001-Add-Gradlew-wrapper-and-deploy-to-Forge-Maven.patch b/FernFlower-Patches/0001-Repository-meta-changes.patch
similarity index 99%
rename from FernFlower-Patches/0001-Add-Gradlew-wrapper-and-deploy-to-Forge-Maven.patch
rename to FernFlower-Patches/0001-Repository-meta-changes.patch
index 9b46475..c75333b 100644
--- a/FernFlower-Patches/0001-Add-Gradlew-wrapper-and-deploy-to-Forge-Maven.patch
+++ b/FernFlower-Patches/0001-Repository-meta-changes.patch
@@ -1,8 +1,10 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sat, 1 Aug 2015 11:35:52 -0700
-Subject: [PATCH] Add Gradlew wrapper and deploy to Forge Maven.
+Subject: [PATCH] Repository meta changes
 
+SHA1 of original commits:
+59d19c77, d51c33c3, 77fcea54, 37cb58c7, 70c73055
 
 diff --git a/.gitignore b/.gitignore
 new file mode 100644
@@ -31,7 +33,7 @@ index 0000000000000000000000000000000000000000..f7284b5aab48e6a6430698fe3c0eb204
 +
 diff --git a/build.gradle b/build.gradle
 new file mode 100644
-index 0000000000000000000000000000000000000000..4ba85eec08fc56b667cb9d690a9ef46b8c389c82
+index 0000000000000000000000000000000000000000..b07b27ac85efa26329091d217623301bc3cdba45
 --- /dev/null
 +++ b/build.gradle
 @@ -0,0 +1,90 @@
@@ -40,9 +42,9 @@ index 0000000000000000000000000000000000000000..4ba85eec08fc56b667cb9d690a9ef46b
 +apply plugin: 'maven'
 +apply plugin: 'java'
 +
-+version = "1.0"
++version = "0.2.3"
 +group = "net.minecraftforge" //not sure if we shoulkd publish under this name, but it's our fork so meh
-+archivesBaseName = "fernflower"
++archivesBaseName = "forgeflower"
 +
 +sourceCompatibility = '1.6'
 +targetCompatibility = '1.6'
@@ -1033,7 +1035,7 @@ index 0000000000000000000000000000000000000000..6b29cc3b32bbc645809e39aafc559bf3
 +zipStorePath=wrapper/dists
 +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
 diff --git a/gradlew b/gradlew
-new file mode 100644
+new file mode 100755
 index 0000000000000000000000000000000000000000..91a7e269e19dfc62e27137a0b57ef3e430cee4fd
 --- /dev/null
 +++ b/gradlew
diff --git a/FernFlower-Patches/0002-Output-generic-parametrs-for-anonymous-classes.patch b/FernFlower-Patches/0002-Output-generic-parametrs-for-anonymous-classes.patch
index 58f024f..ff143eb 100644
--- a/FernFlower-Patches/0002-Output-generic-parametrs-for-anonymous-classes.patch
+++ b/FernFlower-Patches/0002-Output-generic-parametrs-for-anonymous-classes.patch
@@ -3,9 +3,12 @@ From: Lex Manos <LexManos@gmail.com>
 Date: Sat, 1 Aug 2015 13:45:25 -0700
 Subject: [PATCH] Output generic parametrs for anonymous classes.
 
+Squashed with commit c8cfdcfd:
+Some synthetic anon classes are being detected as member classes.
+Unknown why, however this fixes the consturctor argument.
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-index b5ecd9e66750f7f392c111e9254ad97430d780b1..24facc9d80857d3eacbc7b5aaf1ad9a62cd7fd91 100644
+index b5ecd9e66750f7f392c111e9254ad97430d780b1..0297a55fc16eb3eddc0e458bfa49325f563fd613 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
 @@ -26,7 +26,10 @@ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
@@ -40,3 +43,12 @@ index b5ecd9e66750f7f392c111e9254ad97430d780b1..24facc9d80857d3eacbc7b5aaf1ad9a6
          buf.prepend("new " + typename);
  
          if (enclosing != null) {
+@@ -310,7 +327,7 @@ public class NewExprent extends Exprent {
+ 
+                 if (i == lstParameters.size() - 1 && expr.getExprType() == VarType.VARTYPE_NULL) {
+                   ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(leftType.value);
+-                  if (node != null && node.namelessConstructorStub) {
++                  if (node != null && (node.namelessConstructorStub || node.type == ClassNode.CLASS_ANONYMOUS)) {
+                     break;  // skip last parameter of synthetic constructor call
+                   }
+                 }
diff --git a/FernFlower-Patches/0003-Loosen-up-restrictions-on-field-initalizers-allowing.patch b/FernFlower-Patches/0003-Loosen-up-restrictions-on-field-initalizers-allowing.patch
index 0bc9acd..df3c2cc 100644
--- a/FernFlower-Patches/0003-Loosen-up-restrictions-on-field-initalizers-allowing.patch
+++ b/FernFlower-Patches/0003-Loosen-up-restrictions-on-field-initalizers-allowing.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Loosen up restrictions on field initalizers allowing for some
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
-index d9a0a3d828be573cf474d22d836c21ece546e424..d916b1951e026f239028e52f75199e784a7a9639 100644
+index d9a0a3d828be573cf474d22d836c21ece546e424..e64feea59b43cd41ad42ace70ebf78dec4ffb54e 100644
 --- a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
 @@ -29,7 +29,10 @@ import org.jetbrains.java.decompiler.struct.StructField;
@@ -38,14 +38,15 @@ index d9a0a3d828be573cf474d22d836c21ece546e424..d916b1951e026f239028e52f75199e78
  
          if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
            AssignmentExprent asexpr = (AssignmentExprent)exprent;
-@@ -139,22 +142,18 @@ public class InitializerProcessor {
+@@ -139,22 +142,17 @@ public class InitializerProcessor {
              if (fexpr.isStatic() && fexpr.getClassname().equals(cl.qualifiedName) &&
                  cl.hasField(fexpr.getName(), fexpr.getDescriptor().descriptorString)) {
  
 -              if (isExprentIndependent(asexpr.getRight(), meth)) {
-+              if (isExprentIndependent(asexpr.getRight(), meth, cl, whitelist)) {
- 
-                 String keyField = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
+-
+-                String keyField = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
++              String keyField = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
++              if (isExprentIndependent(asexpr.getRight(), meth, cl, whitelist, cl.getFields().getIndexByKey(keyField))) {
                  if (!wrapper.getStaticFieldInitializers().containsKey(keyField)) {
                    wrapper.getStaticFieldInitializers().addWithKey(asexpr.getRight(), keyField);
 -                  firstdata.getExprents().remove(0);
@@ -64,7 +65,7 @@ index d9a0a3d828be573cf474d22d836c21ece546e424..d916b1951e026f239028e52f75199e78
        }
      }
    }
-@@ -191,6 +190,8 @@ public class InitializerProcessor {
+@@ -191,6 +189,8 @@ public class InitializerProcessor {
        return;
      }
  
@@ -73,34 +74,38 @@ index d9a0a3d828be573cf474d22d836c21ece546e424..d916b1951e026f239028e52f75199e78
      while (true) {
  
        String fieldWithDescr = null;
-@@ -216,7 +217,7 @@ public class InitializerProcessor {
+@@ -216,8 +216,8 @@ public class InitializerProcessor {
                  cl.hasField(fexpr.getName(), fexpr
                    .getDescriptor().descriptorString)) { // check for the physical existence of the field. Could be defined in a superclass.
  
 -              if (isExprentIndependent(asexpr.getRight(), lstMethWrappers.get(i))) {
-+              if (isExprentIndependent(asexpr.getRight(), lstMethWrappers.get(i), cl, whitelist)) {
-                 String fieldKey = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
+-                String fieldKey = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
++              String fieldKey = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
++              if (isExprentIndependent(asexpr.getRight(), lstMethWrappers.get(i), cl, whitelist, cl.getFields().getIndexByKey(fieldKey))) {
                  if (fieldWithDescr == null) {
                    fieldWithDescr = fieldKey;
-@@ -252,7 +253,7 @@ public class InitializerProcessor {
+                   value = asexpr.getRight();
+@@ -252,7 +252,7 @@ public class InitializerProcessor {
      }
    }
  
 -  private static boolean isExprentIndependent(Exprent exprent, MethodWrapper meth) {
-+  private static boolean isExprentIndependent(Exprent exprent, MethodWrapper meth, StructClass cl, Set<String> whitelist) {
++  private static boolean isExprentIndependent(Exprent exprent, MethodWrapper meth, StructClass cl, Set<String> whitelist, int fidx) {
  
      List<Exprent> lst = exprent.getAllExprents(true);
      lst.add(exprent);
-@@ -270,7 +271,15 @@ public class InitializerProcessor {
+@@ -270,7 +270,17 @@ public class InitializerProcessor {
            }
            break;
          case Exprent.EXPRENT_FIELD:
 -          return false;
 +          FieldExprent fexpr = (FieldExprent)expr;
 +          if (cl.qualifiedName.equals(fexpr.getClassname())) {
-+            if (!whitelist.contains(InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString))) {
++            String key = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
++            if (!whitelist.contains(key)) {
 +              return false;
 +            }
++            return cl.getFields().getIndexByKey(key) < fidx;
 +          }
 +          else if (!fexpr.isStatic()) {
 +            return false;
diff --git a/FernFlower-Patches/0005-NUll-constructor-synthetic-classes-can-have-content-.patch b/FernFlower-Patches/0005-NUll-constructor-synthetic-classes-can-have-content-.patch
deleted file mode 100644
index d9d6968..0000000
--- a/FernFlower-Patches/0005-NUll-constructor-synthetic-classes-can-have-content-.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Sat, 1 Aug 2015 17:52:35 -0700
-Subject: [PATCH] NUll constructor synthetic classes can have content as well
- so don't rely on it being a stub, just being anonymous. You can't legitimatly
- have a anonymous argument.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-index 24facc9d80857d3eacbc7b5aaf1ad9a62cd7fd91..6dad7c98c8c6c9fe0714e63c24763d2eb111df4c 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-@@ -327,7 +327,7 @@ public class NewExprent extends Exprent {
- 
-                 if (i == lstParameters.size() - 1 && expr.getExprType() == VarType.VARTYPE_NULL) {
-                   ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(leftType.value);
--                  if (node != null && node.namelessConstructorStub) {
-+                  if (node != null && node.type == ClassNode.CLASS_ANONYMOUS) {
-                     break;  // skip last parameter of synthetic constructor call
-                   }
-                 }
diff --git a/FernFlower-Patches/0005-Sort-inner-class-lists-local-variables-variable-defi.patch b/FernFlower-Patches/0005-Sort-inner-class-lists-local-variables-variable-defi.patch
new file mode 100644
index 0000000..dee50f2
--- /dev/null
+++ b/FernFlower-Patches/0005-Sort-inner-class-lists-local-variables-variable-defi.patch
@@ -0,0 +1,780 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sat, 1 Aug 2015 18:40:43 -0700
+Subject: [PATCH] Sort inner class lists, local variables, variable
+ definitions, and blocks finally-processor.
+
+Before this, different JVMs sort HashSets differently which causes inconsistent decompilation.
+
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+index 5a56641c6f614fdf677f8e1900f803f73397867c..b3e9d81eaa3a4d86e4714adf2f8e007af831d670 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+@@ -228,6 +228,7 @@ public class ClassesProcessor {
+                 stack.add(nestedClass);
+               }
+             }
++            Collections.sort(superNode.nested);
+           }
+         }
+       }
+@@ -342,7 +343,7 @@ public class ClassesProcessor {
+   }
+ 
+ 
+-  public static class ClassNode {
++  public static class ClassNode implements Comparable<ClassNode> {
+ 
+     public static final int CLASS_ROOT = 0;
+     public static final int CLASS_MEMBER = 1;
+@@ -441,5 +442,11 @@ public class ClassesProcessor {
+       public boolean is_method_reference;
+       public boolean is_content_method_static;
+     }
++
++    @Override
++    public int compareTo(ClassNode o)
++    {
++        return this.classStruct.qualifiedName.compareTo(o.classStruct.qualifiedName);
++    }
+   }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
+index 0704efd84bdbd29cb6c9f5db79337147ac0b2be7..809af6d88b5f7c232539e0dbc4c7c8d7c5e26e3b 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
+@@ -119,6 +119,7 @@ public class LambdaProcessor {
+             }
+           }
+         }
++        Collections.sort(node.nested);
+       }
+ 
+       mt.releaseResources();
+@@ -133,6 +134,7 @@ public class LambdaProcessor {
+ 
+           parent_class.nested.add(nd);
+           nd.parent = parent_class;
++          Collections.sort(parent_class.nested);
+         }
+       }
+     }
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+index 798010e24206ffcfb76b1f4936f9b5d3709a7275..9aedf22af1f60b3e17752769462aee91cd9daeb0 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+@@ -248,6 +248,7 @@ public class NestedClassProcessor {
+       if (setEnclosing.contains(node.classStruct.qualifiedName)) {
+         node.nested.add(child);
+         child.parent = node;
++        Collections.sort(node.nested);
+ 
+         return true;
+       }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+index 9296bb3f6007bda9647e2f0d919cdfd311567222..205b1876758155132600148f61f641b64e42369c 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+@@ -833,6 +833,7 @@ public class ExprProcessor implements CodeConstants {
+     }
+ 
+     TextBuffer buf = new TextBuffer();
++    lst = Exprent.sortIndexed(lst);
+ 
+     for (Exprent expr : lst) {
+       TextBuffer content = expr.toJava(indent, tracer);
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
+index 9f1c11b318b128a3bf8dc17e3a6d343ef07800d7..ee8d4cee6cbb439907fb9d9c3f7f61a1b068b70f 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
+@@ -579,10 +579,17 @@ public class FinallyProcessor {
+     // so remove dummy exit
+     startBlocks.remove(graph.getLast());
+     startBlocks.removeAll(tryBlocks);
++    List<BasicBlock> starts = new ArrayList<BasicBlock>(startBlocks);
++    Collections.sort(starts, new Comparator<BasicBlock>() {
++      @Override
++      public int compare(BasicBlock o1, BasicBlock o2) {
++          return o2.id - o1.id;
++      }
++    });
+ 
+     List<Area> lstAreas = new ArrayList<Area>();
+ 
+-    for (BasicBlock start : startBlocks) {
++    for (BasicBlock start : starts) {
+ 
+       Area arr = compareSubgraphsEx(graph, start, catchBlocks, first, finallytype, mapLast, skippedFirst);
+       if (arr == null) {
+@@ -606,7 +613,15 @@ public class FinallyProcessor {
+     //		} catch(Exception ex){ex.printStackTrace();}
+ 
+     // INFO: empty basic blocks may remain in the graph!
+-    for (Entry<BasicBlock, Boolean> entry : mapLast.entrySet()) {
++    List<Entry<BasicBlock, Boolean>> lasts = new ArrayList<Entry<BasicBlock, Boolean>>(mapLast.entrySet());
++    // We must sort here to prevent decompile differences deriving from hash maps.
++    Collections.sort(lasts, new Comparator<Entry<BasicBlock, Boolean>>() {
++      @Override
++      public int compare(Entry<BasicBlock, Boolean> o1, Entry<BasicBlock, Boolean> o2) {
++        return o1.getKey().id - o2.getKey().id;
++      }
++    });
++    for (Entry<BasicBlock, Boolean> entry : lasts) {
+       BasicBlock last = entry.getKey();
+ 
+       if (entry.getValue()) {
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+index fbd146eca6b7efc4d56e96121a7c6d91748d077c..5f2cb56a85b9ac61141de1c17b457e5847eb8fff 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+@@ -17,6 +17,8 @@ package org.jetbrains.java.decompiler.modules.decompiler.exps;
+ 
+ import java.util.ArrayList;
+ import java.util.Collection;
++import java.util.Collections;
++import java.util.Comparator;
+ import java.util.HashSet;
+ import java.util.List;
+ import java.util.Map.Entry;
+@@ -140,23 +142,23 @@ public class Exprent implements IMatchable {
+       }
+     }
+   }
+-  
++
+   // *****************************************************************************
+   // IMatchable implementation
+   // *****************************************************************************
+-  
++
+   public IMatchable findObject(MatchNode matchNode, int index) {
+-    
++
+     if(matchNode.getType() != MatchNode.MATCHNODE_EXPRENT) {
+       return null;
+     }
+ 
+     List<Exprent> lstAllExprents = getAllExprents();
+-    
++
+     if(lstAllExprents == null || lstAllExprents.isEmpty()) {
+       return null;
+     }
+-    
++
+     String position = (String)matchNode.getRuleValue(MatchProperties.EXPRENT_POSITION);
+     if(position != null) {
+       if(position.matches("-?\\d+")) {
+@@ -170,11 +172,11 @@ public class Exprent implements IMatchable {
+   }
+ 
+   public boolean match(MatchNode matchNode, MatchEngine engine) {
+-    
++
+     if(matchNode.getType() != MatchNode.MATCHNODE_EXPRENT) {
+       return false;
+     }
+-    
++
+     for(Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
+       switch(rule.getKey()) {
+       case EXPRENT_TYPE:
+@@ -188,10 +190,41 @@ public class Exprent implements IMatchable {
+         }
+         break;
+       }
+-      
++
+     }
+-    
++
+     return true;
+   }
+-  
++
++  public static List<Exprent> sortIndexed(List<Exprent> lst) {
++    List<Exprent> ret = new ArrayList<Exprent>();
++    List<VarExprent> defs = new ArrayList<VarExprent>();
++
++    Comparator<VarExprent> comp = new Comparator<VarExprent>() {
++      public int compare(VarExprent o1, VarExprent o2) {
++        return o1.getIndex() - o2.getIndex();
++      }
++    };
++
++    for (Exprent exp : lst) {
++      boolean isDef = exp instanceof VarExprent && ((VarExprent)exp).isDefinition();
++      if (!isDef) {
++        if (defs.size() > 0) {
++          Collections.sort(defs, comp);
++          ret.addAll(defs);
++          defs.clear();
++        }
++        ret.add(exp);
++      }
++      else {
++        defs.add((VarExprent)exp);
++      }
++    }
++
++    if (defs.size() > 0) {
++      Collections.sort(defs, comp);
++      ret.addAll(defs);
++    }
++    return ret;
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+index 31f0f86d4423ac537faf31b7f16833f263801b23..4751052a5468ffc469d7166bce648d5b658e040d 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+@@ -235,8 +235,15 @@ public class VarVersionsProcessor {
+     Map<Integer, Integer> mapOriginalVarIndices = new HashMap<Integer, Integer>();
+ 
+     // map var-version pairs on new var indexes
+-    Set<VarVersionPair> set = new HashSet<VarVersionPair>(mapExprentMinTypes.keySet());
+-    for (VarVersionPair pair : set) {
++    List<VarVersionPair> lst = new ArrayList<VarVersionPair>(mapExprentMinTypes.keySet());
++    Collections.sort(lst, new Comparator<VarVersionPair>() {
++      public int compare(VarVersionPair o1, VarVersionPair o2) {
++        if (o1.var != o2.var) return o1.var - o2.var;
++        return o1.version - o2.version;
++      }
++    });
++
++    for (VarVersionPair pair : lst) {
+ 
+       if (pair.version >= 0) {
+         int newIndex = pair.version == 1 ? pair.var : counters.getCounterAndIncrement(CounterContainer.VAR_COUNTER);
+diff --git a/testData/results/TestAnonymousClass.dec b/testData/results/TestAnonymousClass.dec
+index 75d1df239bb56bc0a4be42a1310957721146ece2..fdce11007ba778eaaeb4081e1a11041b2573feca 100644
+--- a/testData/results/TestAnonymousClass.dec
++++ b/testData/results/TestAnonymousClass.dec
+@@ -67,15 +67,8 @@ public abstract class TestAnonymousClass {
+       boolean var1 = true;// 39
+    }// 40
+ 
+-   static class InnerRecursive {
+-      TestAnonymousClass.InnerRecursive r;
+-
+-      public InnerRecursive(TestAnonymousClass.InnerRecursive var1) {
+-         this.r = var1;// 105
+-      }// 106
+-
+-      void foo() {
+-      }// 110
++   interface I {
++      void foo() throws Exception;
+    }
+ 
+    private static class Inner {
+@@ -87,8 +80,15 @@ public abstract class TestAnonymousClass {
+       };
+    }
+ 
+-   interface I {
+-      void foo() throws Exception;
++   static class InnerRecursive {
++      TestAnonymousClass.InnerRecursive r;
++
++      public InnerRecursive(TestAnonymousClass.InnerRecursive var1) {
++         this.r = var1;// 105
++      }// 106
++
++      void foo() {
++      }// 110
+    }
+ }
+ 
+@@ -180,24 +180,24 @@ class 'pkg/TestAnonymousClass' {
+    }
+ }
+ 
++class 'pkg/TestAnonymousClass$Inner$1' {
++   method 'run ()V' {
++      0      76
++      1      76
++      2      77
++      3      77
++      4      78
++   }
++}
++
+ class 'pkg/TestAnonymousClass$InnerRecursive' {
+    method '<init> (Lpkg/TestAnonymousClass$InnerRecursive;)V' {
+-      6      73
+-      9      74
++      6      86
++      9      87
+    }
+ 
+    method 'foo ()V' {
+-      0      77
+-   }
+-}
+-
+-class 'pkg/TestAnonymousClass$Inner$1' {
+-   method 'run ()V' {
+-      0      83
+-      1      83
+-      2      84
+-      3      84
+-      4      85
++      0      90
+    }
+ }
+ 
+@@ -223,9 +223,9 @@ Lines mapping:
+ 53 <-> 18
+ 54 <-> 19
+ 55 <-> 20
+-66 <-> 84
+-67 <-> 85
+-68 <-> 86
++66 <-> 77
++67 <-> 78
++68 <-> 79
+ 75 <-> 24
+ 76 <-> 25
+ 77 <-> 26
+@@ -234,9 +234,9 @@ Lines mapping:
+ 91 <-> 37
+ 92 <-> 38
+ 93 <-> 39
+-105 <-> 74
+-106 <-> 75
+-110 <-> 78
++105 <-> 87
++106 <-> 88
++110 <-> 91
+ Not mapped:
+ 18
+ 104
+diff --git a/testData/results/TestClassSimpleBytecodeMapping.dec b/testData/results/TestClassSimpleBytecodeMapping.dec
+index a48375ae4a8f7bbe75a5db9b94ff1b023043faa7..1a2532f0b736a3d1a2db4f7ba3645e48e419189f 100644
+--- a/testData/results/TestClassSimpleBytecodeMapping.dec
++++ b/testData/results/TestClassSimpleBytecodeMapping.dec
+@@ -33,17 +33,17 @@ public class TestClassSimpleBytecodeMapping {
+       var1.run();// 49
+    }// 50
+ 
+-   public class InnerClass2 {
+-      public void print() {
+-         System.out.println("Inner2");// 54
+-      }// 55
+-   }
+-
+    public class InnerClass {
+       public void print() {
+          System.out.println("Inner");// 44
+       }// 45
+    }
++
++   public class InnerClass2 {
++      public void print() {
++         System.out.println("Inner2");// 54
++      }// 55
++   }
+ }
+ 
+ class 'pkg/TestClassSimpleBytecodeMapping$1' {
+@@ -96,7 +96,7 @@ class 'pkg/TestClassSimpleBytecodeMapping' {
+    }
+ }
+ 
+-class 'pkg/TestClassSimpleBytecodeMapping$InnerClass2' {
++class 'pkg/TestClassSimpleBytecodeMapping$InnerClass' {
+    method 'print ()V' {
+       0      37
+       3      37
+@@ -105,7 +105,7 @@ class 'pkg/TestClassSimpleBytecodeMapping$InnerClass2' {
+    }
+ }
+ 
+-class 'pkg/TestClassSimpleBytecodeMapping$InnerClass' {
++class 'pkg/TestClassSimpleBytecodeMapping$InnerClass2' {
+    method 'print ()V' {
+       0      43
+       3      43
+@@ -130,11 +130,11 @@ Lines mapping:
+ 36 <-> 25
+ 38 <-> 27
+ 40 <-> 30
+-44 <-> 44
+-45 <-> 45
++44 <-> 38
++45 <-> 39
+ 49 <-> 33
+ 50 <-> 34
+-54 <-> 38
+-55 <-> 39
++54 <-> 44
++55 <-> 45
+ Not mapped:
+ 39
+diff --git a/testData/results/TestInnerLocal.dec b/testData/results/TestInnerLocal.dec
+index 6ca3a7e1053087d91543ce588eb81e19c9f3432d..e5aba7da20b0b57a4c796a36c24960f38c6eac31 100644
+--- a/testData/results/TestInnerLocal.dec
++++ b/testData/results/TestInnerLocal.dec
+@@ -28,6 +28,14 @@ public class TestInnerLocal {
+       new TestInnerLocal.Inner1Static.Inner2Static("test");// 40
+    }// 41
+ 
++   class Inner1 {
++      final String x;
++
++      public Inner1(String var2) {
++         this.x = var2;// 46
++      }// 47
++   }
++
+    static class Inner1Static {
+       final String x;
+ 
+@@ -43,14 +51,6 @@ public class TestInnerLocal {
+          }// 60
+       }
+    }
+-
+-   class Inner1 {
+-      final String x;
+-
+-      public Inner1(String var2) {
+-         this.x = var2;// 46
+-      }// 47
+-   }
+ }
+ 
+ class 'TestInnerLocal$1Inner' {
+@@ -84,24 +84,24 @@ class 'TestInnerLocal$2Inner' {
+    }
+ }
+ 
+-class 'TestInnerLocal$Inner1Static' {
+-   method '<init> (Ljava/lang/String;)V' {
+-      6      34
+-      9      35
++class 'TestInnerLocal$Inner1' {
++   method '<init> (LTestInnerLocal;Ljava/lang/String;)V' {
++      b      34
++      e      35
+    }
+ }
+ 
+-class 'TestInnerLocal$Inner1Static$Inner2Static' {
++class 'TestInnerLocal$Inner1Static' {
+    method '<init> (Ljava/lang/String;)V' {
+-      6      41
+-      9      42
++      6      42
++      9      43
+    }
+ }
+ 
+-class 'TestInnerLocal$Inner1' {
+-   method '<init> (LTestInnerLocal;Ljava/lang/String;)V' {
+-      b      50
+-      e      51
++class 'TestInnerLocal$Inner1Static$Inner2Static' {
++   method '<init> (Ljava/lang/String;)V' {
++      6      49
++      9      50
+    }
+ }
+ 
+@@ -119,12 +119,12 @@ Lines mapping:
+ 39 <-> 27
+ 40 <-> 28
+ 41 <-> 29
+-46 <-> 51
+-47 <-> 52
+-53 <-> 35
+-54 <-> 36
+-59 <-> 42
+-60 <-> 43
++46 <-> 35
++47 <-> 36
++53 <-> 43
++54 <-> 44
++59 <-> 50
++60 <-> 51
+ Not mapped:
+ 21
+ 33
+diff --git a/testData/results/TestInnerLocalPkg.dec b/testData/results/TestInnerLocalPkg.dec
+index 7cafa415f9b6212b593d0c0940cc16c277cf5e2f..7ddb0ce6ad8adf326a51e145f419e23eed8779dd 100644
+--- a/testData/results/TestInnerLocalPkg.dec
++++ b/testData/results/TestInnerLocalPkg.dec
+@@ -30,6 +30,14 @@ public class TestInnerLocalPkg {
+       new TestInnerLocalPkg.Inner1Static.Inner2Static("test");// 42
+    }// 43
+ 
++   class Inner1 {
++      final String x;
++
++      public Inner1(String var2) {
++         this.x = var2;// 48
++      }// 49
++   }
++
+    static class Inner1Static {
+       final String x;
+ 
+@@ -45,14 +53,6 @@ public class TestInnerLocalPkg {
+          }// 62
+       }
+    }
+-
+-   class Inner1 {
+-      final String x;
+-
+-      public Inner1(String var2) {
+-         this.x = var2;// 48
+-      }// 49
+-   }
+ }
+ 
+ class 'pkg/TestInnerLocalPkg$1Inner' {
+@@ -86,24 +86,24 @@ class 'pkg/TestInnerLocalPkg$2Inner' {
+    }
+ }
+ 
+-class 'pkg/TestInnerLocalPkg$Inner1Static' {
+-   method '<init> (Ljava/lang/String;)V' {
+-      6      36
+-      9      37
++class 'pkg/TestInnerLocalPkg$Inner1' {
++   method '<init> (Lpkg/TestInnerLocalPkg;Ljava/lang/String;)V' {
++      b      36
++      e      37
+    }
+ }
+ 
+-class 'pkg/TestInnerLocalPkg$Inner1Static$Inner2Static' {
++class 'pkg/TestInnerLocalPkg$Inner1Static' {
+    method '<init> (Ljava/lang/String;)V' {
+-      6      43
+-      9      44
++      6      44
++      9      45
+    }
+ }
+ 
+-class 'pkg/TestInnerLocalPkg$Inner1' {
+-   method '<init> (Lpkg/TestInnerLocalPkg;Ljava/lang/String;)V' {
+-      b      52
+-      e      53
++class 'pkg/TestInnerLocalPkg$Inner1Static$Inner2Static' {
++   method '<init> (Ljava/lang/String;)V' {
++      6      51
++      9      52
+    }
+ }
+ 
+@@ -121,12 +121,12 @@ Lines mapping:
+ 41 <-> 29
+ 42 <-> 30
+ 43 <-> 31
+-48 <-> 53
+-49 <-> 54
+-55 <-> 37
+-56 <-> 38
+-61 <-> 44
+-62 <-> 45
++48 <-> 37
++49 <-> 38
++55 <-> 45
++56 <-> 46
++61 <-> 52
++62 <-> 53
+ Not mapped:
+ 23
+ 35
+diff --git a/testData/results/TestInnerSignature.dec b/testData/results/TestInnerSignature.dec
+index 3087a40dc63251ee1444ef4924050413f39221d5..406e1f41d8f0a084a986f683bf7ecb3b44c37429 100644
+--- a/testData/results/TestInnerSignature.dec
++++ b/testData/results/TestInnerSignature.dec
+@@ -9,18 +9,6 @@ public class TestInnerSignature<A, B, C> {
+       this.c = var3;// 25
+    }// 26
+ 
+-   public static class InnerStatic<A, B, C> {
+-      A a;
+-      B b;
+-      C c;
+-
+-      public InnerStatic(A var1, B var2, C var3) {
+-         this.a = var1;// 46
+-         this.b = var2;// 47
+-         this.c = var3;// 48
+-      }// 49
+-   }
+-
+    public class Inner {
+       A a;
+       B b;
+@@ -32,6 +20,18 @@ public class TestInnerSignature<A, B, C> {
+          this.c = var4;// 36
+       }// 37
+    }
++
++   public static class InnerStatic<A, B, C> {
++      A a;
++      B b;
++      C c;
++
++      public InnerStatic(A var1, B var2, C var3) {
++         this.a = var1;// 46
++         this.b = var2;// 47
++         this.c = var3;// 48
++      }// 49
++   }
+ }
+ 
+ class 'TestInnerSignature' {
+@@ -43,21 +43,21 @@ class 'TestInnerSignature' {
+    }
+ }
+ 
+-class 'TestInnerSignature$InnerStatic' {
+-   method '<init> (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
+-      6      17
+-      b      18
+-      10      19
+-      13      20
++class 'TestInnerSignature$Inner' {
++   method '<init> (LTestInnerSignature;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
++      b      17
++      10      18
++      16      19
++      19      20
+    }
+ }
+ 
+-class 'TestInnerSignature$Inner' {
+-   method '<init> (LTestInnerSignature;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
+-      b      29
+-      10      30
+-      16      31
+-      19      32
++class 'TestInnerSignature$InnerStatic' {
++   method '<init> (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
++      6      29
++      b      30
++      10      31
++      13      32
+    }
+ }
+ 
+@@ -66,14 +66,14 @@ Lines mapping:
+ 24 <-> 8
+ 25 <-> 9
+ 26 <-> 10
+-34 <-> 30
+-35 <-> 31
+-36 <-> 32
+-37 <-> 33
+-46 <-> 18
+-47 <-> 19
+-48 <-> 20
+-49 <-> 21
++34 <-> 18
++35 <-> 19
++36 <-> 20
++37 <-> 21
++46 <-> 30
++47 <-> 31
++48 <-> 32
++49 <-> 33
+ Not mapped:
+ 22
+ 33
+diff --git a/testData/results/TestMethodParameters.dec b/testData/results/TestMethodParameters.dec
+index 21f0f129d1bc260e2dbc7ce77f07ece57711bf75..af7ce865f5d946980010ee02c3e5be384a041064 100644
+--- a/testData/results/TestMethodParameters.dec
++++ b/testData/results/TestMethodParameters.dec
+@@ -21,6 +21,14 @@ public class TestMethodParameters {
+ 
+    }// 39
+ 
++   class C1 {
++      C1(@Deprecated int var2) {
++      }// 24
++
++      void m(@Deprecated int var1) {
++      }// 25
++   }
++
+    static class C2 {
+       C2(@Deprecated int var1) {
+       }// 29
+@@ -31,14 +39,6 @@ public class TestMethodParameters {
+       static void m2(@Deprecated int var0) {
+       }// 31
+    }
+-
+-   class C1 {
+-      C1(@Deprecated int var2) {
+-      }// 24
+-
+-      void m(@Deprecated int var1) {
+-      }// 25
+-   }
+ }
+ 
+ class 'pkg/TestMethodParameters' {
+@@ -69,26 +69,26 @@ class 'pkg/TestMethodParameters$1Local' {
+    }
+ }
+ 
+-class 'pkg/TestMethodParameters$C2' {
+-   method '<init> (I)V' {
+-      4      25
++class 'pkg/TestMethodParameters$C1' {
++   method '<init> (Lpkg/TestMethodParameters;I)V' {
++      9      25
+    }
+ 
+-   method 'm1 (I)V' {
++   method 'm (I)V' {
+       0      28
+    }
++}
+ 
+-   method 'm2 (I)V' {
+-      0      31
++class 'pkg/TestMethodParameters$C2' {
++   method '<init> (I)V' {
++      4      33
+    }
+-}
+ 
+-class 'pkg/TestMethodParameters$C1' {
+-   method '<init> (Lpkg/TestMethodParameters;I)V' {
+-      9      36
++   method 'm1 (I)V' {
++      0      36
+    }
+ 
+-   method 'm (I)V' {
++   method 'm2 (I)V' {
+       0      39
+    }
+ }
+@@ -97,11 +97,11 @@ Lines mapping:
+ 19 <-> 5
+ 20 <-> 8
+ 21 <-> 11
+-24 <-> 37
+-25 <-> 40
+-29 <-> 26
+-30 <-> 29
+-31 <-> 32
++24 <-> 26
++25 <-> 29
++29 <-> 34
++30 <-> 37
++31 <-> 40
+ 36 <-> 16
+ 37 <-> 19
+ 39 <-> 22
diff --git a/FernFlower-Patches/0006-LVT-and-LVTT-changes.patch b/FernFlower-Patches/0006-LVT-and-LVTT-changes.patch
new file mode 100644
index 0000000..d9d91c5
--- /dev/null
+++ b/FernFlower-Patches/0006-LVT-and-LVTT-changes.patch
@@ -0,0 +1,1028 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Sun, 2 Aug 2015 10:43:54 -0400
+Subject: [PATCH] LVT and LVTT changes
+
+- Add an LVT test so we can quickly iterate LVT hacking
+- Capture the LVT and LVTT properly, into some structured data.
+- Merge any LVTT to an incoming LVT (if they're out of sequence), merge LVTTs together if there's no LVT yet
+- Change LVT indexing to VarVersionPair
+- Separate the LVT data from the Struct for easier ability to pass around.
+- Added debug printer to MethodProcessorRunnable for the method outline
+- A scoping test, simpler than the complex one, almost passes
+- Some modifications to the printout.
+- Fixed bug in VarVersionsProcessor where it dumped the original indexes, because setVarVersions is called multiple times.
+Preserving an existing origvarstable across the that method seems to have improved accuracy a LOT.
+- Change to track the varversionpair in the "oldnames" table, track if we have a LVT entry when generating names and trust its name exactly
+- Sort by version, use that to align versions with different instances of the same variable.
+- Ignore variables without an LVT entry, and don't exception on empty blocks
+
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+index 18f05a34329a4750249225ce7fbe44e4870d2469..5a35cc8f05f06ca0e9726ff830eccff46da99b6b 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+@@ -169,10 +169,14 @@ public class ClassWrapper {
+           StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
+ 
+         if (attr != null) {
++          varProc.setLVT(attr.getLVT());
+           varProc.setDebugVarNames(attr.getMapVarNames());
+         }
+       }
+ 
++      MethodProcessorRunnable.printMethod(root, mt.getClassStruct().qualifiedName+"."+mt.getName()+mt.getDescriptor(),varProc);
++
++
+       DecompilerContext.getLogger().endMethod();
+     }
+ 
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+index 1c90fb6fc41b20e8b295201cfdb69abb63463bd0..388e76a7a8270d81d03b661ddbfef5ed9fb53fe4 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+@@ -17,6 +17,7 @@ package org.jetbrains.java.decompiler.main.rels;
+ 
+ import org.jetbrains.java.decompiler.code.CodeConstants;
+ import org.jetbrains.java.decompiler.code.InstructionSequence;
++import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
+ import org.jetbrains.java.decompiler.code.cfg.ControlFlowGraph;
+ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
+@@ -25,12 +26,20 @@ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+ import org.jetbrains.java.decompiler.modules.code.DeadCodeHelper;
+ import org.jetbrains.java.decompiler.modules.decompiler.*;
+ import org.jetbrains.java.decompiler.modules.decompiler.deobfuscator.ExceptionDeobfuscator;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.DummyExitStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.LVTVariable;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
+ import org.jetbrains.java.decompiler.struct.StructClass;
+ import org.jetbrains.java.decompiler.struct.StructMethod;
+ 
+ import java.io.IOException;
++import java.util.BitSet;
++import java.util.List;
+ 
+ public class MethodProcessorRunnable implements Runnable {
+ 
+@@ -138,7 +147,7 @@ public class MethodProcessorRunnable implements Runnable {
+     proc.processStatement(root, cl);
+ 
+     SequenceHelper.condenseSequences(root);
+-    
++
+     while (true) {
+       StackVarsProcessor stackProc = new StackVarsProcessor();
+       stackProc.simplifyStackVars(root, mt, cl);
+@@ -217,4 +226,143 @@ public class MethodProcessorRunnable implements Runnable {
+   public boolean isFinished() {
+     return finished;
+   }
++
++  public static void printMethod(RootStatement root, String name, VarProcessor varProc) {
++    System.out.println(name + " {");
++    if (root == null || root.getSequentialObjects() == null) {
++        System.out.println("}");
++        return;
++    }
++    for (Object obj : root.getSequentialObjects()) {
++      if (obj instanceof Statement) {
++        printStatement((Statement)obj, "  ",varProc);
++      } else {
++        System.out.println("  " + obj.getClass().getSimpleName());
++      }
++    }
++    printStatement(root.getDummyExit(), "  ",varProc);
++    System.out.println("}");
++  }
++
++  private static void getOffset(Statement st, BitSet values) {
++    if (st instanceof DummyExitStatement && ((DummyExitStatement)st).bytecode != null)
++      values.or(((DummyExitStatement)st).bytecode);
++    if (st.getExprents() != null) {
++      for (Exprent e : st.getExprents()) {
++        e.getBytecodeRange(values);
++      }
++    } else {
++      for (Object obj : st.getSequentialObjects()) {
++        if (obj instanceof Statement) {
++          getOffset((Statement)obj, values);
++        } else if (obj instanceof Exprent) {
++          ((Exprent)obj).getBytecodeRange(values);
++        } else {
++          System.out.println("WTF?" + obj.getClass());
++        }
++      }
++    }
++  }
++
++  private static void printStatement(Statement statement, String indent, VarProcessor varProc) {
++    BitSet values = new BitSet();
++    getOffset(statement, values);
++    int start = values.nextSetBit(0);
++    int end = values.length()-1;
++
++    System.out.println(indent + statement.type + ": (" + start + ", " + end + ") " + statement.getClass().getSimpleName());
++
++    if (statement.getExprents() != null) {
++      for(Exprent exp : statement.getExprents()) {
++          System.out.println(printExprent(indent + "  ", exp,varProc));
++      }
++    }
++    /*
++      for (Object obj : stat.getSequentialObjects()) {
++        if (obj instanceof Statement) {
++          Statement st = (Statement)obj;
++          childVars.addAll(initStatement(st));
++
++          if (st.type == DoStatement.TYPE_DO) {
++            DoStatement dost = (DoStatement)st;
++            if (dost.getLooptype() != DoStatement.LOOP_FOR &&
++                dost.getLooptype() != DoStatement.LOOP_DO) {
++              currVars.add(dost.getConditionExprent());
++            }
++          }
++          else if (st.type == DoStatement.TYPE_CATCHALL) {
++            CatchAllStatement fin = (CatchAllStatement)st;
++            if (fin.isFinally() && fin.getMonitor() != null) {
++              currVars.add(fin.getMonitor());
++            }
++          }
++        }
++        else if (obj instanceof Exprent) {
++          currVars.add((Exprent)obj);
++        }
++      }
++
++      // children statements
++      for (Integer index : childVars) {
++        Integer count = mapCount.get(index);
++        if (count == null) {
++          count = new Integer(0);
++        }
++        mapCount.put(index, new Integer(count.intValue() + 1));
++      }
++
++      condlst = getAllVars(currVars);
++    }
++    else {
++      condlst = getAllVars(stat.getExprents());
++    }
++
++    // this statement
++    for (VarExprent var : condlst) {
++      mapCount.put(new Integer(var.getIndex()), new Integer(2));
++    }
++
++
++    HashSet<Integer> set = new HashSet<Integer>(mapCount.keySet());
++
++    // put all variables defined in this statement into the set
++    for (Entry<Integer, Integer> en : mapCount.entrySet()) {
++      if (en.getValue().intValue() > 1) {
++        mapVarDefStatements.put(en.getKey(), stat);
++      }
++    }
++
++    mapStatementVars.put(stat.id, set);
++*/
++    indent += "  ";
++    for (Object obj : statement.getSequentialObjects()) {
++      if (obj instanceof Statement) {
++        printStatement((Statement)obj, indent,varProc);
++      } else if (obj instanceof Exprent) {
++          System.out.println(printExprent(indent, (Exprent) obj, varProc));
++      } else {
++        System.out.println(indent + obj.getClass().getSimpleName());
++      }
++    }
++  }
++  private static String printExprent(String indent, Exprent exp, VarProcessor varProc) {
++      StringBuffer sb = new StringBuffer();
++      sb.append(indent);
++      BitSet values = new BitSet();
++      exp.getBytecodeRange(values);
++      sb.append("(").append(values.nextSetBit(0)).append(", ").append(values.length()-1).append(") ");
++      sb.append(exp.getClass().getSimpleName());
++      sb.append(" ").append(exp.id).append(" ");
++      if (exp instanceof VarExprent) {
++          VarExprent varExprent = (VarExprent)exp;
++        int currindex = varExprent.getIndex();
++        int origindex = varProc.getRemapped(currindex);
++        List<LVTVariable> candidates = varProc.getLVT().getCandidates(origindex);
++        sb.append("[").append(currindex).append(":").append(origindex).append(", ").append(varExprent.isStack()).append("]").append(candidates);
++      } else if (exp instanceof AssignmentExprent) {
++          AssignmentExprent assignmentExprent = (AssignmentExprent)exp;
++        sb.append("{").append(printExprent(" ",assignmentExprent.getLeft(),varProc)).append(" =").append(printExprent(" ",assignmentExprent.getRight(),varProc)).append("}");
++      }
++      return sb.toString();
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..13cfa70a586a82cbcea81553680e8d59b5bfd343
+--- /dev/null
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
+@@ -0,0 +1,74 @@
++package org.jetbrains.java.decompiler.modules.decompiler.vars;
++
++import java.util.Comparator;
++import java.util.HashSet;
++import java.util.Map;
++import java.util.Set;
++
++public class LVTVariable implements Comparable<LVTVariable> {
++  public static final Comparator<LVTVariable> INDEX_SORTER = new Comparator<LVTVariable>() {
++    @Override
++    public int compare(LVTVariable o1, LVTVariable o2) {
++      if (o1.index != o2.index) return o1.index - o2.index;
++      if (o1.start != o2.start) return o1.start - o2.start;
++      return o1.end - o2.end;
++    }
++  };
++
++  public final String name;
++  public final int start;
++  public final int end;
++  public final int index;
++  private String desc;
++  private String sig;
++  private boolean isLVTT;
++
++  public LVTVariable(String name, String desc, int start, int end, int index, boolean isLVTT) {
++    this.name = name;
++    this.desc = desc;
++    this.start = start;
++    this.end = end;
++    this.index = index;
++    this.isLVTT = isLVTT;
++  }
++
++  void merge(LVTVariable other) {
++    if (other.isLVTT && this.sig == null) {
++      this.sig = other.desc;
++    }
++  }
++
++  @Override
++  public boolean equals(Object obj) {
++    if (!(obj instanceof LVTVariable))
++      return false;
++    return ((LVTVariable) obj).index == index && ((LVTVariable) obj).start == start;
++  }
++
++  @Override
++  public int hashCode() {
++    return index * 31 + start;
++  }
++
++  public void addTo(Map<Integer, Set<LVTVariable>> startpoints) {
++    Set<LVTVariable> starts = startpoints.get(this.start);
++    if (starts == null) {
++      starts = new HashSet<LVTVariable>();
++      startpoints.put(this.start, starts);
++    }
++    starts.add(this);
++  }
++
++  @Override
++  public int compareTo(LVTVariable o) {
++    if (o.start > start) return -1;
++    if (o.start < start) return 1;
++    if (o.index > index) return -1;
++    if (o.index < index) return 1;
++    return 0;
++  }
++  @Override
++    public String toString() {
++        return "\'("+index+","+start+")"+desc+(sig!=null ? "<"+sig+"> ":" ")+name+"\'";
++    }
++}
+\ No newline at end of file
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..e5fbec84cfe40111f8cb93154f99904bcef8d20a
+--- /dev/null
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
+@@ -0,0 +1,81 @@
++package org.jetbrains.java.decompiler.modules.decompiler.vars;
++
++import java.util.ArrayList;
++import java.util.HashMap;
++import java.util.List;
++import java.util.Map;
++import java.util.Set;
++
++public class LocalVariableTable {
++  private Map<Integer, Set<LVTVariable>> startpoints;
++  private ArrayList<LVTVariable> allLVT;
++private Map<Integer, List<LVTVariable>> mapLVT;
++
++  public LocalVariableTable(int len) {
++    startpoints = new HashMap<Integer,Set<LVTVariable>>(len);
++    allLVT = new ArrayList<LVTVariable>(len);
++  }
++
++  public void addVariable(LVTVariable v) {
++    allLVT.add(v);
++    v.addTo(startpoints);
++  }
++
++  public void mergeLVTs(LocalVariableTable otherLVT) {
++   for (LVTVariable other : otherLVT.allLVT) {
++      int idx = allLVT.indexOf(other);
++      if (idx < 0) {
++        allLVT.add(other);
++      }
++      else {
++        LVTVariable mine = allLVT.get(idx);
++        mine.merge(other);
++      }
++    }
++    mapLVT = null; // Invalidate the cache and rebuild it.
++  }
++
++  public LVTVariable find(Integer index, List<Integer> offsets) {
++    for (Integer offset : offsets) {
++      Set<LVTVariable> lvs = startpoints.get(offset);
++      if (lvs == null || lvs.isEmpty())
++        continue;
++      int idx = index.intValue();
++
++      for (LVTVariable lv : lvs) {
++        if (lv.index == idx)
++          return lv;
++      }
++    }
++    return null;
++  }
++
++  public Map<Integer, List<LVTVariable>> getMapVarNames() {
++    if (mapLVT == null)
++      buildNameMap();
++    return mapLVT;
++  }
++
++  private void buildNameMap() {
++    Map<Integer, Integer> versions = new HashMap<Integer, Integer>();
++    mapLVT = new HashMap<Integer,List<LVTVariable>>();
++    for (LVTVariable lvt : allLVT) {
++      Integer idx = versions.get(lvt.index);
++      if (idx == null)
++        idx = 1;
++      else
++        idx++;
++      versions.put(lvt.index, idx);
++      List<LVTVariable> lvtList = mapLVT.get(lvt.index);
++      if (lvtList == null) {
++          lvtList = new ArrayList<LVTVariable>();
++          mapLVT.put(lvt.index, lvtList);
++      }
++      lvtList.add(lvt);
++    }
++  }
++
++public List<LVTVariable> getCandidates(int index) {
++    return mapLVT.get(index);
++}
++}
+\ No newline at end of file
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+index ce81474ef8291e0a4fbf59bed8b0902de1731921..6b15a12069348463463c60b541b38a355fb27e91 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+@@ -31,10 +31,18 @@ public class VarProcessor {
+   private VarVersionsProcessor varVersions;
+   private final Map<VarVersionPair, String> thisVars = new HashMap<VarVersionPair, String>();
+   private final Set<VarVersionPair> externalVars = new HashSet<VarVersionPair>();
++private LocalVariableTable lvt;
+ 
+   public void setVarVersions(RootStatement root) {
++    Map<Integer, VarVersionPair> mapOriginalVarIndices = null;
++    if (varVersions != null) {
++        mapOriginalVarIndices = varVersions.getMapOriginalVarIndices();
++    }
+     varVersions = new VarVersionsProcessor();
+     varVersions.setVarVersions(root);
++    if (mapOriginalVarIndices != null) {
++        varVersions.getMapOriginalVarIndices().putAll(mapOriginalVarIndices);
++    }
+   }
+ 
+   public void setVarDefinitions(Statement root) {
+@@ -44,12 +52,12 @@ public class VarProcessor {
+     new VarDefinitionHelper(root, mt, this).setVarDefinitions();
+   }
+ 
+-  public void setDebugVarNames(Map<Integer, String> mapDebugVarNames) {
++  public void setDebugVarNames(Map<Integer, List<LVTVariable>> mapDebugVarNames) {
+     if (varVersions == null) {
+       return;
+     }
+ 
+-    Map<Integer, Integer> mapOriginalVarIndices = varVersions.getMapOriginalVarIndices();
++    Map<Integer, VarVersionPair> mapOriginalVarIndices = varVersions.getMapOriginalVarIndices();
+ 
+     List<VarVersionPair> listVars = new ArrayList<VarVersionPair>(mapVarNames.keySet());
+     Collections.sort(listVars, new Comparator<VarVersionPair>() {
+@@ -60,19 +68,44 @@ public class VarProcessor {
+     });
+ 
+     Map<String, Integer> mapNames = new HashMap<String, Integer>();
+-
++    Map<Integer,SortedSet<VarVersionPair>> indexedPairs = new HashMap<Integer,SortedSet<VarVersionPair>>();
++    Comparator<VarVersionPair> vvpVersionComparator = new Comparator<VarVersionPair>() {
++        @Override
++        public int compare(VarVersionPair o1, VarVersionPair o2) {
++            return o1.version - o2.version;
++        }
++    };
++    for (Entry<Integer, VarVersionPair> vvp : mapOriginalVarIndices.entrySet()) {
++        SortedSet<VarVersionPair> set = indexedPairs.get(vvp.getValue().var);
++        if (set == null) {
++            set = new TreeSet<VarVersionPair>(vvpVersionComparator);
++            indexedPairs.put(vvp.getValue().var, set);
++        }
++        set.add(vvp.getValue());
++    }
+     for (VarVersionPair pair : listVars) {
+       String name = mapVarNames.get(pair);
+ 
+-      Integer index = mapOriginalVarIndices.get(pair.var);
+-      if (index != null && mapDebugVarNames.containsKey(index)) {
+-        name = mapDebugVarNames.get(index);
++      VarVersionPair key = mapOriginalVarIndices.get(pair.var);
++
++      boolean lvtName = false;
++      if (key != null) {
++        if (indexedPairs.containsKey(key.var)) {
++          int veridx = indexedPairs.get(key.var).headSet(key).size();
++          List<LVTVariable> list = mapDebugVarNames.get(key.var);
++          if (list != null && list.size()>veridx) {
++              name = list.get(veridx).name;
++              lvtName = true;
++          } else if (list == null) {
++              // we're an exception type, probably. let's just fall through
++          }
++        }
+       }
+ 
+       Integer counter = mapNames.get(name);
+       mapNames.put(name, counter == null ? counter = new Integer(0) : ++counter);
+ 
+-      if (counter > 0) {
++      if (counter > 0 && !lvtName) {
+         name += String.valueOf(counter);
+       }
+ 
+@@ -118,4 +151,17 @@ public class VarProcessor {
+   public Set<VarVersionPair> getExternalVars() {
+     return externalVars;
+   }
++
++public void setLVT(LocalVariableTable lvt) {
++    this.lvt = lvt;
++}
++public LocalVariableTable getLVT() {
++    return this.lvt;
++}
++
++public int getRemapped(int index) {
++    VarVersionPair res = varVersions.getMapOriginalVarIndices().get(index);
++    if (res == null) return index;
++    return res.var;
++}
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+index 4751052a5468ffc469d7166bce648d5b658e040d..eae4cbac7b5074685e16cb6738434e1124528d57 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+@@ -34,7 +34,7 @@ import java.util.Map.Entry;
+ 
+ public class VarVersionsProcessor {
+ 
+-  private Map<Integer, Integer> mapOriginalVarIndices = new HashMap<Integer, Integer>();
++  private Map<Integer, VarVersionPair> mapOriginalVarIndices = new HashMap<Integer, VarVersionPair>();
+   private VarTypeProcessor typeProcessor;
+ 
+   public void setVarVersions(RootStatement root) {
+@@ -232,7 +232,8 @@ public class VarVersionsProcessor {
+     CounterContainer counters = DecompilerContext.getCounterContainer();
+ 
+     final Map<VarVersionPair, Integer> mapVarPaar = new HashMap<VarVersionPair, Integer>();
+-    Map<Integer, Integer> mapOriginalVarIndices = new HashMap<Integer, Integer>();
++    Map<Integer, VarVersionPair> mapOriginalVarIndices = new HashMap<Integer, VarVersionPair>();
++    mapOriginalVarIndices.putAll(this.mapOriginalVarIndices);
+ 
+     // map var-version pairs on new var indexes
+     List<VarVersionPair> lst = new ArrayList<VarVersionPair>(mapExprentMinTypes.keySet());
+@@ -258,7 +259,7 @@ public class VarVersionsProcessor {
+         }
+ 
+         mapVarPaar.put(pair, newIndex);
+-        mapOriginalVarIndices.put(newIndex, pair.var);
++        mapOriginalVarIndices.put(newIndex, pair);
+       }
+     }
+ 
+@@ -315,7 +316,7 @@ public class VarVersionsProcessor {
+     typeProcessor.getMapFinalVars().put(pair, finalType);
+   }
+ 
+-  public Map<Integer, Integer> getMapOriginalVarIndices() {
++  public Map<Integer, VarVersionPair> getMapOriginalVarIndices() {
+     return mapOriginalVarIndices;
+   }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/struct/StructMember.java b/src/org/jetbrains/java/decompiler/struct/StructMember.java
+index f681e19604b34fdc130fe0b8ebfb697c07580f97..af1df05e4120b1053ad0d1e74da88810c3b97487 100644
+--- a/src/org/jetbrains/java/decompiler/struct/StructMember.java
++++ b/src/org/jetbrains/java/decompiler/struct/StructMember.java
+@@ -57,11 +57,20 @@ public class StructMember {
+       StructGeneralAttribute attribute = readAttribute(in, pool, name);
+ 
+       if (attribute != null) {
+-        if (StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name) && attributes.containsKey(name)) {
++        if ((StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name) || StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE.equals(name)) && attributes.containsKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE)) {
+           // merge all variable tables
+-          StructLocalVariableTableAttribute table = (StructLocalVariableTableAttribute)attributes.getWithKey(name);
++          StructLocalVariableTableAttribute table = (StructLocalVariableTableAttribute)attributes.getWithKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
+           table.addLocalVariableTable((StructLocalVariableTableAttribute)attribute);
+         }
++        else if (StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name) && attributes.containsKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE)) {
++            StructLocalVariableTableAttribute lvtt = (StructLocalVariableTableAttribute)attributes.getWithKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
++            ((StructLocalVariableTableAttribute)attribute).addLocalVariableTable(lvtt);
++            attributes.addWithKey(attribute, attribute.getName());
++        }
++        else if (StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE.equals(name) && attributes.containsKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE)) {
++            StructLocalVariableTableAttribute table = (StructLocalVariableTableAttribute)attributes.getWithKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
++            table.addLocalVariableTable((StructLocalVariableTableAttribute)attribute);
++        }
+         else {
+           attributes.addWithKey(attribute, attribute.getName());
+         }
+diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
+index dc0ebc6708a23899fff7c43a7df56ccf02954ec9..87f574193437cf322d002e8ff3120d245474fbcc 100644
+--- a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
++++ b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
+@@ -42,6 +42,7 @@ public class StructGeneralAttribute {
+   public static final String ATTRIBUTE_RUNTIME_VISIBLE_TYPE_ANNOTATIONS = "RuntimeVisibleTypeAnnotations";
+   public static final String ATTRIBUTE_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS = "RuntimeInvisibleTypeAnnotations";
+   public static final String ATTRIBUTE_LOCAL_VARIABLE_TABLE = "LocalVariableTable";
++  public static final String ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE = "LocalVariableTypeTable";
+   public static final String ATTRIBUTE_CONSTANT_VALUE = "ConstantValue";
+   public static final String ATTRIBUTE_BOOTSTRAP_METHODS = "BootstrapMethods";
+   public static final String ATTRIBUTE_SYNTHETIC = "Synthetic";
+@@ -85,7 +86,7 @@ public class StructGeneralAttribute {
+              ATTRIBUTE_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS.equals(name)) {
+       attr = new StructAnnotationTypeAttribute();
+     }
+-    else if (ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name)) {
++    else if (ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name) || ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE.equals(name)) {
+       attr = new StructLocalVariableTableAttribute();
+     }
+     else if (ATTRIBUTE_BOOTSTRAP_METHODS.equals(name)) {
+diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+index fceae359d8fa763b162851a43284e5f13b6c13ee..a983b2788c5ccb570539a28eca0acf4c627f0595 100644
+--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
++++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+@@ -15,12 +15,15 @@
+  */
+ package org.jetbrains.java.decompiler.struct.attr;
+ 
++import org.jetbrains.java.decompiler.modules.decompiler.vars.LVTVariable;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.LocalVariableTable;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+ import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+ import org.jetbrains.java.decompiler.util.DataInputFullStream;
+ 
+ import java.io.IOException;
+ import java.util.Collections;
+-import java.util.HashMap;
++import java.util.List;
+ import java.util.Map;
+ 
+ /*
+@@ -35,33 +38,39 @@ import java.util.Map;
+ */
+ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
+ 
+-  private Map<Integer, String> mapVarNames = Collections.emptyMap();
++  private Map<Integer, List<LVTVariable>> EMPTY_LVT = Collections.emptyMap();
++  private LocalVariableTable lvt;
+ 
+   @Override
+   public void initContent(ConstantPool pool) throws IOException {
+     DataInputFullStream data = stream();
+ 
+     int len = data.readUnsignedShort();
++    boolean isLVTT = this.getName().equals(ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
+     if (len > 0) {
+-      mapVarNames = new HashMap<Integer, String>(len);
++      lvt = new LocalVariableTable(len);
+       for (int i = 0; i < len; i++) {
+-        data.discard(4);
++        int start = data.readUnsignedShort();
++        int vlen = data.readUnsignedShort();
+         int nameIndex = data.readUnsignedShort();
+-        data.discard(2);
++        int descIndex = data.readUnsignedShort(); // either descriptor or signature
+         int varIndex = data.readUnsignedShort();
+-        mapVarNames.put(varIndex, pool.getPrimitiveConstant(nameIndex).getString());
++        LVTVariable v = new LVTVariable(pool.getPrimitiveConstant(nameIndex).getString(), pool.getPrimitiveConstant(descIndex).getString(),start,start+vlen,varIndex,isLVTT);
++        lvt.addVariable(v);
+       }
+     }
+-    else {
+-      mapVarNames = Collections.emptyMap();
+-    }
+   }
+ 
+   public void addLocalVariableTable(StructLocalVariableTableAttribute attr) {
+-    mapVarNames.putAll(attr.getMapVarNames());
++    lvt.mergeLVTs(attr.lvt);
++    attr.lvt = lvt;
+   }
+ 
+-  public Map<Integer, String> getMapVarNames() {
+-    return mapVarNames;
++  public Map<Integer, List<LVTVariable>> getMapVarNames() {
++    return lvt == null ? EMPTY_LVT : lvt.getMapVarNames();
+   }
++
++public LocalVariableTable getLVT() {
++    return lvt;
++}
+ }
+diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..983368c25695ab8bbf090fa01e6d8df9a302bc91
+--- /dev/null
++++ b/test/org/jetbrains/java/decompiler/LVTTest.java
+@@ -0,0 +1,34 @@
++/*
++ * Copyright 2000-2014 JetBrains s.r.o.
++ *
++ * Licensed under the Apache License, Version 2.0 (the "License");
++ * you may not use this file except in compliance with the License.
++ * You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++package org.jetbrains.java.decompiler;
++
++import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
++import org.junit.Test;
++
++import java.util.HashMap;
++import java.util.Map;
++
++public class LVTTest extends SingleClassesTestBase {
++  @Override
++  protected Map<String, Object> getDecompilerOptions() {
++    return new HashMap<String, Object>() {{
++      put(IFernflowerPreferences.USE_DEBUG_LINE_NUMBERS, "1");
++    }};
++  }
++
++  @Test public void testMatch1() { doTest("pkg/TestLVT"); }
++  @Test public void testMatch2() { doTest("pkg/TestLVTScoping"); }
++}
+diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..c7e781e4172f736a831b857ca7fd3060d95e6186
+--- /dev/null
++++ b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
+@@ -0,0 +1,125 @@
++/*
++ * Copyright 2000-2014 JetBrains s.r.o.
++ *
++ * Licensed under the Apache License, Version 2.0 (the "License");
++ * you may not use this file except in compliance with the License.
++ * You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++package org.jetbrains.java.decompiler;
++
++import org.hamcrest.Matchers;
++import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
++import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
++import org.jetbrains.java.decompiler.util.InterpreterUtil;
++import org.junit.After;
++import org.junit.Before;
++import org.junit.Test;
++
++import java.io.*;
++import java.util.Enumeration;
++import java.util.HashMap;
++import java.util.Map;
++import java.util.zip.ZipEntry;
++import java.util.zip.ZipFile;
++
++import static org.junit.Assert.assertThat;
++import static org.junit.Assert.assertTrue;
++
++public class MinecraftDecompilationTest {
++  private DecompilerTestFixture fixture;
++
++  private static final String MC_JAR = "minecraft_ff_in.jar";
++  @Before
++  public void setUp() throws IOException {
++    fixture = new DecompilerTestFixture();
++    // -din=1 -rbr=0 -dgs=1 -asc=1 -rsy=0
++    Map<String,Object> mcFFOptions = new HashMap<String,Object>() {{
++        put(IFernflowerPreferences.DECOMPILE_INNER,"1");
++        put(IFernflowerPreferences.REMOVE_BRIDGE, "0");
++        put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES,"1");
++        put(IFernflowerPreferences.ASCII_STRING_CHARACTERS,"1");
++        put(IFernflowerPreferences.REMOVE_SYNTHETIC,"0");
++    }};
++    fixture.setUp(mcFFOptions);
++    if (!new File(fixture.getTestDataDir(), MC_JAR).exists()) {
++        throw new RuntimeException("Missing "+MC_JAR+" in testData dir - aborting");
++    }
++  }
++
++  @After
++  public void tearDown() {
++//    fixture.tearDown();
++//    fixture = null;
++  }
++
++//  @Test
++//  public void testDirectory() {
++//    File classes = new File(fixture.getTempDir(), "classes");
++//    unpack(new File(fixture.getTestDataDir(), "mc-fernflower-in.jar"), classes);
++//
++//    ConsoleDecompiler decompiler = fixture.getDecompiler();
++//    decompiler.addSpace(classes, true);
++//    decompiler.decompileContext();
++//
++//    compareDirectories(new File(fixture.getTestDataDir(), "bulk"), fixture.getTargetDir());
++//  }
++
++  @Test
++  public void testJar() {
++    ConsoleDecompiler decompiler = fixture.getDecompiler();
++    decompiler.addSpace(new File(fixture.getTestDataDir(), MC_JAR), true);
++    decompiler.decompileContext();
++
++    File unpacked = new File(fixture.getTempDir(), "unpacked");
++    unpack(new File(fixture.getTargetDir(), "bulk.jar"), unpacked);
++
++//    compareDirectories(new File(fixture.getTestDataDir(), "bulk"), unpacked);
++  }
++
++  private static void unpack(File archive, File targetDir) {
++    try {
++      ZipFile zip = new ZipFile(archive);
++      try {
++        Enumeration<? extends ZipEntry> entries = zip.entries();
++        while (entries.hasMoreElements()) {
++          ZipEntry entry = entries.nextElement();
++          if (!entry.isDirectory()) {
++            File file = new File(targetDir, entry.getName());
++            assertTrue(file.getParentFile().mkdirs() || file.getParentFile().isDirectory());
++            InputStream in = zip.getInputStream(entry);
++            OutputStream out = new FileOutputStream(file);
++            InterpreterUtil.copyStream(in, out);
++            out.close();
++            in.close();
++          }
++        }
++      }
++      finally {
++        zip.close();
++      }
++    }
++    catch (IOException e) {
++      throw new RuntimeException(e);
++    }
++  }
++
++  private static void compareDirectories(File expected, File actual) {
++    String[] expectedList = expected.list();
++    String[] actualList = actual.list();
++    assertThat(actualList, Matchers.arrayContainingInAnyOrder(expectedList));
++    for (String name : expectedList) {
++      File child = new File(expected, name);
++      if (child.isDirectory()) {
++        compareDirectories(child, new File(actual, name));
++      }
++    }
++  }
++}
+diff --git a/testData/classes/pkg/TestLVT.class b/testData/classes/pkg/TestLVT.class
+new file mode 100644
+index 0000000000000000000000000000000000000000..d8a5829d4f6504567ecf46bf65167047e41cd291
+GIT binary patch
+literal 1672
+zcmZ`(T~k|C6kR9W<bH6mAta&cmsOD_Ei@8su?bQE#ex^8f>CsQID{))ny*Q2I>Woq
+zJUPDjqT^Vf^&vRc=@0N1_+OkUu9KS#fglskJs)eYz4ktPpTA%J`2s)=U+D-54A-CR
+zWw+d>?-aLmXadm#`BY}hvbvYu*g0@ZzCdKot9t&tz)(6<6wsDxyRL;Hm^Q+Q2wZZ!
+zs=MB*?6{3Bxl?upVot3j%SGAn)VjN=`TJf|V8rQjSs;7G_4jML0=Lr6sqam{;Z^qv
+zgFBg`fl*pDOSQT?V_-}`59ZQ9qIZxpFy1@JNgXMHu?~65_sZFYMnfJtUemX58K#bF
+z0^{dhFSfk$uG_G112=WNdL}V}I2*6wbvk(}%Pn`~8-dCG0D|NdGJ_FVxQYptx;F(9
+z{U+U*Gew2CWh0FY<B|2cTV;BtFM<xRcV!n8#T`X4C2%dhGAN@Tcvk_l=Un`60R5IT
+zHY@3E0mH8a>ILHIL1zUM_b{vD{@FAhHhs5Z<6S&pZPi*VwL}n*SIa);{rlu}Wre{M
+z@Scvj-X)$rwlS|#sn?Z7xoY5j>gkk3?hXrNQNZl2SP35pjGk7)BiY<vlXVMAFjdMv
+zQki(9Qnor6MKAC$`$zp*0wFo0s{MTNu&hHeCm=ljuLy*zHLuCOhz7_`5vuwlPHWa>
+zg{W24N2kIliigRweRNpw_0mKiR1wYfN$6hOJnirG!N_<4>SDW*O<$It(4yPA)@H5M
+zD7nj?YHqvxT-;S^*#o@0PC7!I@jc+EbDiZ^@Eg8;4C6OWLa;chW5B>LM>_!UJHnNT
+zS8$0tG#39r>!6>-qHD3(`p|vtS1iTi`EV?mk37fa?PFZY>(6m@d+HBdKgJuWa2u1U
+z2#18$#_g2e#&jER<&EF*PReK_|E(qxTGaaK<S%oUWXrLK`ABR*aV(MS!@Qx$rn_W{
+zM^Q{BNw%!)J7lIJGf9@zEIF$swK!J3`{CqRMHlE@#wh3NZ5(E#b|<nZ<BBt~>xg23
+z=PTUZ#2B`@`!y1fNa6tFIO1FMJ@<dXl}>h!Xa_vQ$8h*nvo+3CvVSIv!+b{YBk_)U
+ziLr`xY*0lM56J28BI0bhan2(2JcY;jgqdAn=0D}0fg;iC)S*#BU=g8`z(S`UWwAxv
+zQP;x6XVj3S*MO}^wgB}x5nu3Z0@_R1I&SbM9-c7DaIgqQ4fq#})W1z^2w(mOPXBh_
+
+literal 0
+HcmV?d00001
+
+diff --git a/testData/classes/pkg/TestLVTScoping.class b/testData/classes/pkg/TestLVTScoping.class
+new file mode 100644
+index 0000000000000000000000000000000000000000..b13a2da2070ddc93780406d9b74262fec5610576
+GIT binary patch
+literal 1024
+zcma)4U2hUW6g>l5mZeZWODkY&>ldIFZPgcyNn>I{N?Q{M34L4WNVkPu0!yR+#<xD}
+z0~#Ov0sbaqJhKpxRHK<>=H8h*=bU?HzW@CC4Ztp*>+lIA`WKy2T@Kx9qh4z}ear6X
+z&;(-V=A~Kcns%pj+&Y(SS0M1hvMu+efInYo2xzaIQyGFEMi@&72t=!vEssXMmK@a0
+zR#y_d>a@*n!yH&DpKfaInKcwhRj)IbNz#+<nR6OK3<(`^f%sfV#dc*!4#G$xC7@rL
+z-H|+gE0E4t3e{_6WrdLrV-4#9LCba<s@_vy2_nOwx!(*T$KYtcX<!4lbZjnkUVA@u
+zWiN~^Y_rN4(S+3rk>!-$42W5C2h!}3>JIMdxGRwKbSxf+aUXdK?yDPJn;`k$<Pw6W
+zmzAZ$RG!T{nH~v5YOdM7I5hj7hdLfD%JdLOF!6487VRlrPZT}(wET(3aUu|^Iio>a
+zzP8jOB^O_RN71umHq37VXpH#0oONa;u7c}Q@iT%S8Tb(5td3RbGUxE5fNO-AftA_i
+zA*)qgPSd_1I>zb;7>OGPR|q7s2cK}WIL2*->Gv=*ya$plBS;JbaqgywnkBB{NfT{_
+zwFMNJrC2qI9xyZDi~oR6$3uoY{}vGWyMP$U;v`CN=D*{}lKTGy7!v`dnSggw2e#)9
+zM71(o&y4Z-3V)Qb;TgY9$_zWtQb3M>dV|>}pJ{6*CBnJ__Sk*Ki<B$M3k|+CgT6my
+H?8CEPwhyta
+
+literal 0
+HcmV?d00001
+
+diff --git a/testData/results/TestLVT.dec b/testData/results/TestLVT.dec
+new file mode 100644
+index 0000000000000000000000000000000000000000..b1b7e2e3d96ae555cb0fec2901968fb1b366b2a5
+--- /dev/null
++++ b/testData/results/TestLVT.dec
+@@ -0,0 +1,29 @@
++package pkg;
++
++import java.util.ArrayList;
++import java.util.HashMap;
++
++public class TestLVT {
++
++
++   public static void method(String a1, String a2) {
++      String scope1 = "scope1";
++      String scope1a = "scope1a";
++      for(int i = 0; i < 10; ++i) {
++         String scope2 = "scope2";
++         String scope2a = "scope2a";
++         ArrayList noise = new ArrayList();
++         String spam = scope1 + scope2 + scope2a + i + noise;
++         System.out.println(spam);
++      }
++      for (long i = 0L; i < 10L; ++i) {
++         String scope2 = "scope2+1";
++         String scope2a = "scope2+1a";
++         HashMap noise = new HashMap();
++         String spam = scope1a + scope2 + scope2a + i + noise;
++         System.out.println(spam);
++      }
++        
++   }
++}
++
+diff --git a/testData/results/TestLVTScoping.dec b/testData/results/TestLVTScoping.dec
+new file mode 100644
+index 0000000000000000000000000000000000000000..7bbf62484e40f9f00b4028029c6c0862d08e750c
+--- /dev/null
++++ b/testData/results/TestLVTScoping.dec
+@@ -0,0 +1,35 @@
++package pkg;
++
++public class TestLVTScoping {
++
++
++   public static void method() {      String a;
++      if(1 == Integer.valueOf(1).intValue()) {
++         a = "YAY";
++      } else {
++         a = "NAY";      }
++
++      System.out.println(a);
++   }
++
++   public static void method2() {      String a;
++      if(1 == Integer.valueOf(1).intValue()) {
++         a = "YAY";
++      } else {
++         a = "NAY";
++         System.out.println(a);
++      }   }
++
++   public static void method3() {
++      if(1 == Integer.valueOf(1).intValue()) {
++
++         boolean a = true;
++         System.out.println(a);
++      } else {
++
++         String a = "NAY";
++         System.out.println(a);
++      }
++
++   }
++}
+diff --git a/testData/src/pkg/TestLVT.java b/testData/src/pkg/TestLVT.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..05b5228e223eb20be14622126efdb7461c0e1bdf
+--- /dev/null
++++ b/testData/src/pkg/TestLVT.java
+@@ -0,0 +1,27 @@
++package pkg;
++
++import java.util.ArrayList;
++import java.util.HashMap;
++import java.util.List;
++import java.util.Map;
++
++public class TestLVT {
++    public static void method(String a1, String a2) {
++        String scope1 = "scope1";
++        String scope1a = "scope1a";
++        for (int i=0; i<10; i++) {
++            String scope2 = "scope2";
++            String scope2a = "scope2a";
++            List<Object> noise = new ArrayList<Object>();
++            String spam = scope1 + scope2 + scope2a + i + noise;
++            System.out.println(spam);
++        }
++        for (long i=0; i<10; i++) {
++            String scope2 = "scope2+1";
++            String scope2a = "scope2+1a";
++            Map<Object,Object> noise = new HashMap<Object,Object>();
++            String spam = scope1a + scope2 + scope2a + i + noise;
++            System.out.println(spam);
++        }
++    }
++}
+diff --git a/testData/src/pkg/TestLVTScoping.java b/testData/src/pkg/TestLVTScoping.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..ab57832c2f3df13a4ae9da2af193c2d6a79067ab
+--- /dev/null
++++ b/testData/src/pkg/TestLVTScoping.java
+@@ -0,0 +1,34 @@
++package pkg;
++
++
++public class TestLVTScoping {
++    public static void method() {
++        String a;
++        if (1 == Integer.valueOf(1)) {
++            a = "YAY";
++        } else {
++            a = "NAY";
++        }
++        System.out.println(a);
++    }
++    public static void method2() {
++        String a;
++        if (1 == Integer.valueOf(1)) {
++            a = "YAY";
++        } else {
++            a = "NAY";
++            System.out.println(a);
++        }
++    }
++    public static void method3() {
++        if (1 == Integer.valueOf(1)) {
++            boolean a;
++            a = true;
++            System.out.println(a);
++        } else {
++            String a;
++            a = "NAY";
++            System.out.println(a);
++        }
++    }
++}
diff --git a/FernFlower-Patches/0006-Sort-inner-class-lists-to-produce-a-consistant-decom.patch b/FernFlower-Patches/0006-Sort-inner-class-lists-to-produce-a-consistant-decom.patch
deleted file mode 100644
index b9c1b8c..0000000
--- a/FernFlower-Patches/0006-Sort-inner-class-lists-to-produce-a-consistant-decom.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Sat, 1 Aug 2015 18:40:43 -0700
-Subject: [PATCH] Sort inner class lists to produce a consistant decompile.
- Different JVMs sort HashSets differently causing inner classes to get
- shuffled.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index 5a56641c6f614fdf677f8e1900f803f73397867c..b3e9d81eaa3a4d86e4714adf2f8e007af831d670 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-@@ -228,6 +228,7 @@ public class ClassesProcessor {
-                 stack.add(nestedClass);
-               }
-             }
-+            Collections.sort(superNode.nested);
-           }
-         }
-       }
-@@ -342,7 +343,7 @@ public class ClassesProcessor {
-   }
- 
- 
--  public static class ClassNode {
-+  public static class ClassNode implements Comparable<ClassNode> {
- 
-     public static final int CLASS_ROOT = 0;
-     public static final int CLASS_MEMBER = 1;
-@@ -441,5 +442,11 @@ public class ClassesProcessor {
-       public boolean is_method_reference;
-       public boolean is_content_method_static;
-     }
-+
-+    @Override
-+    public int compareTo(ClassNode o)
-+    {
-+        return this.classStruct.qualifiedName.compareTo(o.classStruct.qualifiedName);
-+    }
-   }
- }
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
-index 0704efd84bdbd29cb6c9f5db79337147ac0b2be7..809af6d88b5f7c232539e0dbc4c7c8d7c5e26e3b 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
-@@ -119,6 +119,7 @@ public class LambdaProcessor {
-             }
-           }
-         }
-+        Collections.sort(node.nested);
-       }
- 
-       mt.releaseResources();
-@@ -133,6 +134,7 @@ public class LambdaProcessor {
- 
-           parent_class.nested.add(nd);
-           nd.parent = parent_class;
-+          Collections.sort(parent_class.nested);
-         }
-       }
-     }
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 798010e24206ffcfb76b1f4936f9b5d3709a7275..9aedf22af1f60b3e17752769462aee91cd9daeb0 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-@@ -248,6 +248,7 @@ public class NestedClassProcessor {
-       if (setEnclosing.contains(node.classStruct.qualifiedName)) {
-         node.nested.add(child);
-         child.parent = node;
-+        Collections.sort(node.nested);
- 
-         return true;
-       }
diff --git a/FernFlower-Patches/0007-Add-an-LVT-test-so-we-can-quickly-iterate-LVT-hackin.patch b/FernFlower-Patches/0007-Add-an-LVT-test-so-we-can-quickly-iterate-LVT-hackin.patch
deleted file mode 100644
index 7adf27f..0000000
--- a/FernFlower-Patches/0007-Add-an-LVT-test-so-we-can-quickly-iterate-LVT-hackin.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Sun, 2 Aug 2015 10:43:54 -0400
-Subject: [PATCH] Add an LVT test so we can quickly iterate LVT hacking
-
-
-diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..2d39827fabef8a71133de494460a0c67f4ae9f8b
---- /dev/null
-+++ b/test/org/jetbrains/java/decompiler/LVTTest.java
-@@ -0,0 +1,33 @@
-+/*
-+ * Copyright 2000-2014 JetBrains s.r.o.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+package org.jetbrains.java.decompiler;
-+
-+import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
-+import org.junit.Test;
-+
-+import java.util.HashMap;
-+import java.util.Map;
-+
-+public class LVTTest extends SingleClassesTestBase {
-+  @Override
-+  protected Map<String, Object> getDecompilerOptions() {
-+    return new HashMap<String, Object>() {{
-+      put(IFernflowerPreferences.USE_DEBUG_LINE_NUMBERS, "1");
-+    }};
-+  }
-+
-+  @Test public void testMatch1() { doTest("pkg/TestLVT"); }
-+}
-diff --git a/testData/classes/pkg/TestLVT.class b/testData/classes/pkg/TestLVT.class
-new file mode 100644
-index 0000000000000000000000000000000000000000..d8a5829d4f6504567ecf46bf65167047e41cd291
-GIT binary patch
-literal 1672
-zcmZ`(T~k|C6kR9W<bH6mAta&cmsOD_Ei@8su?bQE#ex^8f>CsQID{))ny*Q2I>Woq
-zJUPDjqT^Vf^&vRc=@0N1_+OkUu9KS#fglskJs)eYz4ktPpTA%J`2s)=U+D-54A-CR
-zWw+d>?-aLmXadm#`BY}hvbvYu*g0@ZzCdKot9t&tz)(6<6wsDxyRL;Hm^Q+Q2wZZ!
-zs=MB*?6{3Bxl?upVot3j%SGAn)VjN=`TJf|V8rQjSs;7G_4jML0=Lr6sqam{;Z^qv
-zgFBg`fl*pDOSQT?V_-}`59ZQ9qIZxpFy1@JNgXMHu?~65_sZFYMnfJtUemX58K#bF
-z0^{dhFSfk$uG_G112=WNdL}V}I2*6wbvk(}%Pn`~8-dCG0D|NdGJ_FVxQYptx;F(9
-z{U+U*Gew2CWh0FY<B|2cTV;BtFM<xRcV!n8#T`X4C2%dhGAN@Tcvk_l=Un`60R5IT
-zHY@3E0mH8a>ILHIL1zUM_b{vD{@FAhHhs5Z<6S&pZPi*VwL}n*SIa);{rlu}Wre{M
-z@Scvj-X)$rwlS|#sn?Z7xoY5j>gkk3?hXrNQNZl2SP35pjGk7)BiY<vlXVMAFjdMv
-zQki(9Qnor6MKAC$`$zp*0wFo0s{MTNu&hHeCm=ljuLy*zHLuCOhz7_`5vuwlPHWa>
-zg{W24N2kIliigRweRNpw_0mKiR1wYfN$6hOJnirG!N_<4>SDW*O<$It(4yPA)@H5M
-zD7nj?YHqvxT-;S^*#o@0PC7!I@jc+EbDiZ^@Eg8;4C6OWLa;chW5B>LM>_!UJHnNT
-zS8$0tG#39r>!6>-qHD3(`p|vtS1iTi`EV?mk37fa?PFZY>(6m@d+HBdKgJuWa2u1U
-z2#18$#_g2e#&jER<&EF*PReK_|E(qxTGaaK<S%oUWXrLK`ABR*aV(MS!@Qx$rn_W{
-zM^Q{BNw%!)J7lIJGf9@zEIF$swK!J3`{CqRMHlE@#wh3NZ5(E#b|<nZ<BBt~>xg23
-z=PTUZ#2B`@`!y1fNa6tFIO1FMJ@<dXl}>h!Xa_vQ$8h*nvo+3CvVSIv!+b{YBk_)U
-ziLr`xY*0lM56J28BI0bhan2(2JcY;jgqdAn=0D}0fg;iC)S*#BU=g8`z(S`UWwAxv
-zQP;x6XVj3S*MO}^wgB}x5nu3Z0@_R1I&SbM9-c7DaIgqQ4fq#})W1z^2w(mOPXBh_
-
-literal 0
-HcmV?d00001
-
-diff --git a/testData/results/TestLVT.dec b/testData/results/TestLVT.dec
-new file mode 100644
-index 0000000000000000000000000000000000000000..b1b7e2e3d96ae555cb0fec2901968fb1b366b2a5
---- /dev/null
-+++ b/testData/results/TestLVT.dec
-@@ -0,0 +1,29 @@
-+package pkg;
-+
-+import java.util.ArrayList;
-+import java.util.HashMap;
-+
-+public class TestLVT {
-+
-+
-+   public static void method(String a1, String a2) {
-+      String scope1 = "scope1";
-+      String scope1a = "scope1a";
-+      for(int i = 0; i < 10; ++i) {
-+         String scope2 = "scope2";
-+         String scope2a = "scope2a";
-+         ArrayList noise = new ArrayList();
-+         String spam = scope1 + scope2 + scope2a + i + noise;
-+         System.out.println(spam);
-+      }
-+      for (long i = 0L; i < 10L; ++i) {
-+         String scope2 = "scope2+1";
-+         String scope2a = "scope2+1a";
-+         HashMap noise = new HashMap();
-+         String spam = scope1a + scope2 + scope2a + i + noise;
-+         System.out.println(spam);
-+      }
-+        
-+   }
-+}
-+
-diff --git a/testData/src/pkg/TestLVT.java b/testData/src/pkg/TestLVT.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..05b5228e223eb20be14622126efdb7461c0e1bdf
---- /dev/null
-+++ b/testData/src/pkg/TestLVT.java
-@@ -0,0 +1,27 @@
-+package pkg;
-+
-+import java.util.ArrayList;
-+import java.util.HashMap;
-+import java.util.List;
-+import java.util.Map;
-+
-+public class TestLVT {
-+    public static void method(String a1, String a2) {
-+        String scope1 = "scope1";
-+        String scope1a = "scope1a";
-+        for (int i=0; i<10; i++) {
-+            String scope2 = "scope2";
-+            String scope2a = "scope2a";
-+            List<Object> noise = new ArrayList<Object>();
-+            String spam = scope1 + scope2 + scope2a + i + noise;
-+            System.out.println(spam);
-+        }
-+        for (long i=0; i<10; i++) {
-+            String scope2 = "scope2+1";
-+            String scope2a = "scope2+1a";
-+            Map<Object,Object> noise = new HashMap<Object,Object>();
-+            String spam = scope1a + scope2 + scope2a + i + noise;
-+            System.out.println(spam);
-+        }
-+    }
-+}
diff --git a/FernFlower-Patches/0014-Fix-how-class-types-are-determined-was-detecting-ano.patch b/FernFlower-Patches/0007-Fix-how-class-types-are-determined-was-detecting-ano.patch
similarity index 100%
rename from FernFlower-Patches/0014-Fix-how-class-types-are-determined-was-detecting-ano.patch
rename to FernFlower-Patches/0007-Fix-how-class-types-are-determined-was-detecting-ano.patch
diff --git a/FernFlower-Patches/0008-Capture-the-LVT-and-LVTT-properly-into-some-structur.patch b/FernFlower-Patches/0008-Capture-the-LVT-and-LVTT-properly-into-some-structur.patch
deleted file mode 100644
index 4af6037..0000000
--- a/FernFlower-Patches/0008-Capture-the-LVT-and-LVTT-properly-into-some-structur.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Sun, 2 Aug 2015 14:07:52 -0400
-Subject: [PATCH] Capture the LVT and LVTT properly, into some structured data.
- Ends seem to be the way to index the variable table. Next up, we need to
- capture the block ends in the var parsing code, so we can then match up
- later.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructMember.java b/src/org/jetbrains/java/decompiler/struct/StructMember.java
-index f681e19604b34fdc130fe0b8ebfb697c07580f97..724c0db23d607d1e243f8cf278b0a61a9789e19d 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructMember.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructMember.java
-@@ -57,9 +57,9 @@ public class StructMember {
-       StructGeneralAttribute attribute = readAttribute(in, pool, name);
- 
-       if (attribute != null) {
--        if (StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name) && attributes.containsKey(name)) {
-+        if ((StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name) || StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE.equals(name)) && attributes.containsKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE)) {
-           // merge all variable tables
--          StructLocalVariableTableAttribute table = (StructLocalVariableTableAttribute)attributes.getWithKey(name);
-+          StructLocalVariableTableAttribute table = (StructLocalVariableTableAttribute)attributes.getWithKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
-           table.addLocalVariableTable((StructLocalVariableTableAttribute)attribute);
-         }
-         else {
-diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
-index dc0ebc6708a23899fff7c43a7df56ccf02954ec9..87f574193437cf322d002e8ff3120d245474fbcc 100644
---- a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
-+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
-@@ -42,6 +42,7 @@ public class StructGeneralAttribute {
-   public static final String ATTRIBUTE_RUNTIME_VISIBLE_TYPE_ANNOTATIONS = "RuntimeVisibleTypeAnnotations";
-   public static final String ATTRIBUTE_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS = "RuntimeInvisibleTypeAnnotations";
-   public static final String ATTRIBUTE_LOCAL_VARIABLE_TABLE = "LocalVariableTable";
-+  public static final String ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE = "LocalVariableTypeTable";
-   public static final String ATTRIBUTE_CONSTANT_VALUE = "ConstantValue";
-   public static final String ATTRIBUTE_BOOTSTRAP_METHODS = "BootstrapMethods";
-   public static final String ATTRIBUTE_SYNTHETIC = "Synthetic";
-@@ -85,7 +86,7 @@ public class StructGeneralAttribute {
-              ATTRIBUTE_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS.equals(name)) {
-       attr = new StructAnnotationTypeAttribute();
-     }
--    else if (ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name)) {
-+    else if (ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name) || ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE.equals(name)) {
-       attr = new StructLocalVariableTableAttribute();
-     }
-     else if (ATTRIBUTE_BOOTSTRAP_METHODS.equals(name)) {
-diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-index fceae359d8fa763b162851a43284e5f13b6c13ee..04f534ed5482d8778826437dafd6979085a3fb65 100644
---- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-@@ -19,9 +19,14 @@ import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
- import org.jetbrains.java.decompiler.util.DataInputFullStream;
- 
- import java.io.IOException;
-+import java.util.ArrayList;
- import java.util.Collections;
- import java.util.HashMap;
-+import java.util.HashSet;
-+import java.util.List;
- import java.util.Map;
-+import java.util.Map.Entry;
-+import java.util.Set;
- 
- /*
-   u2 local_variable_table_length;
-@@ -35,21 +40,80 @@ import java.util.Map;
- */
- public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
- 
-+  public static class LVTVariable implements Comparable<LVTVariable> {
-+      public final String name;
-+      public final int start;
-+      public final int end;
-+      public final int index;
-+      private String desc;
-+      private String sig;
-+      private boolean isLVTT;
-+      LVTVariable(String name, String desc, int start, int end, int index, boolean isLVTT) {
-+          this.name = name;
-+          this.desc = desc;
-+          this.start = start;
-+          this.end = end;
-+          this.index = index;
-+          this.isLVTT = isLVTT;
-+      }
-+
-+    void merge(LVTVariable other) {
-+        if (other.isLVTT && this.sig == null) {
-+            this.sig = other.desc;
-+        }
-+    }
-+    @Override
-+    public boolean equals(Object obj) {
-+        return ((LVTVariable) obj).index == index && ((LVTVariable) obj).end == end;
-+    }
-+    @Override
-+    public int hashCode() {
-+        return index * 31 + end;
-+    }
-+
-+    public void addTo(Map<Integer, Set<LVTVariable>> endpoints) {
-+        Set<LVTVariable> ends = endpoints.get(this.end);
-+        if (ends == null) {
-+            ends = new HashSet<LVTVariable>();
-+            endpoints.put(this.end, ends);
-+        }
-+        ends.add(this);
-+    }
-+
-+    @Override
-+    public int compareTo(LVTVariable o) {
-+        if (o.end > end) return -1;
-+        if (o.end < end) return 1;
-+        if (o.index > index) return -1;
-+        if (o.index < index) return 1;
-+        return 0;
-+    }
-+  }
-   private Map<Integer, String> mapVarNames = Collections.emptyMap();
- 
-+  private Map<Integer, Set<LVTVariable>> endpoints = Collections.emptyMap();
-+  private ArrayList<LVTVariable> allLVT;
-+
-   @Override
-   public void initContent(ConstantPool pool) throws IOException {
-     DataInputFullStream data = stream();
- 
-     int len = data.readUnsignedShort();
-+    boolean isLVTT = this.getName().equals(ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
-     if (len > 0) {
-       mapVarNames = new HashMap<Integer, String>(len);
-+      endpoints = new HashMap<Integer,Set<LVTVariable>>(len);
-+      allLVT = new ArrayList<LVTVariable>(len);
-       for (int i = 0; i < len; i++) {
--        data.discard(4);
-+        int start = data.readUnsignedShort();
-+        int vlen = data.readUnsignedShort();
-         int nameIndex = data.readUnsignedShort();
--        data.discard(2);
-+        int descIndex = data.readUnsignedShort(); // either descriptor or signature
-         int varIndex = data.readUnsignedShort();
-+        LVTVariable v = new LVTVariable(pool.getPrimitiveConstant(nameIndex).getString(), pool.getPrimitiveConstant(descIndex).getString(),start,start+vlen,varIndex,isLVTT);
-         mapVarNames.put(varIndex, pool.getPrimitiveConstant(nameIndex).getString());
-+        allLVT.add(v);
-+        v.addTo(endpoints);
-       }
-     }
-     else {
-@@ -59,6 +123,15 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
- 
-   public void addLocalVariableTable(StructLocalVariableTableAttribute attr) {
-     mapVarNames.putAll(attr.getMapVarNames());
-+    for (LVTVariable other : attr.allLVT) {
-+        int idx = allLVT.indexOf(other);
-+        if (idx < 0) {
-+            allLVT.add(other);
-+        } else {
-+            LVTVariable mine = allLVT.get(idx);
-+            mine.merge(other);
-+        }
-+    }
-   }
- 
-   public Map<Integer, String> getMapVarNames() {
diff --git a/FernFlower-Patches/0015-Force-hide-constructors-with-anon-class-as-last-argu.patch b/FernFlower-Patches/0008-Force-hide-constructors-with-anon-class-as-last-argu.patch
similarity index 100%
rename from FernFlower-Patches/0015-Force-hide-constructors-with-anon-class-as-last-argu.patch
rename to FernFlower-Patches/0008-Force-hide-constructors-with-anon-class-as-last-argu.patch
diff --git a/FernFlower-Patches/0016-Fix-JVM-differences-printing-floats-with-an-undefine.patch b/FernFlower-Patches/0009-Fix-JVM-differences-printing-floats-and-constants-wi.patch
similarity index 60%
rename from FernFlower-Patches/0016-Fix-JVM-differences-printing-floats-with-an-undefine.patch
rename to FernFlower-Patches/0009-Fix-JVM-differences-printing-floats-and-constants-wi.patch
index ec21eb4..871b4f0 100644
--- a/FernFlower-Patches/0016-Fix-JVM-differences-printing-floats-with-an-undefine.patch
+++ b/FernFlower-Patches/0009-Fix-JVM-differences-printing-floats-and-constants-wi.patch
@@ -1,14 +1,36 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Mon, 3 Aug 2015 15:43:39 -0700
-Subject: [PATCH] Fix JVM differences printing floats with an undefined number
- of trailing zeros. (Some JVMs do 0.1F and some do 0.10F)
+Subject: [PATCH] Fix JVM differences printing floats and constants with an
+ undefined number of trailing zeros
 
+(For floats, some JVMs do 0.1F and some do 0.10F)
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-index 4b9b687382d96886a1a954e0fa179211843d45a8..5a751f91d28558268fc18f6f4630338c1e751f9b 100644
+index 4b9b687382d96886a1a954e0fa179211843d45a8..627a4c081bdd39dc0fd3f8607809d8fe679b65fd 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+@@ -182,16 +182,16 @@ public class ConstExprent extends Exprent {
+           String doublefield;
+           if (literal) {
+             if (Double.isNaN(dval)) {
+-              return new TextBuffer("0.0D / 0.0");
++              return new TextBuffer("0.0D / 0.0D");
+             }
+             else if (dval == Double.POSITIVE_INFINITY) {
+-              return new TextBuffer("1.0D / 0.0");
++              return new TextBuffer("1.0D / 0.0D");
+             }
+             else if (dval == Double.NEGATIVE_INFINITY) {
+-              return new TextBuffer("-1.0D / 0.0");
++              return new TextBuffer("-1.0D / 0.0D");
+             }
+             else {
+-              return new TextBuffer(value.toString()).append("D");
++              return new TextBuffer(trimZeros(value.toString())).append("D");
+             }
+           }
+           else if (Double.isNaN(dval)) {
 @@ -210,7 +210,7 @@ public class ConstExprent extends Exprent {
              doublefield = "MIN_VALUE";
            }
@@ -18,6 +40,27 @@ index 4b9b687382d96886a1a954e0fa179211843d45a8..5a751f91d28558268fc18f6f4630338c
            }
            return new FieldExprent(doublefield, "java/lang/Double", true, null, FieldDescriptor.DOUBLE_DESCRIPTOR, bytecode).toJava(0, tracer);
          case CodeConstants.TYPE_FLOAT:
+@@ -219,16 +219,16 @@ public class ConstExprent extends Exprent {
+           String floatfield;
+           if (literal) {
+             if (Double.isNaN(fval)) {
+-              return new TextBuffer("0.0F / 0.0");
++              return new TextBuffer("0.0F / 0.0F");
+             }
+             else if (fval == Double.POSITIVE_INFINITY) {
+-              return new TextBuffer("1.0F / 0.0");
++              return new TextBuffer("1.0F / 0.0F");
+             }
+             else if (fval == Double.NEGATIVE_INFINITY) {
+-              return new TextBuffer("-1.0F / 0.0");
++              return new TextBuffer("-1.0F / 0.0F");
+             }
+             else {
+-              return new TextBuffer(value.toString()).append("F");
++              return new TextBuffer(trimZeros(value.toString())).append("F");
+             }
+           }
+           else if (Float.isNaN(fval)) {
 @@ -247,7 +247,7 @@ public class ConstExprent extends Exprent {
              floatfield = "MIN_VALUE";
            }
diff --git a/FernFlower-Patches/0009-Merge-any-LVTT-to-an-incoming-LVT-if-they-re-out-of-.patch b/FernFlower-Patches/0009-Merge-any-LVTT-to-an-incoming-LVT-if-they-re-out-of-.patch
deleted file mode 100644
index f581025..0000000
--- a/FernFlower-Patches/0009-Merge-any-LVTT-to-an-incoming-LVT-if-they-re-out-of-.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Sun, 2 Aug 2015 20:56:16 -0400
-Subject: [PATCH] Merge any LVTT to an incoming LVT (if they're out of
- sequence), and merge LVTTs together if there's no LVT yet.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructMember.java b/src/org/jetbrains/java/decompiler/struct/StructMember.java
-index 724c0db23d607d1e243f8cf278b0a61a9789e19d..af1df05e4120b1053ad0d1e74da88810c3b97487 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructMember.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructMember.java
-@@ -62,6 +62,15 @@ public class StructMember {
-           StructLocalVariableTableAttribute table = (StructLocalVariableTableAttribute)attributes.getWithKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
-           table.addLocalVariableTable((StructLocalVariableTableAttribute)attribute);
-         }
-+        else if (StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name) && attributes.containsKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE)) {
-+            StructLocalVariableTableAttribute lvtt = (StructLocalVariableTableAttribute)attributes.getWithKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
-+            ((StructLocalVariableTableAttribute)attribute).addLocalVariableTable(lvtt);
-+            attributes.addWithKey(attribute, attribute.getName());
-+        }
-+        else if (StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE.equals(name) && attributes.containsKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE)) {
-+            StructLocalVariableTableAttribute table = (StructLocalVariableTableAttribute)attributes.getWithKey(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
-+            table.addLocalVariableTable((StructLocalVariableTableAttribute)attribute);
-+        }
-         else {
-           attributes.addWithKey(attribute, attribute.getName());
-         }
diff --git a/FernFlower-Patches/0010-Fix-tests-for-inner-class-sorting.patch b/FernFlower-Patches/0010-Fix-tests-for-inner-class-sorting.patch
deleted file mode 100644
index cbc51d7..0000000
--- a/FernFlower-Patches/0010-Fix-tests-for-inner-class-sorting.patch
+++ /dev/null
@@ -1,476 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Sun, 2 Aug 2015 19:22:15 -0700
-Subject: [PATCH] Fix tests for inner class sorting.
-
-
-diff --git a/testData/results/TestAnonymousClass.dec b/testData/results/TestAnonymousClass.dec
-index 75d1df239bb56bc0a4be42a1310957721146ece2..fdce11007ba778eaaeb4081e1a11041b2573feca 100644
---- a/testData/results/TestAnonymousClass.dec
-+++ b/testData/results/TestAnonymousClass.dec
-@@ -67,15 +67,8 @@ public abstract class TestAnonymousClass {
-       boolean var1 = true;// 39
-    }// 40
- 
--   static class InnerRecursive {
--      TestAnonymousClass.InnerRecursive r;
--
--      public InnerRecursive(TestAnonymousClass.InnerRecursive var1) {
--         this.r = var1;// 105
--      }// 106
--
--      void foo() {
--      }// 110
-+   interface I {
-+      void foo() throws Exception;
-    }
- 
-    private static class Inner {
-@@ -87,8 +80,15 @@ public abstract class TestAnonymousClass {
-       };
-    }
- 
--   interface I {
--      void foo() throws Exception;
-+   static class InnerRecursive {
-+      TestAnonymousClass.InnerRecursive r;
-+
-+      public InnerRecursive(TestAnonymousClass.InnerRecursive var1) {
-+         this.r = var1;// 105
-+      }// 106
-+
-+      void foo() {
-+      }// 110
-    }
- }
- 
-@@ -180,24 +180,24 @@ class 'pkg/TestAnonymousClass' {
-    }
- }
- 
-+class 'pkg/TestAnonymousClass$Inner$1' {
-+   method 'run ()V' {
-+      0      76
-+      1      76
-+      2      77
-+      3      77
-+      4      78
-+   }
-+}
-+
- class 'pkg/TestAnonymousClass$InnerRecursive' {
-    method '<init> (Lpkg/TestAnonymousClass$InnerRecursive;)V' {
--      6      73
--      9      74
-+      6      86
-+      9      87
-    }
- 
-    method 'foo ()V' {
--      0      77
--   }
--}
--
--class 'pkg/TestAnonymousClass$Inner$1' {
--   method 'run ()V' {
--      0      83
--      1      83
--      2      84
--      3      84
--      4      85
-+      0      90
-    }
- }
- 
-@@ -223,9 +223,9 @@ Lines mapping:
- 53 <-> 18
- 54 <-> 19
- 55 <-> 20
--66 <-> 84
--67 <-> 85
--68 <-> 86
-+66 <-> 77
-+67 <-> 78
-+68 <-> 79
- 75 <-> 24
- 76 <-> 25
- 77 <-> 26
-@@ -234,9 +234,9 @@ Lines mapping:
- 91 <-> 37
- 92 <-> 38
- 93 <-> 39
--105 <-> 74
--106 <-> 75
--110 <-> 78
-+105 <-> 87
-+106 <-> 88
-+110 <-> 91
- Not mapped:
- 18
- 104
-diff --git a/testData/results/TestInnerLocal.dec b/testData/results/TestInnerLocal.dec
-index 6ca3a7e1053087d91543ce588eb81e19c9f3432d..e5aba7da20b0b57a4c796a36c24960f38c6eac31 100644
---- a/testData/results/TestInnerLocal.dec
-+++ b/testData/results/TestInnerLocal.dec
-@@ -28,6 +28,14 @@ public class TestInnerLocal {
-       new TestInnerLocal.Inner1Static.Inner2Static("test");// 40
-    }// 41
- 
-+   class Inner1 {
-+      final String x;
-+
-+      public Inner1(String var2) {
-+         this.x = var2;// 46
-+      }// 47
-+   }
-+
-    static class Inner1Static {
-       final String x;
- 
-@@ -43,14 +51,6 @@ public class TestInnerLocal {
-          }// 60
-       }
-    }
--
--   class Inner1 {
--      final String x;
--
--      public Inner1(String var2) {
--         this.x = var2;// 46
--      }// 47
--   }
- }
- 
- class 'TestInnerLocal$1Inner' {
-@@ -84,24 +84,24 @@ class 'TestInnerLocal$2Inner' {
-    }
- }
- 
--class 'TestInnerLocal$Inner1Static' {
--   method '<init> (Ljava/lang/String;)V' {
--      6      34
--      9      35
-+class 'TestInnerLocal$Inner1' {
-+   method '<init> (LTestInnerLocal;Ljava/lang/String;)V' {
-+      b      34
-+      e      35
-    }
- }
- 
--class 'TestInnerLocal$Inner1Static$Inner2Static' {
-+class 'TestInnerLocal$Inner1Static' {
-    method '<init> (Ljava/lang/String;)V' {
--      6      41
--      9      42
-+      6      42
-+      9      43
-    }
- }
- 
--class 'TestInnerLocal$Inner1' {
--   method '<init> (LTestInnerLocal;Ljava/lang/String;)V' {
--      b      50
--      e      51
-+class 'TestInnerLocal$Inner1Static$Inner2Static' {
-+   method '<init> (Ljava/lang/String;)V' {
-+      6      49
-+      9      50
-    }
- }
- 
-@@ -119,12 +119,12 @@ Lines mapping:
- 39 <-> 27
- 40 <-> 28
- 41 <-> 29
--46 <-> 51
--47 <-> 52
--53 <-> 35
--54 <-> 36
--59 <-> 42
--60 <-> 43
-+46 <-> 35
-+47 <-> 36
-+53 <-> 43
-+54 <-> 44
-+59 <-> 50
-+60 <-> 51
- Not mapped:
- 21
- 33
-diff --git a/testData/results/TestInnerLocalPkg.dec b/testData/results/TestInnerLocalPkg.dec
-index 7cafa415f9b6212b593d0c0940cc16c277cf5e2f..7ddb0ce6ad8adf326a51e145f419e23eed8779dd 100644
---- a/testData/results/TestInnerLocalPkg.dec
-+++ b/testData/results/TestInnerLocalPkg.dec
-@@ -30,6 +30,14 @@ public class TestInnerLocalPkg {
-       new TestInnerLocalPkg.Inner1Static.Inner2Static("test");// 42
-    }// 43
- 
-+   class Inner1 {
-+      final String x;
-+
-+      public Inner1(String var2) {
-+         this.x = var2;// 48
-+      }// 49
-+   }
-+
-    static class Inner1Static {
-       final String x;
- 
-@@ -45,14 +53,6 @@ public class TestInnerLocalPkg {
-          }// 62
-       }
-    }
--
--   class Inner1 {
--      final String x;
--
--      public Inner1(String var2) {
--         this.x = var2;// 48
--      }// 49
--   }
- }
- 
- class 'pkg/TestInnerLocalPkg$1Inner' {
-@@ -86,24 +86,24 @@ class 'pkg/TestInnerLocalPkg$2Inner' {
-    }
- }
- 
--class 'pkg/TestInnerLocalPkg$Inner1Static' {
--   method '<init> (Ljava/lang/String;)V' {
--      6      36
--      9      37
-+class 'pkg/TestInnerLocalPkg$Inner1' {
-+   method '<init> (Lpkg/TestInnerLocalPkg;Ljava/lang/String;)V' {
-+      b      36
-+      e      37
-    }
- }
- 
--class 'pkg/TestInnerLocalPkg$Inner1Static$Inner2Static' {
-+class 'pkg/TestInnerLocalPkg$Inner1Static' {
-    method '<init> (Ljava/lang/String;)V' {
--      6      43
--      9      44
-+      6      44
-+      9      45
-    }
- }
- 
--class 'pkg/TestInnerLocalPkg$Inner1' {
--   method '<init> (Lpkg/TestInnerLocalPkg;Ljava/lang/String;)V' {
--      b      52
--      e      53
-+class 'pkg/TestInnerLocalPkg$Inner1Static$Inner2Static' {
-+   method '<init> (Ljava/lang/String;)V' {
-+      6      51
-+      9      52
-    }
- }
- 
-@@ -121,12 +121,12 @@ Lines mapping:
- 41 <-> 29
- 42 <-> 30
- 43 <-> 31
--48 <-> 53
--49 <-> 54
--55 <-> 37
--56 <-> 38
--61 <-> 44
--62 <-> 45
-+48 <-> 37
-+49 <-> 38
-+55 <-> 45
-+56 <-> 46
-+61 <-> 52
-+62 <-> 53
- Not mapped:
- 23
- 35
-diff --git a/testData/results/TestInnerSignature.dec b/testData/results/TestInnerSignature.dec
-index 3087a40dc63251ee1444ef4924050413f39221d5..406e1f41d8f0a084a986f683bf7ecb3b44c37429 100644
---- a/testData/results/TestInnerSignature.dec
-+++ b/testData/results/TestInnerSignature.dec
-@@ -9,18 +9,6 @@ public class TestInnerSignature<A, B, C> {
-       this.c = var3;// 25
-    }// 26
- 
--   public static class InnerStatic<A, B, C> {
--      A a;
--      B b;
--      C c;
--
--      public InnerStatic(A var1, B var2, C var3) {
--         this.a = var1;// 46
--         this.b = var2;// 47
--         this.c = var3;// 48
--      }// 49
--   }
--
-    public class Inner {
-       A a;
-       B b;
-@@ -32,6 +20,18 @@ public class TestInnerSignature<A, B, C> {
-          this.c = var4;// 36
-       }// 37
-    }
-+
-+   public static class InnerStatic<A, B, C> {
-+      A a;
-+      B b;
-+      C c;
-+
-+      public InnerStatic(A var1, B var2, C var3) {
-+         this.a = var1;// 46
-+         this.b = var2;// 47
-+         this.c = var3;// 48
-+      }// 49
-+   }
- }
- 
- class 'TestInnerSignature' {
-@@ -43,21 +43,21 @@ class 'TestInnerSignature' {
-    }
- }
- 
--class 'TestInnerSignature$InnerStatic' {
--   method '<init> (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
--      6      17
--      b      18
--      10      19
--      13      20
-+class 'TestInnerSignature$Inner' {
-+   method '<init> (LTestInnerSignature;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
-+      b      17
-+      10      18
-+      16      19
-+      19      20
-    }
- }
- 
--class 'TestInnerSignature$Inner' {
--   method '<init> (LTestInnerSignature;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
--      b      29
--      10      30
--      16      31
--      19      32
-+class 'TestInnerSignature$InnerStatic' {
-+   method '<init> (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
-+      6      29
-+      b      30
-+      10      31
-+      13      32
-    }
- }
- 
-@@ -66,14 +66,14 @@ Lines mapping:
- 24 <-> 8
- 25 <-> 9
- 26 <-> 10
--34 <-> 30
--35 <-> 31
--36 <-> 32
--37 <-> 33
--46 <-> 18
--47 <-> 19
--48 <-> 20
--49 <-> 21
-+34 <-> 18
-+35 <-> 19
-+36 <-> 20
-+37 <-> 21
-+46 <-> 30
-+47 <-> 31
-+48 <-> 32
-+49 <-> 33
- Not mapped:
- 22
- 33
-diff --git a/testData/results/TestMethodParameters.dec b/testData/results/TestMethodParameters.dec
-index 21f0f129d1bc260e2dbc7ce77f07ece57711bf75..af7ce865f5d946980010ee02c3e5be384a041064 100644
---- a/testData/results/TestMethodParameters.dec
-+++ b/testData/results/TestMethodParameters.dec
-@@ -21,6 +21,14 @@ public class TestMethodParameters {
- 
-    }// 39
- 
-+   class C1 {
-+      C1(@Deprecated int var2) {
-+      }// 24
-+
-+      void m(@Deprecated int var1) {
-+      }// 25
-+   }
-+
-    static class C2 {
-       C2(@Deprecated int var1) {
-       }// 29
-@@ -31,14 +39,6 @@ public class TestMethodParameters {
-       static void m2(@Deprecated int var0) {
-       }// 31
-    }
--
--   class C1 {
--      C1(@Deprecated int var2) {
--      }// 24
--
--      void m(@Deprecated int var1) {
--      }// 25
--   }
- }
- 
- class 'pkg/TestMethodParameters' {
-@@ -69,26 +69,26 @@ class 'pkg/TestMethodParameters$1Local' {
-    }
- }
- 
--class 'pkg/TestMethodParameters$C2' {
--   method '<init> (I)V' {
--      4      25
-+class 'pkg/TestMethodParameters$C1' {
-+   method '<init> (Lpkg/TestMethodParameters;I)V' {
-+      9      25
-    }
- 
--   method 'm1 (I)V' {
-+   method 'm (I)V' {
-       0      28
-    }
-+}
- 
--   method 'm2 (I)V' {
--      0      31
-+class 'pkg/TestMethodParameters$C2' {
-+   method '<init> (I)V' {
-+      4      33
-    }
--}
- 
--class 'pkg/TestMethodParameters$C1' {
--   method '<init> (Lpkg/TestMethodParameters;I)V' {
--      9      36
-+   method 'm1 (I)V' {
-+      0      36
-    }
- 
--   method 'm (I)V' {
-+   method 'm2 (I)V' {
-       0      39
-    }
- }
-@@ -97,11 +97,11 @@ Lines mapping:
- 19 <-> 5
- 20 <-> 8
- 21 <-> 11
--24 <-> 37
--25 <-> 40
--29 <-> 26
--30 <-> 29
--31 <-> 32
-+24 <-> 26
-+25 <-> 29
-+29 <-> 34
-+30 <-> 37
-+31 <-> 40
- 36 <-> 16
- 37 <-> 19
- 39 <-> 22
diff --git a/FernFlower-Patches/0018-No-Synthetic-classes-allowed-in-parameters.patch b/FernFlower-Patches/0010-No-Synthetic-classes-allowed-in-parameters.patch
similarity index 100%
rename from FernFlower-Patches/0018-No-Synthetic-classes-allowed-in-parameters.patch
rename to FernFlower-Patches/0010-No-Synthetic-classes-allowed-in-parameters.patch
diff --git a/FernFlower-Patches/0020-Convert-Exprent.bytecode-to-a-BitMap-as-it-gives-bet.patch b/FernFlower-Patches/0011-Convert-Exprent.bytecode-to-a-BitMap-as-it-gives-bet.patch
similarity index 99%
rename from FernFlower-Patches/0020-Convert-Exprent.bytecode-to-a-BitMap-as-it-gives-bet.patch
rename to FernFlower-Patches/0011-Convert-Exprent.bytecode-to-a-BitMap-as-it-gives-bet.patch
index c2d7eed..c3555fc 100644
--- a/FernFlower-Patches/0020-Convert-Exprent.bytecode-to-a-BitMap-as-it-gives-bet.patch
+++ b/FernFlower-Patches/0011-Convert-Exprent.bytecode-to-a-BitMap-as-it-gives-bet.patch
@@ -251,7 +251,7 @@ index 95ebdc5d1bd967c32eb4c7bd34e701de699afd1c..efc64b9d98005572eb9752e36d472f7a
    // getter and setter methods
    // *****************************************************************************
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-index 5a751f91d28558268fc18f6f4630338c1e751f9b..312f6c8a51e96e8f1a8dc27b509716022e22cc39 100644
+index 627a4c081bdd39dc0fd3f8607809d8fe679b65fd..43f29f5320b158feb567b4327e3487c1ea3748e9 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 @@ -48,15 +48,15 @@ public class ConstExprent extends Exprent {
diff --git a/FernFlower-Patches/0011-Fixed-issue-where-field-initalizers-would-incorrectl.patch b/FernFlower-Patches/0011-Fixed-issue-where-field-initalizers-would-incorrectl.patch
deleted file mode 100644
index 58fbb96..0000000
--- a/FernFlower-Patches/0011-Fixed-issue-where-field-initalizers-would-incorrectl.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Sun, 2 Aug 2015 19:49:30 -0700
-Subject: [PATCH] Fixed issue where field initalizers would incorrectly be
- inlined when they relied on fields initalized later.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
-index d916b1951e026f239028e52f75199e784a7a9639..e64feea59b43cd41ad42ace70ebf78dec4ffb54e 100644
---- a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
-@@ -142,9 +142,8 @@ public class InitializerProcessor {
-             if (fexpr.isStatic() && fexpr.getClassname().equals(cl.qualifiedName) &&
-                 cl.hasField(fexpr.getName(), fexpr.getDescriptor().descriptorString)) {
- 
--              if (isExprentIndependent(asexpr.getRight(), meth, cl, whitelist)) {
--
--                String keyField = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
-+              String keyField = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
-+              if (isExprentIndependent(asexpr.getRight(), meth, cl, whitelist, cl.getFields().getIndexByKey(keyField))) {
-                 if (!wrapper.getStaticFieldInitializers().containsKey(keyField)) {
-                   wrapper.getStaticFieldInitializers().addWithKey(asexpr.getRight(), keyField);
-                   whitelist.add(keyField);
-@@ -217,8 +216,8 @@ public class InitializerProcessor {
-                 cl.hasField(fexpr.getName(), fexpr
-                   .getDescriptor().descriptorString)) { // check for the physical existence of the field. Could be defined in a superclass.
- 
--              if (isExprentIndependent(asexpr.getRight(), lstMethWrappers.get(i), cl, whitelist)) {
--                String fieldKey = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
-+              String fieldKey = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
-+              if (isExprentIndependent(asexpr.getRight(), lstMethWrappers.get(i), cl, whitelist, cl.getFields().getIndexByKey(fieldKey))) {
-                 if (fieldWithDescr == null) {
-                   fieldWithDescr = fieldKey;
-                   value = asexpr.getRight();
-@@ -253,7 +252,7 @@ public class InitializerProcessor {
-     }
-   }
- 
--  private static boolean isExprentIndependent(Exprent exprent, MethodWrapper meth, StructClass cl, Set<String> whitelist) {
-+  private static boolean isExprentIndependent(Exprent exprent, MethodWrapper meth, StructClass cl, Set<String> whitelist, int fidx) {
- 
-     List<Exprent> lst = exprent.getAllExprents(true);
-     lst.add(exprent);
-@@ -273,9 +272,11 @@ public class InitializerProcessor {
-         case Exprent.EXPRENT_FIELD:
-           FieldExprent fexpr = (FieldExprent)expr;
-           if (cl.qualifiedName.equals(fexpr.getClassname())) {
--            if (!whitelist.contains(InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString))) {
-+            String key = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
-+            if (!whitelist.contains(key)) {
-               return false;
-             }
-+            return cl.getFields().getIndexByKey(key) < fidx;
-           }
-           else if (!fexpr.isStatic()) {
-             return false;
diff --git a/FernFlower-Patches/0012-Some-synthetic-anon-classes-are-being-detected-as-me.patch b/FernFlower-Patches/0012-Some-synthetic-anon-classes-are-being-detected-as-me.patch
deleted file mode 100644
index 9063d87..0000000
--- a/FernFlower-Patches/0012-Some-synthetic-anon-classes-are-being-detected-as-me.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Sun, 2 Aug 2015 21:14:56 -0700
-Subject: [PATCH] Some synthetic anon classes are being detected as member
- classes. Unknown why, however this fixes the consturctor argument.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-index 6dad7c98c8c6c9fe0714e63c24763d2eb111df4c..0297a55fc16eb3eddc0e458bfa49325f563fd613 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-@@ -327,7 +327,7 @@ public class NewExprent extends Exprent {
- 
-                 if (i == lstParameters.size() - 1 && expr.getExprType() == VarType.VARTYPE_NULL) {
-                   ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(leftType.value);
--                  if (node != null && node.type == ClassNode.CLASS_ANONYMOUS) {
-+                  if (node != null && (node.namelessConstructorStub || node.type == ClassNode.CLASS_ANONYMOUS)) {
-                     break;  // skip last parameter of synthetic constructor call
-                   }
-                 }
diff --git a/FernFlower-Patches/0029-TryCatch-statements-will-now-use-the-correct-variabl.patch b/FernFlower-Patches/0012-Try-statements-will-now-use-the-correct-variable-ind.patch
similarity index 56%
rename from FernFlower-Patches/0029-TryCatch-statements-will-now-use-the-correct-variabl.patch
rename to FernFlower-Patches/0012-Try-statements-will-now-use-the-correct-variable-ind.patch
index cb1ef4d..e2d9961 100644
--- a/FernFlower-Patches/0029-TryCatch-statements-will-now-use-the-correct-variabl.patch
+++ b/FernFlower-Patches/0012-Try-statements-will-now-use-the-correct-variable-ind.patch
@@ -1,8 +1,8 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 9 Aug 2015 15:04:04 -0700
-Subject: [PATCH] TryCatch statements will now use the correct variable index
- for their exception variable. Some small cleanups and NPE fix.
+Subject: [PATCH] Try statements will now use the correct variable index for
+ their exception variable. Some small cleanups and NPE fix.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -105,56 +105,6 @@ index 388e76a7a8270d81d03b661ddbfef5ed9fb53fe4..9542a8025136f7416c2c806f52d5c990
        } else if (exp instanceof AssignmentExprent) {
            AssignmentExprent assignmentExprent = (AssignmentExprent)exp;
          sb.append("{").append(printExprent(" ",assignmentExprent.getLeft(),varProc)).append(" =").append(printExprent(" ",assignmentExprent.getRight(),varProc)).append("}");
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
-index 812ed10b00ba6224ef947be953bc8d88bd72e2f7..d5b432c4fe852fff994e03fed0398da7e22997bd 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
-@@ -16,6 +16,7 @@
- package org.jetbrains.java.decompiler.modules.decompiler.stats;
- 
- import org.jetbrains.java.decompiler.code.CodeConstants;
-+import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
- import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.main.TextBuffer;
- import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
-@@ -68,7 +69,15 @@ public class CatchAllStatement extends Statement {
-       }
-     }
- 
--    vars.add(new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
-+    int varIndex = -1;
-+    BasicBlock block = handler.getBasichead().getBlock();
-+    if (!block.getSeq().isEmpty() && block.getInstruction(0).opcode == CodeConstants.opc_astore) {
-+      varIndex = block.getInstruction(0).getOperand(0);
-+    }
-+    else {
-+      varIndex = DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER);
-+    }
-+    vars.add(new VarExprent(varIndex,
-                             new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Throwable"),
-                             (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR)));
-   }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
-index 8d56042e3667eb6843cdea18d01536f90ea59e50..fda5ed373d94f875ba6450d361bda722086e03d0 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
-@@ -60,7 +60,15 @@ public class CatchStatement extends Statement {
-         stats.addWithKey(stat, stat.id);
-         exctstrings.add(new ArrayList<String>(edge.getExceptions()));
- 
--        vars.add(new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
-+        int varIndex = -1;
-+        BasicBlock block = stat.getBasichead().getBlock();
-+        if (!block.getSeq().isEmpty() && block.getInstruction(0).opcode == CodeConstants.opc_astore) {
-+          varIndex = block.getInstruction(0).getOperand(0);
-+        }
-+        else {
-+          varIndex = DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER);
-+        }
-+        vars.add(new VarExprent(varIndex,
-                                 new VarType(CodeConstants.TYPE_OBJECT, 0, edge.getExceptions().get(0)),
-                                 // FIXME: for now simply the first type. Should get the first common superclass when possible.
-                                 (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR)));
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 index 6b15a12069348463463c60b541b38a355fb27e91..ef07c6bc838bb597d27598351b545343e8a725c5 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
@@ -195,50 +145,3 @@ index a983b2788c5ccb570539a28eca0acf4c627f0595..a654359296bac48d1cc7316987849bd7
  import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
  import org.jetbrains.java.decompiler.util.DataInputFullStream;
  
-diff --git a/testData/results/TestClassSimpleBytecodeMapping.dec b/testData/results/TestClassSimpleBytecodeMapping.dec
-index 1a2532f0b736a3d1a2db4f7ba3645e48e419189f..4a2f333d257cb2a56dddd0b5ae2887537b01bd86 100644
---- a/testData/results/TestClassSimpleBytecodeMapping.dec
-+++ b/testData/results/TestClassSimpleBytecodeMapping.dec
-@@ -21,8 +21,8 @@ public class TestClassSimpleBytecodeMapping {
-    public void test2(String var1) {
-       try {
-          Integer.parseInt(var1);// 34
--      } catch (Exception var6) {// 35
--         System.out.println(var6);// 36
-+      } catch (Exception var2) {// 35
-+         System.out.println(var2);// 36
-       } finally {
-          System.out.println("Finally");// 38
-       }
-diff --git a/testData/results/TestTryCatchFinally.dec b/testData/results/TestTryCatchFinally.dec
-index 772a76e8a850ff853ef51acb29d82a1ba95dfee6..fbe5782266c4dbcdb4d5558b3173625228f71038 100644
---- a/testData/results/TestTryCatchFinally.dec
-+++ b/testData/results/TestTryCatchFinally.dec
-@@ -4,10 +4,10 @@ public class TestTryCatchFinally {
-    public void test1(String var1) {
-       try {
-          System.out.println("sout1");// 24
--      } catch (Exception var9) {
-+      } catch (Exception var2) {
-          try {
-             System.out.println("sout2");// 27
--         } catch (Exception var8) {// 28
-+         } catch (Exception var3) {// 28
-             ;
-          }
-       } finally {
-@@ -28,10 +28,10 @@ public class TestTryCatchFinally {
- 
-    public int test(String var1) {
-       try {
--         int var2 = Integer.parseInt(var1);// 51
--         return var2;
--      } catch (Exception var6) {// 52
--         System.out.println("Error" + var6);// 53
-+         int var5 = Integer.parseInt(var1);// 51
-+         return var5;
-+      } catch (Exception var2) {// 52
-+         System.out.println("Error" + var2);// 53
-       } finally {
-          System.out.println("Finally");// 55
-       }
diff --git a/FernFlower-Patches/0030-Add-enhanced-ForEach-loop-detection-and-re-introduce.patch b/FernFlower-Patches/0013-Add-enhanced-for-each-loop-detection-re-introduce-Do.patch
similarity index 75%
rename from FernFlower-Patches/0030-Add-enhanced-ForEach-loop-detection-and-re-introduce.patch
rename to FernFlower-Patches/0013-Add-enhanced-for-each-loop-detection-re-introduce-Do.patch
index e0a902d..47a4c0f 100644
--- a/FernFlower-Patches/0030-Add-enhanced-ForEach-loop-detection-and-re-introduce.patch
+++ b/FernFlower-Patches/0013-Add-enhanced-for-each-loop-detection-re-introduce-Do.patch
@@ -1,8 +1,8 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 13 Aug 2015 16:03:24 -0700
-Subject: [PATCH] Add enhanced ForEach loop detection and re-introduce the
- DotExporter for debugging.
+Subject: [PATCH] Add enhanced for-each loop detection, re-introduce
+ DotExporter for debugging
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
@@ -31,7 +31,7 @@ index 9aedf22af1f60b3e17752769462aee91cd9daeb0..c6eda1b630480cdec964a3571fc44e1c
              public int processExprent(Exprent exprent) {
                List<Exprent> lst = exprent.getAllExprents(true);
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-index 71d3d7991287bcfc163fb0a5229e8f2595a20dc3..d994c26c65b45e18e54622865e3bc454b22feb0a 100644
+index 71d3d7991287bcfc163fb0a5229e8f2595a20dc3..5ba4dcd0944696d200a8a5857d7afccc3737e5fb 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
 @@ -18,8 +18,13 @@ package org.jetbrains.java.decompiler.modules.decompiler;
@@ -65,8 +65,59 @@ index 71d3d7991287bcfc163fb0a5229e8f2595a20dc3..d994c26c65b45e18e54622865e3bc454
      }
  
      return (stat.getLooptype() != oldloop);
-@@ -366,17 +374,193 @@ public class MergeHelper {
-       stat.setIncExprent(lastData.getExprents().remove(lastData.getExprents().size() - 1));
+@@ -110,6 +118,10 @@ public class MergeHelper {
+           if (ifedge.getType() == StatEdge.TYPE_BREAK) {
+             ifexpr.negateIf();
+           }
++          if (stat.getConditionExprent() != null) {
++            ifexpr.getCondition().addBytecodeOffsets(stat.getConditionExprent().bytecode);
++          }
++          ifexpr.getCondition().addBytecodeOffsets(lastif.getHeadexprent().bytecode);
+           stat.setConditionExprent(ifexpr.getCondition());
+           lastif.getFirst().removeSuccessor(ifedge);
+           lastif.removeSuccessor(elseedge);
+@@ -167,6 +179,10 @@ public class MergeHelper {
+               // negate condition (while header)
+               IfExprent ifexpr = (IfExprent)firstif.getHeadexprent().copy();
+               ifexpr.negateIf();
++              if (stat.getConditionExprent() != null) {
++                ifexpr.getCondition().addBytecodeOffsets(stat.getConditionExprent().bytecode);
++              }
++              ifexpr.getCondition().addBytecodeOffsets(firstif.getHeadexprent().bytecode);
+               stat.setConditionExprent(ifexpr.getCondition());
+ 
+               // remove edges
+@@ -205,7 +221,12 @@ public class MergeHelper {
+               stat.setLooptype(DoStatement.LOOP_WHILE);
+ 
+               // no need to negate the while condition
+-              stat.setConditionExprent(((IfExprent)firstif.getHeadexprent().copy()).getCondition());
++              IfExprent ifexpr = (IfExprent)firstif.getHeadexprent().copy();
++              if (stat.getConditionExprent() != null) {
++                ifexpr.getCondition().addBytecodeOffsets(stat.getConditionExprent().bytecode);
++              }
++              ifexpr.getCondition().addBytecodeOffsets(firstif.getHeadexprent().bytecode);
++              stat.setConditionExprent(ifexpr.getCondition());
+ 
+               // remove edges
+               StatEdge ifedge = firstif.getIfEdge();
+@@ -361,22 +382,320 @@ public class MergeHelper {
+ 
+       stat.setLooptype(DoStatement.LOOP_FOR);
+       if (hasinit) {
+-        stat.setInitExprent(preData.getExprents().remove(preData.getExprents().size() - 1));
++        Exprent exp = preData.getExprents().remove(preData.getExprents().size() - 1);
++        if (stat.getInitExprent() != null) {
++          exp.addBytecodeOffsets(stat.getInitExprent().bytecode);
++        }
++        stat.setInitExprent(exp);
++      }
++      Exprent exp = lastData.getExprents().remove(lastData.getExprents().size() - 1);
++      if (stat.getIncExprent() != null) {
++        exp.addBytecodeOffsets(stat.getIncExprent().bytecode);
+       }
+-      stat.setIncExprent(lastData.getExprents().remove(lastData.getExprents().size() - 1));
++      stat.setIncExprent(exp);
      }
  
 -    if (lastData.getExprents().isEmpty()) {
@@ -111,34 +162,51 @@ index 71d3d7991287bcfc163fb0a5229e8f2595a20dc3..d994c26c65b45e18e54622865e3bc454
 +          }
 +          break;
 +        }
-+      }
-+      else {
-+        break;
        }
 -      removeLastEmptyStatement(stat, lastData);
-     }
- 
++      else {
++        break;
++      }
++    }
++
 +    firstData = getFirstDirectData(stat.getFirst());
 +    if (firstData != null && firstData.getExprents().get(0).type == Exprent.EXPRENT_ASSIGNMENT) {
 +      firstDoExprent = (AssignmentExprent)firstData.getExprents().get(0);
-+    }
-+
+     }
+ 
 +    if (stat.getLooptype() == DoStatement.LOOP_WHILE && initDoExprent != null && firstDoExprent != null) {
 +      if (initDoExprent.type == Exprent.EXPRENT_ASSIGNMENT &&
-+          isInvoke(((AssignmentExprent)initDoExprent).getRight(), null, "iterator", "()Ljava/util/Iterator;")) {
++          isIteratorCall(((AssignmentExprent)initDoExprent).getRight())) {
 +
-+        if (!isInvoke(drillNots(stat.getConditionExprent()), "java/util/Iterator", "hasNext", "()Z") ||
++        if (!isHasNextCall(drillNots(stat.getConditionExprent())) ||
 +            firstDoExprent.type != Exprent.EXPRENT_ASSIGNMENT) {
 +          return false;
 +        }
 +
 +        AssignmentExprent ass = (AssignmentExprent)firstDoExprent;
-+        if (!isInvoke(ass.getRight(), "java/util/Iterator", "next", "()Ljava/lang/Object;") ||
-+            ass.getLeft().type != Exprent.EXPRENT_VAR) {
++        if (!isNextCall(ass.getRight()) || ass.getLeft().type != Exprent.EXPRENT_VAR) {
++          return false;
++        }
++
++        InvocationExprent next = (InvocationExprent)getUncast(ass.getRight());
++        InvocationExprent hnext = (InvocationExprent)getUncast(drillNots(stat.getConditionExprent()));
++        if (next.getInstance().type != Exprent.EXPRENT_VAR ||
++            hnext.getInstance().type != Exprent.EXPRENT_VAR ||
++            isVarReferenced((VarExprent)initDoExprent.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
 +          return false;
 +        }
 +
 +        InvocationExprent holder = (InvocationExprent)((AssignmentExprent)initDoExprent).getRight();
++
++        holder.getInstance().addBytecodeOffsets(initDoExprent.bytecode);
++        ass.getLeft().addBytecodeOffsets(firstDoExprent.bytecode);
++        if (stat.getIncExprent() != null) {
++          holder.getInstance().addBytecodeOffsets(stat.getIncExprent().bytecode);
++        }
++        if (stat.getInitExprent() != null) {
++          ass.getLeft().addBytecodeOffsets(stat.getInitExprent().bytecode);
++        }
++
 +        stat.setLooptype(DoStatement.LOOP_FOREACH);
 +        stat.setInitExprent(ass.getLeft());
 +        stat.setIncExprent(holder.getInstance());
@@ -148,24 +216,66 @@ index 71d3d7991287bcfc163fb0a5229e8f2595a20dc3..d994c26c65b45e18e54622865e3bc454
 +    }
 +    else if (stat.getLooptype() == DoStatement.LOOP_FOR) {
 +      if (isType(stat.getInitExprent(), Exprent.EXPRENT_ASSIGNMENT) &&
-+          isInvoke(((AssignmentExprent)stat.getInitExprent()).getRight(), null, "iterator", "()Ljava/util/Iterator;") &&
++          isIteratorCall(((AssignmentExprent)stat.getInitExprent()).getRight()) &&
 +          isType(stat.getConditionExprent(), Exprent.EXPRENT_FUNCTION)) {
 +
-+        if (!isInvoke(drillNots(stat.getConditionExprent()), "java/util/Iterator", "hasNext", "()Z") ||
++        Exprent exp = drillNots(stat.getConditionExprent());
++        if (!isHasNextCall(exp) ||
 +            !isType(stat.getIncExprent(), Exprent.EXPRENT_ASSIGNMENT)) {
 +          return false;
 +        }
 +
-+        AssignmentExprent ass = (AssignmentExprent)stat.getIncExprent();
-+        if (!isInvoke(ass.getRight(), "java/util/Iterator", "next", "()Ljava/lang/Object;") ||
-+            ass.getLeft().type != Exprent.EXPRENT_VAR) {
++        AssignmentExprent itr = (AssignmentExprent)stat.getInitExprent();
++        InvocationExprent hnext = (InvocationExprent)exp;
++        if (itr.getLeft().type != Exprent.EXPRENT_VAR || hnext.getInstance().type != Exprent.EXPRENT_VAR) {
 +          return false;
 +        }
 +
-+        InvocationExprent holder = (InvocationExprent)((AssignmentExprent)stat.getInitExprent()).getRight();
-+        stat.setLooptype(DoStatement.LOOP_FOREACH);
-+        stat.setInitExprent(ass.getLeft());
-+        stat.setIncExprent(holder.getInstance());
++        AssignmentExprent ass = (AssignmentExprent)stat.getIncExprent();
++        if (!isNextCall(ass.getRight()) || ass.getLeft().type != Exprent.EXPRENT_VAR) {
++
++          if (firstDoExprent == null || !isNextCall(firstDoExprent.getRight()) ||
++              firstDoExprent.getLeft().type != Exprent.EXPRENT_VAR) {
++            return false;
++          }
++
++          InvocationExprent next = (InvocationExprent)getUncast(firstDoExprent.getRight());
++          if (next.getInstance().type != Exprent.EXPRENT_VAR ||
++              isVarReferenced((VarExprent)itr.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
++            return false;
++          }
++
++          //Move the inc exprent back to the end of the body and remove the .next call
++          Statement last = getLastDirectData(stat.getFirst());
++          InvocationExprent holder = (InvocationExprent)getUncast(((AssignmentExprent)stat.getInitExprent()).getRight());
++
++          firstData.getExprents().remove(firstDoExprent);
++          last.getExprents().add(stat.getIncExprent());
++
++          firstDoExprent.getLeft().addBytecodeOffsets(stat.getInitExprent().bytecode);
++          firstDoExprent.getLeft().addBytecodeOffsets(stat.getIncExprent().bytecode);
++          firstDoExprent.getLeft().addBytecodeOffsets(firstDoExprent.bytecode);
++
++          stat.setLooptype(DoStatement.LOOP_FOREACH);
++          stat.setInitExprent(firstDoExprent.getLeft());
++          stat.setIncExprent(holder.getInstance());
++        }
++        else {
++          InvocationExprent next = (InvocationExprent)getUncast(ass.getRight());
++          if (next.getInstance().type != Exprent.EXPRENT_VAR ||
++              isVarReferenced((VarExprent)itr.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
++            return false;
++          }
++
++          InvocationExprent holder = (InvocationExprent)getUncast(((AssignmentExprent)stat.getInitExprent()).getRight());
++
++          holder.getInstance().addBytecodeOffsets(stat.getInitExprent().bytecode);
++          ass.getLeft().addBytecodeOffsets(stat.getIncExprent().bytecode);
++
++          stat.setLooptype(DoStatement.LOOP_FOREACH);
++          stat.setInitExprent(ass.getLeft());
++          stat.setIncExprent(holder.getInstance());
++        }
 +      }
 +      else if (initDoExprent != null && initDoExprent.getRight().type == Exprent.EXPRENT_FUNCTION) {
 +        if (firstDoExprent == null ||
@@ -196,32 +306,87 @@ index 71d3d7991287bcfc163fb0a5229e8f2595a20dc3..d994c26c65b45e18e54622865e3bc454
 +          return false;
 +        }
 +
++        funcRight.getLstOperands().get(0).addBytecodeOffsets(initDoExprent.bytecode);
++        funcRight.getLstOperands().get(0).addBytecodeOffsets(stat.getIncExprent().bytecode);
++        firstDoExprent.getLeft().addBytecodeOffsets(firstDoExprent.bytecode);
++        firstDoExprent.getLeft().addBytecodeOffsets(stat.getInitExprent().bytecode);
++
 +        stat.setLooptype(DoStatement.LOOP_FOREACH);
 +        stat.setInitExprent(firstDoExprent.getLeft());
 +        stat.setIncExprent(funcRight.getLstOperands().get(0));
 +        preData.getExprents().remove(initDoExprent);
 +        firstData.getExprents().remove(firstDoExprent);
 +
++
 +        if (initCopyExprent != null && initCopyExprent.getLeft().type == Exprent.EXPRENT_VAR) {
 +          VarExprent copy = (VarExprent)initCopyExprent.getLeft();
 +          if (copy.getIndex() == array.getIndex() && copy.getVersion() == array.getVersion()) {
 +            preData.getExprents().remove(initCopyExprent);
++            initCopyExprent.getRight().addBytecodeOffsets(initCopyExprent.bytecode);
++            initCopyExprent.getRight().addBytecodeOffsets(stat.getIncExprent().bytecode);
 +            stat.setIncExprent(initCopyExprent.getRight());
 +          }
 +        }
 +      }
 +    }
 +
-+    cleanEmptyStatements(stat, firstData);
++    //cleanEmptyStatements(stat, firstData); //TODO: Look into this and see what it does...
 +
      return true;
    }
  
++  private static boolean isVarReferenced(VarExprent var, Statement stat, VarExprent... whitelist) {
++    if (stat.getExprents() == null) {
++      for (Object obj : stat.getSequentialObjects()) {
++        if (obj instanceof Statement) {
++          if (isVarReferenced(var, (Statement)obj, whitelist)) {
++            return true;
++          }
++        }
++        else if (obj instanceof Exprent) {
++          if (isVarReferenced(var, (Exprent)obj, whitelist)) {
++            return true;
++          }
++        }
++      }
++    }
++    else {
++      for (Exprent exp : stat.getExprents()) {
++        if (isVarReferenced(var, exp, whitelist)) {
++          return true;
++        }
++      }
++    }
++    return false;
++  }
++
++  private static boolean isVarReferenced(VarExprent target, Exprent exp, VarExprent... whitelist) {
++    List<Exprent> lst = exp.getAllExprents(true);
++    lst.add(exp);
++    for (Exprent ex : lst) {
++      if (ex != target && ex.type == Exprent.EXPRENT_VAR) {
++        VarExprent var = (VarExprent)ex;
++        if (var.getIndex() == target.getIndex() && var.getVersion() == target.getVersion()) {
++          boolean allowed = false;
++          for (VarExprent white : whitelist) {
++            if (var == white) {
++              allowed = true;
++            }
++          }
++          if (!allowed) {
++            return true;
++          }
++        }
++      }
++    }
++    return false;
++  }
++
 +  private static boolean isType(Exprent exp, int type) { //This is just a helper macro, Wish java had real macros.
 +    return exp != null && exp.type == type;
 +  }
-+
 +  private static boolean isInvoke(Exprent exp, String cls, String method, String desc) {
++    exp = getUncast(exp);
 +    if (!isType(exp,  Exprent.EXPRENT_INVOCATION)) {
 +      return false;
 +    }
@@ -264,25 +429,65 @@ index 71d3d7991287bcfc163fb0a5229e8f2595a20dc3..d994c26c65b45e18e54622865e3bc454
    private static void removeLastEmptyStatement(DoStatement dostat, Statement stat) {
  
      if (stat == dostat.getFirst()) {
-@@ -418,4 +602,20 @@ public class MergeHelper {
+@@ -407,15 +726,52 @@ public class MergeHelper {
+       return stat;
      }
-     return null;
-   }
+ 
+-    switch (stat.type) {
+-      case Statement.TYPE_SEQUENCE:
+-        for (int i = stat.getStats().size() - 1; i >= 0; i--) {
+-          Statement tmp = getLastDirectData(stat.getStats().get(i));
+-          if (tmp == null || !tmp.getExprents().isEmpty()) {
+-            return tmp;
+-          }
+-        }
++    for (int i = stat.getStats().size() - 1; i >= 0; i--) {
++      Statement tmp = getLastDirectData(stat.getStats().get(i));
++      if (tmp == null || !tmp.getExprents().isEmpty()) {
++        return tmp;
++      }
++    }
++
++    return null;
++  }
 +
 +  private static Statement getFirstDirectData(Statement stat) {
 +    if (stat.getExprents() != null && !stat.getExprents().isEmpty()) {
 +      return stat;
 +    }
 +
-+    if (stat.type == Statement.TYPE_SEQUENCE) {
-+      for (Statement tmp : stat.getStats()) {
-+        Statement ret = getFirstDirectData(tmp);
-+        if (ret != null) {
-+          return ret;
-+        }
++    for (Statement tmp : stat.getStats()) {
++      Statement ret = getFirstDirectData(tmp);
++      if (ret != null) {
++        return ret;
++      }
+     }
+     return null;
+   }
++
++  private static Exprent getUncast(Exprent exp) {
++    if (exp.type == Exprent.EXPRENT_FUNCTION) {
++      FunctionExprent func = (FunctionExprent)exp;
++      if (func.getFuncType() == FunctionExprent.FUNCTION_CAST) {
++        return getUncast(func.getLstOperands().get(0));
 +      }
 +    }
-+    return null;
++    return exp;
++  }
++
++  private static boolean isIteratorCall(Exprent exp) {
++    return isInvoke(exp, null, "iterator",     "()Ljava/util/Iterator;"    ) ||
++           isInvoke(exp, null, "listIterator", "()Ljava/util/ListIterator;");
++  }
++
++  private static boolean isHasNextCall(Exprent exp) {
++    return isInvoke(exp, "java/util/Iterator",     "hasNext", "()Z") ||
++           isInvoke(exp, "java/util/ListIterator", "hasNext", "()Z");
++  }
++
++  private static boolean isNextCall(Exprent exp) {
++    return isInvoke(exp, "java/util/Iterator",     "next", "()Ljava/lang/Object;") ||
++           isInvoke(exp, "java/util/ListIterator", "next", "()Ljava/lang/Object;");
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
@@ -440,7 +645,7 @@ index 95cefcfeef4cbbd2c6e863ae31efd74ee48cd724..9ba8195cd90a7d7c78fca7fa28cf7370
      for (DirectNode node : dgraph.nodes) {
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
-index ef5ea764d6e5d7d6372c21593613ba2b1f98d108..8359284281d3c3e02c15ed407ab4dfacf9eae478 100644
+index ef5ea764d6e5d7d6372c21593613ba2b1f98d108..e7220368e6116aec755c46f25e397bf6f8f76443 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
 @@ -19,6 +19,7 @@ import org.jetbrains.java.decompiler.main.TextBuffer;
@@ -473,13 +678,14 @@ index ef5ea764d6e5d7d6372c21593613ba2b1f98d108..8359284281d3c3e02c15ed407ab4dfac
      }
  
      return buf;
-@@ -151,6 +160,9 @@ public class DoStatement extends Statement {
+@@ -151,6 +160,10 @@ public class DoStatement extends Statement {
          }
        case LOOP_WHILE:
          lst.add(getConditionExprent());
 +        break;
 +      case LOOP_FOREACH:
 +        lst.add(getInitExprent());
++        lst.add(getIncExprent());
      }
  
      lst.add(first);
diff --git a/FernFlower-Patches/0013-Fixed-last-test-all-tests-pass.patch b/FernFlower-Patches/0013-Fixed-last-test-all-tests-pass.patch
deleted file mode 100644
index 5f1f918..0000000
--- a/FernFlower-Patches/0013-Fixed-last-test-all-tests-pass.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Sun, 2 Aug 2015 21:20:47 -0700
-Subject: [PATCH] Fixed last test, all tests pass.
-
-
-diff --git a/testData/results/TestClassSimpleBytecodeMapping.dec b/testData/results/TestClassSimpleBytecodeMapping.dec
-index a48375ae4a8f7bbe75a5db9b94ff1b023043faa7..1a2532f0b736a3d1a2db4f7ba3645e48e419189f 100644
---- a/testData/results/TestClassSimpleBytecodeMapping.dec
-+++ b/testData/results/TestClassSimpleBytecodeMapping.dec
-@@ -33,17 +33,17 @@ public class TestClassSimpleBytecodeMapping {
-       var1.run();// 49
-    }// 50
- 
--   public class InnerClass2 {
--      public void print() {
--         System.out.println("Inner2");// 54
--      }// 55
--   }
--
-    public class InnerClass {
-       public void print() {
-          System.out.println("Inner");// 44
-       }// 45
-    }
-+
-+   public class InnerClass2 {
-+      public void print() {
-+         System.out.println("Inner2");// 54
-+      }// 55
-+   }
- }
- 
- class 'pkg/TestClassSimpleBytecodeMapping$1' {
-@@ -96,7 +96,7 @@ class 'pkg/TestClassSimpleBytecodeMapping' {
-    }
- }
- 
--class 'pkg/TestClassSimpleBytecodeMapping$InnerClass2' {
-+class 'pkg/TestClassSimpleBytecodeMapping$InnerClass' {
-    method 'print ()V' {
-       0      37
-       3      37
-@@ -105,7 +105,7 @@ class 'pkg/TestClassSimpleBytecodeMapping$InnerClass2' {
-    }
- }
- 
--class 'pkg/TestClassSimpleBytecodeMapping$InnerClass' {
-+class 'pkg/TestClassSimpleBytecodeMapping$InnerClass2' {
-    method 'print ()V' {
-       0      43
-       3      43
-@@ -130,11 +130,11 @@ Lines mapping:
- 36 <-> 25
- 38 <-> 27
- 40 <-> 30
--44 <-> 44
--45 <-> 45
-+44 <-> 38
-+45 <-> 39
- 49 <-> 33
- 50 <-> 34
--54 <-> 38
--55 <-> 39
-+54 <-> 44
-+55 <-> 45
- Not mapped:
- 39
diff --git a/FernFlower-Patches/0033-Added-a-test-for-variables-that-seem-to-come-into-sc.patch b/FernFlower-Patches/0014-Added-a-test-for-variables-that-seem-to-come-into-sc.patch
similarity index 100%
rename from FernFlower-Patches/0033-Added-a-test-for-variables-that-seem-to-come-into-sc.patch
rename to FernFlower-Patches/0014-Added-a-test-for-variables-that-seem-to-come-into-sc.patch
diff --git a/FernFlower-Patches/0034-Hook-in-LVT-to-VarExprent-and-print-generic-types.patch b/FernFlower-Patches/0015-Hook-in-LVT-to-VarExprent-and-print-generic-types.patch
similarity index 100%
rename from FernFlower-Patches/0034-Hook-in-LVT-to-VarExprent-and-print-generic-types.patch
rename to FernFlower-Patches/0015-Hook-in-LVT-to-VarExprent-and-print-generic-types.patch
diff --git a/FernFlower-Patches/0036-Add-step-to-VarDefintionHelper-that-splits-variables.patch b/FernFlower-Patches/0016-Add-step-to-VarDefintionHelper-that-splits-variables.patch
similarity index 99%
rename from FernFlower-Patches/0036-Add-step-to-VarDefintionHelper-that-splits-variables.patch
rename to FernFlower-Patches/0016-Add-step-to-VarDefintionHelper-that-splits-variables.patch
index fd00d3b..bf686a0 100644
--- a/FernFlower-Patches/0036-Add-step-to-VarDefintionHelper-that-splits-variables.patch
+++ b/FernFlower-Patches/0016-Add-step-to-VarDefintionHelper-that-splits-variables.patch
@@ -143,7 +143,7 @@ index 270def3a9ba906e3cce7df1c8feed1b9d9fd6b51..cd56bacb1d0d337f3d33b0eb7b87779c
  }
 \ No newline at end of file
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 53201ede8047b09f76fd8ebfee3eeb9d2149327c..1e1a4a7987545d00460cd7e7e17c3bcde6a75df1 100644
+index 53201ede8047b09f76fd8ebfee3eeb9d2149327c..d24813f0d9962ed8b0d6efacd251c175721e33d0 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -17,7 +17,9 @@ package org.jetbrains.java.decompiler.modules.decompiler.vars;
@@ -420,7 +420,7 @@ index 53201ede8047b09f76fd8ebfee3eeb9d2149327c..1e1a4a7987545d00460cd7e7e17c3bcd
 +  }
 +
 +  private void setupLVTs(Statement stat) {
-+    if (stat == null || varproc.getLVT() != null) {
++    if (stat == null || varproc.getLVT() == null) {
 +      return;
 +    }
 +
diff --git a/FernFlower-Patches/0037-Lex-s-tests.patch b/FernFlower-Patches/0017-Lex-s-tests.patch
similarity index 100%
rename from FernFlower-Patches/0037-Lex-s-tests.patch
rename to FernFlower-Patches/0017-Lex-s-tests.patch
diff --git a/FernFlower-Patches/0017-Sort-local-variables-and-variable-definitions.-Again.patch b/FernFlower-Patches/0017-Sort-local-variables-and-variable-definitions.-Again.patch
deleted file mode 100644
index 22eb2ae..0000000
--- a/FernFlower-Patches/0017-Sort-local-variables-and-variable-definitions.-Again.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Mon, 3 Aug 2015 17:26:00 -0700
-Subject: [PATCH] Sort local variables and variable definitions. Again,
- different JVMs sort hash sets differently causing different variable names.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-index 9296bb3f6007bda9647e2f0d919cdfd311567222..205b1876758155132600148f61f641b64e42369c 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-@@ -833,6 +833,7 @@ public class ExprProcessor implements CodeConstants {
-     }
- 
-     TextBuffer buf = new TextBuffer();
-+    lst = Exprent.sortIndexed(lst);
- 
-     for (Exprent expr : lst) {
-       TextBuffer content = expr.toJava(indent, tracer);
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-index fbd146eca6b7efc4d56e96121a7c6d91748d077c..5f2cb56a85b9ac61141de1c17b457e5847eb8fff 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-@@ -17,6 +17,8 @@ package org.jetbrains.java.decompiler.modules.decompiler.exps;
- 
- import java.util.ArrayList;
- import java.util.Collection;
-+import java.util.Collections;
-+import java.util.Comparator;
- import java.util.HashSet;
- import java.util.List;
- import java.util.Map.Entry;
-@@ -140,23 +142,23 @@ public class Exprent implements IMatchable {
-       }
-     }
-   }
--  
-+
-   // *****************************************************************************
-   // IMatchable implementation
-   // *****************************************************************************
--  
-+
-   public IMatchable findObject(MatchNode matchNode, int index) {
--    
-+
-     if(matchNode.getType() != MatchNode.MATCHNODE_EXPRENT) {
-       return null;
-     }
- 
-     List<Exprent> lstAllExprents = getAllExprents();
--    
-+
-     if(lstAllExprents == null || lstAllExprents.isEmpty()) {
-       return null;
-     }
--    
-+
-     String position = (String)matchNode.getRuleValue(MatchProperties.EXPRENT_POSITION);
-     if(position != null) {
-       if(position.matches("-?\\d+")) {
-@@ -170,11 +172,11 @@ public class Exprent implements IMatchable {
-   }
- 
-   public boolean match(MatchNode matchNode, MatchEngine engine) {
--    
-+
-     if(matchNode.getType() != MatchNode.MATCHNODE_EXPRENT) {
-       return false;
-     }
--    
-+
-     for(Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
-       switch(rule.getKey()) {
-       case EXPRENT_TYPE:
-@@ -188,10 +190,41 @@ public class Exprent implements IMatchable {
-         }
-         break;
-       }
--      
-+
-     }
--    
-+
-     return true;
-   }
--  
-+
-+  public static List<Exprent> sortIndexed(List<Exprent> lst) {
-+    List<Exprent> ret = new ArrayList<Exprent>();
-+    List<VarExprent> defs = new ArrayList<VarExprent>();
-+
-+    Comparator<VarExprent> comp = new Comparator<VarExprent>() {
-+      public int compare(VarExprent o1, VarExprent o2) {
-+        return o1.getIndex() - o2.getIndex();
-+      }
-+    };
-+
-+    for (Exprent exp : lst) {
-+      boolean isDef = exp instanceof VarExprent && ((VarExprent)exp).isDefinition();
-+      if (!isDef) {
-+        if (defs.size() > 0) {
-+          Collections.sort(defs, comp);
-+          ret.addAll(defs);
-+          defs.clear();
-+        }
-+        ret.add(exp);
-+      }
-+      else {
-+        defs.add((VarExprent)exp);
-+      }
-+    }
-+
-+    if (defs.size() > 0) {
-+      Collections.sort(defs, comp);
-+      ret.addAll(defs);
-+    }
-+    return ret;
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-index 31f0f86d4423ac537faf31b7f16833f263801b23..4751052a5468ffc469d7166bce648d5b658e040d 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-@@ -235,8 +235,15 @@ public class VarVersionsProcessor {
-     Map<Integer, Integer> mapOriginalVarIndices = new HashMap<Integer, Integer>();
- 
-     // map var-version pairs on new var indexes
--    Set<VarVersionPair> set = new HashSet<VarVersionPair>(mapExprentMinTypes.keySet());
--    for (VarVersionPair pair : set) {
-+    List<VarVersionPair> lst = new ArrayList<VarVersionPair>(mapExprentMinTypes.keySet());
-+    Collections.sort(lst, new Comparator<VarVersionPair>() {
-+      public int compare(VarVersionPair o1, VarVersionPair o2) {
-+        if (o1.var != o2.var) return o1.var - o2.var;
-+        return o1.version - o2.version;
-+      }
-+    });
-+
-+    for (VarVersionPair pair : lst) {
- 
-       if (pair.version >= 0) {
-         int newIndex = pair.version == 1 ? pair.var : counters.getCounterAndIncrement(CounterContainer.VAR_COUNTER);
diff --git a/FernFlower-Patches/0039-More-tweaks.-Closer.patch b/FernFlower-Patches/0018-More-tweaks.-Closer.patch
similarity index 100%
rename from FernFlower-Patches/0039-More-tweaks.-Closer.patch
rename to FernFlower-Patches/0018-More-tweaks.-Closer.patch
diff --git a/FernFlower-Patches/0019-Change-LVT-indexing-to-VarVersionPair.patch b/FernFlower-Patches/0019-Change-LVT-indexing-to-VarVersionPair.patch
deleted file mode 100644
index 12bed9a..0000000
--- a/FernFlower-Patches/0019-Change-LVT-indexing-to-VarVersionPair.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Tue, 4 Aug 2015 21:50:19 -0700
-Subject: [PATCH] Change LVT indexing to VarVersionPair
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-index ce81474ef8291e0a4fbf59bed8b0902de1731921..fbd3455dae324f21854b6374448c0c50f0c1e1ce 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-@@ -44,7 +44,7 @@ public class VarProcessor {
-     new VarDefinitionHelper(root, mt, this).setVarDefinitions();
-   }
- 
--  public void setDebugVarNames(Map<Integer, String> mapDebugVarNames) {
-+  public void setDebugVarNames(Map<VarVersionPair, String> mapDebugVarNames) {
-     if (varVersions == null) {
-       return;
-     }
-@@ -65,8 +65,11 @@ public class VarProcessor {
-       String name = mapVarNames.get(pair);
- 
-       Integer index = mapOriginalVarIndices.get(pair.var);
--      if (index != null && mapDebugVarNames.containsKey(index)) {
--        name = mapDebugVarNames.get(index);
-+      if (index != null) {
-+        VarVersionPair key = new VarVersionPair(index.intValue(), pair.version);
-+        if (mapDebugVarNames.containsKey(key)) {
-+          name = mapDebugVarNames.get(key);
-+        }
-       }
- 
-       Integer counter = mapNames.get(name);
-diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-index 04f534ed5482d8778826437dafd6979085a3fb65..5f55537fc80d50a1b22919165eb117f51f0b86b8 100644
---- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-@@ -15,12 +15,14 @@
-  */
- package org.jetbrains.java.decompiler.struct.attr;
- 
-+import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
- import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
- import org.jetbrains.java.decompiler.util.DataInputFullStream;
- 
- import java.io.IOException;
- import java.util.ArrayList;
- import java.util.Collections;
-+import java.util.Comparator;
- import java.util.HashMap;
- import java.util.HashSet;
- import java.util.List;
-@@ -89,7 +91,17 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
-         return 0;
-     }
-   }
--  private Map<Integer, String> mapVarNames = Collections.emptyMap();
-+
-+  private static Comparator<LVTVariable> comp = new Comparator<LVTVariable>() {
-+    @Override
-+    public int compare(LVTVariable o1, LVTVariable o2)
-+    {
-+      if (o1.index != o2.index) return o1.index - o2.index;
-+      if (o1.start != o2.start) return o1.start - o2.start;
-+      return o1.end - o2.end;
-+    }
-+  };
-+  private Map<VarVersionPair, String> mapVarNames = Collections.emptyMap();
- 
-   private Map<Integer, Set<LVTVariable>> endpoints = Collections.emptyMap();
-   private ArrayList<LVTVariable> allLVT;
-@@ -101,7 +113,7 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
-     int len = data.readUnsignedShort();
-     boolean isLVTT = this.getName().equals(ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
-     if (len > 0) {
--      mapVarNames = new HashMap<Integer, String>(len);
-+      mapVarNames = new HashMap<VarVersionPair, String>(len);
-       endpoints = new HashMap<Integer,Set<LVTVariable>>(len);
-       allLVT = new ArrayList<LVTVariable>(len);
-       for (int i = 0; i < len; i++) {
-@@ -111,10 +123,11 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
-         int descIndex = data.readUnsignedShort(); // either descriptor or signature
-         int varIndex = data.readUnsignedShort();
-         LVTVariable v = new LVTVariable(pool.getPrimitiveConstant(nameIndex).getString(), pool.getPrimitiveConstant(descIndex).getString(),start,start+vlen,varIndex,isLVTT);
--        mapVarNames.put(varIndex, pool.getPrimitiveConstant(nameIndex).getString());
-         allLVT.add(v);
-         v.addTo(endpoints);
-       }
-+      Collections.sort(allLVT, comp);
-+      buildNameMap();
-     }
-     else {
-       mapVarNames = Collections.emptyMap();
-@@ -124,17 +137,33 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
-   public void addLocalVariableTable(StructLocalVariableTableAttribute attr) {
-     mapVarNames.putAll(attr.getMapVarNames());
-     for (LVTVariable other : attr.allLVT) {
--        int idx = allLVT.indexOf(other);
--        if (idx < 0) {
--            allLVT.add(other);
--        } else {
--            LVTVariable mine = allLVT.get(idx);
--            mine.merge(other);
--        }
-+      int idx = allLVT.indexOf(other);
-+      if (idx < 0) {
-+        allLVT.add(other);
-+      }
-+      else {
-+        LVTVariable mine = allLVT.get(idx);
-+        mine.merge(other);
-+      }
-+    }
-+    Collections.sort(allLVT, comp);
-+  }
-+
-+  private void buildNameMap() {
-+    Map<Integer, Integer> versions = new HashMap<Integer, Integer>();
-+    mapVarNames.clear();
-+    for (LVTVariable lvt : allLVT) {
-+      Integer idx = versions.get(lvt.index);
-+      if (idx == null)
-+        idx = 0;
-+      else
-+        idx++;
-+      versions.put(lvt.index, idx);
-+      mapVarNames.put(new VarVersionPair(lvt.index, idx.intValue()), lvt.name);
-     }
-   }
- 
--  public Map<Integer, String> getMapVarNames() {
-+  public Map<VarVersionPair, String> getMapVarNames() {
-     return mapVarNames;
-   }
- }
diff --git a/FernFlower-Patches/0040-More-tweaks-it-passes-the-TestLVT-tests.patch b/FernFlower-Patches/0019-More-tweaks-it-passes-the-TestLVT-tests.patch
similarity index 100%
rename from FernFlower-Patches/0040-More-tweaks-it-passes-the-TestLVT-tests.patch
rename to FernFlower-Patches/0019-More-tweaks-it-passes-the-TestLVT-tests.patch
diff --git a/FernFlower-Patches/0041-Another-fix-from-lex-merges-RHS-and-LHS-of-exprents.patch b/FernFlower-Patches/0020-Another-fix-from-lex-merges-RHS-and-LHS-of-exprents.patch
similarity index 100%
rename from FernFlower-Patches/0041-Another-fix-from-lex-merges-RHS-and-LHS-of-exprents.patch
rename to FernFlower-Patches/0020-Another-fix-from-lex-merges-RHS-and-LHS-of-exprents.patch
diff --git a/FernFlower-Patches/0021-Seperate-the-LVT-data-from-the-Struct-for-easier-abi.patch b/FernFlower-Patches/0021-Seperate-the-LVT-data-from-the-Struct-for-easier-abi.patch
deleted file mode 100644
index 6a6d369..0000000
--- a/FernFlower-Patches/0021-Seperate-the-LVT-data-from-the-Struct-for-easier-abi.patch
+++ /dev/null
@@ -1,325 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Thu, 6 Aug 2015 13:52:24 -0700
-Subject: [PATCH] Seperate the LVT data from the Struct for easier ability to
- pass around.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0533981f9da54787c55fd9b54e1f1d555bdbed12
---- /dev/null
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
-@@ -0,0 +1,70 @@
-+package org.jetbrains.java.decompiler.modules.decompiler.vars;
-+
-+import java.util.Comparator;
-+import java.util.HashSet;
-+import java.util.Map;
-+import java.util.Set;
-+
-+public class LVTVariable implements Comparable<LVTVariable> {
-+  public static final Comparator<LVTVariable> INDEX_SORTER = new Comparator<LVTVariable>() {
-+    @Override
-+    public int compare(LVTVariable o1, LVTVariable o2) {
-+      if (o1.index != o2.index) return o1.index - o2.index;
-+      if (o1.start != o2.start) return o1.start - o2.start;
-+      return o1.end - o2.end;
-+    }
-+  };
-+
-+  public final String name;
-+  public final int start;
-+  public final int end;
-+  public final int index;
-+  private String desc;
-+  private String sig;
-+  private boolean isLVTT;
-+
-+  public LVTVariable(String name, String desc, int start, int end, int index, boolean isLVTT) {
-+    this.name = name;
-+    this.desc = desc;
-+    this.start = start;
-+    this.end = end;
-+    this.index = index;
-+    this.isLVTT = isLVTT;
-+  }
-+
-+  void merge(LVTVariable other) {
-+    if (other.isLVTT && this.sig == null) {
-+      this.sig = other.desc;
-+    }
-+  }
-+
-+  @Override
-+  public boolean equals(Object obj) {
-+    if (!(obj instanceof LVTVariable))
-+      return false;
-+    return ((LVTVariable) obj).index == index && ((LVTVariable) obj).start == start;
-+  }
-+
-+  @Override
-+  public int hashCode() {
-+    return index * 31 + start;
-+  }
-+
-+  public void addTo(Map<Integer, Set<LVTVariable>> startpoints) {
-+    Set<LVTVariable> starts = startpoints.get(this.start);
-+    if (starts == null) {
-+      starts = new HashSet<LVTVariable>();
-+      startpoints.put(this.start, starts);
-+    }
-+    starts.add(this);
-+  }
-+
-+  @Override
-+  public int compareTo(LVTVariable o) {
-+    if (o.start > start) return -1;
-+    if (o.start < start) return 1;
-+    if (o.index > index) return -1;
-+    if (o.index < index) return 1;
-+    return 0;
-+  }
-+}
-\ No newline at end of file
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..75f144dccacee0a214fad16f9cde138ec64de256
---- /dev/null
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-@@ -0,0 +1,72 @@
-+package org.jetbrains.java.decompiler.modules.decompiler.vars;
-+
-+import java.util.ArrayList;
-+import java.util.HashMap;
-+import java.util.List;
-+import java.util.Map;
-+import java.util.Set;
-+
-+public class LocalVariableTable {
-+  private Map<Integer, Set<LVTVariable>> startpoints;
-+  private ArrayList<LVTVariable> allLVT;
-+  private Map<VarVersionPair, String> mapVarNames;
-+
-+  public LocalVariableTable(int len) {
-+    startpoints = new HashMap<Integer,Set<LVTVariable>>(len);
-+    allLVT = new ArrayList<LVTVariable>(len);
-+  }
-+
-+  public void addVariable(LVTVariable v) {
-+    allLVT.add(v);
-+    v.addTo(startpoints);
-+  }
-+
-+  public void mergeLVTs(LocalVariableTable otherLVT) {
-+   for (LVTVariable other : otherLVT.allLVT) {
-+      int idx = allLVT.indexOf(other);
-+      if (idx < 0) {
-+        allLVT.add(other);
-+      }
-+      else {
-+        LVTVariable mine = allLVT.get(idx);
-+        mine.merge(other);
-+      }
-+    }
-+    mapVarNames = null; // Invalidate the cache and rebuild it.
-+  }
-+
-+  public LVTVariable find(Integer index, List<Integer> offsets) {
-+    for (Integer offset : offsets) {
-+      Set<LVTVariable> lvs = startpoints.get(offset);
-+      if (lvs == null || lvs.isEmpty())
-+        continue;
-+      int idx = index.intValue();
-+
-+      for (LVTVariable lv : lvs) {
-+        if (lv.index == idx)
-+          return lv;
-+      }
-+    }
-+    return null;
-+  }
-+
-+  public Map<VarVersionPair, String> getMapVarNames() {
-+    if (mapVarNames == null)
-+      buildNameMap();
-+    return mapVarNames;
-+  }
-+
-+  private void buildNameMap() {
-+    Map<Integer, Integer> versions = new HashMap<Integer, Integer>();
-+    mapVarNames = new HashMap<VarVersionPair, String>();
-+    for (LVTVariable lvt : allLVT) {
-+      Integer idx = versions.get(lvt.index);
-+      if (idx == null)
-+        idx = 0;
-+      else
-+        idx++;
-+      versions.put(lvt.index, idx);
-+      mapVarNames.put(new VarVersionPair(lvt.index, idx.intValue()), lvt.name);
-+    }
-+  }
-+}
-\ No newline at end of file
-diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-index 5f55537fc80d50a1b22919165eb117f51f0b86b8..44557858b5cf5ef1a6b05c79c34bb41f6ae6e5eb 100644
---- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-@@ -15,20 +15,15 @@
-  */
- package org.jetbrains.java.decompiler.struct.attr;
- 
-+import org.jetbrains.java.decompiler.modules.decompiler.vars.LVTVariable;
-+import org.jetbrains.java.decompiler.modules.decompiler.vars.LocalVariableTable;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
- import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
- import org.jetbrains.java.decompiler.util.DataInputFullStream;
- 
- import java.io.IOException;
--import java.util.ArrayList;
- import java.util.Collections;
--import java.util.Comparator;
--import java.util.HashMap;
--import java.util.HashSet;
--import java.util.List;
- import java.util.Map;
--import java.util.Map.Entry;
--import java.util.Set;
- 
- /*
-   u2 local_variable_table_length;
-@@ -42,69 +37,8 @@ import java.util.Set;
- */
- public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
- 
--  public static class LVTVariable implements Comparable<LVTVariable> {
--      public final String name;
--      public final int start;
--      public final int end;
--      public final int index;
--      private String desc;
--      private String sig;
--      private boolean isLVTT;
--      LVTVariable(String name, String desc, int start, int end, int index, boolean isLVTT) {
--          this.name = name;
--          this.desc = desc;
--          this.start = start;
--          this.end = end;
--          this.index = index;
--          this.isLVTT = isLVTT;
--      }
--
--    void merge(LVTVariable other) {
--        if (other.isLVTT && this.sig == null) {
--            this.sig = other.desc;
--        }
--    }
--    @Override
--    public boolean equals(Object obj) {
--        return ((LVTVariable) obj).index == index && ((LVTVariable) obj).end == end;
--    }
--    @Override
--    public int hashCode() {
--        return index * 31 + end;
--    }
--
--    public void addTo(Map<Integer, Set<LVTVariable>> endpoints) {
--        Set<LVTVariable> ends = endpoints.get(this.end);
--        if (ends == null) {
--            ends = new HashSet<LVTVariable>();
--            endpoints.put(this.end, ends);
--        }
--        ends.add(this);
--    }
--
--    @Override
--    public int compareTo(LVTVariable o) {
--        if (o.end > end) return -1;
--        if (o.end < end) return 1;
--        if (o.index > index) return -1;
--        if (o.index < index) return 1;
--        return 0;
--    }
--  }
--
--  private static Comparator<LVTVariable> comp = new Comparator<LVTVariable>() {
--    @Override
--    public int compare(LVTVariable o1, LVTVariable o2)
--    {
--      if (o1.index != o2.index) return o1.index - o2.index;
--      if (o1.start != o2.start) return o1.start - o2.start;
--      return o1.end - o2.end;
--    }
--  };
--  private Map<VarVersionPair, String> mapVarNames = Collections.emptyMap();
--
--  private Map<Integer, Set<LVTVariable>> endpoints = Collections.emptyMap();
--  private ArrayList<LVTVariable> allLVT;
-+  private Map<VarVersionPair, String> EMPTY_LVT = Collections.emptyMap();
-+  private LocalVariableTable lvt;
- 
-   @Override
-   public void initContent(ConstantPool pool) throws IOException {
-@@ -113,9 +47,7 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
-     int len = data.readUnsignedShort();
-     boolean isLVTT = this.getName().equals(ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
-     if (len > 0) {
--      mapVarNames = new HashMap<VarVersionPair, String>(len);
--      endpoints = new HashMap<Integer,Set<LVTVariable>>(len);
--      allLVT = new ArrayList<LVTVariable>(len);
-+      lvt = new LocalVariableTable(len);
-       for (int i = 0; i < len; i++) {
-         int start = data.readUnsignedShort();
-         int vlen = data.readUnsignedShort();
-@@ -123,47 +55,17 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
-         int descIndex = data.readUnsignedShort(); // either descriptor or signature
-         int varIndex = data.readUnsignedShort();
-         LVTVariable v = new LVTVariable(pool.getPrimitiveConstant(nameIndex).getString(), pool.getPrimitiveConstant(descIndex).getString(),start,start+vlen,varIndex,isLVTT);
--        allLVT.add(v);
--        v.addTo(endpoints);
-+        lvt.addVariable(v);
-       }
--      Collections.sort(allLVT, comp);
--      buildNameMap();
--    }
--    else {
--      mapVarNames = Collections.emptyMap();
-     }
-   }
- 
-   public void addLocalVariableTable(StructLocalVariableTableAttribute attr) {
--    mapVarNames.putAll(attr.getMapVarNames());
--    for (LVTVariable other : attr.allLVT) {
--      int idx = allLVT.indexOf(other);
--      if (idx < 0) {
--        allLVT.add(other);
--      }
--      else {
--        LVTVariable mine = allLVT.get(idx);
--        mine.merge(other);
--      }
--    }
--    Collections.sort(allLVT, comp);
--  }
--
--  private void buildNameMap() {
--    Map<Integer, Integer> versions = new HashMap<Integer, Integer>();
--    mapVarNames.clear();
--    for (LVTVariable lvt : allLVT) {
--      Integer idx = versions.get(lvt.index);
--      if (idx == null)
--        idx = 0;
--      else
--        idx++;
--      versions.put(lvt.index, idx);
--      mapVarNames.put(new VarVersionPair(lvt.index, idx.intValue()), lvt.name);
--    }
-+    lvt.mergeLVTs(attr.lvt);
-+    attr.lvt = lvt;
-   }
- 
-   public Map<VarVersionPair, String> getMapVarNames() {
--    return mapVarNames;
-+    return lvt == null ? EMPTY_LVT : lvt.getMapVarNames();
-   }
- }
diff --git a/FernFlower-Patches/0042-need-to-match-both-start-and-end-to-avoid-weirdness-.patch b/FernFlower-Patches/0021-need-to-match-both-start-and-end-to-avoid-weirdness-.patch
similarity index 100%
rename from FernFlower-Patches/0042-need-to-match-both-start-and-end-to-avoid-weirdness-.patch
rename to FernFlower-Patches/0021-need-to-match-both-start-and-end-to-avoid-weirdness-.patch
diff --git a/FernFlower-Patches/0022-Aded-debug-printer-to-MethodProcessorRunnable-for-th.patch b/FernFlower-Patches/0022-Aded-debug-printer-to-MethodProcessorRunnable-for-th.patch
deleted file mode 100644
index 55dc412..0000000
--- a/FernFlower-Patches/0022-Aded-debug-printer-to-MethodProcessorRunnable-for-th.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Thu, 6 Aug 2015 17:01:25 -0700
-Subject: [PATCH] Aded debug printer to MethodProcessorRunnable for the method
- outline.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index 1c90fb6fc41b20e8b295201cfdb69abb63463bd0..dc6f2f0e61563f8132d99b70d3d81278f224da04 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-@@ -17,6 +17,7 @@ package org.jetbrains.java.decompiler.main.rels;
- 
- import org.jetbrains.java.decompiler.code.CodeConstants;
- import org.jetbrains.java.decompiler.code.InstructionSequence;
-+import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
- import org.jetbrains.java.decompiler.code.cfg.ControlFlowGraph;
- import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
-@@ -25,12 +26,16 @@ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
- import org.jetbrains.java.decompiler.modules.code.DeadCodeHelper;
- import org.jetbrains.java.decompiler.modules.decompiler.*;
- import org.jetbrains.java.decompiler.modules.decompiler.deobfuscator.ExceptionDeobfuscator;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.DummyExitStatement;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
- import org.jetbrains.java.decompiler.struct.StructClass;
- import org.jetbrains.java.decompiler.struct.StructMethod;
- 
- import java.io.IOException;
-+import java.util.BitSet;
- 
- public class MethodProcessorRunnable implements Runnable {
- 
-@@ -138,7 +143,7 @@ public class MethodProcessorRunnable implements Runnable {
-     proc.processStatement(root, cl);
- 
-     SequenceHelper.condenseSequences(root);
--    
-+
-     while (true) {
-       StackVarsProcessor stackProc = new StackVarsProcessor();
-       stackProc.simplifyStackVars(root, mt, cl);
-@@ -199,6 +204,8 @@ public class MethodProcessorRunnable implements Runnable {
- 
-     varProc.setVarDefinitions(root);
- 
-+    printMethod(root);
-+
-     // must be the last invocation, because it makes the statement structure inconsistent
-     // FIXME: new edge type needed
-     LabelHelper.replaceContinueWithBreak(root);
-@@ -217,4 +224,118 @@ public class MethodProcessorRunnable implements Runnable {
-   public boolean isFinished() {
-     return finished;
-   }
-+
-+  private static void printMethod(RootStatement root) {
-+    System.out.println("{");
-+
-+    for (Object obj : root.getSequentialObjects()) {
-+      if (obj instanceof Statement) {
-+        printStatement((Statement)obj, "  ");
-+      } else {
-+        System.out.println("  " + obj.getClass().getSimpleName());
-+      }
-+    }
-+    printStatement(root.getDummyExit(), "  ");
-+    System.out.println("}");
-+  }
-+
-+  private static void getOffset(Statement st, BitSet values) {
-+    if (st instanceof DummyExitStatement && ((DummyExitStatement)st).bytecode != null)
-+      values.or(((DummyExitStatement)st).bytecode);
-+    if (st.getExprents() != null) {
-+      for (Exprent e : st.getExprents()) {
-+        e.getBytecodeRange(values);
-+      }
-+    } else {
-+      for (Object obj : st.getSequentialObjects()) {
-+        if (obj instanceof Statement) {
-+          getOffset((Statement)obj, values);
-+        } else if (obj instanceof Exprent) {
-+          ((Exprent)obj).getBytecodeRange(values);
-+        } else {
-+          System.out.println("WTF?" + obj.getClass());
-+        }
-+      }
-+    }
-+  }
-+
-+  private static void printStatement(Statement statement, String indent) {
-+    BitSet values = new BitSet();
-+    getOffset(statement, values);
-+    int start = values.nextSetBit(0);
-+    int end = values.length()-1;
-+
-+    System.out.println(indent + statement.type + ": (" + start + ", " + end + ") " + statement.getClass().getSimpleName());
-+
-+    if (statement.getExprents() != null) {
-+      for(Exprent exp : statement.getExprents()) {
-+        System.out.println(indent + "  " + exp.getClass().getSimpleName());
-+      }
-+    }
-+    /*
-+      for (Object obj : stat.getSequentialObjects()) {
-+        if (obj instanceof Statement) {
-+          Statement st = (Statement)obj;
-+          childVars.addAll(initStatement(st));
-+
-+          if (st.type == DoStatement.TYPE_DO) {
-+            DoStatement dost = (DoStatement)st;
-+            if (dost.getLooptype() != DoStatement.LOOP_FOR &&
-+                dost.getLooptype() != DoStatement.LOOP_DO) {
-+              currVars.add(dost.getConditionExprent());
-+            }
-+          }
-+          else if (st.type == DoStatement.TYPE_CATCHALL) {
-+            CatchAllStatement fin = (CatchAllStatement)st;
-+            if (fin.isFinally() && fin.getMonitor() != null) {
-+              currVars.add(fin.getMonitor());
-+            }
-+          }
-+        }
-+        else if (obj instanceof Exprent) {
-+          currVars.add((Exprent)obj);
-+        }
-+      }
-+
-+      // children statements
-+      for (Integer index : childVars) {
-+        Integer count = mapCount.get(index);
-+        if (count == null) {
-+          count = new Integer(0);
-+        }
-+        mapCount.put(index, new Integer(count.intValue() + 1));
-+      }
-+
-+      condlst = getAllVars(currVars);
-+    }
-+    else {
-+      condlst = getAllVars(stat.getExprents());
-+    }
-+
-+    // this statement
-+    for (VarExprent var : condlst) {
-+      mapCount.put(new Integer(var.getIndex()), new Integer(2));
-+    }
-+
-+
-+    HashSet<Integer> set = new HashSet<Integer>(mapCount.keySet());
-+
-+    // put all variables defined in this statement into the set
-+    for (Entry<Integer, Integer> en : mapCount.entrySet()) {
-+      if (en.getValue().intValue() > 1) {
-+        mapVarDefStatements.put(en.getKey(), stat);
-+      }
-+    }
-+
-+    mapStatementVars.put(stat.id, set);
-+*/
-+    indent += "  ";
-+    for (Object obj : statement.getSequentialObjects()) {
-+      if (obj instanceof Statement) {
-+        printStatement((Statement)obj, indent);
-+      } else {
-+        System.out.println(indent + obj.getClass().getSimpleName());
-+      }
-+    }
-+  }
- }
diff --git a/FernFlower-Patches/0043-Better-remapping-of-assignment-merges.patch b/FernFlower-Patches/0022-Better-remapping-of-assignment-merges.patch
similarity index 100%
rename from FernFlower-Patches/0043-Better-remapping-of-assignment-merges.patch
rename to FernFlower-Patches/0022-Better-remapping-of-assignment-merges.patch
diff --git a/FernFlower-Patches/0023-A-scoping-test-simpler-than-the-complex-one-almost-p.patch b/FernFlower-Patches/0023-A-scoping-test-simpler-than-the-complex-one-almost-p.patch
deleted file mode 100644
index 8ebdb2e..0000000
--- a/FernFlower-Patches/0023-A-scoping-test-simpler-than-the-complex-one-almost-p.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Sat, 8 Aug 2015 13:37:49 -0400
-Subject: [PATCH] A scoping test, simpler than the complex one, almost passes.
-
-
-diff --git a/testData/classes/pkg/TestLVTScoping.class b/testData/classes/pkg/TestLVTScoping.class
-new file mode 100644
-index 0000000000000000000000000000000000000000..b13a2da2070ddc93780406d9b74262fec5610576
-GIT binary patch
-literal 1024
-zcma)4U2hUW6g>l5mZeZWODkY&>ldIFZPgcyNn>I{N?Q{M34L4WNVkPu0!yR+#<xD}
-z0~#Ov0sbaqJhKpxRHK<>=H8h*=bU?HzW@CC4Ztp*>+lIA`WKy2T@Kx9qh4z}ear6X
-z&;(-V=A~Kcns%pj+&Y(SS0M1hvMu+efInYo2xzaIQyGFEMi@&72t=!vEssXMmK@a0
-zR#y_d>a@*n!yH&DpKfaInKcwhRj)IbNz#+<nR6OK3<(`^f%sfV#dc*!4#G$xC7@rL
-z-H|+gE0E4t3e{_6WrdLrV-4#9LCba<s@_vy2_nOwx!(*T$KYtcX<!4lbZjnkUVA@u
-zWiN~^Y_rN4(S+3rk>!-$42W5C2h!}3>JIMdxGRwKbSxf+aUXdK?yDPJn;`k$<Pw6W
-zmzAZ$RG!T{nH~v5YOdM7I5hj7hdLfD%JdLOF!6487VRlrPZT}(wET(3aUu|^Iio>a
-zzP8jOB^O_RN71umHq37VXpH#0oONa;u7c}Q@iT%S8Tb(5td3RbGUxE5fNO-AftA_i
-zA*)qgPSd_1I>zb;7>OGPR|q7s2cK}WIL2*->Gv=*ya$plBS;JbaqgywnkBB{NfT{_
-zwFMNJrC2qI9xyZDi~oR6$3uoY{}vGWyMP$U;v`CN=D*{}lKTGy7!v`dnSggw2e#)9
-zM71(o&y4Z-3V)Qb;TgY9$_zWtQb3M>dV|>}pJ{6*CBnJ__Sk*Ki<B$M3k|+CgT6my
-H?8CEPwhyta
-
-literal 0
-HcmV?d00001
-
-diff --git a/testData/results/TestLVTScoping.dec b/testData/results/TestLVTScoping.dec
-new file mode 100644
-index 0000000000000000000000000000000000000000..7bbf62484e40f9f00b4028029c6c0862d08e750c
---- /dev/null
-+++ b/testData/results/TestLVTScoping.dec
-@@ -0,0 +1,35 @@
-+package pkg;
-+
-+public class TestLVTScoping {
-+
-+
-+   public static void method() {      String a;
-+      if(1 == Integer.valueOf(1).intValue()) {
-+         a = "YAY";
-+      } else {
-+         a = "NAY";      }
-+
-+      System.out.println(a);
-+   }
-+
-+   public static void method2() {      String a;
-+      if(1 == Integer.valueOf(1).intValue()) {
-+         a = "YAY";
-+      } else {
-+         a = "NAY";
-+         System.out.println(a);
-+      }   }
-+
-+   public static void method3() {
-+      if(1 == Integer.valueOf(1).intValue()) {
-+
-+         boolean a = true;
-+         System.out.println(a);
-+      } else {
-+
-+         String a = "NAY";
-+         System.out.println(a);
-+      }
-+
-+   }
-+}
-diff --git a/testData/src/pkg/TestLVTScoping.java b/testData/src/pkg/TestLVTScoping.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..ab57832c2f3df13a4ae9da2af193c2d6a79067ab
---- /dev/null
-+++ b/testData/src/pkg/TestLVTScoping.java
-@@ -0,0 +1,34 @@
-+package pkg;
-+
-+
-+public class TestLVTScoping {
-+    public static void method() {
-+        String a;
-+        if (1 == Integer.valueOf(1)) {
-+            a = "YAY";
-+        } else {
-+            a = "NAY";
-+        }
-+        System.out.println(a);
-+    }
-+    public static void method2() {
-+        String a;
-+        if (1 == Integer.valueOf(1)) {
-+            a = "YAY";
-+        } else {
-+            a = "NAY";
-+            System.out.println(a);
-+        }
-+    }
-+    public static void method3() {
-+        if (1 == Integer.valueOf(1)) {
-+            boolean a;
-+            a = true;
-+            System.out.println(a);
-+        } else {
-+            String a;
-+            a = "NAY";
-+            System.out.println(a);
-+        }
-+    }
-+}
diff --git a/FernFlower-Patches/0045-Change-begin-end-detection.-Less-derpy.patch b/FernFlower-Patches/0023-Change-begin-end-detection.-Less-derpy.patch
similarity index 67%
rename from FernFlower-Patches/0045-Change-begin-end-detection.-Less-derpy.patch
rename to FernFlower-Patches/0023-Change-begin-end-detection.-Less-derpy.patch
index f55ca2a..c2099f7 100644
--- a/FernFlower-Patches/0045-Change-begin-end-detection.-Less-derpy.patch
+++ b/FernFlower-Patches/0023-Change-begin-end-detection.-Less-derpy.patch
@@ -4,8 +4,65 @@ Date: Sun, 13 Sep 2015 18:26:04 -0400
 Subject: [PATCH] Change begin/end detection. Less derpy.
 
 
+diff --git a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
+index a36047be9d5aaafd1e37ea1fc4ed861b7e26e5c9..407aaa96659637e8a746a5e21e6a30d07e09aa31 100644
+--- a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
++++ b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
+@@ -264,17 +264,17 @@ public class BasicBlock implements IGraphNode {
+   }
+ 
+   public int getStartInstruction() {
+-      if (seq.isEmpty()) {
+-          return 0;
+-      }
+-      return instrOldOffsets.get(0);
++    if (seq.isEmpty()) {
++      return 0;
++    }
++    return instrOldOffsets.get(0);
+   }
+ 
+   public int getEndInstruction() {
+-      if (seq.isEmpty()) {
+-          return 0;
+-      }
+-      int end = seq.getLastInstr().length();
+-      return end + instrOldOffsets.get(size() -1);
++    if (seq.isEmpty()) {
++      return 0;
++    }
++    int end = seq.getLastInstr().length();
++    return end + instrOldOffsets.get(size() -1);
+   }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
+index 762fd011314ca3f5c7fdc370ffe2bccdbb01a509..e68cb97ea66761387a6d05a8b38f0f1bf0e1225e 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
+@@ -24,6 +24,7 @@ import org.jetbrains.java.decompiler.main.TextBuffer;
+ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+ import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
+ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
++import org.jetbrains.java.decompiler.modules.decompiler.vars.StartEndPair;
+ 
+ public class BasicBlockStatement extends Statement {
+ 
+@@ -94,4 +95,13 @@ public class BasicBlockStatement extends Statement {
+   public BasicBlock getBlock() {
+     return block;
+   }
++
++  @Override
++  public StartEndPair getStartEndRange() {
++    if (block.size() > 0) {
++      return new StartEndPair(block.getStartInstruction(), block.getEndInstruction());
++    } else {
++      return null;
++    }
++  }
+ }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
-index 8359284281d3c3e02c15ed407ab4dfacf9eae478..0768912fe41d5d60580029e640cfaab07e6447bb 100644
+index e7220368e6116aec755c46f25e397bf6f8f76443..acc74a60fd6a90ad15959f6c3164757390542ada 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
 @@ -21,6 +21,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
@@ -16,18 +73,8 @@ index 8359284281d3c3e02c15ed407ab4dfacf9eae478..0768912fe41d5d60580029e640cfaab0
  
  import java.util.ArrayList;
  import java.util.List;
-@@ -241,4 +242,9 @@ public class DoStatement extends Statement {
-   public void setLooptype(int looptype) {
-     this.looptype = looptype;
-   }
-+
-+  @Override
-+    public StartEndPair getStartEndRange() {
-+        return super.getStartEndRange();
-+    }
- }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
-index 8be0dcc0ca2e0e3a9da1f5f92d625ee25f7d7e7a..f216b73fe7480b9425608a1b19b48ef6de6424bc 100644
+index 8be0dcc0ca2e0e3a9da1f5f92d625ee25f7d7e7a..8f3e4679be0d5821df94253a9f58082aa4f236d4 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
 @@ -22,6 +22,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
@@ -60,7 +107,7 @@ index 8be0dcc0ca2e0e3a9da1f5f92d625ee25f7d7e7a..f216b73fe7480b9425608a1b19b48ef6
      if(matchNode.getType() == MatchNode.MATCHNODE_EXPRENT) {
        String position = (String)matchNode.getRuleValue(MatchProperties.EXPRENT_POSITION);
        if("head".equals(position)) {
-@@ -459,8 +460,12 @@ public class IfStatement extends Statement {
+@@ -459,8 +460,14 @@ public class IfStatement extends Statement {
          return false;
        }
      }
@@ -71,12 +118,14 @@ index 8be0dcc0ca2e0e3a9da1f5f92d625ee25f7d7e7a..f216b73fe7480b9425608a1b19b48ef6
 -  
 +
 +  @Override
-+    public StartEndPair getStartEndRange() {
-+        return StartEndPair.join(super.getStartEndRange(),ifstat != null ? ifstat.getStartEndRange() : null,elsestat != null ? elsestat.getStartEndRange(): null);
-+    }
++  public StartEndPair getStartEndRange() {
++    return StartEndPair.join(super.getStartEndRange(),
++      ifstat != null ? ifstat.getStartEndRange() : null,
++      elsestat != null ? elsestat.getStartEndRange(): null);
++  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
-index 7193f9a787a2b849aac667354b6931e4ed2816d8..0a1e798299c913755fd7b99a8afe10ca34e27d20 100644
+index 7193f9a787a2b849aac667354b6931e4ed2816d8..d8329ff22605f0ef278cefc29483eb760b90a02f 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
 @@ -18,6 +18,7 @@ package org.jetbrains.java.decompiler.modules.decompiler.stats;
@@ -93,12 +142,12 @@ index 7193f9a787a2b849aac667354b6931e4ed2816d8..0a1e798299c913755fd7b99a8afe10ca
    }
 +
 +  @Override
-+    public StartEndPair getStartEndRange() {
-+        return first.getStartEndRange();
-+    }
++  public StartEndPair getStartEndRange() {
++    return first.getStartEndRange();
++  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
-index 7d2ee435ce1c153b6da410d825d697d9790e35fe..b3785fb3235dd593ce293d0c6677546a361fb489 100644
+index 7d2ee435ce1c153b6da410d825d697d9790e35fe..81d31a58f6a913ddc4f5a89ae22fe69f98c63f3e 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
 @@ -20,6 +20,7 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
@@ -109,18 +158,8 @@ index 7d2ee435ce1c153b6da410d825d697d9790e35fe..b3785fb3235dd593ce293d0c6677546a
  
  import java.util.Arrays;
  import java.util.List;
-@@ -137,4 +138,9 @@ public class SequenceStatement extends Statement {
-   public Statement getSimpleCopy() {
-     return new SequenceStatement();
-   }
-+
-+  @Override
-+    public StartEndPair getStartEndRange() {
-+        return super.getStartEndRange();
-+    }
- }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
-index c12605070b1de0bd65ebed44eacb25467666efbc..806c4d57423605f5b11b33f8647734646473b00c 100644
+index c12605070b1de0bd65ebed44eacb25467666efbc..f71ed84bc4ad195a97b4c535f21b55a9568cac62 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
 @@ -24,6 +24,7 @@ import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
@@ -139,26 +178,25 @@ index c12605070b1de0bd65ebed44eacb25467666efbc..806c4d57423605f5b11b33f864773464
 -public SequenceStatement getParentSequenceStat() {
 -    if (parentSeqStat == null) {
 -        parentSeqStat = (getParent()!=null && getParent().type == TYPE_SEQUENCE) ? (SequenceStatement)getParent() : new SequenceStatement(Arrays.asList(this));
--    }
--    return parentSeqStat;
--}
--
 +  private StartEndPair endpoints;
 +  public StartEndPair getStartEndRange() {
-+      if (endpoints == null) {
-+          int start = Integer.MAX_VALUE;
-+          int end = Integer.MIN_VALUE;
-+          for (Statement st : getStats()) {
-+              start = Math.min(start, st.getBasichead().getBlock().getStartInstruction());
-+              end = Math.max(end, st.getBasichead().getBlock().getEndInstruction());
-+          }
-+          endpoints = new StartEndPair(start,end);
++    if (endpoints == null) {
++      int start = Integer.MAX_VALUE;
++      int end   = Integer.MIN_VALUE;
++      for (Statement st : getStats()) {
++        start = Math.min(start, st.getBasichead().getBlock().getStartInstruction());
++        end   = Math.max(end,   st.getBasichead().getBlock().getEndInstruction());
 +      }
-+      return endpoints;
++      endpoints = new StartEndPair(start, end);
+     }
+-    return parentSeqStat;
+-}
+-
++    return endpoints;
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
-index 59164900d91a1d02526de1ab32958fac7083357b..8d7127cc348720d35f161c5c92c7fb66c2bd7ddb 100644
+index 59164900d91a1d02526de1ab32958fac7083357b..3e272016903de00ee47c55fad62db4b0687a04b5 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
 @@ -27,6 +27,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
@@ -175,29 +213,47 @@ index 59164900d91a1d02526de1ab32958fac7083357b..8d7127cc348720d35f161c5c92c7fb66
    }
 +
 +  @Override
-+    public StartEndPair getStartEndRange() {
-+      StartEndPair[] sepairs = new StartEndPair[caseStatements.size() + 1];
-+      int i = 0;
-+      sepairs[i++] = super.getStartEndRange();
-+      for (Statement st : caseStatements) {
-+          sepairs[i++] = st.getStartEndRange();
-+      }
-+      return StartEndPair.join(sepairs);
++  public StartEndPair getStartEndRange() {
++    StartEndPair[] sepairs = new StartEndPair[caseStatements.size() + 1];
++    int i = 0;
++    sepairs[i++] = super.getStartEndRange();
++    for (Statement st : caseStatements) {
++      sepairs[i++] = st.getStartEndRange();
 +    }
++    return StartEndPair.join(sepairs);
++  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-index 1de71812af2089eb1445f9b8448c1a8086b1d435..fe45b111874c303e7a0e839e1ef358131bc320a2 100644
+index 1de71812af2089eb1445f9b8448c1a8086b1d435..7f3447bcf43c09321eeb34e8e62185bb6a38a261 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-@@ -3,6 +3,7 @@ package org.jetbrains.java.decompiler.modules.decompiler.vars;
+@@ -1,14 +1,11 @@
+ package org.jetbrains.java.decompiler.modules.decompiler.vars;
+ 
  import java.util.ArrayList;
- import java.util.BitSet;
+-import java.util.BitSet;
  import java.util.HashMap;
-+import java.util.HashSet;
  import java.util.List;
  import java.util.Map;
  import java.util.Set;
-@@ -88,18 +89,10 @@ public class LocalVariableTable {
+ 
+-import org.jetbrains.java.decompiler.main.rels.MethodProcessorRunnable;
+-import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
+ 
+ public class LocalVariableTable {
+@@ -77,8 +74,8 @@ public class LocalVariableTable {
+       versions.put(lvt.index, idx);
+       List<LVTVariable> lvtList = mapLVT.get(lvt.index);
+       if (lvtList == null) {
+-          lvtList = new ArrayList<LVTVariable>();
+-          mapLVT.put(lvt.index, lvtList);
++        lvtList = new ArrayList<LVTVariable>();
++        mapLVT.put(lvt.index, lvtList);
+       }
+       lvtList.add(lvt);
+     }
+@@ -88,33 +85,17 @@ public class LocalVariableTable {
      return getMapVarNames().get(index);
    }
  
@@ -212,14 +268,34 @@ index 1de71812af2089eb1445f9b8448c1a8086b1d435..fe45b111874c303e7a0e839e1ef35813
 -    //System.out.println(indent + stat.getClass().getSimpleName() + " (" + start +", " + end + ")");
 -
 -    StartEndPair sepair = new StartEndPair(start, end);
--    Map<Integer, LVTVariable> ret = new HashMap<Integer, LVTVariable>();
 +  public Map<Integer, LVTVariable> getVars(Statement statement) {
-+      HashMap<Integer,LVTVariable> ret = new HashMap<Integer,LVTVariable>();
-+      if (statement == null) return ret;
-+      StartEndPair sepair = statement.getStartEndRange();
+     Map<Integer, LVTVariable> ret = new HashMap<Integer, LVTVariable>();
++    if (statement == null) {
++      return ret;
++    }
++    StartEndPair sepair = statement.getStartEndRange();
      if (endpoints.containsKey(sepair)) {
-         for (LVTVariable lvt : endpoints.get(sepair)) {
-             ret.put(lvt.index,lvt);
+-        for (LVTVariable lvt : endpoints.get(sepair)) {
+-            ret.put(lvt.index,lvt);
+-        }
++      for (LVTVariable lvt : endpoints.get(sepair)) {
++        ret.put(lvt.index, lvt);
++      }
+     }
+-//    for (Entry<Integer, List<LVTVariable>> entry : endpoints.get(end)) {
+-//      for (LVTVariable lvt : entry.getValue()) {
+-//        if (lvt.start >= start && lvt.end <= end) {
+-//          if (ret.containsKey(entry.getKey())) {
+-//            System.out.println("DUPLICATE INDEX WHAT THE FUCK: " + entry.getKey());
+-//          }
+-//          ret.put(entry.getKey(), lvt);
+-//        }
+-//      }
+-//    }
+     return ret;
+   }
+ }
+\ No newline at end of file
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/StartEndPair.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/StartEndPair.java
 index 23a3929a12446772fb3e35196223925853b28ec3..32c87996ea629302559202e7cd39c9e345a67398 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/StartEndPair.java
diff --git a/FernFlower-Patches/0046-Fixup-NPE-from-PPMM-helper-and-expand-PPMM-test-to-i.patch b/FernFlower-Patches/0024-Add-PPMM-test-fixup-NPE-from-PPMM-helper-prevent-inf.patch
similarity index 68%
rename from FernFlower-Patches/0046-Fixup-NPE-from-PPMM-helper-and-expand-PPMM-test-to-i.patch
rename to FernFlower-Patches/0024-Add-PPMM-test-fixup-NPE-from-PPMM-helper-prevent-inf.patch
index c0f2a3f..db89e8d 100644
--- a/FernFlower-Patches/0046-Fixup-NPE-from-PPMM-helper-and-expand-PPMM-test-to-i.patch
+++ b/FernFlower-Patches/0024-Add-PPMM-test-fixup-NPE-from-PPMM-helper-prevent-inf.patch
@@ -1,12 +1,12 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Sun, 13 Sep 2015 17:49:00 -0700
-Subject: [PATCH] Fixup NPE from PPMM helper, and expand PPMM test to include
- more edge cases.
+From: cpw <cpw@weeksfamily.ca>
+Date: Sun, 13 Sep 2015 18:25:07 -0400
+Subject: [PATCH] Add PPMM test, fixup NPE from PPMM helper, prevent infinite
+ loops in PPMM
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
-index d93bad6bd760a6de8e546411b1f2798b4bbd03ad..f39946d1c839333a69c91521f6714b183028567d 100644
+index d93bad6bd760a6de8e546411b1f2798b4bbd03ad..db70f64a91a21c04b1277b6da9b38ef7f60c1cf4 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
 @@ -34,6 +34,7 @@ import java.util.HashSet;
@@ -17,7 +17,20 @@ index d93bad6bd760a6de8e546411b1f2798b4bbd03ad..f39946d1c839333a69c91521f6714b18
  
  public class PPandMMHelper {
  
-@@ -183,13 +184,23 @@ public class PPandMMHelper {
+@@ -156,7 +157,11 @@ public class PPandMMHelper {
+ 
+               exprentReplaced = true;
+               if (!left.equals(econd)) {
+-                remaps.put(new VarVersionPair((VarExprent)left), new VarVersionPair((VarExprent)econd));
++                VarVersionPair _old = new VarVersionPair((VarExprent)left);
++                VarVersionPair _new = new VarVersionPair((VarExprent)econd);
++                if (_old.var > _new.var) { // Try and prevent infinite loops here by only merging 'down'
++                  remaps.put(_old, _new);
++                }
+               }
+               return ret;
+             }
+@@ -183,13 +188,23 @@ public class PPandMMHelper {
  
      VarExprent v1 = (VarExprent)e1;
      VarExprent v2 = (VarExprent)e2;
@@ -44,7 +57,7 @@ index d93bad6bd760a6de8e546411b1f2798b4bbd03ad..f39946d1c839333a69c91521f6714b18
        @Override
        public int processExprent(Exprent exprent) {
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-index 312f6c8a51e96e8f1a8dc27b509716022e22cc39..3398924fabb57daddb0f6b51daafdd266cc371b6 100644
+index 43f29f5320b158feb567b4327e3487c1ea3748e9..0fc40559457cfc425bced3a536b862a963a466e5 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
 @@ -416,6 +416,11 @@ public class ConstExprent extends Exprent {
@@ -59,8 +72,27 @@ index 312f6c8a51e96e8f1a8dc27b509716022e22cc39..3398924fabb57daddb0f6b51daafdd26
    // *****************************************************************************
    // IMatchable implementation
    // *****************************************************************************
+diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
+index f4d869c4f04fef50aa1bcf64cb61ce0d2b02bfb9..d2a8f1c20c8a7954d4ba22d17fc1584d3bd4a3ca 100644
+--- a/test/org/jetbrains/java/decompiler/LVTTest.java
++++ b/test/org/jetbrains/java/decompiler/LVTTest.java
+@@ -35,7 +35,10 @@ public class LVTTest extends SingleClassesTestBase {
+         super.setUp();
+         fixture.cleanup = false;
+     }
+-  @Test public void testMatchLM() { doTest("pkg/TestLexManosLVT"); }
+-  @Test public void testMatch1() { doTest("pkg/TestLVT"); }
+-  @Test public void testMatch2() { doTest("pkg/TestLVTScoping"); }
++  @Test public void testMatch1() { doTest("pkg/TestPPMM"); }
++//  @Test public void testMatchLM() { doTest("pkg/TestLexManosLVT"); }
++//  @Test public void testMatch1() { doTest("pkg/TestLVT"); }
++//  @Test public void testMatch2() { doTest("pkg/TestLVTScoping"); }
++//  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
++//  @Test public void testMCGuiCmdBlock() { doTest("net/minecraft/client/gui/GuiCommandBlock"); }
+ }
 diff --git a/testData/classes/pkg/TestPPMM.class b/testData/classes/pkg/TestPPMM.class
-index e493a99dbb742f1f20c3cb134d7366db47c5d4b4..38580c978dbdec1baf1fe2a0d4c7bbb11e2d2a11 100644
+new file mode 100644
+index 0000000000000000000000000000000000000000..38580c978dbdec1baf1fe2a0d4c7bbb11e2d2a11
 GIT binary patch
 literal 936
 zcmb`F&rZTX5XQfuMYI+{RQ!X67%%9Bg9i^1FCGjDL=J@ef)$Gt8flCVzzccOc<=#y
@@ -71,13 +103,8 @@ zbRunvrz5IRlP52bXKn<`w07vk3P0Dr)hOYNrv!Z&qcRqW)+{w2hNr0sqzOwiiLF=!
 zBohyrjAgp!sU*7y$a)01n)ak<R0{0KD-yBtyRu@`ql2hNxi~191wvzG9_U6KlqF8W
 oO8?3{(9Jj~nPH_d@;}tl!^~dl!7P5y9cOQr77nFgoAboy3oV9k<p2Nx
 
-literal 371
-zcmYjL%}&BV7@V&yEtFyr6A#|JsRx^Qm3T2RF)2zS!Sl9maIv;cDL#QO<jKT?58y)?
-zr+{d7cfS38X1@9Q{`drNhCL6KASj<^(L^um@pv@y;0XG2^`fFo<+JEEnd`I`xI>eh
-z`a)nI9Zv<$W$~bW*ysdk!4-tD$@R_hInmWbC7Bis;v!YqR8^+QH$|s@Gz-B_{D0@U
-zz$#0DD86ffe^)H4R9~4!ruXaYv@wN4&;rc^7Jpn#^q57A!q_@_NBeEn_K8g!By@?v
-zdVsOVj3&0^duA4Ep*?&R+1@{y1CCOgLoU%no2QEoCH$52{+hm#wzwcfpQ3_Y@+=H~
-E0NOq`X8-^I
+literal 0
+HcmV?d00001
 
 diff --git a/testData/results/TestPPMM.dec b/testData/results/TestPPMM.dec
 new file mode 100644
@@ -156,20 +183,14 @@ index 0000000000000000000000000000000000000000..ba3a5fc1b4a29798078399358a7e5603
 +   }
 +}
 diff --git a/testData/src/pkg/TestPPMM.java b/testData/src/pkg/TestPPMM.java
-index 02eecf4b565584b5644ad5898565593494aad285..21c7f2eab8296554f3fdb5d23efba4832e42e745 100644
---- a/testData/src/pkg/TestPPMM.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..21c7f2eab8296554f3fdb5d23efba4832e42e745
+--- /dev/null
 +++ b/testData/src/pkg/TestPPMM.java
-@@ -1,11 +1,66 @@
- package pkg;
- 
- public class TestPPMM {
--    public void pp() {
--        int a = 0;
--        a++;
--        a++;
--        a++;
--        a++;
--    }
+@@ -0,0 +1,66 @@
++package pkg;
++
++public class TestPPMM {
 +   // Bytecode wise ipp and ppi are identical when not using the intermediate value. 
 +   // We keep these seperate tests just to see the bytecode.
 +   public void ipp() {
@@ -232,5 +253,5 @@ index 02eecf4b565584b5644ad5898565593494aad285..21c7f2eab8296554f3fdb5d23efba483
 +   }
 +   private static void t(int x){
 +   }
- }
++}
 \ No newline at end of file
diff --git a/FernFlower-Patches/0024-Add-the-test-to-the-harness.patch b/FernFlower-Patches/0024-Add-the-test-to-the-harness.patch
deleted file mode 100644
index 4daad76..0000000
--- a/FernFlower-Patches/0024-Add-the-test-to-the-harness.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Sat, 8 Aug 2015 13:43:47 -0400
-Subject: [PATCH] Add the test to the harness
-
-
-diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
-index 2d39827fabef8a71133de494460a0c67f4ae9f8b..983368c25695ab8bbf090fa01e6d8df9a302bc91 100644
---- a/test/org/jetbrains/java/decompiler/LVTTest.java
-+++ b/test/org/jetbrains/java/decompiler/LVTTest.java
-@@ -30,4 +30,5 @@ public class LVTTest extends SingleClassesTestBase {
-   }
- 
-   @Test public void testMatch1() { doTest("pkg/TestLVT"); }
-+  @Test public void testMatch2() { doTest("pkg/TestLVTScoping"); }
- }
diff --git a/FernFlower-Patches/0025-Some-modifications-to-the-printout.-Also-fixed-a-fas.patch b/FernFlower-Patches/0025-Some-modifications-to-the-printout.-Also-fixed-a-fas.patch
deleted file mode 100644
index ee45722..0000000
--- a/FernFlower-Patches/0025-Some-modifications-to-the-printout.-Also-fixed-a-fas.patch
+++ /dev/null
@@ -1,255 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Sat, 8 Aug 2015 16:13:27 -0400
-Subject: [PATCH] Some modifications to the printout. Also, fixed a fascinating
- bug in VarVersionsProcessor where it dumped the original indexes because
- setVarVersions is called multiple times (seems to be some sort of reparse
- loop). Preserving an existing origvarstable across the that method seems to
- have improved accuracy a LOT.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
-index 18f05a34329a4750249225ce7fbe44e4870d2469..4e865569886a79b208df09e2449106bea16ba87b 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
-@@ -170,9 +170,13 @@ public class ClassWrapper {
- 
-         if (attr != null) {
-           varProc.setDebugVarNames(attr.getMapVarNames());
-+          varProc.setLVT(attr.getLVT());
-         }
-       }
- 
-+      MethodProcessorRunnable.printMethod(root, mt.getClassStruct().qualifiedName+"."+mt.getName()+mt.getDescriptor(),varProc);
-+
-+
-       DecompilerContext.getLogger().endMethod();
-     }
- 
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index dc6f2f0e61563f8132d99b70d3d81278f224da04..f0b17a55f189e6dd356a3188bb6e2ce01074393d 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-@@ -26,16 +26,20 @@ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
- import org.jetbrains.java.decompiler.modules.code.DeadCodeHelper;
- import org.jetbrains.java.decompiler.modules.decompiler.*;
- import org.jetbrains.java.decompiler.modules.decompiler.deobfuscator.ExceptionDeobfuscator;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.DummyExitStatement;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
-+import org.jetbrains.java.decompiler.modules.decompiler.vars.LVTVariable;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
- import org.jetbrains.java.decompiler.struct.StructClass;
- import org.jetbrains.java.decompiler.struct.StructMethod;
- 
- import java.io.IOException;
- import java.util.BitSet;
-+import java.util.List;
- 
- public class MethodProcessorRunnable implements Runnable {
- 
-@@ -204,8 +208,6 @@ public class MethodProcessorRunnable implements Runnable {
- 
-     varProc.setVarDefinitions(root);
- 
--    printMethod(root);
--
-     // must be the last invocation, because it makes the statement structure inconsistent
-     // FIXME: new edge type needed
-     LabelHelper.replaceContinueWithBreak(root);
-@@ -225,17 +227,17 @@ public class MethodProcessorRunnable implements Runnable {
-     return finished;
-   }
- 
--  private static void printMethod(RootStatement root) {
--    System.out.println("{");
-+  public static void printMethod(RootStatement root, String name, VarProcessor varProc) {
-+    System.out.println(name + " {");
- 
-     for (Object obj : root.getSequentialObjects()) {
-       if (obj instanceof Statement) {
--        printStatement((Statement)obj, "  ");
-+        printStatement((Statement)obj, "  ",varProc);
-       } else {
-         System.out.println("  " + obj.getClass().getSimpleName());
-       }
-     }
--    printStatement(root.getDummyExit(), "  ");
-+    printStatement(root.getDummyExit(), "  ",varProc);
-     System.out.println("}");
-   }
- 
-@@ -259,7 +261,7 @@ public class MethodProcessorRunnable implements Runnable {
-     }
-   }
- 
--  private static void printStatement(Statement statement, String indent) {
-+  private static void printStatement(Statement statement, String indent, VarProcessor varProc) {
-     BitSet values = new BitSet();
-     getOffset(statement, values);
-     int start = values.nextSetBit(0);
-@@ -269,7 +271,7 @@ public class MethodProcessorRunnable implements Runnable {
- 
-     if (statement.getExprents() != null) {
-       for(Exprent exp : statement.getExprents()) {
--        System.out.println(indent + "  " + exp.getClass().getSimpleName());
-+          System.out.println(printExprent(indent + "  ", exp,varProc));
-       }
-     }
-     /*
-@@ -332,10 +334,32 @@ public class MethodProcessorRunnable implements Runnable {
-     indent += "  ";
-     for (Object obj : statement.getSequentialObjects()) {
-       if (obj instanceof Statement) {
--        printStatement((Statement)obj, indent);
-+        printStatement((Statement)obj, indent,varProc);
-+      } else if (obj instanceof Exprent) {
-+          System.out.println(printExprent(indent, (Exprent) obj, varProc));
-       } else {
-         System.out.println(indent + obj.getClass().getSimpleName());
-       }
-     }
-   }
-+  private static String printExprent(String indent, Exprent exp, VarProcessor varProc) {
-+      StringBuffer sb = new StringBuffer();
-+      sb.append(indent);
-+      BitSet values = new BitSet();
-+      exp.getBytecodeRange(values);
-+      sb.append("(").append(values.nextSetBit(0)).append(", ").append(values.length()-1).append(") ");
-+      sb.append(exp.getClass().getSimpleName());
-+      sb.append(" ").append(exp.id).append(" ");
-+      if (exp instanceof VarExprent) {
-+          VarExprent varExprent = (VarExprent)exp;
-+        int currindex = varExprent.getIndex();
-+        int origindex = varProc.getRemapped(currindex);
-+        List<LVTVariable> candidates = varProc.getLVT().getCandidates(origindex);
-+        sb.append("[").append(currindex).append(":").append(origindex).append(", ").append(varExprent.isStack()).append("]").append(candidates);
-+      } else if (exp instanceof AssignmentExprent) {
-+          AssignmentExprent assignmentExprent = (AssignmentExprent)exp;
-+        sb.append("{").append(printExprent(" ",assignmentExprent.getLeft(),varProc)).append(" =").append(printExprent(" ",assignmentExprent.getRight(),varProc)).append("}");
-+      }
-+      return sb.toString();
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
-index 0533981f9da54787c55fd9b54e1f1d555bdbed12..13cfa70a586a82cbcea81553680e8d59b5bfd343 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
-@@ -67,4 +67,8 @@ public class LVTVariable implements Comparable<LVTVariable> {
-     if (o.index < index) return 1;
-     return 0;
-   }
-+  @Override
-+    public String toString() {
-+        return "\'("+index+","+start+")"+desc+(sig!=null ? "<"+sig+"> ":" ")+name+"\'";
-+    }
- }
-\ No newline at end of file
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-index 75f144dccacee0a214fad16f9cde138ec64de256..027e81652438e7648ec02c49feb2afcb1e2f234c 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-@@ -10,6 +10,7 @@ public class LocalVariableTable {
-   private Map<Integer, Set<LVTVariable>> startpoints;
-   private ArrayList<LVTVariable> allLVT;
-   private Map<VarVersionPair, String> mapVarNames;
-+private Map<Integer, List<LVTVariable>> mapLVT;
- 
-   public LocalVariableTable(int len) {
-     startpoints = new HashMap<Integer,Set<LVTVariable>>(len);
-@@ -59,6 +60,7 @@ public class LocalVariableTable {
-   private void buildNameMap() {
-     Map<Integer, Integer> versions = new HashMap<Integer, Integer>();
-     mapVarNames = new HashMap<VarVersionPair, String>();
-+    mapLVT = new HashMap<Integer,List<LVTVariable>>();
-     for (LVTVariable lvt : allLVT) {
-       Integer idx = versions.get(lvt.index);
-       if (idx == null)
-@@ -66,7 +68,17 @@ public class LocalVariableTable {
-       else
-         idx++;
-       versions.put(lvt.index, idx);
-+      List<LVTVariable> lvtList = mapLVT.get(lvt.index);
-+      if (lvtList == null) {
-+          lvtList = new ArrayList<LVTVariable>();
-+          mapLVT.put(lvt.index, lvtList);
-+      }
-+      lvtList.add(lvt);
-       mapVarNames.put(new VarVersionPair(lvt.index, idx.intValue()), lvt.name);
-     }
-   }
-+
-+public List<LVTVariable> getCandidates(int index) {
-+    return mapLVT.get(index);
-+}
- }
-\ No newline at end of file
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-index fbd3455dae324f21854b6374448c0c50f0c1e1ce..07b5398d4ccd7b6a06e91056a88b2b6e0df94291 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-@@ -31,10 +31,18 @@ public class VarProcessor {
-   private VarVersionsProcessor varVersions;
-   private final Map<VarVersionPair, String> thisVars = new HashMap<VarVersionPair, String>();
-   private final Set<VarVersionPair> externalVars = new HashSet<VarVersionPair>();
-+private LocalVariableTable lvt;
- 
-   public void setVarVersions(RootStatement root) {
-+    Map<Integer, Integer> mapOriginalVarIndices = null;
-+    if (varVersions != null) {
-+        mapOriginalVarIndices = varVersions.getMapOriginalVarIndices();
-+    }
-     varVersions = new VarVersionsProcessor();
-     varVersions.setVarVersions(root);
-+    if (mapOriginalVarIndices != null) {
-+        varVersions.getMapOriginalVarIndices().putAll(mapOriginalVarIndices);
-+    }
-   }
- 
-   public void setVarDefinitions(Statement root) {
-@@ -121,4 +129,17 @@ public class VarProcessor {
-   public Set<VarVersionPair> getExternalVars() {
-     return externalVars;
-   }
-+
-+public void setLVT(LocalVariableTable lvt) {
-+    this.lvt = lvt;
-+}
-+public LocalVariableTable getLVT() {
-+    return this.lvt;
-+}
-+
-+public int getRemapped(int index) {
-+    Integer res = varVersions.getMapOriginalVarIndices().get(index);
-+    if (res == null) return index;
-+    return res;
-+}
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-index 4751052a5468ffc469d7166bce648d5b658e040d..0de789a6f2278edc1e327d741b800fdba4a9dfcc 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-@@ -233,6 +233,7 @@ public class VarVersionsProcessor {
- 
-     final Map<VarVersionPair, Integer> mapVarPaar = new HashMap<VarVersionPair, Integer>();
-     Map<Integer, Integer> mapOriginalVarIndices = new HashMap<Integer, Integer>();
-+    mapOriginalVarIndices.putAll(this.mapOriginalVarIndices);
- 
-     // map var-version pairs on new var indexes
-     List<VarVersionPair> lst = new ArrayList<VarVersionPair>(mapExprentMinTypes.keySet());
-diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-index 44557858b5cf5ef1a6b05c79c34bb41f6ae6e5eb..4b00061fcee269a40b24f80b6147d4940caa9db6 100644
---- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-@@ -68,4 +68,8 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
-   public Map<VarVersionPair, String> getMapVarNames() {
-     return lvt == null ? EMPTY_LVT : lvt.getMapVarNames();
-   }
-+
-+public LocalVariableTable getLVT() {
-+    return lvt;
-+}
- }
diff --git a/FernFlower-Patches/0048-Types-are-merged-properly-now.patch b/FernFlower-Patches/0025-Types-are-merged-properly-now.patch
similarity index 100%
rename from FernFlower-Patches/0048-Types-are-merged-properly-now.patch
rename to FernFlower-Patches/0025-Types-are-merged-properly-now.patch
diff --git a/FernFlower-Patches/0026-Change-to-track-the-varversionpair-in-the-oldnames-t.patch b/FernFlower-Patches/0026-Change-to-track-the-varversionpair-in-the-oldnames-t.patch
deleted file mode 100644
index c6652e3..0000000
--- a/FernFlower-Patches/0026-Change-to-track-the-varversionpair-in-the-oldnames-t.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Sat, 8 Aug 2015 17:22:07 -0400
-Subject: [PATCH] Change to track the varversionpair in the "oldnames" table.
- Track if we have an lvt entry when generating names and trust it's name
- exactly.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-index 027e81652438e7648ec02c49feb2afcb1e2f234c..99025a511b670f1bf84493afb1ac43f3cd394600 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-@@ -64,7 +64,7 @@ private Map<Integer, List<LVTVariable>> mapLVT;
-     for (LVTVariable lvt : allLVT) {
-       Integer idx = versions.get(lvt.index);
-       if (idx == null)
--        idx = 0;
-+        idx = 1;
-       else
-         idx++;
-       versions.put(lvt.index, idx);
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-index 07b5398d4ccd7b6a06e91056a88b2b6e0df94291..a2a79f581baeb57597f8a69c9701b8c35ac4e2dc 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-@@ -34,7 +34,7 @@ public class VarProcessor {
- private LocalVariableTable lvt;
- 
-   public void setVarVersions(RootStatement root) {
--    Map<Integer, Integer> mapOriginalVarIndices = null;
-+    Map<Integer, VarVersionPair> mapOriginalVarIndices = null;
-     if (varVersions != null) {
-         mapOriginalVarIndices = varVersions.getMapOriginalVarIndices();
-     }
-@@ -57,7 +57,7 @@ private LocalVariableTable lvt;
-       return;
-     }
- 
--    Map<Integer, Integer> mapOriginalVarIndices = varVersions.getMapOriginalVarIndices();
-+    Map<Integer, VarVersionPair> mapOriginalVarIndices = varVersions.getMapOriginalVarIndices();
- 
-     List<VarVersionPair> listVars = new ArrayList<VarVersionPair>(mapVarNames.keySet());
-     Collections.sort(listVars, new Comparator<VarVersionPair>() {
-@@ -72,18 +72,19 @@ private LocalVariableTable lvt;
-     for (VarVersionPair pair : listVars) {
-       String name = mapVarNames.get(pair);
- 
--      Integer index = mapOriginalVarIndices.get(pair.var);
--      if (index != null) {
--        VarVersionPair key = new VarVersionPair(index.intValue(), pair.version);
-+      VarVersionPair key = mapOriginalVarIndices.get(pair.var);
-+      boolean lvtName = false;
-+      if (key != null) {
-         if (mapDebugVarNames.containsKey(key)) {
-           name = mapDebugVarNames.get(key);
-+          lvtName = true;
-         }
-       }
- 
-       Integer counter = mapNames.get(name);
-       mapNames.put(name, counter == null ? counter = new Integer(0) : ++counter);
- 
--      if (counter > 0) {
-+      if (counter > 0 && !lvtName) {
-         name += String.valueOf(counter);
-       }
- 
-@@ -138,8 +139,8 @@ public LocalVariableTable getLVT() {
- }
- 
- public int getRemapped(int index) {
--    Integer res = varVersions.getMapOriginalVarIndices().get(index);
-+    VarVersionPair res = varVersions.getMapOriginalVarIndices().get(index);
-     if (res == null) return index;
--    return res;
-+    return res.var;
- }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-index 0de789a6f2278edc1e327d741b800fdba4a9dfcc..eae4cbac7b5074685e16cb6738434e1124528d57 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
-@@ -34,7 +34,7 @@ import java.util.Map.Entry;
- 
- public class VarVersionsProcessor {
- 
--  private Map<Integer, Integer> mapOriginalVarIndices = new HashMap<Integer, Integer>();
-+  private Map<Integer, VarVersionPair> mapOriginalVarIndices = new HashMap<Integer, VarVersionPair>();
-   private VarTypeProcessor typeProcessor;
- 
-   public void setVarVersions(RootStatement root) {
-@@ -232,7 +232,7 @@ public class VarVersionsProcessor {
-     CounterContainer counters = DecompilerContext.getCounterContainer();
- 
-     final Map<VarVersionPair, Integer> mapVarPaar = new HashMap<VarVersionPair, Integer>();
--    Map<Integer, Integer> mapOriginalVarIndices = new HashMap<Integer, Integer>();
-+    Map<Integer, VarVersionPair> mapOriginalVarIndices = new HashMap<Integer, VarVersionPair>();
-     mapOriginalVarIndices.putAll(this.mapOriginalVarIndices);
- 
-     // map var-version pairs on new var indexes
-@@ -259,7 +259,7 @@ public class VarVersionsProcessor {
-         }
- 
-         mapVarPaar.put(pair, newIndex);
--        mapOriginalVarIndices.put(newIndex, pair.var);
-+        mapOriginalVarIndices.put(newIndex, pair);
-       }
-     }
- 
-@@ -316,7 +316,7 @@ public class VarVersionsProcessor {
-     typeProcessor.getMapFinalVars().put(pair, finalType);
-   }
- 
--  public Map<Integer, Integer> getMapOriginalVarIndices() {
-+  public Map<Integer, VarVersionPair> getMapOriginalVarIndices() {
-     return mapOriginalVarIndices;
-   }
- }
diff --git a/FernFlower-Patches/0051-New-aproach-to-merging-variables.-Use-top-down-manua.patch b/FernFlower-Patches/0026-Use-top-down-manual-scoping-for-merging-variables.patch
similarity index 81%
rename from FernFlower-Patches/0051-New-aproach-to-merging-variables.-Use-top-down-manua.patch
rename to FernFlower-Patches/0026-Use-top-down-manual-scoping-for-merging-variables.patch
index 4864bc9..64aa47e 100644
--- a/FernFlower-Patches/0051-New-aproach-to-merging-variables.-Use-top-down-manua.patch
+++ b/FernFlower-Patches/0026-Use-top-down-manual-scoping-for-merging-variables.patch
@@ -1,15 +1,20 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Fri, 18 Sep 2015 14:36:48 -0700
-Subject: [PATCH] New aproach to merging variables. Use top down manual
- scoping. 341
+From: cpw <cpw@weeksfamily.ca>
+Date: Wed, 16 Sep 2015 00:49:12 -0400
+Subject: [PATCH] Use top down manual scoping for merging variables.
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index ca27e4718c556a478242a60df896f6f61db6e915..0c03cd52d3ab4b664545ebf8c57faa9381a7ac65 100644
+index 7abcec8a356fa92f2bc18bf2dc24fc3defac3a38..5cb5f90885d6c1c748aaa4be4082b6690061f949 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-@@ -25,8 +25,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
+@@ -19,13 +19,13 @@ import org.jetbrains.java.decompiler.code.CodeConstants;
+ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
  import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchAllStatement;
  import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchStatement;
  import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement;
@@ -19,7 +24,7 @@ index ca27e4718c556a478242a60df896f6f61db6e915..0c03cd52d3ab4b664545ebf8c57faa93
  import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
  import org.jetbrains.java.decompiler.struct.StructClass;
  import org.jetbrains.java.decompiler.struct.StructMethod;
-@@ -35,7 +34,6 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
+@@ -34,7 +34,6 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
  
  import java.util.*;
  import java.util.Map.Entry;
@@ -27,27 +32,25 @@ index ca27e4718c556a478242a60df896f6f61db6e915..0c03cd52d3ab4b664545ebf8c57faa93
  
  public class VarDefinitionHelper {
  
-@@ -48,15 +46,16 @@ public class VarDefinitionHelper {
+@@ -47,12 +46,16 @@ public class VarDefinitionHelper {
  
    private final VarProcessor varproc;
  
--  private final Map<VarVersionPair,List<ConstExprent>> constExprents;
+-  public VarDefinitionHelper(Statement root, StructMethod mt, VarProcessor varproc) {
 +  private final Statement root;
 +  private final StructMethod mt;
  
-   public VarDefinitionHelper(Statement root, StructMethod mt, VarProcessor varproc) {
--
++  public VarDefinitionHelper(Statement root, StructMethod mt, VarProcessor varproc) {
      mapVarDefStatements = new HashMap<Integer, Statement>();
      mapStatementVars = new HashMap<Integer, HashSet<Integer>>();
      implDefVars = new HashSet<Integer>();
--    constExprents = new HashMap<VarVersionPair,List<ConstExprent>>();
      this.varproc = varproc;
 +    this.root = root;
 +    this.mt = mt;
  
      VarNamesCollector vc = DecompilerContext.getVarNamesCollector();
  
-@@ -98,8 +97,6 @@ public class VarDefinitionHelper {
+@@ -94,8 +97,6 @@ public class VarDefinitionHelper {
        vc.addName("this");
      }
  
@@ -56,7 +59,7 @@ index ca27e4718c556a478242a60df896f6f61db6e915..0c03cd52d3ab4b664545ebf8c57faa93
      // catch variables are implicitly defined
      LinkedList<Statement> stack = new LinkedList<Statement>();
      stack.add(root);
-@@ -133,15 +130,9 @@ public class VarDefinitionHelper {
+@@ -129,15 +130,9 @@ public class VarDefinitionHelper {
    public void setVarDefinitions() {
      VarNamesCollector vc = DecompilerContext.getVarNamesCollector();
  
@@ -72,7 +75,7 @@ index ca27e4718c556a478242a60df896f6f61db6e915..0c03cd52d3ab4b664545ebf8c57faa93
        setupLVTs(stat);
  
        if (implDefVars.contains(index)) {
-@@ -156,7 +147,7 @@ public class VarDefinitionHelper {
+@@ -152,7 +147,7 @@ public class VarDefinitionHelper {
          DoStatement dstat = (DoStatement)stat;
          if (dstat.getLooptype() == DoStatement.LOOP_FOR) {
  
@@ -81,7 +84,7 @@ index ca27e4718c556a478242a60df896f6f61db6e915..0c03cd52d3ab4b664545ebf8c57faa93
              continue;
            }
            else {
-@@ -198,12 +189,7 @@ public class VarDefinitionHelper {
+@@ -194,12 +189,7 @@ public class VarDefinitionHelper {
        // search for the first assignement to var [index]
        int addindex = 0;
        for (Exprent expr : lst) {
@@ -95,7 +98,7 @@ index ca27e4718c556a478242a60df896f6f61db6e915..0c03cd52d3ab4b664545ebf8c57faa93
            defset = true;
            break;
          }
-@@ -229,13 +215,17 @@ public class VarDefinitionHelper {
+@@ -225,13 +215,17 @@ public class VarDefinitionHelper {
          if (varproc.getLVT() != null) {
            Map<Integer, LVTVariable> vars = varproc.getLVT().getVars(stat);
            if (vars.containsKey(var.getIndex())) {
@@ -114,7 +117,7 @@ index ca27e4718c556a478242a60df896f6f61db6e915..0c03cd52d3ab4b664545ebf8c57faa93
    }
  
  
-@@ -374,14 +364,13 @@ public class VarDefinitionHelper {
+@@ -370,14 +364,13 @@ public class VarDefinitionHelper {
      return res;
    }
  
@@ -130,7 +133,7 @@ index ca27e4718c556a478242a60df896f6f61db6e915..0c03cd52d3ab4b664545ebf8c57faa93
            return true;
          }
        }
-@@ -434,150 +423,299 @@ public class VarDefinitionHelper {
+@@ -430,105 +423,305 @@ public class VarDefinitionHelper {
      }
    }
  
@@ -241,6 +244,9 @@ index ca27e4718c556a478242a60df896f6f61db6e915..0c03cd52d3ab4b664545ebf8c57faa93
 +                leaked_n.clear(); // Force no leaking at the end of if blocks
 +                // We may need to do this for Switches as well.. But havent run into that issue yet...
 +              }
++              else if (obj == ifst.getFirst()) {
++                leaked.putAll(leaked_n); //First is outside the scope so leak!
++              }
 +            }
 +            this_vars.putAll(leaked_n);
 +          }
@@ -284,49 +290,27 @@ index ca27e4718c556a478242a60df896f6f61db6e915..0c03cd52d3ab4b664545ebf8c57faa93
 +    }
 +    else if (exp.type == Exprent.EXPRENT_VAR) {
 +      var = (VarExprent)exp;
++    }
++
++    if (var == null) {
++      return null;
      }
  
 -    VarExprent left = (VarExprent)exp.getLeft();
 -    int index = varproc.getRemapped(left.getIndex());
-+    if (var == null) {
++    if (!var.isDefinition()) {
 +      return null;
 +    }
  
--    // constant
--    VarVersionPair source = new VarVersionPair(left);
--    if (exp.getRight().type == Exprent.EXPRENT_CONST) {
--        VarVersionPair target = new VarVersionPair(index,0);
--        if (index < left.getIndex()) {
--            remaps.put(source, target);
--        }
--        if (!constExprents.containsKey(source)) {
--            constExprents.put(source, new ArrayList<ConstExprent>());
--        }
--        List<ConstExprent> ceList = constExprents.get(source);
--        ceList.add((ConstExprent) exp.getRight());
--    } else {
--        for (Exprent e : exp.getRight().getAllExprents(true)) {
--          if (e.type == Exprent.EXPRENT_VAR) {
--              VarExprent right = (VarExprent)e;
--            if (varproc.getRemapped(right.getIndex()) == index) {
--              if (!left.equals(right) && left.getIndex() > right.getIndex()) {
--                remaps.put(source, new VarVersionPair(right));
--              }
--              return;
--            }
+-    for (Exprent e : exp.getRight().getAllExprents(true)) {
+-      if (e.type == Exprent.EXPRENT_VAR) {
+-          VarExprent right = (VarExprent)e;
+-        if (varproc.getRemapped(right.getIndex()) == index) {
+-          if (!left.equals(right) && left.getIndex() > right.getIndex()) {
+-            remaps.put(new VarVersionPair(left), new VarVersionPair(right));
 -          }
+-          return;
 -        }
--        if (index < left.getIndex()) {
--            remaps.put(source, new VarVersionPair(index,0));
--        }
-+    if (!var.isDefinition()) {
-+      return null;
-     }
--  }
- 
--  private void remapVar(Map<VarVersionPair, VarVersionPair> remap, Statement stat) {
--    if (remap == null || stat == null) {
--      return;
 +    int index = varproc.getRemapped(var.getIndex());
 +    VarVersionPair new_ = this_vars.get(index);
 +    if (new_ != null) {
@@ -334,14 +318,18 @@ index ca27e4718c556a478242a60df896f6f61db6e915..0c03cd52d3ab4b664545ebf8c57faa93
 +      VarVersionPair black = blacklist.get(old);
 +      if (black == null || !black.equals(new_)) {
 +        return new VPPEntry(var, this_vars.get(index));
-+      }
+       }
      }
+-  }
 +    this_vars.put(index, new VarVersionPair(var));
  
+-  private void remapVar(Map<VarVersionPair, VarVersionPair> remap, Statement stat) {
+-    if (remap == null || stat == null) {
+-      return;
 +    if (leaked != null) {
 +      leaked.put(index, new VarVersionPair(var));
-+    }
-+
+     }
+ 
 +    return null;
 +  }
 +
@@ -394,69 +382,45 @@ index ca27e4718c556a478242a60df896f6f61db6e915..0c03cd52d3ab4b664545ebf8c57faa93
      List<Exprent> lst = exprent.getAllExprents(true);
      lst.add(exprent);
      Map<VarVersionPair, VarType> mapExprentMinTypes = varproc.getVarVersions().getTypeProcessor().getMapExprentMinTypes();
-     Map<VarVersionPair, VarType> mapExprentMaxTypes = varproc.getVarVersions().getTypeProcessor().getMapExprentMaxTypes();
- 
-+    boolean remapped = false;
++    Map<VarVersionPair, VarType> mapExprentMaxTypes = varproc.getVarVersions().getTypeProcessor().getMapExprentMaxTypes();
 +
++    boolean remapped = false;
+ 
      for (Exprent expr : lst) {
 -      if (expr.type == Exprent.EXPRENT_VAR) {
--        VarExprent var = (VarExprent)expr;
--        VarVersionPair old = new VarVersionPair(var);
--        VarVersionPair new_ = remap.get(old);
--        if (new_ != null) {
--          VarType firstMinType = mapExprentMinTypes.get(old);
--          VarType secondMinType = mapExprentMinTypes.get(new_);
--          VarType type = firstMinType == null ? secondMinType : (secondMinType == null ? firstMinType :VarType.getCommonSupertype(firstMinType, secondMinType));
--          if (type == null || firstMinType == null || secondMinType == null) {
--              // no common supertype, skip the remapping
--              continue;
--          }
--          if (type.typeFamily == CodeConstants.TYPE_FAMILY_OBJECT) {
--              if (mapExprentMaxTypes.get(old) != null && mapExprentMaxTypes.get(new_) != null) {
--                  type = VarType.getCommonMinType(mapExprentMaxTypes.get(old), mapExprentMaxTypes.get(new_));
--              } else if (firstMinType.arrayDim != secondMinType.arrayDim) {
--                  continue;
--              } else {
--                  type = VarType.getCommonMinType(firstMinType, secondMinType);
--                  // couldn't find a sane common supertype, we're not gonna be able to merge
--                  if (type == null || type == VarType.VARTYPE_NULL) {
--                      continue;
--                  }
--              }
--          }
--          var.setIndex(new_.var);
--          var.setVersion(new_.version);
--          mapExprentMinTypes.put(new_, type);
--          if (constExprents.containsKey(old)) {
--              for (ConstExprent ce : constExprents.get(old)) {
--                  ce.setConstType(type);
--              }
 +      if (expr.type == Exprent.EXPRENT_ASSIGNMENT) {
 +        AssignmentExprent ass = (AssignmentExprent)expr;
 +        if (ass.getLeft().type == Exprent.EXPRENT_VAR && ass.getRight().type == Exprent.EXPRENT_CONST) {
 +          VarVersionPair left = new VarVersionPair((VarExprent)ass.getLeft());
 +          if (!left.equals(from) && !left.equals(to)) {
 +            continue;
-           }
--          if (constExprents.containsKey(new_)) {
--              for (ConstExprent ce : constExprents.get(new_)) {
--                  ce.setConstType(type);
--              }
++          }
 +
 +          ConstExprent right = (ConstExprent)ass.getRight();
++          if (right.getConstType() == VarType.VARTYPE_NULL) {
++              continue;
++          }
 +          VarType merged = getMergedType(mapExprentMinTypes.get(from), mapExprentMinTypes.get(to),
 +                                         mapExprentMaxTypes.get(from), mapExprentMaxTypes.get(to));
 +
 +          if (merged == null) { // Types incompatible, do not merge
 +            continue;
-           }
++          }
 +
 +          right.setConstType(merged);
-         }
-       }
++        }
++      }
 +      else if (expr.type == Exprent.EXPRENT_VAR) {
-+        VarExprent var = (VarExprent)expr;
-+        VarVersionPair old = new VarVersionPair(var);
+         VarExprent var = (VarExprent)expr;
+         VarVersionPair old = new VarVersionPair(var);
+-        VarVersionPair new_ = remap.get(old);
+-        if (new_ != null) {
+-          VarType firstMinType = mapExprentMinTypes.get(old);
+-          VarType secondMinType = mapExprentMinTypes.get(new_);
+-          var.setIndex(new_.var);
+-          var.setVersion(new_.version);
+-          VarType type = VarType.getCommonSupertype(firstMinType, secondMinType);
+-          mapExprentMinTypes.put(new_, type);
 +        if (!old.equals(from)) {
 +          continue;
 +        }
@@ -497,9 +461,9 @@ index ca27e4718c556a478242a60df896f6f61db6e915..0c03cd52d3ab4b664545ebf8c57faa93
 +        // couldn't find a sane common supertype, we're not gonna be able to merge
 +        if (type == null || type == VarType.VARTYPE_NULL) {
 +          return null;
-+        }
-+      }
-+    }
+         }
+       }
+     }
 +    return type;
 +  }
 +
@@ -523,7 +487,33 @@ index ca27e4718c556a478242a60df896f6f61db6e915..0c03cd52d3ab4b664545ebf8c57faa93
 +  private static class VPPEntry extends SimpleEntry<VarVersionPair, VarVersionPair> {
 +    public VPPEntry(VarExprent key, VarVersionPair value) {
 +        super(new VarVersionPair(key), value);
-     }
++    }
    }
  }
 \ No newline at end of file
+diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
+index d2a8f1c20c8a7954d4ba22d17fc1584d3bd4a3ca..52428c70df9fe4166129c11eacd4d19c2d7196e3 100644
+--- a/test/org/jetbrains/java/decompiler/LVTTest.java
++++ b/test/org/jetbrains/java/decompiler/LVTTest.java
+@@ -35,10 +35,20 @@ public class LVTTest extends SingleClassesTestBase {
+         super.setUp();
+         fixture.cleanup = false;
+     }
+-  @Test public void testMatch1() { doTest("pkg/TestPPMM"); }
++//  @Test public void testMatch1() { doTest("pkg/TestPPMM"); }
+ //  @Test public void testMatchLM() { doTest("pkg/TestLexManosLVT"); }
+ //  @Test public void testMatch1() { doTest("pkg/TestLVT"); }
+ //  @Test public void testMatch2() { doTest("pkg/TestLVTScoping"); }
+ //  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
+ //  @Test public void testMCGuiCmdBlock() { doTest("net/minecraft/client/gui/GuiCommandBlock"); }
++
++//  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
++
++//  @Test public void testMCGuiCmdBlock() { doTest("net/minecraft/client/gui/GuiCommandBlock"); }
++
++//  @Test public void testMCBlockFence() { doTest("net/minecraft/block/BlockFence"); }
++
++//  @Test public void testMCAbstractTexture() { doTest("net/minecraft/client/multiplayer/ServerAddress"); }
++//  @Test public void testMCAbstractTexture() { doTest("net/minecraft/client/resources/AbstractResourcePack"); }
++  @Test public void testMCGuiShareToLan() { doTest("net/minecraft/client/gui/GuiShareToLan"); }
+ }
diff --git a/FernFlower-Patches/0053-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch b/FernFlower-Patches/0027-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch
similarity index 96%
rename from FernFlower-Patches/0053-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch
rename to FernFlower-Patches/0027-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch
index 63d7e0b..a135423 100644
--- a/FernFlower-Patches/0053-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch
+++ b/FernFlower-Patches/0027-Bind-the-LVTs-at-the-time-we-create-the-exprents.-Th.patch
@@ -41,10 +41,10 @@ index 0425fbc336f5318514d09849e9910171aa46d8f9..7b94e5b4af7a6618e46f078bcec596e9
              instr.getOperand(1) < 0 ? FunctionExprent.FUNCTION_SUB : FunctionExprent.FUNCTION_ADD, Arrays
              .asList(vevar.copy(), new ConstExprent(VarType.VARTYPE_INT, Math.abs(instr.getOperand(1)), null)),
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-index fe45b111874c303e7a0e839e1ef358131bc320a2..4193f563d90c2fdfee692cf272fb3d3886f72e5b 100644
+index 7f3447bcf43c09321eeb34e8e62185bb6a38a261..729a3d2129c0d6765ad7b415bd4bee6cc40a09d2 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-@@ -41,11 +41,7 @@ public class LocalVariableTable {
+@@ -37,11 +37,7 @@ public class LocalVariableTable {
      mapLVT = null; // Invalidate the cache and rebuild it.
    }
  
@@ -57,7 +57,7 @@ index fe45b111874c303e7a0e839e1ef358131bc320a2..4193f563d90c2fdfee692cf272fb3d38
      //System.out.println(indent + stat.getClass().getSimpleName() + " (" + start +", " + end + ")");
  
      Map<Integer, List<LVTVariable>> map = getMapVarNames();
-@@ -53,7 +49,7 @@ public class LocalVariableTable {
+@@ -49,7 +45,7 @@ public class LocalVariableTable {
        return null;
      }
      for (LVTVariable lvt : map.get(index)) {
@@ -67,7 +67,7 @@ index fe45b111874c303e7a0e839e1ef358131bc320a2..4193f563d90c2fdfee692cf272fb3d38
        }
      }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 9ecb28bffa6dc6159370823066d8f189a3f1a83b..6d8ab120af2261fa02eccfcced62fdcb5cec79ae 100644
+index 5cb5f90885d6c1c748aaa4be4082b6690061f949..8e7a6b5148226b0123fe7e3589bd090e8ac0c4d3 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -133,7 +133,7 @@ public class VarDefinitionHelper {
diff --git a/FernFlower-Patches/0027-Sort-by-version-it-seems-that-it-increases-as-the-vi.patch b/FernFlower-Patches/0027-Sort-by-version-it-seems-that-it-increases-as-the-vi.patch
deleted file mode 100644
index 4834c57..0000000
--- a/FernFlower-Patches/0027-Sort-by-version-it-seems-that-it-increases-as-the-vi.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Sat, 8 Aug 2015 19:43:37 -0400
-Subject: [PATCH] Sort by version (it seems that it increases as the visitors
- visit the various methods), and use that to align versions with different
- instances of the same variable. Still some tweaks need to be made, but it's
- starting to look promising.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-index 99025a511b670f1bf84493afb1ac43f3cd394600..e5fbec84cfe40111f8cb93154f99904bcef8d20a 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-@@ -9,7 +9,6 @@ import java.util.Set;
- public class LocalVariableTable {
-   private Map<Integer, Set<LVTVariable>> startpoints;
-   private ArrayList<LVTVariable> allLVT;
--  private Map<VarVersionPair, String> mapVarNames;
- private Map<Integer, List<LVTVariable>> mapLVT;
- 
-   public LocalVariableTable(int len) {
-@@ -33,7 +32,7 @@ private Map<Integer, List<LVTVariable>> mapLVT;
-         mine.merge(other);
-       }
-     }
--    mapVarNames = null; // Invalidate the cache and rebuild it.
-+    mapLVT = null; // Invalidate the cache and rebuild it.
-   }
- 
-   public LVTVariable find(Integer index, List<Integer> offsets) {
-@@ -51,15 +50,14 @@ private Map<Integer, List<LVTVariable>> mapLVT;
-     return null;
-   }
- 
--  public Map<VarVersionPair, String> getMapVarNames() {
--    if (mapVarNames == null)
-+  public Map<Integer, List<LVTVariable>> getMapVarNames() {
-+    if (mapLVT == null)
-       buildNameMap();
--    return mapVarNames;
-+    return mapLVT;
-   }
- 
-   private void buildNameMap() {
-     Map<Integer, Integer> versions = new HashMap<Integer, Integer>();
--    mapVarNames = new HashMap<VarVersionPair, String>();
-     mapLVT = new HashMap<Integer,List<LVTVariable>>();
-     for (LVTVariable lvt : allLVT) {
-       Integer idx = versions.get(lvt.index);
-@@ -74,7 +72,6 @@ private Map<Integer, List<LVTVariable>> mapLVT;
-           mapLVT.put(lvt.index, lvtList);
-       }
-       lvtList.add(lvt);
--      mapVarNames.put(new VarVersionPair(lvt.index, idx.intValue()), lvt.name);
-     }
-   }
- 
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-index a2a79f581baeb57597f8a69c9701b8c35ac4e2dc..ccd1bd64ac0c5e721806fc2b9b423561976c7fe9 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-@@ -52,7 +52,7 @@ private LocalVariableTable lvt;
-     new VarDefinitionHelper(root, mt, this).setVarDefinitions();
-   }
- 
--  public void setDebugVarNames(Map<VarVersionPair, String> mapDebugVarNames) {
-+  public void setDebugVarNames(Map<Integer, List<LVTVariable>> mapDebugVarNames) {
-     if (varVersions == null) {
-       return;
-     }
-@@ -68,16 +68,35 @@ private LocalVariableTable lvt;
-     });
- 
-     Map<String, Integer> mapNames = new HashMap<String, Integer>();
--
-+    Map<Integer,SortedSet<VarVersionPair>> indexedPairs = new HashMap<Integer,SortedSet<VarVersionPair>>();
-+    Comparator<VarVersionPair> vvpVersionComparator = new Comparator<VarVersionPair>() {
-+        @Override
-+        public int compare(VarVersionPair o1, VarVersionPair o2) {
-+            return o1.version - o2.version;
-+        }
-+    };
-+    for (Entry<Integer, VarVersionPair> vvp : mapOriginalVarIndices.entrySet()) {
-+        SortedSet<VarVersionPair> set = indexedPairs.get(vvp.getValue().var);
-+        if (set == null) {
-+            set = new TreeSet<VarVersionPair>(vvpVersionComparator);
-+            indexedPairs.put(vvp.getValue().var, set);
-+        }
-+        set.add(vvp.getValue());
-+    }
-     for (VarVersionPair pair : listVars) {
-       String name = mapVarNames.get(pair);
- 
-       VarVersionPair key = mapOriginalVarIndices.get(pair.var);
-+
-       boolean lvtName = false;
-       if (key != null) {
--        if (mapDebugVarNames.containsKey(key)) {
--          name = mapDebugVarNames.get(key);
--          lvtName = true;
-+        if (indexedPairs.containsKey(key.var)) {
-+          int veridx = indexedPairs.get(key.var).headSet(key).size();
-+          List<LVTVariable> list = mapDebugVarNames.get(key.var);
-+          if (list.size()>veridx) {
-+              name = list.get(veridx).name;
-+              lvtName = true;
-+          }
-         }
-       }
- 
-diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-index 4b00061fcee269a40b24f80b6147d4940caa9db6..a983b2788c5ccb570539a28eca0acf4c627f0595 100644
---- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
-@@ -23,6 +23,7 @@ import org.jetbrains.java.decompiler.util.DataInputFullStream;
- 
- import java.io.IOException;
- import java.util.Collections;
-+import java.util.List;
- import java.util.Map;
- 
- /*
-@@ -37,7 +38,7 @@ import java.util.Map;
- */
- public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
- 
--  private Map<VarVersionPair, String> EMPTY_LVT = Collections.emptyMap();
-+  private Map<Integer, List<LVTVariable>> EMPTY_LVT = Collections.emptyMap();
-   private LocalVariableTable lvt;
- 
-   @Override
-@@ -65,7 +66,7 @@ public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
-     attr.lvt = lvt;
-   }
- 
--  public Map<VarVersionPair, String> getMapVarNames() {
-+  public Map<Integer, List<LVTVariable>> getMapVarNames() {
-     return lvt == null ? EMPTY_LVT : lvt.getMapVarNames();
-   }
- 
diff --git a/FernFlower-Patches/0028-Ignore-variables-without-an-LVT-entry.-They-re-likel.patch b/FernFlower-Patches/0028-Ignore-variables-without-an-LVT-entry.-They-re-likel.patch
deleted file mode 100644
index f7921c2..0000000
--- a/FernFlower-Patches/0028-Ignore-variables-without-an-LVT-entry.-They-re-likel.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Sun, 9 Aug 2015 11:58:54 -0400
-Subject: [PATCH] Ignore variables without an LVT entry. They're likely dummy
- vars generated by FF for exceptions, little info is missing. Also, don't
- exception on empty blocks, they're just empty blocks!
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
-index 4e865569886a79b208df09e2449106bea16ba87b..5a35cc8f05f06ca0e9726ff830eccff46da99b6b 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
-@@ -169,8 +169,8 @@ public class ClassWrapper {
-           StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
- 
-         if (attr != null) {
--          varProc.setDebugVarNames(attr.getMapVarNames());
-           varProc.setLVT(attr.getLVT());
-+          varProc.setDebugVarNames(attr.getMapVarNames());
-         }
-       }
- 
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index f0b17a55f189e6dd356a3188bb6e2ce01074393d..388e76a7a8270d81d03b661ddbfef5ed9fb53fe4 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-@@ -229,7 +229,10 @@ public class MethodProcessorRunnable implements Runnable {
- 
-   public static void printMethod(RootStatement root, String name, VarProcessor varProc) {
-     System.out.println(name + " {");
--
-+    if (root == null || root.getSequentialObjects() == null) {
-+        System.out.println("}");
-+        return;
-+    }
-     for (Object obj : root.getSequentialObjects()) {
-       if (obj instanceof Statement) {
-         printStatement((Statement)obj, "  ",varProc);
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-index ccd1bd64ac0c5e721806fc2b9b423561976c7fe9..6b15a12069348463463c60b541b38a355fb27e91 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
-@@ -93,9 +93,11 @@ private LocalVariableTable lvt;
-         if (indexedPairs.containsKey(key.var)) {
-           int veridx = indexedPairs.get(key.var).headSet(key).size();
-           List<LVTVariable> list = mapDebugVarNames.get(key.var);
--          if (list.size()>veridx) {
-+          if (list != null && list.size()>veridx) {
-               name = list.get(veridx).name;
-               lvtName = true;
-+          } else if (list == null) {
-+              // we're an exception type, probably. let's just fall through
-           }
-         }
-       }
-diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..c7e781e4172f736a831b857ca7fd3060d95e6186
---- /dev/null
-+++ b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
-@@ -0,0 +1,125 @@
-+/*
-+ * Copyright 2000-2014 JetBrains s.r.o.
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+package org.jetbrains.java.decompiler;
-+
-+import org.hamcrest.Matchers;
-+import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
-+import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
-+import org.jetbrains.java.decompiler.util.InterpreterUtil;
-+import org.junit.After;
-+import org.junit.Before;
-+import org.junit.Test;
-+
-+import java.io.*;
-+import java.util.Enumeration;
-+import java.util.HashMap;
-+import java.util.Map;
-+import java.util.zip.ZipEntry;
-+import java.util.zip.ZipFile;
-+
-+import static org.junit.Assert.assertThat;
-+import static org.junit.Assert.assertTrue;
-+
-+public class MinecraftDecompilationTest {
-+  private DecompilerTestFixture fixture;
-+
-+  private static final String MC_JAR = "minecraft_ff_in.jar";
-+  @Before
-+  public void setUp() throws IOException {
-+    fixture = new DecompilerTestFixture();
-+    // -din=1 -rbr=0 -dgs=1 -asc=1 -rsy=0
-+    Map<String,Object> mcFFOptions = new HashMap<String,Object>() {{
-+        put(IFernflowerPreferences.DECOMPILE_INNER,"1");
-+        put(IFernflowerPreferences.REMOVE_BRIDGE, "0");
-+        put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES,"1");
-+        put(IFernflowerPreferences.ASCII_STRING_CHARACTERS,"1");
-+        put(IFernflowerPreferences.REMOVE_SYNTHETIC,"0");
-+    }};
-+    fixture.setUp(mcFFOptions);
-+    if (!new File(fixture.getTestDataDir(), MC_JAR).exists()) {
-+        throw new RuntimeException("Missing "+MC_JAR+" in testData dir - aborting");
-+    }
-+  }
-+
-+  @After
-+  public void tearDown() {
-+//    fixture.tearDown();
-+//    fixture = null;
-+  }
-+
-+//  @Test
-+//  public void testDirectory() {
-+//    File classes = new File(fixture.getTempDir(), "classes");
-+//    unpack(new File(fixture.getTestDataDir(), "mc-fernflower-in.jar"), classes);
-+//
-+//    ConsoleDecompiler decompiler = fixture.getDecompiler();
-+//    decompiler.addSpace(classes, true);
-+//    decompiler.decompileContext();
-+//
-+//    compareDirectories(new File(fixture.getTestDataDir(), "bulk"), fixture.getTargetDir());
-+//  }
-+
-+  @Test
-+  public void testJar() {
-+    ConsoleDecompiler decompiler = fixture.getDecompiler();
-+    decompiler.addSpace(new File(fixture.getTestDataDir(), MC_JAR), true);
-+    decompiler.decompileContext();
-+
-+    File unpacked = new File(fixture.getTempDir(), "unpacked");
-+    unpack(new File(fixture.getTargetDir(), "bulk.jar"), unpacked);
-+
-+//    compareDirectories(new File(fixture.getTestDataDir(), "bulk"), unpacked);
-+  }
-+
-+  private static void unpack(File archive, File targetDir) {
-+    try {
-+      ZipFile zip = new ZipFile(archive);
-+      try {
-+        Enumeration<? extends ZipEntry> entries = zip.entries();
-+        while (entries.hasMoreElements()) {
-+          ZipEntry entry = entries.nextElement();
-+          if (!entry.isDirectory()) {
-+            File file = new File(targetDir, entry.getName());
-+            assertTrue(file.getParentFile().mkdirs() || file.getParentFile().isDirectory());
-+            InputStream in = zip.getInputStream(entry);
-+            OutputStream out = new FileOutputStream(file);
-+            InterpreterUtil.copyStream(in, out);
-+            out.close();
-+            in.close();
-+          }
-+        }
-+      }
-+      finally {
-+        zip.close();
-+      }
-+    }
-+    catch (IOException e) {
-+      throw new RuntimeException(e);
-+    }
-+  }
-+
-+  private static void compareDirectories(File expected, File actual) {
-+    String[] expectedList = expected.list();
-+    String[] actualList = actual.list();
-+    assertThat(actualList, Matchers.arrayContainingInAnyOrder(expectedList));
-+    for (String name : expectedList) {
-+      File child = new File(expected, name);
-+      if (child.isDirectory()) {
-+        compareDirectories(child, new File(actual, name));
-+      }
-+    }
-+  }
-+}
diff --git a/FernFlower-Patches/0055-Propogate-LVT-data-post-merge.-And-fix-injected-var-.patch b/FernFlower-Patches/0028-Propagate-LVT-data-post-merge-fix-injected-var-defs-.patch
similarity index 93%
rename from FernFlower-Patches/0055-Propogate-LVT-data-post-merge.-And-fix-injected-var-.patch
rename to FernFlower-Patches/0028-Propagate-LVT-data-post-merge-fix-injected-var-defs-.patch
index 93905f8..d708d19 100644
--- a/FernFlower-Patches/0055-Propogate-LVT-data-post-merge.-And-fix-injected-var-.patch
+++ b/FernFlower-Patches/0028-Propagate-LVT-data-post-merge-fix-injected-var-defs-.patch
@@ -1,8 +1,8 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sun, 27 Sep 2015 21:17:47 -0700
-Subject: [PATCH] Propogate LVT data post merge. And fix injected var defs LVT
- association.
+Subject: [PATCH] Propagate LVT data post merge, fix injected var defs LVT
+ association
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
@@ -26,7 +26,7 @@ index 3d5f03b67d07b54d305c16e1dce4d10a93c5b26d..05a4f79e80f9ac6023ff66996e3fda0e
    public String toString() {
      return lvt != null ? lvt.name :  "var_" + index + "_" + version;
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 6d8ab120af2261fa02eccfcced62fdcb5cec79ae..cc5e5e427125ab4673f9aef2a7b56de37f0ab113 100644
+index 8e7a6b5148226b0123fe7e3589bd090e8ac0c4d3..8ae12fe552787580c73728af83502a1de26d8d5a 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -133,7 +133,6 @@ public class VarDefinitionHelper {
@@ -117,7 +117,7 @@ index 6d8ab120af2261fa02eccfcced62fdcb5cec79ae..cc5e5e427125ab4673f9aef2a7b56de3
    private Statement findFirstBlock(Statement stat, Integer varindex) {
  
      LinkedList<Statement> stack = new LinkedList<Statement>();
-@@ -378,31 +424,99 @@ if (mt.getName().equals("func_180655_c")){
+@@ -378,31 +424,102 @@ if (mt.getName().equals("func_180655_c")){
      return false;
    }
  
@@ -125,10 +125,9 @@ index 6d8ab120af2261fa02eccfcced62fdcb5cec79ae..cc5e5e427125ab4673f9aef2a7b56de3
 -    if (stat == null || varproc.getLVT() == null) {
 +  private void propogateLVTs(Statement stat) {
 +    if (varproc.getLVT() == null) {
-       return;
-     }
- 
--    Map<Integer, LVTVariable> vars = varproc.getLVT().getVars(stat);
++      return;
++    }
++
 +    MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
 +    Map<VarVersionPair, LVTVariable> types = new HashMap<VarVersionPair, LVTVariable>();
 +
@@ -138,7 +137,10 @@ index 6d8ab120af2261fa02eccfcced62fdcb5cec79ae..cc5e5e427125ab4673f9aef2a7b56de3
 +    }
 +
 +    for (VarType var : md.params) {
-+      types.put(new VarVersionPair(index, 0), varproc.getLVT().getCandidates(index).get(0));
++      List<LVTVariable> vars = varproc.getLVT().getCandidates(index);
++      if (vars != null) {
++        types.put(new VarVersionPair(index, 0), vars.get(0));
++      }
 +      index += var.stackSize;
 +    }
 +
@@ -149,30 +151,35 @@ index 6d8ab120af2261fa02eccfcced62fdcb5cec79ae..cc5e5e427125ab4673f9aef2a7b56de3
 +
 +  private void findTypes(Statement stat, Map<VarVersionPair, LVTVariable> types) {
 +    if (stat == null) {
-+      return;
-+    }
-+
+       return;
+     }
+ 
+-    Map<Integer, LVTVariable> vars = varproc.getLVT().getVars(stat);
 +    for (Exprent exp : stat.getVarDefinitions()) {
 +      findTypes(exp, types);
 +    }
-+
-+    if (stat.getExprents() == null) {
-+      for (Object obj : stat.getSequentialObjects()) {
-+        if (obj instanceof Statement) {
+ 
+     if (stat.getExprents() == null) {
+       for (Object obj : stat.getSequentialObjects()) {
+         if (obj instanceof Statement) {
+-          setupLVTs((Statement)obj);
 +          findTypes((Statement)obj, types);
-+        }
-+        else if (obj instanceof Exprent) {
+         }
+         else if (obj instanceof Exprent) {
+-          setupLVTs((Exprent)obj, vars);
 +          findTypes((Exprent)obj, types);
-+        }
-+      }
-+    }
-+    else {
-+      for (Exprent exp : stat.getExprents()) {
+         }
+       }
+     }
+     else {
+       for (Exprent exp : stat.getExprents()) {
+-        setupLVTs(exp, vars);
 +        findTypes(exp, types);
-+      }
-+    }
-+  }
-+
+       }
+     }
+   }
+ 
+-  private void setupLVTs(Exprent exprent, Map<Integer, LVTVariable> lvts) {
 +  private void findTypes(Exprent exp, Map<VarVersionPair, LVTVariable> types) {
 +    VarExprent var = null;
 +
@@ -198,33 +205,29 @@ index 6d8ab120af2261fa02eccfcced62fdcb5cec79ae..cc5e5e427125ab4673f9aef2a7b56de3
 +    if (stat == null || types.size() == 0) {
 +      return;
 +    }
- 
-     if (stat.getExprents() == null) {
-       for (Object obj : stat.getSequentialObjects()) {
-         if (obj instanceof Statement) {
--          setupLVTs((Statement)obj);
++
++    if (stat.getExprents() == null) {
++      for (Object obj : stat.getSequentialObjects()) {
++        if (obj instanceof Statement) {
 +          applyTypes((Statement)obj, types);
-         }
-         else if (obj instanceof Exprent) {
--          setupLVTs((Exprent)obj, vars);
++        }
++        else if (obj instanceof Exprent) {
 +          applyTypes((Exprent)obj, types);
-         }
-       }
-     }
-     else {
-       for (Exprent exp : stat.getExprents()) {
--        setupLVTs(exp, vars);
++        }
++      }
++    }
++    else {
++      for (Exprent exp : stat.getExprents()) {
 +        applyTypes(exp, types);
-       }
-     }
-   }
- 
--  private void setupLVTs(Exprent exprent, Map<Integer, LVTVariable> lvts) {
++      }
++    }
++  }
++
 +  private void applyTypes(Exprent exprent, Map<VarVersionPair, LVTVariable> types) {
      if (exprent == null) {
        return;
      }
-@@ -412,12 +526,12 @@ if (mt.getName().equals("func_180655_c")){
+@@ -412,12 +529,12 @@ if (mt.getName().equals("func_180655_c")){
      for (Exprent expr : lst) {
        if (expr.type == Exprent.EXPRENT_VAR) {
          VarExprent var = (VarExprent)expr;
@@ -236,11 +239,11 @@ index 6d8ab120af2261fa02eccfcced62fdcb5cec79ae..cc5e5e427125ab4673f9aef2a7b56de3
          } else {
 -            System.currentTimeMillis();
 +          System.currentTimeMillis();
-+          System.out.println("null " + new VarVersionPair(var));
++          //System.out.println("null " + new VarVersionPair(var));
          }
        }
      }
-@@ -439,19 +553,20 @@ if (mt.getName().equals("func_180655_c")){
+@@ -439,19 +556,20 @@ if (mt.getName().equals("func_180655_c")){
  
      Map<VarVersionPair, VarVersionPair> blacklist = new HashMap<VarVersionPair, VarVersionPair>();
      VPPEntry remap = mergeVars(stat, parent, new HashMap<Integer, VarVersionPair>(), blacklist);
diff --git a/FernFlower-Patches/0056-Fix-types-to-use-LVT-first-and-fallback-to-other-typ.patch b/FernFlower-Patches/0029-Fix-types-to-use-LVT-first-and-fallback-to-other-typ.patch
similarity index 100%
rename from FernFlower-Patches/0056-Fix-types-to-use-LVT-first-and-fallback-to-other-typ.patch
rename to FernFlower-Patches/0029-Fix-types-to-use-LVT-first-and-fallback-to-other-typ.patch
diff --git a/FernFlower-Patches/0057-NPE-protection-in-LVT-loading.patch b/FernFlower-Patches/0030-NPE-protection-in-LVT-loading-and-EnumProcessor.patch
similarity index 59%
rename from FernFlower-Patches/0057-NPE-protection-in-LVT-loading.patch
rename to FernFlower-Patches/0030-NPE-protection-in-LVT-loading-and-EnumProcessor.patch
index a61e292..caf663b 100644
--- a/FernFlower-Patches/0057-NPE-protection-in-LVT-loading.patch
+++ b/FernFlower-Patches/0030-NPE-protection-in-LVT-loading-and-EnumProcessor.patch
@@ -1,9 +1,24 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 1 Oct 2015 18:03:36 -0700
-Subject: [PATCH] NPE protection in LVT loading.
+Subject: [PATCH] NPE protection in LVT loading and EnumProcessor
 
 
+diff --git a/src/org/jetbrains/java/decompiler/main/EnumProcessor.java b/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
+index 37a3384c390209bdbcf46843a4c1a771a24dde18..8956e0ebbe08c761ab14ed61850d767b46642a99 100644
+--- a/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
+@@ -74,7 +74,9 @@ public class EnumProcessor {
+ 
+   // FIXME: move to a util class (see also InitializerProcessor)
+   private static Statement findFirstData(Statement stat) {
+-
++    if (stat == null) {
++      return null;
++    }
+     if (stat.getExprents() != null) {
+       return stat;
+     }
 diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
 index 771ec7add154d7897fa54ac46d91e66e6ad2ecc5..a95870f4b9de4b87eff9a15b88492e8cc051cbdd 100644
 --- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
diff --git a/FernFlower-Patches/0061-Cleanup-unwanted-variables-in-synchronized-headers.patch b/FernFlower-Patches/0031-Cleanup-unwanted-variables-in-synchronized-headers-f.patch
similarity index 97%
rename from FernFlower-Patches/0061-Cleanup-unwanted-variables-in-synchronized-headers.patch
rename to FernFlower-Patches/0031-Cleanup-unwanted-variables-in-synchronized-headers-f.patch
index ecfb77e..9de115d 100644
--- a/FernFlower-Patches/0061-Cleanup-unwanted-variables-in-synchronized-headers.patch
+++ b/FernFlower-Patches/0031-Cleanup-unwanted-variables-in-synchronized-headers-f.patch
@@ -1,7 +1,8 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Fri, 2 Oct 2015 01:34:53 -0700
-Subject: [PATCH] Cleanup unwanted variables in synchronized headers.
+Subject: [PATCH] Cleanup unwanted variables in synchronized headers, fix
+ switch cases leaking variables incorrectly
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
@@ -168,10 +169,10 @@ index 0000000000000000000000000000000000000000..371fc5aafff4dd8f7dc86bc476e97f8e
 +  }
 +}
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 560328a405e5860dba08daf85f0e957a21fc91d1..e294648ca0e77864f3827b94bd6846440b139a30 100644
+index 8ae12fe552787580c73728af83502a1de26d8d5a..2259ce1c9b2bc515fd588ff44a2d152567ab3cf4 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-@@ -635,6 +635,12 @@ public class VarDefinitionHelper {
+@@ -638,6 +638,15 @@ public class VarDefinitionHelper {
                  leaked.putAll(leaked_n); //First is outside the scope so leak!
                }
              }
@@ -180,6 +181,9 @@ index 560328a405e5860dba08daf85f0e957a21fc91d1..e294648ca0e77864f3827b94bd684644
 +              if (obj == stat.getFirst()) {
 +                leaked.putAll(leaked_n); //First is outside the scope so leak!
 +              }
++              else {
++                leaked_n.clear();
++              }
 +            }
              this_vars.putAll(leaked_n);
            }
diff --git a/FernFlower-Patches/0031-Fix-permissions-on-gradlew.-It-s-writeable-on-linux.patch b/FernFlower-Patches/0031-Fix-permissions-on-gradlew.-It-s-writeable-on-linux.patch
deleted file mode 100644
index b017e58..0000000
--- a/FernFlower-Patches/0031-Fix-permissions-on-gradlew.-It-s-writeable-on-linux.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Thu, 13 Aug 2015 17:06:24 -0700
-Subject: [PATCH] Fix permissions on gradlew. It's writeable on linux.
-
-
-diff --git a/gradlew b/gradlew
-old mode 100644
-new mode 100755
diff --git a/FernFlower-Patches/0062-Include-LVT-info-in-VarExprent.copy.patch b/FernFlower-Patches/0032-Include-LVT-info-in-VarExprent.copy.patch
similarity index 96%
rename from FernFlower-Patches/0062-Include-LVT-info-in-VarExprent.copy.patch
rename to FernFlower-Patches/0032-Include-LVT-info-in-VarExprent.copy.patch
index 0168b82..93046c3 100644
--- a/FernFlower-Patches/0062-Include-LVT-info-in-VarExprent.copy.patch
+++ b/FernFlower-Patches/0032-Include-LVT-info-in-VarExprent.copy.patch
@@ -17,7 +17,7 @@ index 933b0467478a4315a6d8dbdb7ae067f57046a8bc..c85d889d96073327a5ea08a9d986621d
    }
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index e294648ca0e77864f3827b94bd6846440b139a30..88dae4d81ca4ebc059cc575cf5e97d9f5bfe0fee 100644
+index 2259ce1c9b2bc515fd588ff44a2d152567ab3cf4..bec695f0265d7ed92175ba4e43ce2932f70eed16 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 @@ -260,22 +260,18 @@ public class VarDefinitionHelper {
diff --git a/FernFlower-Patches/0032-Partially-revert-TryCatch-statements-will-now-use-th.patch b/FernFlower-Patches/0032-Partially-revert-TryCatch-statements-will-now-use-th.patch
deleted file mode 100644
index 096f5c6..0000000
--- a/FernFlower-Patches/0032-Partially-revert-TryCatch-statements-will-now-use-th.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Thu, 13 Aug 2015 21:45:39 -0700
-Subject: [PATCH] Partially revert "TryCatch statements will now use the
- correct variable index for their exception variable." (rolled back catch
- changes)
-
-This reverts commit 5f699acc70d8e40f758737ae88aeddecc07edc8c.
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
-index d5b432c4fe852fff994e03fed0398da7e22997bd..812ed10b00ba6224ef947be953bc8d88bd72e2f7 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
-@@ -16,7 +16,6 @@
- package org.jetbrains.java.decompiler.modules.decompiler.stats;
- 
- import org.jetbrains.java.decompiler.code.CodeConstants;
--import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
- import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.main.TextBuffer;
- import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
-@@ -69,15 +68,7 @@ public class CatchAllStatement extends Statement {
-       }
-     }
- 
--    int varIndex = -1;
--    BasicBlock block = handler.getBasichead().getBlock();
--    if (!block.getSeq().isEmpty() && block.getInstruction(0).opcode == CodeConstants.opc_astore) {
--      varIndex = block.getInstruction(0).getOperand(0);
--    }
--    else {
--      varIndex = DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER);
--    }
--    vars.add(new VarExprent(varIndex,
-+    vars.add(new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
-                             new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Throwable"),
-                             (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR)));
-   }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
-index fda5ed373d94f875ba6450d361bda722086e03d0..8d56042e3667eb6843cdea18d01536f90ea59e50 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
-@@ -60,15 +60,7 @@ public class CatchStatement extends Statement {
-         stats.addWithKey(stat, stat.id);
-         exctstrings.add(new ArrayList<String>(edge.getExceptions()));
- 
--        int varIndex = -1;
--        BasicBlock block = stat.getBasichead().getBlock();
--        if (!block.getSeq().isEmpty() && block.getInstruction(0).opcode == CodeConstants.opc_astore) {
--          varIndex = block.getInstruction(0).getOperand(0);
--        }
--        else {
--          varIndex = DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER);
--        }
--        vars.add(new VarExprent(varIndex,
-+        vars.add(new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
-                                 new VarType(CodeConstants.TYPE_OBJECT, 0, edge.getExceptions().get(0)),
-                                 // FIXME: for now simply the first type. Should get the first common superclass when possible.
-                                 (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR)));
-diff --git a/testData/results/TestClassSimpleBytecodeMapping.dec b/testData/results/TestClassSimpleBytecodeMapping.dec
-index 4a2f333d257cb2a56dddd0b5ae2887537b01bd86..1a2532f0b736a3d1a2db4f7ba3645e48e419189f 100644
---- a/testData/results/TestClassSimpleBytecodeMapping.dec
-+++ b/testData/results/TestClassSimpleBytecodeMapping.dec
-@@ -21,8 +21,8 @@ public class TestClassSimpleBytecodeMapping {
-    public void test2(String var1) {
-       try {
-          Integer.parseInt(var1);// 34
--      } catch (Exception var2) {// 35
--         System.out.println(var2);// 36
-+      } catch (Exception var6) {// 35
-+         System.out.println(var6);// 36
-       } finally {
-          System.out.println("Finally");// 38
-       }
-diff --git a/testData/results/TestTryCatchFinally.dec b/testData/results/TestTryCatchFinally.dec
-index fbe5782266c4dbcdb4d5558b3173625228f71038..772a76e8a850ff853ef51acb29d82a1ba95dfee6 100644
---- a/testData/results/TestTryCatchFinally.dec
-+++ b/testData/results/TestTryCatchFinally.dec
-@@ -4,10 +4,10 @@ public class TestTryCatchFinally {
-    public void test1(String var1) {
-       try {
-          System.out.println("sout1");// 24
--      } catch (Exception var2) {
-+      } catch (Exception var9) {
-          try {
-             System.out.println("sout2");// 27
--         } catch (Exception var3) {// 28
-+         } catch (Exception var8) {// 28
-             ;
-          }
-       } finally {
-@@ -28,10 +28,10 @@ public class TestTryCatchFinally {
- 
-    public int test(String var1) {
-       try {
--         int var5 = Integer.parseInt(var1);// 51
--         return var5;
--      } catch (Exception var2) {// 52
--         System.out.println("Error" + var2);// 53
-+         int var2 = Integer.parseInt(var1);// 51
-+         return var2;
-+      } catch (Exception var6) {// 52
-+         System.out.println("Error" + var6);// 53
-       } finally {
-          System.out.println("Finally");// 55
-       }
diff --git a/FernFlower-Patches/0063-Remove-dowhile-detection-and-restore-do-loop-collaps.patch b/FernFlower-Patches/0033-Remove-dowhile-detection-and-restore-do-loop-collaps.patch
similarity index 100%
rename from FernFlower-Patches/0063-Remove-dowhile-detection-and-restore-do-loop-collaps.patch
rename to FernFlower-Patches/0033-Remove-dowhile-detection-and-restore-do-loop-collaps.patch
diff --git a/FernFlower-Patches/0064-Move-LoopExtract-to-before-MergeHelper-and-add-more-.patch b/FernFlower-Patches/0034-Loosen-up-LoopExtractHelper-to-include-extractable-b.patch
similarity index 74%
rename from FernFlower-Patches/0064-Move-LoopExtract-to-before-MergeHelper-and-add-more-.patch
rename to FernFlower-Patches/0034-Loosen-up-LoopExtractHelper-to-include-extractable-b.patch
index 6fb1fce..6b16af7 100644
--- a/FernFlower-Patches/0064-Move-LoopExtract-to-before-MergeHelper-and-add-more-.patch
+++ b/FernFlower-Patches/0034-Loosen-up-LoopExtractHelper-to-include-extractable-b.patch
@@ -1,9 +1,10 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Sat, 3 Oct 2015 22:54:34 -0700
-Subject: [PATCH] Move LoopExtract to before MergeHelper and add more debug
- information to printMethod.
+Subject: [PATCH] Loosen up LoopExtractHelper to include extractable break
+ edges, move to before MergeHelper
 
+Also add more debug information to printMethod.
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
 index ef7e97a5e99899896b11376fd31e3511fb5b06b5..eca34134bf72cb0ddc9e3b245ca3847478f3a39f 100644
@@ -173,3 +174,80 @@ index c93be38f6abaabfe2704a3fd7c8f0d17a1b9ff52..67d16d5c139033d4774acc22c54b8866
        throw new RuntimeException("parsing failure!");
      }
  
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
+index d5c9e8f20aee82846a0d92f1c80b9d75a5984f8f..93bc21dd17add5a854450a034ed69a0a961808ee 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
+@@ -22,6 +22,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
+ 
+ import java.util.ArrayList;
+ import java.util.Arrays;
++import java.util.List;
+ import java.util.Set;
+ 
+ 
+@@ -79,21 +80,27 @@ public class LoopExtractHelper {
+       return false;
+     }
+ 
++    List<Statement> stats = new ArrayList<Statement>();
+     for (StatEdge edge : stat.getLabelEdges()) {
+       if (edge.getType() != StatEdge.TYPE_CONTINUE && edge.getDestination().type != Statement.TYPE_DUMMYEXIT) {
+-        return false;
++        if (edge.getType() == StatEdge.TYPE_BREAK && isExternStatement(stat, edge.getSource(), edge.getSource())) {
++          stats.add(edge.getSource());
++        }
++        else {
++          return false;
++        }
+       }
+     }
+ 
+-    if (!extractLastIf(stat)) {
+-      return extractFirstIf(stat);
++    if (!extractLastIf(stat, stats)) {
++      return extractFirstIf(stat, stats);
+     }
+     else {
+       return true;
+     }
+   }
+ 
+-  private static boolean extractLastIf(DoStatement stat) {
++  private static boolean extractLastIf(DoStatement stat, List<Statement> stats) {
+ 
+     // search for an if condition at the end of the loop
+     Statement last = stat.getFirst();
+@@ -114,6 +121,11 @@ public class LoopExtractHelper {
+ 
+           if (set.isEmpty()) { // no direct continues in a do{}while loop
+             if (isExternStatement(stat, ifstat, ifstat)) {
++              for (Statement s : stats) {
++                if (!ifstat.containsStatement(s)) {
++                  return false;
++                }
++              }
+               extractIfBlock(stat, lastif);
+               return true;
+             }
+@@ -124,7 +136,7 @@ public class LoopExtractHelper {
+     return false;
+   }
+ 
+-  private static boolean extractFirstIf(DoStatement stat) {
++  private static boolean extractFirstIf(DoStatement stat, List<Statement> stats) {
+ 
+     // search for an if condition at the entrance of the loop
+     Statement first = stat.getFirst();
+@@ -142,6 +154,11 @@ public class LoopExtractHelper {
+           Statement ifstat = firstif.getIfstat();
+ 
+           if (isExternStatement(stat, ifstat, ifstat)) {
++            for (Statement s : stats) {
++              if (!ifstat.containsStatement(s)) {
++                return false;
++              }
++            }
+             extractIfBlock(stat, firstif);
+             return true;
+           }
diff --git a/FernFlower-Patches/0066-Hack-to-prevent-extracted-ifs-from-being-inlined-aga.patch b/FernFlower-Patches/0035-Hack-to-prevent-extracted-ifs-from-being-inlined-aga.patch
similarity index 100%
rename from FernFlower-Patches/0066-Hack-to-prevent-extracted-ifs-from-being-inlined-aga.patch
rename to FernFlower-Patches/0035-Hack-to-prevent-extracted-ifs-from-being-inlined-aga.patch
diff --git a/FernFlower-Patches/0035-Make-Loop-Enhancement-retain-all-bytecode-data.-And-.patch b/FernFlower-Patches/0035-Make-Loop-Enhancement-retain-all-bytecode-data.-And-.patch
deleted file mode 100644
index 86f430c..0000000
--- a/FernFlower-Patches/0035-Make-Loop-Enhancement-retain-all-bytecode-data.-And-.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Tue, 25 Aug 2015 12:03:36 -0700
-Subject: [PATCH] Make Loop Enhancement retain all bytecode data. And support
- iterator/listIterator.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-index d994c26c65b45e18e54622865e3bc454b22feb0a..3172b5e6754fc9e2d5570f1d7110dc452b77b510 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-@@ -118,6 +118,10 @@ public class MergeHelper {
-           if (ifedge.getType() == StatEdge.TYPE_BREAK) {
-             ifexpr.negateIf();
-           }
-+          if (stat.getConditionExprent() != null) {
-+            ifexpr.getCondition().addBytecodeOffsets(stat.getConditionExprent().bytecode);
-+          }
-+          ifexpr.getCondition().addBytecodeOffsets(lastif.getHeadexprent().bytecode);
-           stat.setConditionExprent(ifexpr.getCondition());
-           lastif.getFirst().removeSuccessor(ifedge);
-           lastif.removeSuccessor(elseedge);
-@@ -175,6 +179,10 @@ public class MergeHelper {
-               // negate condition (while header)
-               IfExprent ifexpr = (IfExprent)firstif.getHeadexprent().copy();
-               ifexpr.negateIf();
-+              if (stat.getConditionExprent() != null) {
-+                ifexpr.getCondition().addBytecodeOffsets(stat.getConditionExprent().bytecode);
-+              }
-+              ifexpr.getCondition().addBytecodeOffsets(firstif.getHeadexprent().bytecode);
-               stat.setConditionExprent(ifexpr.getCondition());
- 
-               // remove edges
-@@ -213,7 +221,12 @@ public class MergeHelper {
-               stat.setLooptype(DoStatement.LOOP_WHILE);
- 
-               // no need to negate the while condition
--              stat.setConditionExprent(((IfExprent)firstif.getHeadexprent().copy()).getCondition());
-+              IfExprent ifexpr = (IfExprent)firstif.getHeadexprent().copy();
-+              if (stat.getConditionExprent() != null) {
-+                ifexpr.getCondition().addBytecodeOffsets(stat.getConditionExprent().bytecode);
-+              }
-+              ifexpr.getCondition().addBytecodeOffsets(firstif.getHeadexprent().bytecode);
-+              stat.setConditionExprent(ifexpr.getCondition());
- 
-               // remove edges
-               StatEdge ifedge = firstif.getIfEdge();
-@@ -369,9 +382,17 @@ public class MergeHelper {
- 
-       stat.setLooptype(DoStatement.LOOP_FOR);
-       if (hasinit) {
--        stat.setInitExprent(preData.getExprents().remove(preData.getExprents().size() - 1));
-+        Exprent exp = preData.getExprents().remove(preData.getExprents().size() - 1);
-+        if (stat.getInitExprent() != null) {
-+          exp.addBytecodeOffsets(stat.getInitExprent().bytecode);
-+        }
-+        stat.setInitExprent(exp);
-       }
--      stat.setIncExprent(lastData.getExprents().remove(lastData.getExprents().size() - 1));
-+      Exprent exp = lastData.getExprents().remove(lastData.getExprents().size() - 1);
-+      if (stat.getIncExprent() != null) {
-+        exp.addBytecodeOffsets(stat.getIncExprent().bytecode);
-+      }
-+      stat.setIncExprent(exp);
-     }
- 
-     cleanEmptyStatements(stat, lastData);
-@@ -425,20 +446,29 @@ public class MergeHelper {
- 
-     if (stat.getLooptype() == DoStatement.LOOP_WHILE && initDoExprent != null && firstDoExprent != null) {
-       if (initDoExprent.type == Exprent.EXPRENT_ASSIGNMENT &&
--          isInvoke(((AssignmentExprent)initDoExprent).getRight(), null, "iterator", "()Ljava/util/Iterator;")) {
-+          isIteratorCall(((AssignmentExprent)initDoExprent).getRight())) {
- 
--        if (!isInvoke(drillNots(stat.getConditionExprent()), "java/util/Iterator", "hasNext", "()Z") ||
-+        if (!isHasNextCall(drillNots(stat.getConditionExprent())) ||
-             firstDoExprent.type != Exprent.EXPRENT_ASSIGNMENT) {
-           return false;
-         }
- 
-         AssignmentExprent ass = (AssignmentExprent)firstDoExprent;
--        if (!isInvoke(ass.getRight(), "java/util/Iterator", "next", "()Ljava/lang/Object;") ||
--            ass.getLeft().type != Exprent.EXPRENT_VAR) {
-+        if (!isNextCall(ass.getRight()) || ass.getLeft().type != Exprent.EXPRENT_VAR) {
-           return false;
-         }
- 
-         InvocationExprent holder = (InvocationExprent)((AssignmentExprent)initDoExprent).getRight();
-+
-+        holder.getInstance().addBytecodeOffsets(initDoExprent.bytecode);
-+        ass.getLeft().addBytecodeOffsets(firstDoExprent.bytecode);
-+        if (stat.getIncExprent() != null) {
-+          holder.getInstance().addBytecodeOffsets(stat.getIncExprent().bytecode);
-+        }
-+        if (stat.getInitExprent() != null) {
-+          ass.getLeft().addBytecodeOffsets(stat.getInitExprent().bytecode);
-+        }
-+
-         stat.setLooptype(DoStatement.LOOP_FOREACH);
-         stat.setInitExprent(ass.getLeft());
-         stat.setIncExprent(holder.getInstance());
-@@ -448,24 +478,48 @@ public class MergeHelper {
-     }
-     else if (stat.getLooptype() == DoStatement.LOOP_FOR) {
-       if (isType(stat.getInitExprent(), Exprent.EXPRENT_ASSIGNMENT) &&
--          isInvoke(((AssignmentExprent)stat.getInitExprent()).getRight(), null, "iterator", "()Ljava/util/Iterator;") &&
-+          isIteratorCall(((AssignmentExprent)stat.getInitExprent()).getRight()) &&
-           isType(stat.getConditionExprent(), Exprent.EXPRENT_FUNCTION)) {
- 
--        if (!isInvoke(drillNots(stat.getConditionExprent()), "java/util/Iterator", "hasNext", "()Z") ||
-+        Exprent exp = drillNots(stat.getConditionExprent());
-+        if (!isHasNextCall(exp) ||
-             !isType(stat.getIncExprent(), Exprent.EXPRENT_ASSIGNMENT)) {
-           return false;
-         }
- 
-         AssignmentExprent ass = (AssignmentExprent)stat.getIncExprent();
--        if (!isInvoke(ass.getRight(), "java/util/Iterator", "next", "()Ljava/lang/Object;") ||
--            ass.getLeft().type != Exprent.EXPRENT_VAR) {
--          return false;
-+        if (!isNextCall(ass.getRight()) || ass.getLeft().type != Exprent.EXPRENT_VAR) {
-+
-+          if (firstDoExprent == null || !isNextCall(firstDoExprent.getRight()) ||
-+              firstDoExprent.getLeft().type != Exprent.EXPRENT_VAR) {
-+            return false;
-+          }
-+
-+          //Move the inc exprent back to the end of the body and remove the .next call
-+          Statement last = getLastDirectData(stat.getFirst());
-+          InvocationExprent holder = (InvocationExprent)getUncast(((AssignmentExprent)stat.getInitExprent()).getRight());
-+
-+          firstData.getExprents().remove(firstDoExprent);
-+          last.getExprents().add(stat.getIncExprent());
-+
-+          firstDoExprent.getLeft().addBytecodeOffsets(stat.getInitExprent().bytecode);
-+          firstDoExprent.getLeft().addBytecodeOffsets(stat.getIncExprent().bytecode);
-+          firstDoExprent.getLeft().addBytecodeOffsets(firstDoExprent.bytecode);
-+
-+          stat.setLooptype(DoStatement.LOOP_FOREACH);
-+          stat.setInitExprent(firstDoExprent.getLeft());
-+          stat.setIncExprent(holder.getInstance());
-         }
-+        else {
-+          InvocationExprent holder = (InvocationExprent)getUncast(((AssignmentExprent)stat.getInitExprent()).getRight());
- 
--        InvocationExprent holder = (InvocationExprent)((AssignmentExprent)stat.getInitExprent()).getRight();
--        stat.setLooptype(DoStatement.LOOP_FOREACH);
--        stat.setInitExprent(ass.getLeft());
--        stat.setIncExprent(holder.getInstance());
-+          holder.getInstance().addBytecodeOffsets(stat.getInitExprent().bytecode);
-+          ass.getLeft().addBytecodeOffsets(stat.getIncExprent().bytecode);
-+
-+          stat.setLooptype(DoStatement.LOOP_FOREACH);
-+          stat.setInitExprent(ass.getLeft());
-+          stat.setIncExprent(holder.getInstance());
-+        }
-       }
-       else if (initDoExprent != null && initDoExprent.getRight().type == Exprent.EXPRENT_FUNCTION) {
-         if (firstDoExprent == null ||
-@@ -496,23 +550,31 @@ public class MergeHelper {
-           return false;
-         }
- 
-+        funcRight.getLstOperands().get(0).addBytecodeOffsets(initDoExprent.bytecode);
-+        funcRight.getLstOperands().get(0).addBytecodeOffsets(stat.getIncExprent().bytecode);
-+        firstDoExprent.getLeft().addBytecodeOffsets(firstDoExprent.bytecode);
-+        firstDoExprent.getLeft().addBytecodeOffsets(stat.getInitExprent().bytecode);
-+
-         stat.setLooptype(DoStatement.LOOP_FOREACH);
-         stat.setInitExprent(firstDoExprent.getLeft());
-         stat.setIncExprent(funcRight.getLstOperands().get(0));
-         preData.getExprents().remove(initDoExprent);
-         firstData.getExprents().remove(firstDoExprent);
- 
-+
-         if (initCopyExprent != null && initCopyExprent.getLeft().type == Exprent.EXPRENT_VAR) {
-           VarExprent copy = (VarExprent)initCopyExprent.getLeft();
-           if (copy.getIndex() == array.getIndex() && copy.getVersion() == array.getVersion()) {
-             preData.getExprents().remove(initCopyExprent);
-+            initCopyExprent.getRight().addBytecodeOffsets(initCopyExprent.bytecode);
-+            initCopyExprent.getRight().addBytecodeOffsets(stat.getIncExprent().bytecode);
-             stat.setIncExprent(initCopyExprent.getRight());
-           }
-         }
-       }
-     }
- 
--    cleanEmptyStatements(stat, firstData);
-+    //cleanEmptyStatements(stat, firstData); //TODO: Look into this and see what it does...
- 
-     return true;
-   }
-@@ -520,8 +582,8 @@ public class MergeHelper {
-   private static boolean isType(Exprent exp, int type) { //This is just a helper macro, Wish java had real macros.
-     return exp != null && exp.type == type;
-   }
--
-   private static boolean isInvoke(Exprent exp, String cls, String method, String desc) {
-+    exp = getUncast(exp);
-     if (!isType(exp,  Exprent.EXPRENT_INVOCATION)) {
-       return false;
-     }
-@@ -591,15 +653,13 @@ public class MergeHelper {
-       return stat;
-     }
- 
--    switch (stat.type) {
--      case Statement.TYPE_SEQUENCE:
--        for (int i = stat.getStats().size() - 1; i >= 0; i--) {
--          Statement tmp = getLastDirectData(stat.getStats().get(i));
--          if (tmp == null || !tmp.getExprents().isEmpty()) {
--            return tmp;
--          }
--        }
-+    for (int i = stat.getStats().size() - 1; i >= 0; i--) {
-+      Statement tmp = getLastDirectData(stat.getStats().get(i));
-+      if (tmp == null || !tmp.getExprents().isEmpty()) {
-+        return tmp;
-+      }
-     }
-+
-     return null;
-   }
- 
-@@ -608,14 +668,37 @@ public class MergeHelper {
-       return stat;
-     }
- 
--    if (stat.type == Statement.TYPE_SEQUENCE) {
--      for (Statement tmp : stat.getStats()) {
--        Statement ret = getFirstDirectData(tmp);
--        if (ret != null) {
--          return ret;
--        }
-+    for (Statement tmp : stat.getStats()) {
-+      Statement ret = getFirstDirectData(tmp);
-+      if (ret != null) {
-+        return ret;
-       }
-     }
-     return null;
-   }
-+
-+  private static Exprent getUncast(Exprent exp) {
-+    if (exp.type == Exprent.EXPRENT_FUNCTION) {
-+      FunctionExprent func = (FunctionExprent)exp;
-+      if (func.getFuncType() == FunctionExprent.FUNCTION_CAST) {
-+        return getUncast(func.getLstOperands().get(0));
-+      }
-+    }
-+    return exp;
-+  }
-+
-+  private static boolean isIteratorCall(Exprent exp) {
-+    return isInvoke(exp, null, "iterator",     "()Ljava/util/Iterator;"    ) ||
-+           isInvoke(exp, null, "listIterator", "()Ljava/util/ListIterator;");
-+  }
-+
-+  private static boolean isHasNextCall(Exprent exp) {
-+    return isInvoke(exp, "java/util/Iterator",     "hasNext", "()Z") ||
-+           isInvoke(exp, "java/util/ListIterator", "hasNext", "()Z");
-+  }
-+
-+  private static boolean isNextCall(Exprent exp) {
-+    return isInvoke(exp, "java/util/Iterator",     "next", "()Ljava/lang/Object;") ||
-+           isInvoke(exp, "java/util/ListIterator", "next", "()Ljava/lang/Object;");
-+  }
- }
diff --git a/FernFlower-Patches/0036-Rewrite-for-each-detection-to-be-before-for-detectio.patch b/FernFlower-Patches/0036-Rewrite-for-each-detection-to-be-before-for-detectio.patch
new file mode 100644
index 0000000..8e4ea4b
--- /dev/null
+++ b/FernFlower-Patches/0036-Rewrite-for-each-detection-to-be-before-for-detectio.patch
@@ -0,0 +1,576 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lex Manos <LexManos@gmail.com>
+Date: Sun, 4 Oct 2015 04:23:24 -0700
+Subject: [PATCH] Rewrite for-each detection to be before for detection.
+
+
+diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+index 62d52975708c5a8126bdc73824fe575b14dea108..2e1668de1af3414bfbed0bf72461688246303931 100644
+--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
++++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+@@ -28,9 +28,13 @@ import org.jetbrains.java.decompiler.modules.decompiler.*;
+ import org.jetbrains.java.decompiler.modules.decompiler.deobfuscator.ExceptionDeobfuscator;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.IfExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatement;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.DummyExitStatement;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
+@@ -42,6 +46,10 @@ import java.util.BitSet;
+ 
+ public class MethodProcessorRunnable implements Runnable {
+ 
++  private static RootStatement currentRoot;
++
++  private static VarProcessor vp;
++
+   public final Object lock = new Object();
+ 
+   private final StructMethod method;
+@@ -126,7 +134,8 @@ public class MethodProcessorRunnable implements Runnable {
+     }
+ 
+     RootStatement root = DomHelper.parseGraph(graph, mt);
+-
++    MethodProcessorRunnable.currentRoot = root;
++    MethodProcessorRunnable.vp = varProc;
+     FinallyProcessor fProc = new FinallyProcessor(varProc);
+     while (fProc.iterateGraph(mt, root, graph)) {
+       root = DomHelper.parseGraph(graph, mt);
+@@ -232,6 +241,9 @@ public class MethodProcessorRunnable implements Runnable {
+     return finished;
+   }
+ 
++  public static void printMethod(String desc) {
++      printMethod(currentRoot, desc, vp);
++  }
+   public static void printMethod(Statement root, String name, VarProcessor varProc) {
+     System.out.println(name + " {");
+     if (root == null || root.getSequentialObjects() == null) {
+@@ -280,7 +292,13 @@ public class MethodProcessorRunnable implements Runnable {
+     int start = values.nextSetBit(0);
+     int end = values.length()-1;
+ 
+-    System.out.println(indent + "{" + statement.type + "}:" + statement.id + " (" + start + ", " + end + ") " + statement.getClass().getSimpleName());
++    System.out.print(indent + "{" + statement.type + "}:" + statement.id + " (" + start + ", " + end + ") " + statement.getClass().getSimpleName());
++    if (statement.type == Statement.TYPE_DO) {
++        System.out.print(" t:"+((DoStatement)statement).getLooptype());
++    } else if (statement.type == Statement.TYPE_BASICBLOCK) {
++        System.out.print(" i:"+((BasicBlockStatement)statement).getBlock().toStringOldIndices().replaceAll("\n", ";"));
++    }
++    System.out.println();
+     for (StatEdge edge : statement.getAllSuccessorEdges())
+       System.out.println(indent + " Dest: " + edge.getDestination());
+ 
+@@ -323,6 +341,8 @@ public class MethodProcessorRunnable implements Runnable {
+         sb.append("{").append(printExprent(" ",assignmentExprent.getLeft(),varProc)).append(" =").append(printExprent(" ",assignmentExprent.getRight(),varProc)).append("}");
+       } else if (exp instanceof IfExprent) {
+         sb.append(" ").append(exp.toJava(0, new BytecodeMappingTracer()));
++      } else if (exp instanceof FunctionExprent) {
++        sb.append(" ").append(exp.toJava(0, new BytecodeMappingTracer()));
+       }
+       return sb.toString();
+   }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+index 0e7f1ab7fe6fe4ca716cdcc0fc182dcfa59c3b7b..3025737508432bebbbd645908852f93d44dd384f 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+@@ -20,6 +20,7 @@ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.ArrayExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.IfExprent;
+@@ -67,10 +68,9 @@ public class MergeHelper {
+ 
+         // identify a while loop
+         if (matchWhile(stat)) {
+-          // identify a for loop - subtype of while
+-          matchFor(stat);
+-          // identify for each loop,
+-          matchForEach(stat);
++          if (!matchForEach(stat)) {
++            matchFor(stat);
++          }
+         }
+         else {
+           // identify a do{}while loop
+@@ -79,8 +79,9 @@ public class MergeHelper {
+ 
+         break;
+       case DoStatement.LOOP_WHILE:
+-        matchFor(stat);
+-        matchForEach(stat);
++        if (!matchForEach(stat)) {
++          matchFor(stat);
++        }
+     }
+ 
+     return (stat.getLooptype() != oldloop);
+@@ -357,6 +358,8 @@ public class MergeHelper {
+         }
+         else {
+           preData = current.getNeighbours(StatEdge.TYPE_REGULAR, Statement.DIRECTION_BACKWARD).get(0);
++          // we're not a basic block, so we can't dive inside for exprents
++          if (preData.type != Statement.TYPE_BASICBLOCK) break;
+           preData = getLastDirectData(preData);
+           if (preData != null && !preData.getExprents().isEmpty()) {
+             initDoExprent = preData.getExprents().get(preData.getExprents().size() - 1);
+@@ -402,8 +405,10 @@ public class MergeHelper {
+   }
+ 
+   private static boolean matchForEach(DoStatement stat) {
+-    AssignmentExprent firstDoExprent = null, initDoExprent = null, initCopyExprent = null;
+-    Statement firstData, preData = null;
++    AssignmentExprent firstDoExprent = null;
++    AssignmentExprent[] initExprents = new AssignmentExprent[3];
++    Statement firstData = null, preData = null, lastData = null;
++    Exprent lastExprent = null;
+ 
+     // search for an initializing exprent
+     Statement current = stat;
+@@ -421,14 +426,13 @@ public class MergeHelper {
+           preData = current.getNeighbours(StatEdge.TYPE_REGULAR, Statement.DIRECTION_BACKWARD).get(0);
+           preData = getLastDirectData(preData);
+           if (preData != null && !preData.getExprents().isEmpty()) {
+-            Exprent exprent = preData.getExprents().get(preData.getExprents().size() - 1);
+-            if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
+-              initDoExprent = (AssignmentExprent)exprent;
+-              if (preData.getExprents().size() >= 2) {
+-                exprent = preData.getExprents().get(preData.getExprents().size() - 2);
+-                if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
+-                  initCopyExprent = (AssignmentExprent)exprent;
+-                }
++            int size = preData.getExprents().size();
++            for (int x = 0; x < initExprents.length; x++) {
++              if (size > x) {
++                 Exprent exprent = preData.getExprents().get(size - 1 - x);
++                 if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
++                   initExprents[x] = (AssignmentExprent)exprent;
++                 }
+               }
+             }
+           }
+@@ -444,10 +448,14 @@ public class MergeHelper {
+     if (firstData != null && firstData.getExprents().get(0).type == Exprent.EXPRENT_ASSIGNMENT) {
+       firstDoExprent = (AssignmentExprent)firstData.getExprents().get(0);
+     }
++    lastData = getLastDirectData(stat.getFirst());
++    if (lastData != null && !lastData.getExprents().isEmpty()) {
++      lastExprent = lastData.getExprents().get(lastData.getExprents().size() - 1);
++    }
+ 
+-    if (stat.getLooptype() == DoStatement.LOOP_WHILE && initDoExprent != null && firstDoExprent != null) {
+-      if (initDoExprent.type == Exprent.EXPRENT_ASSIGNMENT &&
+-          isIteratorCall(((AssignmentExprent)initDoExprent).getRight())) {
++    if (stat.getLooptype() == DoStatement.LOOP_WHILE && initExprents[0] != null && firstDoExprent != null) {
++      if (initExprents[0].type == Exprent.EXPRENT_ASSIGNMENT &&
++          isIteratorCall(((AssignmentExprent)initExprents[0]).getRight())) {
+ 
+         if (!isHasNextCall(drillNots(stat.getConditionExprent())) ||
+             firstDoExprent.type != Exprent.EXPRENT_ASSIGNMENT) {
+@@ -463,13 +471,13 @@ public class MergeHelper {
+         InvocationExprent hnext = (InvocationExprent)getUncast(drillNots(stat.getConditionExprent()));
+         if (next.getInstance().type != Exprent.EXPRENT_VAR ||
+             hnext.getInstance().type != Exprent.EXPRENT_VAR ||
+-            ExprentUtil.isVarReferenced((VarExprent)initDoExprent.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
++            ExprentUtil.isVarReferenced((VarExprent)initExprents[0].getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
+           return false;
+         }
+ 
+-        InvocationExprent holder = (InvocationExprent)((AssignmentExprent)initDoExprent).getRight();
++        InvocationExprent holder = (InvocationExprent)((AssignmentExprent)initExprents[0]).getRight();
+ 
+-        holder.getInstance().addBytecodeOffsets(initDoExprent.bytecode);
++        holder.getInstance().addBytecodeOffsets(initExprents[0].bytecode);
+         ass.getLeft().addBytecodeOffsets(firstDoExprent.bytecode);
+         if (stat.getIncExprent() != null) {
+           holder.getInstance().addBytecodeOffsets(stat.getIncExprent().bytecode);
+@@ -481,88 +489,45 @@ public class MergeHelper {
+         stat.setLooptype(DoStatement.LOOP_FOREACH);
+         stat.setInitExprent(ass.getLeft());
+         stat.setIncExprent(holder.getInstance());
+-        preData.getExprents().remove(initDoExprent);
++        preData.getExprents().remove(initExprents[0]);
+         firstData.getExprents().remove(firstDoExprent);
++
++        if (initExprents[1] != null && initExprents[1].getLeft().type == Exprent.EXPRENT_VAR &&
++            holder.getInstance().type == Exprent.EXPRENT_VAR) {
++          VarExprent copy = (VarExprent)initExprents[1].getLeft();
++          VarExprent inc = (VarExprent)holder.getInstance();
++          if (copy.getIndex() == inc.getIndex() && copy.getVersion() == inc.getVersion() && !ExprentUtil.isVarReferenced(inc, stat.getTopParent(), copy)) {
++            preData.getExprents().remove(initExprents[1]);
++            initExprents[1].getRight().addBytecodeOffsets(initExprents[1].bytecode);
++            initExprents[1].getRight().addBytecodeOffsets(stat.getIncExprent().bytecode);
++            stat.setIncExprent(initExprents[1].getRight());
++          }
++        }
++        return true;
+       }
+-    }
+-    else if (stat.getLooptype() == DoStatement.LOOP_FOR) {
+-      if (isType(stat.getInitExprent(), Exprent.EXPRENT_ASSIGNMENT) &&
+-          isIteratorCall(((AssignmentExprent)stat.getInitExprent()).getRight()) &&
+-          isType(stat.getConditionExprent(), Exprent.EXPRENT_FUNCTION)) {
+-
+-        Exprent exp = drillNots(stat.getConditionExprent());
+-        if (!isHasNextCall(exp) ||
+-            !isType(stat.getIncExprent(), Exprent.EXPRENT_ASSIGNMENT)) {
++      else if (initExprents[0] != null && initExprents[1] != null && firstDoExprent != null) {
++        if (firstDoExprent.getRight().type != Exprent.EXPRENT_ARRAY || firstDoExprent.getLeft().type != Exprent.EXPRENT_VAR) {
+           return false;
+         }
+ 
+-        AssignmentExprent itr = (AssignmentExprent)stat.getInitExprent();
+-        InvocationExprent hnext = (InvocationExprent)exp;
+-        if (itr.getLeft().type != Exprent.EXPRENT_VAR || hnext.getInstance().type != Exprent.EXPRENT_VAR) {
++        if (lastExprent == null || lastExprent.type != Exprent.EXPRENT_FUNCTION) {
+           return false;
+         }
+ 
+-        AssignmentExprent ass = (AssignmentExprent)stat.getIncExprent();
+-        if (!isNextCall(ass.getRight()) || ass.getLeft().type != Exprent.EXPRENT_VAR) {
+-
+-          if (firstDoExprent == null || !isNextCall(firstDoExprent.getRight()) ||
+-              firstDoExprent.getLeft().type != Exprent.EXPRENT_VAR) {
+-            return false;
+-          }
+-
+-          InvocationExprent next = (InvocationExprent)getUncast(firstDoExprent.getRight());
+-          if (next.getInstance().type != Exprent.EXPRENT_VAR ||
+-              ExprentUtil.isVarReferenced((VarExprent)itr.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
+-            return false;
+-          }
+-
+-          //Move the inc exprent back to the end of the body and remove the .next call
+-          Statement last = getLastDirectData(stat.getFirst());
+-          InvocationExprent holder = (InvocationExprent)getUncast(((AssignmentExprent)stat.getInitExprent()).getRight());
+-
+-          firstData.getExprents().remove(firstDoExprent);
+-          last.getExprents().add(stat.getIncExprent());
+-
+-          firstDoExprent.getLeft().addBytecodeOffsets(stat.getInitExprent().bytecode);
+-          firstDoExprent.getLeft().addBytecodeOffsets(stat.getIncExprent().bytecode);
+-          firstDoExprent.getLeft().addBytecodeOffsets(firstDoExprent.bytecode);
+-
+-          stat.setLooptype(DoStatement.LOOP_FOREACH);
+-          stat.setInitExprent(firstDoExprent.getLeft());
+-          stat.setIncExprent(holder.getInstance());
+-        }
+-        else {
+-          InvocationExprent next = (InvocationExprent)getUncast(ass.getRight());
+-          if (next.getInstance().type != Exprent.EXPRENT_VAR ||
+-              ExprentUtil.isVarReferenced((VarExprent)itr.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
+-            return false;
+-          }
+-
+-          InvocationExprent holder = (InvocationExprent)getUncast(((AssignmentExprent)stat.getInitExprent()).getRight());
+-
+-          holder.getInstance().addBytecodeOffsets(stat.getInitExprent().bytecode);
+-          ass.getLeft().addBytecodeOffsets(stat.getIncExprent().bytecode);
+-
+-          stat.setLooptype(DoStatement.LOOP_FOREACH);
+-          stat.setInitExprent(ass.getLeft());
+-          stat.setIncExprent(holder.getInstance());
+-        }
+-      }
+-      else if (initDoExprent != null && initDoExprent.getRight().type == Exprent.EXPRENT_FUNCTION) {
+-        if (firstDoExprent == null ||
+-            firstDoExprent.getRight().type != Exprent.EXPRENT_ARRAY ||
+-            firstDoExprent.getLeft().type != Exprent.EXPRENT_VAR ||
+-            !isType(stat.getIncExprent(), Exprent.EXPRENT_FUNCTION) ||
+-            !isType(stat.getInitExprent(), Exprent.EXPRENT_ASSIGNMENT)) {
++        if (initExprents[0].getRight().type != Exprent.EXPRENT_CONST ||
++            initExprents[1].getRight().type != Exprent.EXPRENT_FUNCTION ||
++            stat.getConditionExprent().type != Exprent.EXPRENT_FUNCTION) {
+           return false;
+         }
+ 
+-        FunctionExprent funcRight = (FunctionExprent)initDoExprent.getRight();
+-        FunctionExprent funcInc = (FunctionExprent)stat.getIncExprent();
+-        ArrayExprent arr = (ArrayExprent)firstDoExprent.getRight();
++        //FunctionExprent funcCond  = (FunctionExprent)drillNots(stat.getConditionExprent()); //TODO: Verify this is counter < copy.length
++        FunctionExprent funcRight = (FunctionExprent)initExprents[1].getRight();
++        FunctionExprent funcInc   = (FunctionExprent)lastExprent;
++        ArrayExprent    arr       = (ArrayExprent)firstDoExprent.getRight();
++        int incType = funcInc.getFuncType();
+ 
+         if (funcRight.getFuncType() != FunctionExprent.FUNCTION_ARRAY_LENGTH ||
+-            (funcInc.getFuncType() != FunctionExprent.FUNCTION_PPI && funcInc.getFuncType() != FunctionExprent.FUNCTION_IPP) ||
++            (incType != FunctionExprent.FUNCTION_PPI && incType != FunctionExprent.FUNCTION_IPP) ||
+             arr.getIndex().type != Exprent.EXPRENT_VAR ||
+             arr.getArray().type != Exprent.EXPRENT_VAR) {
+             return false;
+@@ -576,34 +541,41 @@ public class MergeHelper {
+             counter.getVersion() != index.getVersion()) {
+           return false;
+         }
++        if (ExprentUtil.isVarReferenced(counter, stat.getFirst(), index)) {
++          return false;
++        }
+ 
+-        funcRight.getLstOperands().get(0).addBytecodeOffsets(initDoExprent.bytecode);
+-        funcRight.getLstOperands().get(0).addBytecodeOffsets(stat.getIncExprent().bytecode);
++        funcRight.getLstOperands().get(0).addBytecodeOffsets(initExprents[0].bytecode);
++        funcRight.getLstOperands().get(0).addBytecodeOffsets(initExprents[1].bytecode);
++        funcRight.getLstOperands().get(0).addBytecodeOffsets(lastExprent.bytecode);
+         firstDoExprent.getLeft().addBytecodeOffsets(firstDoExprent.bytecode);
+-        firstDoExprent.getLeft().addBytecodeOffsets(stat.getInitExprent().bytecode);
++        firstDoExprent.getLeft().addBytecodeOffsets(initExprents[0].bytecode);
+ 
+         stat.setLooptype(DoStatement.LOOP_FOREACH);
+         stat.setInitExprent(firstDoExprent.getLeft());
+         stat.setIncExprent(funcRight.getLstOperands().get(0));
+-        preData.getExprents().remove(initDoExprent);
++        preData.getExprents().remove(initExprents[0]);
++        preData.getExprents().remove(initExprents[1]);
+         firstData.getExprents().remove(firstDoExprent);
++        lastData.getExprents().remove(lastExprent);
+ 
+-
+-        if (initCopyExprent != null && initCopyExprent.getLeft().type == Exprent.EXPRENT_VAR) {
+-          VarExprent copy = (VarExprent)initCopyExprent.getLeft();
++        if (initExprents[2] != null && initExprents[2].getLeft().type == Exprent.EXPRENT_VAR) {
++          VarExprent copy = (VarExprent)initExprents[2].getLeft();
+           if (copy.getIndex() == array.getIndex() && copy.getVersion() == array.getVersion()) {
+-            preData.getExprents().remove(initCopyExprent);
+-            initCopyExprent.getRight().addBytecodeOffsets(initCopyExprent.bytecode);
+-            initCopyExprent.getRight().addBytecodeOffsets(stat.getIncExprent().bytecode);
+-            stat.setIncExprent(initCopyExprent.getRight());
++            preData.getExprents().remove(initExprents[2]);
++            initExprents[2].getRight().addBytecodeOffsets(initExprents[2].bytecode);
++            initExprents[2].getRight().addBytecodeOffsets(stat.getIncExprent().bytecode);
++            stat.setIncExprent(initExprents[2].getRight());
+           }
+         }
++
++        return true;
+       }
+     }
+ 
+     //cleanEmptyStatements(stat, firstData); //TODO: Look into this and see what it does...
+ 
+-    return true;
++    return false;
+   }
+ 
+   private static boolean isType(Exprent exp, int type) { //This is just a helper macro, Wish java had real macros.
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+index f71ed84bc4ad195a97b4c535f21b55a9568cac62..686001d878d4204c439e6a4b6d140c155eadbb97 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+@@ -837,6 +837,14 @@ public class Statement implements IMatchable {
+     this.parent = parent;
+   }
+ 
++  public Statement getTopParent() {
++    Statement ret = this;
++    while (ret.getParent() != null) {
++      ret = ret.getParent();
++    }
++    return ret;
++  }
++
+   public HashSet<StatEdge> getLabelEdges() {  // FIXME: why HashSet?
+     return labelEdges;
+   }
+diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
+index d4771bb0b063154fd4e38ac3d68ed3c0b27c8938..fea37bceb36c964966c7772c8911f9aa63ae119e 100644
+--- a/test/org/jetbrains/java/decompiler/LVTTest.java
++++ b/test/org/jetbrains/java/decompiler/LVTTest.java
+@@ -38,11 +38,12 @@ public class LVTTest extends SingleClassesTestBase {
+ //  @Test public void testMatch1() { doTest("pkg/TestPPMM"); }
+ //  @Test public void testMatchLM() { doTest("pkg/TestLexManosLVT"); }
+ //  @Test public void testMatch1() { doTest("pkg/TestLVT"); }
++//  @Test public void testMatch1() { doTest("pkg/TestLoopMerging"); }
+ //  @Test public void testMatch2() { doTest("pkg/TestLVTScoping"); }
+ //  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
+ //  @Test public void testMCGuiCmdBlock() { doTest("net/minecraft/client/gui/GuiCommandBlock"); }
+ 
+-  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
++//  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
+ 
+ //  @Test public void testMCGuiCmdBlock() { doTest("net/minecraft/client/gui/GuiCommandBlock"); }
+ 
+@@ -51,4 +52,5 @@ public class LVTTest extends SingleClassesTestBase {
+ //  @Test public void testMCAbstractTexture() { doTest("net/minecraft/client/multiplayer/ServerAddress"); }
+ //  @Test public void testMCAbstractResourcePack() { doTest("net/minecraft/client/resources/AbstractResourcePack"); }
+ //  @Test public void testMCGuiShareToLan() { doTest("net/minecraft/client/gui/GuiShareToLan"); }
++//  @Test public void testMCContainerPlayer() { doTest("net/minecraft/inventory/ContainerPlayer"); }
+ }
+diff --git a/test/org/jetbrains/java/decompiler/LoopMergingTests.java b/test/org/jetbrains/java/decompiler/LoopMergingTests.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..ddc15d14e9efaca03115795dbce9266d361b565e
+--- /dev/null
++++ b/test/org/jetbrains/java/decompiler/LoopMergingTests.java
+@@ -0,0 +1,30 @@
++package org.jetbrains.java.decompiler;
++
++import java.io.IOException;
++import java.util.HashMap;
++import java.util.Map;
++
++import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
++import org.junit.Test;
++
++public class LoopMergingTests extends SingleClassesTestBase {
++    @SuppressWarnings("serial")
++    @Override
++    protected Map<String, Object> getDecompilerOptions() {
++      return new HashMap<String, Object>() {{
++        put(IFernflowerPreferences.USE_DEBUG_LINE_NUMBERS, "1");
++      }};
++    }
++
++    @Override
++      public void setUp() throws IOException {
++          super.setUp();
++          fixture.cleanup = false;
++      }
++
++    @Test
++    public void testLoopMerging() {
++        doTest("pkg/TestLoopMerging");
++    }
++
++}
+diff --git a/testData/classes/pkg/TestLoopMerging.class b/testData/classes/pkg/TestLoopMerging.class
+new file mode 100644
+index 0000000000000000000000000000000000000000..453837353833482c6abb1718c2900e2149662c1f
+GIT binary patch
+literal 1524
+zcmbu7OHUI~7>3`|nRZGUZY?brLGHJrR1u8<g%}J8Nl_6(L{`%>;BaY48BAQbz!3g{
+zZoI`6CMG5l&_oF#ap(VV!PXyOea|pZi!3l?a?Y7^``-6F-}mG9*IfYJ=+@v72rbRe
+z#>UNMJDyH2jhLBPD>bV@6)2rE9viU*BQ+blo0v0`wtz6$hS(AUz8hA`vik*;_Kpbw
+zbuc|`2B1LK;YWc$N!&`AcUBe?W@g+-ESLhpcsgk;Oc)tU&fP`Teq=2RgySdJ=wn!$
+z&K!-Q0tl4r(BM-Cw*Wb<(Bb9udk?73PM~PaHj?ur#*!P}EAMv~pcZu+&gVU9?8&li
+zF6yX90|nA6lnKY3H(Tl0y^NKz$Lx%0EcOM^gcc3WWOc%}j#jh@XiM_OLW-8#hdL(I
+zTlLb8BY#D}WAKfhsbQj<VH?)a>2CH21jf=UnWQ;nNl4|#Qqd(P(ZE;=lje~z;o~0_
+zozcrb@@604YK)`c=#73s;V0)p5qqDrsGykt`oRH|pp-L#G6dPn%TFmGFAr>>I6Aq7
+zP%u2RjZkz85w_4wu=2&r?0#-Dk+)g({8e^ep8d!W3Z!hY<5?qoKYHmgCqLlISM!t)
+zsuCy*Q2N}FmA9^y(P-f|A{(gKM2(F78I96eM5nei6$!S})6Y|$$}@MK03{7Stp+)^
+z(oz?hT;~|)O3v(PzFB{$EJU*%hh{~DW@Sp&m7PGmbF$aFdrejP$*Ia)+jVozBi0mA
+z8&=<Cf92TyH`vp0$a`Vb$!Y{DDiB5`zX}#oHTns93N=VFF^e2mQRlq2-bvTG`&t#x
+z5Je|n8s_>1Tx9XdbhX2uB_^K+p%IvHdIYir>2cS<bVekj*byV!WwdvU(fdP2XGSxc
+zE0HtA`nR|~9A@u9esOoRW`IW0Z6cv&(rv+2R?&U5;UOtavqDx$@D1miJoAkNWlbGW
+r-aDeab42;|UzBe{KY?<V8Fj&nL-0hclXqp7evT!D8Ms764=(=!{dE@Z
+
+literal 0
+HcmV?d00001
+
+diff --git a/testData/results/TestLoopMerging.dec b/testData/results/TestLoopMerging.dec
+new file mode 100644
+index 0000000000000000000000000000000000000000..9f91437231e714f985a1f44aa1a7e3df82cb1e5a
+--- /dev/null
++++ b/testData/results/TestLoopMerging.dec
+@@ -0,0 +1,49 @@
++package pkg;
++
++public class TestLoopMerging {
++   public float a;
++   public float b;
++   public float test() {      while(this.a - this.b < -180.0F) {
++         this.b -= 360.0F;      }      while(this.a - this.b >= 180.0F) {
++         this.b += 360.0F;      }
++      return this.a;   }
++
++   public float test2() {
++      for(this.a = 0.0F; this.a < 10.0F; ++this.a) {
++         System.out.println(this.a);      }
++
++      for(this.a = 0.0F; this.a < 10.0F; ++this.a) {
++         System.out.println(this.a);      }
++
++      return this.a;
++   }
++
++   public float test3() {
++      int[] as = new int[0];
++      for(int f : as) {
++         ++f;      }
++
++      while(this.a - this.b < -180.0F) {         this.b -= 360.0F;      }
++      while(this.a - this.b >= 180.0F) {         this.b += 360.0F;
++      }
++      for(this.a = 0.0F; this.a < 10.0F; ++this.a) {
++         System.out.println(this.a);
++      }
++      return this.a;   }
++   public float test4() {
++      int[] as = new int[0];
++      for(int f : as) {
++         ++f;         while(this.a - this.b < -180.0F) {
++            this.b -= 360.0F;         }         while(this.a - this.b >= 180.0F) {
++            this.b += 360.0F;         }
++         for(this.a = 0.0F; this.a < 10.0F; ++this.a) {
++            System.out.println(this.a);            while(this.a - this.b < -180.0F) {
++               this.b -= 360.0F;            }            while(this.a - this.b >= 180.0F) {
++               this.b += 360.0F;
++            }
++         }
++      }
++
++      return this.a;
++   }
++}
+diff --git a/testData/src/pkg/TestLoopMerging.java b/testData/src/pkg/TestLoopMerging.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..c257b10446cf1cc23c6c9408e8f5660d30906b29
+--- /dev/null
++++ b/testData/src/pkg/TestLoopMerging.java
+@@ -0,0 +1,47 @@
++package pkg;
++
++public class TestLoopMerging {
++    public float a;
++    public float b;
++    public float test() {
++      while(a - b < -180) b -= 360;
++      while(a - b >= 180) b += 360;
++      return a;
++    }
++    public float test2() {
++        for (a = 0; a < 10; a++) {
++            System.out.println(a);
++        }
++        for (a = 0; a < 10; a++) {
++            System.out.println(a);
++        }
++        return a;
++      }
++
++    public float test3() {
++        int[] as = new int[0];
++        for (int f: as) {
++            f++;
++        }
++        while(this.a - this.b < -180) this.b -= 360;
++        while(this.a - this.b >= 180) this.b += 360;
++        for (a = 0; a < 10; a++) {
++            System.out.println(a);
++        }
++        return this.a;
++    }
++    public float test4() {
++        int[] as = new int[0];
++        for (int f: as) {
++            f++;
++            while(this.a - this.b < -180) this.b -= 360;
++            while(this.a - this.b >= 180) this.b += 360;
++            for (a = 0; a < 10; a++) {
++                System.out.println(a);
++                while(this.a - this.b < -180) this.b -= 360;
++                while(this.a - this.b >= 180) this.b += 360;
++            }
++        }
++        return this.a;
++    }
++}
diff --git a/FernFlower-Patches/0069-Propogate-LVTs-to-inner-classes.-Fix-improper-var-me.patch b/FernFlower-Patches/0037-Propogate-LVTs-to-inner-classes.-Fix-improper-var-me.patch
similarity index 86%
rename from FernFlower-Patches/0069-Propogate-LVTs-to-inner-classes.-Fix-improper-var-me.patch
rename to FernFlower-Patches/0037-Propogate-LVTs-to-inner-classes.-Fix-improper-var-me.patch
index 5ff8c5a..ea657e2 100644
--- a/FernFlower-Patches/0069-Propogate-LVTs-to-inner-classes.-Fix-improper-var-me.patch
+++ b/FernFlower-Patches/0037-Propogate-LVTs-to-inner-classes.-Fix-improper-var-me.patch
@@ -163,10 +163,10 @@ index 209d3e081f58e2d54b231dbe2c90fe11c319f66c..cb376d9b480f06971c71647037a17a16
  }
 \ No newline at end of file
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 88dae4d81ca4ebc059cc575cf5e97d9f5bfe0fee..0427e3b329d4599d42ef5f8ac35fd84581c5f8c6 100644
+index bec695f0265d7ed92175ba4e43ce2932f70eed16..726edd7aeab41647414952e0a0a6c8cb52674816 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-@@ -440,6 +440,10 @@ public class VarDefinitionHelper {
+@@ -443,6 +443,10 @@ public class VarDefinitionHelper {
  
      findTypes(stat, types);
  
@@ -177,7 +177,7 @@ index 88dae4d81ca4ebc059cc575cf5e97d9f5bfe0fee..0427e3b329d4599d42ef5f8ac35fd845
      applyTypes(stat, types);
    }
  
-@@ -470,23 +474,24 @@ public class VarDefinitionHelper {
+@@ -473,23 +477,24 @@ public class VarDefinitionHelper {
    }
  
    private void findTypes(Exprent exp, Map<VarVersionPair, LVTVariable> types) {
@@ -216,7 +216,7 @@ index 88dae4d81ca4ebc059cc575cf5e97d9f5bfe0fee..0427e3b329d4599d42ef5f8ac35fd845
    }
  
  
-@@ -495,6 +500,10 @@ public class VarDefinitionHelper {
+@@ -498,6 +503,10 @@ public class VarDefinitionHelper {
        return;
      }
  
@@ -227,8 +227,8 @@ index 88dae4d81ca4ebc059cc575cf5e97d9f5bfe0fee..0427e3b329d4599d42ef5f8ac35fd845
      if (stat.getExprents() == null) {
        for (Object obj : stat.getSequentialObjects()) {
          if (obj instanceof Statement) {
-@@ -637,6 +646,10 @@ public class VarDefinitionHelper {
-                 leaked.putAll(leaked_n); //First is outside the scope so leak!
+@@ -643,6 +652,10 @@ public class VarDefinitionHelper {
+                 leaked_n.clear();
                }
              }
 +            else if (stat.type == Statement.TYPE_TRYCATCH ||
@@ -238,7 +238,7 @@ index 88dae4d81ca4ebc059cc575cf5e97d9f5bfe0fee..0427e3b329d4599d42ef5f8ac35fd845
              this_vars.putAll(leaked_n);
            }
          }
-@@ -732,6 +745,18 @@ public class VarDefinitionHelper {
+@@ -738,6 +751,30 @@ public class VarDefinitionHelper {
        }
        success |= remapped;
      }
@@ -251,12 +251,43 @@ index 88dae4d81ca4ebc059cc575cf5e97d9f5bfe0fee..0427e3b329d4599d42ef5f8ac35fd845
 +          if (from.var == var.getIndex() && from.version == var.getVersion()) {
 +            itr.remove();
 +          }
++          else if (to.var == var.getIndex() && to.version == var.getVersion()) {
++            Map<VarVersionPair, VarType> mapExprentMinTypes = varproc.getVarVersions().getTypeProcessor().getMapExprentMinTypes();
++            Map<VarVersionPair, VarType> mapExprentMaxTypes = varproc.getVarVersions().getTypeProcessor().getMapExprentMaxTypes();
++            VarType merged = getMergedType(mapExprentMinTypes.get(from), mapExprentMinTypes.get(to),
++                                           mapExprentMaxTypes.get(from), mapExprentMaxTypes.get(to));
++
++            if (merged == null) { // Something went wrong.. This SHOULD be non-null
++              continue;
++            }
++
++            var.setVarType(merged);
++          }
 +        }
 +      }
 +    }
      return success;
    }
  
+@@ -763,7 +800,7 @@ public class VarDefinitionHelper {
+ 
+           ConstExprent right = (ConstExprent)ass.getRight();
+           if (right.getConstType() == VarType.VARTYPE_NULL) {
+-              continue;
++            continue;
+           }
+           VarType merged = getMergedType(mapExprentMinTypes.get(from), mapExprentMinTypes.get(to),
+                                          mapExprentMaxTypes.get(from), mapExprentMaxTypes.get(to));
+@@ -843,7 +880,7 @@ public class VarDefinitionHelper {
+   }
+   private static class VPPEntry extends SimpleEntry<VarVersionPair, VarVersionPair> {
+     public VPPEntry(VarExprent key, VarVersionPair value) {
+-        super(new VarVersionPair(key), value);
++      super(new VarVersionPair(key), value);
+     }
+   }
+ }
+\ No newline at end of file
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
 index 89f24f365a7c01b7920fd8002dda2ec0b955f96c..04ee48f75b4d78b117e6fe1e70cf41fa0073b99d 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
diff --git a/FernFlower-Patches/0071-Fix-constructor-arguments-for-non-static-inner-class.patch b/FernFlower-Patches/0038-Fix-constructor-arguments-for-non-static-inner-class.patch
similarity index 100%
rename from FernFlower-Patches/0071-Fix-constructor-arguments-for-non-static-inner-class.patch
rename to FernFlower-Patches/0038-Fix-constructor-arguments-for-non-static-inner-class.patch
diff --git a/FernFlower-Patches/0038-Fix-inverted-null-test.patch b/FernFlower-Patches/0038-Fix-inverted-null-test.patch
deleted file mode 100644
index 76155e8..0000000
--- a/FernFlower-Patches/0038-Fix-inverted-null-test.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Thu, 27 Aug 2015 15:41:47 -0400
-Subject: [PATCH] Fix inverted null test
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 1e1a4a7987545d00460cd7e7e17c3bcde6a75df1..d24813f0d9962ed8b0d6efacd251c175721e33d0 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-@@ -556,7 +556,7 @@ public class VarDefinitionHelper {
-   }
- 
-   private void setupLVTs(Statement stat) {
--    if (stat == null || varproc.getLVT() != null) {
-+    if (stat == null || varproc.getLVT() == null) {
-       return;
-     }
- 
diff --git a/FernFlower-Patches/0072-Return-generic-typevar-casting-support.patch b/FernFlower-Patches/0039-Return-generic-typevar-casting-support.patch
similarity index 100%
rename from FernFlower-Patches/0072-Return-generic-typevar-casting-support.patch
rename to FernFlower-Patches/0039-Return-generic-typevar-casting-support.patch
diff --git a/FernFlower-Patches/0073-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch b/FernFlower-Patches/0040-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch
similarity index 77%
rename from FernFlower-Patches/0073-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch
rename to FernFlower-Patches/0040-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch
index ede42bb..0db0320 100644
--- a/FernFlower-Patches/0073-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch
+++ b/FernFlower-Patches/0040-Add-new-decompiler-option-iec-Include_Entire_Classpa.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add new decompiler option -iec Include_Entire_Classpath which
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-index e355ee9ff5bc6e5c3a9dd2262c1c33b2dc826f83..65733ac2c8ea53277e5a2ffe54ea7e91e0c6fc97 100644
+index e355ee9ff5bc6e5c3a9dd2262c1c33b2dc826f83..6afe975fe2034ad25b7810a0bdc59ebcff8453e1 100644
 --- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
 +++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
 @@ -19,6 +19,7 @@ import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
@@ -39,7 +39,7 @@ index e355ee9ff5bc6e5c3a9dd2262c1c33b2dc826f83..65733ac2c8ea53277e5a2ffe54ea7e91
    }
  
    public void decompileContext() {
-@@ -92,4 +100,25 @@ public class Fernflower implements IDecompiledData {
+@@ -92,4 +100,26 @@ public class Fernflower implements IDecompiledData {
        return null;
      }
    }
@@ -56,7 +56,8 @@ index e355ee9ff5bc6e5c3a9dd2262c1c33b2dc826f83..65733ac2c8ea53277e5a2ffe54ea7e91
 +        if (found.contains(file.getAbsolutePath()))
 +          continue;
 +
-+        if (file.exists()) {
++        // only add .class files from classpath
++        if (file.exists() && (file.getName().endsWith(".class") || file.getName().endsWith(".jar"))) {
 +          DecompilerContext.getLogger().writeMessage("Adding File to context from classpath: " + file, Severity.INFO);
 +          structContext.addSpace(file, false);
 +          found.add(file.getAbsolutePath());
@@ -85,3 +86,15 @@ index 31871c5d945034a810fa9f866446e14c40cd9b18..79dd8e890cd37e88bfbe9f0c22c825b3
 +    put(INCLUDE_ENTIRE_CLASSPATH, "0");
    }});
  }
+diff --git a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
+index 850c3d84888d95343abd8a3c297baac58783a8c3..e3043962de86e4823458766ff2afda4eb3e71e5f 100644
+--- a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
++++ b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
+@@ -110,6 +110,7 @@ public class ContextUnit {
+         // classes
+         for (int i = 0; i < classes.size(); i++) {
+           StructClass cl = classes.get(i);
++          if (!cl.isOwn()) continue;
+           String entryName = decompiledData.getClassEntryName(cl, classEntries.get(i));
+           if (entryName != null) {
+             String content = decompiledData.getClassContent(cl);
diff --git a/FernFlower-Patches/0074-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch b/FernFlower-Patches/0041-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch
similarity index 98%
rename from FernFlower-Patches/0074-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch
rename to FernFlower-Patches/0041-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch
index 5a83e98..54cd466 100644
--- a/FernFlower-Patches/0074-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch
+++ b/FernFlower-Patches/0041-Rework-GenericType-to-be-subclass-of-VarType-and-con.patch
@@ -756,7 +756,7 @@ index 7ef93995cb08d8bc8f88603c16907740a6b09b57..5c2ff051baebf27af879a6e01a4bd855
 +  public final List<VarType> exceptions = new ArrayList<VarType>();
  }
 diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-index 9305bf93cf68b9f87b6d765b25494bcb2813c2aa..c45d47f7e7efbd28e5bbddb02441299306518733 100644
+index 9305bf93cf68b9f87b6d765b25494bcb2813c2aa..2ed5574e1638339c62ab849de86600c366d1ced9 100644
 --- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
 +++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
 @@ -16,38 +16,43 @@
@@ -817,7 +817,7 @@ index 9305bf93cf68b9f87b6d765b25494bcb2813c2aa..c45d47f7e7efbd28e5bbddb024412993
  
      int index = 0;
      loop:
-@@ -65,32 +70,53 @@ public class GenericType {
+@@ -65,32 +70,54 @@ public class GenericType {
          case 'L':
            type = CodeConstants.TYPE_OBJECT;
            signature = signature.substring(index + 1, signature.length() - 1);
@@ -865,7 +865,7 @@ index 9305bf93cf68b9f87b6d765b25494bcb2813c2aa..c45d47f7e7efbd28e5bbddb024412993
 +              }
 +
 +              if (name_buff.length() > 0) {
-+                name_buff.append('.');
++                name_buff.append('$');
 +              }
 +              name_buff.append(name);
 +
@@ -885,13 +885,14 @@ index 9305bf93cf68b9f87b6d765b25494bcb2813c2aa..c45d47f7e7efbd28e5bbddb024412993
 +
 +                signature = signature.substring(cl.length() + 1);
 +              }
++              cl = getNextClassSignature(signature);
              }
            }
 -
            break loop;
  
          default:
-@@ -101,10 +127,20 @@ public class GenericType {
+@@ -101,10 +128,20 @@ public class GenericType {
        index++;
      }
  
@@ -916,7 +917,7 @@ index 9305bf93cf68b9f87b6d765b25494bcb2813c2aa..c45d47f7e7efbd28e5bbddb024412993
    }
  
    private static String getNextClassSignature(String value) {
-@@ -132,11 +168,13 @@ public class GenericType {
+@@ -132,11 +169,13 @@ public class GenericType {
      return value.substring(0, index);
    }
  
@@ -932,7 +933,7 @@ index 9305bf93cf68b9f87b6d765b25494bcb2813c2aa..c45d47f7e7efbd28e5bbddb024412993
      while (value.length() > 0) {
        String typeStr = getNextType(value);
        int len = typeStr.length();
-@@ -154,16 +192,16 @@ public class GenericType {
+@@ -154,16 +193,16 @@ public class GenericType {
            break;
        }
  
@@ -952,7 +953,7 @@ index 9305bf93cf68b9f87b6d765b25494bcb2813c2aa..c45d47f7e7efbd28e5bbddb024412993
    }
  
    public static String getNextType(String value) {
-@@ -212,37 +250,71 @@ public class GenericType {
+@@ -212,37 +251,71 @@ public class GenericType {
      return value.substring(0, index + 1);
    }
  
@@ -1001,7 +1002,7 @@ index 9305bf93cf68b9f87b6d765b25494bcb2813c2aa..c45d47f7e7efbd28e5bbddb024412993
 +      clsName = DecompilerContext.getImportCollector().getShortName(value.replace('/', '.'));
 +    }
 +    else if (parent.isGeneric()) {
-+      clsName = ((GenericType)parent).getCastName() + "." + value.substring(value.lastIndexOf('.') + 1);
++      clsName = ((GenericType)parent).getCastName() + "." + value.substring(parent.value.length() + 1);
 +    }
 +    else {
 +      clsName = DecompilerContext.getImportCollector().getShortName(parent.value.replace('/', '.')) + "." + value.substring(value.lastIndexOf('.') + 1);
diff --git a/FernFlower-Patches/0042-Improve-generation-of-type-inference.patch b/FernFlower-Patches/0042-Improve-generation-of-type-inference.patch
new file mode 100644
index 0000000..3f1baec
--- /dev/null
+++ b/FernFlower-Patches/0042-Improve-generation-of-type-inference.patch
@@ -0,0 +1,502 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: RainWarrior <rainwarrior@fry.su>
+Date: Mon, 12 Oct 2015 09:21:36 +0300
+Subject: [PATCH] Improve generation of type inference
+
+- Foo.<Bar>baz() generation
+- concentrated changes to Exprent.getInferredExprType
+- passing information from InvocationExprent's inferred type arguments to the parameters
+- pushed remapping to the VarType, added type inference to a couple more places
+- handle generic lists with multiple arguments in method invocations
+- using the generic info from InvocationExprent correctly, 1 more error down
+
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+index 4ec7fe9d7d34fe35fcd379d608a102d8f40e1734..7c8276c8dd60eac7022378d4b0700d272a333705 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+@@ -435,6 +435,7 @@ public class ClassWriter {
+       else {
+         buffer.append(" = ");
+         // FIXME: special case field initializer. Can map to more than one method (constructor) and bytecode intruction.
++        initializer.getInferredExprType(descriptor == null? fieldType : descriptor.type);
+         buffer.append(initializer.toJava(indent, tracer));
+       }
+     }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+index 162d9cb6953a6501771750e82f7de0a6b855c75c..60832d3af2925a806c852e72209e676fb293d882 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+@@ -853,6 +853,7 @@ public class ExprProcessor implements CodeConstants {
+     lst = Exprent.sortIndexed(lst);
+ 
+     for (Exprent expr : lst) {
++      expr.getInferredExprType(null);
+       TextBuffer content = expr.toJava(indent, tracer);
+       if (content.length() > 0) {
+         if (expr.type != Exprent.EXPRENT_VAR || !((VarExprent)expr).isClassDef()) {
+@@ -912,7 +913,7 @@ public class ExprProcessor implements CodeConstants {
+                                          boolean castAlways,
+                                          BytecodeMappingTracer tracer) {
+ 
+-    VarType rightType = exprent.getExprType();
++    VarType rightType = exprent.getInferredExprType(leftType);
+ 
+     TextBuffer res = exprent.toJava(indent, tracer);
+ 
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
+index efc64b9d98005572eb9752e36d472f7a65358203..68f58305f21314d969c79cd0bdcdc14c5b0ae003 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
+@@ -65,6 +65,12 @@ public class AssignmentExprent extends Exprent {
+     return left.getExprType();
+   }
+ 
++  @Override
++  public VarType getInferredExprType(VarType upperBound) {
++    //System.out.println("infer: " + upperBound + " = " + getExprType());
++    return getExprType();
++  }
++
+   @Override
+   public CheckTypesResult checkExprTypeBounds() {
+     CheckTypesResult result = new CheckTypesResult();
+@@ -106,7 +112,7 @@ public class AssignmentExprent extends Exprent {
+   @Override
+   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
+     VarType leftType = left.getExprType();
+-    VarType rightType = right.getExprType();
++    VarType rightType = right.getInferredExprType(left.getInferredExprType(null));
+ 
+     boolean fieldInClassInit = false, hiddenField = false;
+     if (left.type == Exprent.EXPRENT_FIELD) { // first assignment to a final field. Field name without "this" in front of it
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+index ca9c1ed566e423e9169e2b7f72bfec128010f68f..bda80a0333129fd0e1d476e00cd1e6dee18ce98b 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+@@ -74,6 +74,10 @@ public abstract class Exprent implements IMatchable {
+     return VarType.VARTYPE_VOID;
+   }
+ 
++  public VarType getInferredExprType(VarType upperBound) {
++    return getExprType();
++  }
++
+   public int getExprentUse() {
+     return 0;
+   }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
+index fdc9cec54252976b63964d039875e0229ff93172..be95dc1f6242dc3a12cc433384d34700d8c602b3 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
+@@ -23,6 +23,8 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+ import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
+ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
++import org.jetbrains.java.decompiler.struct.StructClass;
++import org.jetbrains.java.decompiler.struct.StructField;
+ import org.jetbrains.java.decompiler.struct.consts.LinkConstant;
+ import org.jetbrains.java.decompiler.struct.gen.FieldDescriptor;
+ import org.jetbrains.java.decompiler.struct.gen.VarType;
+@@ -65,6 +67,20 @@ public class FieldExprent extends Exprent {
+     return descriptor.type;
+   }
+ 
++  @Override
++  public VarType getInferredExprType(VarType upperBound) {
++    StructClass cl = DecompilerContext.getStructContext().getClass(classname);
++    while(cl != null) {
++      StructField ft = cl.getField(name, descriptor.descriptorString);
++      if(ft != null && ft.getSignature() != null) {
++        return ft.getSignature().type;
++      }
++      if(cl.superClass == null) cl = null;
++      else cl = DecompilerContext.getStructContext().getClass((String)cl.superClass.value);
++    }
++    return getExprType();
++  }
++
+   @Override
+   public int getExprentUse() {
+     return instance == null ? Exprent.MULTIPLE_USES : instance.getExprentUse() & Exprent.MULTIPLE_USES;
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+index 9d16de2d5ab160c76a9a3efff83b4e0f011f5a12..e6152070d2b155d98fc0b8155db12c12ca3864e0 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+@@ -19,7 +19,9 @@ import java.util.ArrayList;
+ import java.util.BitSet;
+ import java.util.Collections;
+ import java.util.List;
++import java.util.Map;
+ import java.util.Map.Entry;
++import java.util.HashMap;
+ 
+ import org.jetbrains.java.decompiler.code.CodeConstants;
+ import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
+@@ -37,6 +39,7 @@ import org.jetbrains.java.decompiler.struct.StructMethod;
+ import org.jetbrains.java.decompiler.struct.consts.LinkConstant;
+ import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
+ import org.jetbrains.java.decompiler.struct.gen.VarType;
++import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
+ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
+ import org.jetbrains.java.decompiler.struct.match.MatchNode;
+ import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
+@@ -69,6 +72,8 @@ public class InvocationExprent extends Exprent {
+   private int invocationTyp = INVOKE_VIRTUAL;
+   private List<Exprent> lstParameters = new ArrayList<Exprent>();
+ 
++  private List<VarType> genericArgs = new ArrayList<VarType>();
++
+   public InvocationExprent() {
+     super(EXPRENT_INVOCATION);
+   }
+@@ -160,6 +165,56 @@ public class InvocationExprent extends Exprent {
+     return descriptor.ret;
+   }
+ 
++  @Override
++  public VarType getInferredExprType(VarType upperBound) {
++    List<StructMethod> matches = getMatchedDescriptors();
++    StructMethod desc = null;
++    if(matches.size() == 1) desc = matches.get(0);
++
++    VarType type = getExprType();
++
++    genericArgs.clear();
++
++    if(desc != null && desc.getSignature() != null) {
++      VarType ret = desc.getSignature().ret;
++      Map<VarType, VarType> map = new HashMap<VarType, VarType>();
++      // more harm than gain
++      // T -> String
++      /*if(upperBound != null && desc.getSignature().fparameters.size() == 1 && desc.getSignature().fparameters.get(0).equals(ret.value)) {
++        genericArgs.add(upperBound);
++      }*/
++      // List<T> -> List<String>
++      if(upperBound != null && upperBound.isGeneric() && ret.isGeneric()) {
++        List<VarType> leftArgs = ((GenericType)upperBound).getArguments();
++        List<VarType> rightArgs = ((GenericType)ret).getArguments();
++        List<String> fparams = desc.getSignature().fparameters;
++        if(leftArgs.size() == rightArgs.size() && rightArgs.size() == fparams.size()) {
++          for(int i = 0; i < leftArgs.size(); i++) {
++            VarType l = leftArgs.get(i);
++            VarType r = rightArgs.get(i);
++            if(l != null && r.value.equals(fparams.get(i))) {
++              genericArgs.add(l);
++              map.put(r, l);
++            }
++            else {
++              genericArgs.clear();
++              map.clear();
++              break;
++            }
++          }
++        }
++      }
++
++      if(!map.isEmpty()) {
++        // remap and return generic type
++        VarType newType = ret.remap(map);
++        if(ret != newType) return newType;
++      }
++      return ret;
++    }
++    return type;
++  }
++
+   @Override
+   public CheckTypesResult checkExprTypeBounds() {
+     CheckTypesResult result = new CheckTypesResult();
+@@ -276,8 +331,18 @@ public class InvocationExprent extends Exprent {
+ 
+         if (buf.length() > 0) {
+           buf.append(".");
+-        }
+ 
++          if(genericArgs.size() != 0) {
++            buf.append("<");
++            for(int i = 0; i < genericArgs.size(); i++) {
++              buf.append(ExprProcessor.getCastTypeName(genericArgs.get(i)));
++              if(i + 1 < genericArgs.size()) {
++                buf.append(", ");
++              }
++            }
++            buf.append(">");
++          }
++        }
+         buf.append(name);
+         if (invocationTyp == INVOKE_DYNAMIC) {
+           buf.append("<invokedynamic>");
+@@ -318,8 +383,27 @@ public class InvocationExprent extends Exprent {
+       }
+     }
+ 
+-    BitSet setAmbiguousParameters = getAmbiguousParameters();
++    List<StructMethod> matches = getMatchedDescriptors();
++    BitSet setAmbiguousParameters = getAmbiguousParameters(matches);
++    StructMethod desc = null;
++    if(matches.size() == 1) desc = matches.get(0);
+ 
++    StructClass cl = DecompilerContext.getStructContext().getClass(classname);
++    Map<VarType, VarType> genArgs = new HashMap<VarType, VarType>();
++
++    // building generic info from the instance
++    if(cl != null && cl.getSignature() != null && instance != null && instance.getInferredExprType(null).isGeneric()) {
++      GenericType genType = (GenericType)instance.getInferredExprType(null);
++      if(genType.getArguments().size() == cl.getSignature().fparameters.size()) {
++        for(int i = 0; i < cl.getSignature().fparameters.size(); i++) {
++          VarType from = GenericType.parse("T" + cl.getSignature().fparameters.get(i) + ";");
++          VarType to = genType.getArguments().get(i);
++          if(from != null && to != null) {
++            genArgs.put(from, to);
++          }
++        }
++      }
++    }
+     boolean firstParameter = true;
+     int start = isEnum ? 2 : 0;
+     for (int i = start; i < lstParameters.size(); i++) {
+@@ -330,7 +414,32 @@ public class InvocationExprent extends Exprent {
+ 
+         TextBuffer buff = new TextBuffer();
+         boolean ambiguous = setAmbiguousParameters.get(i);
+-        ExprProcessor.getCastedExprent(lstParameters.get(i), descriptor.params[i], buff, indent, true, ambiguous, tracer);
++        VarType type = descriptor.params[i];
++        // using info from the generic signature
++        if(desc != null && desc.getSignature() != null && desc.getSignature().params.size() == lstParameters.size()) {
++          type = desc.getSignature().params.get(i);
++        }
++        // applying generic info from the signature
++        VarType remappedType = type.remap(genArgs);
++        if(type != remappedType) {
++          type = remappedType;
++        }
++        // and from the inferred generic arguments
++        else if(desc != null && desc.getSignature() != null && genericArgs.size() != 0) {
++          Map<VarType, VarType> genMap = new HashMap<VarType, VarType>();
++          for(int j = 0; j < genericArgs.size(); j++) {
++            VarType from = GenericType.parse("T" + desc.getSignature().fparameters.get(j) + ";");
++            VarType to = genericArgs.get(j);
++            genMap.put(from, to);
++          }
++          type = type.remap(genMap);
++        }
++        // not passing it along if what we get back is more specific
++        VarType exprType = lstParameters.get(i).getInferredExprType(type);
++        if(exprType != null && type != null && type.type == CodeConstants.TYPE_GENVAR) {
++          type = exprType;
++        }
++        ExprProcessor.getCastedExprent(lstParameters.get(i), type, buff, indent, type.type != CodeConstants.TYPE_NULL, ambiguous, tracer);
+         buf.append(buff);
+ 
+         firstParameter = false;
+@@ -342,12 +451,12 @@ public class InvocationExprent extends Exprent {
+     return buf;
+   }
+ 
+-  private BitSet getAmbiguousParameters() {
++  private List<StructMethod> getMatchedDescriptors() {
++    List<StructMethod> matches = new ArrayList<StructMethod>();
++
+     StructClass cl = DecompilerContext.getStructContext().getClass(classname);
+-    if (cl == null) return EMPTY_BIT_SET;
++    if (cl == null) return matches;
+ 
+-    // check number of matches
+-    List<MethodDescriptor> matches = new ArrayList<MethodDescriptor>();
+     nextMethod:
+     for (StructMethod mt : cl.getMethods()) {
+       if (name.equals(mt.getName())) {
+@@ -358,10 +467,17 @@ public class InvocationExprent extends Exprent {
+               continue nextMethod;
+             }
+           }
+-          matches.add(md);
+-        }
++          matches.add(mt);
++       }
+       }
+     }
++    return matches;
++  }
++
++  private BitSet getAmbiguousParameters(List<StructMethod> matches) {
++    StructClass cl = DecompilerContext.getStructContext().getClass(classname);
++    if (cl == null) return EMPTY_BIT_SET;
++
+     if (matches.size() == 1) return EMPTY_BIT_SET;
+ 
+     // check if a call is unambiguous
+@@ -384,7 +500,9 @@ public class InvocationExprent extends Exprent {
+     BitSet ambiguous = new BitSet(descriptor.params.length);
+     for (int i = 0; i < descriptor.params.length; i++) {
+       VarType paramType = descriptor.params[i];
+-      for (MethodDescriptor md : matches) {
++      for (StructMethod mtt : matches) {
++        if(mtt.getSignature() != null && mtt.getSignature().params.get(i).isGeneric()) break;
++        MethodDescriptor md = MethodDescriptor.parseDescriptor(mtt.getDescriptor());
+         if (!paramType.equals(md.params[i])) {
+           ambiguous.set(i);
+           break;
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+index 4784e030332e1ea0ce87a4bfa69432cfa0906b73..0d417258f78e649b034a680374610a961ed21257 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+@@ -65,6 +65,21 @@ public class VarExprent extends Exprent {
+     return getVarType();
+   }
+ 
++  @Override
++  public VarType getInferredExprType(VarType upperBound) {
++    if (lvt != null && lvt.getSig() != null) {
++      // TODO; figure out why it's crashing, ugly fix for now
++      try {
++        return GenericType.parse(lvt.getSig());
++      } catch (StringIndexOutOfBoundsException ex) {
++      }
++    }
++    else if (lvt != null) {
++      return lvt.getVarType();
++    }
++    return getVarType();
++  }
++
+   @Override
+   public int getExprentUse() {
+     return Exprent.MULTIPLE_USES | Exprent.SIDE_EFFECTS_FREE;
+diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
+index 1b0df9d2e710cb6d1bee94eb1dddfe2c06135941..81342ed8f18463360e9c31f77e5091aa68ec7cdb 100644
+--- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
++++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
+@@ -19,6 +19,8 @@ import org.jetbrains.java.decompiler.code.CodeConstants;
+ import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ 
++import java.util.Map;
++
+ public class VarType {  // TODO: optimize switch
+ 
+   public static final VarType[] EMPTY_ARRAY = {};
+@@ -269,6 +271,15 @@ public class VarType {  // TODO: optimize switch
+     return res;
+   }
+ 
++  @Override
++  public int hashCode() {
++    int result = 1;
++    result = 37 * result + type;
++    result = 37 * result + arrayDim;
++    result = 37 * result + value == null ? 0 : value.hashCode();
++    return result;
++  }
++
+   @Override
+   public boolean equals(Object o) {
+     if (o == this) {
+@@ -419,4 +430,11 @@ public class VarType {  // TODO: optimize switch
+         throw new IllegalArgumentException("Invalid type: " + c);
+     }
+   }
++
++  public VarType remap(Map<VarType, VarType> map) {
++    if(map.containsKey(this)) {
++      return map.get(this);
++    }
++    return this;
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
+index 2ed5574e1638339c62ab849de86600c366d1ced9..9b111e572b474328818f044002d50dc22e946c5c 100644
+--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
++++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
+@@ -23,6 +23,7 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
+ import java.util.ArrayList;
+ import java.util.Collections;
+ import java.util.List;
++import java.util.Map;
+ 
+ public class GenericType extends VarType {
+ 
+@@ -35,7 +36,7 @@ public class GenericType extends VarType {
+   private final List<VarType> arguments;
+   private final int wildcard;
+ 
+-  private GenericType(int type, int arrayDim, String value, VarType parent, List<VarType> arguments, int wildcard) {
++  public GenericType(int type, int arrayDim, String value, VarType parent, List<VarType> arguments, int wildcard) {
+     super(type, arrayDim, value, getFamily(type, arrayDim), getStackSize(type, arrayDim), false);
+     this.parent = parent;
+     this.arguments = arguments == null ? Collections.<VarType>emptyList() : arguments;
+@@ -256,6 +257,10 @@ public class GenericType extends VarType {
+     return new GenericType(type, arrayDim - 1, value, parent, arguments, wildcard);
+   }
+ 
++  public VarType getParent() {
++    return parent;
++  }
++
+   public List<VarType> getArguments() {
+     return arguments;
+   }
+@@ -318,4 +323,51 @@ public class GenericType extends VarType {
+     }
+     return buffer.toString();
+   }
++
++  @Override
++  public String toString() {
++    StringBuilder buf = new StringBuilder();
++    switch(getWildcard()) {
++      case GenericType.WILDCARD_EXTENDS:
++        buf.append("? extends ");
++        break;
++      case GenericType.WILDCARD_SUPER:
++        buf.append("? super ");
++      break;
++    }
++    buf.append(super.toString());
++    buf.append(getTypeArguments());
++    return buf.toString();
++  }
++
++  @Override
++  public VarType remap(Map<VarType, VarType> map) {
++    VarType main = super.remap(map);
++    if(main != this) {
++      return main;
++    }
++    boolean changed = false;
++    VarType parent = getParent();
++    if(map.containsKey(parent)) {
++      parent = map.get(parent);
++      changed = true;
++    }
++    List<VarType> newArgs = new ArrayList<VarType>();
++    for(VarType arg : getArguments()) {
++      VarType newArg = null;
++      if(arg != null) {
++        newArg = arg.remap(map);
++      }
++      if(newArg != arg) {
++        newArgs.add(newArg);
++        changed = true;
++      } else {
++        newArgs.add(arg);
++      }
++    }
++    if(changed) {
++      return new GenericType(main.type, main.arrayDim, main.value, parent, newArgs, getWildcard());
++    }
++    return this;
++  }
+ }
+diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
+index c7e781e4172f736a831b857ca7fd3060d95e6186..2afd2e6f60ee5cc191b6eaf535e0fa12f25ea275 100644
+--- a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
++++ b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
+@@ -47,6 +47,7 @@ public class MinecraftDecompilationTest {
+         put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES,"1");
+         put(IFernflowerPreferences.ASCII_STRING_CHARACTERS,"1");
+         put(IFernflowerPreferences.REMOVE_SYNTHETIC,"0");
++        put(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH, "1");
+     }};
+     fixture.setUp(mcFFOptions);
+     if (!new File(fixture.getTestDataDir(), MC_JAR).exists()) {
diff --git a/FernFlower-Patches/0086-Enhance-switches-on-enums.patch b/FernFlower-Patches/0043-Enhance-switches-on-enums.patch
similarity index 95%
rename from FernFlower-Patches/0086-Enhance-switches-on-enums.patch
rename to FernFlower-Patches/0043-Enhance-switches-on-enums.patch
index 28fd09a..45ef1b5 100644
--- a/FernFlower-Patches/0086-Enhance-switches-on-enums.patch
+++ b/FernFlower-Patches/0043-Enhance-switches-on-enums.patch
@@ -18,7 +18,7 @@ index 2e1668de1af3414bfbed0bf72461688246303931..16d778867677249c16b38fcfbca16618
      System.out.println();
      for (StatEdge edge : statement.getAllSuccessorEdges())
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 33785497b358346846ce58824ce3c2f0aa2be815..12653a4836d4f864154310b6115369e943f36fd7 100644
+index 33785497b358346846ce58824ce3c2f0aa2be815..1eaeaa6519574c4defe41c789743631fb6c6222f 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 @@ -16,6 +16,7 @@
@@ -41,16 +41,7 @@ index 33785497b358346846ce58824ce3c2f0aa2be815..12653a4836d4f864154310b6115369e9
  import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
  import org.jetbrains.java.decompiler.modules.decompiler.vars.LVTVariable;
  import org.jetbrains.java.decompiler.modules.decompiler.vars.VarTypeProcessor;
-@@ -39,6 +43,8 @@ import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
- import org.jetbrains.java.decompiler.util.InterpreterUtil;
- 
-+import com.sun.xml.internal.ws.org.objectweb.asm.Opcodes;
-+
- import java.util.*;
- import java.util.Map.Entry;
- 
-@@ -59,6 +65,10 @@ public class NestedClassProcessor {
+@@ -59,6 +63,10 @@ public class NestedClassProcessor {
        return;
      }
  
@@ -61,7 +52,7 @@ index 33785497b358346846ce58824ce3c2f0aa2be815..12653a4836d4f864154310b6115369e9
      if (node.type != ClassNode.CLASS_LAMBDA) {
  
        computeLocalVarsAndDefinitions(node);
-@@ -102,6 +112,125 @@ public class NestedClassProcessor {
+@@ -102,6 +110,125 @@ public class NestedClassProcessor {
      }
    }
  
@@ -88,7 +79,7 @@ index 33785497b358346846ce58824ce3c2f0aa2be815..12653a4836d4f864154310b6115369e9
 +      return;
 +    }
 +
-+    final int STATIC_FINAL_SYNTHETIC = Opcodes.ACC_STATIC | Opcodes.ACC_FINAL | Opcodes.ACC_SYNTHETIC;
++    final int STATIC_FINAL_SYNTHETIC = CodeConstants.ACC_STATIC | CodeConstants.ACC_FINAL | CodeConstants.ACC_SYNTHETIC;
 +    Set<String> potentialFields = new HashSet<String>();
 +    for (StructField fd : node.classStruct.getFields()) {
 +      if ((fd.getAccessFlags() & STATIC_FINAL_SYNTHETIC) == STATIC_FINAL_SYNTHETIC && "[I".equals(fd.getDescriptor())) {
diff --git a/FernFlower-Patches/0087-Fixed-issue-where-inner-class-fields-would-not-be-re.patch b/FernFlower-Patches/0044-Fixed-issue-where-inner-class-fields-would-not-be-re.patch
similarity index 80%
rename from FernFlower-Patches/0087-Fixed-issue-where-inner-class-fields-would-not-be-re.patch
rename to FernFlower-Patches/0044-Fixed-issue-where-inner-class-fields-would-not-be-re.patch
index 7203308..ed3bef7 100644
--- a/FernFlower-Patches/0087-Fixed-issue-where-inner-class-fields-would-not-be-re.patch
+++ b/FernFlower-Patches/0044-Fixed-issue-where-inner-class-fields-would-not-be-re.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fixed issue where inner class fields would not be replaced by
 
 
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 12653a4836d4f864154310b6115369e943f36fd7..6d40b8a1dc102b0cdf90aed615e74c10cbd08ffa 100644
+index 1eaeaa6519574c4defe41c789743631fb6c6222f..3975d8cf93f8a2ce22b57ca3a666f3be77b5dcb4 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-@@ -706,8 +706,8 @@ public class NestedClassProcessor {
+@@ -704,8 +704,8 @@ public class NestedClassProcessor {
  
          DirectGraph graph = meth.getOrBuildGraph();
  
@@ -20,7 +20,7 @@ index 12653a4836d4f864154310b6115369e943f36fd7..6d40b8a1dc102b0cdf90aed615e74c10
  
              if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
                AssignmentExprent asexpr = (AssignmentExprent)exprent;
-@@ -718,7 +718,7 @@ public class NestedClassProcessor {
+@@ -716,7 +716,7 @@ public class NestedClassProcessor {
                      mapFieldsToNewVars.containsKey(InterpreterUtil.makeUniqueKey(child.classStruct.qualifiedName,
                                                                                   InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr
                                                                                     .getDescriptor().descriptorString)))) {
@@ -29,7 +29,7 @@ index 12653a4836d4f864154310b6115369e943f36fd7..6d40b8a1dc102b0cdf90aed615e74c10
                  }
  
                  //if(fexpr.getClassname().equals(child.classStruct.qualifiedName) &&
-@@ -734,13 +734,13 @@ public class NestedClassProcessor {
+@@ -732,13 +732,13 @@ public class NestedClassProcessor {
                if (invexpr.getFunctype() == InvocationExprent.TYP_INIT) {
                  // invocation of the super constructor in an anonymous class
                  child.superInvocation = invexpr; // FIXME: save original names of parameters
@@ -46,7 +46,16 @@ index 12653a4836d4f864154310b6115369e943f36fd7..6d40b8a1dc102b0cdf90aed615e74c10
            }
  
            private Exprent replaceExprent(Exprent exprent) {
-@@ -1191,4 +1191,43 @@ public class NestedClassProcessor {
+@@ -1143,7 +1143,7 @@ public class NestedClassProcessor {
+           res = classname.equals(((InvocationExprent)expr).getClassname());
+           break;
+         case Exprent.EXPRENT_NEW:
+-          VarType newType = expr.getExprType();
++          VarType newType = ((NewExprent)expr).getNewType();
+           res = newType.type == CodeConstants.TYPE_OBJECT && classname.equals(newType.value);
+           break;
+         case Exprent.EXPRENT_VAR:
+@@ -1189,4 +1189,41 @@ public class NestedClassProcessor {
        return keyfield.hashCode() + varpaar.hashCode();
      }
    }
@@ -57,8 +66,6 @@ index 12653a4836d4f864154310b6115369e943f36fd7..6d40b8a1dc102b0cdf90aed615e74c10
 +    Exprent processExprent(Exprent exprent);
 +  }
 +
-+
-+
 +  private static void iterateExprents(DirectGraph graph, ExprentIteratorWithReplace iter) {
 +    LinkedList<DirectNode> stack = new LinkedList<DirectNode>();
 +    stack.add(graph.first);
diff --git a/FernFlower-Patches/0044-PPMM-test-for-lex.patch b/FernFlower-Patches/0044-PPMM-test-for-lex.patch
deleted file mode 100644
index 1c9514c..0000000
--- a/FernFlower-Patches/0044-PPMM-test-for-lex.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Sun, 13 Sep 2015 18:25:07 -0400
-Subject: [PATCH] PPMM test for lex
-
-
-diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
-index f4d869c4f04fef50aa1bcf64cb61ce0d2b02bfb9..d2a8f1c20c8a7954d4ba22d17fc1584d3bd4a3ca 100644
---- a/test/org/jetbrains/java/decompiler/LVTTest.java
-+++ b/test/org/jetbrains/java/decompiler/LVTTest.java
-@@ -35,7 +35,10 @@ public class LVTTest extends SingleClassesTestBase {
-         super.setUp();
-         fixture.cleanup = false;
-     }
--  @Test public void testMatchLM() { doTest("pkg/TestLexManosLVT"); }
--  @Test public void testMatch1() { doTest("pkg/TestLVT"); }
--  @Test public void testMatch2() { doTest("pkg/TestLVTScoping"); }
-+  @Test public void testMatch1() { doTest("pkg/TestPPMM"); }
-+//  @Test public void testMatchLM() { doTest("pkg/TestLexManosLVT"); }
-+//  @Test public void testMatch1() { doTest("pkg/TestLVT"); }
-+//  @Test public void testMatch2() { doTest("pkg/TestLVTScoping"); }
-+//  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
-+//  @Test public void testMCGuiCmdBlock() { doTest("net/minecraft/client/gui/GuiCommandBlock"); }
- }
-diff --git a/testData/classes/pkg/TestPPMM.class b/testData/classes/pkg/TestPPMM.class
-new file mode 100644
-index 0000000000000000000000000000000000000000..e493a99dbb742f1f20c3cb134d7366db47c5d4b4
-GIT binary patch
-literal 371
-zcmYjL%}&BV7@V&yEtFyr6A#|JsRx^Qm3T2RF)2zS!Sl9maIv;cDL#QO<jKT?58y)?
-zr+{d7cfS38X1@9Q{`drNhCL6KASj<^(L^um@pv@y;0XG2^`fFo<+JEEnd`I`xI>eh
-z`a)nI9Zv<$W$~bW*ysdk!4-tD$@R_hInmWbC7Bis;v!YqR8^+QH$|s@Gz-B_{D0@U
-zz$#0DD86ffe^)H4R9~4!ruXaYv@wN4&;rc^7Jpn#^q57A!q_@_NBeEn_K8g!By@?v
-zdVsOVj3&0^duA4Ep*?&R+1@{y1CCOgLoU%no2QEoCH$52{+hm#wzwcfpQ3_Y@+=H~
-E0NOq`X8-^I
-
-literal 0
-HcmV?d00001
-
-diff --git a/testData/src/pkg/TestPPMM.java b/testData/src/pkg/TestPPMM.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..02eecf4b565584b5644ad5898565593494aad285
---- /dev/null
-+++ b/testData/src/pkg/TestPPMM.java
-@@ -0,0 +1,11 @@
-+package pkg;
-+
-+public class TestPPMM {
-+    public void pp() {
-+        int a = 0;
-+        a++;
-+        a++;
-+        a++;
-+        a++;
-+    }
-+}
-\ No newline at end of file
diff --git a/FernFlower-Patches/0088-Added-support-for-and-field-accessors-in-inner-class.patch b/FernFlower-Patches/0045-Add-support-for-and-field-accessors-in-inner-classes.patch
similarity index 67%
rename from FernFlower-Patches/0088-Added-support-for-and-field-accessors-in-inner-class.patch
rename to FernFlower-Patches/0045-Add-support-for-and-field-accessors-in-inner-classes.patch
index 157b030..1d8996a 100644
--- a/FernFlower-Patches/0088-Added-support-for-and-field-accessors-in-inner-class.patch
+++ b/FernFlower-Patches/0045-Add-support-for-and-field-accessors-in-inner-classes.patch
@@ -1,32 +1,9 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Lex Manos <LexManos@gmail.com>
 Date: Thu, 15 Oct 2015 15:51:24 -0700
-Subject: [PATCH] Added support for ++ and -- field accessors in inner classes.
- And fixed inner class type find issue.
+Subject: [PATCH] Add support for ++ and -- field accessors in inner classes
 
 
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 6d40b8a1dc102b0cdf90aed615e74c10cbd08ffa..1e69d8d4c01f89a1703a8e40424e8cb3c4ba62d3 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-@@ -1145,7 +1145,7 @@ public class NestedClassProcessor {
-           res = classname.equals(((InvocationExprent)expr).getClassname());
-           break;
-         case Exprent.EXPRENT_NEW:
--          VarType newType = expr.getExprType();
-+          VarType newType = ((NewExprent)expr).getNewType();
-           res = newType.type == CodeConstants.TYPE_OBJECT && classname.equals(newType.value);
-           break;
-         case Exprent.EXPRENT_VAR:
-@@ -1198,8 +1198,6 @@ public class NestedClassProcessor {
-     Exprent processExprent(Exprent exprent);
-   }
- 
--
--
-   private static void iterateExprents(DirectGraph graph, ExprentIteratorWithReplace iter) {
-     LinkedList<DirectNode> stack = new LinkedList<DirectNode>();
-     stack.add(graph.first);
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java b/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
 index 3fa8128a4e7f607770d592033588e716f49f12f0..b4856a6fabd1b06c2f8a12d9d11f62f2b2e408ec 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
diff --git a/FernFlower-Patches/0090-Tweak-decompilation-test-to-new-settings-no-syntheti.patch b/FernFlower-Patches/0046-Tweak-decompilation-test-to-new-settings-no-syntheti.patch
similarity index 100%
rename from FernFlower-Patches/0090-Tweak-decompilation-test-to-new-settings-no-syntheti.patch
rename to FernFlower-Patches/0046-Tweak-decompilation-test-to-new-settings-no-syntheti.patch
diff --git a/FernFlower-Patches/0092-Deterministic-label-names-based-on-jvm-instruction-i.patch b/FernFlower-Patches/0047-Deterministic-label-names-based-on-jvm-instruction-i.patch
similarity index 100%
rename from FernFlower-Patches/0092-Deterministic-label-names-based-on-jvm-instruction-i.patch
rename to FernFlower-Patches/0047-Deterministic-label-names-based-on-jvm-instruction-i.patch
diff --git a/FernFlower-Patches/0047-Prevent-infinite-loops-in-PPMM.patch b/FernFlower-Patches/0047-Prevent-infinite-loops-in-PPMM.patch
deleted file mode 100644
index 7877368..0000000
--- a/FernFlower-Patches/0047-Prevent-infinite-loops-in-PPMM.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Sun, 13 Sep 2015 18:19:20 -0700
-Subject: [PATCH] Prevent infinite loops in PPMM.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
-index f39946d1c839333a69c91521f6714b183028567d..db70f64a91a21c04b1277b6da9b38ef7f60c1cf4 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
-@@ -157,7 +157,11 @@ public class PPandMMHelper {
- 
-               exprentReplaced = true;
-               if (!left.equals(econd)) {
--                remaps.put(new VarVersionPair((VarExprent)left), new VarVersionPair((VarExprent)econd));
-+                VarVersionPair _old = new VarVersionPair((VarExprent)left);
-+                VarVersionPair _new = new VarVersionPair((VarExprent)econd);
-+                if (_old.var > _new.var) { // Try and prevent infinite loops here by only merging 'down'
-+                  remaps.put(_old, _new);
-+                }
-               }
-               return ret;
-             }
diff --git a/FernFlower-Patches/0097-Fixed-JUint-tests.-AmbiguousCallWithDebugInfo-Was-br.patch b/FernFlower-Patches/0048-Fixed-JUint-tests.-AmbiguousCallWithDebugInfo-Was-br.patch
similarity index 100%
rename from FernFlower-Patches/0097-Fixed-JUint-tests.-AmbiguousCallWithDebugInfo-Was-br.patch
rename to FernFlower-Patches/0048-Fixed-JUint-tests.-AmbiguousCallWithDebugInfo-Was-br.patch
diff --git a/FernFlower-Patches/0049-More-merging.-It-does-some-things-better.-But-still-.patch b/FernFlower-Patches/0049-More-merging.-It-does-some-things-better.-But-still-.patch
deleted file mode 100644
index 55ca90b..0000000
--- a/FernFlower-Patches/0049-More-merging.-It-does-some-things-better.-But-still-.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Wed, 16 Sep 2015 00:49:12 -0400
-Subject: [PATCH] More merging. It does some things better. But still not
- anywhere near good enough :(
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
-index 762fd011314ca3f5c7fdc370ffe2bccdbb01a509..ea7e6110cf1e5eeb4d3f13d98527d53e85dd60fe 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
-@@ -24,6 +24,7 @@ import org.jetbrains.java.decompiler.main.TextBuffer;
- import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
- import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
- import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
-+import org.jetbrains.java.decompiler.modules.decompiler.vars.StartEndPair;
- 
- public class BasicBlockStatement extends Statement {
- 
-@@ -94,4 +95,13 @@ public class BasicBlockStatement extends Statement {
-   public BasicBlock getBlock() {
-     return block;
-   }
-+
-+  @Override
-+    public StartEndPair getStartEndRange() {
-+      if (block.size() > 0) {
-+          return new StartEndPair(block.getStartInstruction(),block.getEndInstruction());
-+    } else {
-+        return null;
-+    }
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 7abcec8a356fa92f2bc18bf2dc24fc3defac3a38..8c42c0c192cd73d7aef3632e22eaa74a3fff20e1 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-@@ -19,6 +19,7 @@ import org.jetbrains.java.decompiler.code.CodeConstants;
- import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchAllStatement;
-@@ -47,11 +48,14 @@ public class VarDefinitionHelper {
- 
-   private final VarProcessor varproc;
- 
-+  private final Map<VarVersionPair,List<ConstExprent>> constExprents;
-+
-   public VarDefinitionHelper(Statement root, StructMethod mt, VarProcessor varproc) {
- 
-     mapVarDefStatements = new HashMap<Integer, Statement>();
-     mapStatementVars = new HashMap<Integer, HashSet<Integer>>();
-     implDefVars = new HashSet<Integer>();
-+    constExprents = new HashMap<VarVersionPair,List<ConstExprent>>();
-     this.varproc = varproc;
- 
-     VarNamesCollector vc = DecompilerContext.getVarNamesCollector();
-@@ -472,16 +476,33 @@ public class VarDefinitionHelper {
-     VarExprent left = (VarExprent)exp.getLeft();
-     int index = varproc.getRemapped(left.getIndex());
- 
--    for (Exprent e : exp.getRight().getAllExprents(true)) {
--      if (e.type == Exprent.EXPRENT_VAR) {
--          VarExprent right = (VarExprent)e;
--        if (varproc.getRemapped(right.getIndex()) == index) {
--          if (!left.equals(right) && left.getIndex() > right.getIndex()) {
--            remaps.put(new VarVersionPair(left), new VarVersionPair(right));
-+    // constant
-+    VarVersionPair source = new VarVersionPair(left);
-+    if (exp.getRight().type == Exprent.EXPRENT_CONST) {
-+        VarVersionPair target = new VarVersionPair(index,0);
-+        if (index < left.getIndex()) {
-+            remaps.put(source, target);
-+        }
-+        if (!constExprents.containsKey(source)) {
-+            constExprents.put(source, new ArrayList<ConstExprent>());
-+        }
-+        List<ConstExprent> ceList = constExprents.get(source);
-+        ceList.add((ConstExprent) exp.getRight());
-+    } else {
-+        for (Exprent e : exp.getRight().getAllExprents(true)) {
-+          if (e.type == Exprent.EXPRENT_VAR) {
-+              VarExprent right = (VarExprent)e;
-+            if (varproc.getRemapped(right.getIndex()) == index) {
-+              if (!left.equals(right) && left.getIndex() > right.getIndex()) {
-+                remaps.put(source, new VarVersionPair(right));
-+              }
-+              return;
-+            }
-           }
--          return;
-         }
--      }
-+        if (index < left.getIndex()) {
-+            remaps.put(source, new VarVersionPair(index,0));
-+        }
-     }
-   }
- 
-@@ -514,6 +535,7 @@ public class VarDefinitionHelper {
-     List<Exprent> lst = exprent.getAllExprents(true);
-     lst.add(exprent);
-     Map<VarVersionPair, VarType> mapExprentMinTypes = varproc.getVarVersions().getTypeProcessor().getMapExprentMinTypes();
-+    Map<VarVersionPair, VarType> mapExprentMaxTypes = varproc.getVarVersions().getTypeProcessor().getMapExprentMaxTypes();
- 
-     for (Exprent expr : lst) {
-       if (expr.type == Exprent.EXPRENT_VAR) {
-@@ -523,10 +545,24 @@ public class VarDefinitionHelper {
-         if (new_ != null) {
-           VarType firstMinType = mapExprentMinTypes.get(old);
-           VarType secondMinType = mapExprentMinTypes.get(new_);
-+          VarType type = firstMinType == null ? secondMinType : (secondMinType == null ? firstMinType :VarType.getCommonSupertype(firstMinType, secondMinType));
-+          if (type == null || firstMinType == null || secondMinType == null) {
-+              // no common supertype, skip the remapping
-+              continue;
-+          }
-+          if (type.typeFamily == CodeConstants.TYPE_FAMILY_OBJECT && mapExprentMaxTypes.get(old) != null && mapExprentMaxTypes.get(new_) != null) {
-+              type = VarType.getCommonMinType(mapExprentMaxTypes.get(old), mapExprentMaxTypes.get(new_));
-+          } else if (type.typeFamily == CodeConstants.TYPE_FAMILY_OBJECT) {
-+              continue;
-+          }
-           var.setIndex(new_.var);
-           var.setVersion(new_.version);
--          VarType type = VarType.getCommonSupertype(firstMinType, secondMinType);
-           mapExprentMinTypes.put(new_, type);
-+          if (constExprents.containsKey(old)) {
-+              for (ConstExprent ce : constExprents.get(old)) {
-+                  ce.setConstType(type);
-+              }
-+          }
-         }
-       }
-     }
diff --git a/FernFlower-Patches/0102-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch b/FernFlower-Patches/0049-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch
similarity index 100%
rename from FernFlower-Patches/0102-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch
rename to FernFlower-Patches/0049-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch
diff --git a/FernFlower-Patches/0104-Add-a-parameter-renamer.patch b/FernFlower-Patches/0050-Add-a-parameter-renamer.patch
similarity index 100%
rename from FernFlower-Patches/0104-Add-a-parameter-renamer.patch
rename to FernFlower-Patches/0050-Add-a-parameter-renamer.patch
diff --git a/FernFlower-Patches/0050-More-tweaks-to-merging.-It-s-pretty-decent.-But-stil.patch b/FernFlower-Patches/0050-More-tweaks-to-merging.-It-s-pretty-decent.-But-stil.patch
deleted file mode 100644
index 6923ebe..0000000
--- a/FernFlower-Patches/0050-More-tweaks-to-merging.-It-s-pretty-decent.-But-stil.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Thu, 17 Sep 2015 17:13:17 -0400
-Subject: [PATCH] More tweaks to merging. It's pretty decent. But still no
- where near good enough.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 8c42c0c192cd73d7aef3632e22eaa74a3fff20e1..ca27e4718c556a478242a60df896f6f61db6e915 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-@@ -550,10 +550,18 @@ public class VarDefinitionHelper {
-               // no common supertype, skip the remapping
-               continue;
-           }
--          if (type.typeFamily == CodeConstants.TYPE_FAMILY_OBJECT && mapExprentMaxTypes.get(old) != null && mapExprentMaxTypes.get(new_) != null) {
--              type = VarType.getCommonMinType(mapExprentMaxTypes.get(old), mapExprentMaxTypes.get(new_));
--          } else if (type.typeFamily == CodeConstants.TYPE_FAMILY_OBJECT) {
--              continue;
-+          if (type.typeFamily == CodeConstants.TYPE_FAMILY_OBJECT) {
-+              if (mapExprentMaxTypes.get(old) != null && mapExprentMaxTypes.get(new_) != null) {
-+                  type = VarType.getCommonMinType(mapExprentMaxTypes.get(old), mapExprentMaxTypes.get(new_));
-+              } else if (firstMinType.arrayDim != secondMinType.arrayDim) {
-+                  continue;
-+              } else {
-+                  type = VarType.getCommonMinType(firstMinType, secondMinType);
-+                  // couldn't find a sane common supertype, we're not gonna be able to merge
-+                  if (type == null || type == VarType.VARTYPE_NULL) {
-+                      continue;
-+                  }
-+              }
-           }
-           var.setIndex(new_.var);
-           var.setVersion(new_.version);
-@@ -563,6 +571,11 @@ public class VarDefinitionHelper {
-                   ce.setConstType(type);
-               }
-           }
-+          if (constExprents.containsKey(new_)) {
-+              for (ConstExprent ce : constExprents.get(new_)) {
-+                  ce.setConstType(type);
-+              }
-+          }
-         }
-       }
-     }
diff --git a/FernFlower-Patches/0105-Bulk-decompilation-test-for-all-to-use.patch b/FernFlower-Patches/0051-Bulk-test-for-MC.patch
similarity index 57%
rename from FernFlower-Patches/0105-Bulk-decompilation-test-for-all-to-use.patch
rename to FernFlower-Patches/0051-Bulk-test-for-MC.patch
index 1254da5..d3d2795 100644
--- a/FernFlower-Patches/0105-Bulk-decompilation-test-for-all-to-use.patch
+++ b/FernFlower-Patches/0051-Bulk-test-for-MC.patch
@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
-Date: Sun, 25 Oct 2015 14:08:33 -0400
-Subject: [PATCH] Bulk decompilation test for all to use
+Date: Sun, 25 Oct 2015 10:29:37 -0400
+Subject: [PATCH] Bulk test for MC
 
 
 diff --git a/build.gradle b/build.gradle
-index bc211f2219fbcef72a0acca7b79f5c41fcf0affa..cf3d8ec6b2fe4260b788b46643e8a397e5d63e18 100644
+index b07b27ac85efa26329091d217623301bc3cdba45..7dec9ec6fb04c6cd2081f2e452d072f7451ddcad 100644
 --- a/build.gradle
 +++ b/build.gradle
 @@ -17,6 +17,11 @@ sourceSets {
@@ -68,11 +68,55 @@ index bc211f2219fbcef72a0acca7b79f5c41fcf0affa..cf3d8ec6b2fe4260b788b46643e8a397
  compileJava.options.encoding = "utf-8"
  compileJava.options.deprecation = true
  
+diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
+index f2c344a925dda9d1081aa867987147fd3fb3664e..77eda8797ac72262d0c6dabbbd06a0ed0f481596 100644
+--- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
++++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
+@@ -46,23 +46,26 @@ public class DecompilerTestFixture {
+     assertTrue("current dir: " + new File("").getAbsolutePath(), isTestDataDir(testDataDir));
+ 
+     //noinspection SSBasedInspection
+-    tempDir = File.createTempFile("decompiler_test_", "_dir");
+-    assertTrue(tempDir.delete());
+-
++    tempDir = getRandomDir();
++    if (tempDir.exists()) tempDir.delete();
+     targetDir = new File(tempDir, "decompiled");
+-    assertTrue(targetDir.mkdirs());
++    targetDir.mkdirs();
+     decompiler = new ConsoleDecompiler(this.targetDir, new HashMap<String, Object>() {{
+       put(IFernflowerPreferences.LOG_LEVEL, "warn");
+       put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES, "1");
+       put(IFernflowerPreferences.REMOVE_SYNTHETIC, "1");
+       put(IFernflowerPreferences.REMOVE_BRIDGE, "1");
+       put(IFernflowerPreferences.LITERALS_AS_IS, "1");
+-      put(IFernflowerPreferences.UNIT_TEST_MODE, "1");
++      put(IFernflowerPreferences.MAX_PROCESSING_METHOD, "60000");
+       putAll(options);
+     }});
+   }
+ 
+-  public void tearDown() {
++  protected File getRandomDir() throws IOException {
++	  return File.createTempFile("decompiler_test_", "_dir");
++  }
++
++public void tearDown() {
+     if (tempDir != null && cleanup) {
+       delete(tempDir);
+     }
+@@ -95,6 +98,5 @@ public class DecompilerTestFixture {
+         for (File f : files) delete(f);
+       }
+     }
+-    assertTrue(file.delete());
+   }
+ }
 diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
-index 660d0313e68f87b72b694b886ab321792fb5a8bc..0d68e8886c6f6584c4514e9b95f320fb05b9e941 100644
+index 087c8102c11b1258d8e3f1615fe64f745b8587d6..2ae6da55e0d8ecb2fbdb39a6e42d1f179ac32203 100644
 --- a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
 +++ b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
-@@ -16,8 +16,12 @@
+@@ -16,47 +16,83 @@
  package org.jetbrains.java.decompiler;
  
  import org.hamcrest.Matchers;
@@ -84,16 +128,28 @@ index 660d0313e68f87b72b694b886ab321792fb5a8bc..0d68e8886c6f6584c4514e9b95f320fb
 +import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
  import org.jetbrains.java.decompiler.util.InterpreterUtil;
  import org.junit.After;
- import org.junit.Assert;
-@@ -34,11 +38,17 @@ import java.util.HashSet;
- import java.util.List;
++import org.junit.Assert;
+ import org.junit.Before;
+ import org.junit.Test;
+ 
+ import java.io.*;
++import java.math.BigInteger;
++import java.security.MessageDigest;
++import java.security.NoSuchAlgorithmException;
+ import java.util.Enumeration;
+ import java.util.HashMap;
++import java.util.HashSet;
++import java.util.List;
  import java.util.Map;
- import java.util.Map.Entry;
++import java.util.Map.Entry;
 +import java.util.regex.Matcher;
 +import java.util.regex.Pattern;
  import java.util.zip.ZipEntry;
  import java.util.zip.ZipFile;
  
+-import static org.junit.Assert.assertThat;
+-import static org.junit.Assert.assertTrue;
+-
  public class MinecraftDecompilationTest {
 +  public static final Pattern p = Pattern.compile("func_(\\d+)_.*");
    private DecompilerTestFixture fixture;
@@ -103,20 +159,22 @@ index 660d0313e68f87b72b694b886ab321792fb5a8bc..0d68e8886c6f6584c4514e9b95f320fb
  
    private static final String MC_JAR = "minecraft_ff_in.jar";
    @Before
-@@ -46,7 +56,7 @@ public class MinecraftDecompilationTest {
-     fixture = new DecompilerTestFixture() {
-       @Override
-       public File getRandomDir() {
--        return new File("/run/user/1000/fftest");
+   public void setUp() throws IOException {
+-    fixture = new DecompilerTestFixture();
+-    // -din=1 -rbr=0 -dgs=1 -asc=1 -rsy=0
++    fixture = new DecompilerTestFixture() {
++      @Override
++      public File getRandomDir() {
 +        return new File(OUTROOT,"fftest");
-       }
-     };
++      }
++    };
      Map<String,Object> mcFFOptions = new HashMap<String,Object>() {{
-@@ -56,9 +66,24 @@ public class MinecraftDecompilationTest {
+         put(IFernflowerPreferences.DECOMPILE_INNER,"1");
+         put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES,"1");
+         put(IFernflowerPreferences.ASCII_STRING_CHARACTERS,"1");
          put(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH, "1");
-         put(IFernflowerPreferences.REMOVE_BRIDGE, "1");
-         put(IFernflowerPreferences.REMOVE_SYNTHETIC, "1");
--        put(IFernflowerPreferences.NEW_LINE_SEPARATOR, "0");
++        put(IFernflowerPreferences.REMOVE_BRIDGE, "1");
++        put(IFernflowerPreferences.REMOVE_SYNTHETIC, "1");
 +        put(IFernflowerPreferences.NEW_LINE_SEPARATOR, "1");
 +        put(IFernflowerPreferences.LITERALS_AS_IS, "0");
      }};
@@ -136,23 +194,32 @@ index 660d0313e68f87b72b694b886ab321792fb5a8bc..0d68e8886c6f6584c4514e9b95f320fb
 +        }
 +    });
      if (!new File(fixture.getTestDataDir(), MC_JAR).exists()) {
-       throw new RuntimeException("Missing "+MC_JAR+" in testData dir - aborting");
+-        throw new RuntimeException("Missing "+MC_JAR+" in testData dir - aborting");
++      throw new RuntimeException("Missing "+MC_JAR+" in testData dir - aborting");
      }
-@@ -85,28 +110,44 @@ public class MinecraftDecompilationTest {
+   }
+ 
+   @After
+   public void tearDown() {
+-//    fixture.tearDown();
+-//    fixture = null;
++    fixture.tearDown();
++    fixture = null;
+   }
+ 
+ //  @Test
+@@ -72,32 +108,116 @@ public class MinecraftDecompilationTest {
+ //  }
+ 
    @Test
-   public void testJar() throws IOException {
-     Map<String,String> md5s = new HashMap<String,String>();
--	MessageDigest md5;
+-  public void testJar() {
++  public void testJar() throws IOException {
++    Map<String,String> md5s = new HashMap<String,String>();
 +    MessageDigest md5;
-     try {
--	  md5 = MessageDigest.getInstance("MD5");
--	} catch (NoSuchAlgorithmException e1) {
++    try {
 +      md5 = MessageDigest.getInstance("MD5");
 +    } catch (NoSuchAlgorithmException e1) {
-       md5 = null;
--	}
--
--    System.out.println("Decompiling base");
++      md5 = null;
 +    }
 +    System.out.printf("TEST SETUP: MD5: %s, OUTPUT: %s, LOOPS %d\n",MD5IN, OUTROOT, LOOPS);
      ConsoleDecompiler decompiler = fixture.getDecompiler();
@@ -167,15 +234,11 @@ index 660d0313e68f87b72b694b886ab321792fb5a8bc..0d68e8886c6f6584c4514e9b95f320fb
 +            md5s.put(parts[0],parts[1]);
 +        }
 +    } else {
- 
--    Map<String, HashSet<String>> variants = new HashMap<String, HashSet<String>>();
++
 +        System.out.println("Decompiling base");
 +        decompiler.addSpace(new File(fixture.getTestDataDir(), MC_JAR), true);
 +        decompiler.decompileContext();
- 
--    Map<String, String> valid = readJar(new File(fixture.getTargetDir(), MC_JAR),md5s,md5);
--    
--    File outRoot = new File("/run/user/1000/ffbulk");
++
 +
 +        readJar(new File(fixture.getTargetDir(), MC_JAR),md5s,md5);
 +        File outmd5 = new File(fixture.getRandomDir(),"md5s.csv");
@@ -187,42 +250,23 @@ index 660d0313e68f87b72b694b886ab321792fb5a8bc..0d68e8886c6f6584c4514e9b95f320fb
 +    }
 +    Map<String, HashSet<String>> variants = new HashMap<String, HashSet<String>>();
 +    File outRoot = new File(OUTROOT,"ffbulk");
-     outRoot.mkdirs();
--    for (int x = 0; x < 10000; x++) {
++    outRoot.mkdirs();
 +    for (int x = 0; x < LOOPS; x++) {
-       this.tearDown();
-       this.setUp();
--      System.out.println(x + "/10000 Starting Decompile");
++      this.tearDown();
++      this.setUp();
 +      System.out.printf("%d/%s Starting Decompile",x,LOOPS);
-       decompiler = fixture.getDecompiler();
-       decompiler.addSpace(new File(fixture.getTestDataDir(), MC_JAR), true);
-       decompiler.decompileContext();
-@@ -115,29 +156,32 @@ public class MinecraftDecompilationTest {
-       Map<String, String> data = readJar(new File(fixture.getTargetDir(), MC_JAR),null,null);
++      decompiler = fixture.getDecompiler();
++      decompiler.addSpace(new File(fixture.getTestDataDir(), MC_JAR), true);
++      decompiler.decompileContext();
++      System.gc();
+ 
+-    File unpacked = new File(fixture.getTempDir(), "unpacked");
+-    unpack(new File(fixture.getTargetDir(), "bulk.jar"), unpacked);
++      Map<String, String> data = readJar(new File(fixture.getTargetDir(), MC_JAR),null,null);
  
-       for (Entry<String, String> e : data.entrySet()) {
++      for (Entry<String, String> e : data.entrySet()) {
 +        String fname = e.getKey();
-         String found = e.getValue();
--        String expected = valid.get(e.getKey());
--        if (!found.equals(expected)) {
--          HashSet<String> set = variants.get(e.getKey());
--          if (set == null) {
--            set = new HashSet<String>();
--            set.add(expected);
--            variants.put(e.getKey(), set);
--          }
--          String md5digest = md5digest(found, md5);
--		if (!set.contains(found)) {
--            System.out.println("New Variant: " + e.getKey());
--            set.add(found);
--            System.out.println("Orig md5:"+md5s.get(e.getKey()));
--            System.out.println("Variant md5: "+md5digest);
--            writeFile(expected,e.getKey(),outRoot);
--            writeFile(found,e.getKey()+"."+md5digest,outRoot);
--          }
--          else
--          {
--            System.out.println("Existing Variant: " + e.getKey());
++        String found = e.getValue();
 +        String md5digest = md5digest(found, md5);
 +        String expected = null;
 +        if (md5digest.equals(md5s.get(fname)) && !valid.containsKey(fname)) {
@@ -241,48 +285,49 @@ index 660d0313e68f87b72b694b886ab321792fb5a8bc..0d68e8886c6f6584c4514e9b95f320fb
 +            System.out.println("New Variant: " + fname);
 +            set.add(md5digest);
 +            System.out.println("Orig md5:"+md5s.get(fname));
-             System.out.println("Variant md5: "+md5digest);
--          }
-+            writeFile(expected,fname,outRoot);
++            System.out.println("Variant md5: "+md5digest);
++            if (expected != null) writeFile(expected,fname,outRoot);
 +            writeFile(found,fname+"."+md5digest,outRoot);
 +        } else if (!md5digest.equals(md5s.get(fname))) {
 +          System.out.println("Existing Variant: " + fname);
 +          System.out.println("Variant md5: "+md5digest);
-         }
-       }
-     }
-@@ -145,15 +189,15 @@ public class MinecraftDecompilationTest {
++        }
++      }
++    }
+ //    compareDirectories(new File(fixture.getTestDataDir(), "bulk"), unpacked);
    }
  
-   private static void writeFile(String fl, String path, File outRoot) {
--	  File out = new File(outRoot,path);
--	  out.getParentFile().mkdirs();
+-  private static void unpack(File archive, File targetDir) {
++  private static void writeFile(String fl, String path, File outRoot) {
 +      File out = new File(outRoot,path);
 +      out.getParentFile().mkdirs();
-       try {
--		FileWriter fw = new FileWriter(out.getAbsoluteFile());
--		  fw.write(fl);
--		  fw.close();
--	} catch (IOException e) {
--		e.printStackTrace();
--	}
++      try {
 +        FileWriter fw = new FileWriter(out.getAbsoluteFile());
 +          fw.write(fl);
 +          fw.close();
 +    } catch (IOException e) {
 +        e.printStackTrace();
 +    }
-   }
-   private static Map<String, String> readJar(File archive, Map<String, String> md5s, MessageDigest md5) {
-     Map<String, String> ret = new HashMap<String, String>();
-@@ -170,10 +214,10 @@ public class MinecraftDecompilationTest {
++  }
++  private static Map<String, String> readJar(File archive, Map<String, String> md5s, MessageDigest md5) {
++    Map<String, String> ret = new HashMap<String, String>();
+     try {
+       ZipFile zip = new ZipFile(archive);
+       try {
+         Enumeration<? extends ZipEntry> entries = zip.entries();
+         while (entries.hasMoreElements()) {
+           ZipEntry entry = entries.nextElement();
+-          if (!entry.isDirectory()) {
+-            File file = new File(targetDir, entry.getName());
+-            assertTrue(file.getParentFile().mkdirs() || file.getParentFile().isDirectory());
++          if (!entry.isDirectory() && entry.getName().endsWith(".java")) {
+             InputStream in = zip.getInputStream(entry);
+-            OutputStream out = new FileOutputStream(file);
++            ByteArrayOutputStream out = new ByteArrayOutputStream((int)entry.getSize());
+             InterpreterUtil.copyStream(in, out);
              out.close();
              in.close();
-             String fileContent = new String(out.toByteArray());
--			ret.put(entry.getName(), fileContent);
--			if (md5!=null && md5s != null) {
--				md5s.put(entry.getName(), md5digest(fileContent, md5));
--			}
++            String fileContent = new String(out.toByteArray());
 +            ret.put(entry.getName(), fileContent);
 +            if (md5!=null && md5s != null) {
 +                md5s.put(entry.getName(), md5digest(fileContent, md5));
@@ -290,21 +335,28 @@ index 660d0313e68f87b72b694b886ab321792fb5a8bc..0d68e8886c6f6584c4514e9b95f320fb
            }
          }
        }
-@@ -187,11 +231,11 @@ public class MinecraftDecompilationTest {
-     return ret;
+@@ -108,17 +228,14 @@ public class MinecraftDecompilationTest {
+     catch (IOException e) {
+       throw new RuntimeException(e);
+     }
++    return ret;
    }
-   private static String md5digest(String input, MessageDigest md5) {
--	  md5.reset();
--	  try {
--		return String.format("0%032x",new BigInteger(1,md5.digest(input.getBytes("UTF-8"))));
--	} catch (UnsupportedEncodingException e) {
--		return null;
--	}
+-
+-  private static void compareDirectories(File expected, File actual) {
+-    String[] expectedList = expected.list();
+-    String[] actualList = actual.list();
+-    assertThat(actualList, Matchers.arrayContainingInAnyOrder(expectedList));
+-    for (String name : expectedList) {
+-      File child = new File(expected, name);
+-      if (child.isDirectory()) {
+-        compareDirectories(child, new File(actual, name));
+-      }
++  private static String md5digest(String input, MessageDigest md5) {
 +      md5.reset();
 +      try {
 +        return String.format("0%032x",new BigInteger(1,md5.digest(input.getBytes("UTF-8"))));
 +    } catch (UnsupportedEncodingException e) {
 +        return null;
-+    }
+     }
    }
  }
diff --git a/FernFlower-Patches/0052-If-it-s-a-null-constant-don-t-give-it-a-type.-Cleans.patch b/FernFlower-Patches/0052-If-it-s-a-null-constant-don-t-give-it-a-type.-Cleans.patch
deleted file mode 100644
index 98a17cd..0000000
--- a/FernFlower-Patches/0052-If-it-s-a-null-constant-don-t-give-it-a-type.-Cleans.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Thu, 24 Sep 2015 00:00:19 -0400
-Subject: [PATCH] If it's a null constant, don't give it a type. Cleans up some
- more errors.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 0c03cd52d3ab4b664545ebf8c57faa9381a7ac65..9ecb28bffa6dc6159370823066d8f189a3f1a83b 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-@@ -637,6 +637,9 @@ if (mt.getName().equals("func_180655_c")){
-           }
- 
-           ConstExprent right = (ConstExprent)ass.getRight();
-+          if (right.getConstType() == VarType.VARTYPE_NULL) {
-+              continue;
-+          }
-           VarType merged = getMergedType(mapExprentMinTypes.get(from), mapExprentMinTypes.get(to),
-                                          mapExprentMaxTypes.get(from), mapExprentMaxTypes.get(to));
- 
-diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
-index d2a8f1c20c8a7954d4ba22d17fc1584d3bd4a3ca..52428c70df9fe4166129c11eacd4d19c2d7196e3 100644
---- a/test/org/jetbrains/java/decompiler/LVTTest.java
-+++ b/test/org/jetbrains/java/decompiler/LVTTest.java
-@@ -35,10 +35,20 @@ public class LVTTest extends SingleClassesTestBase {
-         super.setUp();
-         fixture.cleanup = false;
-     }
--  @Test public void testMatch1() { doTest("pkg/TestPPMM"); }
-+//  @Test public void testMatch1() { doTest("pkg/TestPPMM"); }
- //  @Test public void testMatchLM() { doTest("pkg/TestLexManosLVT"); }
- //  @Test public void testMatch1() { doTest("pkg/TestLVT"); }
- //  @Test public void testMatch2() { doTest("pkg/TestLVTScoping"); }
- //  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
- //  @Test public void testMCGuiCmdBlock() { doTest("net/minecraft/client/gui/GuiCommandBlock"); }
-+
-+//  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
-+
-+//  @Test public void testMCGuiCmdBlock() { doTest("net/minecraft/client/gui/GuiCommandBlock"); }
-+
-+//  @Test public void testMCBlockFence() { doTest("net/minecraft/block/BlockFence"); }
-+
-+//  @Test public void testMCAbstractTexture() { doTest("net/minecraft/client/multiplayer/ServerAddress"); }
-+//  @Test public void testMCAbstractTexture() { doTest("net/minecraft/client/resources/AbstractResourcePack"); }
-+  @Test public void testMCGuiShareToLan() { doTest("net/minecraft/client/gui/GuiShareToLan"); }
- }
diff --git a/FernFlower-Patches/0107-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch b/FernFlower-Patches/0052-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch
similarity index 100%
rename from FernFlower-Patches/0107-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch
rename to FernFlower-Patches/0052-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch
diff --git a/FernFlower-Patches/0108-Gather-all-variable-declarations-including-those-wit.patch b/FernFlower-Patches/0053-Gather-all-variable-declarations-including-those-wit.patch
similarity index 100%
rename from FernFlower-Patches/0108-Gather-all-variable-declarations-including-those-wit.patch
rename to FernFlower-Patches/0053-Gather-all-variable-declarations-including-those-wit.patch
diff --git a/FernFlower-Patches/0109-Renaming-thinger.patch b/FernFlower-Patches/0054-Add-variable-renaming-option-and-interface.patch
similarity index 71%
rename from FernFlower-Patches/0109-Renaming-thinger.patch
rename to FernFlower-Patches/0054-Add-variable-renaming-option-and-interface.patch
index 3094bac..b93698a 100644
--- a/FernFlower-Patches/0109-Renaming-thinger.patch
+++ b/FernFlower-Patches/0054-Add-variable-renaming-option-and-interface.patch
@@ -1,23 +1,35 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: cpw <cpw@weeksfamily.ca>
 Date: Fri, 6 Nov 2015 01:36:47 -0500
-Subject: [PATCH] Renaming thinger
+Subject: [PATCH] Add variable renaming option and interface
 
+"jvn" argument enables JAD-style variable naming (int i, j, k etc).
+Can pass a "RENAMER_FACTORY" to the decompiler context: this is the
+name of a class implementing IVariableNamingFactory, that will be
+loaded and instantiated, overriding other variable naming options.
 
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index 808c5e1bb2c32a5f85eaac548040522697e60fc8..c515d2e60e0917d2588a359c1d52a5345e8747ca 100644
+index 808c5e1bb2c32a5f85eaac548040522697e60fc8..b90f2ec58cc54cdd9b72257824ec6ceaefbc536e 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-@@ -732,7 +732,7 @@ public class ClassWriter {
+@@ -18,7 +18,6 @@ package org.jetbrains.java.decompiler.main;
+ import org.jetbrains.java.decompiler.code.CodeConstants;
+ import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
+ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+-import org.jetbrains.java.decompiler.main.extern.IAbstractParameterRenamer;
+ import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
+ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+ import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
+@@ -732,7 +731,7 @@ public class ClassWriter {
              buffer.append(' ');
              String parameterName = methodWrapper.varproc.getVarName(new VarVersionPair(index, 0));
              if ((flags & (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_NATIVE)) != 0) {
 -                parameterName = renameParameterIfPossible(parameterName, index, methodWrapper, flags);
-+                parameterName = methodWrapper.methodStruct.renamer.renameAbstractParameter(parameterName);
++                parameterName = methodWrapper.methodStruct.getRenamer().renameAbstractParameter(parameterName, index);
              }
              buffer.append(parameterName == null ? "param" + index : parameterName); // null iff decompiled with errors
  
-@@ -839,13 +839,7 @@ public class ClassWriter {
+@@ -839,13 +838,7 @@ public class ClassWriter {
      return !hideMethod;
    }
  
@@ -32,8 +44,30 @@ index 808c5e1bb2c32a5f85eaac548040522697e60fc8..c515d2e60e0917d2588a359c1d52a534
      // build line start offsets map
      HashMap<Integer, Set<Integer>> lineStartOffsets = new HashMap<Integer, Set<Integer>>();
      for (Map.Entry<Integer, Integer> entry : tracer.getMapping().entrySet()) {
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+index 00600213ac4a4a39de72131a9cc6dc22424dc7a0..e0fdaacc5d6f16c5eea148540b2c90758779deae 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+@@ -24,6 +24,7 @@ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+ import org.jetbrains.java.decompiler.main.extern.IIdentifierRenamer;
+ import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
+ import org.jetbrains.java.decompiler.main.rels.LambdaProcessor;
++import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
+ import org.jetbrains.java.decompiler.main.rels.NestedClassProcessor;
+ import org.jetbrains.java.decompiler.main.rels.NestedMemberAccess;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent;
+@@ -353,6 +354,9 @@ public class ClassesProcessor {
+ 
+     node.wrapper = null;
+     node.classStruct.releaseResources();
++    for (StructMethod m : node.classStruct.getMethods()) {
++        m.unloadRenamer();
++    }
+ 
+     for (ClassNode nd : node.nested) {
+       destroyWrappers(nd);
 diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-index 15c6e406640315e5fbe82d48006b1a15f97020c8..8d4d403773a861191083e2b2f6e469ec9ace45f2 100644
+index 15c6e406640315e5fbe82d48006b1a15f97020c8..f946bb46ab04b018786a72371af431d42f65cf1c 100644
 --- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
 +++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
 @@ -21,8 +21,10 @@ import org.jetbrains.java.decompiler.main.collectors.ImportCollector;
@@ -55,7 +89,7 @@ index 15c6e406640315e5fbe82d48006b1a15f97020c8..8d4d403773a861191083e2b2f6e469ec
  
    private static final ThreadLocal<DecompilerContext> currentContext = new ThreadLocal<DecompilerContext>();
  
-@@ -48,6 +51,7 @@ public class DecompilerContext {
+@@ -48,17 +51,34 @@ public class DecompilerContext {
    private PoolInterceptor poolInterceptor;
    private IFernflowerLogger logger;
    private BytecodeSourceMapper bytecodeSourceMapper;
@@ -63,25 +97,35 @@ index 15c6e406640315e5fbe82d48006b1a15f97020c8..8d4d403773a861191083e2b2f6e469ec
  
    private DecompilerContext(Map<String, Object> properties) {
      this.properties = properties;
-@@ -59,6 +63,17 @@ public class DecompilerContext {
+   }
+ 
+-  public static void initContext(Map<String, Object> propertiesCustom) {
++  public static void initContext(Map<String, Object> propertiesCustom, IFernflowerLogger logger) {
+     Map<String, Object> properties = new HashMap<String, Object>(IFernflowerPreferences.DEFAULTS);
+     if (propertiesCustom != null) {
        properties.putAll(propertiesCustom);
      }
      currentContext.set(new DecompilerContext(properties));
++    setLogger(logger);
 +    // Default a no-op renamer factory if none is provided
 +    if (DecompilerContext.getProperty(RENAMER_FACTORY) != null) {
 +      try {
 +        currentContext.get().renamerFactory = Class.forName((String) DecompilerContext.getProperty(RENAMER_FACTORY)).asSubclass(IVariableNamingFactory.class).newInstance();
 +      } catch (Exception e) {
-+
++        getLogger().writeMessage("Error loading renamer factory class", e);
 +      }
 +    }
 +    if (DecompilerContext.getNamingFactory() == null) {
-+      currentContext.get().renamerFactory = new JADNameProvider.JADNameProviderFactory();
++      if (DecompilerContext.getOption(IFernflowerPreferences.USE_JAD_VARNAMING)) {
++        currentContext.get().renamerFactory = new JADNameProvider.JADNameProviderFactory();
++      } else {
++        currentContext.get().renamerFactory = new IdentityRenamerFactory();
++      }
 +    }
    }
  
    public static DecompilerContext getCurrentContext() {
-@@ -141,6 +156,10 @@ public class DecompilerContext {
+@@ -141,6 +161,10 @@ public class DecompilerContext {
      return getCurrentContext().logger;
    }
  
@@ -93,7 +137,7 @@ index 15c6e406640315e5fbe82d48006b1a15f97020c8..8d4d403773a861191083e2b2f6e469ec
      if (logger != null) {
        String level = (String)getProperty(IFernflowerPreferences.LOG_LEVEL);
 diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-index 6afe975fe2034ad25b7810a0bdc59ebcff8453e1..91e70d3132095281338593d2166eedbcbd09e5d6 100644
+index 6afe975fe2034ad25b7810a0bdc59ebcff8453e1..320e250ce1fe0eeca0194b296a3944cc710127bc 100644
 --- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
 +++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
 @@ -27,6 +27,7 @@ import org.jetbrains.java.decompiler.struct.IDecompiledData;
@@ -104,9 +148,20 @@ index 6afe975fe2034ad25b7810a0bdc59ebcff8453e1..91e70d3132095281338593d2166eedbc
  
  import java.io.File;
  import java.util.HashSet;
+@@ -40,9 +41,8 @@ public class Fernflower implements IDecompiledData {
+ 
+   public Fernflower(IBytecodeProvider provider, IResultSaver saver, Map<String, Object> options, IFernflowerLogger logger) {
+     structContext = new StructContext(saver, this, new LazyLoader(provider));
+-    DecompilerContext.initContext(options);
++    DecompilerContext.initContext(options,logger);
+     DecompilerContext.setCounterContainer(new CounterContainer());
+-    DecompilerContext.setLogger(logger);
+ 
+     if (DecompilerContext.getOption(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH)) {
+       addAllClasspath();
 diff --git a/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java b/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..bc29407ea2503b16a1eff3b49a6579189eccd14f
+index 0000000000000000000000000000000000000000..e8c33402d6b7e0c07dbe2aacf73c2f8f500fc8c3
 --- /dev/null
 +++ b/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java
 @@ -0,0 +1,28 @@
@@ -126,7 +181,7 @@ index 0000000000000000000000000000000000000000..bc29407ea2503b16a1eff3b49a657918
 +  }
 +
 +  @Override
-+  public String renameAbstractParameter(String abstractParam) {
++  public String renameAbstractParameter(String abstractParam, int index) {
 +    return abstractParam;
 +  }
 +
@@ -138,9 +193,42 @@ index 0000000000000000000000000000000000000000..bc29407ea2503b16a1eff3b49a657918
 +  public void addParentContext(IVariableNameProvider renamer) {
 +  }
 +}
+diff --git a/src/org/jetbrains/java/decompiler/main/extern/IAbstractParameterRenamer.java b/src/org/jetbrains/java/decompiler/main/extern/IAbstractParameterRenamer.java
+deleted file mode 100644
+index 4c509eb6633f575b4f7cc93ad781885e8581be70..0000000000000000000000000000000000000000
+--- a/src/org/jetbrains/java/decompiler/main/extern/IAbstractParameterRenamer.java
++++ /dev/null
+@@ -1,7 +0,0 @@
+-package org.jetbrains.java.decompiler.main.extern;
+-
+-import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
+-
+-public interface IAbstractParameterRenamer {
+-  public String renameParameter(String orig, int index, MethodWrapper wrapper, int flags);
+-}
+diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+index 79dd8e890cd37e88bfbe9f0c22c825b3c2549bb8..7940dcfbd89ec1427459aeeac1aebaea30db1899 100644
+--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
++++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+@@ -62,6 +62,8 @@ public interface IFernflowerPreferences {
+ 
+   String INCLUDE_ENTIRE_CLASSPATH = "iec";
+ 
++  String USE_JAD_VARNAMING = "jvn";
++
+   Map<String, Object> DEFAULTS = Collections.unmodifiableMap(new HashMap<String, Object>() {{
+     put(REMOVE_BRIDGE, "1");
+     put(REMOVE_SYNTHETIC, "0");
+@@ -96,5 +98,6 @@ public interface IFernflowerPreferences {
+     put(UNIT_TEST_MODE, "0");
+     put(DUMP_ORIGINAL_LINES, "0");
+     put(INCLUDE_ENTIRE_CLASSPATH, "0");
++    put(USE_JAD_VARNAMING, "0");
+   }});
+ }
 diff --git a/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java b/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..9d6b1a5cdff732d251e078750b2a26243f93463e
+index 0000000000000000000000000000000000000000..26f10715a8d594f00480a80e9c94c8b3bf011998
 --- /dev/null
 +++ b/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java
 @@ -0,0 +1,11 @@
@@ -152,7 +240,7 @@ index 0000000000000000000000000000000000000000..9d6b1a5cdff732d251e078750b2a2624
 +
 +public interface IVariableNameProvider {
 +  public Map<VarVersionPair,String> rename(Map<VarVersionPair,String> variables);
-+  public String renameAbstractParameter(String abstractParam);
++  public String renameAbstractParameter(String abstractParam, int index);
 +  public void addParentContext(IVariableNameProvider renamer);
 +}
 diff --git a/src/org/jetbrains/java/decompiler/main/extern/IVariableNamingFactory.java b/src/org/jetbrains/java/decompiler/main/extern/IVariableNamingFactory.java
@@ -183,31 +271,62 @@ index 0f44e42c44c68b178fced0d0c362fe6a027b5a8a..c277392bd6bace5efee52426204b6eeb
  import org.jetbrains.java.decompiler.modules.decompiler.sforms.FlattenStatementsHelper;
  import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 3975d8cf93f8a2ce22b57ca3a666f3be77b5dcb4..07ac606e43cdb7d21467d72ce32fb89e9d09a61f 100644
+index 3975d8cf93f8a2ce22b57ca3a666f3be77b5dcb4..9be9edbb36ecd3082cb15f5ff5a6ba8a627f3d89 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-@@ -577,7 +577,7 @@ public class NestedClassProcessor {
+@@ -577,7 +577,6 @@ public class NestedClassProcessor {
      for (final MethodWrapper meth : child.getWrapper().getMethods()) {
  
        if (meth.root != null) { // neither abstract nor native
 -
-+        if (encmeth != null) { meth.methodStruct.renamer.addParentContext(encmeth.methodStruct.renamer); }
          // local var names
          HashMap<VarVersionPair, String> mapNewNames = new HashMap<VarVersionPair, String>();
          // local var types
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
+index cb376d9b480f06971c71647037a17a166764e805..16f2bfb5fbc04312c21d10d26441786ac0604657 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
+@@ -88,6 +88,8 @@ public class LVTVariable implements Comparable<LVTVariable> {
+   }
+ 
+   public LVTVariable rename(String newName) {
+-    return new LVTVariable(newName, desc, start, end, index, isLVTT);
++    LVTVariable lvtVariable = new LVTVariable(newName, desc, start, end, index, isLVTT);
++    lvtVariable.sig = this.sig;
++    return lvtVariable;
+   }
+ }
+\ No newline at end of file
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 164ddb5639ed92ae8bcab25a62713211d2e904fe..59b1c42717441f6bce853aa4ce9d710c15d723b6 100644
+index 164ddb5639ed92ae8bcab25a62713211d2e904fe..fcd8c64de9c7d3af4e9ce943c41dd58ced598014 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-@@ -18,6 +18,7 @@ package org.jetbrains.java.decompiler.modules.decompiler.vars;
+@@ -16,13 +16,16 @@
+ package org.jetbrains.java.decompiler.modules.decompiler.vars;
+ 
  import org.jetbrains.java.decompiler.code.CodeConstants;
++import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
  import org.jetbrains.java.decompiler.main.DecompilerContext;
  import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
-+import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
  import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
  import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
  import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
-@@ -424,35 +425,47 @@ public class VarDefinitionHelper {
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
++import org.jetbrains.java.decompiler.modules.decompiler.exps.NewExprent;
+ import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
++import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph.ExprentIterator;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchAllStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchStatement;
+ import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement;
+@@ -33,6 +36,7 @@ import org.jetbrains.java.decompiler.struct.StructMethod;
+ import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
+ import org.jetbrains.java.decompiler.struct.gen.VarType;
+ import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
++import org.jetbrains.java.decompiler.util.StatementIterator;
+ 
+ import java.util.*;
+ import java.util.Map.Entry;
+@@ -424,35 +428,77 @@ public class VarDefinitionHelper {
  
    private void propogateLVTs(Statement stat) {
      MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
@@ -221,10 +340,14 @@ index 164ddb5639ed92ae8bcab25a62713211d2e904fe..59b1c42717441f6bce853aa4ce9d710c
      }
  
      for (VarType var : md.params) {
-       List<LVTVariable> vars = varproc.getLVT().getCandidates(index);
-       if (vars != null) {
+-      List<LVTVariable> vars = varproc.getLVT().getCandidates(index);
+-      if (vars != null) {
 -        types.put(new VarVersionPair(index, 0), new VarInfo(vars.get(0), var));
-+        types.put(new VarVersionPair(index, 0), new VarInfo(null,null));
++      if (varproc.getLVT() != null) {
++        List<LVTVariable> vars = varproc.getLVT().getCandidates(index);
++        if (vars != null) {
++          types.put(new VarVersionPair(index, 0), new VarInfo(null,null));
++        }
        }
        index += var.stackSize;
      }
@@ -237,12 +360,39 @@ index 164ddb5639ed92ae8bcab25a62713211d2e904fe..59b1c42717441f6bce853aa4ce9d710c
      for (Entry<VarVersionPair, VarInfo> e : types.entrySet()) {
 -      if (e.getValue().lvt != null) {
 -        varproc.setVarLVT(e.getKey(), e.getValue().lvt);
--      }
 +      typeNames.put(e.getKey(), e.getValue().typeName());
-     }
--
-+    StructMethod current_meth = (StructMethod)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD);
-+    Map<VarVersionPair, String> renames = current_meth.renamer.rename(typeNames);
++    }
++    final StructMethod current_meth = (StructMethod)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD);
++    Map<VarVersionPair, String> renames = current_meth.getRenamer().rename(typeNames);
++
++    // Stuff the parent context into enclosed child methods
++    StatementIterator.iterate(root, new ExprentIterator(){
++      @Override
++      public int processExprent(Exprent exprent){
++        ClassNode child = null;
++        if (exprent.type == Exprent.EXPRENT_VAR) {
++          VarExprent var = (VarExprent)exprent;
++          if (var.isClassDef()) {
++            child = DecompilerContext.getClassProcessor().getMapRootClasses().get(var.getVarType().value);
++          }
++        }
++        else if (exprent.type == Exprent.EXPRENT_NEW) {
++          NewExprent _new = (NewExprent)exprent;
++          if (_new.isAnonymous()) { //TODO: Check for Lambda here?
++            child = DecompilerContext.getClassProcessor().getMapRootClasses().get(_new.getNewType().value);
++          }
++        }
++
++        if (child != null) {
++          for (StructMethod meth : child.classStruct.getMethods()) {
++            meth.getRenamer().addParentContext(current_meth.getRenamer());
++          }
++        }
++        return 0;
+       }
+-    }
++    });
+ 
      Map<VarVersionPair, LVTVariable> lvts = new HashMap<VarVersionPair, LVTVariable>();
 +
      for (Entry<VarVersionPair, VarInfo> e : types.entrySet()) {
@@ -266,7 +416,7 @@ index 164ddb5639ed92ae8bcab25a62713211d2e904fe..59b1c42717441f6bce853aa4ce9d710c
        }
      }
  
-@@ -508,14 +521,21 @@ public class VarDefinitionHelper {
+@@ -508,14 +554,21 @@ public class VarDefinitionHelper {
      String cast;
      private VarInfo(LVTVariable lvt, VarType type) {
        if (lvt != null && lvt.getSig() != null) {
@@ -292,7 +442,7 @@ index 164ddb5639ed92ae8bcab25a62713211d2e904fe..59b1c42717441f6bce853aa4ce9d710c
    }
  
 diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-index 8f0da2b8eeed9428133834dbf4bd8be3f6e38ee5..7e7f7580f5301ea94b4bf97440a471caa3f62c50 100644
+index 8f0da2b8eeed9428133834dbf4bd8be3f6e38ee5..d7ede2e3ab1f542a7223cc79e2f139d29c29cec4 100644
 --- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
 +++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
 @@ -18,6 +18,7 @@ package org.jetbrains.java.decompiler.struct;
@@ -307,24 +457,48 @@ index 8f0da2b8eeed9428133834dbf4bd8be3f6e38ee5..7e7f7580f5301ea94b4bf97440a471ca
    private InstructionSequence seq;
    private boolean expanded = false;
    private VBStyleCollection<StructGeneralAttribute, String> codeAttributes;
-+  public final IVariableNameProvider renamer;
++  private IVariableNameProvider renamer;
  
    public StructMethod(DataInputFullStream in, StructClass clStruct) throws IOException {
      classStruct = clStruct;
-@@ -78,6 +80,7 @@ public class StructMethod extends StructMember {
-       attributes.addAllWithKey(codeAttributes);
-       codeAttributes = null;
+@@ -118,10 +120,17 @@ public class StructMethod extends StructMember {
+     if (containsCode && !expanded) {
+       byte[] code = classStruct.getLoader().loadBytecode(this, codeFullLength);
+       seq = parseBytecode(new DataInputFullStream(code), codeLength, classStruct.getPool());
++      loadRenamer();
+       expanded = true;
      }
-+    this.renamer = DecompilerContext.getNamingFactory().createFactory(this);
    }
  
-   @Override
++  private void loadRenamer() {
++    if (this.renamer == null) {
++      this.renamer = DecompilerContext.getNamingFactory().createFactory(this);
++    }
++  }
++
+   public void releaseResources() throws IOException {
+     if (containsCode && expanded) {
+       seq = null;
+@@ -405,4 +414,13 @@ public class StructMethod extends StructMember {
+   public GenericMethodDescriptor getSignature() {
+     return signature;
+   }
++
++  public IVariableNameProvider getRenamer() {
++    loadRenamer();
++    return renamer;
++  }
++
++  public void unloadRenamer() {
++    this.renamer = null;
++  }
+ }
 diff --git a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..010ef5fdc0137798ca8a7097222cbc67ba5101ec
+index 0000000000000000000000000000000000000000..b588cec7b138dfffeb1d57a11aeb7e4b41fa5a38
 --- /dev/null
 +++ b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
-@@ -0,0 +1,193 @@
+@@ -0,0 +1,194 @@
 +package org.jetbrains.java.decompiler.util;
 +
 +import java.util.ArrayList;
@@ -352,13 +526,13 @@ index 0000000000000000000000000000000000000000..010ef5fdc0137798ca8a7097222cbc67
 +
 +    public JADNameProvider(StructMethod wrapper) {
 +      last = new HashMap<String, Holder>();
-+      last.put("int",       new Holder(0, true,  "i", "j", "k", "l"));
-+      last.put("byte",       new Holder(0, false, "b"       ));
-+      last.put("char",       new Holder(0, false, "c"       ));
-+      last.put("short",       new Holder(1, false, "short"   ));
-+      last.put("boolean",       new Holder(0, true,  "flag"    ));
-+      last.put("double",       new Holder(0, false, "d"       ));
-+      last.put("float",       new Holder(0, true,  "f"       ));
++      last.put("int",     new Holder(0, true,  "i", "j", "k", "l"));
++      last.put("byte",    new Holder(0, false, "b"       ));
++      last.put("char",    new Holder(0, false, "c"       ));
++      last.put("short",   new Holder(1, false, "short"   ));
++      last.put("boolean", new Holder(0, true,  "flag"    ));
++      last.put("double",  new Holder(0, false, "d"       ));
++      last.put("float",   new Holder(0, true,  "f"       ));
 +      last.put("File",    new Holder(1, true,  "file"    ));
 +      last.put("String",  new Holder(0, true,  "s"       ));
 +      last.put("Class",   new Holder(0, true,  "oclass"  ));
@@ -373,6 +547,7 @@ index 0000000000000000000000000000000000000000..010ef5fdc0137798ca8a7097222cbc67
 +      remap.put("long", "int");
 +    }
 +
++    @Override
 +    public void addParentContext(IVariableNameProvider iparent) {
 +        JADNameProvider parent = (JADNameProvider) iparent;
 +        last = new HashMap<String, Holder>();
@@ -421,7 +596,7 @@ index 0000000000000000000000000000000000000000..010ef5fdc0137798ca8a7097222cbc67
 +          continue;
 +        }
 +        if (type.indexOf('<') != -1) {
-+          type = type.substring(0, type.indexOf('<') - 1);
++          type = type.substring(0, type.indexOf('<'));
 +        }
 +        if (type.indexOf('.') != -1) {
 +          type = type.substring(type.lastIndexOf('.')+1);
@@ -505,7 +680,7 @@ index 0000000000000000000000000000000000000000..010ef5fdc0137798ca8a7097222cbc67
 +    }
 +
 +    @Override
-+    public String renameAbstractParameter(String abstractParam) {
++    public String renameAbstractParameter(String abstractParam, int index) {
 +      return abstractParam;
 +    }
 +
@@ -519,6 +694,55 @@ index 0000000000000000000000000000000000000000..010ef5fdc0137798ca8a7097222cbc67
 +    }
 +}
 \ No newline at end of file
+diff --git a/src/org/jetbrains/java/decompiler/util/StatementIterator.java b/src/org/jetbrains/java/decompiler/util/StatementIterator.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..4e4c8b475a4fdf4d6452ebe57621fc36bc2a2e38
+--- /dev/null
++++ b/src/org/jetbrains/java/decompiler/util/StatementIterator.java
+@@ -0,0 +1,43 @@
++package org.jetbrains.java.decompiler.util;
++
++import java.util.List;
++
++import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
++import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph.ExprentIterator;
++import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
++
++public class StatementIterator {
++  public static void iterate(Statement stat, ExprentIterator itr) {
++    if (stat == null) {
++      return;
++    }
++
++    for (Exprent exp : stat.getVarDefinitions()) {
++      iterate(exp, itr);
++    }
++
++    if (stat.getExprents() == null) {
++      for (Object obj : stat.getSequentialObjects()) {
++        if (obj instanceof Statement) {
++          iterate((Statement)obj, itr);
++        }
++        else if (obj instanceof Exprent) {
++          iterate((Exprent)obj, itr);
++        }
++      }
++    }
++    else {
++      for (Exprent exp : stat.getExprents()) {
++        iterate(exp, itr);
++      }
++    }
++  }
++
++  private static void iterate(Exprent exp, ExprentIterator itr) {
++    List<Exprent> lst = exp.getAllExprents(true);
++    lst.add(exp);
++    for (Exprent exprent : lst) {
++      itr.processExprent(exprent);
++    }
++  }
++}
 diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
 index 77eda8797ac72262d0c6dabbbd06a0ed0f481596..f2c344a925dda9d1081aa867987147fd3fb3664e 100644
 --- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
@@ -564,14 +788,14 @@ index 77eda8797ac72262d0c6dabbbd06a0ed0f481596..f2c344a925dda9d1081aa867987147fd
    }
  }
 diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
-index 368407ef017b524f7e26940606e7b50714c7d96a..ff2457b4e38f5cec0854d21a15ca4bc5551bbda3 100644
+index 368407ef017b524f7e26940606e7b50714c7d96a..b4af1f7cfd661fe456121f999a495c89dffb1d0f 100644
 --- a/test/org/jetbrains/java/decompiler/LVTTest.java
 +++ b/test/org/jetbrains/java/decompiler/LVTTest.java
 @@ -59,4 +59,5 @@ public class LVTTest extends SingleClassesTestBase {
  //  @Test public void testMCAbstractResourcePack() { doTest("net/minecraft/client/resources/AbstractResourcePack"); }
  //  @Test public void testMCGuiShareToLan() { doTest("net/minecraft/client/gui/GuiShareToLan"); }
  //  @Test public void testMCContainerPlayer() { doTest("net/minecraft/inventory/ContainerPlayer"); }
-+  @Test public void testMCContainerPlayer() { doTest("net/minecraft/inventory/ContainerPlayer"); }
++  @Test public void testMCContainerPlayer() { doTest("net/minecraft/command/PlayerSelector"); }
  }
 diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
 index 2ae6da55e0d8ecb2fbdb39a6e42d1f179ac32203..087c8102c11b1258d8e3f1615fe64f745b8587d6 100644
diff --git a/FernFlower-Patches/0054-Some-code-cleanup-damn-cpw.patch b/FernFlower-Patches/0054-Some-code-cleanup-damn-cpw.patch
deleted file mode 100644
index a51718f..0000000
--- a/FernFlower-Patches/0054-Some-code-cleanup-damn-cpw.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Sun, 27 Sep 2015 21:17:03 -0700
-Subject: [PATCH] Some code cleanup damn cpw
-
-
-diff --git a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
-index a36047be9d5aaafd1e37ea1fc4ed861b7e26e5c9..407aaa96659637e8a746a5e21e6a30d07e09aa31 100644
---- a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
-+++ b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
-@@ -264,17 +264,17 @@ public class BasicBlock implements IGraphNode {
-   }
- 
-   public int getStartInstruction() {
--      if (seq.isEmpty()) {
--          return 0;
--      }
--      return instrOldOffsets.get(0);
-+    if (seq.isEmpty()) {
-+      return 0;
-+    }
-+    return instrOldOffsets.get(0);
-   }
- 
-   public int getEndInstruction() {
--      if (seq.isEmpty()) {
--          return 0;
--      }
--      int end = seq.getLastInstr().length();
--      return end + instrOldOffsets.get(size() -1);
-+    if (seq.isEmpty()) {
-+      return 0;
-+    }
-+    int end = seq.getLastInstr().length();
-+    return end + instrOldOffsets.get(size() -1);
-   }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
-index ea7e6110cf1e5eeb4d3f13d98527d53e85dd60fe..e68cb97ea66761387a6d05a8b38f0f1bf0e1225e 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
-@@ -97,11 +97,11 @@ public class BasicBlockStatement extends Statement {
-   }
- 
-   @Override
--    public StartEndPair getStartEndRange() {
--      if (block.size() > 0) {
--          return new StartEndPair(block.getStartInstruction(),block.getEndInstruction());
-+  public StartEndPair getStartEndRange() {
-+    if (block.size() > 0) {
-+      return new StartEndPair(block.getStartInstruction(), block.getEndInstruction());
-     } else {
--        return null;
-+      return null;
-     }
-   }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
-index 0768912fe41d5d60580029e640cfaab07e6447bb..36cd7fb229ea03784017336da4dd1cb0fd528fa4 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
-@@ -242,9 +242,4 @@ public class DoStatement extends Statement {
-   public void setLooptype(int looptype) {
-     this.looptype = looptype;
-   }
--
--  @Override
--    public StartEndPair getStartEndRange() {
--        return super.getStartEndRange();
--    }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
-index f216b73fe7480b9425608a1b19b48ef6de6424bc..8f3e4679be0d5821df94253a9f58082aa4f236d4 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
-@@ -465,7 +465,9 @@ public class IfStatement extends Statement {
-   }
- 
-   @Override
--    public StartEndPair getStartEndRange() {
--        return StartEndPair.join(super.getStartEndRange(),ifstat != null ? ifstat.getStartEndRange() : null,elsestat != null ? elsestat.getStartEndRange(): null);
--    }
-+  public StartEndPair getStartEndRange() {
-+    return StartEndPair.join(super.getStartEndRange(),
-+      ifstat != null ? ifstat.getStartEndRange() : null,
-+      elsestat != null ? elsestat.getStartEndRange(): null);
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
-index 0a1e798299c913755fd7b99a8afe10ca34e27d20..d8329ff22605f0ef278cefc29483eb760b90a02f 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
-@@ -49,7 +49,7 @@ public class RootStatement extends Statement {
-   }
- 
-   @Override
--    public StartEndPair getStartEndRange() {
--        return first.getStartEndRange();
--    }
-+  public StartEndPair getStartEndRange() {
-+    return first.getStartEndRange();
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
-index b3785fb3235dd593ce293d0c6677546a361fb489..81d31a58f6a913ddc4f5a89ae22fe69f98c63f3e 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
-@@ -138,9 +138,4 @@ public class SequenceStatement extends Statement {
-   public Statement getSimpleCopy() {
-     return new SequenceStatement();
-   }
--
--  @Override
--    public StartEndPair getStartEndRange() {
--        return super.getStartEndRange();
--    }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
-index 806c4d57423605f5b11b33f8647734646473b00c..f71ed84bc4ad195a97b4c535f21b55a9568cac62 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
-@@ -941,15 +941,15 @@ public class Statement implements IMatchable {
- 
-   private StartEndPair endpoints;
-   public StartEndPair getStartEndRange() {
--      if (endpoints == null) {
--          int start = Integer.MAX_VALUE;
--          int end = Integer.MIN_VALUE;
--          for (Statement st : getStats()) {
--              start = Math.min(start, st.getBasichead().getBlock().getStartInstruction());
--              end = Math.max(end, st.getBasichead().getBlock().getEndInstruction());
--          }
--          endpoints = new StartEndPair(start,end);
-+    if (endpoints == null) {
-+      int start = Integer.MAX_VALUE;
-+      int end   = Integer.MIN_VALUE;
-+      for (Statement st : getStats()) {
-+        start = Math.min(start, st.getBasichead().getBlock().getStartInstruction());
-+        end   = Math.max(end,   st.getBasichead().getBlock().getEndInstruction());
-       }
--      return endpoints;
-+      endpoints = new StartEndPair(start, end);
-+    }
-+    return endpoints;
-   }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
-index 8d7127cc348720d35f161c5c92c7fb66c2bd7ddb..3e272016903de00ee47c55fad62db4b0687a04b5 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
-@@ -368,13 +368,13 @@ public class SwitchStatement extends Statement {
-   }
- 
-   @Override
--    public StartEndPair getStartEndRange() {
--      StartEndPair[] sepairs = new StartEndPair[caseStatements.size() + 1];
--      int i = 0;
--      sepairs[i++] = super.getStartEndRange();
--      for (Statement st : caseStatements) {
--          sepairs[i++] = st.getStartEndRange();
--      }
--      return StartEndPair.join(sepairs);
-+  public StartEndPair getStartEndRange() {
-+    StartEndPair[] sepairs = new StartEndPair[caseStatements.size() + 1];
-+    int i = 0;
-+    sepairs[i++] = super.getStartEndRange();
-+    for (Statement st : caseStatements) {
-+      sepairs[i++] = st.getStartEndRange();
-     }
-+    return StartEndPair.join(sepairs);
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-index 4193f563d90c2fdfee692cf272fb3d3886f72e5b..729a3d2129c0d6765ad7b415bd4bee6cc40a09d2 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LocalVariableTable.java
-@@ -1,15 +1,11 @@
- package org.jetbrains.java.decompiler.modules.decompiler.vars;
- 
- import java.util.ArrayList;
--import java.util.BitSet;
- import java.util.HashMap;
--import java.util.HashSet;
- import java.util.List;
- import java.util.Map;
- import java.util.Set;
- 
--import org.jetbrains.java.decompiler.main.rels.MethodProcessorRunnable;
--import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
- 
- public class LocalVariableTable {
-@@ -74,8 +70,8 @@ public class LocalVariableTable {
-       versions.put(lvt.index, idx);
-       List<LVTVariable> lvtList = mapLVT.get(lvt.index);
-       if (lvtList == null) {
--          lvtList = new ArrayList<LVTVariable>();
--          mapLVT.put(lvt.index, lvtList);
-+        lvtList = new ArrayList<LVTVariable>();
-+        mapLVT.put(lvt.index, lvtList);
-       }
-       lvtList.add(lvt);
-     }
-@@ -86,24 +82,16 @@ public class LocalVariableTable {
-   }
- 
-   public Map<Integer, LVTVariable> getVars(Statement statement) {
--      HashMap<Integer,LVTVariable> ret = new HashMap<Integer,LVTVariable>();
--      if (statement == null) return ret;
--      StartEndPair sepair = statement.getStartEndRange();
-+    Map<Integer, LVTVariable> ret = new HashMap<Integer, LVTVariable>();
-+    if (statement == null) {
-+      return ret;
-+    }
-+    StartEndPair sepair = statement.getStartEndRange();
-     if (endpoints.containsKey(sepair)) {
--        for (LVTVariable lvt : endpoints.get(sepair)) {
--            ret.put(lvt.index,lvt);
--        }
-+      for (LVTVariable lvt : endpoints.get(sepair)) {
-+        ret.put(lvt.index, lvt);
-+      }
-     }
--//    for (Entry<Integer, List<LVTVariable>> entry : endpoints.get(end)) {
--//      for (LVTVariable lvt : entry.getValue()) {
--//        if (lvt.start >= start && lvt.end <= end) {
--//          if (ret.containsKey(entry.getKey())) {
--//            System.out.println("DUPLICATE INDEX WHAT THE FUCK: " + entry.getKey());
--//          }
--//          ret.put(entry.getKey(), lvt);
--//        }
--//      }
--//    }
-     return ret;
-   }
- }
-\ No newline at end of file
diff --git a/FernFlower-Patches/0120-Do-not-merge-varaibles-when-the-to-target-is-read-fu.patch b/FernFlower-Patches/0055-Do-not-merge-varaibles-when-the-to-target-is-read-fu.patch
similarity index 100%
rename from FernFlower-Patches/0120-Do-not-merge-varaibles-when-the-to-target-is-read-fu.patch
rename to FernFlower-Patches/0055-Do-not-merge-varaibles-when-the-to-target-is-read-fu.patch
diff --git a/FernFlower-Patches/0122-Allow-saving-to-JAR.patch b/FernFlower-Patches/0056-Allow-saving-to-JAR.patch
similarity index 100%
rename from FernFlower-Patches/0122-Allow-saving-to-JAR.patch
rename to FernFlower-Patches/0056-Allow-saving-to-JAR.patch
diff --git a/FernFlower-Patches/0058-Fix-variable-defintions-in-IfStatement-s-headers-hav.patch b/FernFlower-Patches/0058-Fix-variable-defintions-in-IfStatement-s-headers-hav.patch
deleted file mode 100644
index c597b68..0000000
--- a/FernFlower-Patches/0058-Fix-variable-defintions-in-IfStatement-s-headers-hav.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Thu, 1 Oct 2015 18:04:09 -0700
-Subject: [PATCH] Fix variable defintions in IfStatement's headers having wrong
- scope.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index cc5e5e427125ab4673f9aef2a7b56de37f0ab113..560328a405e5860dba08daf85f0e957a21fc91d1 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-@@ -531,7 +531,7 @@ public class VarDefinitionHelper {
-           var.setLVT(lvt);
-         } else {
-           System.currentTimeMillis();
--          System.out.println("null " + new VarVersionPair(var));
-+          //System.out.println("null " + new VarVersionPair(var));
-         }
-       }
-     }
-@@ -631,6 +631,9 @@ public class VarDefinitionHelper {
-                 leaked_n.clear(); // Force no leaking at the end of if blocks
-                 // We may need to do this for Switches as well.. But havent run into that issue yet...
-               }
-+              else if (obj == ifst.getFirst()) {
-+                leaked.putAll(leaked_n); //First is outside the scope so leak!
-+              }
-             }
-             this_vars.putAll(leaked_n);
-           }
diff --git a/FernFlower-Patches/0059-Detect-if-the-itterator-is-being-used-elseware-befor.patch b/FernFlower-Patches/0059-Detect-if-the-itterator-is-being-used-elseware-befor.patch
deleted file mode 100644
index 0ee841e..0000000
--- a/FernFlower-Patches/0059-Detect-if-the-itterator-is-being-used-elseware-befor.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Thu, 1 Oct 2015 20:00:53 -0700
-Subject: [PATCH] Detect if the itterator is being used elseware before
- creating an enhanced for loop.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-index 3172b5e6754fc9e2d5570f1d7110dc452b77b510..5ba4dcd0944696d200a8a5857d7afccc3737e5fb 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-@@ -458,6 +458,14 @@ public class MergeHelper {
-           return false;
-         }
- 
-+        InvocationExprent next = (InvocationExprent)getUncast(ass.getRight());
-+        InvocationExprent hnext = (InvocationExprent)getUncast(drillNots(stat.getConditionExprent()));
-+        if (next.getInstance().type != Exprent.EXPRENT_VAR ||
-+            hnext.getInstance().type != Exprent.EXPRENT_VAR ||
-+            isVarReferenced((VarExprent)initDoExprent.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
-+          return false;
-+        }
-+
-         InvocationExprent holder = (InvocationExprent)((AssignmentExprent)initDoExprent).getRight();
- 
-         holder.getInstance().addBytecodeOffsets(initDoExprent.bytecode);
-@@ -487,6 +495,12 @@ public class MergeHelper {
-           return false;
-         }
- 
-+        AssignmentExprent itr = (AssignmentExprent)stat.getInitExprent();
-+        InvocationExprent hnext = (InvocationExprent)exp;
-+        if (itr.getLeft().type != Exprent.EXPRENT_VAR || hnext.getInstance().type != Exprent.EXPRENT_VAR) {
-+          return false;
-+        }
-+
-         AssignmentExprent ass = (AssignmentExprent)stat.getIncExprent();
-         if (!isNextCall(ass.getRight()) || ass.getLeft().type != Exprent.EXPRENT_VAR) {
- 
-@@ -495,6 +509,12 @@ public class MergeHelper {
-             return false;
-           }
- 
-+          InvocationExprent next = (InvocationExprent)getUncast(firstDoExprent.getRight());
-+          if (next.getInstance().type != Exprent.EXPRENT_VAR ||
-+              isVarReferenced((VarExprent)itr.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
-+            return false;
-+          }
-+
-           //Move the inc exprent back to the end of the body and remove the .next call
-           Statement last = getLastDirectData(stat.getFirst());
-           InvocationExprent holder = (InvocationExprent)getUncast(((AssignmentExprent)stat.getInitExprent()).getRight());
-@@ -511,6 +531,12 @@ public class MergeHelper {
-           stat.setIncExprent(holder.getInstance());
-         }
-         else {
-+          InvocationExprent next = (InvocationExprent)getUncast(ass.getRight());
-+          if (next.getInstance().type != Exprent.EXPRENT_VAR ||
-+              isVarReferenced((VarExprent)itr.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
-+            return false;
-+          }
-+
-           InvocationExprent holder = (InvocationExprent)getUncast(((AssignmentExprent)stat.getInitExprent()).getRight());
- 
-           holder.getInstance().addBytecodeOffsets(stat.getInitExprent().bytecode);
-@@ -579,6 +605,53 @@ public class MergeHelper {
-     return true;
-   }
- 
-+  private static boolean isVarReferenced(VarExprent var, Statement stat, VarExprent... whitelist) {
-+    if (stat.getExprents() == null) {
-+      for (Object obj : stat.getSequentialObjects()) {
-+        if (obj instanceof Statement) {
-+          if (isVarReferenced(var, (Statement)obj, whitelist)) {
-+            return true;
-+          }
-+        }
-+        else if (obj instanceof Exprent) {
-+          if (isVarReferenced(var, (Exprent)obj, whitelist)) {
-+            return true;
-+          }
-+        }
-+      }
-+    }
-+    else {
-+      for (Exprent exp : stat.getExprents()) {
-+        if (isVarReferenced(var, exp, whitelist)) {
-+          return true;
-+        }
-+      }
-+    }
-+    return false;
-+  }
-+
-+  private static boolean isVarReferenced(VarExprent target, Exprent exp, VarExprent... whitelist) {
-+    List<Exprent> lst = exp.getAllExprents(true);
-+    lst.add(exp);
-+    for (Exprent ex : lst) {
-+      if (ex != target && ex.type == Exprent.EXPRENT_VAR) {
-+        VarExprent var = (VarExprent)ex;
-+        if (var.getIndex() == target.getIndex() && var.getVersion() == target.getVersion()) {
-+          boolean allowed = false;
-+          for (VarExprent white : whitelist) {
-+            if (var == white) {
-+              allowed = true;
-+            }
-+          }
-+          if (!allowed) {
-+            return true;
-+          }
-+        }
-+      }
-+    }
-+    return false;
-+  }
-+
-   private static boolean isType(Exprent exp, int type) { //This is just a helper macro, Wish java had real macros.
-     return exp != null && exp.type == type;
-   }
diff --git a/FernFlower-Patches/0060-NPE-Protection-in-EnumProcessor.patch b/FernFlower-Patches/0060-NPE-Protection-in-EnumProcessor.patch
deleted file mode 100644
index bdc0032..0000000
--- a/FernFlower-Patches/0060-NPE-Protection-in-EnumProcessor.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Fri, 2 Oct 2015 01:32:57 -0700
-Subject: [PATCH] NPE Protection in EnumProcessor
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/EnumProcessor.java b/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
-index 37a3384c390209bdbcf46843a4c1a771a24dde18..8956e0ebbe08c761ab14ed61850d767b46642a99 100644
---- a/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
-@@ -74,7 +74,9 @@ public class EnumProcessor {
- 
-   // FIXME: move to a util class (see also InitializerProcessor)
-   private static Statement findFirstData(Statement stat) {
--
-+    if (stat == null) {
-+      return null;
-+    }
-     if (stat.getExprents() != null) {
-       return stat;
-     }
diff --git a/FernFlower-Patches/0065-Loosen-up-LoopExtractHelper-to-include-break-edges-t.patch b/FernFlower-Patches/0065-Loosen-up-LoopExtractHelper-to-include-break-edges-t.patch
deleted file mode 100644
index 1e27b9b..0000000
--- a/FernFlower-Patches/0065-Loosen-up-LoopExtractHelper-to-include-break-edges-t.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Sat, 3 Oct 2015 22:55:00 -0700
-Subject: [PATCH] Loosen up LoopExtractHelper to include break edges that can
- be extracted.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
-index d5c9e8f20aee82846a0d92f1c80b9d75a5984f8f..93bc21dd17add5a854450a034ed69a0a961808ee 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
-@@ -22,6 +22,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
- 
- import java.util.ArrayList;
- import java.util.Arrays;
-+import java.util.List;
- import java.util.Set;
- 
- 
-@@ -79,21 +80,27 @@ public class LoopExtractHelper {
-       return false;
-     }
- 
-+    List<Statement> stats = new ArrayList<Statement>();
-     for (StatEdge edge : stat.getLabelEdges()) {
-       if (edge.getType() != StatEdge.TYPE_CONTINUE && edge.getDestination().type != Statement.TYPE_DUMMYEXIT) {
--        return false;
-+        if (edge.getType() == StatEdge.TYPE_BREAK && isExternStatement(stat, edge.getSource(), edge.getSource())) {
-+          stats.add(edge.getSource());
-+        }
-+        else {
-+          return false;
-+        }
-       }
-     }
- 
--    if (!extractLastIf(stat)) {
--      return extractFirstIf(stat);
-+    if (!extractLastIf(stat, stats)) {
-+      return extractFirstIf(stat, stats);
-     }
-     else {
-       return true;
-     }
-   }
- 
--  private static boolean extractLastIf(DoStatement stat) {
-+  private static boolean extractLastIf(DoStatement stat, List<Statement> stats) {
- 
-     // search for an if condition at the end of the loop
-     Statement last = stat.getFirst();
-@@ -114,6 +121,11 @@ public class LoopExtractHelper {
- 
-           if (set.isEmpty()) { // no direct continues in a do{}while loop
-             if (isExternStatement(stat, ifstat, ifstat)) {
-+              for (Statement s : stats) {
-+                if (!ifstat.containsStatement(s)) {
-+                  return false;
-+                }
-+              }
-               extractIfBlock(stat, lastif);
-               return true;
-             }
-@@ -124,7 +136,7 @@ public class LoopExtractHelper {
-     return false;
-   }
- 
--  private static boolean extractFirstIf(DoStatement stat) {
-+  private static boolean extractFirstIf(DoStatement stat, List<Statement> stats) {
- 
-     // search for an if condition at the entrance of the loop
-     Statement first = stat.getFirst();
-@@ -142,6 +154,11 @@ public class LoopExtractHelper {
-           Statement ifstat = firstif.getIfstat();
- 
-           if (isExternStatement(stat, ifstat, ifstat)) {
-+            for (Statement s : stats) {
-+              if (!ifstat.containsStatement(s)) {
-+                return false;
-+              }
-+            }
-             extractIfBlock(stat, firstif);
-             return true;
-           }
diff --git a/FernFlower-Patches/0067-Include-ForEach-source-vars-in-itteration-allows-for.patch b/FernFlower-Patches/0067-Include-ForEach-source-vars-in-itteration-allows-for.patch
deleted file mode 100644
index a15d934..0000000
--- a/FernFlower-Patches/0067-Include-ForEach-source-vars-in-itteration-allows-for.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Sun, 4 Oct 2015 04:22:34 -0700
-Subject: [PATCH] Include ForEach source vars in itteration, allows for
- remapping in merge.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
-index 36cd7fb229ea03784017336da4dd1cb0fd528fa4..acc74a60fd6a90ad15959f6c3164757390542ada 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
-@@ -164,6 +164,7 @@ public class DoStatement extends Statement {
-         break;
-       case LOOP_FOREACH:
-         lst.add(getInitExprent());
-+        lst.add(getIncExprent());
-     }
- 
-     lst.add(first);
diff --git a/FernFlower-Patches/0068-Re-write-ForEach-detection-to-be-before-For-detectio.patch b/FernFlower-Patches/0068-Re-write-ForEach-detection-to-be-before-For-detectio.patch
deleted file mode 100644
index 810793c..0000000
--- a/FernFlower-Patches/0068-Re-write-ForEach-detection-to-be-before-For-detectio.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Sun, 4 Oct 2015 04:23:24 -0700
-Subject: [PATCH] Re-write ForEach detection to be before For detection. Fixes
- issues where incrementors would be added back in incorrectly.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-index 0e7f1ab7fe6fe4ca716cdcc0fc182dcfa59c3b7b..f354f0684b4d16e8dcd08b2ce6db76210249b571 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-@@ -20,6 +20,7 @@ import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.ArrayExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.IfExprent;
-@@ -67,10 +68,9 @@ public class MergeHelper {
- 
-         // identify a while loop
-         if (matchWhile(stat)) {
--          // identify a for loop - subtype of while
--          matchFor(stat);
--          // identify for each loop,
--          matchForEach(stat);
-+          if (!matchForEach(stat)) {
-+            matchFor(stat);
-+          }
-         }
-         else {
-           // identify a do{}while loop
-@@ -79,8 +79,9 @@ public class MergeHelper {
- 
-         break;
-       case DoStatement.LOOP_WHILE:
--        matchFor(stat);
--        matchForEach(stat);
-+        if (!matchForEach(stat)) {
-+          matchFor(stat);
-+        }
-     }
- 
-     return (stat.getLooptype() != oldloop);
-@@ -402,8 +403,10 @@ public class MergeHelper {
-   }
- 
-   private static boolean matchForEach(DoStatement stat) {
--    AssignmentExprent firstDoExprent = null, initDoExprent = null, initCopyExprent = null;
--    Statement firstData, preData = null;
-+    AssignmentExprent firstDoExprent = null;
-+    AssignmentExprent[] initExprents = new AssignmentExprent[3];
-+    Statement firstData = null, preData = null, lastData = null;
-+    Exprent lastExprent = null;
- 
-     // search for an initializing exprent
-     Statement current = stat;
-@@ -421,14 +424,13 @@ public class MergeHelper {
-           preData = current.getNeighbours(StatEdge.TYPE_REGULAR, Statement.DIRECTION_BACKWARD).get(0);
-           preData = getLastDirectData(preData);
-           if (preData != null && !preData.getExprents().isEmpty()) {
--            Exprent exprent = preData.getExprents().get(preData.getExprents().size() - 1);
--            if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
--              initDoExprent = (AssignmentExprent)exprent;
--              if (preData.getExprents().size() >= 2) {
--                exprent = preData.getExprents().get(preData.getExprents().size() - 2);
--                if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
--                  initCopyExprent = (AssignmentExprent)exprent;
--                }
-+            int size = preData.getExprents().size();
-+            for (int x = 0; x < initExprents.length; x++) {
-+              if (size > x) {
-+                 Exprent exprent = preData.getExprents().get(size - 1 - x);
-+                 if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
-+                   initExprents[x] = (AssignmentExprent)exprent;
-+                 }
-               }
-             }
-           }
-@@ -444,10 +446,14 @@ public class MergeHelper {
-     if (firstData != null && firstData.getExprents().get(0).type == Exprent.EXPRENT_ASSIGNMENT) {
-       firstDoExprent = (AssignmentExprent)firstData.getExprents().get(0);
-     }
-+    lastData = getLastDirectData(stat.getFirst());
-+    if (lastData != null && !lastData.getExprents().isEmpty()) {
-+      lastExprent = lastData.getExprents().get(lastData.getExprents().size() - 1);
-+    }
- 
--    if (stat.getLooptype() == DoStatement.LOOP_WHILE && initDoExprent != null && firstDoExprent != null) {
--      if (initDoExprent.type == Exprent.EXPRENT_ASSIGNMENT &&
--          isIteratorCall(((AssignmentExprent)initDoExprent).getRight())) {
-+    if (stat.getLooptype() == DoStatement.LOOP_WHILE && initExprents[0] != null && firstDoExprent != null) {
-+      if (initExprents[0].type == Exprent.EXPRENT_ASSIGNMENT &&
-+          isIteratorCall(((AssignmentExprent)initExprents[0]).getRight())) {
- 
-         if (!isHasNextCall(drillNots(stat.getConditionExprent())) ||
-             firstDoExprent.type != Exprent.EXPRENT_ASSIGNMENT) {
-@@ -463,13 +469,13 @@ public class MergeHelper {
-         InvocationExprent hnext = (InvocationExprent)getUncast(drillNots(stat.getConditionExprent()));
-         if (next.getInstance().type != Exprent.EXPRENT_VAR ||
-             hnext.getInstance().type != Exprent.EXPRENT_VAR ||
--            ExprentUtil.isVarReferenced((VarExprent)initDoExprent.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
-+            ExprentUtil.isVarReferenced((VarExprent)initExprents[0].getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
-           return false;
-         }
- 
--        InvocationExprent holder = (InvocationExprent)((AssignmentExprent)initDoExprent).getRight();
-+        InvocationExprent holder = (InvocationExprent)((AssignmentExprent)initExprents[0]).getRight();
- 
--        holder.getInstance().addBytecodeOffsets(initDoExprent.bytecode);
-+        holder.getInstance().addBytecodeOffsets(initExprents[0].bytecode);
-         ass.getLeft().addBytecodeOffsets(firstDoExprent.bytecode);
-         if (stat.getIncExprent() != null) {
-           holder.getInstance().addBytecodeOffsets(stat.getIncExprent().bytecode);
-@@ -481,88 +487,31 @@ public class MergeHelper {
-         stat.setLooptype(DoStatement.LOOP_FOREACH);
-         stat.setInitExprent(ass.getLeft());
-         stat.setIncExprent(holder.getInstance());
--        preData.getExprents().remove(initDoExprent);
-+        preData.getExprents().remove(initExprents[0]);
-         firstData.getExprents().remove(firstDoExprent);
-+        return true;
-       }
--    }
--    else if (stat.getLooptype() == DoStatement.LOOP_FOR) {
--      if (isType(stat.getInitExprent(), Exprent.EXPRENT_ASSIGNMENT) &&
--          isIteratorCall(((AssignmentExprent)stat.getInitExprent()).getRight()) &&
--          isType(stat.getConditionExprent(), Exprent.EXPRENT_FUNCTION)) {
--
--        Exprent exp = drillNots(stat.getConditionExprent());
--        if (!isHasNextCall(exp) ||
--            !isType(stat.getIncExprent(), Exprent.EXPRENT_ASSIGNMENT)) {
-+      else if (initExprents[0] != null && initExprents[1] != null && firstDoExprent != null) {
-+        if (firstDoExprent.getRight().type != Exprent.EXPRENT_ARRAY || firstDoExprent.getLeft().type != Exprent.EXPRENT_VAR) {
-           return false;
-         }
- 
--        AssignmentExprent itr = (AssignmentExprent)stat.getInitExprent();
--        InvocationExprent hnext = (InvocationExprent)exp;
--        if (itr.getLeft().type != Exprent.EXPRENT_VAR || hnext.getInstance().type != Exprent.EXPRENT_VAR) {
-+        if (lastExprent == null || lastExprent.type != Exprent.EXPRENT_FUNCTION) {
-           return false;
-         }
- 
--        AssignmentExprent ass = (AssignmentExprent)stat.getIncExprent();
--        if (!isNextCall(ass.getRight()) || ass.getLeft().type != Exprent.EXPRENT_VAR) {
--
--          if (firstDoExprent == null || !isNextCall(firstDoExprent.getRight()) ||
--              firstDoExprent.getLeft().type != Exprent.EXPRENT_VAR) {
--            return false;
--          }
--
--          InvocationExprent next = (InvocationExprent)getUncast(firstDoExprent.getRight());
--          if (next.getInstance().type != Exprent.EXPRENT_VAR ||
--              ExprentUtil.isVarReferenced((VarExprent)itr.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
--            return false;
--          }
--
--          //Move the inc exprent back to the end of the body and remove the .next call
--          Statement last = getLastDirectData(stat.getFirst());
--          InvocationExprent holder = (InvocationExprent)getUncast(((AssignmentExprent)stat.getInitExprent()).getRight());
--
--          firstData.getExprents().remove(firstDoExprent);
--          last.getExprents().add(stat.getIncExprent());
--
--          firstDoExprent.getLeft().addBytecodeOffsets(stat.getInitExprent().bytecode);
--          firstDoExprent.getLeft().addBytecodeOffsets(stat.getIncExprent().bytecode);
--          firstDoExprent.getLeft().addBytecodeOffsets(firstDoExprent.bytecode);
--
--          stat.setLooptype(DoStatement.LOOP_FOREACH);
--          stat.setInitExprent(firstDoExprent.getLeft());
--          stat.setIncExprent(holder.getInstance());
--        }
--        else {
--          InvocationExprent next = (InvocationExprent)getUncast(ass.getRight());
--          if (next.getInstance().type != Exprent.EXPRENT_VAR ||
--              ExprentUtil.isVarReferenced((VarExprent)itr.getLeft(), stat, (VarExprent)next.getInstance(), (VarExprent)hnext.getInstance())) {
--            return false;
--          }
--
--          InvocationExprent holder = (InvocationExprent)getUncast(((AssignmentExprent)stat.getInitExprent()).getRight());
--
--          holder.getInstance().addBytecodeOffsets(stat.getInitExprent().bytecode);
--          ass.getLeft().addBytecodeOffsets(stat.getIncExprent().bytecode);
--
--          stat.setLooptype(DoStatement.LOOP_FOREACH);
--          stat.setInitExprent(ass.getLeft());
--          stat.setIncExprent(holder.getInstance());
--        }
--      }
--      else if (initDoExprent != null && initDoExprent.getRight().type == Exprent.EXPRENT_FUNCTION) {
--        if (firstDoExprent == null ||
--            firstDoExprent.getRight().type != Exprent.EXPRENT_ARRAY ||
--            firstDoExprent.getLeft().type != Exprent.EXPRENT_VAR ||
--            !isType(stat.getIncExprent(), Exprent.EXPRENT_FUNCTION) ||
--            !isType(stat.getInitExprent(), Exprent.EXPRENT_ASSIGNMENT)) {
-+        if (initExprents[0].getRight().type != Exprent.EXPRENT_CONST ||
-+            initExprents[1].getRight().type != Exprent.EXPRENT_FUNCTION) {
-           return false;
-         }
- 
--        FunctionExprent funcRight = (FunctionExprent)initDoExprent.getRight();
--        FunctionExprent funcInc = (FunctionExprent)stat.getIncExprent();
--        ArrayExprent arr = (ArrayExprent)firstDoExprent.getRight();
-+        FunctionExprent funcRight = (FunctionExprent)initExprents[1].getRight();
-+        FunctionExprent funcInc   = (FunctionExprent)lastExprent;
-+        ArrayExprent    arr       = (ArrayExprent)firstDoExprent.getRight();
-+        int incType = funcInc.getFuncType();
- 
-         if (funcRight.getFuncType() != FunctionExprent.FUNCTION_ARRAY_LENGTH ||
--            (funcInc.getFuncType() != FunctionExprent.FUNCTION_PPI && funcInc.getFuncType() != FunctionExprent.FUNCTION_IPP) ||
-+            (incType != FunctionExprent.FUNCTION_PPI && incType != FunctionExprent.FUNCTION_IPP) ||
-             arr.getIndex().type != Exprent.EXPRENT_VAR ||
-             arr.getArray().type != Exprent.EXPRENT_VAR) {
-             return false;
-@@ -577,33 +526,37 @@ public class MergeHelper {
-           return false;
-         }
- 
--        funcRight.getLstOperands().get(0).addBytecodeOffsets(initDoExprent.bytecode);
--        funcRight.getLstOperands().get(0).addBytecodeOffsets(stat.getIncExprent().bytecode);
-+        funcRight.getLstOperands().get(0).addBytecodeOffsets(initExprents[0].bytecode);
-+        funcRight.getLstOperands().get(0).addBytecodeOffsets(initExprents[1].bytecode);
-+        funcRight.getLstOperands().get(0).addBytecodeOffsets(lastExprent.bytecode);
-         firstDoExprent.getLeft().addBytecodeOffsets(firstDoExprent.bytecode);
--        firstDoExprent.getLeft().addBytecodeOffsets(stat.getInitExprent().bytecode);
-+        firstDoExprent.getLeft().addBytecodeOffsets(initExprents[0].bytecode);
- 
-         stat.setLooptype(DoStatement.LOOP_FOREACH);
-         stat.setInitExprent(firstDoExprent.getLeft());
-         stat.setIncExprent(funcRight.getLstOperands().get(0));
--        preData.getExprents().remove(initDoExprent);
-+        preData.getExprents().remove(initExprents[0]);
-+        preData.getExprents().remove(initExprents[1]);
-         firstData.getExprents().remove(firstDoExprent);
-+        lastData.getExprents().remove(lastExprent);
- 
--
--        if (initCopyExprent != null && initCopyExprent.getLeft().type == Exprent.EXPRENT_VAR) {
--          VarExprent copy = (VarExprent)initCopyExprent.getLeft();
-+        if (initExprents[2] != null && initExprents[2].getLeft().type == Exprent.EXPRENT_VAR) {
-+          VarExprent copy = (VarExprent)initExprents[2].getLeft();
-           if (copy.getIndex() == array.getIndex() && copy.getVersion() == array.getVersion()) {
--            preData.getExprents().remove(initCopyExprent);
--            initCopyExprent.getRight().addBytecodeOffsets(initCopyExprent.bytecode);
--            initCopyExprent.getRight().addBytecodeOffsets(stat.getIncExprent().bytecode);
--            stat.setIncExprent(initCopyExprent.getRight());
-+            preData.getExprents().remove(initExprents[2]);
-+            initExprents[2].getRight().addBytecodeOffsets(initExprents[2].bytecode);
-+            initExprents[2].getRight().addBytecodeOffsets(stat.getIncExprent().bytecode);
-+            stat.setIncExprent(initExprents[2].getRight());
-           }
-         }
-+
-+        return true;
-       }
-     }
- 
-     //cleanEmptyStatements(stat, firstData); //TODO: Look into this and see what it does...
- 
--    return true;
-+    return false;
-   }
- 
-   private static boolean isType(Exprent exp, int type) { //This is just a helper macro, Wish java had real macros.
diff --git a/FernFlower-Patches/0070-Fix-issue-where-For-loops-would-be-enhanced-to-ForEa.patch b/FernFlower-Patches/0070-Fix-issue-where-For-loops-would-be-enhanced-to-ForEa.patch
deleted file mode 100644
index 962c063..0000000
--- a/FernFlower-Patches/0070-Fix-issue-where-For-loops-would-be-enhanced-to-ForEa.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Sun, 4 Oct 2015 18:14:24 -0700
-Subject: [PATCH] Fix issue where For loops would be enhanced to ForEach
- incorrectly.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-index f354f0684b4d16e8dcd08b2ce6db76210249b571..11c7c599d4413cb46b58906f4b7fdbe4a019e1f0 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-@@ -501,10 +501,12 @@ public class MergeHelper {
-         }
- 
-         if (initExprents[0].getRight().type != Exprent.EXPRENT_CONST ||
--            initExprents[1].getRight().type != Exprent.EXPRENT_FUNCTION) {
-+            initExprents[1].getRight().type != Exprent.EXPRENT_FUNCTION ||
-+            stat.getConditionExprent().type != Exprent.EXPRENT_FUNCTION) {
-           return false;
-         }
- 
-+        //FunctionExprent funcCond  = (FunctionExprent)drillNots(stat.getConditionExprent()); //TODO: Verify this is counter < copy.length
-         FunctionExprent funcRight = (FunctionExprent)initExprents[1].getRight();
-         FunctionExprent funcInc   = (FunctionExprent)lastExprent;
-         ArrayExprent    arr       = (ArrayExprent)firstDoExprent.getRight();
-@@ -525,6 +527,9 @@ public class MergeHelper {
-             counter.getVersion() != index.getVersion()) {
-           return false;
-         }
-+        if (ExprentUtil.isVarReferenced(counter, stat.getFirst(), index)) {
-+          return false;
-+        }
- 
-         funcRight.getLstOperands().get(0).addBytecodeOffsets(initExprents[0].bytecode);
-         funcRight.getLstOperands().get(0).addBytecodeOffsets(initExprents[1].bytecode);
diff --git a/FernFlower-Patches/0075-Fix-up-the-scouting-for-an-init-exprent-not-to-look-.patch b/FernFlower-Patches/0075-Fix-up-the-scouting-for-an-init-exprent-not-to-look-.patch
deleted file mode 100644
index 821779a..0000000
--- a/FernFlower-Patches/0075-Fix-up-the-scouting-for-an-init-exprent-not-to-look-.patch
+++ /dev/null
@@ -1,285 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Sun, 11 Oct 2015 12:51:22 -0400
-Subject: [PATCH] Fix up the scouting for an init exprent, not to look inside
- loops for it. Fixes the broken loops. Added tests for it.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index 62d52975708c5a8126bdc73824fe575b14dea108..2e1668de1af3414bfbed0bf72461688246303931 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-@@ -28,9 +28,13 @@ import org.jetbrains.java.decompiler.modules.decompiler.*;
- import org.jetbrains.java.decompiler.modules.decompiler.deobfuscator.ExceptionDeobfuscator;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.IfExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatement;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.DummyExitStatement;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
-@@ -42,6 +46,10 @@ import java.util.BitSet;
- 
- public class MethodProcessorRunnable implements Runnable {
- 
-+  private static RootStatement currentRoot;
-+
-+  private static VarProcessor vp;
-+
-   public final Object lock = new Object();
- 
-   private final StructMethod method;
-@@ -126,7 +134,8 @@ public class MethodProcessorRunnable implements Runnable {
-     }
- 
-     RootStatement root = DomHelper.parseGraph(graph, mt);
--
-+    MethodProcessorRunnable.currentRoot = root;
-+    MethodProcessorRunnable.vp = varProc;
-     FinallyProcessor fProc = new FinallyProcessor(varProc);
-     while (fProc.iterateGraph(mt, root, graph)) {
-       root = DomHelper.parseGraph(graph, mt);
-@@ -232,6 +241,9 @@ public class MethodProcessorRunnable implements Runnable {
-     return finished;
-   }
- 
-+  public static void printMethod(String desc) {
-+      printMethod(currentRoot, desc, vp);
-+  }
-   public static void printMethod(Statement root, String name, VarProcessor varProc) {
-     System.out.println(name + " {");
-     if (root == null || root.getSequentialObjects() == null) {
-@@ -280,7 +292,13 @@ public class MethodProcessorRunnable implements Runnable {
-     int start = values.nextSetBit(0);
-     int end = values.length()-1;
- 
--    System.out.println(indent + "{" + statement.type + "}:" + statement.id + " (" + start + ", " + end + ") " + statement.getClass().getSimpleName());
-+    System.out.print(indent + "{" + statement.type + "}:" + statement.id + " (" + start + ", " + end + ") " + statement.getClass().getSimpleName());
-+    if (statement.type == Statement.TYPE_DO) {
-+        System.out.print(" t:"+((DoStatement)statement).getLooptype());
-+    } else if (statement.type == Statement.TYPE_BASICBLOCK) {
-+        System.out.print(" i:"+((BasicBlockStatement)statement).getBlock().toStringOldIndices().replaceAll("\n", ";"));
-+    }
-+    System.out.println();
-     for (StatEdge edge : statement.getAllSuccessorEdges())
-       System.out.println(indent + " Dest: " + edge.getDestination());
- 
-@@ -323,6 +341,8 @@ public class MethodProcessorRunnable implements Runnable {
-         sb.append("{").append(printExprent(" ",assignmentExprent.getLeft(),varProc)).append(" =").append(printExprent(" ",assignmentExprent.getRight(),varProc)).append("}");
-       } else if (exp instanceof IfExprent) {
-         sb.append(" ").append(exp.toJava(0, new BytecodeMappingTracer()));
-+      } else if (exp instanceof FunctionExprent) {
-+        sb.append(" ").append(exp.toJava(0, new BytecodeMappingTracer()));
-       }
-       return sb.toString();
-   }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-index 11c7c599d4413cb46b58906f4b7fdbe4a019e1f0..c240daa740a7766b1541dc8aea73025cb9486ac7 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-@@ -358,6 +358,8 @@ public class MergeHelper {
-         }
-         else {
-           preData = current.getNeighbours(StatEdge.TYPE_REGULAR, Statement.DIRECTION_BACKWARD).get(0);
-+          // we're not a basic block, so we can't dive inside for exprents
-+          if (preData.type != Statement.TYPE_BASICBLOCK) break;
-           preData = getLastDirectData(preData);
-           if (preData != null && !preData.getExprents().isEmpty()) {
-             initDoExprent = preData.getExprents().get(preData.getExprents().size() - 1);
-diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
-index d4771bb0b063154fd4e38ac3d68ed3c0b27c8938..fea37bceb36c964966c7772c8911f9aa63ae119e 100644
---- a/test/org/jetbrains/java/decompiler/LVTTest.java
-+++ b/test/org/jetbrains/java/decompiler/LVTTest.java
-@@ -38,11 +38,12 @@ public class LVTTest extends SingleClassesTestBase {
- //  @Test public void testMatch1() { doTest("pkg/TestPPMM"); }
- //  @Test public void testMatchLM() { doTest("pkg/TestLexManosLVT"); }
- //  @Test public void testMatch1() { doTest("pkg/TestLVT"); }
-+//  @Test public void testMatch1() { doTest("pkg/TestLoopMerging"); }
- //  @Test public void testMatch2() { doTest("pkg/TestLVTScoping"); }
- //  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
- //  @Test public void testMCGuiCmdBlock() { doTest("net/minecraft/client/gui/GuiCommandBlock"); }
- 
--  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
-+//  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
- 
- //  @Test public void testMCGuiCmdBlock() { doTest("net/minecraft/client/gui/GuiCommandBlock"); }
- 
-@@ -51,4 +52,5 @@ public class LVTTest extends SingleClassesTestBase {
- //  @Test public void testMCAbstractTexture() { doTest("net/minecraft/client/multiplayer/ServerAddress"); }
- //  @Test public void testMCAbstractResourcePack() { doTest("net/minecraft/client/resources/AbstractResourcePack"); }
- //  @Test public void testMCGuiShareToLan() { doTest("net/minecraft/client/gui/GuiShareToLan"); }
-+//  @Test public void testMCContainerPlayer() { doTest("net/minecraft/inventory/ContainerPlayer"); }
- }
-diff --git a/test/org/jetbrains/java/decompiler/LoopMergingTests.java b/test/org/jetbrains/java/decompiler/LoopMergingTests.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..ddc15d14e9efaca03115795dbce9266d361b565e
---- /dev/null
-+++ b/test/org/jetbrains/java/decompiler/LoopMergingTests.java
-@@ -0,0 +1,30 @@
-+package org.jetbrains.java.decompiler;
-+
-+import java.io.IOException;
-+import java.util.HashMap;
-+import java.util.Map;
-+
-+import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
-+import org.junit.Test;
-+
-+public class LoopMergingTests extends SingleClassesTestBase {
-+    @SuppressWarnings("serial")
-+    @Override
-+    protected Map<String, Object> getDecompilerOptions() {
-+      return new HashMap<String, Object>() {{
-+        put(IFernflowerPreferences.USE_DEBUG_LINE_NUMBERS, "1");
-+      }};
-+    }
-+
-+    @Override
-+      public void setUp() throws IOException {
-+          super.setUp();
-+          fixture.cleanup = false;
-+      }
-+
-+    @Test
-+    public void testLoopMerging() {
-+        doTest("pkg/TestLoopMerging");
-+    }
-+
-+}
-diff --git a/testData/classes/pkg/TestLoopMerging.class b/testData/classes/pkg/TestLoopMerging.class
-new file mode 100644
-index 0000000000000000000000000000000000000000..453837353833482c6abb1718c2900e2149662c1f
-GIT binary patch
-literal 1524
-zcmbu7OHUI~7>3`|nRZGUZY?brLGHJrR1u8<g%}J8Nl_6(L{`%>;BaY48BAQbz!3g{
-zZoI`6CMG5l&_oF#ap(VV!PXyOea|pZi!3l?a?Y7^``-6F-}mG9*IfYJ=+@v72rbRe
-z#>UNMJDyH2jhLBPD>bV@6)2rE9viU*BQ+blo0v0`wtz6$hS(AUz8hA`vik*;_Kpbw
-zbuc|`2B1LK;YWc$N!&`AcUBe?W@g+-ESLhpcsgk;Oc)tU&fP`Teq=2RgySdJ=wn!$
-z&K!-Q0tl4r(BM-Cw*Wb<(Bb9udk?73PM~PaHj?ur#*!P}EAMv~pcZu+&gVU9?8&li
-zF6yX90|nA6lnKY3H(Tl0y^NKz$Lx%0EcOM^gcc3WWOc%}j#jh@XiM_OLW-8#hdL(I
-zTlLb8BY#D}WAKfhsbQj<VH?)a>2CH21jf=UnWQ;nNl4|#Qqd(P(ZE;=lje~z;o~0_
-zozcrb@@604YK)`c=#73s;V0)p5qqDrsGykt`oRH|pp-L#G6dPn%TFmGFAr>>I6Aq7
-zP%u2RjZkz85w_4wu=2&r?0#-Dk+)g({8e^ep8d!W3Z!hY<5?qoKYHmgCqLlISM!t)
-zsuCy*Q2N}FmA9^y(P-f|A{(gKM2(F78I96eM5nei6$!S})6Y|$$}@MK03{7Stp+)^
-z(oz?hT;~|)O3v(PzFB{$EJU*%hh{~DW@Sp&m7PGmbF$aFdrejP$*Ia)+jVozBi0mA
-z8&=<Cf92TyH`vp0$a`Vb$!Y{DDiB5`zX}#oHTns93N=VFF^e2mQRlq2-bvTG`&t#x
-z5Je|n8s_>1Tx9XdbhX2uB_^K+p%IvHdIYir>2cS<bVekj*byV!WwdvU(fdP2XGSxc
-zE0HtA`nR|~9A@u9esOoRW`IW0Z6cv&(rv+2R?&U5;UOtavqDx$@D1miJoAkNWlbGW
-r-aDeab42;|UzBe{KY?<V8Fj&nL-0hclXqp7evT!D8Ms764=(=!{dE@Z
-
-literal 0
-HcmV?d00001
-
-diff --git a/testData/results/TestLoopMerging.dec b/testData/results/TestLoopMerging.dec
-new file mode 100644
-index 0000000000000000000000000000000000000000..9f91437231e714f985a1f44aa1a7e3df82cb1e5a
---- /dev/null
-+++ b/testData/results/TestLoopMerging.dec
-@@ -0,0 +1,49 @@
-+package pkg;
-+
-+public class TestLoopMerging {
-+   public float a;
-+   public float b;
-+   public float test() {      while(this.a - this.b < -180.0F) {
-+         this.b -= 360.0F;      }      while(this.a - this.b >= 180.0F) {
-+         this.b += 360.0F;      }
-+      return this.a;   }
-+
-+   public float test2() {
-+      for(this.a = 0.0F; this.a < 10.0F; ++this.a) {
-+         System.out.println(this.a);      }
-+
-+      for(this.a = 0.0F; this.a < 10.0F; ++this.a) {
-+         System.out.println(this.a);      }
-+
-+      return this.a;
-+   }
-+
-+   public float test3() {
-+      int[] as = new int[0];
-+      for(int f : as) {
-+         ++f;      }
-+
-+      while(this.a - this.b < -180.0F) {         this.b -= 360.0F;      }
-+      while(this.a - this.b >= 180.0F) {         this.b += 360.0F;
-+      }
-+      for(this.a = 0.0F; this.a < 10.0F; ++this.a) {
-+         System.out.println(this.a);
-+      }
-+      return this.a;   }
-+   public float test4() {
-+      int[] as = new int[0];
-+      for(int f : as) {
-+         ++f;         while(this.a - this.b < -180.0F) {
-+            this.b -= 360.0F;         }         while(this.a - this.b >= 180.0F) {
-+            this.b += 360.0F;         }
-+         for(this.a = 0.0F; this.a < 10.0F; ++this.a) {
-+            System.out.println(this.a);            while(this.a - this.b < -180.0F) {
-+               this.b -= 360.0F;            }            while(this.a - this.b >= 180.0F) {
-+               this.b += 360.0F;
-+            }
-+         }
-+      }
-+
-+      return this.a;
-+   }
-+}
-diff --git a/testData/src/pkg/TestLoopMerging.java b/testData/src/pkg/TestLoopMerging.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..c257b10446cf1cc23c6c9408e8f5660d30906b29
---- /dev/null
-+++ b/testData/src/pkg/TestLoopMerging.java
-@@ -0,0 +1,47 @@
-+package pkg;
-+
-+public class TestLoopMerging {
-+    public float a;
-+    public float b;
-+    public float test() {
-+      while(a - b < -180) b -= 360;
-+      while(a - b >= 180) b += 360;
-+      return a;
-+    }
-+    public float test2() {
-+        for (a = 0; a < 10; a++) {
-+            System.out.println(a);
-+        }
-+        for (a = 0; a < 10; a++) {
-+            System.out.println(a);
-+        }
-+        return a;
-+      }
-+
-+    public float test3() {
-+        int[] as = new int[0];
-+        for (int f: as) {
-+            f++;
-+        }
-+        while(this.a - this.b < -180) this.b -= 360;
-+        while(this.a - this.b >= 180) this.b += 360;
-+        for (a = 0; a < 10; a++) {
-+            System.out.println(a);
-+        }
-+        return this.a;
-+    }
-+    public float test4() {
-+        int[] as = new int[0];
-+        for (int f: as) {
-+            f++;
-+            while(this.a - this.b < -180) this.b -= 360;
-+            while(this.a - this.b >= 180) this.b += 360;
-+            for (a = 0; a < 10; a++) {
-+                System.out.println(a);
-+                while(this.a - this.b < -180) this.b -= 360;
-+                while(this.a - this.b >= 180) this.b += 360;
-+            }
-+        }
-+        return this.a;
-+    }
-+}
diff --git a/FernFlower-Patches/0076-Fix-IncludeEntireClasspath-so-it-doesn-t-dump-out-ra.patch b/FernFlower-Patches/0076-Fix-IncludeEntireClasspath-so-it-doesn-t-dump-out-ra.patch
deleted file mode 100644
index a051c2c..0000000
--- a/FernFlower-Patches/0076-Fix-IncludeEntireClasspath-so-it-doesn-t-dump-out-ra.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Mon, 12 Oct 2015 14:44:39 -0400
-Subject: [PATCH] Fix IncludeEntireClasspath so it doesn't dump out random
- other files from the classpath. Also, it doesn't try and save undecompiled
- additional classes too.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-index 65733ac2c8ea53277e5a2ffe54ea7e91e0c6fc97..6afe975fe2034ad25b7810a0bdc59ebcff8453e1 100644
---- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
-+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-@@ -113,7 +113,8 @@ public class Fernflower implements IDecompiledData {
-         if (found.contains(file.getAbsolutePath()))
-           continue;
- 
--        if (file.exists()) {
-+        // only add .class files from classpath
-+        if (file.exists() && (file.getName().endsWith(".class") || file.getName().endsWith(".jar"))) {
-           DecompilerContext.getLogger().writeMessage("Adding File to context from classpath: " + file, Severity.INFO);
-           structContext.addSpace(file, false);
-           found.add(file.getAbsolutePath());
-diff --git a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
-index 850c3d84888d95343abd8a3c297baac58783a8c3..e3043962de86e4823458766ff2afda4eb3e71e5f 100644
---- a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
-+++ b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
-@@ -110,6 +110,7 @@ public class ContextUnit {
-         // classes
-         for (int i = 0; i < classes.size(); i++) {
-           StructClass cl = classes.get(i);
-+          if (!cl.isOwn()) continue;
-           String entryName = decompiledData.getClassEntryName(cl, classEntries.get(i));
-           if (entryName != null) {
-             String content = decompiledData.getClassContent(cl);
diff --git a/FernFlower-Patches/0077-Fixed-generic-type-parsing-of-inner-classes-with-gen.patch b/FernFlower-Patches/0077-Fixed-generic-type-parsing-of-inner-classes-with-gen.patch
deleted file mode 100644
index 63fb7c7..0000000
--- a/FernFlower-Patches/0077-Fixed-generic-type-parsing-of-inner-classes-with-gen.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Wed, 14 Oct 2015 13:20:13 -0700
-Subject: [PATCH] Fixed generic type parsing of inner classes with generic
- outers.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-index c45d47f7e7efbd28e5bbddb02441299306518733..aeb786a7b26864424c5b730ef3f954b9bfb583be 100644
---- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-@@ -95,7 +95,7 @@ public class GenericType extends VarType {
-               }
- 
-               if (name_buff.length() > 0) {
--                name_buff.append('.');
-+                name_buff.append('$');
-               }
-               name_buff.append(name);
- 
-@@ -115,6 +115,7 @@ public class GenericType extends VarType {
- 
-                 signature = signature.substring(cl.length() + 1);
-               }
-+              cl = getNextClassSignature(signature);
-             }
-           }
-           break loop;
diff --git a/FernFlower-Patches/0078-Foo.-Bar-baz-generation.patch b/FernFlower-Patches/0078-Foo.-Bar-baz-generation.patch
deleted file mode 100644
index 00983f0..0000000
--- a/FernFlower-Patches/0078-Foo.-Bar-baz-generation.patch
+++ /dev/null
@@ -1,340 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: RainWarrior <rainwarrior@fry.su>
-Date: Mon, 12 Oct 2015 09:21:36 +0300
-Subject: [PATCH] Foo.<Bar>baz() generation
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-index 162d9cb6953a6501771750e82f7de0a6b855c75c..2760f202f5d1b04570ad3eb59f89c829f050b6ab 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-@@ -914,7 +914,7 @@ public class ExprProcessor implements CodeConstants {
- 
-     VarType rightType = exprent.getExprType();
- 
--    TextBuffer res = exprent.toJava(indent, tracer);
-+    TextBuffer res = exprent.toJava(indent, tracer, leftType);
- 
-     boolean cast =
-       castAlways ||
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-index ca9c1ed566e423e9169e2b7f72bfec128010f68f..9d41ec2900c7cbdddfb591598526c009f69148ae 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-@@ -74,6 +74,10 @@ public abstract class Exprent implements IMatchable {
-     return VarType.VARTYPE_VOID;
-   }
- 
-+  public VarType getGenericExprType() {
-+    return getExprType();
-+  }
-+
-   public int getExprentUse() {
-     return 0;
-   }
-@@ -126,6 +130,10 @@ public abstract class Exprent implements IMatchable {
-     throw new RuntimeException("not implemented");
-   }
- 
-+  public TextBuffer toJava(int indent, BytecodeMappingTracer tracer, VarType expectedType) {
-+    return toJava(indent, tracer);
-+  }
-+
-   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
-     throw new RuntimeException("not implemented");
-   }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-index fdc9cec54252976b63964d039875e0229ff93172..d4bd68ef9fd192a67843e14504a226250aaf7a85 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-@@ -23,6 +23,8 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
- import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
- import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
- import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
-+import org.jetbrains.java.decompiler.struct.StructClass;
-+import org.jetbrains.java.decompiler.struct.StructField;
- import org.jetbrains.java.decompiler.struct.consts.LinkConstant;
- import org.jetbrains.java.decompiler.struct.gen.FieldDescriptor;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
-@@ -65,6 +67,19 @@ public class FieldExprent extends Exprent {
-     return descriptor.type;
-   }
- 
-+  @Override
-+  public VarType getGenericExprType() {
-+    StructClass cl = DecompilerContext.getStructContext().getClass(classname);
-+    while(cl != null) {
-+      StructField ft = cl.getField(name, descriptor.descriptorString);
-+      if(ft != null && ft.getSignature() != null) {
-+        return ft.getSignature().type;
-+      }
-+      cl = DecompilerContext.getStructContext().getClass((String)cl.superClass.value);
-+    }
-+    return getExprType();
-+  }
-+
-   @Override
-   public int getExprentUse() {
-     return instance == null ? Exprent.MULTIPLE_USES : instance.getExprentUse() & Exprent.MULTIPLE_USES;
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 9d16de2d5ab160c76a9a3efff83b4e0f011f5a12..81b6f4e5108eb3e7b73b4962b5695337e5a1e726 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-@@ -19,7 +19,9 @@ import java.util.ArrayList;
- import java.util.BitSet;
- import java.util.Collections;
- import java.util.List;
-+import java.util.Map;
- import java.util.Map.Entry;
-+import java.util.HashMap;
- 
- import org.jetbrains.java.decompiler.code.CodeConstants;
- import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
-@@ -37,6 +39,7 @@ import org.jetbrains.java.decompiler.struct.StructMethod;
- import org.jetbrains.java.decompiler.struct.consts.LinkConstant;
- import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
- import org.jetbrains.java.decompiler.struct.match.MatchEngine;
- import org.jetbrains.java.decompiler.struct.match.MatchNode;
- import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
-@@ -194,6 +197,11 @@ public class InvocationExprent extends Exprent {
- 
-   @Override
-   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
-+    return toJava(indent, tracer, null);
-+  }
-+
-+  @Override
-+  public TextBuffer toJava(int indent, BytecodeMappingTracer tracer, VarType expectedType) {
-     TextBuffer buf = new TextBuffer();
- 
-     String super_qualifier = null;
-@@ -268,6 +276,11 @@ public class InvocationExprent extends Exprent {
-       }
-     }
- 
-+    List<StructMethod> matches = getMatchedDescriptors();
-+    BitSet setAmbiguousParameters = getAmbiguousParameters(matches);
-+    StructMethod desc = null;
-+    if(matches.size() == 1) desc = matches.get(0);
-+
-     switch (functype) {
-       case TYP_GENERAL:
-         if (VarExprent.VAR_NAMELESS_ENCLOSURE.equals(buf.toString())) {
-@@ -276,8 +289,66 @@ public class InvocationExprent extends Exprent {
- 
-         if (buf.length() > 0) {
-           buf.append(".");
--        }
- 
-+          boolean add = false;
-+          List<VarType> toAdd = new ArrayList<VarType>();
-+          if(expectedType != null && expectedType.type == CodeConstants.TYPE_OBJECT && descriptor.ret.type == CodeConstants.TYPE_OBJECT) {
-+            //System.out.println("0: " + isStatic + " " + desc + " " + expectedType + " " + descriptor.ret + " " + expectedType.isGeneric());
-+            if(desc == null) {
-+              // more harn than gain
-+              // Object -> String
-+              /*if(descriptor.ret.value.equals("java/lang/Object") && !descriptor.ret.equals(expectedType)) {
-+                add = true;
-+                toAdd.add(expectedType);
-+                System.out.println("1: " + expectedType + " " + descriptor.ret);
-+              }*/
-+              // List -> List<String>
-+              if(expectedType.isGeneric()) {
-+                List<VarType> leftArgs = ((GenericType)expectedType).getArguments();
-+                //System.out.println("22: " + expectedType + " " + leftArgs.get(0));
-+                if(leftArgs.size() == 1 && descriptor.ret.equals(expectedType) && leftArgs.get(0).type == CodeConstants.TYPE_OBJECT) {
-+                  add = true;
-+                  toAdd.add(leftArgs.get(0));
-+                  System.out.println("2: " + expectedType.type + " " + expectedType + " " + leftArgs.get(0).type + " " + leftArgs.get(0));
-+                }
-+              }
-+            }
-+            if(desc != null && desc.getSignature() != null) {
-+              VarType ret = desc.getSignature().ret;
-+              // more harm than gain
-+              // T -> String
-+              /*if(desc.getSignature().fparameters.size() == 1 && desc.getSignature().fparameters.get(0).equals(ret.value)) {
-+                add = true;
-+                toAdd.add(expectedType);
-+                System.out.println("3: " + expectedType + " " + ret + " " + desc.getSignature().fparameters.get(0));
-+              }
-+              // List<T> -> List<String>
-+              if(expectedType.isGeneric() && ret.isGeneric()) {
-+                List<VarType> leftArgs = ((GenericType)expectedType).getArguments();
-+                List<VarType> rightArgs = ((GenericType)ret).getArguments();
-+                List<String> fparams = desc.getSignature().fparameters;
-+                // trivial case only for now
-+                if(leftArgs.size() == 1 && rightArgs.size() == 1 && fparams.size() == 1 &&
-+                   !leftArgs.get(0).equals(rightArgs.get(0)) && rightArgs.get(0).value.equals(fparams.get(0))) {
-+                  add = true;
-+                  toAdd.add(leftArgs.get(0));
-+                  System.out.println("4: " + leftArgs.get(0) + " " + rightArgs.get(0) + " " + fparams.get(0));
-+                }
-+              }*/
-+            }
-+            if(add && toAdd.size() != 0) {
-+              buf.append("<");
-+              for(int i = 0; i < toAdd.size(); i++) {
-+                buf.append(ExprProcessor.getCastTypeName(toAdd.get(i)));
-+                if(i + 1 < toAdd.size()) {
-+                  buf.append(", ");
-+                }
-+              }
-+              buf.append(">");
-+            }
-+          }
-+
-+        }
-         buf.append(name);
-         if (invocationTyp == INVOKE_DYNAMIC) {
-           buf.append("<invokedynamic>");
-@@ -318,8 +389,17 @@ public class InvocationExprent extends Exprent {
-       }
-     }
- 
--    BitSet setAmbiguousParameters = getAmbiguousParameters();
--
-+    /*StructClass cl = DecompilerContext.getStructContext().getClass(classname);
-+    Map<VarType, VarType> genArgs = new HashMap<VarType, VarType>();
-+    if(cl != null && cl.getSignature() != null && instance != null && instance.getGenericExprType().isGeneric()) {
-+      GenericType genType = (GenericType)instance.getGenericExprType();
-+      for(int i = 0; i < cl.getSignature().fparameters.size(); i++) {
-+        VarType from = GenericType.parse("T" + cl.getSignature().fparameters.get(i) + ";");
-+        VarType to = genType.getArguments().get(i);
-+        //System.out.println("(" + from.type + " " + from.value + " -> " + to.type + " " + to.value + ")");
-+        genArgs.put(from, to);
-+      }
-+    }*/
-     boolean firstParameter = true;
-     int start = isEnum ? 2 : 0;
-     for (int i = start; i < lstParameters.size(); i++) {
-@@ -330,7 +410,33 @@ public class InvocationExprent extends Exprent {
- 
-         TextBuffer buff = new TextBuffer();
-         boolean ambiguous = setAmbiguousParameters.get(i);
--        ExprProcessor.getCastedExprent(lstParameters.get(i), descriptor.params[i], buff, indent, true, ambiguous, tracer);
-+        VarType type = descriptor.params[i];
-+        if(desc != null && desc.getSignature() != null && desc.getSignature().params.size() == lstParameters.size()) {
-+          VarType newType = desc.getSignature().params.get(i);
-+          boolean free = false;
-+          for(String param : desc.getSignature().fparameters) {
-+            if(param.equals(newType.value)) {
-+              free = true;
-+              break;
-+            }
-+          }
-+          if(!free && desc.getSignature().params.get(i).type == CodeConstants.TYPE_OBJECT) {
-+            type = desc.getSignature().params.get(i);
-+          }
-+        }
-+        /*if(genArgs.containsKey(type)) {
-+          type = genArgs.get(type);
-+        }
-+        if(desc != null && desc.getSignature() != null) {
-+          for(String ps: desc.getSignature().fparameters) {
-+            VarType param = GenericType.parse("T" + ps + ";");
-+            if(param.equals(type)) { // found free argument, need to infer it from the argument
-+              type = lstParameters.get(i).getExprType();
-+              break;
-+            }
-+          }
-+        }*/
-+        ExprProcessor.getCastedExprent(lstParameters.get(i), type, buff, indent, true, ambiguous, tracer);
-         buf.append(buff);
- 
-         firstParameter = false;
-@@ -342,12 +448,12 @@ public class InvocationExprent extends Exprent {
-     return buf;
-   }
- 
--  private BitSet getAmbiguousParameters() {
-+  private List<StructMethod> getMatchedDescriptors() {
-+    List<StructMethod> matches = new ArrayList<StructMethod>();
-+
-     StructClass cl = DecompilerContext.getStructContext().getClass(classname);
--    if (cl == null) return EMPTY_BIT_SET;
-+    if (cl == null) return matches;
- 
--    // check number of matches
--    List<MethodDescriptor> matches = new ArrayList<MethodDescriptor>();
-     nextMethod:
-     for (StructMethod mt : cl.getMethods()) {
-       if (name.equals(mt.getName())) {
-@@ -358,10 +464,17 @@ public class InvocationExprent extends Exprent {
-               continue nextMethod;
-             }
-           }
--          matches.add(md);
--        }
-+          matches.add(mt);
-+       }
-       }
-     }
-+    return matches;
-+  }
-+
-+  private BitSet getAmbiguousParameters(List<StructMethod> matches) {
-+    StructClass cl = DecompilerContext.getStructContext().getClass(classname);
-+    if (cl == null) return EMPTY_BIT_SET;
-+
-     if (matches.size() == 1) return EMPTY_BIT_SET;
- 
-     // check if a call is unambiguous
-@@ -384,7 +497,8 @@ public class InvocationExprent extends Exprent {
-     BitSet ambiguous = new BitSet(descriptor.params.length);
-     for (int i = 0; i < descriptor.params.length; i++) {
-       VarType paramType = descriptor.params[i];
--      for (MethodDescriptor md : matches) {
-+      for (StructMethod mtt : matches) {
-+        MethodDescriptor md = MethodDescriptor.parseDescriptor(mtt.getDescriptor());
-         if (!paramType.equals(md.params[i])) {
-           ambiguous.set(i);
-           break;
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index 4784e030332e1ea0ce87a4bfa69432cfa0906b73..3058e7724f20f48309683af8c16b7bf19e124820 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-@@ -65,6 +65,21 @@ public class VarExprent extends Exprent {
-     return getVarType();
-   }
- 
-+  @Override
-+  public VarType getGenericExprType() {
-+    if (lvt != null && lvt.getSig() != null) {
-+      // TODO; figure out why it's crashing, ugly fix for now
-+      try {
-+        return GenericType.parse(lvt.getSig());
-+      } catch (StringIndexOutOfBoundsException ex) {
-+      }
-+    }
-+    else if (lvt != null) {
-+      return lvt.getVarType();
-+    }
-+    return getVarType();
-+  }
-+
-   @Override
-   public int getExprentUse() {
-     return Exprent.MULTIPLE_USES | Exprent.SIDE_EFFECTS_FREE;
-diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
-index 1b0df9d2e710cb6d1bee94eb1dddfe2c06135941..af06b8e0d37763abcbabbca680dee2539831f978 100644
---- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
-+++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
-@@ -269,6 +269,15 @@ public class VarType {  // TODO: optimize switch
-     return res;
-   }
- 
-+  @Override
-+  public int hashCode() {
-+    int result = 1;
-+    result = 37 * result + type;
-+    result = 37 * result + arrayDim;
-+    result = 37 * result + value == null ? 0 : value.hashCode();
-+    return result;
-+  }
-+
-   @Override
-   public boolean equals(Object o) {
-     if (o == this) {
diff --git a/FernFlower-Patches/0079-concentrated-changes-to-Exprent.getInferredExprType.patch b/FernFlower-Patches/0079-concentrated-changes-to-Exprent.getInferredExprType.patch
deleted file mode 100644
index e6ce0e9..0000000
--- a/FernFlower-Patches/0079-concentrated-changes-to-Exprent.getInferredExprType.patch
+++ /dev/null
@@ -1,434 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: RainWarrior <rainwarrior@fry.su>
-Date: Wed, 14 Oct 2015 05:45:41 +0300
-Subject: [PATCH] concentrated changes to Exprent.getInferredExprType
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index 4ec7fe9d7d34fe35fcd379d608a102d8f40e1734..7c8276c8dd60eac7022378d4b0700d272a333705 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-@@ -435,6 +435,7 @@ public class ClassWriter {
-       else {
-         buffer.append(" = ");
-         // FIXME: special case field initializer. Can map to more than one method (constructor) and bytecode intruction.
-+        initializer.getInferredExprType(descriptor == null? fieldType : descriptor.type);
-         buffer.append(initializer.toJava(indent, tracer));
-       }
-     }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-index 2760f202f5d1b04570ad3eb59f89c829f050b6ab..3be3b6fb3db44ef1320c3106e7d432dd1579e335 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-@@ -912,9 +912,9 @@ public class ExprProcessor implements CodeConstants {
-                                          boolean castAlways,
-                                          BytecodeMappingTracer tracer) {
- 
--    VarType rightType = exprent.getExprType();
-+    VarType rightType = exprent.getInferredExprType(leftType);
- 
--    TextBuffer res = exprent.toJava(indent, tracer, leftType);
-+    TextBuffer res = exprent.toJava(indent, tracer);
- 
-     boolean cast =
-       castAlways ||
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
-index efc64b9d98005572eb9752e36d472f7a65358203..8276abdbc032467bcff47d2be07729c0f0e53d44 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
-@@ -65,6 +65,12 @@ public class AssignmentExprent extends Exprent {
-     return left.getExprType();
-   }
- 
-+  @Override
-+  public VarType getInferredExprType(VarType upperBound) {
-+    //System.out.println("infer: " + upperBound + " = " + getExprType());
-+    return getExprType();
-+  }
-+
-   @Override
-   public CheckTypesResult checkExprTypeBounds() {
-     CheckTypesResult result = new CheckTypesResult();
-@@ -106,7 +112,7 @@ public class AssignmentExprent extends Exprent {
-   @Override
-   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
-     VarType leftType = left.getExprType();
--    VarType rightType = right.getExprType();
-+    VarType rightType = right.getInferredExprType(leftType);
- 
-     boolean fieldInClassInit = false, hiddenField = false;
-     if (left.type == Exprent.EXPRENT_FIELD) { // first assignment to a final field. Field name without "this" in front of it
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-index 9d41ec2900c7cbdddfb591598526c009f69148ae..bda80a0333129fd0e1d476e00cd1e6dee18ce98b 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-@@ -74,7 +74,7 @@ public abstract class Exprent implements IMatchable {
-     return VarType.VARTYPE_VOID;
-   }
- 
--  public VarType getGenericExprType() {
-+  public VarType getInferredExprType(VarType upperBound) {
-     return getExprType();
-   }
- 
-@@ -130,10 +130,6 @@ public abstract class Exprent implements IMatchable {
-     throw new RuntimeException("not implemented");
-   }
- 
--  public TextBuffer toJava(int indent, BytecodeMappingTracer tracer, VarType expectedType) {
--    return toJava(indent, tracer);
--  }
--
-   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
-     throw new RuntimeException("not implemented");
-   }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-index d4bd68ef9fd192a67843e14504a226250aaf7a85..be95dc1f6242dc3a12cc433384d34700d8c602b3 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-@@ -68,14 +68,15 @@ public class FieldExprent extends Exprent {
-   }
- 
-   @Override
--  public VarType getGenericExprType() {
-+  public VarType getInferredExprType(VarType upperBound) {
-     StructClass cl = DecompilerContext.getStructContext().getClass(classname);
-     while(cl != null) {
-       StructField ft = cl.getField(name, descriptor.descriptorString);
-       if(ft != null && ft.getSignature() != null) {
-         return ft.getSignature().type;
-       }
--      cl = DecompilerContext.getStructContext().getClass((String)cl.superClass.value);
-+      if(cl.superClass == null) cl = null;
-+      else cl = DecompilerContext.getStructContext().getClass((String)cl.superClass.value);
-     }
-     return getExprType();
-   }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 81b6f4e5108eb3e7b73b4962b5695337e5a1e726..ca5e0778987e633aaf5c4f54a63fefe28cb356e0 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-@@ -72,6 +72,8 @@ public class InvocationExprent extends Exprent {
-   private int invocationTyp = INVOKE_VIRTUAL;
-   private List<Exprent> lstParameters = new ArrayList<Exprent>();
- 
-+  private List<VarType> genericArgs = new ArrayList<VarType>();
-+
-   public InvocationExprent() {
-     super(EXPRENT_INVOCATION);
-   }
-@@ -163,6 +165,65 @@ public class InvocationExprent extends Exprent {
-     return descriptor.ret;
-   }
- 
-+  @Override
-+  public VarType getInferredExprType(VarType upperBound) {
-+    //System.out.println("infer: " + instance + " " + classname + "." + name + " " + getExprType() + " " + upperBound);
-+    List<StructMethod> matches = getMatchedDescriptors();
-+    StructMethod desc = null;
-+    if(matches.size() == 1) desc = matches.get(0);
-+
-+    VarType type = getExprType();
-+
-+    List<VarType> toAdd = new ArrayList<VarType>();
-+    if(upperBound != null/* && upperBound.type == CodeConstants.TYPE_OBJECT && descriptor.ret.type == CodeConstants.TYPE_OBJECT*/) {
-+      genericArgs.clear();
-+      //System.out.println("0: " + isStatic + " " + desc + " " + upperBound + " " + descriptor.ret + " " + upperBound.isGeneric());
-+      /*if(desc == null) {
-+        // more harn than gain
-+        // Object -> String
-+        if(descriptor.ret.value.equals("java/lang/Object") && !descriptor.ret.equals(upperBound)) {
-+          genericArgs.add(upperBound);
-+          System.out.println("1: " + upperBound + " " + descriptor.ret);
-+        }
-+        // List -> List<String>
-+        if(upperBound.isGeneric()) {
-+          List<VarType> leftArgs = ((GenericType)upperBound).getArguments();
-+          //System.out.println("22: " + upperBound + " " + leftArgs.get(0));
-+          if(leftArgs.size() == 1 && descriptor.ret.equals(upperBound) && leftArgs.get(0).type == CodeConstants.TYPE_OBJECT) {
-+            genericArgs.add(leftArgs.get(0));
-+            System.out.println("2: " + upperBound.type + " " + upperBound + " " + leftArgs.get(0).type + " " + leftArgs.get(0));
-+          }
-+        }
-+      }*/
-+      if(desc != null && desc.getSignature() != null) {
-+        VarType ret = desc.getSignature().ret;
-+        // more harm than gain
-+        // T -> String
-+        /*if(desc.getSignature().fparameters.size() == 1 && desc.getSignature().fparameters.get(0).equals(ret.value)) {
-+          genericArgs.add(upperBound);
-+          System.out.println("3: " + upperBound + " " + ret + " " + desc.getSignature().fparameters.get(0));
-+        }*/
-+        // List<T> -> List<String>
-+        if(upperBound.isGeneric() && ret.isGeneric()) {
-+          List<VarType> leftArgs = ((GenericType)upperBound).getArguments();
-+          List<VarType> rightArgs = ((GenericType)ret).getArguments();
-+          List<String> fparams = desc.getSignature().fparameters;
-+          // trivial case only for now
-+          if(leftArgs.size() == 1 && rightArgs.size() == 1 && fparams.size() == 1) {
-+            VarType l = leftArgs.get(0);
-+            VarType r = rightArgs.get(0);
-+            if(l != null /*&& l.type == CodeConstants.TYPE_OBJECT && !l.equals(r)*/ && r.value.equals(fparams.get(0))) {
-+              genericArgs.add(leftArgs.get(0));
-+              //type = upperBound;
-+              System.out.println("4: " + leftArgs.get(0) + " " + rightArgs.get(0) + " " + fparams.get(0));
-+            }
-+          }
-+        }
-+      }
-+    }
-+
-+    return type;
-+  }
-   @Override
-   public CheckTypesResult checkExprTypeBounds() {
-     CheckTypesResult result = new CheckTypesResult();
-@@ -197,11 +258,6 @@ public class InvocationExprent extends Exprent {
- 
-   @Override
-   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
--    return toJava(indent, tracer, null);
--  }
--
--  @Override
--  public TextBuffer toJava(int indent, BytecodeMappingTracer tracer, VarType expectedType) {
-     TextBuffer buf = new TextBuffer();
- 
-     String super_qualifier = null;
-@@ -276,11 +332,6 @@ public class InvocationExprent extends Exprent {
-       }
-     }
- 
--    List<StructMethod> matches = getMatchedDescriptors();
--    BitSet setAmbiguousParameters = getAmbiguousParameters(matches);
--    StructMethod desc = null;
--    if(matches.size() == 1) desc = matches.get(0);
--
-     switch (functype) {
-       case TYP_GENERAL:
-         if (VarExprent.VAR_NAMELESS_ENCLOSURE.equals(buf.toString())) {
-@@ -290,64 +341,16 @@ public class InvocationExprent extends Exprent {
-         if (buf.length() > 0) {
-           buf.append(".");
- 
--          boolean add = false;
--          List<VarType> toAdd = new ArrayList<VarType>();
--          if(expectedType != null && expectedType.type == CodeConstants.TYPE_OBJECT && descriptor.ret.type == CodeConstants.TYPE_OBJECT) {
--            //System.out.println("0: " + isStatic + " " + desc + " " + expectedType + " " + descriptor.ret + " " + expectedType.isGeneric());
--            if(desc == null) {
--              // more harn than gain
--              // Object -> String
--              /*if(descriptor.ret.value.equals("java/lang/Object") && !descriptor.ret.equals(expectedType)) {
--                add = true;
--                toAdd.add(expectedType);
--                System.out.println("1: " + expectedType + " " + descriptor.ret);
--              }*/
--              // List -> List<String>
--              if(expectedType.isGeneric()) {
--                List<VarType> leftArgs = ((GenericType)expectedType).getArguments();
--                //System.out.println("22: " + expectedType + " " + leftArgs.get(0));
--                if(leftArgs.size() == 1 && descriptor.ret.equals(expectedType) && leftArgs.get(0).type == CodeConstants.TYPE_OBJECT) {
--                  add = true;
--                  toAdd.add(leftArgs.get(0));
--                  System.out.println("2: " + expectedType.type + " " + expectedType + " " + leftArgs.get(0).type + " " + leftArgs.get(0));
--                }
--              }
--            }
--            if(desc != null && desc.getSignature() != null) {
--              VarType ret = desc.getSignature().ret;
--              // more harm than gain
--              // T -> String
--              /*if(desc.getSignature().fparameters.size() == 1 && desc.getSignature().fparameters.get(0).equals(ret.value)) {
--                add = true;
--                toAdd.add(expectedType);
--                System.out.println("3: " + expectedType + " " + ret + " " + desc.getSignature().fparameters.get(0));
-+          if(genericArgs.size() != 0) {
-+            buf.append("<");
-+            for(int i = 0; i < genericArgs.size(); i++) {
-+              buf.append(ExprProcessor.getCastTypeName(genericArgs.get(i)));
-+              if(i + 1 < genericArgs.size()) {
-+                buf.append(", ");
-               }
--              // List<T> -> List<String>
--              if(expectedType.isGeneric() && ret.isGeneric()) {
--                List<VarType> leftArgs = ((GenericType)expectedType).getArguments();
--                List<VarType> rightArgs = ((GenericType)ret).getArguments();
--                List<String> fparams = desc.getSignature().fparameters;
--                // trivial case only for now
--                if(leftArgs.size() == 1 && rightArgs.size() == 1 && fparams.size() == 1 &&
--                   !leftArgs.get(0).equals(rightArgs.get(0)) && rightArgs.get(0).value.equals(fparams.get(0))) {
--                  add = true;
--                  toAdd.add(leftArgs.get(0));
--                  System.out.println("4: " + leftArgs.get(0) + " " + rightArgs.get(0) + " " + fparams.get(0));
--                }
--              }*/
--            }
--            if(add && toAdd.size() != 0) {
--              buf.append("<");
--              for(int i = 0; i < toAdd.size(); i++) {
--                buf.append(ExprProcessor.getCastTypeName(toAdd.get(i)));
--                if(i + 1 < toAdd.size()) {
--                  buf.append(", ");
--                }
--              }
--              buf.append(">");
-             }
-+            buf.append(">");
-           }
--
-         }
-         buf.append(name);
-         if (invocationTyp == INVOKE_DYNAMIC) {
-@@ -389,17 +392,31 @@ public class InvocationExprent extends Exprent {
-       }
-     }
- 
--    /*StructClass cl = DecompilerContext.getStructContext().getClass(classname);
-+    List<StructMethod> matches = getMatchedDescriptors();
-+    BitSet setAmbiguousParameters = getAmbiguousParameters(matches);
-+    StructMethod desc = null;
-+    if(matches.size() == 1) desc = matches.get(0);
-+
-+    StructClass cl = DecompilerContext.getStructContext().getClass(classname);
-     Map<VarType, VarType> genArgs = new HashMap<VarType, VarType>();
--    if(cl != null && cl.getSignature() != null && instance != null && instance.getGenericExprType().isGeneric()) {
--      GenericType genType = (GenericType)instance.getGenericExprType();
--      for(int i = 0; i < cl.getSignature().fparameters.size(); i++) {
--        VarType from = GenericType.parse("T" + cl.getSignature().fparameters.get(i) + ";");
--        VarType to = genType.getArguments().get(i);
--        //System.out.println("(" + from.type + " " + from.value + " -> " + to.type + " " + to.value + ")");
--        genArgs.put(from, to);
-+
-+    if(cl != null && cl.getSignature() != null && instance != null && instance.getInferredExprType(null).isGeneric()) {
-+      GenericType genType = (GenericType)instance.getInferredExprType(null);
-+      if(genType.getArguments().size() == cl.getSignature().fparameters.size()) {
-+		/*System.out.println("remap: " + classname + "." + name);
-+		if(instance instanceof FieldExprent) {
-+			System.out.println(((FieldExprent)instance).getClassname() + "." + ((FieldExprent)instance).getName());
-+		}*/
-+        for(int i = 0; i < cl.getSignature().fparameters.size(); i++) {
-+          VarType from = GenericType.parse("T" + cl.getSignature().fparameters.get(i) + ";");
-+          VarType to = genType.getArguments().get(i);
-+          //System.out.println("(" + from.type + " " + from.value + " -> " + to.type + " " + to.value + ")");
-+          if(from != null && to != null && to.type == CodeConstants.TYPE_OBJECT) {
-+            genArgs.put(from, to);
-+          }
-+        }
-       }
--    }*/
-+    }
-     boolean firstParameter = true;
-     int start = isEnum ? 2 : 0;
-     for (int i = start; i < lstParameters.size(); i++) {
-@@ -411,8 +428,9 @@ public class InvocationExprent extends Exprent {
-         TextBuffer buff = new TextBuffer();
-         boolean ambiguous = setAmbiguousParameters.get(i);
-         VarType type = descriptor.params[i];
--        if(desc != null && desc.getSignature() != null && desc.getSignature().params.size() == lstParameters.size()) {
--          VarType newType = desc.getSignature().params.get(i);
-+		VarType newType = null;
-+        /*if(desc != null && desc.getSignature() != null && desc.getSignature().params.size() == lstParameters.size()) {
-+          newType = desc.getSignature().params.get(i);
-           boolean free = false;
-           for(String param : desc.getSignature().fparameters) {
-             if(param.equals(newType.value)) {
-@@ -420,14 +438,14 @@ public class InvocationExprent extends Exprent {
-               break;
-             }
-           }
--          if(!free && desc.getSignature().params.get(i).type == CodeConstants.TYPE_OBJECT) {
--            type = desc.getSignature().params.get(i);
-+          if(!free) {
-+            type = newType;
-           }
--        }
--        /*if(genArgs.containsKey(type)) {
-+        }*/
-+        if(genArgs.containsKey(type)) {
-           type = genArgs.get(type);
-         }
--        if(desc != null && desc.getSignature() != null) {
-+        /*if(desc != null && desc.getSignature() != null) {
-           for(String ps: desc.getSignature().fparameters) {
-             VarType param = GenericType.parse("T" + ps + ";");
-             if(param.equals(type)) { // found free argument, need to infer it from the argument
-@@ -436,6 +454,11 @@ public class InvocationExprent extends Exprent {
-             }
-           }
-         }*/
-+		VarType exprType = lstParameters.get(i).getInferredExprType(type);
-+		if(exprType != null && exprType.type != CodeConstants.TYPE_NULL && type != null && type.type == CodeConstants.TYPE_GENVAR) {
-+		  type = exprType;
-+		}
-+		//System.out.println("param: " + i + " " + newType + " " + exprType + " " + type + " " + lstParameters.get(i));
-         ExprProcessor.getCastedExprent(lstParameters.get(i), type, buff, indent, true, ambiguous, tracer);
-         buf.append(buff);
- 
-@@ -452,6 +475,7 @@ public class InvocationExprent extends Exprent {
-     List<StructMethod> matches = new ArrayList<StructMethod>();
- 
-     StructClass cl = DecompilerContext.getStructContext().getClass(classname);
-+    //System.out.println("m: " + classname + "." + name + " " + cl);
-     if (cl == null) return matches;
- 
-     nextMethod:
-@@ -485,7 +509,8 @@ public class InvocationExprent extends Exprent {
-         boolean exact = true;
-         for (int i = 0; i < md.params.length; i++) {
-           if (!md.params[i].equals(lstParameters.get(i).getExprType())) {
--            exact = false;
-+            // FIXME
-+            //exact = false;
-             break;
-           }
-         }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index 3058e7724f20f48309683af8c16b7bf19e124820..0d417258f78e649b034a680374610a961ed21257 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-@@ -66,7 +66,7 @@ public class VarExprent extends Exprent {
-   }
- 
-   @Override
--  public VarType getGenericExprType() {
-+  public VarType getInferredExprType(VarType upperBound) {
-     if (lvt != null && lvt.getSig() != null) {
-       // TODO; figure out why it's crashing, ugly fix for now
-       try {
-diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-index aeb786a7b26864424c5b730ef3f954b9bfb583be..da04e009a8b3ef883536cf117faee2f6dfe3b417 100644
---- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-@@ -318,4 +318,20 @@ public class GenericType extends VarType {
-     }
-     return buffer.toString();
-   }
-+
-+  @Override
-+  public String toString() {
-+    StringBuilder buf = new StringBuilder();
-+	switch(getWildcard()) {
-+      case GenericType.WILDCARD_EXTENDS:
-+        buf.append("? extends ");
-+        break;
-+      case GenericType.WILDCARD_SUPER:
-+        buf.append("? super ");
-+      break;
-+	}
-+	buf.append(super.toString());
-+    buf.append(getTypeArguments());
-+	return buf.toString();
-+  }
- }
-diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
-index c7e781e4172f736a831b857ca7fd3060d95e6186..2afd2e6f60ee5cc191b6eaf535e0fa12f25ea275 100644
---- a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
-+++ b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
-@@ -47,6 +47,7 @@ public class MinecraftDecompilationTest {
-         put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES,"1");
-         put(IFernflowerPreferences.ASCII_STRING_CHARACTERS,"1");
-         put(IFernflowerPreferences.REMOVE_SYNTHETIC,"0");
-+        put(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH, "1");
-     }};
-     fixture.setUp(mcFFOptions);
-     if (!new File(fixture.getTestDataDir(), MC_JAR).exists()) {
diff --git a/FernFlower-Patches/0080-passing-information-from-InvocationExprent-s-inferre.patch b/FernFlower-Patches/0080-passing-information-from-InvocationExprent-s-inferre.patch
deleted file mode 100644
index 0963240..0000000
--- a/FernFlower-Patches/0080-passing-information-from-InvocationExprent-s-inferre.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: RainWarrior <rainwarrior@fry.su>
-Date: Wed, 14 Oct 2015 09:26:05 +0300
-Subject: [PATCH] passing information from InvocationExprent's inferred type
- arguments to the parameters
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index ca5e0778987e633aaf5c4f54a63fefe28cb356e0..884a2d7ed927eb6f402b05a169ca772764bf9c61 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-@@ -429,7 +429,7 @@ public class InvocationExprent extends Exprent {
-         boolean ambiguous = setAmbiguousParameters.get(i);
-         VarType type = descriptor.params[i];
- 		VarType newType = null;
--        /*if(desc != null && desc.getSignature() != null && desc.getSignature().params.size() == lstParameters.size()) {
-+        if(desc != null && desc.getSignature() != null && genericArgs.size() != 0 && desc.getSignature().params.size() == lstParameters.size()) {
-           newType = desc.getSignature().params.get(i);
-           boolean free = false;
-           for(String param : desc.getSignature().fparameters) {
-@@ -441,10 +441,44 @@ public class InvocationExprent extends Exprent {
-           if(!free) {
-             type = newType;
-           }
--        }*/
-+        }
-         if(genArgs.containsKey(type)) {
-           type = genArgs.get(type);
-         }
-+		else if(desc != null && desc.getSignature() != null && genericArgs.size() != 0) {
-+			Map<VarType, VarType> genMap = new HashMap<VarType, VarType>();
-+			for(int j = 0; j < genericArgs.size(); j++) {
-+				VarType from = GenericType.parse("T" + desc.getSignature().fparameters.get(j) + ";");
-+				VarType to = genericArgs.get(j);
-+				genMap.put(from, to);
-+				//System.out.println("map: (" + from + " -> " + to + ")");
-+			}
-+			if(genMap.containsKey(type)) {
-+				type = genMap.get(type);
-+			}
-+			// this only checks 1 level deep right now
-+			else if(type.isGeneric()) {
-+				GenericType genType = (GenericType)type;
-+				List<VarType> toArgs = new ArrayList<VarType>();
-+				boolean changed = false;
-+				VarType parent = genType.getParent();
-+				if(genMap.containsKey(parent)) {
-+					parent = genMap.get(parent);
-+					changed = true;
-+				}
-+				for(VarType arg : genType.getArguments()) {
-+					if(genMap.containsKey(arg)) {
-+						toArgs.add(genMap.get(arg));
-+						changed = true;
-+					} else {
-+						toArgs.add(arg);
-+					}
-+				}
-+				if(changed) {
-+					type = new GenericType(type.type, type.arrayDim, type.value, parent, toArgs, genType.getWildcard());
-+				}
-+			}
-+		}
-         /*if(desc != null && desc.getSignature() != null) {
-           for(String ps: desc.getSignature().fparameters) {
-             VarType param = GenericType.parse("T" + ps + ";");
-@@ -509,8 +543,7 @@ public class InvocationExprent extends Exprent {
-         boolean exact = true;
-         for (int i = 0; i < md.params.length; i++) {
-           if (!md.params[i].equals(lstParameters.get(i).getExprType())) {
--            // FIXME
--            //exact = false;
-+            exact = false;
-             break;
-           }
-         }
-@@ -523,6 +556,7 @@ public class InvocationExprent extends Exprent {
-     for (int i = 0; i < descriptor.params.length; i++) {
-       VarType paramType = descriptor.params[i];
-       for (StructMethod mtt : matches) {
-+        if(mtt.getSignature() != null && mtt.getSignature().params.get(i).isGeneric()) break;
-         MethodDescriptor md = MethodDescriptor.parseDescriptor(mtt.getDescriptor());
-         if (!paramType.equals(md.params[i])) {
-           ambiguous.set(i);
-diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-index da04e009a8b3ef883536cf117faee2f6dfe3b417..9319bf76366d189afd5bdb98b018c8e0425a58b0 100644
---- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-@@ -35,7 +35,7 @@ public class GenericType extends VarType {
-   private final List<VarType> arguments;
-   private final int wildcard;
- 
--  private GenericType(int type, int arrayDim, String value, VarType parent, List<VarType> arguments, int wildcard) {
-+  public GenericType(int type, int arrayDim, String value, VarType parent, List<VarType> arguments, int wildcard) {
-     super(type, arrayDim, value, getFamily(type, arrayDim), getStackSize(type, arrayDim), false);
-     this.parent = parent;
-     this.arguments = arguments == null ? Collections.<VarType>emptyList() : arguments;
-@@ -256,6 +256,10 @@ public class GenericType extends VarType {
-     return new GenericType(type, arrayDim - 1, value, parent, arguments, wildcard);
-   }
- 
-+  public VarType getParent() {
-+    return parent;
-+  }
-+
-   public List<VarType> getArguments() {
-     return arguments;
-   }
diff --git a/FernFlower-Patches/0081-pushed-remapping-to-the-VarType-added-type-inference.patch b/FernFlower-Patches/0081-pushed-remapping-to-the-VarType-added-type-inference.patch
deleted file mode 100644
index 78ff39a..0000000
--- a/FernFlower-Patches/0081-pushed-remapping-to-the-VarType-added-type-inference.patch
+++ /dev/null
@@ -1,284 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: RainWarrior <rainwarrior@fry.su>
-Date: Wed, 14 Oct 2015 14:18:10 +0300
-Subject: [PATCH] pushed remapping to the VarType, added type inference to a
- couple more places
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-index 3be3b6fb3db44ef1320c3106e7d432dd1579e335..60832d3af2925a806c852e72209e676fb293d882 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-@@ -853,6 +853,7 @@ public class ExprProcessor implements CodeConstants {
-     lst = Exprent.sortIndexed(lst);
- 
-     for (Exprent expr : lst) {
-+      expr.getInferredExprType(null);
-       TextBuffer content = expr.toJava(indent, tracer);
-       if (content.length() > 0) {
-         if (expr.type != Exprent.EXPRENT_VAR || !((VarExprent)expr).isClassDef()) {
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
-index 8276abdbc032467bcff47d2be07729c0f0e53d44..68f58305f21314d969c79cd0bdcdc14c5b0ae003 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
-@@ -112,7 +112,7 @@ public class AssignmentExprent extends Exprent {
-   @Override
-   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
-     VarType leftType = left.getExprType();
--    VarType rightType = right.getInferredExprType(leftType);
-+    VarType rightType = right.getInferredExprType(left.getInferredExprType(null));
- 
-     boolean fieldInClassInit = false, hiddenField = false;
-     if (left.type == Exprent.EXPRENT_FIELD) { // first assignment to a final field. Field name without "this" in front of it
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 884a2d7ed927eb6f402b05a169ca772764bf9c61..4c4b8981d0e7b3e12d7024e5dc7e05c31476ea8d 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-@@ -167,10 +167,10 @@ public class InvocationExprent extends Exprent {
- 
-   @Override
-   public VarType getInferredExprType(VarType upperBound) {
--    //System.out.println("infer: " + instance + " " + classname + "." + name + " " + getExprType() + " " + upperBound);
-     List<StructMethod> matches = getMatchedDescriptors();
-     StructMethod desc = null;
-     if(matches.size() == 1) desc = matches.get(0);
-+    //System.out.println("infer: " + instance + " " + classname + "." + name + " " + getExprType() + " " + upperBound + " " + desc);
- 
-     VarType type = getExprType();
- 
-@@ -403,15 +403,15 @@ public class InvocationExprent extends Exprent {
-     if(cl != null && cl.getSignature() != null && instance != null && instance.getInferredExprType(null).isGeneric()) {
-       GenericType genType = (GenericType)instance.getInferredExprType(null);
-       if(genType.getArguments().size() == cl.getSignature().fparameters.size()) {
--		/*System.out.println("remap: " + classname + "." + name);
--		if(instance instanceof FieldExprent) {
--			System.out.println(((FieldExprent)instance).getClassname() + "." + ((FieldExprent)instance).getName());
--		}*/
-+        /*System.out.println("remap: " + classname + "." + name + " " + genType);
-+        if(instance instanceof FieldExprent) {
-+            System.out.println(((FieldExprent)instance).getClassname() + "." + ((FieldExprent)instance).getName());
-+        }*/
-         for(int i = 0; i < cl.getSignature().fparameters.size(); i++) {
-           VarType from = GenericType.parse("T" + cl.getSignature().fparameters.get(i) + ";");
-           VarType to = genType.getArguments().get(i);
--          //System.out.println("(" + from.type + " " + from.value + " -> " + to.type + " " + to.value + ")");
--          if(from != null && to != null && to.type == CodeConstants.TYPE_OBJECT) {
-+          if(from != null && to != null /*&& to.type == CodeConstants.TYPE_OBJECT*/) {
-+            //System.out.println("(" + from.type + " " + from + " -> " + to.type + " " + to + ")");
-             genArgs.put(from, to);
-           }
-         }
-@@ -428,57 +428,65 @@ public class InvocationExprent extends Exprent {
-         TextBuffer buff = new TextBuffer();
-         boolean ambiguous = setAmbiguousParameters.get(i);
-         VarType type = descriptor.params[i];
--		VarType newType = null;
--        if(desc != null && desc.getSignature() != null && genericArgs.size() != 0 && desc.getSignature().params.size() == lstParameters.size()) {
-+        VarType newType = null;
-+        if(desc != null && desc.getSignature() != null && /*genericArgs.size() != 0 && */desc.getSignature().params.size() == lstParameters.size()) {
-           newType = desc.getSignature().params.get(i);
--          boolean free = false;
-+          /*boolean free = false;
-           for(String param : desc.getSignature().fparameters) {
-             if(param.equals(newType.value)) {
-               free = true;
-               break;
-             }
-           }
--          if(!free) {
-+
-+          if(!free) {*/
-             type = newType;
--          }
-+          //}
-         }
--        if(genArgs.containsKey(type)) {
-+        //System.out.println("check: " + type + " " + type.remap(genArgs) + " " + type.isGeneric() + " " + type.remap(genArgs).isGeneric());
-+        /*if(genArgs.containsKey(type)) {
-           type = genArgs.get(type);
-+        }*/
-+        VarType remappedType = type.remap(genArgs);
-+        if(type != remappedType) {
-+          type = remappedType;
-+        }
-+        else if(desc != null && desc.getSignature() != null && genericArgs.size() != 0) {
-+          Map<VarType, VarType> genMap = new HashMap<VarType, VarType>();
-+          for(int j = 0; j < genericArgs.size(); j++) {
-+            VarType from = GenericType.parse("T" + desc.getSignature().fparameters.get(j) + ";");
-+            VarType to = genericArgs.get(j);
-+            genMap.put(from, to);
-+            //System.out.println("map: (" + from + " -> " + to + ")");
-+          }
-+          type = type.remap(genMap);
-+          /*if(genMap.containsKey(type)) {
-+            type = genMap.get(type);
-+          }
-+          // this only checks 1 level deep right now
-+          else if(type.isGeneric()) {
-+            GenericType genType = (GenericType)type;
-+            List<VarType> toArgs = new ArrayList<VarType>();
-+            boolean changed = false;
-+            VarType parent = genType.getParent();
-+            if(genMap.containsKey(parent)) {
-+              parent = genMap.get(parent);
-+              changed = true;
-+            }
-+            for(VarType arg : genType.getArguments()) {
-+              if(genMap.containsKey(arg)) {
-+                toArgs.add(genMap.get(arg));
-+                changed = true;
-+              } else {
-+                toArgs.add(arg);
-+              }
-+            }
-+            System.out.println("gen: " + changed + " " + parent + " ");
-+            if(changed) {
-+              type = new GenericType(type.type, type.arrayDim, type.value, parent, toArgs, genType.getWildcard());
-+            }
-+          }*/
-         }
--		else if(desc != null && desc.getSignature() != null && genericArgs.size() != 0) {
--			Map<VarType, VarType> genMap = new HashMap<VarType, VarType>();
--			for(int j = 0; j < genericArgs.size(); j++) {
--				VarType from = GenericType.parse("T" + desc.getSignature().fparameters.get(j) + ";");
--				VarType to = genericArgs.get(j);
--				genMap.put(from, to);
--				//System.out.println("map: (" + from + " -> " + to + ")");
--			}
--			if(genMap.containsKey(type)) {
--				type = genMap.get(type);
--			}
--			// this only checks 1 level deep right now
--			else if(type.isGeneric()) {
--				GenericType genType = (GenericType)type;
--				List<VarType> toArgs = new ArrayList<VarType>();
--				boolean changed = false;
--				VarType parent = genType.getParent();
--				if(genMap.containsKey(parent)) {
--					parent = genMap.get(parent);
--					changed = true;
--				}
--				for(VarType arg : genType.getArguments()) {
--					if(genMap.containsKey(arg)) {
--						toArgs.add(genMap.get(arg));
--						changed = true;
--					} else {
--						toArgs.add(arg);
--					}
--				}
--				if(changed) {
--					type = new GenericType(type.type, type.arrayDim, type.value, parent, toArgs, genType.getWildcard());
--				}
--			}
--		}
-         /*if(desc != null && desc.getSignature() != null) {
-           for(String ps: desc.getSignature().fparameters) {
-             VarType param = GenericType.parse("T" + ps + ";");
-@@ -488,12 +496,12 @@ public class InvocationExprent extends Exprent {
-             }
-           }
-         }*/
--		VarType exprType = lstParameters.get(i).getInferredExprType(type);
--		if(exprType != null && exprType.type != CodeConstants.TYPE_NULL && type != null && type.type == CodeConstants.TYPE_GENVAR) {
--		  type = exprType;
--		}
--		//System.out.println("param: " + i + " " + newType + " " + exprType + " " + type + " " + lstParameters.get(i));
--        ExprProcessor.getCastedExprent(lstParameters.get(i), type, buff, indent, true, ambiguous, tracer);
-+        VarType exprType = lstParameters.get(i).getInferredExprType(type);
-+        if(exprType != null /*&& exprType.type != CodeConstants.TYPE_NULL*/ && type != null && type.type == CodeConstants.TYPE_GENVAR) {
-+          type = exprType;
-+        }
-+        //System.out.println("param: " + i + " " + newType + " " + exprType + " " + type + " " + lstParameters.get(i));
-+        ExprProcessor.getCastedExprent(lstParameters.get(i), type, buff, indent, type.type != CodeConstants.TYPE_NULL, ambiguous, tracer);
-         buf.append(buff);
- 
-         firstParameter = false;
-diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
-index af06b8e0d37763abcbabbca680dee2539831f978..81342ed8f18463360e9c31f77e5091aa68ec7cdb 100644
---- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
-+++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
-@@ -19,6 +19,8 @@ import org.jetbrains.java.decompiler.code.CodeConstants;
- import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
- import org.jetbrains.java.decompiler.util.InterpreterUtil;
- 
-+import java.util.Map;
-+
- public class VarType {  // TODO: optimize switch
- 
-   public static final VarType[] EMPTY_ARRAY = {};
-@@ -428,4 +430,11 @@ public class VarType {  // TODO: optimize switch
-         throw new IllegalArgumentException("Invalid type: " + c);
-     }
-   }
-+
-+  public VarType remap(Map<VarType, VarType> map) {
-+    if(map.containsKey(this)) {
-+      return map.get(this);
-+    }
-+    return this;
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-index 9319bf76366d189afd5bdb98b018c8e0425a58b0..9ad5a1fe83d6f2e43f257bad5982e1b524e9d3af 100644
---- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-@@ -23,6 +23,7 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
- import java.util.ArrayList;
- import java.util.Collections;
- import java.util.List;
-+import java.util.Map;
- 
- public class GenericType extends VarType {
- 
-@@ -326,16 +327,47 @@ public class GenericType extends VarType {
-   @Override
-   public String toString() {
-     StringBuilder buf = new StringBuilder();
--	switch(getWildcard()) {
-+    switch(getWildcard()) {
-       case GenericType.WILDCARD_EXTENDS:
-         buf.append("? extends ");
-         break;
-       case GenericType.WILDCARD_SUPER:
-         buf.append("? super ");
-       break;
--	}
--	buf.append(super.toString());
-+    }
-+    buf.append(super.toString());
-     buf.append(getTypeArguments());
--	return buf.toString();
-+    return buf.toString();
-+  }
-+
-+  @Override
-+  public VarType remap(Map<VarType, VarType> map) {
-+    VarType main = super.remap(map);
-+    if(main != this) {
-+      return main;
-+    }
-+    boolean changed = false;
-+    VarType parent = getParent();
-+    if(map.containsKey(parent)) {
-+      parent = map.get(parent);
-+      changed = true;
-+    }
-+    List<VarType> newArgs = new ArrayList<VarType>();
-+    for(VarType arg : getArguments()) {
-+      VarType newArg = null;
-+      if(arg != null) {
-+        newArg = arg.remap(map);
-+      }
-+      if(newArg != arg) {
-+        newArgs.add(newArg);
-+        changed = true;
-+      } else {
-+        newArgs.add(arg);
-+      }
-+    }
-+    if(changed) {
-+      return new GenericType(main.type, main.arrayDim, main.value, parent, newArgs, getWildcard());
-+    }
-+    return this;
-   }
- }
diff --git a/FernFlower-Patches/0082-handle-generic-lists-with-multiple-arguments-in-meth.patch b/FernFlower-Patches/0082-handle-generic-lists-with-multiple-arguments-in-meth.patch
deleted file mode 100644
index 1b5377a..0000000
--- a/FernFlower-Patches/0082-handle-generic-lists-with-multiple-arguments-in-meth.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: RainWarrior <rainwarrior@fry.su>
-Date: Wed, 14 Oct 2015 15:30:51 +0300
-Subject: [PATCH] handle generic lists with multiple arguments in method
- invocations
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 4c4b8981d0e7b3e12d7024e5dc7e05c31476ea8d..f98c822f58aa151185507a7fd7dc2cb0198f72b8 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-@@ -208,14 +208,19 @@ public class InvocationExprent extends Exprent {
-           List<VarType> leftArgs = ((GenericType)upperBound).getArguments();
-           List<VarType> rightArgs = ((GenericType)ret).getArguments();
-           List<String> fparams = desc.getSignature().fparameters;
--          // trivial case only for now
--          if(leftArgs.size() == 1 && rightArgs.size() == 1 && fparams.size() == 1) {
--            VarType l = leftArgs.get(0);
--            VarType r = rightArgs.get(0);
--            if(l != null /*&& l.type == CodeConstants.TYPE_OBJECT && !l.equals(r)*/ && r.value.equals(fparams.get(0))) {
--              genericArgs.add(leftArgs.get(0));
--              //type = upperBound;
--              System.out.println("4: " + leftArgs.get(0) + " " + rightArgs.get(0) + " " + fparams.get(0));
-+          if(leftArgs.size() == rightArgs.size() && rightArgs.size() == fparams.size()) {
-+            for(int i = 0; i < leftArgs.size(); i++) {
-+              VarType l = leftArgs.get(i);
-+              VarType r = rightArgs.get(i);
-+              if(l != null /*&& l.type == CodeConstants.TYPE_OBJECT && !l.equals(r)*/ && r.value.equals(fparams.get(i))) {
-+                genericArgs.add(l);
-+                //type = upperBound;
-+                System.out.println("4: " + i + " " + l + " " + r + " " + fparams.get(i));
-+              }
-+              else {
-+                genericArgs.clear();
-+                break;
-+              }
-             }
-           }
-         }
diff --git a/FernFlower-Patches/0083-using-the-generic-info-from-InvocationExprent-correc.patch b/FernFlower-Patches/0083-using-the-generic-info-from-InvocationExprent-correc.patch
deleted file mode 100644
index 3ce1b81..0000000
--- a/FernFlower-Patches/0083-using-the-generic-info-from-InvocationExprent-correc.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: RainWarrior <rainwarrior@fry.su>
-Date: Thu, 15 Oct 2015 01:00:20 +0300
-Subject: [PATCH] using the generic info from InvocationExprent correctly, 1
- more error down
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index f98c822f58aa151185507a7fd7dc2cb0198f72b8..b2c3574dec9dcc67e8af5c94c4f2e6c2cb078214 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-@@ -174,59 +174,67 @@ public class InvocationExprent extends Exprent {
- 
-     VarType type = getExprType();
- 
--    List<VarType> toAdd = new ArrayList<VarType>();
--    if(upperBound != null/* && upperBound.type == CodeConstants.TYPE_OBJECT && descriptor.ret.type == CodeConstants.TYPE_OBJECT*/) {
--      genericArgs.clear();
--      //System.out.println("0: " + isStatic + " " + desc + " " + upperBound + " " + descriptor.ret + " " + upperBound.isGeneric());
--      /*if(desc == null) {
--        // more harn than gain
--        // Object -> String
--        if(descriptor.ret.value.equals("java/lang/Object") && !descriptor.ret.equals(upperBound)) {
--          genericArgs.add(upperBound);
--          System.out.println("1: " + upperBound + " " + descriptor.ret);
--        }
--        // List -> List<String>
--        if(upperBound.isGeneric()) {
--          List<VarType> leftArgs = ((GenericType)upperBound).getArguments();
--          //System.out.println("22: " + upperBound + " " + leftArgs.get(0));
--          if(leftArgs.size() == 1 && descriptor.ret.equals(upperBound) && leftArgs.get(0).type == CodeConstants.TYPE_OBJECT) {
--            genericArgs.add(leftArgs.get(0));
--            System.out.println("2: " + upperBound.type + " " + upperBound + " " + leftArgs.get(0).type + " " + leftArgs.get(0));
--          }
-+    genericArgs.clear();
-+
-+    //System.out.println("0: " + isStatic + " " + desc + " " + upperBound + " " + descriptor.ret + " " + upperBound.isGeneric());
-+    /*if(desc == null) {
-+      // more harn than gain
-+      // Object -> String
-+      if(descriptor.ret.value.equals("java/lang/Object") && !descriptor.ret.equals(upperBound)) {
-+        genericArgs.add(upperBound);
-+        System.out.println("1: " + upperBound + " " + descriptor.ret);
-+      }
-+      // List -> List<String>
-+      if(upperBound.isGeneric()) {
-+        List<VarType> leftArgs = ((GenericType)upperBound).getArguments();
-+        //System.out.println("22: " + upperBound + " " + leftArgs.get(0));
-+        if(leftArgs.size() == 1 && descriptor.ret.equals(upperBound) && leftArgs.get(0).type == CodeConstants.TYPE_OBJECT) {
-+          genericArgs.add(leftArgs.get(0));
-+          System.out.println("2: " + upperBound.type + " " + upperBound + " " + leftArgs.get(0).type + " " + leftArgs.get(0));
-         }
-+      }
-+    }*/
-+    if(desc != null && desc.getSignature() != null) {
-+      VarType ret = desc.getSignature().ret;
-+      Map<VarType, VarType> map = new HashMap<VarType, VarType>();
-+      // more harm than gain
-+      // T -> String
-+      /*if(upperBound != null && desc.getSignature().fparameters.size() == 1 && desc.getSignature().fparameters.get(0).equals(ret.value)) {
-+        genericArgs.add(upperBound);
-+        System.out.println("3: " + upperBound + " " + ret + " " + desc.getSignature().fparameters.get(0));
-       }*/
--      if(desc != null && desc.getSignature() != null) {
--        VarType ret = desc.getSignature().ret;
--        // more harm than gain
--        // T -> String
--        /*if(desc.getSignature().fparameters.size() == 1 && desc.getSignature().fparameters.get(0).equals(ret.value)) {
--          genericArgs.add(upperBound);
--          System.out.println("3: " + upperBound + " " + ret + " " + desc.getSignature().fparameters.get(0));
--        }*/
--        // List<T> -> List<String>
--        if(upperBound.isGeneric() && ret.isGeneric()) {
--          List<VarType> leftArgs = ((GenericType)upperBound).getArguments();
--          List<VarType> rightArgs = ((GenericType)ret).getArguments();
--          List<String> fparams = desc.getSignature().fparameters;
--          if(leftArgs.size() == rightArgs.size() && rightArgs.size() == fparams.size()) {
--            for(int i = 0; i < leftArgs.size(); i++) {
--              VarType l = leftArgs.get(i);
--              VarType r = rightArgs.get(i);
--              if(l != null /*&& l.type == CodeConstants.TYPE_OBJECT && !l.equals(r)*/ && r.value.equals(fparams.get(i))) {
--                genericArgs.add(l);
--                //type = upperBound;
--                System.out.println("4: " + i + " " + l + " " + r + " " + fparams.get(i));
--              }
--              else {
--                genericArgs.clear();
--                break;
--              }
-+      // List<T> -> List<String>
-+      if(upperBound != null && upperBound.isGeneric() && ret.isGeneric()) {
-+        List<VarType> leftArgs = ((GenericType)upperBound).getArguments();
-+        List<VarType> rightArgs = ((GenericType)ret).getArguments();
-+        List<String> fparams = desc.getSignature().fparameters;
-+        if(leftArgs.size() == rightArgs.size() && rightArgs.size() == fparams.size()) {
-+          for(int i = 0; i < leftArgs.size(); i++) {
-+            VarType l = leftArgs.get(i);
-+            VarType r = rightArgs.get(i);
-+            if(l != null /*&& l.type == CodeConstants.TYPE_OBJECT && !l.equals(r)*/ && r.value.equals(fparams.get(i))) {
-+              genericArgs.add(l);
-+              map.put(r, l);
-+              System.out.println("4: " + i + " " + l + " " + r + " " + fparams.get(i));
-+            }
-+            else {
-+              genericArgs.clear();
-+              map.clear();
-+              break;
-             }
-           }
-         }
-       }
--    }
- 
-+      //System.out.println("infer map: "+ ret + " -> " + ret.remap(map));
-+
-+      if(!map.isEmpty()) {
-+        // remap and return generic type
-+        VarType newType = ret.remap(map);
-+        if(ret != newType) return newType;
-+      }
-+      return ret;
-+    }
-     return type;
-   }
-   @Override
-@@ -505,7 +513,7 @@ public class InvocationExprent extends Exprent {
-         if(exprType != null /*&& exprType.type != CodeConstants.TYPE_NULL*/ && type != null && type.type == CodeConstants.TYPE_GENVAR) {
-           type = exprType;
-         }
--        //System.out.println("param: " + i + " " + newType + " " + exprType + " " + type + " " + lstParameters.get(i));
-+        //System.out.println("param: " + i + " " + exprType + " " + type + " " + lstParameters.get(i));
-         ExprProcessor.getCastedExprent(lstParameters.get(i), type, buff, indent, type.type != CodeConstants.TYPE_NULL, ambiguous, tracer);
-         buf.append(buff);
- 
diff --git a/FernFlower-Patches/0084-Itterator-enchanced-for-loops-can-also-have-a-copy-i.patch b/FernFlower-Patches/0084-Itterator-enchanced-for-loops-can-also-have-a-copy-i.patch
deleted file mode 100644
index f9f4a41..0000000
--- a/FernFlower-Patches/0084-Itterator-enchanced-for-loops-can-also-have-a-copy-i.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Wed, 14 Oct 2015 16:07:14 -0700
-Subject: [PATCH] Itterator enchanced for loops can also have a 'copy'
- instruction, so detect those as well.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-index c240daa740a7766b1541dc8aea73025cb9486ac7..d0158aba3e732e854494bfbe80b128f47a70fc24 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-@@ -491,6 +491,18 @@ public class MergeHelper {
-         stat.setIncExprent(holder.getInstance());
-         preData.getExprents().remove(initExprents[0]);
-         firstData.getExprents().remove(firstDoExprent);
-+
-+        if (initExprents[1] != null && initExprents[1].getLeft().type == Exprent.EXPRENT_VAR &&
-+            holder.getInstance().type == Exprent.EXPRENT_VAR) {
-+          VarExprent copy = (VarExprent)initExprents[1].getLeft();
-+          VarExprent inc = (VarExprent)holder.getInstance();
-+          if (copy.getIndex() == inc.getIndex() && copy.getVersion() == inc.getVersion() && !ExprentUtil.isVarReferenced(inc, stat, copy)) {
-+            preData.getExprents().remove(initExprents[1]);
-+            initExprents[1].getRight().addBytecodeOffsets(initExprents[1].bytecode);
-+            initExprents[1].getRight().addBytecodeOffsets(stat.getIncExprent().bytecode);
-+            stat.setIncExprent(initExprents[1].getRight());
-+          }
-+        }
-         return true;
-       }
-       else if (initExprents[0] != null && initExprents[1] != null && firstDoExprent != null) {
diff --git a/FernFlower-Patches/0085-Be-a-bit-more-strict-in-detecting-copy-var-usage.patch b/FernFlower-Patches/0085-Be-a-bit-more-strict-in-detecting-copy-var-usage.patch
deleted file mode 100644
index 585e443..0000000
--- a/FernFlower-Patches/0085-Be-a-bit-more-strict-in-detecting-copy-var-usage.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Wed, 14 Oct 2015 16:40:04 -0700
-Subject: [PATCH] Be a bit more strict in detecting copy var usage.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-index d0158aba3e732e854494bfbe80b128f47a70fc24..3025737508432bebbbd645908852f93d44dd384f 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
-@@ -496,7 +496,7 @@ public class MergeHelper {
-             holder.getInstance().type == Exprent.EXPRENT_VAR) {
-           VarExprent copy = (VarExprent)initExprents[1].getLeft();
-           VarExprent inc = (VarExprent)holder.getInstance();
--          if (copy.getIndex() == inc.getIndex() && copy.getVersion() == inc.getVersion() && !ExprentUtil.isVarReferenced(inc, stat, copy)) {
-+          if (copy.getIndex() == inc.getIndex() && copy.getVersion() == inc.getVersion() && !ExprentUtil.isVarReferenced(inc, stat.getTopParent(), copy)) {
-             preData.getExprents().remove(initExprents[1]);
-             initExprents[1].getRight().addBytecodeOffsets(initExprents[1].bytecode);
-             initExprents[1].getRight().addBytecodeOffsets(stat.getIncExprent().bytecode);
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
-index f71ed84bc4ad195a97b4c535f21b55a9568cac62..686001d878d4204c439e6a4b6d140c155eadbb97 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
-@@ -837,6 +837,14 @@ public class Statement implements IMatchable {
-     this.parent = parent;
-   }
- 
-+  public Statement getTopParent() {
-+    Statement ret = this;
-+    while (ret.getParent() != null) {
-+      ret = ret.getParent();
-+    }
-+    return ret;
-+  }
-+
-   public HashSet<StatEdge> getLabelEdges() {  // FIXME: why HashSet?
-     return labelEdges;
-   }
diff --git a/FernFlower-Patches/0089-cleanup-of-InvocationExprent-changes.patch b/FernFlower-Patches/0089-cleanup-of-InvocationExprent-changes.patch
deleted file mode 100644
index d3a2ca6..0000000
--- a/FernFlower-Patches/0089-cleanup-of-InvocationExprent-changes.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: RainWarrior <rainwarrior@fry.su>
-Date: Fri, 16 Oct 2015 02:06:25 +0300
-Subject: [PATCH] cleanup of InvocationExprent changes
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index b2c3574dec9dcc67e8af5c94c4f2e6c2cb078214..e6152070d2b155d98fc0b8155db12c12ca3864e0 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-@@ -170,30 +170,11 @@ public class InvocationExprent extends Exprent {
-     List<StructMethod> matches = getMatchedDescriptors();
-     StructMethod desc = null;
-     if(matches.size() == 1) desc = matches.get(0);
--    //System.out.println("infer: " + instance + " " + classname + "." + name + " " + getExprType() + " " + upperBound + " " + desc);
- 
-     VarType type = getExprType();
- 
-     genericArgs.clear();
- 
--    //System.out.println("0: " + isStatic + " " + desc + " " + upperBound + " " + descriptor.ret + " " + upperBound.isGeneric());
--    /*if(desc == null) {
--      // more harn than gain
--      // Object -> String
--      if(descriptor.ret.value.equals("java/lang/Object") && !descriptor.ret.equals(upperBound)) {
--        genericArgs.add(upperBound);
--        System.out.println("1: " + upperBound + " " + descriptor.ret);
--      }
--      // List -> List<String>
--      if(upperBound.isGeneric()) {
--        List<VarType> leftArgs = ((GenericType)upperBound).getArguments();
--        //System.out.println("22: " + upperBound + " " + leftArgs.get(0));
--        if(leftArgs.size() == 1 && descriptor.ret.equals(upperBound) && leftArgs.get(0).type == CodeConstants.TYPE_OBJECT) {
--          genericArgs.add(leftArgs.get(0));
--          System.out.println("2: " + upperBound.type + " " + upperBound + " " + leftArgs.get(0).type + " " + leftArgs.get(0));
--        }
--      }
--    }*/
-     if(desc != null && desc.getSignature() != null) {
-       VarType ret = desc.getSignature().ret;
-       Map<VarType, VarType> map = new HashMap<VarType, VarType>();
-@@ -201,7 +182,6 @@ public class InvocationExprent extends Exprent {
-       // T -> String
-       /*if(upperBound != null && desc.getSignature().fparameters.size() == 1 && desc.getSignature().fparameters.get(0).equals(ret.value)) {
-         genericArgs.add(upperBound);
--        System.out.println("3: " + upperBound + " " + ret + " " + desc.getSignature().fparameters.get(0));
-       }*/
-       // List<T> -> List<String>
-       if(upperBound != null && upperBound.isGeneric() && ret.isGeneric()) {
-@@ -212,10 +192,9 @@ public class InvocationExprent extends Exprent {
-           for(int i = 0; i < leftArgs.size(); i++) {
-             VarType l = leftArgs.get(i);
-             VarType r = rightArgs.get(i);
--            if(l != null /*&& l.type == CodeConstants.TYPE_OBJECT && !l.equals(r)*/ && r.value.equals(fparams.get(i))) {
-+            if(l != null && r.value.equals(fparams.get(i))) {
-               genericArgs.add(l);
-               map.put(r, l);
--              System.out.println("4: " + i + " " + l + " " + r + " " + fparams.get(i));
-             }
-             else {
-               genericArgs.clear();
-@@ -226,8 +205,6 @@ public class InvocationExprent extends Exprent {
-         }
-       }
- 
--      //System.out.println("infer map: "+ ret + " -> " + ret.remap(map));
--
-       if(!map.isEmpty()) {
-         // remap and return generic type
-         VarType newType = ret.remap(map);
-@@ -237,6 +214,7 @@ public class InvocationExprent extends Exprent {
-     }
-     return type;
-   }
-+
-   @Override
-   public CheckTypesResult checkExprTypeBounds() {
-     CheckTypesResult result = new CheckTypesResult();
-@@ -413,18 +391,14 @@ public class InvocationExprent extends Exprent {
-     StructClass cl = DecompilerContext.getStructContext().getClass(classname);
-     Map<VarType, VarType> genArgs = new HashMap<VarType, VarType>();
- 
-+    // building generic info from the instance
-     if(cl != null && cl.getSignature() != null && instance != null && instance.getInferredExprType(null).isGeneric()) {
-       GenericType genType = (GenericType)instance.getInferredExprType(null);
-       if(genType.getArguments().size() == cl.getSignature().fparameters.size()) {
--        /*System.out.println("remap: " + classname + "." + name + " " + genType);
--        if(instance instanceof FieldExprent) {
--            System.out.println(((FieldExprent)instance).getClassname() + "." + ((FieldExprent)instance).getName());
--        }*/
-         for(int i = 0; i < cl.getSignature().fparameters.size(); i++) {
-           VarType from = GenericType.parse("T" + cl.getSignature().fparameters.get(i) + ";");
-           VarType to = genType.getArguments().get(i);
--          if(from != null && to != null /*&& to.type == CodeConstants.TYPE_OBJECT*/) {
--            //System.out.println("(" + from.type + " " + from + " -> " + to.type + " " + to + ")");
-+          if(from != null && to != null) {
-             genArgs.put(from, to);
-           }
-         }
-@@ -441,79 +415,30 @@ public class InvocationExprent extends Exprent {
-         TextBuffer buff = new TextBuffer();
-         boolean ambiguous = setAmbiguousParameters.get(i);
-         VarType type = descriptor.params[i];
--        VarType newType = null;
--        if(desc != null && desc.getSignature() != null && /*genericArgs.size() != 0 && */desc.getSignature().params.size() == lstParameters.size()) {
--          newType = desc.getSignature().params.get(i);
--          /*boolean free = false;
--          for(String param : desc.getSignature().fparameters) {
--            if(param.equals(newType.value)) {
--              free = true;
--              break;
--            }
--          }
--
--          if(!free) {*/
--            type = newType;
--          //}
-+        // using info from the generic signature
-+        if(desc != null && desc.getSignature() != null && desc.getSignature().params.size() == lstParameters.size()) {
-+          type = desc.getSignature().params.get(i);
-         }
--        //System.out.println("check: " + type + " " + type.remap(genArgs) + " " + type.isGeneric() + " " + type.remap(genArgs).isGeneric());
--        /*if(genArgs.containsKey(type)) {
--          type = genArgs.get(type);
--        }*/
-+        // applying generic info from the signature
-         VarType remappedType = type.remap(genArgs);
-         if(type != remappedType) {
-           type = remappedType;
-         }
-+        // and from the inferred generic arguments
-         else if(desc != null && desc.getSignature() != null && genericArgs.size() != 0) {
-           Map<VarType, VarType> genMap = new HashMap<VarType, VarType>();
-           for(int j = 0; j < genericArgs.size(); j++) {
-             VarType from = GenericType.parse("T" + desc.getSignature().fparameters.get(j) + ";");
-             VarType to = genericArgs.get(j);
-             genMap.put(from, to);
--            //System.out.println("map: (" + from + " -> " + to + ")");
-           }
-           type = type.remap(genMap);
--          /*if(genMap.containsKey(type)) {
--            type = genMap.get(type);
--          }
--          // this only checks 1 level deep right now
--          else if(type.isGeneric()) {
--            GenericType genType = (GenericType)type;
--            List<VarType> toArgs = new ArrayList<VarType>();
--            boolean changed = false;
--            VarType parent = genType.getParent();
--            if(genMap.containsKey(parent)) {
--              parent = genMap.get(parent);
--              changed = true;
--            }
--            for(VarType arg : genType.getArguments()) {
--              if(genMap.containsKey(arg)) {
--                toArgs.add(genMap.get(arg));
--                changed = true;
--              } else {
--                toArgs.add(arg);
--              }
--            }
--            System.out.println("gen: " + changed + " " + parent + " ");
--            if(changed) {
--              type = new GenericType(type.type, type.arrayDim, type.value, parent, toArgs, genType.getWildcard());
--            }
--          }*/
-         }
--        /*if(desc != null && desc.getSignature() != null) {
--          for(String ps: desc.getSignature().fparameters) {
--            VarType param = GenericType.parse("T" + ps + ";");
--            if(param.equals(type)) { // found free argument, need to infer it from the argument
--              type = lstParameters.get(i).getExprType();
--              break;
--            }
--          }
--        }*/
-+        // not passing it along if what we get back is more specific
-         VarType exprType = lstParameters.get(i).getInferredExprType(type);
--        if(exprType != null /*&& exprType.type != CodeConstants.TYPE_NULL*/ && type != null && type.type == CodeConstants.TYPE_GENVAR) {
-+        if(exprType != null && type != null && type.type == CodeConstants.TYPE_GENVAR) {
-           type = exprType;
-         }
--        //System.out.println("param: " + i + " " + exprType + " " + type + " " + lstParameters.get(i));
-         ExprProcessor.getCastedExprent(lstParameters.get(i), type, buff, indent, type.type != CodeConstants.TYPE_NULL, ambiguous, tracer);
-         buf.append(buff);
- 
-@@ -530,7 +455,6 @@ public class InvocationExprent extends Exprent {
-     List<StructMethod> matches = new ArrayList<StructMethod>();
- 
-     StructClass cl = DecompilerContext.getStructContext().getClass(classname);
--    //System.out.println("m: " + classname + "." + name + " " + cl);
-     if (cl == null) return matches;
- 
-     nextMethod:
diff --git a/FernFlower-Patches/0091-Fix-constants-with-trailing-zeros-and-incorrect-type.patch b/FernFlower-Patches/0091-Fix-constants-with-trailing-zeros-and-incorrect-type.patch
deleted file mode 100644
index c9ac86f..0000000
--- a/FernFlower-Patches/0091-Fix-constants-with-trailing-zeros-and-incorrect-type.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Sat, 17 Oct 2015 00:50:20 -0400
-Subject: [PATCH] Fix constants with trailing zeros and incorrect types.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-index 3398924fabb57daddb0f6b51daafdd266cc371b6..0fc40559457cfc425bced3a536b862a963a466e5 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-@@ -182,16 +182,16 @@ public class ConstExprent extends Exprent {
-           String doublefield;
-           if (literal) {
-             if (Double.isNaN(dval)) {
--              return new TextBuffer("0.0D / 0.0");
-+              return new TextBuffer("0.0D / 0.0D");
-             }
-             else if (dval == Double.POSITIVE_INFINITY) {
--              return new TextBuffer("1.0D / 0.0");
-+              return new TextBuffer("1.0D / 0.0D");
-             }
-             else if (dval == Double.NEGATIVE_INFINITY) {
--              return new TextBuffer("-1.0D / 0.0");
-+              return new TextBuffer("-1.0D / 0.0D");
-             }
-             else {
--              return new TextBuffer(value.toString()).append("D");
-+              return new TextBuffer(trimZeros(value.toString())).append("D");
-             }
-           }
-           else if (Double.isNaN(dval)) {
-@@ -219,16 +219,16 @@ public class ConstExprent extends Exprent {
-           String floatfield;
-           if (literal) {
-             if (Double.isNaN(fval)) {
--              return new TextBuffer("0.0F / 0.0");
-+              return new TextBuffer("0.0F / 0.0F");
-             }
-             else if (fval == Double.POSITIVE_INFINITY) {
--              return new TextBuffer("1.0F / 0.0");
-+              return new TextBuffer("1.0F / 0.0F");
-             }
-             else if (fval == Double.NEGATIVE_INFINITY) {
--              return new TextBuffer("-1.0F / 0.0");
-+              return new TextBuffer("-1.0F / 0.0F");
-             }
-             else {
--              return new TextBuffer(value.toString()).append("F");
-+              return new TextBuffer(trimZeros(value.toString())).append("F");
-             }
-           }
-           else if (Float.isNaN(fval)) {
diff --git a/FernFlower-Patches/0093-Version-2.0.patch b/FernFlower-Patches/0093-Version-2.0.patch
deleted file mode 100644
index 1958b85..0000000
--- a/FernFlower-Patches/0093-Version-2.0.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Sat, 17 Oct 2015 01:11:19 -0400
-Subject: [PATCH] Version 2.0
-
-
-diff --git a/build.gradle b/build.gradle
-index 4ba85eec08fc56b667cb9d690a9ef46b8c389c82..5e14c2528a26cc50323d2d408cd16c2506d6b6c1 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -3,7 +3,7 @@ apply plugin: 'idea'
- apply plugin: 'maven'
- apply plugin: 'java'
- 
--version = "1.0"
-+version = "2.0"
- group = "net.minecraftforge" //not sure if we shoulkd publish under this name, but it's our fork so meh
- archivesBaseName = "fernflower"
- 
diff --git a/FernFlower-Patches/0094-Fixed-invalid-reference-to-ASM.-Oops.patch b/FernFlower-Patches/0094-Fixed-invalid-reference-to-ASM.-Oops.patch
deleted file mode 100644
index 515dde9..0000000
--- a/FernFlower-Patches/0094-Fixed-invalid-reference-to-ASM.-Oops.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Mon, 19 Oct 2015 18:50:25 -0700
-Subject: [PATCH] Fixed invalid reference to ASM.. Oops..
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 1e69d8d4c01f89a1703a8e40424e8cb3c4ba62d3..3975d8cf93f8a2ce22b57ca3a666f3be77b5dcb4 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-@@ -43,8 +43,6 @@ import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
- import org.jetbrains.java.decompiler.util.InterpreterUtil;
- 
--import com.sun.xml.internal.ws.org.objectweb.asm.Opcodes;
--
- import java.util.*;
- import java.util.Map.Entry;
- 
-@@ -135,7 +133,7 @@ public class NestedClassProcessor {
-       return;
-     }
- 
--    final int STATIC_FINAL_SYNTHETIC = Opcodes.ACC_STATIC | Opcodes.ACC_FINAL | Opcodes.ACC_SYNTHETIC;
-+    final int STATIC_FINAL_SYNTHETIC = CodeConstants.ACC_STATIC | CodeConstants.ACC_FINAL | CodeConstants.ACC_SYNTHETIC;
-     Set<String> potentialFields = new HashSet<String>();
-     for (StructField fd : node.classStruct.getFields()) {
-       if ((fd.getAccessFlags() & STATIC_FINAL_SYNTHETIC) == STATIC_FINAL_SYNTHETIC && "[I".equals(fd.getDescriptor())) {
diff --git a/FernFlower-Patches/0095-Fixed-potential-NPE-in-lvt-propogation.patch b/FernFlower-Patches/0095-Fixed-potential-NPE-in-lvt-propogation.patch
deleted file mode 100644
index 4ec7430..0000000
--- a/FernFlower-Patches/0095-Fixed-potential-NPE-in-lvt-propogation.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Mon, 19 Oct 2015 18:51:10 -0700
-Subject: [PATCH] Fixed potential NPE in lvt propogation.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 0427e3b329d4599d42ef5f8ac35fd84581c5f8c6..aee11f60aab5e1f790a607e78675ba23f774fb47 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-@@ -434,7 +434,10 @@ public class VarDefinitionHelper {
-     }
- 
-     for (VarType var : md.params) {
--      types.put(new VarVersionPair(index, 0), varproc.getLVT().getCandidates(index).get(0));
-+      List<LVTVariable> vars = varproc.getLVT().getCandidates(index);
-+      if (vars != null) {
-+        types.put(new VarVersionPair(index, 0), vars.get(0));
-+      }
-       index += var.stackSize;
-     }
- 
diff --git a/FernFlower-Patches/0096-Fixed-nested-inner-generic-type-printing.patch b/FernFlower-Patches/0096-Fixed-nested-inner-generic-type-printing.patch
deleted file mode 100644
index da5dfc5..0000000
--- a/FernFlower-Patches/0096-Fixed-nested-inner-generic-type-printing.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Mon, 19 Oct 2015 18:51:39 -0700
-Subject: [PATCH] Fixed nested inner generic type printing.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-index 9ad5a1fe83d6f2e43f257bad5982e1b524e9d3af..9b111e572b474328818f044002d50dc22e946c5c 100644
---- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
-@@ -280,7 +280,7 @@ public class GenericType extends VarType {
-       clsName = DecompilerContext.getImportCollector().getShortName(value.replace('/', '.'));
-     }
-     else if (parent.isGeneric()) {
--      clsName = ((GenericType)parent).getCastName() + "." + value.substring(value.lastIndexOf('.') + 1);
-+      clsName = ((GenericType)parent).getCastName() + "." + value.substring(parent.value.length() + 1);
-     }
-     else {
-       clsName = DecompilerContext.getImportCollector().getShortName(parent.value.replace('/', '.')) + "." + value.substring(value.lastIndexOf('.') + 1);
diff --git a/FernFlower-Patches/0098-Fixed-var-merging-not-propogating-type-data-to-var-d.patch b/FernFlower-Patches/0098-Fixed-var-merging-not-propogating-type-data-to-var-d.patch
deleted file mode 100644
index fe4c505..0000000
--- a/FernFlower-Patches/0098-Fixed-var-merging-not-propogating-type-data-to-var-d.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Tue, 20 Oct 2015 04:04:12 -0700
-Subject: [PATCH] Fixed var merging not propogating type data to var
- definitions.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index aee11f60aab5e1f790a607e78675ba23f774fb47..520b951dd96e4cc70a1800af58aa7a9b43ac1d9f 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-@@ -757,6 +757,18 @@ public class VarDefinitionHelper {
-           if (from.var == var.getIndex() && from.version == var.getVersion()) {
-             itr.remove();
-           }
-+          else if (to.var == var.getIndex() && to.version == var.getVersion()) {
-+            Map<VarVersionPair, VarType> mapExprentMinTypes = varproc.getVarVersions().getTypeProcessor().getMapExprentMinTypes();
-+            Map<VarVersionPair, VarType> mapExprentMaxTypes = varproc.getVarVersions().getTypeProcessor().getMapExprentMaxTypes();
-+            VarType merged = getMergedType(mapExprentMinTypes.get(from), mapExprentMinTypes.get(to),
-+                                           mapExprentMaxTypes.get(from), mapExprentMaxTypes.get(to));
-+
-+            if (merged == null) { // Something went wrong.. This SHOULD be non-null
-+              continue;
-+            }
-+
-+            var.setVarType(merged);
-+          }
-         }
-       }
-     }
-@@ -785,7 +797,7 @@ public class VarDefinitionHelper {
- 
-           ConstExprent right = (ConstExprent)ass.getRight();
-           if (right.getConstType() == VarType.VARTYPE_NULL) {
--              continue;
-+            continue;
-           }
-           VarType merged = getMergedType(mapExprentMinTypes.get(from), mapExprentMinTypes.get(to),
-                                          mapExprentMaxTypes.get(from), mapExprentMaxTypes.get(to));
-@@ -865,7 +877,7 @@ public class VarDefinitionHelper {
-   }
-   private static class VPPEntry extends SimpleEntry<VarVersionPair, VarVersionPair> {
-     public VPPEntry(VarExprent key, VarVersionPair value) {
--        super(new VarVersionPair(key), value);
-+      super(new VarVersionPair(key), value);
-     }
-   }
- }
-\ No newline at end of file
diff --git a/FernFlower-Patches/0099-Snapshots-because-we-might-be-doing-a-bit-more-work-.patch b/FernFlower-Patches/0099-Snapshots-because-we-might-be-doing-a-bit-more-work-.patch
deleted file mode 100644
index 1237cc1..0000000
--- a/FernFlower-Patches/0099-Snapshots-because-we-might-be-doing-a-bit-more-work-.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Tue, 20 Oct 2015 19:20:44 -0400
-Subject: [PATCH] Snapshots because we might be doing a bit more work yet
-
-
-diff --git a/build.gradle b/build.gradle
-index 5e14c2528a26cc50323d2d408cd16c2506d6b6c1..bc211f2219fbcef72a0acca7b79f5c41fcf0affa 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -3,7 +3,7 @@ apply plugin: 'idea'
- apply plugin: 'maven'
- apply plugin: 'java'
- 
--version = "2.0"
-+version = "2.0-SNAPSHOT"
- group = "net.minecraftforge" //not sure if we shoulkd publish under this name, but it's our fork so meh
- archivesBaseName = "fernflower"
- 
diff --git a/FernFlower-Patches/0100-Sort-some-blocks-that-are-itterated-in-hash-sets-in-.patch b/FernFlower-Patches/0100-Sort-some-blocks-that-are-itterated-in-hash-sets-in-.patch
deleted file mode 100644
index 4c3c9ce..0000000
--- a/FernFlower-Patches/0100-Sort-some-blocks-that-are-itterated-in-hash-sets-in-.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Tue, 20 Oct 2015 16:37:32 -0700
-Subject: [PATCH] Sort some blocks that are itterated in hash sets in Finally
- Processor. SHOULD stabelize SOME of the finally's in decompiles.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
-index 9f1c11b318b128a3bf8dc17e3a6d343ef07800d7..ee8d4cee6cbb439907fb9d9c3f7f61a1b068b70f 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
-@@ -579,10 +579,17 @@ public class FinallyProcessor {
-     // so remove dummy exit
-     startBlocks.remove(graph.getLast());
-     startBlocks.removeAll(tryBlocks);
-+    List<BasicBlock> starts = new ArrayList<BasicBlock>(startBlocks);
-+    Collections.sort(starts, new Comparator<BasicBlock>() {
-+      @Override
-+      public int compare(BasicBlock o1, BasicBlock o2) {
-+          return o2.id - o1.id;
-+      }
-+    });
- 
-     List<Area> lstAreas = new ArrayList<Area>();
- 
--    for (BasicBlock start : startBlocks) {
-+    for (BasicBlock start : starts) {
- 
-       Area arr = compareSubgraphsEx(graph, start, catchBlocks, first, finallytype, mapLast, skippedFirst);
-       if (arr == null) {
-@@ -606,7 +613,15 @@ public class FinallyProcessor {
-     //		} catch(Exception ex){ex.printStackTrace();}
- 
-     // INFO: empty basic blocks may remain in the graph!
--    for (Entry<BasicBlock, Boolean> entry : mapLast.entrySet()) {
-+    List<Entry<BasicBlock, Boolean>> lasts = new ArrayList<Entry<BasicBlock, Boolean>>(mapLast.entrySet());
-+    // We must sort here to prevent decompile differences deriving from hash maps.
-+    Collections.sort(lasts, new Comparator<Entry<BasicBlock, Boolean>>() {
-+      @Override
-+      public int compare(Entry<BasicBlock, Boolean> o1, Entry<BasicBlock, Boolean> o2) {
-+        return o1.getKey().id - o2.getKey().id;
-+      }
-+    });
-+    for (Entry<BasicBlock, Boolean> entry : lasts) {
-       BasicBlock last = entry.getKey();
- 
-       if (entry.getValue()) {
diff --git a/FernFlower-Patches/0101-Fixed-switch-cases-leaking-variables-incorrectly.patch b/FernFlower-Patches/0101-Fixed-switch-cases-leaking-variables-incorrectly.patch
deleted file mode 100644
index a268f97..0000000
--- a/FernFlower-Patches/0101-Fixed-switch-cases-leaking-variables-incorrectly.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Thu, 22 Oct 2015 16:14:59 -0700
-Subject: [PATCH] Fixed switch cases leaking variables incorrectly.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 520b951dd96e4cc70a1800af58aa7a9b43ac1d9f..726edd7aeab41647414952e0a0a6c8cb52674816 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-@@ -648,6 +648,9 @@ public class VarDefinitionHelper {
-               if (obj == stat.getFirst()) {
-                 leaked.putAll(leaked_n); //First is outside the scope so leak!
-               }
-+              else {
-+                leaked_n.clear();
-+              }
-             }
-             else if (stat.type == Statement.TYPE_TRYCATCH ||
-                      stat.type == Statement.TYPE_CATCHALL) {
diff --git a/FernFlower-Patches/0103-Bulk-test-for-MC.patch b/FernFlower-Patches/0103-Bulk-test-for-MC.patch
deleted file mode 100644
index 64c2b4a..0000000
--- a/FernFlower-Patches/0103-Bulk-test-for-MC.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Sun, 25 Oct 2015 10:29:37 -0400
-Subject: [PATCH] Bulk test for MC
-
-
-diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
-index f2c344a925dda9d1081aa867987147fd3fb3664e..77eda8797ac72262d0c6dabbbd06a0ed0f481596 100644
---- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
-+++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
-@@ -46,23 +46,26 @@ public class DecompilerTestFixture {
-     assertTrue("current dir: " + new File("").getAbsolutePath(), isTestDataDir(testDataDir));
- 
-     //noinspection SSBasedInspection
--    tempDir = File.createTempFile("decompiler_test_", "_dir");
--    assertTrue(tempDir.delete());
--
-+    tempDir = getRandomDir();
-+    if (tempDir.exists()) tempDir.delete();
-     targetDir = new File(tempDir, "decompiled");
--    assertTrue(targetDir.mkdirs());
-+    targetDir.mkdirs();
-     decompiler = new ConsoleDecompiler(this.targetDir, new HashMap<String, Object>() {{
-       put(IFernflowerPreferences.LOG_LEVEL, "warn");
-       put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES, "1");
-       put(IFernflowerPreferences.REMOVE_SYNTHETIC, "1");
-       put(IFernflowerPreferences.REMOVE_BRIDGE, "1");
-       put(IFernflowerPreferences.LITERALS_AS_IS, "1");
--      put(IFernflowerPreferences.UNIT_TEST_MODE, "1");
-+      put(IFernflowerPreferences.MAX_PROCESSING_METHOD, "60000");
-       putAll(options);
-     }});
-   }
- 
--  public void tearDown() {
-+  protected File getRandomDir() throws IOException {
-+	  return File.createTempFile("decompiler_test_", "_dir");
-+  }
-+
-+public void tearDown() {
-     if (tempDir != null && cleanup) {
-       delete(tempDir);
-     }
-@@ -95,6 +98,5 @@ public class DecompilerTestFixture {
-         for (File f : files) delete(f);
-       }
-     }
--    assertTrue(file.delete());
-   }
- }
-diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
-index 087c8102c11b1258d8e3f1615fe64f745b8587d6..660d0313e68f87b72b694b886ab321792fb5a8bc 100644
---- a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
-+++ b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
-@@ -20,43 +20,54 @@ import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
- import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
- import org.jetbrains.java.decompiler.util.InterpreterUtil;
- import org.junit.After;
-+import org.junit.Assert;
- import org.junit.Before;
- import org.junit.Test;
- 
- import java.io.*;
-+import java.math.BigInteger;
-+import java.security.MessageDigest;
-+import java.security.NoSuchAlgorithmException;
- import java.util.Enumeration;
- import java.util.HashMap;
-+import java.util.HashSet;
-+import java.util.List;
- import java.util.Map;
-+import java.util.Map.Entry;
- import java.util.zip.ZipEntry;
- import java.util.zip.ZipFile;
- 
--import static org.junit.Assert.assertThat;
--import static org.junit.Assert.assertTrue;
--
- public class MinecraftDecompilationTest {
-   private DecompilerTestFixture fixture;
- 
-   private static final String MC_JAR = "minecraft_ff_in.jar";
-   @Before
-   public void setUp() throws IOException {
--    fixture = new DecompilerTestFixture();
--    // -din=1 -rbr=0 -dgs=1 -asc=1 -rsy=0
-+    fixture = new DecompilerTestFixture() {
-+      @Override
-+      public File getRandomDir() {
-+        return new File("/run/user/1000/fftest");
-+      }
-+    };
-     Map<String,Object> mcFFOptions = new HashMap<String,Object>() {{
-         put(IFernflowerPreferences.DECOMPILE_INNER,"1");
-         put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES,"1");
-         put(IFernflowerPreferences.ASCII_STRING_CHARACTERS,"1");
-         put(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH, "1");
-+        put(IFernflowerPreferences.REMOVE_BRIDGE, "1");
-+        put(IFernflowerPreferences.REMOVE_SYNTHETIC, "1");
-+        put(IFernflowerPreferences.NEW_LINE_SEPARATOR, "0");
-     }};
-     fixture.setUp(mcFFOptions);
-     if (!new File(fixture.getTestDataDir(), MC_JAR).exists()) {
--        throw new RuntimeException("Missing "+MC_JAR+" in testData dir - aborting");
-+      throw new RuntimeException("Missing "+MC_JAR+" in testData dir - aborting");
-     }
-   }
- 
-   @After
-   public void tearDown() {
--//    fixture.tearDown();
--//    fixture = null;
-+    fixture.tearDown();
-+    fixture = null;
-   }
- 
- //  @Test
-@@ -72,32 +83,97 @@ public class MinecraftDecompilationTest {
- //  }
- 
-   @Test
--  public void testJar() {
-+  public void testJar() throws IOException {
-+    Map<String,String> md5s = new HashMap<String,String>();
-+	MessageDigest md5;
-+    try {
-+	  md5 = MessageDigest.getInstance("MD5");
-+	} catch (NoSuchAlgorithmException e1) {
-+      md5 = null;
-+	}
-+
-+    System.out.println("Decompiling base");
-     ConsoleDecompiler decompiler = fixture.getDecompiler();
-     decompiler.addSpace(new File(fixture.getTestDataDir(), MC_JAR), true);
-     decompiler.decompileContext();
- 
--    File unpacked = new File(fixture.getTempDir(), "unpacked");
--    unpack(new File(fixture.getTargetDir(), "bulk.jar"), unpacked);
-+    Map<String, HashSet<String>> variants = new HashMap<String, HashSet<String>>();
-+
-+    Map<String, String> valid = readJar(new File(fixture.getTargetDir(), MC_JAR),md5s,md5);
-+    
-+    File outRoot = new File("/run/user/1000/ffbulk");
-+    outRoot.mkdirs();
-+    for (int x = 0; x < 10000; x++) {
-+      this.tearDown();
-+      this.setUp();
-+      System.out.println(x + "/10000 Starting Decompile");
-+      decompiler = fixture.getDecompiler();
-+      decompiler.addSpace(new File(fixture.getTestDataDir(), MC_JAR), true);
-+      decompiler.decompileContext();
-+      System.gc();
- 
-+      Map<String, String> data = readJar(new File(fixture.getTargetDir(), MC_JAR),null,null);
-+
-+      for (Entry<String, String> e : data.entrySet()) {
-+        String found = e.getValue();
-+        String expected = valid.get(e.getKey());
-+        if (!found.equals(expected)) {
-+          HashSet<String> set = variants.get(e.getKey());
-+          if (set == null) {
-+            set = new HashSet<String>();
-+            set.add(expected);
-+            variants.put(e.getKey(), set);
-+          }
-+          String md5digest = md5digest(found, md5);
-+		if (!set.contains(found)) {
-+            System.out.println("New Variant: " + e.getKey());
-+            set.add(found);
-+            System.out.println("Orig md5:"+md5s.get(e.getKey()));
-+            System.out.println("Variant md5: "+md5digest);
-+            writeFile(expected,e.getKey(),outRoot);
-+            writeFile(found,e.getKey()+"."+md5digest,outRoot);
-+          }
-+          else
-+          {
-+            System.out.println("Existing Variant: " + e.getKey());
-+            System.out.println("Variant md5: "+md5digest);
-+          }
-+        }
-+      }
-+    }
- //    compareDirectories(new File(fixture.getTestDataDir(), "bulk"), unpacked);
-   }
- 
--  private static void unpack(File archive, File targetDir) {
-+  private static void writeFile(String fl, String path, File outRoot) {
-+	  File out = new File(outRoot,path);
-+	  out.getParentFile().mkdirs();
-+      try {
-+		FileWriter fw = new FileWriter(out.getAbsoluteFile());
-+		  fw.write(fl);
-+		  fw.close();
-+	} catch (IOException e) {
-+		e.printStackTrace();
-+	}
-+  }
-+  private static Map<String, String> readJar(File archive, Map<String, String> md5s, MessageDigest md5) {
-+    Map<String, String> ret = new HashMap<String, String>();
-     try {
-       ZipFile zip = new ZipFile(archive);
-       try {
-         Enumeration<? extends ZipEntry> entries = zip.entries();
-         while (entries.hasMoreElements()) {
-           ZipEntry entry = entries.nextElement();
--          if (!entry.isDirectory()) {
--            File file = new File(targetDir, entry.getName());
--            assertTrue(file.getParentFile().mkdirs() || file.getParentFile().isDirectory());
-+          if (!entry.isDirectory() && entry.getName().endsWith(".java")) {
-             InputStream in = zip.getInputStream(entry);
--            OutputStream out = new FileOutputStream(file);
-+            ByteArrayOutputStream out = new ByteArrayOutputStream((int)entry.getSize());
-             InterpreterUtil.copyStream(in, out);
-             out.close();
-             in.close();
-+            String fileContent = new String(out.toByteArray());
-+			ret.put(entry.getName(), fileContent);
-+			if (md5!=null && md5s != null) {
-+				md5s.put(entry.getName(), md5digest(fileContent, md5));
-+			}
-           }
-         }
-       }
-@@ -108,17 +184,14 @@ public class MinecraftDecompilationTest {
-     catch (IOException e) {
-       throw new RuntimeException(e);
-     }
-+    return ret;
-   }
--
--  private static void compareDirectories(File expected, File actual) {
--    String[] expectedList = expected.list();
--    String[] actualList = actual.list();
--    assertThat(actualList, Matchers.arrayContainingInAnyOrder(expectedList));
--    for (String name : expectedList) {
--      File child = new File(expected, name);
--      if (child.isDirectory()) {
--        compareDirectories(child, new File(actual, name));
--      }
--    }
-+  private static String md5digest(String input, MessageDigest md5) {
-+	  md5.reset();
-+	  try {
-+		return String.format("0%032x",new BigInteger(1,md5.digest(input.getBytes("UTF-8"))));
-+	} catch (UnsupportedEncodingException e) {
-+		return null;
-+	}
-   }
- }
diff --git a/FernFlower-Patches/0106-Fix-NPE.patch b/FernFlower-Patches/0106-Fix-NPE.patch
deleted file mode 100644
index ac9cfe7..0000000
--- a/FernFlower-Patches/0106-Fix-NPE.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Sun, 25 Oct 2015 14:26:33 -0400
-Subject: [PATCH] Fix NPE
-
-
-diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
-index 0d68e8886c6f6584c4514e9b95f320fb05b9e941..2ae6da55e0d8ecb2fbdb39a6e42d1f179ac32203 100644
---- a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
-+++ b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
-@@ -177,7 +177,7 @@ public class MinecraftDecompilationTest {
-             set.add(md5digest);
-             System.out.println("Orig md5:"+md5s.get(fname));
-             System.out.println("Variant md5: "+md5digest);
--            writeFile(expected,fname,outRoot);
-+            if (expected != null) writeFile(expected,fname,outRoot);
-             writeFile(found,fname+"."+md5digest,outRoot);
-         } else if (!md5digest.equals(md5s.get(fname))) {
-           System.out.println("Existing Variant: " + fname);
diff --git a/FernFlower-Patches/0110-Fix-up-some-name-issues.-Still-outstanding-propogati.patch b/FernFlower-Patches/0110-Fix-up-some-name-issues.-Still-outstanding-propogati.patch
deleted file mode 100644
index b0d35ff..0000000
--- a/FernFlower-Patches/0110-Fix-up-some-name-issues.-Still-outstanding-propogati.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Fri, 6 Nov 2015 02:30:26 -0500
-Subject: [PATCH] Fix up some name issues. Still outstanding: propogating the
- parent context into child methods. Current placement in insertLocalVars is
- too late.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index 00600213ac4a4a39de72131a9cc6dc22424dc7a0..b3bd44e5c7276d33eecd4cf4287d77864568f927 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-@@ -24,6 +24,7 @@ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
- import org.jetbrains.java.decompiler.main.extern.IIdentifierRenamer;
- import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
- import org.jetbrains.java.decompiler.main.rels.LambdaProcessor;
-+import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
- import org.jetbrains.java.decompiler.main.rels.NestedClassProcessor;
- import org.jetbrains.java.decompiler.main.rels.NestedMemberAccess;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent;
-@@ -334,6 +335,13 @@ public class ClassesProcessor {
-     node.wrapper = wrapper;
- 
-     for (ClassNode nd : node.nested) {
-+      // Stuff the parent context into enclosed child methods
-+      if (nd.enclosingMethod != null) {
-+        MethodWrapper encmeth = wrapper.getMethods().getWithKey(nd.enclosingMethod);
-+        for (final MethodWrapper meth : nd.getWrapper().getMethods()) {
-+          meth.methodStruct.renamer.addParentContext(encmeth.methodStruct.renamer);
-+        }
-+      }
-       initWrappers(nd);
-     }
-   }
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 07ac606e43cdb7d21467d72ce32fb89e9d09a61f..9be9edbb36ecd3082cb15f5ff5a6ba8a627f3d89 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-@@ -577,7 +577,6 @@ public class NestedClassProcessor {
-     for (final MethodWrapper meth : child.getWrapper().getMethods()) {
- 
-       if (meth.root != null) { // neither abstract nor native
--        if (encmeth != null) { meth.methodStruct.renamer.addParentContext(encmeth.methodStruct.renamer); }
-         // local var names
-         HashMap<VarVersionPair, String> mapNewNames = new HashMap<VarVersionPair, String>();
-         // local var types
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
-index cb376d9b480f06971c71647037a17a166764e805..16f2bfb5fbc04312c21d10d26441786ac0604657 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/LVTVariable.java
-@@ -88,6 +88,8 @@ public class LVTVariable implements Comparable<LVTVariable> {
-   }
- 
-   public LVTVariable rename(String newName) {
--    return new LVTVariable(newName, desc, start, end, index, isLVTT);
-+    LVTVariable lvtVariable = new LVTVariable(newName, desc, start, end, index, isLVTT);
-+    lvtVariable.sig = this.sig;
-+    return lvtVariable;
-   }
- }
-\ No newline at end of file
-diff --git a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
-index 010ef5fdc0137798ca8a7097222cbc67ba5101ec..4c0c9762f5f59e858f49e6bd093df00eff0cdaac 100644
---- a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
-+++ b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
-@@ -46,6 +46,7 @@ public class JADNameProvider implements IVariableNameProvider {
-       remap.put("long", "int");
-     }
- 
-+    @Override
-     public void addParentContext(IVariableNameProvider iparent) {
-         JADNameProvider parent = (JADNameProvider) iparent;
-         last = new HashMap<String, Holder>();
-@@ -94,7 +95,7 @@ public class JADNameProvider implements IVariableNameProvider {
-           continue;
-         }
-         if (type.indexOf('<') != -1) {
--          type = type.substring(0, type.indexOf('<') - 1);
-+          type = type.substring(0, type.indexOf('<'));
-         }
-         if (type.indexOf('.') != -1) {
-           type = type.substring(type.lastIndexOf('.')+1);
-diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
-index ff2457b4e38f5cec0854d21a15ca4bc5551bbda3..b4af1f7cfd661fe456121f999a495c89dffb1d0f 100644
---- a/test/org/jetbrains/java/decompiler/LVTTest.java
-+++ b/test/org/jetbrains/java/decompiler/LVTTest.java
-@@ -59,5 +59,5 @@ public class LVTTest extends SingleClassesTestBase {
- //  @Test public void testMCAbstractResourcePack() { doTest("net/minecraft/client/resources/AbstractResourcePack"); }
- //  @Test public void testMCGuiShareToLan() { doTest("net/minecraft/client/gui/GuiShareToLan"); }
- //  @Test public void testMCContainerPlayer() { doTest("net/minecraft/inventory/ContainerPlayer"); }
--  @Test public void testMCContainerPlayer() { doTest("net/minecraft/inventory/ContainerPlayer"); }
-+  @Test public void testMCContainerPlayer() { doTest("net/minecraft/command/PlayerSelector"); }
- }
diff --git a/FernFlower-Patches/0111-Propogate-renamer-state-to-nested-classes.patch b/FernFlower-Patches/0111-Propogate-renamer-state-to-nested-classes.patch
deleted file mode 100644
index eba3546..0000000
--- a/FernFlower-Patches/0111-Propogate-renamer-state-to-nested-classes.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lex Manos <LexManos@gmail.com>
-Date: Fri, 6 Nov 2015 03:13:00 -0800
-Subject: [PATCH] Propogate renamer state to nested classes.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index b3bd44e5c7276d33eecd4cf4287d77864568f927..f22baa00bfcb99aa8e05ee323fdecacdf8cf177a 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-@@ -335,13 +335,6 @@ public class ClassesProcessor {
-     node.wrapper = wrapper;
- 
-     for (ClassNode nd : node.nested) {
--      // Stuff the parent context into enclosed child methods
--      if (nd.enclosingMethod != null) {
--        MethodWrapper encmeth = wrapper.getMethods().getWithKey(nd.enclosingMethod);
--        for (final MethodWrapper meth : nd.getWrapper().getMethods()) {
--          meth.methodStruct.renamer.addParentContext(encmeth.methodStruct.renamer);
--        }
--      }
-       initWrappers(nd);
-     }
-   }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index 59b1c42717441f6bce853aa4ce9d710c15d723b6..de4dbdc7b84cc6bcb95faa3ba05e6e2290922cf5 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-@@ -16,14 +16,16 @@
- package org.jetbrains.java.decompiler.modules.decompiler.vars;
- 
- import org.jetbrains.java.decompiler.code.CodeConstants;
-+import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
- import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
--import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
- import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.NewExprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph.ExprentIterator;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchAllStatement;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.CatchStatement;
- import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement;
-@@ -34,6 +36,7 @@ import org.jetbrains.java.decompiler.struct.StructMethod;
- import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
- import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
-+import org.jetbrains.java.decompiler.util.StatementIterator;
- 
- import java.util.*;
- import java.util.Map.Entry;
-@@ -433,9 +436,11 @@ public class VarDefinitionHelper {
-     }
- 
-     for (VarType var : md.params) {
--      List<LVTVariable> vars = varproc.getLVT().getCandidates(index);
--      if (vars != null) {
--        types.put(new VarVersionPair(index, 0), new VarInfo(null,null));
-+      if (varproc.getLVT() != null) {
-+        List<LVTVariable> vars = varproc.getLVT().getCandidates(index);
-+        if (vars != null) {
-+          types.put(new VarVersionPair(index, 0), new VarInfo(null,null));
-+        }
-       }
-       index += var.stackSize;
-     }
-@@ -446,8 +451,36 @@ public class VarDefinitionHelper {
-     for (Entry<VarVersionPair, VarInfo> e : types.entrySet()) {
-       typeNames.put(e.getKey(), e.getValue().typeName());
-     }
--    StructMethod current_meth = (StructMethod)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD);
-+    final StructMethod current_meth = (StructMethod)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD);
-     Map<VarVersionPair, String> renames = current_meth.renamer.rename(typeNames);
-+
-+    // Stuff the parent context into enclosed child methods
-+    StatementIterator.iterate(root, new ExprentIterator(){
-+      @Override
-+      public int processExprent(Exprent exprent){
-+        ClassNode child = null;
-+        if (exprent.type == Exprent.EXPRENT_VAR) {
-+          VarExprent var = (VarExprent)exprent;
-+          if (var.isClassDef()) {
-+            child = DecompilerContext.getClassProcessor().getMapRootClasses().get(var.getVarType().value);
-+          }
-+        }
-+        else if (exprent.type == Exprent.EXPRENT_NEW) {
-+          NewExprent _new = (NewExprent)exprent;
-+          if (_new.isAnonymous()) { //TODO: Check for Lambda here?
-+            child = DecompilerContext.getClassProcessor().getMapRootClasses().get(_new.getNewType().value);
-+          }
-+        }
-+
-+        if (child != null) {
-+          for (StructMethod meth : child.classStruct.getMethods()) {
-+            meth.renamer.addParentContext(current_meth.renamer);
-+          }
-+        }
-+        return 0;
-+      }
-+    });
-+
-     Map<VarVersionPair, LVTVariable> lvts = new HashMap<VarVersionPair, LVTVariable>();
- 
-     for (Entry<VarVersionPair, VarInfo> e : types.entrySet()) {
-diff --git a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
-index 4c0c9762f5f59e858f49e6bd093df00eff0cdaac..f2d2e3baf14f3004b1d377b9cb7a882741885d23 100644
---- a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
-+++ b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
-@@ -25,13 +25,13 @@ public class JADNameProvider implements IVariableNameProvider {
- 
-     public JADNameProvider(StructMethod wrapper) {
-       last = new HashMap<String, Holder>();
--      last.put("int",       new Holder(0, true,  "i", "j", "k", "l"));
--      last.put("byte",       new Holder(0, false, "b"       ));
--      last.put("char",       new Holder(0, false, "c"       ));
--      last.put("short",       new Holder(1, false, "short"   ));
--      last.put("boolean",       new Holder(0, true,  "flag"    ));
--      last.put("double",       new Holder(0, false, "d"       ));
--      last.put("float",       new Holder(0, true,  "f"       ));
-+      last.put("int",     new Holder(0, true,  "i", "j", "k", "l"));
-+      last.put("byte",    new Holder(0, false, "b"       ));
-+      last.put("char",    new Holder(0, false, "c"       ));
-+      last.put("short",   new Holder(1, false, "short"   ));
-+      last.put("boolean", new Holder(0, true,  "flag"    ));
-+      last.put("double",  new Holder(0, false, "d"       ));
-+      last.put("float",   new Holder(0, true,  "f"       ));
-       last.put("File",    new Holder(1, true,  "file"    ));
-       last.put("String",  new Holder(0, true,  "s"       ));
-       last.put("Class",   new Holder(0, true,  "oclass"  ));
-diff --git a/src/org/jetbrains/java/decompiler/util/StatementIterator.java b/src/org/jetbrains/java/decompiler/util/StatementIterator.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..4e4c8b475a4fdf4d6452ebe57621fc36bc2a2e38
---- /dev/null
-+++ b/src/org/jetbrains/java/decompiler/util/StatementIterator.java
-@@ -0,0 +1,43 @@
-+package org.jetbrains.java.decompiler.util;
-+
-+import java.util.List;
-+
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph.ExprentIterator;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
-+
-+public class StatementIterator {
-+  public static void iterate(Statement stat, ExprentIterator itr) {
-+    if (stat == null) {
-+      return;
-+    }
-+
-+    for (Exprent exp : stat.getVarDefinitions()) {
-+      iterate(exp, itr);
-+    }
-+
-+    if (stat.getExprents() == null) {
-+      for (Object obj : stat.getSequentialObjects()) {
-+        if (obj instanceof Statement) {
-+          iterate((Statement)obj, itr);
-+        }
-+        else if (obj instanceof Exprent) {
-+          iterate((Exprent)obj, itr);
-+        }
-+      }
-+    }
-+    else {
-+      for (Exprent exp : stat.getExprents()) {
-+        iterate(exp, itr);
-+      }
-+    }
-+  }
-+
-+  private static void iterate(Exprent exp, ExprentIterator itr) {
-+    List<Exprent> lst = exp.getAllExprents(true);
-+    lst.add(exp);
-+    for (Exprent exprent : lst) {
-+      itr.processExprent(exprent);
-+    }
-+  }
-+}
diff --git a/FernFlower-Patches/0112-Properly-implement-options-for-the-renamer-stuff.-JV.patch b/FernFlower-Patches/0112-Properly-implement-options-for-the-renamer-stuff.-JV.patch
deleted file mode 100644
index 1b6be1d..0000000
--- a/FernFlower-Patches/0112-Properly-implement-options-for-the-renamer-stuff.-JV.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Fri, 6 Nov 2015 15:16:23 -0500
-Subject: [PATCH] Properly implement options for the renamer stuff. "JVN"
- argument enables JAD style variable naming (int i, j, k etc). Can pass a
- "RENAMER_FACTORY" to the decompiler context: this is the name of a class
- implementing IVariableNamingFactory, that will be loaded and instantiated,
- overriding other options.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index c515d2e60e0917d2588a359c1d52a5345e8747ca..1338a42a36f02f479a7efbb280f2826a2948bb03 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-@@ -18,7 +18,6 @@ package org.jetbrains.java.decompiler.main;
- import org.jetbrains.java.decompiler.code.CodeConstants;
- import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
- import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
--import org.jetbrains.java.decompiler.main.extern.IAbstractParameterRenamer;
- import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
- import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
- import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
-diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-index 8d4d403773a861191083e2b2f6e469ec9ace45f2..d66145aef50938051b6a21f5d089b40cf9e8ef9f 100644
---- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-+++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-@@ -68,11 +68,15 @@ public class DecompilerContext {
-       try {
-         currentContext.get().renamerFactory = Class.forName((String) DecompilerContext.getProperty(RENAMER_FACTORY)).asSubclass(IVariableNamingFactory.class).newInstance();
-       } catch (Exception e) {
--
-+        getLogger().writeMessage("Error loading renamer factory class", e);
-       }
-     }
-     if (DecompilerContext.getNamingFactory() == null) {
--      currentContext.get().renamerFactory = new JADNameProvider.JADNameProviderFactory();
-+      if (DecompilerContext.getOption(IFernflowerPreferences.USE_JAD_VARNAMING)) {
-+        currentContext.get().renamerFactory = new JADNameProvider.JADNameProviderFactory();
-+      } else {
-+        currentContext.get().renamerFactory = new IdentityRenamerFactory();
-+      }
-     }
-   }
- 
-diff --git a/src/org/jetbrains/java/decompiler/main/extern/IAbstractParameterRenamer.java b/src/org/jetbrains/java/decompiler/main/extern/IAbstractParameterRenamer.java
-deleted file mode 100644
-index 4c509eb6633f575b4f7cc93ad781885e8581be70..0000000000000000000000000000000000000000
---- a/src/org/jetbrains/java/decompiler/main/extern/IAbstractParameterRenamer.java
-+++ /dev/null
-@@ -1,7 +0,0 @@
--package org.jetbrains.java.decompiler.main.extern;
--
--import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
--
--public interface IAbstractParameterRenamer {
--  public String renameParameter(String orig, int index, MethodWrapper wrapper, int flags);
--}
-diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-index 79dd8e890cd37e88bfbe9f0c22c825b3c2549bb8..7940dcfbd89ec1427459aeeac1aebaea30db1899 100644
---- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-@@ -62,6 +62,8 @@ public interface IFernflowerPreferences {
- 
-   String INCLUDE_ENTIRE_CLASSPATH = "iec";
- 
-+  String USE_JAD_VARNAMING = "jvn";
-+
-   Map<String, Object> DEFAULTS = Collections.unmodifiableMap(new HashMap<String, Object>() {{
-     put(REMOVE_BRIDGE, "1");
-     put(REMOVE_SYNTHETIC, "0");
-@@ -96,5 +98,6 @@ public interface IFernflowerPreferences {
-     put(UNIT_TEST_MODE, "0");
-     put(DUMP_ORIGINAL_LINES, "0");
-     put(INCLUDE_ENTIRE_CLASSPATH, "0");
-+    put(USE_JAD_VARNAMING, "0");
-   }});
- }
diff --git a/FernFlower-Patches/0113-Add-the-index-to-the-param-renamer-needed-for-sane-p.patch b/FernFlower-Patches/0113-Add-the-index-to-the-param-renamer-needed-for-sane-p.patch
deleted file mode 100644
index 6a46ba3..0000000
--- a/FernFlower-Patches/0113-Add-the-index-to-the-param-renamer-needed-for-sane-p.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Sun, 8 Nov 2015 13:28:24 -0500
-Subject: [PATCH] Add the index to the param renamer, needed for sane param
- name generation..
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index 1338a42a36f02f479a7efbb280f2826a2948bb03..25d01e38f0c006411e0a6c5c053b16d188b0c9a1 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-@@ -731,7 +731,7 @@ public class ClassWriter {
-             buffer.append(' ');
-             String parameterName = methodWrapper.varproc.getVarName(new VarVersionPair(index, 0));
-             if ((flags & (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_NATIVE)) != 0) {
--                parameterName = methodWrapper.methodStruct.renamer.renameAbstractParameter(parameterName);
-+                parameterName = methodWrapper.methodStruct.renamer.renameAbstractParameter(parameterName, index);
-             }
-             buffer.append(parameterName == null ? "param" + index : parameterName); // null iff decompiled with errors
- 
-diff --git a/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java b/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java
-index bc29407ea2503b16a1eff3b49a6579189eccd14f..e8c33402d6b7e0c07dbe2aacf73c2f8f500fc8c3 100644
---- a/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java
-+++ b/src/org/jetbrains/java/decompiler/main/IdentityRenamerFactory.java
-@@ -14,7 +14,7 @@ public class IdentityRenamerFactory implements IVariableNamingFactory, IVariable
-   }
- 
-   @Override
--  public String renameAbstractParameter(String abstractParam) {
-+  public String renameAbstractParameter(String abstractParam, int index) {
-     return abstractParam;
-   }
- 
-diff --git a/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java b/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java
-index 9d6b1a5cdff732d251e078750b2a26243f93463e..26f10715a8d594f00480a80e9c94c8b3bf011998 100644
---- a/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java
-+++ b/src/org/jetbrains/java/decompiler/main/extern/IVariableNameProvider.java
-@@ -6,6 +6,6 @@ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
- 
- public interface IVariableNameProvider {
-   public Map<VarVersionPair,String> rename(Map<VarVersionPair,String> variables);
--  public String renameAbstractParameter(String abstractParam);
-+  public String renameAbstractParameter(String abstractParam, int index);
-   public void addParentContext(IVariableNameProvider renamer);
- }
-diff --git a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
-index f2d2e3baf14f3004b1d377b9cb7a882741885d23..b588cec7b138dfffeb1d57a11aeb7e4b41fa5a38 100644
---- a/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
-+++ b/src/org/jetbrains/java/decompiler/util/JADNameProvider.java
-@@ -179,7 +179,7 @@ public class JADNameProvider implements IVariableNameProvider {
-     }
- 
-     @Override
--    public String renameAbstractParameter(String abstractParam) {
-+    public String renameAbstractParameter(String abstractParam, int index) {
-       return abstractParam;
-     }
- 
diff --git a/FernFlower-Patches/0114-Early-set-the-logger-so-that-it-can-be-used-during-i.patch b/FernFlower-Patches/0114-Early-set-the-logger-so-that-it-can-be-used-during-i.patch
deleted file mode 100644
index 9e89f65..0000000
--- a/FernFlower-Patches/0114-Early-set-the-logger-so-that-it-can-be-used-during-i.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Sun, 8 Nov 2015 16:12:19 -0500
-Subject: [PATCH] Early set the logger so that it can be used during init
- context without NPEs.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-index d66145aef50938051b6a21f5d089b40cf9e8ef9f..22ab9e0fd0f4571f360492221a619f9419d8812a 100644
---- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-+++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-@@ -68,7 +68,8 @@ public class DecompilerContext {
-       try {
-         currentContext.get().renamerFactory = Class.forName((String) DecompilerContext.getProperty(RENAMER_FACTORY)).asSubclass(IVariableNamingFactory.class).newInstance();
-       } catch (Exception e) {
--        getLogger().writeMessage("Error loading renamer factory class", e);
-+        e.printStackTrace();
-+        System.err.println("Error loading renamer factory class");
-       }
-     }
-     if (DecompilerContext.getNamingFactory() == null) {
-diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-index 91e70d3132095281338593d2166eedbcbd09e5d6..8319da8a08838b77508269bf44fe2209bcf4a328 100644
---- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
-+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-@@ -41,6 +41,7 @@ public class Fernflower implements IDecompiledData {
- 
-   public Fernflower(IBytecodeProvider provider, IResultSaver saver, Map<String, Object> options, IFernflowerLogger logger) {
-     structContext = new StructContext(saver, this, new LazyLoader(provider));
-+    DecompilerContext.setLogger(logger);
-     DecompilerContext.initContext(options);
-     DecompilerContext.setCounterContainer(new CounterContainer());
-     DecompilerContext.setLogger(logger);
diff --git a/FernFlower-Patches/0115-More-fixage-to-the-way-init-happens.patch b/FernFlower-Patches/0115-More-fixage-to-the-way-init-happens.patch
deleted file mode 100644
index 8117cb1..0000000
--- a/FernFlower-Patches/0115-More-fixage-to-the-way-init-happens.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Sun, 8 Nov 2015 16:18:49 -0500
-Subject: [PATCH] More fixage to the way init happens.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-index 22ab9e0fd0f4571f360492221a619f9419d8812a..f946bb46ab04b018786a72371af431d42f65cf1c 100644
---- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-+++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
-@@ -57,19 +57,19 @@ public class DecompilerContext {
-     this.properties = properties;
-   }
- 
--  public static void initContext(Map<String, Object> propertiesCustom) {
-+  public static void initContext(Map<String, Object> propertiesCustom, IFernflowerLogger logger) {
-     Map<String, Object> properties = new HashMap<String, Object>(IFernflowerPreferences.DEFAULTS);
-     if (propertiesCustom != null) {
-       properties.putAll(propertiesCustom);
-     }
-     currentContext.set(new DecompilerContext(properties));
-+    setLogger(logger);
-     // Default a no-op renamer factory if none is provided
-     if (DecompilerContext.getProperty(RENAMER_FACTORY) != null) {
-       try {
-         currentContext.get().renamerFactory = Class.forName((String) DecompilerContext.getProperty(RENAMER_FACTORY)).asSubclass(IVariableNamingFactory.class).newInstance();
-       } catch (Exception e) {
--        e.printStackTrace();
--        System.err.println("Error loading renamer factory class");
-+        getLogger().writeMessage("Error loading renamer factory class", e);
-       }
-     }
-     if (DecompilerContext.getNamingFactory() == null) {
-diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-index 8319da8a08838b77508269bf44fe2209bcf4a328..320e250ce1fe0eeca0194b296a3944cc710127bc 100644
---- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
-+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-@@ -41,10 +41,8 @@ public class Fernflower implements IDecompiledData {
- 
-   public Fernflower(IBytecodeProvider provider, IResultSaver saver, Map<String, Object> options, IFernflowerLogger logger) {
-     structContext = new StructContext(saver, this, new LazyLoader(provider));
--    DecompilerContext.setLogger(logger);
--    DecompilerContext.initContext(options);
-+    DecompilerContext.initContext(options,logger);
-     DecompilerContext.setCounterContainer(new CounterContainer());
--    DecompilerContext.setLogger(logger);
- 
-     if (DecompilerContext.getOption(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH)) {
-       addAllClasspath();
diff --git a/FernFlower-Patches/0116-Try-and-release-the-renamer-after-we-re-done-with-th.patch b/FernFlower-Patches/0116-Try-and-release-the-renamer-after-we-re-done-with-th.patch
deleted file mode 100644
index aefe430..0000000
--- a/FernFlower-Patches/0116-Try-and-release-the-renamer-after-we-re-done-with-th.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Mon, 23 Nov 2015 11:56:24 -0500
-Subject: [PATCH] Try and release the renamer after we're done with the class.
- Should reduce memory footprint somewhat.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
-index ab0f118debc0d7dee08f79a12c3558909e652482..784860620c1c07884c28ac26d431396960312f19 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructClass.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructClass.java
-@@ -147,6 +147,9 @@ public class StructClass extends StructMember {
-     if (loader != null) {
-       pool = null;
-     }
-+    for (StructMethod m : methods) {
-+        m.renamer = null;
-+    }
-   }
- 
-   public ConstantPool getPool() {
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-index 7e7f7580f5301ea94b4bf97440a471caa3f62c50..68f5427e95ffd45a0fd925b8912c79d07a999d17 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-@@ -61,7 +61,7 @@ public class StructMethod extends StructMember {
-   private InstructionSequence seq;
-   private boolean expanded = false;
-   private VBStyleCollection<StructGeneralAttribute, String> codeAttributes;
--  public final IVariableNameProvider renamer;
-+  public IVariableNameProvider renamer;
- 
-   public StructMethod(DataInputFullStream in, StructClass clStruct) throws IOException {
-     classStruct = clStruct;
diff --git a/FernFlower-Patches/0117-Try-to-release-resources-after-we-re-done-not-before.patch b/FernFlower-Patches/0117-Try-to-release-resources-after-we-re-done-not-before.patch
deleted file mode 100644
index b4f4457..0000000
--- a/FernFlower-Patches/0117-Try-to-release-resources-after-we-re-done-not-before.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Mon, 23 Nov 2015 14:01:47 -0500
-Subject: [PATCH] Try to release resources *after* we're done, not before we've
- started
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index f22baa00bfcb99aa8e05ee323fdecacdf8cf177a..5feaf475b6e1100d40a907d1b42bb602f1db7984 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-@@ -354,6 +354,9 @@ public class ClassesProcessor {
- 
-     node.wrapper = null;
-     node.classStruct.releaseResources();
-+    for (StructMethod m : node.classStruct.getMethods()) {
-+        m.renamer = null;
-+    }
- 
-     for (ClassNode nd : node.nested) {
-       destroyWrappers(nd);
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
-index 784860620c1c07884c28ac26d431396960312f19..ab0f118debc0d7dee08f79a12c3558909e652482 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructClass.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructClass.java
-@@ -147,9 +147,6 @@ public class StructClass extends StructMember {
-     if (loader != null) {
-       pool = null;
-     }
--    for (StructMethod m : methods) {
--        m.renamer = null;
--    }
-   }
- 
-   public ConstantPool getPool() {
diff --git a/FernFlower-Patches/0118-Don-t-allocate-a-renamer-for-every-single-method-rea.patch b/FernFlower-Patches/0118-Don-t-allocate-a-renamer-for-every-single-method-rea.patch
deleted file mode 100644
index 65b761c..0000000
--- a/FernFlower-Patches/0118-Don-t-allocate-a-renamer-for-every-single-method-rea.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Mon, 23 Nov 2015 14:27:08 -0500
-Subject: [PATCH] Don't allocate a renamer for every single method read. That
- should cut down the memory quite a lot.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-index 68f5427e95ffd45a0fd925b8912c79d07a999d17..77fd181a17eb566fa0f0330c0c21fb08f787922f 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-@@ -80,7 +80,6 @@ public class StructMethod extends StructMember {
-       attributes.addAllWithKey(codeAttributes);
-       codeAttributes = null;
-     }
--    this.renamer = DecompilerContext.getNamingFactory().createFactory(this);
-   }
- 
-   @Override
-@@ -121,6 +120,7 @@ public class StructMethod extends StructMember {
-     if (containsCode && !expanded) {
-       byte[] code = classStruct.getLoader().loadBytecode(this, codeFullLength);
-       seq = parseBytecode(new DataInputFullStream(code), codeLength, classStruct.getPool());
-+      this.renamer = DecompilerContext.getNamingFactory().createFactory(this);
-       expanded = true;
-     }
-   }
diff --git a/FernFlower-Patches/0119-Clean-up-renamer-access-a-bit-ensure-it-s-loaded-for.patch b/FernFlower-Patches/0119-Clean-up-renamer-access-a-bit-ensure-it-s-loaded-for.patch
deleted file mode 100644
index bc8f308..0000000
--- a/FernFlower-Patches/0119-Clean-up-renamer-access-a-bit-ensure-it-s-loaded-for.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: cpw <cpw@weeksfamily.ca>
-Date: Mon, 23 Nov 2015 14:56:19 -0500
-Subject: [PATCH] Clean up renamer access a bit- ensure it's loaded for inner
- classes
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index 25d01e38f0c006411e0a6c5c053b16d188b0c9a1..b90f2ec58cc54cdd9b72257824ec6ceaefbc536e 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-@@ -731,7 +731,7 @@ public class ClassWriter {
-             buffer.append(' ');
-             String parameterName = methodWrapper.varproc.getVarName(new VarVersionPair(index, 0));
-             if ((flags & (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_NATIVE)) != 0) {
--                parameterName = methodWrapper.methodStruct.renamer.renameAbstractParameter(parameterName, index);
-+                parameterName = methodWrapper.methodStruct.getRenamer().renameAbstractParameter(parameterName, index);
-             }
-             buffer.append(parameterName == null ? "param" + index : parameterName); // null iff decompiled with errors
- 
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index 5feaf475b6e1100d40a907d1b42bb602f1db7984..e0fdaacc5d6f16c5eea148540b2c90758779deae 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-@@ -355,7 +355,7 @@ public class ClassesProcessor {
-     node.wrapper = null;
-     node.classStruct.releaseResources();
-     for (StructMethod m : node.classStruct.getMethods()) {
--        m.renamer = null;
-+        m.unloadRenamer();
-     }
- 
-     for (ClassNode nd : node.nested) {
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index de4dbdc7b84cc6bcb95faa3ba05e6e2290922cf5..fcd8c64de9c7d3af4e9ce943c41dd58ced598014 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-@@ -452,7 +452,7 @@ public class VarDefinitionHelper {
-       typeNames.put(e.getKey(), e.getValue().typeName());
-     }
-     final StructMethod current_meth = (StructMethod)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD);
--    Map<VarVersionPair, String> renames = current_meth.renamer.rename(typeNames);
-+    Map<VarVersionPair, String> renames = current_meth.getRenamer().rename(typeNames);
- 
-     // Stuff the parent context into enclosed child methods
-     StatementIterator.iterate(root, new ExprentIterator(){
-@@ -474,7 +474,7 @@ public class VarDefinitionHelper {
- 
-         if (child != null) {
-           for (StructMethod meth : child.classStruct.getMethods()) {
--            meth.renamer.addParentContext(current_meth.renamer);
-+            meth.getRenamer().addParentContext(current_meth.getRenamer());
-           }
-         }
-         return 0;
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-index 77fd181a17eb566fa0f0330c0c21fb08f787922f..d7ede2e3ab1f542a7223cc79e2f139d29c29cec4 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-@@ -61,7 +61,7 @@ public class StructMethod extends StructMember {
-   private InstructionSequence seq;
-   private boolean expanded = false;
-   private VBStyleCollection<StructGeneralAttribute, String> codeAttributes;
--  public IVariableNameProvider renamer;
-+  private IVariableNameProvider renamer;
- 
-   public StructMethod(DataInputFullStream in, StructClass clStruct) throws IOException {
-     classStruct = clStruct;
-@@ -120,11 +120,17 @@ public class StructMethod extends StructMember {
-     if (containsCode && !expanded) {
-       byte[] code = classStruct.getLoader().loadBytecode(this, codeFullLength);
-       seq = parseBytecode(new DataInputFullStream(code), codeLength, classStruct.getPool());
--      this.renamer = DecompilerContext.getNamingFactory().createFactory(this);
-+      loadRenamer();
-       expanded = true;
-     }
-   }
- 
-+  private void loadRenamer() {
-+    if (this.renamer == null) {
-+      this.renamer = DecompilerContext.getNamingFactory().createFactory(this);
-+    }
-+  }
-+
-   public void releaseResources() throws IOException {
-     if (containsCode && expanded) {
-       seq = null;
-@@ -408,4 +414,13 @@ public class StructMethod extends StructMember {
-   public GenericMethodDescriptor getSignature() {
-     return signature;
-   }
-+
-+  public IVariableNameProvider getRenamer() {
-+    loadRenamer();
-+    return renamer;
-+  }
-+
-+  public void unloadRenamer() {
-+    this.renamer = null;
-+  }
- }
diff --git a/FernFlower-Patches/0121-Changed-archive-name-to-reflect-the-update-to-ForgeF.patch b/FernFlower-Patches/0121-Changed-archive-name-to-reflect-the-update-to-ForgeF.patch
deleted file mode 100644
index 5385e04..0000000
--- a/FernFlower-Patches/0121-Changed-archive-name-to-reflect-the-update-to-ForgeF.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Curle <curle@gemwire.uk>
-Date: Tue, 21 Apr 2020 14:00:05 +0000
-Subject: [PATCH] Changed archive name to reflect the update to ForgeFlower
-
-
-diff --git a/build.gradle b/build.gradle
-index cf3d8ec6b2fe4260b788b46643e8a397e5d63e18..7dec9ec6fb04c6cd2081f2e452d072f7451ddcad 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -3,9 +3,9 @@ apply plugin: 'idea'
- apply plugin: 'maven'
- apply plugin: 'java'
- 
--version = "2.0-SNAPSHOT"
-+version = "0.2.3"
- group = "net.minecraftforge" //not sure if we shoulkd publish under this name, but it's our fork so meh
--archivesBaseName = "fernflower"
-+archivesBaseName = "forgeflower"
- 
- sourceCompatibility = '1.6'
- targetCompatibility = '1.6'

From d5139ae5afbddd312a718e7d088387a330fd2e14 Mon Sep 17 00:00:00 2001
From: sciwhiz12 <sciwhiz12@sciwhiz12.tk>
Date: Sun, 7 Feb 2021 01:43:26 +0800
Subject: [PATCH 06/22] Add needed command line arguments

Thanks again to sciwhiz12.
---
 ...and-line-argument-sef-SkipExtraFiles.patch |  40 ++++++
 ...fg-argument-to-specify-a-config-file.patch | 100 ++++++++++++++
 ...ile-for-renaming-abstract-parameters.patch | 125 ++++++++++++++++++
 ...n-iib-option-IGNORE_INVALID_BYTECODE.patch |  90 +++++++++++++
 4 files changed, 355 insertions(+)
 create mode 100644 FernFlower-Patches/0057-Add-new-command-line-argument-sef-SkipExtraFiles.patch
 create mode 100644 FernFlower-Patches/0058-Add-cfg-argument-to-specify-a-config-file.patch
 create mode 100644 FernFlower-Patches/0059-Add-a-metadata-file-for-renaming-abstract-parameters.patch
 create mode 100644 FernFlower-Patches/0060-Add-in-iib-option-IGNORE_INVALID_BYTECODE.patch

diff --git a/FernFlower-Patches/0057-Add-new-command-line-argument-sef-SkipExtraFiles.patch b/FernFlower-Patches/0057-Add-new-command-line-argument-sef-SkipExtraFiles.patch
new file mode 100644
index 0000000..0597765
--- /dev/null
+++ b/FernFlower-Patches/0057-Add-new-command-line-argument-sef-SkipExtraFiles.patch
@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: sciwhiz12 <sciwhiz12@sciwhiz12.tk>
+Date: Thu, 4 Feb 2021 01:50:48 +0800
+Subject: [PATCH] Add new command line argument -sef 'SkipExtraFiles'
+
+Used to skip copying non-class files from the input jars to the output.
+
+diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+index 7940dcfbd89ec1427459aeeac1aebaea30db1899..259e5d276e7a98a379bfcf03a18a4b93a92f4396 100644
+--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
++++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+@@ -64,6 +64,8 @@ public interface IFernflowerPreferences {
+ 
+   String USE_JAD_VARNAMING = "jvn";
+ 
++  String SKIP_EXTRA_FILES = "sef";
++
+   Map<String, Object> DEFAULTS = Collections.unmodifiableMap(new HashMap<String, Object>() {{
+     put(REMOVE_BRIDGE, "1");
+     put(REMOVE_SYNTHETIC, "0");
+@@ -99,5 +101,6 @@ public interface IFernflowerPreferences {
+     put(DUMP_ORIGINAL_LINES, "0");
+     put(INCLUDE_ENTIRE_CLASSPATH, "0");
+     put(USE_JAD_VARNAMING, "0");
++    put(SKIP_EXTRA_FILES, "0");
+   }});
+ }
+diff --git a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
+index e3043962de86e4823458766ff2afda4eb3e71e5f..db51534cb8ac1012460c6de7a6f0ad04101244af 100644
+--- a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
++++ b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
+@@ -68,6 +68,8 @@ public class ContextUnit {
+   }
+ 
+   public void addOtherEntry(String fullPath, String entry) {
++    if (DecompilerContext.getOption(IFernflowerPreferences.SKIP_EXTRA_FILES))
++      return;
+     otherEntries.add(new String[]{fullPath, entry});
+   }
+ 
diff --git a/FernFlower-Patches/0058-Add-cfg-argument-to-specify-a-config-file.patch b/FernFlower-Patches/0058-Add-cfg-argument-to-specify-a-config-file.patch
new file mode 100644
index 0000000..ab2a0d0
--- /dev/null
+++ b/FernFlower-Patches/0058-Add-cfg-argument-to-specify-a-config-file.patch
@@ -0,0 +1,100 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: sciwhiz12 <sciwhiz12@sciwhiz12.tk>
+Date: Thu, 4 Feb 2021 01:58:45 +0800
+Subject: [PATCH] Add -cfg argument, to specify a config file
+
+Used to specify a text file which contains additional command line arguments, which will be added in place of the -cfg argument.
+
+diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+index 06f3b1d3b135a30441cb68e2a7a33eddeaa40a1c..ae6aee3c81c8a9aff3bf13af9ac4b3d8c8c1e2b4 100644
+--- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
++++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+@@ -23,9 +23,13 @@ import org.jetbrains.java.decompiler.main.extern.IResultSaver;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ 
+ import java.io.*;
++import java.nio.file.Files;
++import java.nio.file.Path;
++import java.nio.file.Paths;
+ import java.util.*;
+ import java.util.jar.JarOutputStream;
+ import java.util.jar.Manifest;
++import java.util.stream.Stream;
+ import java.util.zip.ZipEntry;
+ import java.util.zip.ZipFile;
+ import java.util.zip.ZipOutputStream;
+@@ -34,6 +38,38 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
+ 
+   @SuppressWarnings("UseOfSystemOutOrSystemErr")
+   public static void main(String[] args) {
++    List<String> params = new ArrayList<>();
++    for (int x = 0; x < args.length; x++) {
++      if (args[x].startsWith("-cfg")) {
++        String path = null;
++        if (args[x].startsWith("-cfg=")) {
++          path = args[x].substring(5);
++        }
++        else if (args.length > x+1) {
++          path = args[++x];
++        }
++        else {
++          System.out.println("Must specify a file when using -cfg argument.");
++          return;
++        }
++        Path file = Paths.get(path);
++        if (!Files.exists(file)) {
++          System.out.println("error: missing config '" + path + "'");
++          return;
++        }
++        try (Stream<String> stream = Files.lines(file)) {
++          stream.forEach(params::add);
++        } catch (IOException e) {
++          System.out.println("error: Failed to read config file '" + path + "'");
++          throw new RuntimeException(e);
++        }
++      }
++      else {
++        params.add(args[x]);
++      }
++    }
++    args = params.toArray(new String[params.size()]);
++
+     if (args.length < 2) {
+       System.out.println(
+         "Usage: java -jar fernflower.jar [-<option>=<value>]* [<source>]+ <destination>\n" +
+@@ -86,12 +122,12 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
+     PrintStreamLogger logger = new PrintStreamLogger(System.out);
+     ConsoleDecompiler decompiler = new ConsoleDecompiler(destination, mapOptions, logger);
+ 
+-    for (File source : lstSources) {
+-      decompiler.addSpace(source, true);
+-    }
+     for (File library : lstLibraries) {
+       decompiler.addSpace(library, false);
+     }
++    for (File source : lstSources) {
++      decompiler.addSpace(source, true);
++    }
+ 
+     decompiler.decompileContext();
+   }
+diff --git a/src/org/jetbrains/java/decompiler/struct/StructContext.java b/src/org/jetbrains/java/decompiler/struct/StructContext.java
+index 7bfb139ede3087d6a04975eacc48ac31b3fa9c00..93f8cc7ac1c178de4f2cc1fe86db82c1784b416f 100644
+--- a/src/org/jetbrains/java/decompiler/struct/StructContext.java
++++ b/src/org/jetbrains/java/decompiler/struct/StructContext.java
+@@ -107,6 +107,7 @@ public class StructContext {
+       catch (IOException ex) {
+         String message = "Corrupted archive file: " + file;
+         DecompilerContext.getLogger().writeMessage(message, ex);
++        throw new RuntimeException(ex);
+       }
+       if (isArchive) {
+         return;
+@@ -134,6 +135,7 @@ public class StructContext {
+         catch (IOException ex) {
+           String message = "Corrupted class file: " + file;
+           DecompilerContext.getLogger().writeMessage(message, ex);
++          throw new RuntimeException(ex);
+         }
+       }
+       else {
diff --git a/FernFlower-Patches/0059-Add-a-metadata-file-for-renaming-abstract-parameters.patch b/FernFlower-Patches/0059-Add-a-metadata-file-for-renaming-abstract-parameters.patch
new file mode 100644
index 0000000..db3411b
--- /dev/null
+++ b/FernFlower-Patches/0059-Add-a-metadata-file-for-renaming-abstract-parameters.patch
@@ -0,0 +1,125 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: sciwhiz12 <sciwhiz12@sciwhiz12.tk>
+Date: Thu, 4 Feb 2021 02:11:22 +0800
+Subject: [PATCH] Add a metadata file for renaming abstract parameters
+
+The file is named 'fernflower_abstract_parameter_names.txt', with the format of:
+
+ClassName MethodName Descriptor Param1[ Param2...]
+
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+index b90f2ec58cc54cdd9b72257824ec6ceaefbc536e..581ef65be27be38883be48fc6758642953c12468 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+@@ -731,7 +731,8 @@ public class ClassWriter {
+             buffer.append(' ');
+             String parameterName = methodWrapper.varproc.getVarName(new VarVersionPair(index, 0));
+             if ((flags & (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_NATIVE)) != 0) {
+-                parameterName = methodWrapper.methodStruct.getRenamer().renameAbstractParameter(parameterName, index);
++              String newParameterName = methodWrapper.methodStruct.getRenamer().renameAbstractParameter(parameterName, index);
++              parameterName = !newParameterName.equals(parameterName) ? newParameterName : DecompilerContext.getStructContext().renameAbstractParameter(methodWrapper.methodStruct.getClassStruct().qualifiedName, mt.getName(), mt.getDescriptor(), index - (((flags & CodeConstants.ACC_STATIC) == 0) ? 1 : 0), parameterName);
+             }
+             buffer.append(parameterName == null ? "param" + index : parameterName); // null iff decompiled with errors
+ 
+diff --git a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
+index db51534cb8ac1012460c6de7a6f0ad04101244af..1c2603c2a02ca4ac0da5a0c309ffb8fe3c21e9e2 100644
+--- a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
++++ b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
+@@ -21,12 +21,16 @@ import org.jetbrains.java.decompiler.main.extern.IResultSaver;
+ import org.jetbrains.java.decompiler.struct.lazy.LazyLoader;
+ import org.jetbrains.java.decompiler.struct.lazy.LazyLoader.Link;
+ import org.jetbrains.java.decompiler.util.DataInputFullStream;
++import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ 
++import java.io.File;
+ import java.io.IOException;
++import java.nio.charset.StandardCharsets;
+ import java.util.ArrayList;
+ import java.util.List;
+ import java.util.jar.JarFile;
+ import java.util.jar.Manifest;
++import java.util.zip.ZipFile;
+ 
+ public class ContextUnit {
+ 
+@@ -68,6 +72,24 @@ public class ContextUnit {
+   }
+ 
+   public void addOtherEntry(String fullPath, String entry) {
++    if ("fernflower_abstract_parameter_names.txt".equals(entry)) {
++      byte[] data;
++      try {
++        if (type == TYPE_JAR || type == TYPE_ZIP) {
++          try (ZipFile archive = new ZipFile(fullPath)) {
++            data = InterpreterUtil.getBytes(archive, archive.getEntry(entry));
++          }
++        }
++        else {
++          data = InterpreterUtil.getBytes(new File(fullPath));
++        }
++        DecompilerContext.getStructContext().loadAbstractMetadata(new String(data, StandardCharsets.UTF_8));
++      }
++      catch (IOException e) {
++        String message = "Cannot read fernflower_abstract_parameter_names.txt from " + fullPath;
++        DecompilerContext.getLogger().writeMessage(message, e);
++      }
++    }
+     if (DecompilerContext.getOption(IFernflowerPreferences.SKIP_EXTRA_FILES))
+       return;
+     otherEntries.add(new String[]{fullPath, entry});
+diff --git a/src/org/jetbrains/java/decompiler/struct/StructContext.java b/src/org/jetbrains/java/decompiler/struct/StructContext.java
+index 93f8cc7ac1c178de4f2cc1fe86db82c1784b416f..a154193f9b9f698873c62af08d1211d0e79b8ae4 100644
+--- a/src/org/jetbrains/java/decompiler/struct/StructContext.java
++++ b/src/org/jetbrains/java/decompiler/struct/StructContext.java
+@@ -17,14 +17,18 @@ package org.jetbrains.java.decompiler.struct;
+ 
+ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.extern.IResultSaver;
++import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
++import org.jetbrains.java.decompiler.struct.gen.generics.GenericMethodDescriptor;
+ import org.jetbrains.java.decompiler.struct.lazy.LazyLoader;
+ import org.jetbrains.java.decompiler.util.DataInputFullStream;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ 
+ import java.io.File;
+ import java.io.IOException;
++import java.util.ArrayList;
+ import java.util.Enumeration;
+ import java.util.HashMap;
++import java.util.List;
+ import java.util.Map;
+ import java.util.jar.JarFile;
+ import java.util.zip.ZipEntry;
+@@ -37,6 +41,7 @@ public class StructContext {
+   private final LazyLoader loader;
+   private final Map<String, ContextUnit> units = new HashMap<String, ContextUnit>();
+   private final Map<String, StructClass> classes = new HashMap<String, StructClass>();
++  private final Map<String, List<String>> abstractNames = new HashMap<>();
+ 
+   public StructContext(IResultSaver saver, IDecompiledData decompiledData, LazyLoader loader) {
+     this.saver = saver;
+@@ -188,4 +193,24 @@ public class StructContext {
+   public Map<String, StructClass> getClasses() {
+     return classes;
+   }
++
++  public void loadAbstractMetadata(String string) {
++    for (String line : string.split("\\n")) {
++      String[] pts = line.split(" ");
++      if (pts.length < 4) //class method desc [args...]
++        continue;
++      GenericMethodDescriptor desc = GenericMain.parseMethodSignature(pts[2]);
++      List<String> params = new ArrayList<>();
++      for (int x = 0; x < pts.length - 3; x++) {
++        for (int y = 0; y < desc.params.get(x).stackSize; y++)
++          params.add(pts[x+3]);
++      }
++      this.abstractNames.put(pts[0] + ' ' + pts[1] + ' ' + pts[2], params);
++    }
++  }
++
++  public String renameAbstractParameter(String className, String methodName, String descriptor, int index, String _default) {
++    List<String> params = this.abstractNames.get(className + ' ' + methodName + ' ' + descriptor);
++    return params != null && index < params.size() ? params.get(index) : _default;
++  }
+ }
diff --git a/FernFlower-Patches/0060-Add-in-iib-option-IGNORE_INVALID_BYTECODE.patch b/FernFlower-Patches/0060-Add-in-iib-option-IGNORE_INVALID_BYTECODE.patch
new file mode 100644
index 0000000..4ca31b3
--- /dev/null
+++ b/FernFlower-Patches/0060-Add-in-iib-option-IGNORE_INVALID_BYTECODE.patch
@@ -0,0 +1,90 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: sciwhiz12 <sciwhiz12@sciwhiz12.tk>
+Date: Thu, 4 Feb 2021 02:55:14 +0800
+Subject: [PATCH] Add in -iib option; IGNORE_INVALID_BYTECODE
+
+ref: https://github.com/MinecraftForge/FernFlower/commit/c2a6c13d3ccc835ee32d8250f94687bd2712aa40
+
+Upstream has ExprUtil#getSyntheticParametersMask which does not exist here, so had to find all old places before the move to ExprUtil and patched those. (ref: https://github.com/MinecraftForge/FernFlower/commit/8990950daad666f8d9712fdd51ce9ff0d04f5fd7#diff-0d4f70d78fbde518520227007f32404aef3efb8156422c9c7c5b8ab90a39776b)
+
+diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+index 259e5d276e7a98a379bfcf03a18a4b93a92f4396..e16232be3ffdfde57380608ff584079537b2debd 100644
+--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
++++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+@@ -45,6 +45,7 @@ public interface IFernflowerPreferences {
+   String LAMBDA_TO_ANONYMOUS_CLASS = "lac";
+   String BYTECODE_SOURCE_MAPPING = "bsm";
+   String USE_DEBUG_LINE_NUMBERS = "udl";
++  String IGNORE_INVALID_BYTECODE = "iib";
+ 
+   String LOG_LEVEL = "log";
+   String MAX_PROCESSING_METHOD = "mpm";
+@@ -90,6 +91,7 @@ public interface IFernflowerPreferences {
+     put(LAMBDA_TO_ANONYMOUS_CLASS, "0");
+     put(BYTECODE_SOURCE_MAPPING, "0");
+     put(USE_DEBUG_LINE_NUMBERS, "0");
++    put(IGNORE_INVALID_BYTECODE, "0");
+ 
+     put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name());
+     put(MAX_PROCESSING_METHOD, "0");
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+index e6152070d2b155d98fc0b8155db12c12ca3864e0..95b3c37273c1460c017fc7b4d94b52d2feea6e27 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+@@ -371,7 +371,9 @@ public class InvocationExprent extends Exprent {
+ 
+       if (newNode != null) {  // own class
+         if (newNode.getWrapper() != null) {
+-          sigFields = newNode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, stringDescriptor).signatureFields;
++          MethodWrapper wrapper = newNode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, stringDescriptor);
++          if (wrapper != null || !DecompilerContext.getOption(IFernflowerPreferences.IGNORE_INVALID_BYTECODE))
++            sigFields = wrapper.signatureFields;
+         }
+         else {
+           if (newNode.type == ClassNode.CLASS_MEMBER && (newNode.access & CodeConstants.ACC_STATIC) == 0) { // non-static member class
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+index 56e67715de8e9fa7c7bf7e341e50d37b0b6b1382..e8376e074749958d779a85f69dde0c7ff8656f87 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+@@ -22,6 +22,7 @@ import org.jetbrains.java.decompiler.main.DecompilerContext;
+ import org.jetbrains.java.decompiler.main.TextBuffer;
+ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
++import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
+ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
+ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+@@ -180,7 +181,9 @@ public class NewExprent extends Exprent {
+         List<VarVersionPair> sigFields = null;
+         if (newnode != null) { // own class
+           if (newnode.getWrapper() != null) {
+-            sigFields = newnode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, invsuper.getStringDescriptor()).signatureFields;
++            MethodWrapper wrapper = newnode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, invsuper.getStringDescriptor());
++            if (wrapper != null || !DecompilerContext.getOption(IFernflowerPreferences.IGNORE_INVALID_BYTECODE))
++              sigFields = wrapper.signatureFields;
+           }
+           else {
+             if (newnode.type == ClassNode.CLASS_MEMBER && (newnode.access & CodeConstants.ACC_STATIC) == 0 &&
+@@ -302,7 +305,9 @@ public class NewExprent extends Exprent {
+           List<VarVersionPair> sigFields = null;
+           if (newnode != null) { // own class
+             if (newnode.getWrapper() != null) {
+-              sigFields = newnode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, constructor.getStringDescriptor()).signatureFields;
++              MethodWrapper wrapper = newnode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, constructor.getStringDescriptor());
++              if (wrapper != null || !DecompilerContext.getOption(IFernflowerPreferences.IGNORE_INVALID_BYTECODE))
++                sigFields = wrapper.signatureFields;
+             }
+             else {
+               if (newnode.type == ClassNode.CLASS_MEMBER && (newnode.access & CodeConstants.ACC_STATIC) == 0 &&
+diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+index e85cd673a627d164a7c168bbf8a19f9a49c22c69..514351caac48358a3c10400dba4ca8bf40db0c6c 100644
+--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
++++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+@@ -27,6 +27,7 @@ public class SingleClassesTest extends SingleClassesTestBase {
+     return new HashMap<String, Object>() {{
+       put(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING, "1");
+       put(IFernflowerPreferences.DUMP_ORIGINAL_LINES, "1");
++      put(IFernflowerPreferences.IGNORE_INVALID_BYTECODE, "1");
+     }};
+   }
+ 

From 28d0153a60d4a679cf9af9ca06eee725e10af8bf Mon Sep 17 00:00:00 2001
From: sciwhiz12 <arnoldnunag12@gmail.com>
Date: Fri, 5 Feb 2021 04:57:43 +0800
Subject: [PATCH 07/22] Move to Gradle 6.8.1 and use java toolchains

---
 .../0001-Repository-meta-changes.patch        | 98 -------------------
 .../0051-Bulk-test-for-MC.patch               | 64 ------------
 2 files changed, 162 deletions(-)

diff --git a/FernFlower-Patches/0001-Repository-meta-changes.patch b/FernFlower-Patches/0001-Repository-meta-changes.patch
index c75333b..a6acc08 100644
--- a/FernFlower-Patches/0001-Repository-meta-changes.patch
+++ b/FernFlower-Patches/0001-Repository-meta-changes.patch
@@ -3,8 +3,6 @@ From: Lex Manos <LexManos@gmail.com>
 Date: Sat, 1 Aug 2015 11:35:52 -0700
 Subject: [PATCH] Repository meta changes
 
-SHA1 of original commits:
-59d19c77, d51c33c3, 77fcea54, 37cb58c7, 70c73055
 
 diff --git a/.gitignore b/.gitignore
 new file mode 100644
@@ -31,102 +29,6 @@ index 0000000000000000000000000000000000000000..f7284b5aab48e6a6430698fe3c0eb204
 +#other
 +repo
 +
-diff --git a/build.gradle b/build.gradle
-new file mode 100644
-index 0000000000000000000000000000000000000000..b07b27ac85efa26329091d217623301bc3cdba45
---- /dev/null
-+++ b/build.gradle
-@@ -0,0 +1,90 @@
-+apply plugin: 'eclipse'
-+apply plugin: 'idea'
-+apply plugin: 'maven'
-+apply plugin: 'java'
-+
-+version = "0.2.3"
-+group = "net.minecraftforge" //not sure if we shoulkd publish under this name, but it's our fork so meh
-+archivesBaseName = "forgeflower"
-+
-+sourceCompatibility = '1.6'
-+targetCompatibility = '1.6'
-+
-+sourceSets {
-+    main.java.srcDirs = ['src']
-+    test.java.srcDirs = ['test']
-+}
-+
-+repositories {
-+    mavenCentral()
-+}
-+
-+configurations {
-+    deployerJars
-+}
-+
-+dependencies {
-+    testCompile "junit:junit:4.12"
-+    testCompile 'org.hamcrest:hamcrest-core:1.3'
-+    testCompile 'org.hamcrest:hamcrest-library:1.3'
-+
-+    // maven deployment
-+    deployerJars "org.apache.maven.wagon:wagon-ssh:2.2"
-+}
-+
-+compileJava.options.encoding = "utf-8"
-+compileJava.options.deprecation = true
-+
-+jar.manifest {
-+    attributes "Main-Class" : "org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler"
-+}
-+
-+uploadArchives {
-+    repositories {
-+        add getProject().repositories.mavenLocal()
-+    }
-+    repositories.mavenDeployer {
-+        configuration = configurations.deployerJars
-+
-+        if (project.hasProperty("filesmaven")) {
-+            logger.info('Publishing to files server')
-+            repository(url: project.filesmaven.url) {
-+                authentication(userName: project.filesmaven.username, privateKey: project.filesmaven.key)
-+            }
-+        } else {
-+            logger.info('Publishing to repo folder')
-+            repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
-+        }
-+
-+        pom {
-+            groupId = project.group
-+            version = project.version
-+            artifactId = project.archivesBaseName
-+            project {
-+                name project.archivesBaseName
-+                packaging 'jar'
-+                description 'Fernflower from https://github.com/JetBrains/intellij-community as standalone library'
-+                url 'https://github.com/MinecraftForge/FernFlower'
-+
-+                scm {
-+                    url 'https://github.com/MinecraftForge/FernFlower'
-+                    connection 'scm:git:git://github.com/MinecraftForge/FernFlower.git'
-+                    developerConnection 'scm:git:git@github.com:MinecraftForge/FernFlower.git'
-+                }
-+
-+                issueManagement {
-+                    system 'github'
-+                    url 'https://github.com/MinecraftForge/FernFlower/issues'
-+                }
-+
-+                licenses {
-+                    license {
-+                        name 'Apache License 2.0'
-+                        url 'http://www.apache.org/licenses/LICENSE-2.0'
-+                        distribution 'repo'
-+                    }
-+                }
-+            }
-+        }
-+    }
-+}
 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
 new file mode 100644
 index 0000000000000000000000000000000000000000..c97a8bdb9088d370da7e88784a7a093b971aa23a
diff --git a/FernFlower-Patches/0051-Bulk-test-for-MC.patch b/FernFlower-Patches/0051-Bulk-test-for-MC.patch
index d3d2795..bf8126a 100644
--- a/FernFlower-Patches/0051-Bulk-test-for-MC.patch
+++ b/FernFlower-Patches/0051-Bulk-test-for-MC.patch
@@ -4,70 +4,6 @@ Date: Sun, 25 Oct 2015 10:29:37 -0400
 Subject: [PATCH] Bulk test for MC
 
 
-diff --git a/build.gradle b/build.gradle
-index b07b27ac85efa26329091d217623301bc3cdba45..7dec9ec6fb04c6cd2081f2e452d072f7451ddcad 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -17,6 +17,11 @@ sourceSets {
- 
- repositories {
-     mavenCentral()
-+   maven {
-+       name = "mc"
-+       url = "https://libraries.minecraft.net/"
-+   }
-+
- }
- 
- configurations {
-@@ -28,10 +33,47 @@ dependencies {
-     testCompile 'org.hamcrest:hamcrest-core:1.3'
-     testCompile 'org.hamcrest:hamcrest-library:1.3'
- 
-+  // MC test only
-+  testRuntime "oshi-project:oshi-core:1.1"
-+  testRuntime "net.java.dev.jna:jna:3.4.0"
-+  testRuntime "net.java.dev.jna:platform:3.4.0"
-+  testRuntime "com.ibm.icu:icu4j-core-mojang:51.2"
-+  testRuntime "net.sf.jopt-simple:jopt-simple:4.6"
-+  testRuntime "com.paulscode:codecjorbis:20101023"
-+  testRuntime "com.paulscode:codecwav:20101023"
-+  testRuntime "com.paulscode:libraryjavasound:20101123"
-+  testRuntime "com.paulscode:librarylwjglopenal:20100824"
-+  testRuntime "com.paulscode:soundsystem:20120107"
-+  testRuntime "io.netty:netty-all:4.0.23.Final"
-+  testRuntime "com.google.guava:guava:17.0"
-+  testRuntime "org.apache.commons:commons-lang3:3.3.2"
-+  testRuntime "commons-io:commons-io:2.4"
-+  testRuntime "commons-codec:commons-codec:1.9"
-+  testRuntime "net.java.jinput:jinput:2.0.5"
-+  testRuntime "net.java.jutils:jutils:1.0.0"
-+  testRuntime "com.google.code.gson:gson:2.2.4"
-+  testRuntime "com.mojang:authlib:1.5.21"
-+  testRuntime "com.mojang:realms:1.7.39"
-+  testRuntime "org.apache.commons:commons-compress:1.8.1"
-+  testRuntime "org.apache.httpcomponents:httpclient:4.3.3"
-+  testRuntime "commons-logging:commons-logging:1.1.3"
-+  testRuntime "org.apache.httpcomponents:httpcore:4.3.2"
-+  testRuntime "org.apache.logging.log4j:log4j-api:2.0-beta9"
-+  testRuntime "org.apache.logging.log4j:log4j-core:2.0-beta9"
-+  testRuntime "org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209"
-+  testRuntime "org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209"
-+  testRuntime "tv.twitch:twitch:6.5"
-+
-     // maven deployment
-     deployerJars "org.apache.maven.wagon:wagon-ssh:2.2"
- }
- 
-+test {
-+    systemProperties System.properties
-+	onOutput {
-+		descriptor, event -> logger.lifecycle("TESTOUTPUT:" + event.message)
-+	}
-+}
- compileJava.options.encoding = "utf-8"
- compileJava.options.deprecation = true
- 
 diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
 index f2c344a925dda9d1081aa867987147fd3fb3664e..77eda8797ac72262d0c6dabbbd06a0ed0f481596 100644
 --- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java

From 7617d7dcf663dae7bed7262818fe8b309a9e0b94 Mon Sep 17 00:00:00 2001
From: sciwhiz12 <sciwhiz12@sciwhiz12.tk>
Date: Mon, 15 Feb 2021 17:46:54 +0800
Subject: [PATCH 08/22] Add patch to set StructContext, courtesy of @TheCurle
 (#4)

---
 .../0057-Set-StructContext-early.patch        | 27 +++++++++++++++++++
 ...nd-line-argument-sef-SkipExtraFiles.patch} |  0
 ...g-argument-to-specify-a-config-file.patch} |  0
 ...le-for-renaming-abstract-parameters.patch} |  0
 ...-iib-option-IGNORE_INVALID_BYTECODE.patch} |  0
 5 files changed, 27 insertions(+)
 create mode 100644 FernFlower-Patches/0057-Set-StructContext-early.patch
 rename FernFlower-Patches/{0057-Add-new-command-line-argument-sef-SkipExtraFiles.patch => 0058-Add-new-command-line-argument-sef-SkipExtraFiles.patch} (100%)
 rename FernFlower-Patches/{0058-Add-cfg-argument-to-specify-a-config-file.patch => 0059-Add-cfg-argument-to-specify-a-config-file.patch} (100%)
 rename FernFlower-Patches/{0059-Add-a-metadata-file-for-renaming-abstract-parameters.patch => 0060-Add-a-metadata-file-for-renaming-abstract-parameters.patch} (100%)
 rename FernFlower-Patches/{0060-Add-in-iib-option-IGNORE_INVALID_BYTECODE.patch => 0061-Add-in-iib-option-IGNORE_INVALID_BYTECODE.patch} (100%)

diff --git a/FernFlower-Patches/0057-Set-StructContext-early.patch b/FernFlower-Patches/0057-Set-StructContext-early.patch
new file mode 100644
index 0000000..01cb2e4
--- /dev/null
+++ b/FernFlower-Patches/0057-Set-StructContext-early.patch
@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Curle <curle@gemwire.uk>
+Date: Fri, 18 Dec 2020 23:31:08 +0000
+Subject: [PATCH] Set StructContext early
+
+
+diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
+index 320e250ce1fe0eeca0194b296a3944cc710127bc..bc92f349c0d49038f113fd3cd11e9a52fd2763a1 100644
+--- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
++++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
+@@ -43,6 +43,8 @@ public class Fernflower implements IDecompiledData {
+     structContext = new StructContext(saver, this, new LazyLoader(provider));
+     DecompilerContext.initContext(options,logger);
+     DecompilerContext.setCounterContainer(new CounterContainer());
++    
++    DecompilerContext.setStructContext(structContext);
+ 
+     if (DecompilerContext.getOption(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH)) {
+       addAllClasspath();
+@@ -57,7 +59,6 @@ public class Fernflower implements IDecompiledData {
+     classesProcessor = new ClassesProcessor(structContext);
+ 
+     DecompilerContext.setClassProcessor(classesProcessor);
+-    DecompilerContext.setStructContext(structContext);
+ 
+     structContext.saveContext();
+   }
diff --git a/FernFlower-Patches/0057-Add-new-command-line-argument-sef-SkipExtraFiles.patch b/FernFlower-Patches/0058-Add-new-command-line-argument-sef-SkipExtraFiles.patch
similarity index 100%
rename from FernFlower-Patches/0057-Add-new-command-line-argument-sef-SkipExtraFiles.patch
rename to FernFlower-Patches/0058-Add-new-command-line-argument-sef-SkipExtraFiles.patch
diff --git a/FernFlower-Patches/0058-Add-cfg-argument-to-specify-a-config-file.patch b/FernFlower-Patches/0059-Add-cfg-argument-to-specify-a-config-file.patch
similarity index 100%
rename from FernFlower-Patches/0058-Add-cfg-argument-to-specify-a-config-file.patch
rename to FernFlower-Patches/0059-Add-cfg-argument-to-specify-a-config-file.patch
diff --git a/FernFlower-Patches/0059-Add-a-metadata-file-for-renaming-abstract-parameters.patch b/FernFlower-Patches/0060-Add-a-metadata-file-for-renaming-abstract-parameters.patch
similarity index 100%
rename from FernFlower-Patches/0059-Add-a-metadata-file-for-renaming-abstract-parameters.patch
rename to FernFlower-Patches/0060-Add-a-metadata-file-for-renaming-abstract-parameters.patch
diff --git a/FernFlower-Patches/0060-Add-in-iib-option-IGNORE_INVALID_BYTECODE.patch b/FernFlower-Patches/0061-Add-in-iib-option-IGNORE_INVALID_BYTECODE.patch
similarity index 100%
rename from FernFlower-Patches/0060-Add-in-iib-option-IGNORE_INVALID_BYTECODE.patch
rename to FernFlower-Patches/0061-Add-in-iib-option-IGNORE_INVALID_BYTECODE.patch

From 2cea121d1dc3d52387ff8ea140b0ad774ec567bd Mon Sep 17 00:00:00 2001
From: sciwhiz12 <arnoldnunag12@gmail.com>
Date: Tue, 16 Feb 2021 01:53:00 +0800
Subject: [PATCH 09/22] Add patch for prioritizing inconsistent inner class
 entries

---
 ...and-enclosing-class-when-encounterin.patch | 164 ++++++++++++++++++
 1 file changed, 164 insertions(+)
 create mode 100644 FernFlower-Patches/0062-Prioritize-self-and-enclosing-class-when-encounterin.patch

diff --git a/FernFlower-Patches/0062-Prioritize-self-and-enclosing-class-when-encounterin.patch b/FernFlower-Patches/0062-Prioritize-self-and-enclosing-class-when-encounterin.patch
new file mode 100644
index 0000000..6bb9b1e
--- /dev/null
+++ b/FernFlower-Patches/0062-Prioritize-self-and-enclosing-class-when-encounterin.patch
@@ -0,0 +1,164 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: sciwhiz12 <sciwhiz12@sciwhiz12.tk>
+Date: Tue, 16 Feb 2021 01:50:54 +0800
+Subject: [PATCH] Prioritize self and enclosing class when encountering
+ inconsistent inner class attributes
+
+The compiler encodes all REFERENCED inner classes into the class. The first found used to win, but now it's 'ThisClass > EnclosingClass > Others'.
+AccessTransformers only edit the targeted class as it can't find all references.
+
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+index 581ef65be27be38883be48fc6758642953c12468..538e85107cc68079240d04c801e22295841c5f37 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+@@ -44,6 +44,7 @@ import org.jetbrains.java.decompiler.struct.gen.generics.*;
+ import org.jetbrains.java.decompiler.util.InterpreterUtil;
+ 
+ import java.util.*;
++import java.util.stream.Collectors;
+ 
+ public class ClassWriter {
+ 
+@@ -997,6 +998,10 @@ public class ClassWriter {
+     put(CodeConstants.ACC_NATIVE, "native");
+   }};
+ 
++  public static String getModifiers(int flags) {
++    return MODIFIERS.entrySet().stream().filter(e -> (e.getKey() & flags) != 0).map(Map.Entry::getValue).collect(Collectors.joining(" "));
++  }
++
+   private static final int CLASS_ALLOWED =
+     CodeConstants.ACC_PUBLIC | CodeConstants.ACC_PROTECTED | CodeConstants.ACC_PRIVATE | CodeConstants.ACC_ABSTRACT |
+     CodeConstants.ACC_STATIC | CodeConstants.ACC_FINAL | CodeConstants.ACC_STRICT;
+diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+index e0fdaacc5d6f16c5eea148540b2c90758779deae..f79f8cd98f555b003a2f185980de3250c31ce417 100644
+--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
++++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+@@ -48,9 +48,29 @@ public class ClassesProcessor {
+ 
+   private final Map<String, ClassNode> mapRootClasses = new HashMap<String, ClassNode>();
+ 
++  private static class Inner {
++    private String simpleName;
++    private int type;
++    private int accessFlags;
++    private String source;
++
++    private static boolean equal(Inner o1, Inner o2) {
++      return o1.type == o2.type && o1.accessFlags == o2.accessFlags && InterpreterUtil.equalObjects(o1.simpleName, o2.simpleName);
++    }
++
++    @Override
++    public String toString() {
++      return simpleName + " " + ClassWriter.getModifiers(accessFlags) + " " + getType() + " " + source;
++    }
++
++    private String getType() {
++      return type == ClassNode.CLASS_ANONYMOUS ? "ANONYMOUS" : type == ClassNode.CLASS_LAMBDA ? "LAMBDA" : type == ClassNode.CLASS_LOCAL ? "LOCAL" : type == ClassNode.CLASS_MEMBER ? "MEMBER" : type == ClassNode.CLASS_ROOT ? "ROOT" : "UNKNOWN(" + type + ")";
++    }
++  }
++
+   public ClassesProcessor(StructContext context) {
+ 
+-    Map<String, Object[]> mapInnerClasses = new HashMap<String, Object[]>();
++    Map<String, Inner> mapInnerClasses = new HashMap<String, Inner>();
+     Map<String, Set<String>> mapNestedClassReferences = new HashMap<String, Set<String>>();
+     Map<String, Set<String>> mapEnclosingClassReferences = new HashMap<String, Set<String>>();
+     Map<String, String> mapNewSimpleNames = new HashMap<String, String>();
+@@ -66,32 +86,32 @@ public class ClassesProcessor {
+           if (inner != null) {
+ 
+             for (InnerClassInfo entry : inner.getEntries()) {
+-              Object[] arr = new Object[4]; // arr[0] not used
++              Inner rec = new Inner();
+               String innerName = entry.inner_class;
+ 
+               // nested class type
+               if (entry.inner_class != null) {
+                 if (entry.inner_name == null) {
+-                  arr[2] = ClassNode.CLASS_ANONYMOUS;
++                  rec.type = ClassNode.CLASS_ANONYMOUS;
+                 }
+                 else {
+                   StructClass in = context.getClass(entry.inner_class);
+                   if (in == null) { // A referenced library that was not added to the context, make assumptions
+-                    arr[2] = ClassNode.CLASS_MEMBER;
++                    rec.type = ClassNode.CLASS_MEMBER;
+                   }
+                   else {
+                     StructEnclosingMethodAttribute attr = (StructEnclosingMethodAttribute)in.getAttributes().getWithKey("EnclosingMethod");
+                     if (attr != null && attr.getMethodName() != null) {
+-                      arr[2] = ClassNode.CLASS_LOCAL;
++                      rec.type = ClassNode.CLASS_LOCAL;
+                     }
+                     else {
+-                      arr[2] = ClassNode.CLASS_MEMBER;
++                      rec.type = ClassNode.CLASS_MEMBER;
+                     }
+                   }
+                 }
+               }
+               else { // This should never happen as inner_class and outer_class are NOT optional, make assumptions
+-                arr[2] = ClassNode.CLASS_MEMBER;
++                rec.type = ClassNode.CLASS_MEMBER;
+               }
+ 
+               // original simple name
+@@ -109,10 +129,10 @@ public class ClassesProcessor {
+                 }
+               }
+ 
+-              arr[1] = simpleName;
++              rec.simpleName = simpleName;
+ 
+               // original access flags
+-              arr[3] = entry.access;
++              rec.accessFlags = entry.access;
+ 
+               // enclosing class
+               String enclClassName;
+@@ -127,13 +147,20 @@ public class ClassesProcessor {
+                 StructClass enclosing_class = context.getClasses().get(enclClassName);
+                 if (enclosing_class != null && enclosing_class.isOwn()) { // own classes only
+ 
+-                  Object[] arrOld = mapInnerClasses.get(innerName);
+-                  if (arrOld == null) {
+-                    mapInnerClasses.put(innerName, arr);
++                  Inner existingRec = mapInnerClasses.get(innerName);
++                  if (existingRec == null) {
++                    mapInnerClasses.put(innerName, rec);
+                   }
+-                  else if (!InterpreterUtil.equalObjectArrays(arrOld, arr)) {
++                  else if (!Inner.equal(existingRec, rec)) {
+                     String message = "Inconsistent inner class entries for " + innerName + "!";
+                     DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
++                    DecompilerContext.getLogger().writeMessage("  Old: " + existingRec.toString(), IFernflowerLogger.Severity.WARN);
++                    DecompilerContext.getLogger().writeMessage("  New: " + rec.toString(), IFernflowerLogger.Severity.WARN);
++                    int oldPriority = existingRec.source.equals(innerName) ? 1 : existingRec.source.equals(enclClassName) ? 2 : 3;
++                    int newPriority = rec.source.equals(innerName) ? 1 : rec.source.equals(enclClassName) ? 2 : 3;
++                    if (newPriority < oldPriority) {
++                      mapInnerClasses.put(innerName, rec);
++                    }
+                   }
+ 
+                   // reference to the nested class
+@@ -206,15 +233,15 @@ public class ClassesProcessor {
+                   continue;
+                 }
+ 
+-                Object[] arr = mapInnerClasses.get(nestedClass);
++                Inner rec = mapInnerClasses.get(nestedClass);
+ 
+                 //if ((Integer)arr[2] == ClassNode.CLASS_MEMBER) {
+                   // FIXME: check for consistent naming
+                 //}
+ 
+-                nestedNode.type = (Integer)arr[2];
+-                nestedNode.simpleName = (String)arr[1];
+-                nestedNode.access = (Integer)arr[3];
++                nestedNode.type = rec.type;
++                nestedNode.simpleName = rec.simpleName;
++                nestedNode.access = rec.accessFlags;
+ 
+                 if (nestedNode.type == ClassNode.CLASS_ANONYMOUS) {
+                   StructClass cl = nestedNode.classStruct;

From 8ab8b4f1fa54248e955ecb60ba1d46d997ac6744 Mon Sep 17 00:00:00 2001
From: sciwhiz12 <arnoldnunag12@gmail.com>
Date: Tue, 16 Feb 2021 02:13:02 +0800
Subject: [PATCH 10/22] Fix inner class patch (add in missing line)

---
 ...itize-self-and-enclosing-class-when-encounterin.patch | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/FernFlower-Patches/0062-Prioritize-self-and-enclosing-class-when-encounterin.patch b/FernFlower-Patches/0062-Prioritize-self-and-enclosing-class-when-encounterin.patch
index 6bb9b1e..367a1de 100644
--- a/FernFlower-Patches/0062-Prioritize-self-and-enclosing-class-when-encounterin.patch
+++ b/FernFlower-Patches/0062-Prioritize-self-and-enclosing-class-when-encounterin.patch
@@ -31,7 +31,7 @@ index 581ef65be27be38883be48fc6758642953c12468..538e85107cc68079240d04c801e22295
      CodeConstants.ACC_PUBLIC | CodeConstants.ACC_PROTECTED | CodeConstants.ACC_PRIVATE | CodeConstants.ACC_ABSTRACT |
      CodeConstants.ACC_STATIC | CodeConstants.ACC_FINAL | CodeConstants.ACC_STRICT;
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
-index e0fdaacc5d6f16c5eea148540b2c90758779deae..f79f8cd98f555b003a2f185980de3250c31ce417 100644
+index e0fdaacc5d6f16c5eea148540b2c90758779deae..917c804858922a2997e4e5cc1f67baaefab00f09 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
 @@ -48,9 +48,29 @@ public class ClassesProcessor {
@@ -104,7 +104,7 @@ index e0fdaacc5d6f16c5eea148540b2c90758779deae..f79f8cd98f555b003a2f185980de3250
                }
  
                // original simple name
-@@ -109,10 +129,10 @@ public class ClassesProcessor {
+@@ -109,10 +129,11 @@ public class ClassesProcessor {
                  }
                }
  
@@ -114,10 +114,11 @@ index e0fdaacc5d6f16c5eea148540b2c90758779deae..f79f8cd98f555b003a2f185980de3250
                // original access flags
 -              arr[3] = entry.access;
 +              rec.accessFlags = entry.access;
++              rec.source = cl.qualifiedName;
  
                // enclosing class
                String enclClassName;
-@@ -127,13 +147,20 @@ public class ClassesProcessor {
+@@ -127,13 +148,20 @@ public class ClassesProcessor {
                  StructClass enclosing_class = context.getClasses().get(enclClassName);
                  if (enclosing_class != null && enclosing_class.isOwn()) { // own classes only
  
@@ -142,7 +143,7 @@ index e0fdaacc5d6f16c5eea148540b2c90758779deae..f79f8cd98f555b003a2f185980de3250
                    }
  
                    // reference to the nested class
-@@ -206,15 +233,15 @@ public class ClassesProcessor {
+@@ -206,15 +234,15 @@ public class ClassesProcessor {
                    continue;
                  }
  

From a6c20c245b89bd97a61d5c0d948c188da12a6634 Mon Sep 17 00:00:00 2001
From: sciwhiz12 <arnoldnunag12@gmail.com>
Date: Tue, 16 Feb 2021 21:42:41 +0800
Subject: [PATCH 11/22] Add more stabilization patching from master ForgeFlower

---
 ...-lists-local-variables-variable-defi.patch | 221 +++++++++++++++++-
 ...-each-loop-detection-re-introduce-Do.patch |  20 +-
 ...ange-begin-end-detection.-Less-derpy.patch |   4 +-
 ...tractHelper-to-include-extractable-b.patch |   8 +-
 .../0043-Enhance-switches-on-enums.patch      |   8 +-
 ...bel-names-based-on-jvm-instruction-i.patch |   8 +-
 ...ashSet-to-LinkedHashSet-to-stabelize.patch |  74 ++----
 ...areas-on-Java-8.-Notibly-the-exit-ma.patch |  97 +-------
 8 files changed, 270 insertions(+), 170 deletions(-)

diff --git a/FernFlower-Patches/0005-Sort-inner-class-lists-local-variables-variable-defi.patch b/FernFlower-Patches/0005-Sort-inner-class-lists-local-variables-variable-defi.patch
index dee50f2..6102b18 100644
--- a/FernFlower-Patches/0005-Sort-inner-class-lists-local-variables-variable-defi.patch
+++ b/FernFlower-Patches/0005-Sort-inner-class-lists-local-variables-variable-defi.patch
@@ -40,10 +40,10 @@ index 5a56641c6f614fdf677f8e1900f803f73397867c..b3e9d81eaa3a4d86e4714adf2f8e007a
    }
  }
 diff --git a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
-index 0704efd84bdbd29cb6c9f5db79337147ac0b2be7..809af6d88b5f7c232539e0dbc4c7c8d7c5e26e3b 100644
+index 0704efd84bdbd29cb6c9f5db79337147ac0b2be7..e5f6d7235f27ed41754c534ec758a6c0502a51fa 100644
 --- a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
 +++ b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
-@@ -119,6 +119,7 @@ public class LambdaProcessor {
+@@ -119,11 +119,14 @@ public class LambdaProcessor {
              }
            }
          }
@@ -51,7 +51,14 @@ index 0704efd84bdbd29cb6c9f5db79337147ac0b2be7..809af6d88b5f7c232539e0dbc4c7c8d7
        }
  
        mt.releaseResources();
-@@ -133,6 +134,7 @@ public class LambdaProcessor {
+     }
+ 
++    Collections.sort(node.nested);
++
+     // build class hierarchy on lambda
+     for (ClassNode nd : node.nested) {
+       if (nd.type == ClassNode.CLASS_LAMBDA) {
+@@ -133,6 +136,7 @@ public class LambdaProcessor {
  
            parent_class.nested.add(nd);
            nd.parent = parent_class;
@@ -71,6 +78,51 @@ index 798010e24206ffcfb76b1f4936f9b5d3709a7275..9aedf22af1f60b3e17752769462aee91
  
          return true;
        }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
+index c93be38f6abaabfe2704a3fd7c8f0d17a1b9ff52..ac920538381ad0db746f31c1f026c9c6c8883156 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
+@@ -211,7 +211,7 @@ public class DomHelper {
+ 
+     RootStatement root = graphToStatement(graph);
+ 
+-    if (!processStatement(root, new HashMap<Integer, Set<Integer>>())) {
++    if (!processStatement(root, new LinkedHashMap<Integer, Set<Integer>>())) {
+ 
+       //			try {
+       //				DotExporter.toDotFile(root.getFirst().getStats().get(13), new File("c:\\Temp\\stat1.dot"));
+@@ -221,7 +221,7 @@ public class DomHelper {
+       throw new RuntimeException("parsing failure!");
+     }
+ 
+-    LabelHelper.lowContinueLabels(root, new HashSet<StatEdge>());
++    LabelHelper.lowContinueLabels(root, new LinkedHashSet<StatEdge>());
+ 
+     SequenceHelper.condenseSequences(root);
+     root.buildMonitorFlags();
+@@ -486,11 +486,11 @@ public class DomHelper {
+ 
+         boolean same = (post == head);
+ 
+-        HashSet<Statement> setNodes = new HashSet<Statement>();
++        HashSet<Statement> setNodes = new LinkedHashSet<Statement>();
+         HashSet<Statement> setPreds = new HashSet<Statement>();
+ 
+         // collect statement nodes
+-        HashSet<Statement> setHandlers = new HashSet<Statement>();
++        HashSet<Statement> setHandlers = new LinkedHashSet<Statement>();
+         setHandlers.add(head);
+         while (true) {
+ 
+@@ -638,7 +638,7 @@ public class DomHelper {
+               if (setOldNodes.contains(key)) {
+                 Set<Integer> setNew = mapExtPost.get(newid);
+                 if (setNew == null) {
+-                  mapExtPost.put(newid, setNew = new HashSet<Integer>());
++                  mapExtPost.put(newid, setNew = new LinkedHashSet<Integer>());
+                 }
+                 setNew.addAll(set);
+ 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
 index 9296bb3f6007bda9647e2f0d919cdfd311567222..205b1876758155132600148f61f641b64e42369c 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -123,6 +175,99 @@ index 9f1c11b318b128a3bf8dc17e3a6d343ef07800d7..ee8d4cee6cbb439907fb9d9c3f7f61a1
        BasicBlock last = entry.getKey();
  
        if (entry.getValue()) {
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
+index 26cc638aacb1ae120a4f0000bf224eb01cefe1f1..8ec889c05a77f344d011cb95ab9646a2cd217958 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
+@@ -33,7 +33,7 @@ public class LabelHelper {
+ 
+     liftClosures(root);
+ 
+-    lowContinueLabels(root, new HashSet<StatEdge>());
++    lowContinueLabels(root, new LinkedHashSet<StatEdge>());
+ 
+     lowClosures(root);
+   }
+@@ -131,7 +131,7 @@ public class LabelHelper {
+         lowContinueLabels(st, edges);
+       }
+       else {
+-        lowContinueLabels(st, new HashSet<StatEdge>());
++        lowContinueLabels(st, new LinkedHashSet<StatEdge>());
+       }
+     }
+   }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
+index 89e684930084f603339ce2cb067ec9719532110c..1aa61c4c7e866da335ab96177283a702153cb748 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
+@@ -27,10 +27,10 @@ public class DominatorTreeExceptionFilter {
+   private final Statement statement;
+ 
+   // idom, nodes
+-  private final Map<Integer, Set<Integer>> mapTreeBranches = new HashMap<Integer, Set<Integer>>();
++  private final Map<Integer, Set<Integer>> mapTreeBranches = new LinkedHashMap<Integer, Set<Integer>>();
+ 
+   // handler, range nodes
+-  private final Map<Integer, Set<Integer>> mapExceptionRanges = new HashMap<Integer, Set<Integer>>();
++  private final Map<Integer, Set<Integer>> mapExceptionRanges = new LinkedHashMap<Integer, Set<Integer>>();
+ 
+   // handler, head dom
+   private Map<Integer, Integer> mapExceptionDoms = new HashMap<Integer, Integer>();
+@@ -86,7 +86,7 @@ public class DominatorTreeExceptionFilter {
+ 
+       Set<Integer> set = mapTreeBranches.get(idom);
+       if (set == null) {
+-        mapTreeBranches.put(idom, set = new HashSet<Integer>());
++        mapTreeBranches.put(idom, set = new LinkedHashSet<Integer>());
+       }
+       set.add(key);
+     }
+@@ -101,7 +101,7 @@ public class DominatorTreeExceptionFilter {
+       List<Statement> lstPreds = stat.getNeighbours(StatEdge.TYPE_EXCEPTION, Statement.DIRECTION_BACKWARD);
+       if (!lstPreds.isEmpty()) {
+ 
+-        Set<Integer> set = new HashSet<Integer>();
++        Set<Integer> set = new LinkedHashSet<Integer>();
+ 
+         for (Statement st : lstPreds) {
+           set.add(st.id);
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
+index 52338f909228f21a19a2a6e31cc734bdbcd024ff..84d1d9bbd2d07a0f18fa0fdcd7dba6e348e33134 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
+@@ -28,9 +28,9 @@ public class FastExtendedPostdominanceHelper {
+ 
+   private List<Statement> lstReversePostOrderList;
+ 
+-  private HashMap<Integer, FastFixedSet<Integer>> mapSupportPoints = new HashMap<Integer, FastFixedSet<Integer>>();
++  private HashMap<Integer, FastFixedSet<Integer>> mapSupportPoints = new LinkedHashMap<Integer, FastFixedSet<Integer>>();
+ 
+-  private final HashMap<Integer, FastFixedSet<Integer>> mapExtPostdominators = new HashMap<Integer, FastFixedSet<Integer>>();
++  private final HashMap<Integer, FastFixedSet<Integer>> mapExtPostdominators = new LinkedHashMap<Integer, FastFixedSet<Integer>>();
+ 
+   private Statement statement;
+ 
+@@ -40,7 +40,7 @@ public class FastExtendedPostdominanceHelper {
+ 
+     this.statement = statement;
+ 
+-    HashSet<Integer> set = new HashSet<Integer>();
++    HashSet<Integer> set = new LinkedHashSet<Integer>();
+     for (Statement st : statement.getStats()) {
+       set.add(st.id);
+     }
+@@ -67,7 +67,9 @@ public class FastExtendedPostdominanceHelper {
+ 
+     HashMap<Integer, Set<Integer>> res = new HashMap<Integer, Set<Integer>>();
+     for (Entry<Integer, FastFixedSet<Integer>> entry : mapExtPostdominators.entrySet()) {
+-      res.put(entry.getKey(), entry.getValue().toPlainSet());
++      List<Integer> lst = new ArrayList<>(entry.getValue().toPlainSet());
++      Collections.sort(lst);
++      res.put(entry.getKey(), new LinkedHashSet<>(lst));
+     }
+ 
+     return res;
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
 index fbd146eca6b7efc4d56e96121a7c6d91748d077c..5f2cb56a85b9ac61141de1c17b457e5847eb8fff 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
@@ -224,6 +369,76 @@ index fbd146eca6b7efc4d56e96121a7c6d91748d077c..5f2cb56a85b9ac61141de1c17b457e58
 +    return ret;
 +  }
  }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
+index 76a973f9d5813db6c4422b588ec910662dc634a2..2b2167a215106c1024115a9c98b9e67f9cce1ad6 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
+@@ -73,7 +73,7 @@ public class SSAConstructorSparseEx {
+     // DotExporter.toDotFile(dgraph, new File("c:\\Temp\\gr12_my.dot"));
+     // } catch(Exception ex) {ex.printStackTrace();}
+ 
+-    HashSet<Integer> setInit = new HashSet<Integer>();
++    List<Integer> setInit = new ArrayList<Integer>();
+     for (int i = 0; i < 64; i++) {
+       setInit.add(i);
+     }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
+index 95cefcfeef4cbbd2c6e863ae31efd74ee48cd724..220da75f37dde2eab94c042c0e0929b004e7f8ed 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
+@@ -88,7 +88,7 @@ public class SSAUConstructorSparseEx {
+     FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
+     DirectGraph dgraph = flatthelper.buildDirectGraph(root);
+ 
+-    HashSet<Integer> setInit = new HashSet<Integer>();
++    List<Integer> setInit = new ArrayList<Integer>();
+     for (int i = 0; i < 64; i++) {
+       setInit.add(i);
+     }
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
+index 4f22cf710a67e5f0d69951fb4bee6fa194e5a4ea..c0455987e9e8c7d2c99c155f997d378179dcb4c8 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
+@@ -20,7 +20,8 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+ 
+ import java.util.Collection;
+ import java.util.HashSet;
+-
++import java.util.LinkedHashSet;
++import java.util.Set;
+ 
+ public class GeneralStatement extends Statement {
+ 
+@@ -39,7 +40,7 @@ public class GeneralStatement extends Statement {
+     first = head;
+     stats.addWithKey(head, head.id);
+ 
+-    HashSet<Statement> set = new HashSet<Statement>(statements);
++    Set<Statement> set = new LinkedHashSet<Statement>(statements);
+     set.remove(head);
+ 
+     for (Statement st : set) {
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
+index 59164900d91a1d02526de1ab32958fac7083357b..97880cd0c8c820f5a157a6e206d7156f7433aa56 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
+@@ -75,7 +75,15 @@ public class SwitchStatement extends Statement {
+ 
+     default_edge = head.getSuccessorEdges(Statement.STATEDGE_DIRECT_ALL).get(0);
+ 
+-    for (Statement st : lstNodes) {
++    // We need to use set above in case we have multiple edges to the same node. But HashSets iterator is not ordered, so sort
++    List<Statement> sorted = new ArrayList<>(lstNodes);
++    Collections.sort(sorted, new Comparator<Statement>() {
++      @Override
++      public int compare(Statement o1, Statement o2) {
++        return o1.id - o2.id;
++      }
++    });
++    for (Statement st : sorted) {
+       stats.addWithKey(st, st.id);
+     }
+   }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
 index 31f0f86d4423ac537faf31b7f16833f263801b23..4751052a5468ffc469d7166bce648d5b658e040d 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
diff --git a/FernFlower-Patches/0013-Add-enhanced-for-each-loop-detection-re-introduce-Do.patch b/FernFlower-Patches/0013-Add-enhanced-for-each-loop-detection-re-introduce-Do.patch
index 47a4c0f..c3e1553 100644
--- a/FernFlower-Patches/0013-Add-enhanced-for-each-loop-detection-re-introduce-Do.patch
+++ b/FernFlower-Patches/0013-Add-enhanced-for-each-loop-detection-re-introduce-Do.patch
@@ -539,7 +539,7 @@ index 971ace503b1289a07195289a8e951ae192d9123a..d88480ef7133b0c27ff18518599127ec
  
                  DirectNode nodeinc = new DirectNode(DirectNode.NODE_INCREMENT, stat, stat.id + "_inc");
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
-index 76a973f9d5813db6c4422b588ec910662dc634a2..7f4118cd58c31d58c3715e67bbe2ad8f227da8b8 100644
+index 2b2167a215106c1024115a9c98b9e67f9cce1ad6..ea50bd65b736dfd71f65de2e635330b0ce8db0a6 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
 @@ -59,6 +59,7 @@ public class SSAConstructorSparseEx {
@@ -550,7 +550,7 @@ index 76a973f9d5813db6c4422b588ec910662dc634a2..7f4118cd58c31d58c3715e67bbe2ad8f
    private final List<VarVersionPair> startVars = new ArrayList<VarVersionPair>();
  
    // set factory
-@@ -69,11 +70,9 @@ public class SSAConstructorSparseEx {
+@@ -69,9 +70,7 @@ public class SSAConstructorSparseEx {
      FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
      DirectGraph dgraph = flatthelper.buildDirectGraph(root);
  
@@ -559,11 +559,8 @@ index 76a973f9d5813db6c4422b588ec910662dc634a2..7f4118cd58c31d58c3715e67bbe2ad8f
 -    // } catch(Exception ex) {ex.printStackTrace();}
 +    org.jetbrains.java.decompiler.util.DotExporter.toDotFile(dgraph, mt, "ssaSplitVariables");
  
--    HashSet<Integer> setInit = new HashSet<Integer>();
-+    List<Integer> setInit = new ArrayList<Integer>(); //Important: HashSets have undefined order, so use a ordered list.
+     List<Integer> setInit = new ArrayList<Integer>();
      for (int i = 0; i < 64; i++) {
-       setInit.add(i);
-     }
 @@ -84,20 +83,19 @@ public class SSAConstructorSparseEx {
  
      setCatchMaps(root, dgraph, flatthelper);
@@ -598,21 +595,18 @@ index 76a973f9d5813db6c4422b588ec910662dc634a2..7f4118cd58c31d58c3715e67bbe2ad8f
      return startVars;
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
-index 95cefcfeef4cbbd2c6e863ae31efd74ee48cd724..9ba8195cd90a7d7c78fca7fa28cf7370d319768c 100644
+index 220da75f37dde2eab94c042c0e0929b004e7f8ed..94b4cbac5f02ace7ba2f1505fdb6794b182312f5 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
-@@ -88,7 +88,9 @@ public class SSAUConstructorSparseEx {
-     FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
+@@ -89,6 +89,7 @@ public class SSAUConstructorSparseEx {
      DirectGraph dgraph = flatthelper.buildDirectGraph(root);
  
--    HashSet<Integer> setInit = new HashSet<Integer>();
+     List<Integer> setInit = new ArrayList<Integer>();
 +    org.jetbrains.java.decompiler.util.DotExporter.toDotFile(dgraph, mt, "ssauSplitVariables");
-+
-+    List<Integer> setInit = new ArrayList<Integer>(); //Important: HashSets have undefined order, so use a ordered list.
      for (int i = 0; i < 64; i++) {
        setInit.add(i);
      }
-@@ -98,25 +100,25 @@ public class SSAUConstructorSparseEx {
+@@ -98,25 +99,25 @@ public class SSAUConstructorSparseEx {
  
      setCatchMaps(root, dgraph, flatthelper);
  
diff --git a/FernFlower-Patches/0023-Change-begin-end-detection.-Less-derpy.patch b/FernFlower-Patches/0023-Change-begin-end-detection.-Less-derpy.patch
index c2099f7..bc738fb 100644
--- a/FernFlower-Patches/0023-Change-begin-end-detection.-Less-derpy.patch
+++ b/FernFlower-Patches/0023-Change-begin-end-detection.-Less-derpy.patch
@@ -196,7 +196,7 @@ index c12605070b1de0bd65ebed44eacb25467666efbc..f71ed84bc4ad195a97b4c535f21b55a9
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
-index 59164900d91a1d02526de1ab32958fac7083357b..3e272016903de00ee47c55fad62db4b0687a04b5 100644
+index 97880cd0c8c820f5a157a6e206d7156f7433aa56..f4acbd4fb624b6d818fa78cdbdbe2f39ad1dc9aa 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
 @@ -27,6 +27,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
@@ -207,7 +207,7 @@ index 59164900d91a1d02526de1ab32958fac7083357b..3e272016903de00ee47c55fad62db4b0
  import org.jetbrains.java.decompiler.struct.gen.VarType;
  
  import java.util.*;
-@@ -365,4 +366,15 @@ public class SwitchStatement extends Statement {
+@@ -373,4 +374,15 @@ public class SwitchStatement extends Statement {
    public List<List<ConstExprent>> getCaseValues() {
      return caseValues;
    }
diff --git a/FernFlower-Patches/0034-Loosen-up-LoopExtractHelper-to-include-extractable-b.patch b/FernFlower-Patches/0034-Loosen-up-LoopExtractHelper-to-include-extractable-b.patch
index 6b16af7..4a13a5e 100644
--- a/FernFlower-Patches/0034-Loosen-up-LoopExtractHelper-to-include-extractable-b.patch
+++ b/FernFlower-Patches/0034-Loosen-up-LoopExtractHelper-to-include-extractable-b.patch
@@ -138,7 +138,7 @@ index ef7e97a5e99899896b11376fd31e3511fb5b06b5..eca34134bf72cb0ddc9e3b245ca38474
        return sb.toString();
    }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
-index c93be38f6abaabfe2704a3fd7c8f0d17a1b9ff52..67d16d5c139033d4774acc22c54b8866594c3ec5 100644
+index ac920538381ad0db746f31c1f026c9c6c8883156..e044890242dd7998a4414ac44da2ec045fed88a8 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
 @@ -20,9 +20,12 @@ import org.jetbrains.java.decompiler.code.cfg.ControlFlowGraph;
@@ -154,7 +154,7 @@ index c93be38f6abaabfe2704a3fd7c8f0d17a1b9ff52..67d16d5c139033d4774acc22c54b8866
  import org.jetbrains.java.decompiler.util.FastFixedSetFactory;
  import org.jetbrains.java.decompiler.util.FastFixedSetFactory.FastFixedSet;
  import org.jetbrains.java.decompiler.util.InterpreterUtil;
-@@ -207,17 +210,11 @@ public class DomHelper {
+@@ -207,17 +210,12 @@ public class DomHelper {
      return ret;
    }
  
@@ -162,8 +162,8 @@ index c93be38f6abaabfe2704a3fd7c8f0d17a1b9ff52..67d16d5c139033d4774acc22c54b8866
 +  public static RootStatement parseGraph(ControlFlowGraph graph, StructMethod mt) {
  
      RootStatement root = graphToStatement(graph);
--
-     if (!processStatement(root, new HashMap<Integer, Set<Integer>>())) {
+ 
+     if (!processStatement(root, new LinkedHashMap<Integer, Set<Integer>>())) {
 -
 -      //			try {
 -      //				DotExporter.toDotFile(root.getFirst().getStats().get(13), new File("c:\\Temp\\stat1.dot"));
diff --git a/FernFlower-Patches/0043-Enhance-switches-on-enums.patch b/FernFlower-Patches/0043-Enhance-switches-on-enums.patch
index 45ef1b5..b77ee2c 100644
--- a/FernFlower-Patches/0043-Enhance-switches-on-enums.patch
+++ b/FernFlower-Patches/0043-Enhance-switches-on-enums.patch
@@ -179,7 +179,7 @@ index 33785497b358346846ce58824ce3c2f0aa2be815..1eaeaa6519574c4defe41c789743631f
  
      if (child.lambdaInformation.is_method_reference) { // method reference, no code and no parameters
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
-index 3e272016903de00ee47c55fad62db4b0687a04b5..f8eec64ce7edbb2ff9e4d76c7d9e59c42060e57f 100644
+index f4acbd4fb624b6d818fa78cdbdbe2f39ad1dc9aa..fec1d7552348fca1d200e164219f1cf542c2c3ad 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
 @@ -24,10 +24,14 @@ import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
@@ -197,7 +197,7 @@ index 3e272016903de00ee47c55fad62db4b0687a04b5..f8eec64ce7edbb2ff9e4d76c7d9e59c4
  import org.jetbrains.java.decompiler.struct.gen.VarType;
  
  import java.util.*;
-@@ -118,7 +122,12 @@ public class SwitchStatement extends Statement {
+@@ -126,7 +130,12 @@ public class SwitchStatement extends Statement {
        tracer.incrementCurrentSourceLine();
      }
  
@@ -211,7 +211,7 @@ index 3e272016903de00ee47c55fad62db4b0687a04b5..f8eec64ce7edbb2ff9e4d76c7d9e59c4
      tracer.incrementCurrentSourceLine();
  
      VarType switch_type = headexprent.get(0).getExprType();
-@@ -138,7 +147,14 @@ public class SwitchStatement extends Statement {
+@@ -146,7 +155,14 @@ public class SwitchStatement extends Statement {
            ConstExprent value = (ConstExprent)values.get(j).copy();
            value.setConstType(switch_type);
  
@@ -227,7 +227,7 @@ index 3e272016903de00ee47c55fad62db4b0687a04b5..f8eec64ce7edbb2ff9e4d76c7d9e59c4
            tracer.incrementCurrentSourceLine();
          }
        }
-@@ -152,6 +168,41 @@ public class SwitchStatement extends Statement {
+@@ -160,6 +176,41 @@ public class SwitchStatement extends Statement {
      return buf;
    }
  
diff --git a/FernFlower-Patches/0047-Deterministic-label-names-based-on-jvm-instruction-i.patch b/FernFlower-Patches/0047-Deterministic-label-names-based-on-jvm-instruction-i.patch
index 9879ec6..652de0a 100644
--- a/FernFlower-Patches/0047-Deterministic-label-names-based-on-jvm-instruction-i.patch
+++ b/FernFlower-Patches/0047-Deterministic-label-names-based-on-jvm-instruction-i.patch
@@ -58,10 +58,10 @@ index acc74a60fd6a90ad15959f6c3164757390542ada..6636d1dab67c0ad87b98fd6b9ebfeca7
      }
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
-index 4f22cf710a67e5f0d69951fb4bee6fa194e5a4ea..499894a572629a0e14aba0ebfae4929d6e0eec18 100644
+index c0455987e9e8c7d2c99c155f997d378179dcb4c8..dc9789593e86b85d293c7620e4255fa9bafe3e81 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
-@@ -57,7 +57,7 @@ public class GeneralStatement extends Statement {
+@@ -58,7 +58,7 @@ public class GeneralStatement extends Statement {
      TextBuffer buf = new TextBuffer();
  
      if (isLabeled()) {
@@ -106,10 +106,10 @@ index 7d2ee435ce1c153b6da410d825d697d9790e35fe..92588febd470b2cf9db2d9f7ff3ae4e2
      }
  
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
-index f8eec64ce7edbb2ff9e4d76c7d9e59c42060e57f..2a2930908a9051cea5f590d0a6e66d38689d1753 100644
+index fec1d7552348fca1d200e164219f1cf542c2c3ad..1624ce778d827671f916cc822335febaa1df60cf 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
-@@ -118,7 +118,7 @@ public class SwitchStatement extends Statement {
+@@ -126,7 +126,7 @@ public class SwitchStatement extends Statement {
      buf.append(first.toJava(indent, tracer));
  
      if (isLabeled()) {
diff --git a/FernFlower-Patches/0049-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch b/FernFlower-Patches/0049-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch
index 06e4f77..5c7eff8 100644
--- a/FernFlower-Patches/0049-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch
+++ b/FernFlower-Patches/0049-More-move-from-HashSet-to-LinkedHashSet-to-stabelize.patch
@@ -6,25 +6,19 @@ Subject: [PATCH] More move from HashSet to LinkedHashSet to stabelize
 
 
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
-index 67d16d5c139033d4774acc22c54b8866594c3ec5..c45f5e06dba0607232dd1fac4c089a22ceeede7b 100644
+index e044890242dd7998a4414ac44da2ec045fed88a8..7434b14c7c6d2d9ff2a10f66c9da848cf25b3a9e 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
-@@ -213,12 +213,12 @@ public class DomHelper {
-   public static RootStatement parseGraph(ControlFlowGraph graph, StructMethod mt) {
+@@ -214,7 +214,7 @@ public class DomHelper {
  
      RootStatement root = graphToStatement(graph);
--    if (!processStatement(root, new HashMap<Integer, Set<Integer>>())) {
-+    if (!processStatement(root, new HashMap<Integer, LinkedHashSet<Integer>>())) {
+ 
+-    if (!processStatement(root, new LinkedHashMap<Integer, Set<Integer>>())) {
++    if (!processStatement(root, new LinkedHashMap<Integer, LinkedHashSet<Integer>>())) {
        DotExporter.toDotFile(graph, mt, "parseGraphFail", true);
        throw new RuntimeException("parsing failure!");
      }
- 
--    LabelHelper.lowContinueLabels(root, new HashSet<StatEdge>());
-+    LabelHelper.lowContinueLabels(root, new LinkedHashSet<StatEdge>());
- 
-     SequenceHelper.condenseSequences(root);
-     root.buildMonitorFlags();
-@@ -309,7 +309,7 @@ public class DomHelper {
+@@ -310,7 +310,7 @@ public class DomHelper {
      }
    }
  
@@ -33,7 +27,7 @@ index 67d16d5c139033d4774acc22c54b8866594c3ec5..c45f5e06dba0607232dd1fac4c089a22
  
      if (general.type == Statement.TYPE_ROOT) {
        Statement stat = general.getFirst();
-@@ -358,7 +358,7 @@ public class DomHelper {
+@@ -359,7 +359,7 @@ public class DomHelper {
            //						DotExporter.toDotFile(general, new File("c:\\Temp\\stat1.dot"));
            //					} catch(Exception ex) {ex.printStackTrace();}
  
@@ -42,7 +36,7 @@ index 67d16d5c139033d4774acc22c54b8866594c3ec5..c45f5e06dba0607232dd1fac4c089a22
            mapRefreshed = true;
          }
  
-@@ -379,7 +379,7 @@ public class DomHelper {
+@@ -380,7 +380,7 @@ public class DomHelper {
              Statement stat = findGeneralStatement(general, forceall, mapExtPost);
  
              if (stat != null) {
@@ -51,7 +45,7 @@ index 67d16d5c139033d4774acc22c54b8866594c3ec5..c45f5e06dba0607232dd1fac4c089a22
  
                if (complete) {
                  // replace general purpose statement with simple one
-@@ -389,7 +389,7 @@ public class DomHelper {
+@@ -390,7 +390,7 @@ public class DomHelper {
                  return false;
                }
  
@@ -60,7 +54,7 @@ index 67d16d5c139033d4774acc22c54b8866594c3ec5..c45f5e06dba0607232dd1fac4c089a22
                mapRefreshed = true;
                reducibility = 0;
              }
-@@ -410,14 +410,14 @@ public class DomHelper {
+@@ -411,14 +411,14 @@ public class DomHelper {
          break;
        }
        else {
@@ -77,7 +71,7 @@ index 67d16d5c139033d4774acc22c54b8866594c3ec5..c45f5e06dba0607232dd1fac4c089a22
  
      VBStyleCollection<Statement, Integer> stats = stat.getStats();
      VBStyleCollection<List<Integer>, Integer> vbPost;
-@@ -595,7 +595,7 @@ public class DomHelper {
+@@ -596,7 +596,7 @@ public class DomHelper {
      return true;
    }
  
@@ -86,19 +80,16 @@ index 67d16d5c139033d4774acc22c54b8866594c3ec5..c45f5e06dba0607232dd1fac4c089a22
  
      boolean found, success = false;
  
-@@ -633,9 +633,9 @@ public class DomHelper {
+@@ -634,7 +634,7 @@ public class DomHelper {
                set.removeAll(setOldNodes);
  
                if (setOldNodes.contains(key)) {
 -                Set<Integer> setNew = mapExtPost.get(newid);
 +                LinkedHashSet<Integer> setNew = mapExtPost.get(newid);
                  if (setNew == null) {
--                  mapExtPost.put(newid, setNew = new HashSet<Integer>());
-+                  mapExtPost.put(newid, setNew = new LinkedHashSet<Integer>());
+                   mapExtPost.put(newid, setNew = new LinkedHashSet<Integer>());
                  }
-                 setNew.addAll(set);
- 
-@@ -666,7 +666,6 @@ public class DomHelper {
+@@ -667,7 +667,6 @@ public class DomHelper {
  
  
    private static Statement detectStatement(Statement head) {
@@ -107,18 +98,9 @@ index 67d16d5c139033d4774acc22c54b8866594c3ec5..c45f5e06dba0607232dd1fac4c089a22
  
      if ((res = DoStatement.isHead(head)) != null) {
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
-index 26cc638aacb1ae120a4f0000bf224eb01cefe1f1..9bf29358c5c3c36c1fa69198ad17587a21d66823 100644
+index 8ec889c05a77f344d011cb95ab9646a2cd217958..9bf29358c5c3c36c1fa69198ad17587a21d66823 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
-@@ -33,7 +33,7 @@ public class LabelHelper {
- 
-     liftClosures(root);
- 
--    lowContinueLabels(root, new HashSet<StatEdge>());
-+    lowContinueLabels(root, new LinkedHashSet<StatEdge>());
- 
-     lowClosures(root);
-   }
 @@ -99,7 +99,7 @@ public class LabelHelper {
      }
    }
@@ -128,17 +110,8 @@ index 26cc638aacb1ae120a4f0000bf224eb01cefe1f1..9bf29358c5c3c36c1fa69198ad17587a
  
      boolean ok = (stat.type != Statement.TYPE_DO);
      if (!ok) {
-@@ -131,7 +131,7 @@ public class LabelHelper {
-         lowContinueLabels(st, edges);
-       }
-       else {
--        lowContinueLabels(st, new HashSet<StatEdge>());
-+        lowContinueLabels(st, new LinkedHashSet<StatEdge>());
-       }
-     }
-   }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
-index 52338f909228f21a19a2a6e31cc734bdbcd024ff..eee7b15dc347c9582f49f13c41106f76ff14b064 100644
+index 84d1d9bbd2d07a0f18fa0fdcd7dba6e348e33134..3fd6bf4d788b9110f362d477ee273057d18ae819 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
 @@ -36,7 +36,7 @@ public class FastExtendedPostdominanceHelper {
@@ -150,21 +123,16 @@ index 52338f909228f21a19a2a6e31cc734bdbcd024ff..eee7b15dc347c9582f49f13c41106f76
  
      this.statement = statement;
  
-@@ -65,9 +65,11 @@ public class FastExtendedPostdominanceHelper {
+@@ -65,7 +65,7 @@ public class FastExtendedPostdominanceHelper {
  
      filterOnDominance(filter);
  
 -    HashMap<Integer, Set<Integer>> res = new HashMap<Integer, Set<Integer>>();
 +    HashMap<Integer, LinkedHashSet<Integer>> res = new HashMap<Integer, LinkedHashSet<Integer>>();
      for (Entry<Integer, FastFixedSet<Integer>> entry : mapExtPostdominators.entrySet()) {
--      res.put(entry.getKey(), entry.getValue().toPlainSet());
-+      List<Integer> lst =  new ArrayList<Integer>(entry.getValue().toPlainSet());
-+      Collections.sort(lst); // Order matters!
-+      res.put(entry.getKey(), new LinkedHashSet<Integer>(lst));
-     }
- 
-     return res;
-@@ -91,7 +93,7 @@ public class FastExtendedPostdominanceHelper {
+       List<Integer> lst = new ArrayList<>(entry.getValue().toPlainSet());
+       Collections.sort(lst);
+@@ -93,7 +93,7 @@ public class FastExtendedPostdominanceHelper {
        Set<Statement> setVisited = new HashSet<Statement>();
  
        setVisited.add(stack.getFirst());
@@ -173,7 +141,7 @@ index 52338f909228f21a19a2a6e31cc734bdbcd024ff..eee7b15dc347c9582f49f13c41106f76
        while (!stack.isEmpty()) {
  
          Statement stat = stack.removeFirst();
-@@ -109,17 +111,17 @@ public class FastExtendedPostdominanceHelper {
+@@ -111,17 +111,17 @@ public class FastExtendedPostdominanceHelper {
            setPostdoms.complement(path);
            continue;
          }
diff --git a/FernFlower-Patches/0052-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch b/FernFlower-Patches/0052-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch
index bce4a6a..7f2bf90 100644
--- a/FernFlower-Patches/0052-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch
+++ b/FernFlower-Patches/0052-Stabelize-a-few-areas-on-Java-8.-Notibly-the-exit-ma.patch
@@ -31,113 +31,36 @@ index 16d778867677249c16b38fcfbca16618b1fa4ac0..9bcd3ba461d73cb139bca4fc0756130d
          System.out.print(" t:"+((DoStatement)statement).getLooptype());
      } else if (statement.type == Statement.TYPE_BASICBLOCK) {
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
-index c45f5e06dba0607232dd1fac4c089a22ceeede7b..e780bd6642f5ebca0af8971bb209630e44bb3b0a 100644
+index 7434b14c7c6d2d9ff2a10f66c9da848cf25b3a9e..3c5a86d8ecb45644c65b4507cdf87d91b8aaa1c3 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
-@@ -483,11 +483,11 @@ public class DomHelper {
+@@ -484,7 +484,7 @@ public class DomHelper {
  
          boolean same = (post == head);
  
--        HashSet<Statement> setNodes = new HashSet<Statement>();
+-        HashSet<Statement> setNodes = new LinkedHashSet<Statement>();
 +        LinkedHashSet<Statement> setNodes = new LinkedHashSet<Statement>();
          HashSet<Statement> setPreds = new HashSet<Statement>();
  
          // collect statement nodes
--        HashSet<Statement> setHandlers = new HashSet<Statement>();
-+        HashSet<Statement> setHandlers = new LinkedHashSet<Statement>();
-         setHandlers.add(head);
-         while (true) {
- 
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
-index 89e684930084f603339ce2cb067ec9719532110c..1c3a8e13df680240d0a6638115bf9a7f6982b5c9 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
-@@ -27,10 +27,10 @@ public class DominatorTreeExceptionFilter {
-   private final Statement statement;
- 
-   // idom, nodes
--  private final Map<Integer, Set<Integer>> mapTreeBranches = new HashMap<Integer, Set<Integer>>();
-+  private final Map<Integer, Set<Integer>> mapTreeBranches = new LinkedHashMap<Integer, Set<Integer>>();
- 
-   // handler, range nodes
--  private final Map<Integer, Set<Integer>> mapExceptionRanges = new HashMap<Integer, Set<Integer>>();
-+  private final Map<Integer, Set<Integer>> mapExceptionRanges = new LinkedHashMap<Integer, Set<Integer>>();
- 
-   // handler, head dom
-   private Map<Integer, Integer> mapExceptionDoms = new HashMap<Integer, Integer>();
-@@ -86,7 +86,7 @@ public class DominatorTreeExceptionFilter {
- 
-       Set<Integer> set = mapTreeBranches.get(idom);
-       if (set == null) {
--        mapTreeBranches.put(idom, set = new HashSet<Integer>());
-+        mapTreeBranches.put(idom, set = new LinkedHashSet<Integer>());
-       }
-       set.add(key);
-     }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
-index eee7b15dc347c9582f49f13c41106f76ff14b064..349f522b2fe170c57b55d4812cbc56086f6a1502 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
-@@ -28,9 +28,9 @@ public class FastExtendedPostdominanceHelper {
- 
-   private List<Statement> lstReversePostOrderList;
- 
--  private HashMap<Integer, FastFixedSet<Integer>> mapSupportPoints = new HashMap<Integer, FastFixedSet<Integer>>();
-+  private HashMap<Integer, FastFixedSet<Integer>> mapSupportPoints = new LinkedHashMap<Integer, FastFixedSet<Integer>>();
- 
--  private final HashMap<Integer, FastFixedSet<Integer>> mapExtPostdominators = new HashMap<Integer, FastFixedSet<Integer>>();
-+  private final HashMap<Integer, FastFixedSet<Integer>> mapExtPostdominators = new LinkedHashMap<Integer, FastFixedSet<Integer>>();
- 
-   private Statement statement;
- 
-@@ -40,7 +40,7 @@ public class FastExtendedPostdominanceHelper {
- 
-     this.statement = statement;
- 
--    HashSet<Integer> set = new HashSet<Integer>();
-+    HashSet<Integer> set = new LinkedHashSet<Integer>();
-     for (Statement st : statement.getStats()) {
-       set.add(st.id);
-     }
 diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
-index 499894a572629a0e14aba0ebfae4929d6e0eec18..f7e00804a046ad4992f918396b9ca53c6872b01c 100644
+index dc9789593e86b85d293c7620e4255fa9bafe3e81..722d6cb6c9ad3d18212e127787287d9fc504ad7d 100644
 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
 +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
-@@ -20,6 +20,7 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
- 
+@@ -21,7 +21,6 @@ import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
  import java.util.Collection;
  import java.util.HashSet;
-+import java.util.LinkedHashSet;
- 
+ import java.util.LinkedHashSet;
+-import java.util.Set;
  
  public class GeneralStatement extends Statement {
-@@ -39,7 +40,7 @@ public class GeneralStatement extends Statement {
+ 
+@@ -40,7 +39,7 @@ public class GeneralStatement extends Statement {
      first = head;
      stats.addWithKey(head, head.id);
  
--    HashSet<Statement> set = new HashSet<Statement>(statements);
+-    Set<Statement> set = new LinkedHashSet<Statement>(statements);
 +    LinkedHashSet<Statement> set = new LinkedHashSet<Statement>(statements);
      set.remove(head);
  
      for (Statement st : set) {
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
-index 2a2930908a9051cea5f590d0a6e66d38689d1753..af522d97a6198ba50a5eae7b69232d9e4ac5eec6 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
-@@ -80,7 +80,15 @@ public class SwitchStatement extends Statement {
- 
-     default_edge = head.getSuccessorEdges(Statement.STATEDGE_DIRECT_ALL).get(0);
- 
--    for (Statement st : lstNodes) {
-+    //We need to use set above in case we have multiple edges to the same node. But HashSets iterator is not ordered, so sort
-+    List<Statement> sorted = new ArrayList<Statement>(lstNodes);
-+    Collections.sort(sorted, new Comparator<Statement>() {
-+      @Override
-+      public int compare(Statement o1, Statement o2) {
-+        return o1.id - o2.id;
-+      }
-+    });
-+    for (Statement st : sorted) {
-       stats.addWithKey(st, st.id);
-     }
-   }

From f359ea98d8ee4c3471b4f9a0c40d2f19cadd9a8a Mon Sep 17 00:00:00 2001
From: sciwhiz12 <arnoldnunag12@gmail.com>
Date: Tue, 16 Feb 2021 21:53:02 +0800
Subject: [PATCH 12/22] Filter out abstract parameter renaming file from output

---
 ...dd-a-metadata-file-for-renaming-abstract-parameters.patch | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/FernFlower-Patches/0060-Add-a-metadata-file-for-renaming-abstract-parameters.patch b/FernFlower-Patches/0060-Add-a-metadata-file-for-renaming-abstract-parameters.patch
index db3411b..61121a8 100644
--- a/FernFlower-Patches/0060-Add-a-metadata-file-for-renaming-abstract-parameters.patch
+++ b/FernFlower-Patches/0060-Add-a-metadata-file-for-renaming-abstract-parameters.patch
@@ -22,7 +22,7 @@ index b90f2ec58cc54cdd9b72257824ec6ceaefbc536e..581ef65be27be38883be48fc67586429
              buffer.append(parameterName == null ? "param" + index : parameterName); // null iff decompiled with errors
  
 diff --git a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
-index db51534cb8ac1012460c6de7a6f0ad04101244af..1c2603c2a02ca4ac0da5a0c309ffb8fe3c21e9e2 100644
+index db51534cb8ac1012460c6de7a6f0ad04101244af..6ba6cc291f07a1f0839fa21fc5c3765815bdd635 100644
 --- a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
 +++ b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
 @@ -21,12 +21,16 @@ import org.jetbrains.java.decompiler.main.extern.IResultSaver;
@@ -42,7 +42,7 @@ index db51534cb8ac1012460c6de7a6f0ad04101244af..1c2603c2a02ca4ac0da5a0c309ffb8fe
  
  public class ContextUnit {
  
-@@ -68,6 +72,24 @@ public class ContextUnit {
+@@ -68,6 +72,25 @@ public class ContextUnit {
    }
  
    public void addOtherEntry(String fullPath, String entry) {
@@ -63,6 +63,7 @@ index db51534cb8ac1012460c6de7a6f0ad04101244af..1c2603c2a02ca4ac0da5a0c309ffb8fe
 +        String message = "Cannot read fernflower_abstract_parameter_names.txt from " + fullPath;
 +        DecompilerContext.getLogger().writeMessage(message, e);
 +      }
++      return;
 +    }
      if (DecompilerContext.getOption(IFernflowerPreferences.SKIP_EXTRA_FILES))
        return;

From 5b2950caed6ad0ec828b7a541ffd64e050709fbc Mon Sep 17 00:00:00 2001
From: Curle <curle@gemwire.uk>
Date: Sat, 24 Apr 2021 01:55:10 +0100
Subject: [PATCH 13/22] Update to newer buildscripts. Doesn't quite work yet.

---
 settings.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/settings.gradle b/settings.gradle
index da17e03..00ceac5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,5 +6,6 @@ pluginManagement {
 }
 
 include 'ForgeFlower'
+include 'ForgeFlower9'
 
 project(':ForgeFlower').buildFileName = 'TeamCityIsAnnoying'

From b0ca3ffa771f51c16d103aa27056d943eb7a3aca Mon Sep 17 00:00:00 2001
From: Curle <curle@gemwire.uk>
Date: Thu, 29 Apr 2021 13:47:09 +0100
Subject: [PATCH 14/22] More work towards parity with FernFlowerLegacy

---
 ...-9-classes-to-fix-classpath-oddities.patch | 202 +++++++++
 ...Remove-tests-that-reference-hamcrest.patch | 396 ++++++++++++++++++
 2 files changed, 598 insertions(+)
 create mode 100644 FernFlower-Patches/0063-Add-Java-9-classes-to-fix-classpath-oddities.patch
 create mode 100644 FernFlower-Patches/0064-Remove-tests-that-reference-hamcrest.patch

diff --git a/FernFlower-Patches/0063-Add-Java-9-classes-to-fix-classpath-oddities.patch b/FernFlower-Patches/0063-Add-Java-9-classes-to-fix-classpath-oddities.patch
new file mode 100644
index 0000000..64789ef
--- /dev/null
+++ b/FernFlower-Patches/0063-Add-Java-9-classes-to-fix-classpath-oddities.patch
@@ -0,0 +1,202 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Curle <curle@gemwire.uk>
+Date: Thu, 29 Apr 2021 00:13:35 +0100
+Subject: [PATCH] Add Java 9 classes to fix classpath oddities.
+
+
+diff --git a/java9/org/jetbrains/java/decompiler/util/ClasspathScanner.java b/java9/org/jetbrains/java/decompiler/util/ClasspathScanner.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..c21b75cdf2afbca3076fcaf4a36bc53c344b8e40
+--- /dev/null
++++ b/java9/org/jetbrains/java/decompiler/util/ClasspathScanner.java
+@@ -0,0 +1,77 @@
++// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
++package org.jetbrains.java.decompiler.util;
++
++import java.lang.module.*;
++import java.nio.ByteBuffer;
++import java.io.File;
++import java.io.IOException;
++import java.util.HashSet;
++import java.util.Optional;
++import java.util.Set;
++
++import org.jetbrains.java.decompiler.main.DecompilerContext;
++import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger.Severity;
++import org.jetbrains.java.decompiler.struct.StructContext;
++
++public class ClasspathScanner {
++
++    public static void addAllClasspath(StructContext ctx) {
++    Set<String> found = new HashSet<String>();
++    String[] props = { System.getProperty("java.class.path"), System.getProperty("sun.boot.class.path") };
++    for (String prop : props) {
++        if (prop == null)
++          continue;
++
++        for (final String path : prop.split(File.pathSeparator)) {
++          File file = new File(path);
++          if (found.contains(file.getAbsolutePath()))
++            continue;
++
++          if (file.exists() && (file.getName().endsWith(".class") || file.getName().endsWith(".jar"))) {
++            DecompilerContext.getLogger().writeMessage("Adding File to context from classpath: " + file, Severity.INFO);
++            ctx.addSpace(file, false);
++            found.add(file.getAbsolutePath());
++          }
++        }
++      }
++
++      addAllModulePath(ctx);
++    }
++
++    private static void addAllModulePath(StructContext ctx) {
++      for (ModuleReference module : ModuleFinder.ofSystem().findAll()) {
++        String name = module.descriptor().name();
++        try {
++          ModuleReader reader = module.open();
++          DecompilerContext.getLogger().writeMessage("Reading Module: " + name, Severity.INFO);
++          reader.list().forEach(cls -> {
++            if (!cls.endsWith(".class") || cls.contains("module-info.class"))
++              return;
++
++            DecompilerContext.getLogger().writeMessage("  " + cls, Severity.INFO);
++            try {
++              Optional<ByteBuffer> bb = reader.read(cls);
++              if (!bb.isPresent()) {
++                DecompilerContext.getLogger().writeMessage("    Error Reading Class: " + cls, Severity.ERROR);
++                return;
++              }
++
++              byte[] data;
++              if (bb.get().hasArray()) {
++                data = bb.get().array();
++              } else {
++                data = new byte[bb.get().remaining()];
++                bb.get().get(data);
++              }
++              ctx.addData(name, cls, data, false);
++            } catch (IOException e) {
++              DecompilerContext.getLogger().writeMessage("    Error Reading Class: " + cls, e);
++            }
++          });
++          reader.close();
++        } catch (IOException e) {
++          DecompilerContext.getLogger().writeMessage("Error loading module " + name, e);
++        }
++      }
++    }
++}
+\ No newline at end of file
+diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
+index bc92f349c0d49038f113fd3cd11e9a52fd2763a1..f2fca86b4ec2d585e76f1dbf72c8d3528989e75c 100644
+--- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
++++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
+@@ -45,6 +45,10 @@ public class Fernflower implements IDecompiledData {
+     DecompilerContext.setCounterContainer(new CounterContainer());
+     
+     DecompilerContext.setStructContext(structContext);
++    String vendor = System.getProperty("java.vendor", "missing vendor");
++    String javaVersion = System.getProperty("java.version", "missing java version");
++    String jvmVersion = System.getProperty("java.vm.version", "missing jvm version");
++    logger.writeMessage(String.format("JVM info: %s - %s - %s", vendor, javaVersion, jvmVersion), IFernflowerLogger.Severity.INFO);
+ 
+     if (DecompilerContext.getOption(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH)) {
+       addAllClasspath();
+diff --git a/src/org/jetbrains/java/decompiler/struct/StructContext.java b/src/org/jetbrains/java/decompiler/struct/StructContext.java
+index a154193f9b9f698873c62af08d1211d0e79b8ae4..5106daba215d0bf458bf57db4f4209b6b7a08070 100644
+--- a/src/org/jetbrains/java/decompiler/struct/StructContext.java
++++ b/src/org/jetbrains/java/decompiler/struct/StructContext.java
+@@ -213,4 +213,17 @@ public class StructContext {
+     List<String> params = this.abstractNames.get(className + ' ' + methodName + ' ' + descriptor);
+     return params != null && index < params.size() ? params.get(index) : _default;
+   }
++
++  public void addData(String path, String cls, byte[] data, boolean isOwn) throws IOException {
++        ContextUnit unit = units.get(path);
++        if (unit == null) {
++          unit = new ContextUnit(ContextUnit.TYPE_FOLDER, path, cls, isOwn, saver, decompiledData);
++          units.put(path, unit);
++        }
++
++        StructClass cl = new StructClass(new DataInputFullStream(data), isOwn, loader);
++        classes.put(cl.qualifiedName, cl);
++        unit.addClass(cl, cls);
++        loader.addClassLink(cl.qualifiedName, new LazyLoader.Link(path, cls, data));
++  }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
+index d75c93deecbdd8c43a5f9d1a2a7a7f4e7e13e8cf..789060ca39b7ff5f897c3150554f97d00bdbf41e 100644
+--- a/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
++++ b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
+@@ -144,7 +144,7 @@ public class LazyLoader {
+ 
+   public DataInputFullStream getClassStream(String qualifiedClassName) throws IOException {
+     Link link = mapClassLinks.get(qualifiedClassName);
+-    return link == null ? null : getClassStream(link.externalPath, link.internalPath);
++    return link == null ? null : link.data != null ? new DataInputFullStream(link.data) : getClassStream(link.externalPath, link.internalPath);
+   }
+ 
+   public static void skipAttributes(DataInputFullStream in) throws IOException {
+@@ -163,11 +163,20 @@ public class LazyLoader {
+     public final int type;
+     public final String externalPath;
+     public final String internalPath;
++    public final byte[] data;
++
++    public Link(String externalPath, String internalPath, byte[] data) {
++      this.type = CLASS;
++      this.externalPath = externalPath;
++      this.internalPath = internalPath;
++      this.data = data;
++    }
+ 
+     public Link(int type, String externalPath, String internalPath) {
+       this.type = type;
+       this.externalPath = externalPath;
+       this.internalPath = internalPath;
++      this.data = new byte[] {};
+     }
+   }
+ }
+diff --git a/src/org/jetbrains/java/decompiler/util/ClasspathScanner.java b/src/org/jetbrains/java/decompiler/util/ClasspathScanner.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..1374a39daccc44d64945487c2934c4f86651f856
+--- /dev/null
++++ b/src/org/jetbrains/java/decompiler/util/ClasspathScanner.java
+@@ -0,0 +1,35 @@
++package org.jetbrains.java.decompiler.util;
++
++import org.jetbrains.java.decompiler.main.DecompilerContext;
++import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
++import org.jetbrains.java.decompiler.struct.StructContext;
++
++import java.io.File;
++import java.util.HashSet;
++import java.util.Set;
++
++public class ClasspathScanner {
++    //TODO: Look into caching the metadata grabbed from the context info?
++    //J9 destroys the classpath so we need to scan this differently. We take advantage of MultiRelease jars to do this.
++    public static void addAllClasspath(StructContext ctx) {
++      Set<String> found = new HashSet<String>();
++      String[] props = { System.getProperty("java.class.path"), System.getProperty("sun.boot.class.path") };
++      for (String prop : props) {
++        if (prop == null)
++          continue;
++
++        for (final String path : prop.split(File.pathSeparator)) {
++          File file = new File(path);
++          if (found.contains(file.getAbsolutePath()))
++            continue;
++
++          if (file.exists() && (file.getName().endsWith(".class") || file.getName().endsWith(".jar"))) {
++            DecompilerContext.getLogger().writeMessage("Adding File to context from classpath: " + file, IFernflowerLogger.Severity.INFO);
++            ctx.addSpace(file, false);
++            found.add(file.getAbsolutePath());
++          }
++        }
++      }
++    }
++}
++
diff --git a/FernFlower-Patches/0064-Remove-tests-that-reference-hamcrest.patch b/FernFlower-Patches/0064-Remove-tests-that-reference-hamcrest.patch
new file mode 100644
index 0000000..94f00d5
--- /dev/null
+++ b/FernFlower-Patches/0064-Remove-tests-that-reference-hamcrest.patch
@@ -0,0 +1,396 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Curle <curle@gemwire.uk>
+Date: Thu, 29 Apr 2021 00:22:07 +0100
+Subject: [PATCH] Remove tests that reference hamcrest
+
+
+diff --git a/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java b/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
+deleted file mode 100644
+index 1b5353b37a497db848f47d9aa15459ad3fff3066..0000000000000000000000000000000000000000
+--- a/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
++++ /dev/null
+@@ -1,110 +0,0 @@
+-/*
+- * Copyright 2000-2014 JetBrains s.r.o.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at
+- *
+- * http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.jetbrains.java.decompiler;
+-
+-import org.hamcrest.Matchers;
+-import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
+-import org.jetbrains.java.decompiler.util.InterpreterUtil;
+-import org.junit.After;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-import java.io.*;
+-import java.util.Enumeration;
+-import java.util.zip.ZipEntry;
+-import java.util.zip.ZipFile;
+-
+-import static org.junit.Assert.assertThat;
+-import static org.junit.Assert.assertTrue;
+-
+-public class BulkDecompilationTest {
+-  private DecompilerTestFixture fixture;
+-
+-  @Before
+-  public void setUp() throws IOException {
+-    fixture = new DecompilerTestFixture();
+-    fixture.setUp();
+-  }
+-
+-  @After
+-  public void tearDown() {
+-    fixture.tearDown();
+-    fixture = null;
+-  }
+-
+-  @Test
+-  public void testDirectory() {
+-    File classes = new File(fixture.getTempDir(), "classes");
+-    unpack(new File(fixture.getTestDataDir(), "bulk.jar"), classes);
+-
+-    ConsoleDecompiler decompiler = fixture.getDecompiler();
+-    decompiler.addSpace(classes, true);
+-    decompiler.decompileContext();
+-
+-    compareDirectories(new File(fixture.getTestDataDir(), "bulk"), fixture.getTargetDir());
+-  }
+-
+-  @Test
+-  public void testJar() {
+-    ConsoleDecompiler decompiler = fixture.getDecompiler();
+-    decompiler.addSpace(new File(fixture.getTestDataDir(), "bulk.jar"), true);
+-    decompiler.decompileContext();
+-
+-    File unpacked = new File(fixture.getTempDir(), "unpacked");
+-    unpack(new File(fixture.getTargetDir(), "bulk.jar"), unpacked);
+-
+-    compareDirectories(new File(fixture.getTestDataDir(), "bulk"), unpacked);
+-  }
+-
+-  private static void unpack(File archive, File targetDir) {
+-    try {
+-      ZipFile zip = new ZipFile(archive);
+-      try {
+-        Enumeration<? extends ZipEntry> entries = zip.entries();
+-        while (entries.hasMoreElements()) {
+-          ZipEntry entry = entries.nextElement();
+-          if (!entry.isDirectory()) {
+-            File file = new File(targetDir, entry.getName());
+-            assertTrue(file.getParentFile().mkdirs() || file.getParentFile().isDirectory());
+-            InputStream in = zip.getInputStream(entry);
+-            OutputStream out = new FileOutputStream(file);
+-            InterpreterUtil.copyStream(in, out);
+-            out.close();
+-            in.close();
+-          }
+-        }
+-      }
+-      finally {
+-        zip.close();
+-      }
+-    }
+-    catch (IOException e) {
+-      throw new RuntimeException(e);
+-    }
+-  }
+-
+-  private static void compareDirectories(File expected, File actual) {
+-    String[] expectedList = expected.list();
+-    String[] actualList = actual.list();
+-    assertThat(actualList, Matchers.arrayContainingInAnyOrder(expectedList));
+-    for (String name : expectedList) {
+-      File child = new File(expected, name);
+-      if (child.isDirectory()) {
+-        compareDirectories(child, new File(actual, name));
+-      }
+-    }
+-  }
+-}
+diff --git a/test/org/jetbrains/java/decompiler/LVTTest.java b/test/org/jetbrains/java/decompiler/LVTTest.java
+deleted file mode 100644
+index b4af1f7cfd661fe456121f999a495c89dffb1d0f..0000000000000000000000000000000000000000
+--- a/test/org/jetbrains/java/decompiler/LVTTest.java
++++ /dev/null
+@@ -1,63 +0,0 @@
+-/*
+- * Copyright 2000-2014 JetBrains s.r.o.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at
+- *
+- * http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.jetbrains.java.decompiler;
+-
+-import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+-import org.junit.Test;
+-
+-import java.io.IOException;
+-import java.util.HashMap;
+-import java.util.Map;
+-
+-public class LVTTest extends SingleClassesTestBase {
+-  @Override
+-  protected Map<String, Object> getDecompilerOptions() {
+-    return new HashMap<String, Object>() {{
+-      put(IFernflowerPreferences.DECOMPILE_INNER,"1");
+-      put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES,"1");
+-      put(IFernflowerPreferences.ASCII_STRING_CHARACTERS,"1");
+-      put(IFernflowerPreferences.LOG_LEVEL, "TRACE");
+-      put(IFernflowerPreferences.REMOVE_SYNTHETIC, "1");
+-      put(IFernflowerPreferences.REMOVE_BRIDGE, "1");
+-      put(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH, "1");
+-    }};
+-  }
+-
+-  @Override
+-    public void setUp() throws IOException {
+-        super.setUp();
+-        fixture.cleanup = false;
+-    }
+-//  @Test public void testMatch1() { doTest("pkg/TestPPMM"); }
+-//  @Test public void testMatchLM() { doTest("pkg/TestLexManosLVT"); }
+-//  @Test public void testMatch1() { doTest("pkg/TestLVT"); }
+-//  @Test public void testMatch1() { doTest("pkg/TestLoopMerging"); }
+-//  @Test public void testMatch2() { doTest("pkg/TestLVTScoping"); }
+-//  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
+-//  @Test public void testMCGuiCmdBlock() { doTest("net/minecraft/client/gui/GuiCommandBlock"); }
+-
+-//  @Test public void testMCWorld() { doTest("net/minecraft/world/World"); }
+-
+-//  @Test public void testMCGuiCmdBlock() { doTest("net/minecraft/client/gui/GuiCommandBlock"); }
+-
+-//  @Test public void testMCBlockFence() { doTest("net/minecraft/block/BlockFence"); }
+-
+-//  @Test public void testMCAbstractTexture() { doTest("net/minecraft/client/multiplayer/ServerAddress"); }
+-//  @Test public void testMCAbstractResourcePack() { doTest("net/minecraft/client/resources/AbstractResourcePack"); }
+-//  @Test public void testMCGuiShareToLan() { doTest("net/minecraft/client/gui/GuiShareToLan"); }
+-//  @Test public void testMCContainerPlayer() { doTest("net/minecraft/inventory/ContainerPlayer"); }
+-  @Test public void testMCContainerPlayer() { doTest("net/minecraft/command/PlayerSelector"); }
+-}
+diff --git a/test/org/jetbrains/java/decompiler/LineNumbersMatchTest.java b/test/org/jetbrains/java/decompiler/LineNumbersMatchTest.java
+deleted file mode 100644
+index 758aa5f3222dfb0b24890ec2225881b7ebf8c898..0000000000000000000000000000000000000000
+--- a/test/org/jetbrains/java/decompiler/LineNumbersMatchTest.java
++++ /dev/null
+@@ -1,33 +0,0 @@
+-/*
+- * Copyright 2000-2014 JetBrains s.r.o.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at
+- *
+- * http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.jetbrains.java.decompiler;
+-
+-import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+-import org.junit.Test;
+-
+-import java.util.HashMap;
+-import java.util.Map;
+-
+-public class LineNumbersMatchTest extends SingleClassesTestBase {
+-  @Override
+-  protected Map<String, Object> getDecompilerOptions() {
+-    return new HashMap<String, Object>() {{
+-      put(IFernflowerPreferences.USE_DEBUG_LINE_NUMBERS, "1");
+-    }};
+-  }
+-
+-  @Test public void testMatch1() { doTest("pkg/TestLineNumbersMatch"); }
+-}
+diff --git a/test/org/jetbrains/java/decompiler/LoopMergingTests.java b/test/org/jetbrains/java/decompiler/LoopMergingTests.java
+deleted file mode 100644
+index ddc15d14e9efaca03115795dbce9266d361b565e..0000000000000000000000000000000000000000
+--- a/test/org/jetbrains/java/decompiler/LoopMergingTests.java
++++ /dev/null
+@@ -1,30 +0,0 @@
+-package org.jetbrains.java.decompiler;
+-
+-import java.io.IOException;
+-import java.util.HashMap;
+-import java.util.Map;
+-
+-import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+-import org.junit.Test;
+-
+-public class LoopMergingTests extends SingleClassesTestBase {
+-    @SuppressWarnings("serial")
+-    @Override
+-    protected Map<String, Object> getDecompilerOptions() {
+-      return new HashMap<String, Object>() {{
+-        put(IFernflowerPreferences.USE_DEBUG_LINE_NUMBERS, "1");
+-      }};
+-    }
+-
+-    @Override
+-      public void setUp() throws IOException {
+-          super.setUp();
+-          fixture.cleanup = false;
+-      }
+-
+-    @Test
+-    public void testLoopMerging() {
+-        doTest("pkg/TestLoopMerging");
+-    }
+-
+-}
+diff --git a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java b/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
+deleted file mode 100644
+index 087c8102c11b1258d8e3f1615fe64f745b8587d6..0000000000000000000000000000000000000000
+--- a/test/org/jetbrains/java/decompiler/MinecraftDecompilationTest.java
++++ /dev/null
+@@ -1,124 +0,0 @@
+-/*
+- * Copyright 2000-2014 JetBrains s.r.o.
+- *
+- * Licensed under the Apache License, Version 2.0 (the "License");
+- * you may not use this file except in compliance with the License.
+- * You may obtain a copy of the License at
+- *
+- * http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the License for the specific language governing permissions and
+- * limitations under the License.
+- */
+-package org.jetbrains.java.decompiler;
+-
+-import org.hamcrest.Matchers;
+-import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
+-import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+-import org.jetbrains.java.decompiler.util.InterpreterUtil;
+-import org.junit.After;
+-import org.junit.Before;
+-import org.junit.Test;
+-
+-import java.io.*;
+-import java.util.Enumeration;
+-import java.util.HashMap;
+-import java.util.Map;
+-import java.util.zip.ZipEntry;
+-import java.util.zip.ZipFile;
+-
+-import static org.junit.Assert.assertThat;
+-import static org.junit.Assert.assertTrue;
+-
+-public class MinecraftDecompilationTest {
+-  private DecompilerTestFixture fixture;
+-
+-  private static final String MC_JAR = "minecraft_ff_in.jar";
+-  @Before
+-  public void setUp() throws IOException {
+-    fixture = new DecompilerTestFixture();
+-    // -din=1 -rbr=0 -dgs=1 -asc=1 -rsy=0
+-    Map<String,Object> mcFFOptions = new HashMap<String,Object>() {{
+-        put(IFernflowerPreferences.DECOMPILE_INNER,"1");
+-        put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES,"1");
+-        put(IFernflowerPreferences.ASCII_STRING_CHARACTERS,"1");
+-        put(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH, "1");
+-    }};
+-    fixture.setUp(mcFFOptions);
+-    if (!new File(fixture.getTestDataDir(), MC_JAR).exists()) {
+-        throw new RuntimeException("Missing "+MC_JAR+" in testData dir - aborting");
+-    }
+-  }
+-
+-  @After
+-  public void tearDown() {
+-//    fixture.tearDown();
+-//    fixture = null;
+-  }
+-
+-//  @Test
+-//  public void testDirectory() {
+-//    File classes = new File(fixture.getTempDir(), "classes");
+-//    unpack(new File(fixture.getTestDataDir(), "mc-fernflower-in.jar"), classes);
+-//
+-//    ConsoleDecompiler decompiler = fixture.getDecompiler();
+-//    decompiler.addSpace(classes, true);
+-//    decompiler.decompileContext();
+-//
+-//    compareDirectories(new File(fixture.getTestDataDir(), "bulk"), fixture.getTargetDir());
+-//  }
+-
+-  @Test
+-  public void testJar() {
+-    ConsoleDecompiler decompiler = fixture.getDecompiler();
+-    decompiler.addSpace(new File(fixture.getTestDataDir(), MC_JAR), true);
+-    decompiler.decompileContext();
+-
+-    File unpacked = new File(fixture.getTempDir(), "unpacked");
+-    unpack(new File(fixture.getTargetDir(), "bulk.jar"), unpacked);
+-
+-//    compareDirectories(new File(fixture.getTestDataDir(), "bulk"), unpacked);
+-  }
+-
+-  private static void unpack(File archive, File targetDir) {
+-    try {
+-      ZipFile zip = new ZipFile(archive);
+-      try {
+-        Enumeration<? extends ZipEntry> entries = zip.entries();
+-        while (entries.hasMoreElements()) {
+-          ZipEntry entry = entries.nextElement();
+-          if (!entry.isDirectory()) {
+-            File file = new File(targetDir, entry.getName());
+-            assertTrue(file.getParentFile().mkdirs() || file.getParentFile().isDirectory());
+-            InputStream in = zip.getInputStream(entry);
+-            OutputStream out = new FileOutputStream(file);
+-            InterpreterUtil.copyStream(in, out);
+-            out.close();
+-            in.close();
+-          }
+-        }
+-      }
+-      finally {
+-        zip.close();
+-      }
+-    }
+-    catch (IOException e) {
+-      throw new RuntimeException(e);
+-    }
+-  }
+-
+-  private static void compareDirectories(File expected, File actual) {
+-    String[] expectedList = expected.list();
+-    String[] actualList = actual.list();
+-    assertThat(actualList, Matchers.arrayContainingInAnyOrder(expectedList));
+-    for (String name : expectedList) {
+-      File child = new File(expected, name);
+-      if (child.isDirectory()) {
+-        compareDirectories(child, new File(actual, name));
+-      }
+-    }
+-  }
+-}

From dba9577ec181cbd0bc604f5ffdc2b261a1d03687 Mon Sep 17 00:00:00 2001
From: AterAnimAvis <AterAnimAvis@users.noreply.github.com>
Date: Fri, 21 May 2021 15:56:03 +0100
Subject: [PATCH 15/22] test: Add Comparison Test against FG2 Output (#10)

* test: Add Comparison Test against FG2 Output

Setup Required:

#### testData/retrogradle/fg2/decompiled.zip
- clone 1.11.x (FG2) from <a href="https://github.com/RetroGradle/MinecraftForge">RetroGradle/MinecraftForge</a>
- `gradlew setup` (May need to be from the terminal due to gradle version)
- copy `build/localCache/decompiled.zip`

#### testData/retrogradle/fg3/output.jar
- checkout retrogradle1.11 branch
- `gradlew setup` (May require a second `gradlew setup` as the first downloads the custom MCPConfig zip)
- copy `projects/mcp/build/mcp/decompile/output.jar`

Diffs are output to `testData/retrogradle/output`

Signed-off-by: AterAnimAvis <AterAnimAvis@gmail.com>
---
 ...n-Test-comparing-output-with-old-FG2.patch | 96 +++++++++++++++++++
 fernflower.gradle                             |  2 +
 2 files changed, 98 insertions(+)
 create mode 100644 FernFlower-Patches/0065-Add-Decompilation-Test-comparing-output-with-old-FG2.patch

diff --git a/FernFlower-Patches/0065-Add-Decompilation-Test-comparing-output-with-old-FG2.patch b/FernFlower-Patches/0065-Add-Decompilation-Test-comparing-output-with-old-FG2.patch
new file mode 100644
index 0000000..d93ada1
--- /dev/null
+++ b/FernFlower-Patches/0065-Add-Decompilation-Test-comparing-output-with-old-FG2.patch
@@ -0,0 +1,96 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AterAnimAvis <AterAnimAvis@gmail.com>
+Date: Mon, 17 May 2021 19:32:29 +0100
+Subject: [PATCH] Add Decompilation Test comparing output with old FG2
+
+
+diff --git a/test/org/jetbrains/java/decompiler/RetroGradleComparisonTest.java b/test/org/jetbrains/java/decompiler/RetroGradleComparisonTest.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..601fdde223bbeb3f028bd8719f244ebbecf5dcab
+--- /dev/null
++++ b/test/org/jetbrains/java/decompiler/RetroGradleComparisonTest.java
+@@ -0,0 +1,84 @@
++package org.jetbrains.java.decompiler;
++
++import java.io.IOException;
++import java.io.InputStream;
++import java.io.OutputStream;
++import java.nio.file.Files;
++import java.nio.file.Path;
++import java.nio.file.Paths;
++import java.util.zip.ZipEntry;
++import java.util.zip.ZipInputStream;
++import java.util.zip.ZipOutputStream;
++
++import org.junit.Test;
++import codechicken.diffpatch.cli.CliOperation;
++import codechicken.diffpatch.cli.DiffOperation;
++import codechicken.diffpatch.util.Utils;
++
++import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.fail;
++
++public class RetroGradleComparisonTest {
++
++    Path fg2output   = Paths.get("testData", "retrogradle", "fg2/decompiled.zip");
++    Path fg2filtered = Paths.get("testData", "retrogradle", "fg2/decompiled-filtered.zip");
++    Path fg3input    = Paths.get("testData", "retrogradle", "fg3/output.jar");
++    Path diffOutput  = Paths.get("testData", "retrogradle", "output");
++
++    /**
++     * Setup Required: <br>
++     * <br>
++     * - clone 1.11.x (FG2) from <a href="https://github.com/RetroGradle/MinecraftForge">RetroGradle/MinecraftForge</a><br>
++     * - `gradlew setup` (May need to be from the terminal due to gradle version) <br>
++     * - copy `build/localCache/decompiled.zip` -> `testData/retrogradle/fg2/decompiled.zip` <br>
++     * <br>
++     * - checkout retrogradle1.11 branch <br>
++     * - `gradlew setup` (May require a second `gradlew setup` as the first downloads the custom MCPConfig zip) <br>
++     * - copy `projects/mcp/build/mcp/decompile/output.jar` -> `testData/retrogradle/fg3/output.jar` <br>
++     */
++    @Test
++    public void diffOutputs() throws IOException {
++        if (Files.exists(diffOutput)) Utils.deleteFolder(diffOutput);
++        Files.createDirectories(diffOutput);
++
++        if (!Files.exists(fg2output)) fail("FG2 1.11.x decompiled.zip not provided");
++        if (!Files.exists(fg3input))  fail("Retrogradle 1.11.x output.jar not provided");
++
++        // We have to filter the fg2output to only contain the java files like fg3 does
++        filter(fg2output, fg2filtered);
++
++        final CliOperation.Result<DiffOperation.DiffSummary> result = DiffOperation.builder()
++            .aPrefix("fg2")
++            .bPrefix("fg3")
++            .aPath(fg2filtered)
++            .bPath(fg3input)
++            .outputPath(diffOutput)
++            .logTo(System.out)
++            .verbose(false)
++            .summary(true) // Summary is fairly useful in testing
++            .build()
++            .operate();
++
++        assertEquals(2, result.summary.removedFiles); // Side & SideOnly aren't present in the FG3 zip
++        assertEquals(0, result.summary.changedFiles); // Otherwise we expect 0 differences with FG2 zip
++        assertEquals(0, result.summary.addedFiles);
++    }
++
++    private static void filter(Path input, Path output) throws IOException {
++        if (Files.exists(output)) return;
++
++        filter(Files.newInputStream(input), Files.newOutputStream(output));
++    }
++
++    private static void filter(InputStream input, OutputStream output) throws IOException {
++        try (ZipOutputStream zout = new ZipOutputStream(output); ZipInputStream zin = new ZipInputStream(input)) {
++            ZipEntry entry;
++            while ((entry = zin.getNextEntry()) != null) {
++                if (entry.getName().endsWith(".java")) {
++                    zout.putNextEntry(entry);
++                    Utils.copy(zin, zout);
++                }
++            }
++        }
++    }
++}
diff --git a/fernflower.gradle b/fernflower.gradle
index 08e9110..d827a23 100644
--- a/fernflower.gradle
+++ b/fernflower.gradle
@@ -16,6 +16,7 @@ sourceSets {
 repositories {
     mavenCentral()
     maven { url = "https://libraries.minecraft.net/" }
+    maven { url = 'https://maven.minecraftforge.net/' }
 }
 
 dependencies {
@@ -25,6 +26,7 @@ dependencies {
     testImplementation 'org.hamcrest:hamcrest-core:1.3'
     testImplementation 'org.assertj:assertj-core:3.+'
     testImplementation 'com.google.code.gson:gson:2.8.0'
+    testImplementation 'net.minecraftforge:DiffPatch:2.0.5:all'
 }
 
 // Default all standard Java compile tasks to Java 17

From 46b91189366760f76af1aa347ba68007116740a0 Mon Sep 17 00:00:00 2001
From: AterAnimAvis <AterAnimAvis@users.noreply.github.com>
Date: Fri, 21 May 2021 15:57:26 +0100
Subject: [PATCH 16/22] fix: Java 8 no longer loading ClassStreams correctly
 (#11)

The original patched will skip the IBytecodeProvider due to the always present byte array (even if it is 0 length), It looks like the original intention is for `link.data` to be null in this case.

Signed-off-by: AterAnimAvis <AterAnimAvis@gmail.com>
---
 .../0063-Add-Java-9-classes-to-fix-classpath-oddities.patch     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FernFlower-Patches/0063-Add-Java-9-classes-to-fix-classpath-oddities.patch b/FernFlower-Patches/0063-Add-Java-9-classes-to-fix-classpath-oddities.patch
index 64789ef..25adb9c 100644
--- a/FernFlower-Patches/0063-Add-Java-9-classes-to-fix-classpath-oddities.patch
+++ b/FernFlower-Patches/0063-Add-Java-9-classes-to-fix-classpath-oddities.patch
@@ -155,7 +155,7 @@ index d75c93deecbdd8c43a5f9d1a2a7a7f4e7e13e8cf..789060ca39b7ff5f897c3150554f97d0
        this.type = type;
        this.externalPath = externalPath;
        this.internalPath = internalPath;
-+      this.data = new byte[] {};
++      this.data = null;
      }
    }
  }

From 76755d0e8599b6c7761082ed20bb55dfb608a3f8 Mon Sep 17 00:00:00 2001
From: AterAnimAvis <AterAnimAvis@users.noreply.github.com>
Date: Sun, 23 May 2021 19:36:00 +0100
Subject: [PATCH 17/22] Pull in CPW commit for the BiomeMesa decomp difference
 (#12)

Fixes the following decomp difference in BiomeMesa:
<https://gist.github.com/AterAnimAvis/36edd447fde25c3ea9259bc20033d4cb>

Signed-off-by: AterAnimAvis <AterAnimAvis@gmail.com>
---
 ...-9-classes-to-fix-classpath-oddities.patch |  2 +-
 ...ng-tracking-entirely-and-just-do-a-f.patch | 99 +++++++++++++++++++
 2 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 FernFlower-Patches/0065-Kill-the-remapping-tracking-entirely-and-just-do-a-f.patch

diff --git a/FernFlower-Patches/0063-Add-Java-9-classes-to-fix-classpath-oddities.patch b/FernFlower-Patches/0063-Add-Java-9-classes-to-fix-classpath-oddities.patch
index 25adb9c..e50e1e6 100644
--- a/FernFlower-Patches/0063-Add-Java-9-classes-to-fix-classpath-oddities.patch
+++ b/FernFlower-Patches/0063-Add-Java-9-classes-to-fix-classpath-oddities.patch
@@ -126,7 +126,7 @@ index a154193f9b9f698873c62af08d1211d0e79b8ae4..5106daba215d0bf458bf57db4f4209b6
 +  }
  }
 diff --git a/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
-index d75c93deecbdd8c43a5f9d1a2a7a7f4e7e13e8cf..789060ca39b7ff5f897c3150554f97d00bdbf41e 100644
+index d75c93deecbdd8c43a5f9d1a2a7a7f4e7e13e8cf..9b82853162f9d0a55dc14c59c774ec65090079b2 100644
 --- a/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
 +++ b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
 @@ -144,7 +144,7 @@ public class LazyLoader {
diff --git a/FernFlower-Patches/0065-Kill-the-remapping-tracking-entirely-and-just-do-a-f.patch b/FernFlower-Patches/0065-Kill-the-remapping-tracking-entirely-and-just-do-a-f.patch
new file mode 100644
index 0000000..b37234a
--- /dev/null
+++ b/FernFlower-Patches/0065-Kill-the-remapping-tracking-entirely-and-just-do-a-f.patch
@@ -0,0 +1,99 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: cpw <cpw@weeksfamily.ca>
+Date: Fri, 21 May 2021 16:08:27 +0100
+Subject: [PATCH] Kill the remapping tracking entirely, and just do a full
+ graph replace on contraction. Not as efficient, but guaranteed to work.. Ref:
+ https://github.com/MinecraftForge/FernFlowerLegacy/commit/58f09199efda8b5923200b57f1e7c22c63f61b4d
+
+
+diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
+index db70f64a91a21c04b1277b6da9b38ef7f60c1cf4..4f8701bcc88ab069e45c07e07e60753884caf95a 100644
+--- a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
++++ b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
+@@ -40,7 +40,7 @@ public class PPandMMHelper {
+ 
+   private boolean exprentReplaced;
+   private VarProcessor varProc;
+-  private Map<VarVersionPair, VarVersionPair> remaps = new HashMap<VarVersionPair, VarVersionPair>();
++  private DirectGraph dgraph;
+ 
+   public PPandMMHelper(VarProcessor varProc) {
+     this.varProc = varProc;
+@@ -49,7 +49,7 @@ public class PPandMMHelper {
+   public boolean findPPandMM(RootStatement root) {
+ 
+     FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
+-    DirectGraph dgraph = flatthelper.buildDirectGraph(root);
++    dgraph = flatthelper.buildDirectGraph(root);
+ 
+     LinkedList<DirectNode> stack = new LinkedList<DirectNode>();
+     stack.add(dgraph.first);
+@@ -72,13 +72,10 @@ public class PPandMMHelper {
+       stack.addAll(node.succs);
+     }
+ 
+-    updateVersions(dgraph);
+-
+     return res;
+   }
+ 
+   private boolean processExprentList(List<Exprent> lst) {
+-
+     boolean result = false;
+ 
+     for (int i = 0; i < lst.size(); i++) {
+@@ -148,7 +145,7 @@ public class PPandMMHelper {
+           if (econst.type == Exprent.EXPRENT_CONST && ((ConstExprent)econst).hasValueOne()) {
+             Exprent left = as.getLeft();
+ 
+-            VarType condtype = econd.getExprType();
++            VarType condtype = left.getExprType();
+             if (exprsEqual(left, econd) && (midlayer == null || midlayer.equals(condtype))) {
+               FunctionExprent ret = new FunctionExprent(
+                 func.getFuncType() == FunctionExprent.FUNCTION_ADD ? FunctionExprent.FUNCTION_PPI : FunctionExprent.FUNCTION_MMI,
+@@ -157,11 +154,7 @@ public class PPandMMHelper {
+ 
+               exprentReplaced = true;
+               if (!left.equals(econd)) {
+-                VarVersionPair _old = new VarVersionPair((VarExprent)left);
+-                VarVersionPair _new = new VarVersionPair((VarExprent)econd);
+-                if (_old.var > _new.var) { // Try and prevent infinite loops here by only merging 'down'
+-                  remaps.put(_old, _new);
+-                }
++                updateVersions(dgraph, new VarVersionPair((VarExprent) left), new VarVersionPair((VarExprent) econd));
+               }
+               return ret;
+             }
+@@ -194,17 +187,7 @@ public class PPandMMHelper {
+   }
+ 
+ 
+-  private void updateVersions(DirectGraph graph) {
+-    if (remaps.isEmpty()) return;
+-
+-    for (Entry<VarVersionPair, VarVersionPair> remap : remaps.entrySet()) {
+-      VarVersionPair target = remap.getValue();
+-      while (remaps.containsKey(target)) {
+-        target = remaps.get(target);
+-      }
+-      remaps.put(remap.getKey(), target);
+-    }
+-
++  private void updateVersions(DirectGraph graph, final VarVersionPair oldVVP, final VarVersionPair newVVP) {
+     graph.iterateExprents(new DirectGraph.ExprentIterator() {
+       @Override
+       public int processExprent(Exprent exprent) {
+@@ -214,10 +197,9 @@ public class PPandMMHelper {
+         for (Exprent expr : lst) {
+           if (expr.type == Exprent.EXPRENT_VAR) {
+             VarExprent var = (VarExprent)expr;
+-            VarVersionPair nvar = remaps.get(new VarVersionPair(var));
+-            if (nvar != null) {
+-              var.setIndex(nvar.var);
+-              var.setVersion(nvar.version);
++            if (var.getIndex() == oldVVP.var && var.getVersion() == oldVVP.version) {
++              var.setIndex(newVVP.var);
++              var.setVersion(newVVP.version);
+             }
+           }
+         }

From 9bd65fd1eb026dbb7f753495df831dd4314e6d56 Mon Sep 17 00:00:00 2001
From: AterAnimAvis <AterAnimAvis@users.noreply.github.com>
Date: Sun, 27 Jun 2021 13:14:07 +0100
Subject: [PATCH 18/22] fix: J9 issues again due to partially ported patch
 (#13)

Signed-off-by: AterAnimAvis <AterAnimAvis@gmail.com>
---
 ...-9-classes-to-fix-classpath-oddities.patch | 45 +++++++++++++++++--
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/FernFlower-Patches/0063-Add-Java-9-classes-to-fix-classpath-oddities.patch b/FernFlower-Patches/0063-Add-Java-9-classes-to-fix-classpath-oddities.patch
index e50e1e6..6f59612 100644
--- a/FernFlower-Patches/0063-Add-Java-9-classes-to-fix-classpath-oddities.patch
+++ b/FernFlower-Patches/0063-Add-Java-9-classes-to-fix-classpath-oddities.patch
@@ -89,10 +89,18 @@ index 0000000000000000000000000000000000000000..c21b75cdf2afbca3076fcaf4a36bc53c
 +}
 \ No newline at end of file
 diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-index bc92f349c0d49038f113fd3cd11e9a52fd2763a1..f2fca86b4ec2d585e76f1dbf72c8d3528989e75c 100644
+index bc92f349c0d49038f113fd3cd11e9a52fd2763a1..ed5d519846fe1ec39efa711288d27c7709c363f6 100644
 --- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
 +++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-@@ -45,6 +45,10 @@ public class Fernflower implements IDecompiledData {
+@@ -27,6 +27,7 @@ import org.jetbrains.java.decompiler.struct.IDecompiledData;
+ import org.jetbrains.java.decompiler.struct.StructClass;
+ import org.jetbrains.java.decompiler.struct.StructContext;
+ import org.jetbrains.java.decompiler.struct.lazy.LazyLoader;
++import org.jetbrains.java.decompiler.util.ClasspathScanner;
+ import org.jetbrains.java.decompiler.util.JADNameProvider;
+ 
+ import java.io.File;
+@@ -45,9 +46,13 @@ public class Fernflower implements IDecompiledData {
      DecompilerContext.setCounterContainer(new CounterContainer());
      
      DecompilerContext.setStructContext(structContext);
@@ -102,7 +110,38 @@ index bc92f349c0d49038f113fd3cd11e9a52fd2763a1..f2fca86b4ec2d585e76f1dbf72c8d352
 +    logger.writeMessage(String.format("JVM info: %s - %s - %s", vendor, javaVersion, jvmVersion), IFernflowerLogger.Severity.INFO);
  
      if (DecompilerContext.getOption(IFernflowerPreferences.INCLUDE_ENTIRE_CLASSPATH)) {
-       addAllClasspath();
+-      addAllClasspath();
++      ClasspathScanner.addAllClasspath(structContext);
+     }
+   }
+ 
+@@ -101,26 +106,4 @@ public class Fernflower implements IDecompiledData {
+       return null;
+     }
+   }
+-
+-  private void addAllClasspath() {
+-    Set<String> found = new HashSet<String>();
+-    String[] props = { System.getProperty("java.class.path"), System.getProperty("sun.boot.class.path") };
+-    for (String prop : props) {
+-      if (prop == null)
+-        continue;
+-
+-      for (final String path : prop.split(File.pathSeparator)) {
+-        File file = new File(path);
+-        if (found.contains(file.getAbsolutePath()))
+-          continue;
+-
+-        // only add .class files from classpath
+-        if (file.exists() && (file.getName().endsWith(".class") || file.getName().endsWith(".jar"))) {
+-          DecompilerContext.getLogger().writeMessage("Adding File to context from classpath: " + file, Severity.INFO);
+-          structContext.addSpace(file, false);
+-          found.add(file.getAbsolutePath());
+-        }
+-      }
+-    }
+-  }
+ }
 diff --git a/src/org/jetbrains/java/decompiler/struct/StructContext.java b/src/org/jetbrains/java/decompiler/struct/StructContext.java
 index a154193f9b9f698873c62af08d1211d0e79b8ae4..5106daba215d0bf458bf57db4f4209b6b7a08070 100644
 --- a/src/org/jetbrains/java/decompiler/struct/StructContext.java

From a1c7b1fc69328e875465798d1d79eac8150009c1 Mon Sep 17 00:00:00 2001
From: SizableShrimp <sizableshrimp@sizableshrimp.me>
Date: Tue, 21 Mar 2023 20:10:10 -0500
Subject: [PATCH 19/22] Delete the added patch files from rebase

---
 ...filter-and-setup-cleanup-for-java-17.patch |  713 ----------
 ...d-a-reference-to-their-declaring-cla.patch |   54 -
 .../0014-Add-better-debug-logging.patch       |   85 --
 ...Class-Objects.requireNonNull-cleanup.patch |  171 ---
 ...ports-that-are-shadowed-by-super-cla.patch |  218 ---
 ...output-for-float-and-double-literals.patch |  259 ----
 .../0024-Add-try-with-resource-support.patch  | 1176 -----------------
 ...-mapping-information-in-archive-mode.patch |  256 ----
 .../0040-Fixup-J9-string-concat.patch         |  177 ---
 .../0041-Fix-compound-assignments.patch       |  625 ---------
 ...ated-Record-getters-and-constructor..patch |  106 --
 ...n-finally-blocks-not-getting-renamed.patch |   80 --
 ...when-finding-where-to-inject-local-c.patch |   98 --
 ...Reduce-allocations-in-getAllExprents.patch |  318 -----
 ...file-instances-and-source-class-data.patch |  318 -----
 ...47-Fix-signature-polymorphic-methods.patch |  117 --
 ...rove-output-of-loops-inside-trycatch.patch |   74 --
 17 files changed, 4845 deletions(-)
 delete mode 100644 FernFlower-Patches/0001-Git-filter-and-setup-cleanup-for-java-17.patch
 delete mode 100644 FernFlower-Patches/0006-Make-methods-hold-a-reference-to-their-declaring-cla.patch
 delete mode 100644 FernFlower-Patches/0014-Add-better-debug-logging.patch
 delete mode 100644 FernFlower-Patches/0021-Synthetic-getClass-Objects.requireNonNull-cleanup.patch
 delete mode 100644 FernFlower-Patches/0022-Fix-shortname-imports-that-are-shadowed-by-super-cla.patch
 delete mode 100644 FernFlower-Patches/0023-Give-nicer-output-for-float-and-double-literals.patch
 delete mode 100644 FernFlower-Patches/0024-Add-try-with-resource-support.patch
 delete mode 100644 FernFlower-Patches/0039-Expose-line-mapping-information-in-archive-mode.patch
 delete mode 100644 FernFlower-Patches/0040-Fixup-J9-string-concat.patch
 delete mode 100644 FernFlower-Patches/0041-Fix-compound-assignments.patch
 delete mode 100644 FernFlower-Patches/0042-Filter-out-generated-Record-getters-and-constructor..patch
 delete mode 100644 FernFlower-Patches/0043-Fix-variables-in-finally-blocks-not-getting-renamed.patch
 delete mode 100644 FernFlower-Patches/0044-Search-generics-when-finding-where-to-inject-local-c.patch
 delete mode 100644 FernFlower-Patches/0045-Reduce-allocations-in-getAllExprents.patch
 delete mode 100644 FernFlower-Patches/0046-Cache-zip-file-instances-and-source-class-data.patch
 delete mode 100644 FernFlower-Patches/0047-Fix-signature-polymorphic-methods.patch
 delete mode 100644 FernFlower-Patches/0048-Improve-output-of-loops-inside-trycatch.patch

diff --git a/FernFlower-Patches/0001-Git-filter-and-setup-cleanup-for-java-17.patch b/FernFlower-Patches/0001-Git-filter-and-setup-cleanup-for-java-17.patch
deleted file mode 100644
index 884e58a..0000000
--- a/FernFlower-Patches/0001-Git-filter-and-setup-cleanup-for-java-17.patch
+++ /dev/null
@@ -1,713 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Tue, 11 Apr 2017 20:44:39 -0700
-Subject: [PATCH] Git filter and setup, cleanup for java 17
-
-
-diff --git a/.gitattributes b/.gitattributes
-index f1df734f9f0bc7080a99140482eedf28bfe6b166..972529aebd1f5daa057f1fe9606c79be1dc4f64f 100644
---- a/.gitattributes
-+++ b/.gitattributes
-@@ -1 +1,42 @@
--*.dec	text
-+# Convert line endings to linux for files detected as text
-+# and leave all files detected as binary untouched.
-+* text eol=lf
-+
-+#
-+# The above will handle all files NOT found below
-+#
-+# These files are text and should be normalized (Convert crlf => lf)
-+*.css           text
-+*.df            text
-+*.htm           text
-+*.html          text
-+*.java          text
-+*.js            text
-+*.json          text
-+*.jsp           text
-+*.jspf          text
-+*.jspx          text
-+*.properties    text
-+*.sh            text
-+*.tld           text
-+*.txt           text
-+*.tag           text
-+*.tagx          text
-+*.xml           text
-+*.yml           text
-+*.dec           text
-+
-+# These files are binary and should be left untouched
-+# (binary is a macro for -text -diff)
-+*.class         binary
-+*.dll           binary
-+*.ear           binary
-+*.gif           binary
-+*.ico           binary
-+*.jar           binary
-+*.jpg           binary
-+*.jpeg          binary
-+*.png           binary
-+*.so            binary
-+*.war           binary
-+ 
-\ No newline at end of file
-diff --git a/.gitignore b/.gitignore
-index 2b5420b0d76d97d25c4de444bc669891fd9ea4f3..c52eb2e815432be8d1f1e6b61cffdcce68af85bb 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -1,4 +1,231 @@
--/.idea/
--/.gradle/
-+
-+# Created by https://www.gitignore.io/api/java,macos,linux,gradle,windows,eclipse,intellij
-+
-+### Eclipse ###
-+
-+.metadata
-+bin/
-+tmp/
-+*.tmp
-+*.bak
-+*.swp
-+*~.nib
-+local.properties
-+.settings/
-+.loadpath
-+.recommenders
-+
-+# Eclipse Core
-+.project
-+
-+# External tool builders
-+.externalToolBuilders/
-+
-+# Locally stored "Eclipse launch configurations"
-+*.launch
-+
-+# PyDev specific (Python IDE for Eclipse)
-+*.pydevproject
-+
-+# CDT-specific (C/C++ Development Tooling)
-+.cproject
-+
-+# JDT-specific (Eclipse Java Development Tools)
-+.classpath
-+
-+# Java annotation processor (APT)
-+.factorypath
-+
-+# PDT-specific (PHP Development Tools)
-+.buildpath
-+
-+# sbteclipse plugin
-+.target
-+
-+# Tern plugin
-+.tern-project
-+
-+# TeXlipse plugin
-+.texlipse
-+
-+# STS (Spring Tool Suite)
-+.springBeans
-+
-+# Code Recommenders
-+.recommenders/
-+
-+# Scala IDE specific (Scala & Java development for Eclipse)
-+.cache-main
-+.scala_dependencies
-+.worksheet
-+
-+### Intellij ###
-+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
-+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-+
-+# User-specific stuff:
-+.idea/**/workspace.xml
-+.idea/**/tasks.xml
-+.idea/dictionaries
-+
-+# Sensitive or high-churn files:
-+.idea/**/dataSources/
-+.idea/**/dataSources.ids
-+.idea/**/dataSources.xml
-+.idea/**/dataSources.local.xml
-+.idea/**/sqlDataSources.xml
-+.idea/**/dynamic.xml
-+.idea/**/uiDesigner.xml
-+
-+# Gradle:
-+.idea/**/gradle.xml
-+.idea/**/libraries
-+
-+# Mongo Explorer plugin:
-+.idea/**/mongoSettings.xml
-+
-+## File-based project format:
-+*.iws
-+
-+## Plugin-specific files:
-+
-+# IntelliJ
-+/out/
-+
-+# mpeltonen/sbt-idea plugin
-+.idea_modules/
-+
-+# JIRA plugin
-+atlassian-ide-plugin.xml
-+
-+# Cursive Clojure plugin
-+.idea/replstate.xml
-+
-+# Crashlytics plugin (for Android Studio and IntelliJ)
-+com_crashlytics_export_strings.xml
-+crashlytics.properties
-+crashlytics-build.properties
-+fabric.properties
-+
-+### Intellij Patch ###
-+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
-+
-+# *.iml
-+# modules.xml
-+# .idea/misc.xml
-+# *.ipr
-+
-+# Sonarlint plugin
-+.idea/sonarlint
-+
-+### Java ###
-+# Compiled class file
-+*.class
-+
-+# Log file
-+*.log
-+
-+# BlueJ files
-+*.ctxt
-+
-+# Mobile Tools for Java (J2ME)
-+.mtj.tmp/
-+
-+# Package Files #
-+*.jar
-+*.war
-+*.ear
-+*.zip
-+*.tar.gz
-+*.rar
-+
-+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-+hs_err_pid*
-+
-+### Linux ###
-+*~
-+
-+# temporary files which can be created if a process still has a handle open of a deleted file
-+.fuse_hidden*
-+
-+# KDE directory preferences
-+.directory
-+
-+# Linux trash folder which might appear on any partition or disk
-+.Trash-*
-+
-+# .nfs files are created when an open file is removed but is still being accessed
-+.nfs*
-+
-+### macOS ###
-+*.DS_Store
-+.AppleDouble
-+.LSOverride
-+
-+# Icon must end with two \r
-+Icon
-+
-+
-+# Thumbnails
-+._*
-+
-+# Files that might appear in the root of a volume
-+.DocumentRevisions-V100
-+.fseventsd
-+.Spotlight-V100
-+.TemporaryItems
-+.Trashes
-+.VolumeIcon.icns
-+.com.apple.timemachine.donotpresent
-+
-+# Directories potentially created on remote AFP share
-+.AppleDB
-+.AppleDesktop
-+Network Trash Folder
-+Temporary Items
-+.apdisk
-+
-+### Windows ###
-+# Windows thumbnail cache files
-+Thumbs.db
-+ehthumbs.db
-+ehthumbs_vista.db
-+
-+# Folder config file
-+Desktop.ini
-+
-+# Recycle Bin used on file shares
-+$RECYCLE.BIN/
-+
-+# Windows Installer files
-+*.cab
-+*.msi
-+*.msm
-+*.msp
-+
-+# Windows shortcuts
-+*.lnk
-+
-+### Gradle ###
-+.gradle
- /build/
--/out/
-\ No newline at end of file
-+
-+# Ignore Gradle GUI config
-+gradle-app.setting
-+
-+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-+!gradle-wrapper.jar
-+
-+# Cache of project
-+.gradletasknamecache
-+
-+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
-+# gradle/wrapper/gradle-wrapper.properties
-+
-+# End of https://www.gitignore.io/api/java,macos,linux,gradle,windows,eclipse,intellij
-+
-+### ForgeFlower ###
-+ForgeFlower/
-+.idea/
-+repo
-+!testData/classes/**
-diff --git a/README.md b/README.md
-index 3f5a417a01d918a21b7dcb057b2eb259ec2df475..9b15cd643468b3852b0092f7bffd399518fc03b3 100644
---- a/README.md
-+++ b/README.md
-@@ -11,6 +11,8 @@ Fernflower is licenced under the [Apache Licence Version 2.0](http://www.apache.
- 
- ### Running from command line
- 
-+ForgeFlower requires Java 17 to run.
-+
- `java -jar fernflower.jar [-<option>=<value>]* [<source>]+ <destination>`
- 
- \* means 0 or more times\
-diff --git a/build.gradle b/build.gradle
-deleted file mode 100644
-index 02824bca257e3bb1d20d79a898a06aa9237f1b2f..0000000000000000000000000000000000000000
---- a/build.gradle
-+++ /dev/null
-@@ -1,26 +0,0 @@
--// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
--apply plugin: 'java'
--
--compileJava {
--  sourceCompatibility '17'
--  targetCompatibility '17'
--}
--
--sourceSets {
--  main.java.srcDirs 'src'
--  test.java.srcDirs 'test'
--}
--
--repositories { mavenCentral() }
--dependencies {
--  implementation 'org.jetbrains:annotations:20.1.0'
--  testImplementation 'junit:junit:4.12'
--  testImplementation 'org.assertj:assertj-core:3.23.1'
--}
--
--jar {
--  archiveFileName = 'fernflower.jar'
--  manifest {
--    attributes 'Main-Class': 'org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler'
--  }
--}
-diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
-index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..41d9927a4d4fb3f96a785543079b8df6723c946b 100644
-GIT binary patch
-delta 8958
-zcmY+KWl$VIlZIh&f(Hri?gR<$?iyT!TL`X;1^2~W7YVSq1qtqM!JWlDxLm%}UESUM
-zndj}Uny%^UnjhVhFb!8V3s(a#fIy>`VW15{5nuy;_V&a5O#0S&!a4dSkUMz_VHu3S
-zGA@p9Q$T|Sj}tYGWdjH;Mpp8m&yu&YURcrt{K;R|kM~(*{v%QwrBJIUF+K1kX5ZmF
-zty3i{d`y0;DgE+d<pEk7Pr|u=*zNE>e>vN@yYqFPe1Ud{!&G*Q?iUc^V=|H%4~2|N
-zW+DM)W!`b&V2mQ0Y4u<ea&fhP8Zl}9enFLMGA78rwN)ZSva{tuDBrFm!)H9vOM3m4
-z-niSubJ&a4xSs}+dP%fO+GC$_<4)P0YuO<_KzvEJ?(Ir@)@_h}QPu8eKx^*hOS|ob
-zglR#!I=XV6e96{sFaTqa*yroz1qr?Te(?&#62a<0lDtodq4P_}6zQ3XQ@k&Wac@zj
-z!xW|4+QCtgyAKtcH=EZr)8(8$Sk&Y@4x_8dchwcHlyPSsIYtMhD7{~tRr%@kj%5Vm
-z;7_r0klH%P3r<%Wk32g(qX3Vlvsh(>_)uB=P@-2`v|Wm{>CxE<!zXQ=*HWl2>R1P^
-z>c}ZPZ)xxdOCDu59{X^~2id7+6l6x)U}C4Em?H~F`uOxS1?}xMxTV|5@}PlN%Cg$(
-z<u@mW976lW8Jb6)e1=uV8`_*8fnDQKnsWpmN8p7Nc?_FdC-=Z>wY6c}r60=z5ZA1L
-zTMe;84rLtYvcm?M(H~ZqU;6F7Evo{P7!<V=+h%r|+GH1ai~D70{AN;wJ6scs_bdsL
-zk~o&+!QijE(H{-r{aJH0mTO&C64O&h_H<P$ZX>LGcdwO|qf1w+)MsnvK5^c@Uzj<{
-zUoej1>95tuSvDJ|5K6k%&UF*uE6kBn47QJw^yE&#G;u^Z9oYWrK(+oL97hBsUMc_^
-z;-lmxebwlB`Er_kXp2$`&o+rPJAN<`WX3ws2K{q@qUp}XTfV{t%KrsZ5vM!Q#4{V&
-zq>iO$MCiLq#%wXj%`W$_%FRg_WR*quv65TdHhdpV&jlq<=K^K`&!Kl5mA6p4n~p3u
-zWE{20^hYpn1M}}VmSHBXl1*-)2MP=0_k)EPr#>EoZukiXFDz?Di1I>2@Z^P$pvaF+
-zN+qUy63jek2m59;YG)`r^F3-O)0RDIXPhf)XOOdkmu`3SMMSW(g+`Ajt{=h1dt~ks
-ztrhhP|L4G%5x79N#kwAHh5N){@{fzE7n&%dnisCm65Za<8r_hKvfx4Bg*`%-*-Mvn
-zFvn~)VP@}1sAyD+B{{8l{EjD10Av&Mz9^Xff*t`lU=q=S#(|>ls520;n3<}X#pyh&
-z*{CJf7$*&~!9jMnw_D~ikUKJ2+UnXmN6qak{xx%W;BKuXt7@ky!LPI1qk?gDwG@@o
-zkY+BkIie>{{q==5)kXw(*t#I?__Kwi>`=+s?Gq6X+vtSsaAO&Tf+Bl$vKnzc&%BHM
-z=loWOQq~n}>l=EL(5&6((ESsQC3^@4jlO5Od{qN#sWV)vqXw}aA>*uvwZopNN(|-T
-zRTF%5Y_k1R$;(d-)n;hWex{;7b6KgdAVE@&0pd(*qDzBO#YZV%kh%pYt1`hnQ(Fa&
-zYiDrOTDqk5M7hzp9kI2h!PxNnuJ<B`^Mhe3ly%$^w$3*WOd4DLEzfG@J3$}Y)fnX)
-zH;<m_AN0yr_leAC%G$CR3<-^>&xl*zF8sx6!67bA49R1bmUF5bpK&&{eI0U~cH}PM
-z3aW1$lRb|ItkG<M4<w%Yk)iJvsJ=qk(wBabc9wCBgqqQUl?_J0j@dtLNgo0oTIBMw
-zFmxG2{&>5~_eBNu$|I|vYIdAA9a!pVq<+UTx*M}f<Cydl3cV>G`23zxXp&E=FfnY-
-zEzKj;Cu_s4v>leO7M2-mE(UzKHL4c$c`3dS*19OpLV^4NI*hWWnJQ9lvzP4c;c?do
-zqrcsKT*i~eIHl0D3r4N{)+RsB6XhrC^;sp2cf_Eq#6*CV;t8v=V!ISe>>9kPgh}NI
-z=1UZutslxcT$Ad;_P^;Oouoa(cs!Ctpvi>%aQ+Zp=1d|h{W9Wmf7JWxa(~<#<N|-x
-z+wB5>tSZ?C%wu4_5F!fc!<@PIBeJ)Nr^$bB6!_Gic_7}c3J{<c?hHY$$whr&k?{Y6
-znNJn%ZB2QXBU93>QI~Gg5g5jTp9}V6KYgrgaX>pJt}7$!wOht&KO|+z{Iw@YL|@~D
-zMww}+lG}rm2^peNx>58ME||ZQxFQeVSX8iogHLq_vXb`>RnoEKaTWBF-$JD#Q4BMv
-zt2(2Qb*x-?ur1Y(NsW8AdtX0#rDB?O(Vs4_xA(u-o!-tBG03OI!pQD+2UytbL5>lG
-z*(F)KacHqMa4?dxa(Vcrw>IIAeB$3cx#;;5r2X;HE8|}eYdAgCw#tpXNy7C3w1q`9
-zGxZ6;@1G%8shz9e+!K2MO*{_RjO}Jo6eL3{TSZ>nY7)Qs`Dhi5><@oh0r)gT7H-?3
-zLDsd^@m<xQVzcNd`(P7s86P>%JvrS8sta5`QiZNs^*GT}Hiy^zjK2^Ni%`Z|ma)D2
-zuyumbvw$M8$haCTI~6M%d4+P)uX%u{Sfg4Al+F7c6;O-*)DKI7E8izSOKB#FcV{M+
-zEvY0FBkq!$J0EW$Cxl}3{JwV^ki-T?q6C30Y5e&p@8Rd?$ST-Ghn*-`tB{k54W<>F
-z5I)TFpUC!E9298=sk>m#FI4sUDy_!8?51F<M%uN*Ajyq*bGIeIeUdXoo%Xd3XTV_s
-zo>qqW!9LN1(zuDnB3$!<jN%eFzQRV+_R;j^$*k0bf`MjlUD&itHhuf_;vw1w4BRM?
-z6D;>pEUjL>N>RNgAG~-9Xm|1lqHseW(%v&6K(DZ3Pano(1-Qe?3%J&>0`~w^Q-p&@
-zg@HjvhJk?*hpF7$9P|gkzz`zBz_5Z!C4_-%fCcAgiSilzFQef!@amHDrW!YZS@?7C
-zs2Y9~>yqO<a2K5*Q;s{+>+rkih?kXztzvnB^6W=f52*iyuZPv$<OX>c42$WK7>PHb
-z6%MYIr5D32KPdwL1hJf{_#jn?`k(taW?mwmZVvrr=y~fNcV$`}v(8};o9AjOJumS4
-z`889O91^pkF+|@$d9wVoZ3<bnIfu#o3!UfMc5V%(mOg>;^j;^sUs&Ubo_qD&MTL%O
-z&*SE0ujG~<CGD(ok$`?}t)%pTf{IbQ(>zm;?<jNixA~e@gZ*6U>x)8TLC&ft))nyI
-zcg44@*Q{cYT+qGrA=In_X{NNCD+B0w#;@g)jvBU;_8od6U>;7HIo@F*=g8CQUo(u^
-z3r4FJ7#<@)MXO&5+DgKE&^>^`r!loe7CWE*1k0*0wLFzSOV8jvlX~<chY>WOQ?$1v
-zk$Or}!;ix0g78^6W;+<=J>z@CBs!<<)HvF(Ls-&`mat<kA@dLCUcQ=31Rg+;+4kFq
-zMtMu68RC?D0`}krH?jJL21$$HZ{Lsv3X)mHiwI4hrTnt?y2RfqwFnpo_DGwe6uJ3A
-zv|B1aggMlaQ%*i&<>pesJ5kkjC)6nGB@b{ii6-Uoho$BT%iJgugTOeZ$5Xo4D7Pd<
-zC*LJh5V@2#5%aBZCgzlQi3@<_!VfiL0<l-dOmBG0&Iil%Hq+E?Sf^KQ(|bI4!OpXy
-zVRBc5#N^$i6+{=62?W$DwMDtPX+J-4uBMRSZ1m0%a%LR*o4)iDuAWoJVbBFktzX97
-z3sONNH5G)`)=!)`1yxB-Ty^?M2IkLZ>7ywc)ZbwKPfcR|ElQoS(8x|a7#IR}7#Io=
-zwg4$8S{egr-NffD)Fg&X9bJSoM25pF&%hf>(T&9bI}=#dPQyNYz;ZZ7EZ<P2*spI-
-zU~l_wK|f7_K)-tdJ_gn9c)@?Z$)mZdsj<<w(WdjQ)!B+m9x>=u1n701<vS^S$MWWS
-z*2<^a_4=z<N^2*xa+XX)H4|Y5SH4~?Q`*}ms)P}km{%f@@-<^%&uN>SWKkZ9n(-qU
-ztN`sdWL1uxQ1mKS@x11;O|@^AD9!NeoPx}?EKIr!2>1Qq4gjfGU)tr6?Z5l7JAS3j
-zZeq{vG{rb%DFE4%$szK}d2UzB{4>L?Tv+NAlE*&Nq6g+XauaSI+N2Y8PJLw+aNg1p
-zbxr|hI8wcMP&&+(Cu|%+Jq|r>+BHk@{AvfBXKiVldN)@}TBS0LdIpnANCVE26WL-}
-zV}HJ^?m&$Rkq;Zf*i-hoasnpJVyTH__dbGWrB_R55d*>pTyl6(?$EO@>RCmTX1Hzr
-zT2)rOng?D4FfZ_C49hjMV*UonG2DlG$^+k=Y%|?Dqae4}JOU=8=fgY4Uh!pa9eEqf
-zFX&WLPu!jArN*^(>|H>dj~g`ONZhaaD%h_HHrHkk%d~TR_RrX{&eM#P@3x=S^%_6h
-zh=A)A{id16$zEFq@-D7La;kTuE!oopx^9{uA3y<}<CA$fk1IT{4FjGWgv!&Qj=->9
-z^bQ@U<&pJV6kq7LRF47&!UAvgkBx=)KS_<sRR+!6RZC5cwwj}~S;x)Q)+5fHbM32@
-zs9Dpw6*_`sQMYrP%1#j|U1c3>X!NY28^gQr27P=gKh0+E>$aCx&^vj2uc}ycsfSEP
-zedhTgUwPx%?;+dESs!g1z}5q9EC+fol}tAH9#fhZQ?q1GjyIaR@}lGCSpM-014T~l
-zEwriqt~ftwz=@2tn$xP&-rJt?nn5sy8sJ5Roy;pavj@O+tm}d_qmAlvhG(&k>(arz
-z;e|SiTr+0<&6(-An0*4{7akwUk~Yf4<JX9Tq5J!*OP4&wi-J3;wg&c+D8MXROBM9x
-zY%+{fj6XCxVA3e*V+E4ZaC2?*_b$@bw?dl3w)Md>M!!YKj^swp9WOa%al`%R>V7mi
-z+5+UodFAaPdi4(8_FO&O!Ymb#@yxk<HZ;C?aw~lw1!ng28dO31y6a^%A?mrZiLhlq
-z*)r9D-qc@_^Yo)QL>uVMrog(7gkj$G@FLA#ENMxG)4f<}S%Fn?Up$+C%{02AgMKa^
-z4SFGWp6U>{Q6VRJV}yjxXT*e`1XaX}(dW1F&RNhpTzvC<hla}alUMpFiPxiUEJDg)
-z5T@OEnNE}Jw;&G3crL{}5pCqBws~Gb_7$63#%$YX!r1fagPH-PbSt2dQ@`XI+!FpO
-zPBg3@LF}wg;SB#}QqN)V$tpZHYJGRjf`Z$Cq<>tzuu;LMhMfJ2LBEy?{^GHG!OF!!
-zDvs64TG)?MX&9NCE#H3(M0K>O>`ca0WT2YR>PTe&tn?~0FV!MRtdb@v?MAUG&Ef7v
-zW%7>H<yyBb4^02^=S~lp(==aV^=yU&QsYS{R$Z#_MPQ}KX>(;Mm)RJkt18GXv!&np
-z?RUxOrCfs;m{fBz5MVlq59idhov21di5>WXWD-594L-X5;|@kyWi@N+(jLuh=o+5l
-zGGTi~)nflP_G}Yg5Pi%pl88U4+^*ihDoMP&zA*^xJE_X*Ah!jODrijCqQ^{=&hD7&
-z^)qv3;cu?olaT3pc{)Kcy9jA2E8I)#Kn8qO>70SQ5P8YSCN<o_4{q)RX(xgDwNlZH
-zzebPidQyv5yfB^u)f8#wF9D2~qZ>=_+_&)qg)OYBg|-k^d3*@jRAeB?;yd-O1A0wJ
-z?K*RDm|wE<(PBz~+C%2CTtzCTUohxP2*1kE8Of~{KRAvMrO_}NN&@P7SUO{;zx0iK
-z@or9<q8_W=jB;CG$!3sa>R8ydYOFZ<QmE(^V7$Xl0ZTLH#4LQ49$*&tdo06GSY2B5
-zWAbnOoFOm;0r9<^opq%%1#>f(cHASCAatL%;62IL27~SmASr(7F&NMr+#gNw@z1VM
-z_ALFwo3)SoANEwRerBdRV`>y`t72#aF2ConmWQp(Xy|msN9$yxhZ1jAQ67lq{vbC5
-zujj|MlGo`6Bfn0TfKgi(k=gq0`K~W+X(@GzYlPI4g0M;owH3yG14rhK>lG8lS{`!K
-z+Nc@glT-DGz?Ym?v#Hq|_mEdPAlHH5jZuh*6glq!+>Lk$S%ED2@+ea6CE@&1-9a?s
-znglt|fmIK}fg<9@XgHe4*q!aO<-;Xj$T?IzB-{&2`<ytxLqDCA^PWKz2Ct4sO5e`N
-z#3V>#eA6rdtCi80mpP&vw(Uytxu$#YzNI_<LOg^VxHp(U<w~GJ1f1W5T<#!>cB>LS
-z<BGD5FQUI9ZdhON9ZG|Z2$;M>mim>ys;ir;*Dzbr22ZDxO2s;671&J0U<9(n1yj)J
-zHFNz=ufPcQVEG+ePjB<5C;=H0{>Mi*xD>hQq8`Vi7TjJ$V04$`h3EZGL|}a07oQdR
-z?{cR(z+d>arn^AUug&voOzzi$ZqaS)blz-z3zr;10x;oP2)|Cyb^WtN2*wNn`YX!Y
-z+$Pji<7|!XyMCEw4so}xXLU)p)BA~2fl>y2Tt}o9*BPm?AXA8UE8a;>rOgyCwZBFa
-zyl42y`bc3}+hiZL_|L_LY29vVerM+BVE@YxK>TGm@dHi@Uw*7AIq?QA9?THL603J%
-zIBJ4y3n8OFzsOI;NH%DZ!MDwMl<#$)d9eVVeqVl(5ZX$PPbt*p_(_9VSXhaUPa9Qu
-z7)q4vqYKX7ieVSjOmVEbLj4VYtnDpe*0Y&+>0dS^bJ<8s*eHq3tjRAw^+Mu4W^-E=
-z4;&namG4G;3pVDyPkUw#0kWEO1;HI6M51(1<0|*pa(I!sj}F^)avrE`ShVMKBz}nE
-zzKgOPMSEp6M>h<xzBqqC2r<F^H92Aw&4uudWPKvL8@MToS|loeJ@cW2tFfXRh#&3M
-zmy2Twln2FD@uLUm4efWiER|oHpuZBo0oOKxa%U{r=@uGv42}`By+%ym)Y7RDXH&du
-zoEx|?JqEWM#fL@T=I%`p-wa5K`f*Y;?romQLrl!#2OvbxCL(4R_Rj)fPeHt@ZfZ6z
-z!;^0XxFdQkgf|tVjx9o8i${;IN?3&o^gkMA7K`xtqNSPm346BF^Tw77TU$f7fhUZg
-zx>JzyTHHcjV%W*;Tdb}1xJjCP#=iQuBk_Eho6yCRVp<B-D5qnXH^$;Z)Q%;=b)~TV
-zma>&e!}4IBJ&?ksVc&u#g3+G$oNlJ?mWfADjeBS-Ph3`DKk-~Z70XugH8sq2eba@4
-zIC1H_J$`9b$K`J)sGX3d!&>OmC@@rx1TL~NinQOYy72Q_+^&Mg>Ku(fTgaXdr$p_V
-z#gav1o{k~c>#)u3r@~6v^o)Lf=C{rAlL@!s457pq)pO;Cojx7U{urO4cvXP|E>+dV
-zmr2?!-5)tk-&*ap^D^2x7NG6nOop2zNFQ9v8-EZ{WCz-h36C)<<!{n3lmWRTJS2LL
-zKqeb1k2ia;BW>^|f{V#R_WE^@(T0+d-at5hXX{U?zak*ac-XnyINo+yBD~~3O1I=a
-z99|CI>502&s-Qi5bv>^2#cQ%ut<4d7KgQ^kE|=%6#VlGiY8$rdJUH{sra;P~cyb_i
-zeX(kS%w0C?mjhJl9TZp8RS;N~y3(EXEz13oPhOSE4WaTljGkVXWd~|#)<uV3j}5Te
-zkV*EdY9egzhtn*nao`21CzD^I)5+{Z18Rw4lVU`8%2$p*UCl1`TX(>vsG6_76I)Kb
-z8ro?;{j^lxNsaxE-cfP;g(e;mhh3)&ba}li?woV2#7ByioiD>s%L_D;?#;C#z;a(N
-z-_WY<=SH42m9bFQ>Nb<j)a&Ob18H&7^vzH?H5JL2Of;-n4as~D=@sj@(xGD?Q&6)o
-zNw<auASS+8#i*1R!&uI-tFKh%KIr6NC(#SxD@3iP2k4DgV7OG2_i^y2M9g#zlD(U-
-z$!Uj{C~~=*h*XIwivlGPRURp*;)QB+YqgJIj&37B54@$-sI~y;X3Dihu4r?k)$3U*
-zk9uj6ma79_U1P?O&-Dm+nDF-X=2Qho8(&-!Lg<We!MbaT@J&@W=LLZ<CT{ON!^Ca>
-z@4K$@4l8pD7AKxCR>t0%`Qoy9=hA?<<^Vcj8;-E+oBe3ReW1`el8np8E$k{LgFQ}2
-z2t8a`wOXFdJ9!5$&mEfD1CnJ)TB+R<n2vZS8t~mtTC`K4pZCx&&(3zcvRA9eh$H8M
-z_(FD=Q{%@E%kevl^P8LEUHNViR|?_s&XalEIk_ZMI{}%7`W~XTC3|-uNW*qO<~QBb
-z3zP=yM9fq3N?>Jih88-Zos9@<!L<$JX|GawFX(o*O6o}Qi}@c~jn=uep}m0v`a|BB
-z2yR(9di0m0I`Pal?D2-w8ORi_pAzH`yiiE8$#II4Ocmx12(HsCbIF+K0-=4+5>HZ#
-zL#{qfbF0ARTXkR@G{lwlOH~nnL)1jcyu!qv2`57S&%oKz0}r{~l9U_UHaJ5!8#nrs
-z<AG(3w&=4UE7yD|>?2FrL`mxnzu&{bweD&62)ilz*?pYIvt`T!XFVVA78})p1YEy7
-z8fK#s?b~Yo$n7&_a?E<s;#As-2YXI2Zgj?Y;b*tIcNMs31ValY{ovhcp0H0&QM5o$
-z4!co%1r!(fx$se``<7Cmbm7?ejQIjV2y;U|x^!0Vm*%Fy)fu&$Qx*Oc;-S!FsjbE@
-zLB~r9R-1QTmStt90_5Z$9#S2eFR((hQF{$xVA=D1=6|LvHNnwH@y;m(oAc$*ViI6Z
-zEx94E7BZJ-uSdFn?oC)Uou8kJ2oUZF*FO-jg9CC19{3y;-I@2Jr?+Cmtid${#WLE7
-z>BdXH-_W)Z44?!;DFx6pZ?~RArtBI*Qm4~6nX6Z_T*i$bQPE;Qz?DAPstpGSqr-AJ
-zo%m9cA`oDDm?&dTaoh_>@F>a?!y4qt_;NGN9Z<%SS;fX-cSu|>+Pba22`CRb#|HZa
-z;{)yHE>M-pc1C0mrnT~80!u&dvVTYFV8xTQ#g;6{c<9d!FDqU%TK5T6h*w*p980D~
-zUyCb`y3{-?(mJFP)0*-Nt;mI$-gc4VQumh|rs&j_^R{sgTPF`1Xja2YWstsKFuQ(d
-zmZMxV$p$|qQUXchu&8%J(9|)B?`~rIx&)LqDS>ob5%gTeTP#Sbny#y*rnJ&?(l=!(
-zoV~}LJ1DPLnF8oyM(2ScrQ0{Q4m4-BWnS4wilgCW-~~;}pw=&<+HggRD_3c@3RQIr
-z9+-%!%}u_{`YS=&>h%kPO3ce}>y!d-zqiniNR-b5r97u;+K6HA2tS>Z#cV{+eFI`*
-zd8RMGAUtX1KWfPV;q<-5JAykS+2sY$2~UX+4461a(%{P#{rwFPu0xpIuYlbgD{C7C
-z=U{FUarVTYX6ZUq3wE@G^QT4H2Re;n$Fz9cJ>hABl)9T8pozqbA1)H-%1=WKm^QMu
-zjnUZ&Pu>q+X&6Co*y#@pxc-4waKMInEPGmE_>3@Ym3S*dedSradmc5mlJn`i0vMW6
-zhBnGQD^Z;&S0lnS0curqDO@({J7kTtRE+Ra?nl^HP9<)W&C>~`!258f$XDbyQOQXG
-zP8hhy<b(LFnif-XZwyRLGhe;etnjh`>SnarOpgu8xv8@WlXnm(Uk~)_3$Sg0vTbU3
-z{W!5B(L3{Yy3K5PN<@jEarAtja`}@KYva&<mg(_$O@VX5`i${0FdG$4{}rEJ0`R&Z
-zZs#begZtjukzdS}v}xrs@_Gxo!#!cy(lp$QA>zFRF*s+_%jI<i@$eKN=@#NPOmQlJ
-z=7^e*>Xh$T(S=an8?=Ry3H*NRqWgsM`<yWowt)b~MiHh~U(61jVh*wRB$%EpguObr
-z{C3K9^9C*d4~t4O^w;Si@@(EOQBj0^AR@&Z$?J2;l@0mka+vG&V0u~tGhp2HcU9Vc
-z(3Q+dYiLv8D}k6It5K+SSFp1a{3+y+@59Qw$=A%>&!#|@kf1>=4q%bFw7^Rhz!z5I
-z<ebaYnWhT}|MWO3GSGz>yI^zU8_R1WN9`88Z=n>pIZQ`Ixr~_9G%Q}@A7rd#*%y7G
-zXl^Id=^ZL?Rx}}gWXCqzj9C6;x(~mAH|$JteXa1MH<6UQig@!Hf~t}B%tP0I|H&;y
-zO6N0}svOa1a^PyP9N5?4W6VF%=Bj{qHUgc8@siw4bafT=UPFSoQqKgyUX>sXTBZ=x
-zOh^Ad!{kOM9v{%5y}`-8u*T&C7Vq6mD%GR}UeU(*epO&qgC-CkD;%=l)ZuinSzHM`
-z{@`j&_vC6dDe{Yb9k@1zeV_K6!l(@=6ucoI=R^cH=6{i71%4W3$J-?<8Qn#$-DMtA
-z6Qqi)t?4ifrt%3jSA#6ji#{f(($KBL-iQh-xrC||3U3lq`9>r)>X%oLvtimuHW-)}
-zy}>9~|M>w4eES`g7;iBM%Se5-OP%1U6gNWp3AZqT8C6OlFFfQ$|7LL;tBV)(qlp4K
-z<dPx#CSC1=4n%oyXOigA4XSj3{aKc{){yJp5b`oNF2J2BrG6uS^Wrd-BJ{m_yWEZS
-zk$9>ruar^K8FnJN3@_}B;G`a~H`t|3+6d>q3#`ctTkE-D^1#d9NalQ04lH*qUW2!V
-zhk7#z8OwHhSl8w14;KctfO8ubZJ4$dEdpXE78wABz<AT^6SV|+Ync#@d!bkI5#JQU
-z3b`Q?>=n5*=q9ex3S}`e7x~~V-jmHOhtX2*n+pBslo3uosdE7xABK=V#-t{1Hd~?i
-z{i~%Bw6NYF+F$aK$M`r#xe=NxhA5=p%i7!$);sd>Q}#`G<UXGdHa#qs#Rtzk+he;v
-z4Ks`bftVt<iTnIwWOp`bWnAf#a4QJhA<;EY5}#bKSqFZX;m+%6+z%P;2Yl?&Agk1r
-z-FB=A3bmYe`>?Q~fygrMXmZw?0#5#17W}6Tj+&kFexG{!mYl5FoA99}3G9l;3lVQ^
-z48^~gsVppE*x91WheqI(A%F0Z#$#1UJP1R12Mj9r)y(A?a+iquX+d8WD4WAQJ_!oq
-z9rTISr7bPd(GTP57xm$}C}&kjMivi;zi^Y9g3&<wLZq73hQe~~EfZyl=aX?g0t?D2
-zuuy~aVnthj6OZffoHY=Ney162uSvLAYB#m|BM1I?^kCc74K{CyWT=18^#bi7yWdqK
-z!tys-h@#h{nW16VYPjpSZ)_p2X!N3=_}w$e7u=7yM8();wZR{HMXtR9?DA?=-1gS@
-zV{;f*zEJNvVC-`tLihb~EGUE~uzf@bO1mi5Vws1@4E@|vc=oz}2Hi}mt-rzkrwa@c
-zTP3Pj(}xZE?_Uu*D~crlZ$|NVYVkj-I4D{I<idgn>X0A;ovdJ?{%_wHgt%%9P&N4H
-z^<Cu!JQ@8%Oe0#*=_(Uo!{omudXfnuD0~$Q^uY=X?SIduxBllBv?2xNtuX=k96+2-
-zBp~RTFo4VXFEWAD)|mjYULe19RluniXnb88!0Qd7*$@O+dV|b1i~twDe>XzV(uNA4
-zAP`hgP6BEN5`YXh|DF~6Pud?~gWfhUKoP<JH*Q+UKj+gXFJLY5FH(cvB9K5vTTFnV
-zsDH9@OA6o+_YdP@aX|FjOaPO_f6`-H8qk>X4>z|}0aocC&K+AoV%|SX*N!wGq3|y<
-zg4lP(04XIPmt6}$N!dTk+pZv>u;MTB{L4hp9uXk7>aS!6jqM2lVr%{)H3$O127TSZ
-z0x9hi0k-P?nWFdQ0K`pykqUIT&jD~B0tHP{ffS(}fZ(aW$oBWTSfHO!A^><6v<S5V
-R_{@Vu|29OF7ypyz{{qB}Ob!45
-
-delta 8722
-zcmY*;Wn2_c*XJ;R(j_4+E#1=H-QC^YIm8gsFf@+D&?(ZAlF}t5odeR+{krb6yU*TF
-z|2X&D{M`@d*32TNOe20l5=0ho#^2I~pbD~q^aFzN{Rm#3zYeiL5N6aRiR|+XoxRvM
-znZSLLlAJDh@2J2?#n2<HJgNrn!y}gPKy{ZIxz59kz<hm~l0|39>A?qar%tzN-5NQO
-zL&|F{nGiQyzNJ+bM$Y`n=Lx^3wTG^o2bGB@cwr1eb+6c-1tN=U+Db<XX<i;aUs3{y
-zu$Yc46}LAQ4CAsc4)9EnYl%6dJ~10(X5ZW^Ss{b(VG*NtD9iGhPK-k@+=)!T!`f{+
-z@ainn^hW(LPf$0Tl<&Xcm`;9Od$*nF|E8{^jqGNNRryx;b5{+SMn@+ZXGdh-G|tKP
-zuHT41(Hg5&N{#%6$V!J^?}Ma22!#@avKdJgEHC>;bc~eJ!hwM{SbI=#g?$!PjDB+)
-zPgU_2EIxocr*EOJG52-~!gml&|D|C2OQ3Y(zAhL}iae4-Ut0F*!z!VEdfw8#`LAi#
-zhJ_EM*~;S|FMV6y%-SduHjPOI3cFM(GpH|HES<}*=vqY+64%dJYc|k?n6Br7)D#~#
-zEqO(xepfaf2F{>{E2`xb=AO%A<7RtUq6kU_Iu0m?@0K(+<}u3gVw5fy=Y4CC*{IE3
-zLP3YBJ7x+U(os5=&NT%gKi23bbaZ`@;%ln)wp4GpDUT$J8NtFDHJzIe_-t}{!HAsh
-zJ4<^WovY};)9IKAskSebdQiXv$y5}THuJZ}ouoElIZRui=6l<y)fv;;3oP9g(<=Mo
-z4KtG6Sz-`Lzy`Dwm;GGDNaoU(-j1TqQOr9h2X|FC)NAMQT9Rav&<rB<8Y+quHxXE=
-zcvM@*_)2r5BzxbYsR<sFreYP*eb<Sq70MiItNRw~t5qn}jC1-(A(w~+@~c$HlIbm@
-z{gieFFc7i{RP1#KAN88>rupV|_Jz=9^&;@HwL;J#@23k?A;k`0Bgf;ioO>W`IQ+4?
-z7A)eKoY4%+g%=w;=Vm8}H>@U*=*AWNtPqgWRqib#5RT<UUiN@Qs4P~Sqw`JnC89N3
-z=0)f>GA@Q=43FrQn3J`GkTUV5yp0U`EOTqjfp+-9;0F8!dMEwwcK%(6`8sDD^aR04
-zd6O5vh|Xk?&3dy4f|1QK&Ulf{h6Iq;d-&*ti#Ck>wZFG;GHwc?b;X~eBITx49>2d8
-z4HcK&1&DvEGT6kXdzAm4oO8%<TLI2zycGy7+z<|}*wFJ={=R(+YKmC@^1M#1n(Z))
-zF>c}8OBt~8H956_;Y<j%Tkq`kqsDj0EhIv0n_b!%m<=x1Wp?SWR2i*M&1*Rvc2q2I
-z94b=fK?Q%~<+aISrM;>P-ss*uMf==a+%w~F>Qkm7r)IAuxuoX}h92$gHqbFUun#8m
-zWHdy`Zrm#=Pa98x8cO0vd@Tgkr*lm0{dky+Gocr0P8y%HGEI#c3qLqIRc`Oq_C%*;
-zG+QTr(#Q|yHKv6R@!DmLlwJQ3FAB)Yor-I4zyDyqM4yp5n2TrQH>gRt*Z<a&#Z6)3
-zSFWZ_cWY?YVMR09l(AQZEAmyk9bEFO*P;0c*Gy8gl27yx5T_$gWyyY#p@N=H@PwZF
-zCg+}dPJ?5fflHsWBf7vHkHDJFn2}&+NkF_+PR!9~D@Hk3)k@it?=y0Jyz1W69S?7+
-z-Ie2fN5DibI#qo+7)w$!&F<A^fCpo-dRQbU+k5;m8@iur>w0+WI-Sj`EgmYHh=t9!
-zF6lz^xpqGGpo6!5`sc0a^FVhy_Uxq|@~(1@IIzV)nTpY9sY`CV!?8e&bB8=M&sYEb
-z2i}fvKdhp9Hs68Y-!QJ<=wE(iQ5+49tqt;Rh|jhYrI5VW-mIz|UY{h8E=rC5sh#DU
-z?wGgk-Tn!I?+Zer7pHlF_Z^!Kd1qkS3&lv#%s6-<5Y%jQL${cge5=G5Ab?D&|9$Y~
-zf%rJC2+=2vg;y0-SJb3<@3%}BO$T$C66q$L_H33a`VUbgW~N(4B=v5(<=My|#|J7q
-z*Ox4wL4kbJd_~EjLTABSu4U7Jk#`y(6O*U6(k6XxM}CtGZB(H@3~kh*zaGRXM}Iwp
-zQ%xFk2>@wiZrVCV_G4G~v;NebCQ%T7{SDyPpSv&dT@Cn)Mx@IK*IdNrj{*4pkV4wv
-z)y0J538h>cpB7iPSzA~x24T`{dzNkpvGIqvt1Dvdq@o-`B=$hkczX8$yFMhsWNK-X
-zxr$kR$tMD0@W)Vxe1^t9qVmsg&K^F@u84)(n2dttIEAZFN6VD$&tskpG%SI7whGL3
-z)DeRiwe&?8m7U{G`oW8!SCi*dM>oYL%UKQnKxV_0RXAEBQg1kStExGEUVwLJ0o<mX
-zPQSP~IvpJ8tvs1qUF7Z#Yzkp`7Rt#W`%%Ca88|N|_RIN)YkGhqsoF+!rg-W;%EwC<
-z>rGGwb7uv+kPDl7_E2*iD|J*=8A@;XCvwq0aw5oJY<RSFg%fLH75$g!t@`Fk=qJH=
-zpC{pOmSlX&lChE0RB4x-r+%D1e6=1gF&dF`;8R|3S<`+Y_Cp8{DQ(9P>N*Yh&o=l}
-z2z8YKb-fIAH5spql4eXqp*)o2*b>#1@DSt?zZi{GPj0gH&Nm+EI<3^z0w%YTEV4xw
-zI6$+=Faa|Y4o5i0zm5lOg|&tmnJ806DBovU@Ll6XsA;NRrTK~t*AAJIAS=v-UZ%Pr
-z$oddI@NRir&erzCwq|)ciJemr-E061j{0Vc@Ys7K(mW|JYj*$+i1<Y}*RC{b<)FqH
-zj62}90*b<Z=qvQSb$MR_$=(fQmQ0)soS;`VF?2jn=&zp>Q8XlIK8T?TYS(AXu$`2U
-zQ@fHxc=AVHl_}cRZQ)w0anMEoqRKKIvS^`<-aMf*FM`NsG&Uowneo+Ji$7DUD<LAG
-z0RSi{002M&5NT(h5ex(Xh+hE!kP=Bz3TO0rY<&DUZARp!KZU3o390?|nwP*?q|?&n
-zLKc=ZDSXg_0;Wsu=bQ$iQ?IoK?sm}g^DVMDc``<SYL<n7goRA>Yc7*Hjg;-&aHM%3
-zXO6cz$$G};Uqh+iY7Wpme>PHG4cu(q;xyskNLs$^uRRMfEg?8Cj~aE-ajM%CXkx0F
-z>C?g3tIA#9sBQOpe`J+04{q7^TqhFk^F1jFtk4JDRO*`d-fx`GYHb=&(JiaM1b?Y^
-zO3Kj3sj76ieol|N$;>j@t#tKj=@*gP+mv}KwlTcPYgR$+)2(gk)2JNE=jSauPq!$<
-z<|?Sb%W)wS)b>b6i{8!x!^!xIdU3{CJFVnTcw0j{M%DUCF=_>eYYEUWnA-|B(+KYL
-z_W_`JI&&u^@t0})@DH^1LDuT0s3dMpCHIbYBgOT4Zh_4yHbSqRbtIKndeT4Q*Jg91
-z@>rO!^t-G~*AIW;FQ$3J=b;oGg8?CTa~qNCb>&cgp@e;?0AqA&paz~(%PYO+QBo4(
-zp?}ZdSMWx0iJm7HVNk9A#^9Osa#GPJ!_pYEW}($8>&2}fbr@&ygZ?${A7_9?X$(&5
-z#~-hxdPQwCNEpf=^+WH-3`2LxrrBMTa}~qJC9S;VzhG!On^JLyW6WkF{8aAE$sM+(
-zxr8xLW(KIjI<m$<QP-s3u2Bsy6WFBNJ8auK=%vnBo~&XM#H=7z*|184NwfgYujE3;
-zhlc{I10O9+J>`Rm(24r3OJBk<3GF=G!uSP0-G&AY32mLm8q=#Xom&Pqv=1C{d3>1^
-zAjsmV@XZ%BKq^eUfBpa8KvO8ob|F3hAjJv*yo2Bhl0)KUus{qA9m8jf)KnOGG<ZK0
-z7qi6c6;SXn!tpX+8D7x^D9GAgjFUp9WQ+*1n&;<d;!K=tGMbABGLTecYUT`E=3RZ~
-zeud1snh_Zp-izIgE7K24^{fxEuRN@E!aoOPz6jiO2&p~Ye7BNr%zhy$?lh(yH<(dQ
-zE!EGhh_Y8K&H>Ta6~4>3@J_VzkL|vYPl*uL+Ot*Q7W!f5rJw5+AsjP_IfL+-S*2p|
-zB7!FhjvkUTxQkGWGSg{X;h~dK>gAJivW?88Nu!3o>ySDaABn$rAYt086#27fbjPQS
-zhq>55ASvm*60qRdVOY9=bU^+{Pi#!OaZwENN;zy5?EztOHK-Q5;rCuiFl}BSc1YaQ
-zC-S{=KsGDz@Ji9O5W;XxE0xI|@3o6(2~i4b8Ii9VT;^G$*dRw(V?=br)D&q^XkeBX
-z+gl~+R@rVD-Hwv@7RHV?Bip5KMI)aV^&snt?H<$Nt=OPx#Vx<wrnG(X?#5j@S1F=V
-zOZFPcfe)mH?XG>F&BGi?2A2+lNOYywNUGMeGL;|(=UjGDtLG0sN&LpGx;|U;xa13s
-z;W_<zYa$VMZtJkd3eIv0jv72gO`~hf`V(aHJ)`JIN8-M{wNNg%`(lpdboQ2nzLW9u
-z*F^iq!l9!@nCW)u91gE0BliHl;X-SdYtTh={5*)a$#wacc6W%;>|SPk^G}!M9_^pO
-zA3bt3-tca%^42sHeDtfcC0S3w3H1ny!Bxpa=*k?XRPpx9Bb-gx1J9Yvx)4J(8cG+q
-z(iCPZ9dsf3#QVyZgD_MW#G#qgV)olu$59&3(PzQfw@%4uZ~<5J=ABvdY43(Qnp{;G
-zHg3>@T#>DbTuhFl3)fb3TFqdh)V2aq7!;&JOHseTWukvA7}(iGUq;v-{2J0iHSNHq
-z;+)h!p6Ok^+Sp8-jgL($n6Qu47xyE`cFO5SdZR6;R!FET`tm#0D37z339Suxjpv+s
-z*=%2-N$N?X&0?x_uut3erF@aBGj;9$k9?3FlbDO{RQa1_qtxrh4!4#f<u_#49<#Me
-zT}`O819!AFB7<8tqeiowrNbH;Atr0Zg9{d|0hb)JGg^iLC)qlS1`z0iO!X)AKEXrB
-z3zO91j=s#Ek2&c!jEQwIMjT72NxdBbz)42Z;gS{Bz!cQjys(;UZ@sLZujYOtkTTHF
-zQJ+6j*RdukVLuLS1KBIa1{xQcqvu=|afX66wi%aF=d(ZFs2Fix?H>jp4x~akvdTp@
-zos?^Q&XE;3N93s4rHQGPrV7+au1$$aB6$hLy*Yz_kN$~dweb9PcB!eYVQTGjFuJP>
-zZCEwBtb>TIgI<TVyC9z!p9DB9m;+SJtwpX&dvLqBOk7`ZOdBJ%2jd;bwTUk13zVXM
-z)u%#E%<(krJO!3xHRjelYO3Pxvd|w_zGbS{+*+}*u_6#E*@|^$-Q&kp<q$k-#MMz}
-zRHmEJji~@yep<@n5pr(O8b>O^qAzq@Bv-qud_ZD-2W<_at&ml-gv`tPt$@DF5`HlA
-zM>DmmMkpv&Zm-8)Y#0bLQf4MpD4_-7M8eu6rh(tL8dq8onHs#R9J~dGd2IaXXMC~h
-z91pKhnQa%Fsn29nAA1;<lB7S|jj`%V&Ul6h;`#7<q#ab(BXL<Jp~Q^0m772>x(%oC
-zhca~qQDJaMf?wFrl-Pj;e$bZMYmMF!Y3Lv&Sb?Sjn#!NVx&NDyc^$b4uYyo2OmERa
-zRz;yDGd@JTykzFLe|Wk-y7#3x`6$wt$zR8r48mdUvfbeL+4D|Z``~7$PrE@qc7rZe
-zVsIoIbCwzjLZ@_M1*bD{HaYn();Z1-q*-I{tEnTZ(}Zmk&%MXSN<hBJc%#b>BX>o|
-z<E0~M_3d_^zb*ZAotV_<>-u*RNkAyKC-Srp7c-=@5f)xMWg>o2WWl}j6j9=8+D8;T
-z>0*0q#;qw8%U8i;6s0fu#I*%(g*@@a2Er@@nyI}{=@W{Z-;`=wN4N~>6Xrh&z#g}l
-zN1g5}0-#(nHUTv_rl2{yUZ;h#t&Fd?tY!7L%ClY)>uH-Ny2ET$lW$S)IQiN79H)D^
-zb&0AXYkupy0~w8)*>Sj_p9}4L?lGTq%VG|2p`nWGhnM^!g|j-|O{%9Q%swOq63|*W
-zw$(N_laI}`ilB+o!a-wl?er~;;3+)$_akSQ!8YO_&-e*SI7n^(QQ;X0ZE`{4f!gAl
-z5$d+9CKVNonM!NO_frREICIAxOv)wm>}-k?iRisM`R7;=lyo|E_YR~FpS&PS`Lg0f
-zl-ON<0S%Uix8J%#yZdkCz4YNhcec<|7*P(JsM#>-L>+tYg_71q9~70FAc^6KW5jql
-zw!crdgVLH1G_eET=|SEc977;)ezVC|{PJZfra|}@rD;0s&@61mTEBJtILllg{%{vN
-zfhb&lq0yChaLhnJ-Qb62MB7`>M;|_ceHKZAeeh@#8tbrK!ArP6oXIhMK;dhEJTY`@
-z0Tq>MIe0`7tGv)N*F0IGYSJv0vN?Az8g+4K9S!pW2~9F4W(_U_T=jCZrzuZ3*|__T
-zONp_UWmy<Aq+0nbZ&=<ZR;i&e6E+87kR}p;KE40WA@->ePv8C~rckc?Xji;Z5OEqg
-zC*Um)i;Wh4TEwqReQdVVbUKT^2>Tpi6z_^-uF*adUFug4i@JhzpWT^Sk&E>CyP2?H
-z<yDwjpi;%{B``^5ns(`@%}?w?Tmv>Wf6x}ehuTs6wvzCnTU&gYzT029Nz19(In1WC
-z`(1IGmi!O%2AR|BjQa4Q0~u)kM%}?<v2X}ER&l<(GSV{5xiT4gWSP3)r|Kh;@ROr5
-za2<>xQyjWuQ16^Gp++;`vr7!k--UZWM*~7Zl|ceO@I3`OpaRhD;YoCuo5IC0uHx>9
-z478hu@H|e0Zlo)Zj@01#;8BDs@991xe~^9uG2}UXLM(m7fa}AMwX*tjioBeV&Q8Gx
-zSq$6wZFkRBK`cMI>R(@W@+lo2t)L+4q-negWRLWZBz*|%=W4v62JrmzNuOtA*x)QE
-z5L%=OH#@KMdB%Jp^r?0tE}5-*6oP`-lO7Sf)0)n*e<{HA=&qhLR)oD8-+V}Z4=md)
-z+k9lKf64DB2hAT)UaCP~di?-V3~JBH7itYyk~L6hrnxM%?RKntqd`=!b|e7eFnAcu
-z3*V;g{xr7TSTm$}DY%~SMpl>m{Sj!We+WfxSEor?YeiAxYUy25pn(?T()E>ByP^c@
-zipwvWrhIK((R((VU+;@LmOnDu)ZXB3YArzzin!Z^0;PyJWnlfflo|q8(QY;o1*5CO
-z##hnkO{uy<F1stt^4+O-)m2_k;##de2WT8yPLs6`VeY_M+!iU-HURRFgaoKWq63kH
-z&9lwxz1RRWh3Neue(-TEdzMqF_t)7kCD*-ShyrGEJgL30-P~_**S>nTMdk`~DOC#1
-zdiYxQoy}=@7(ke#A8$YZZVtk4wo$8x28&I;cY3Ro-|kW=*yiiHgCLZeAr)UtVx>Tu
-z|LvL0hq|1-jC0I4x#>&QZCfrVB=zT!n<v5HW%p@E#Sc^c1w^%^di{w>R|~Uz`9%~2
-znl{uZ{VEszW`Fad^q_HB!K9*|U-stK%?~;g?&&+12A}Rq$z($Bzuk^2X(Y=hF?-dQ
-ztc3DsQK<S>I;qhWIV`99Q#R3xnU0AvY!i*BECj-z9l74|%O=V@nlv|qqC^r^-~C?E
-zGW%c|uYgnfJ(gjsTm_cIqcv*mYM{+i+&@F@+69ZQOK&u#v4oxUSQJ=tvqQ3W=*m;|
-z>SkBi8LYb-qRY7Sthh*0%3XAC%$z1rhOJzuX=PkTOa=DlocZUpE#KxVNH5)_4n=T(
-zGi3YrH7e~sPNYVBd~Grcq#CF~rN{p9Zza-Ntnwfma@TB)=3g36*0lSZg#ixEjFe%+
-zX=&LDZ5zqculZ`=RYc^ln(~;nN|Qh6gN=!6f9-N2h+3NWbIxYud&;4SX*tWf5slk4
-z{q@@l71UAZgj~*6<a!P^*XyO6h3V&EIvmVB&lB>edXb57fBUxvAS<?R$3H&g9z(ud
-zC=Y=i9ogPk$0eTBe>7s(RI=X868JM0+^DCn2yC>;v%S;qPOjB>YVsz(Zx9a>>BK&M
-zIQK>7_n)4ud0X5YM}^i*keH{ehLsiy9@NvOpsFeQjdI6anLGvVbBw_*fU1TzdVS$i
-z*4j7z!I5RF#rSz|8ibi$;qE{4`aqWYik7QB5U&F5C*;TO_x+gtzPGpzNt!7<mrl&D
-z?YHQ8AcjmQWvKqy#)p^zuglBl8CDINLKBj)?_%r~jbwgM{?XCV#nwCrsDywOPl)O4
-z1iY&OaHb!ID%|!6v}WZyD;r0d5HHqMY07YEQA3%B1K0*$F{tE{b8#WEiNKpXge-SF
-z>~nsBT7)Ckc(K~%uv&{{6A`mmBJVAk-{s~52Vu|HbCH7_W1~ZCX^RflOakGg=jo2Z
-z<*s;5-J+2@^LRDZ-7EV&Pq+FTErw@pf<FOqg*(-e451n#;tkkoriWQEDKDFq2!ieN
-zLeiVf5`ty(aFD?X`*lpmkSi<-av=S~=*aBP35=&q7u^BTyY^<5hixaX(LHSM1mn)S
-z+#9YFD(b%_u;jWXg5ybDQ+)AmBS5<>Fqvx^i%E7Fx#^n(E`m2(c>K-O5`M`Yek9el
-zzTGs5qD6*G;y#~xu3>qWuO?-amKYtvRA}I9z#UspEeM;wOERYeot_n_EUMJf$4_<k
-zNVbZgMSmWQ6FqNF#0s0V(lu@ogXcb7BEKcEh)QLjfht~yc*mYZjInx)u41y89(84Q
-zN#BI!hxsr%F!apVO`9ev@_f^SJ?O(8KAOUo4tWLfZrN1^+hr|8RWEoP{Syb1-FE?)
-zwgmw|kZ=e!2w8aFsUkFNkDI)JQO0I1ro3ZZYc4RIDM@ozB)dX#uZ=)!4pt_NJrw~2
-zN+XZURqQ#vGvtqxrzc#6S>u?E!6X~?q)tPoZb^_<d;nWljU)~5zM?#f<ak_3zV{&+
-zV1Yaz#_X?wf@sTxVWR_=01=ctDE26}#k>;8Y_Ox2h1m<+Le-fsRd|T8db<8#$bqez
-zua^Z|>h%zdnuU^ww$#-dZ9NTM`FN+!IlLkz*FqWb!x^Z|C{KyGjZ+>G;;7Mb@LY|H
-zc+Gp`L((Dw7pnDlHNm&;SfHedhx*kad$I^uGz{`0BYelq0yEUHpNKSk<tbO&BJ#-~
-zNioWDy(zsj+JiDGyO>vj$|dpvY3{7*YGyhXA^LP0&wOw9oNoC=QoVx1<2Dne8qqZL
-zm>nFh5DX(-RnQwvHCZQwn^#Z=E!SPVlaRJ78Bo@}!!9dRt^qZy?-*`Pt4WSmgucJv
-zV1yFkcjlEM^uz-;b#Q7ZCP@Lk)m}uPX={R4B=56k7WNh11BN~0T*vr@!!ow^B0hOR
-zQ)4)&(e%>bNNL%bm<d)SA><&8H{*l_L7s0$2GUgX2Vd;=4d9Dm2v3TaL+;L>{K7h7
-zV#<qazV44lYPWneiZ1UOf5G8x42YZmekhZ8CScs%<&!eu_viN2j>k?xDPm(NDE31$
-z<}|X)pEY6myjK+^gaIMk&Yj2~F0rSKemNqlsVm4c|N7mp_<l-IyhbRMa-e_N5Nk#`
-z<`_$OtC(NWjlAFk@gf}s+IIC+v^^hxSIz!0qIY2r&MLr!N1TW<`ojRq7bl1I-)@q4
-z9_Fp_r9~k)^Ar(J6urX%82HJ62vD*ntGO<={xMPl+biAc9@4DYh5F~bjY}TjCGqV}
-z-o`ac*dy6QqT7bCKSj?Ip>C*L01s;GNx#D-*&gk!qQr}^?_r@q!8fuXw!)fA7xkd}
-zb>vHvdx~H$5qq<OQ!8gN;RoQ8c=%I2*((Yyi^K@RxA%p>AWrow7}+8zBM65-JOt5z
-za=T6f7MK`XJuQog8kIEboPdhcaVJeHy)5z7EBLK5NRr()E|#K0L0N^JD@pUA^Czb`
-zbUZ_558y+vqAGeyHCbrvOvLD67Ph}06959VzQ_|>RrXQAqE+AQ(-AaKdxoWaF8hdt
-z{O3W@b^*o#-f1VuU>YMV03ELF7zkCN4Q&b#prz<E5F(~V?qtBO2>%3Nne0lSbRo@@
-z^ihv%oIl~Qyl6Q;a#<eQoefN;+JeGiCpL!4-J>$*jOC%x0_;eis*)J7=f@Ct*)xF5
-zo}u~@-I}2|$b%5L7>@+Z?4o+1r&v6ceIy+vroK&jCQ<4q&45HP2wCol4hVm3pZtjf
-zHz1D7oyaSKJ~T{Gx}7ONLA)D5k(%%`WswrDyzX*rn}i}}TB4^y#@mAwPzoC)`?rYv
-zHgx|trUN#mu*VzUV~8TnJM2Qh*ZM5B{x&y>5An`(M7=Z*Q>TdiH@j*2=moNuOtvpz
-z+G`@~-`%~+AgPKgke@XiRPgndh@bp*-HRsh;HTtz@-y_uhb%7ylVOTqG0#u?Vn5c5
-zEp*XRo|8hcgG^$#{$O9CJ&NE;TrfRpSnLmes&MO{m=N%zc`}gb!eQ7odl$oy1%PI}
-z#AIxx%oRVy&{O~9xnK4$EY>(eQj}!HKIV$Fz*H=-=Kn)N0D6u`(;iO|VraI4fu_W`
-z;b5{7;Lyx4za}DU#+U7}=H0dAS#YJJ&g2!P@Htu-AL&w=-)*%P9h2{wR|@?Ff9~)b
-z^+e_3Hetq7W%ls{!?<6&Y$Z;NNB41pvrv)|MET6AZXFXJeFqbFW5@i5WGzl?bP+~?
-z*&_puH;wKv2)9T_d+P`bLvJFqX#j&xa*-;0nGBbQf0DC>o~=J_Wmtf*2SZQr?{i~X
-z9-IbRH8{iy?<0v9Ir1?$66+igy|yD<u*FL=BXByYf`Ydv9d`X1fs~1euE8BK6Dev`
-z#=o-z(5q=uFnh*sRnN(McXxt$kv%^FH+Irl5lWRMm+%16v=F$FG5oytgvEV*?`rjK
-zSlAE9ER3M<&H1YRLi8hNIl%svh}z&nnE6^Hdt~RO>Q5J~A9sFX@Pe<*kCY8+MwH?I
-z`P}zfQ6l^AO8ehZ=l^ZR;R%uu4;BK*=?W9t|0{+<XjV;uT!#OgFe40z-YO0R)f5Ng
-z|MV*kUo-w^;+SJX1WeyT(AJoMy{7+>-at(MQZ(CtG=EJFNaFMlKCMXu30(gJUqj5+
-z`GM|!keqcj;FKTa_qq;{*dHRXAq157hlB@kL#8%yAm2AgfU|*rDKX@FLlp=HL8ddv
-zAWLCHe@DcDeB2}fl7#=0+#<05c3=VqM*O3bkr@9X4nO|)q<dojnluovElyz7$A55m
-zOB$$__zzYk;r&~u_BIJnGUcE2Ih7PryUhg5PX9~gA$NN?5bx~&PN<OeFRmn;43fCR
-z1oZy=k51*2LJZ(Ikk`8;K(9hbeF-B(c~>0hU;Gye{L8ZN*NH8Id@mP-u<kJdqbmLd
-zMeKb5hFAZC+k4_b_qu=C#=hYGO^yR`fRh0G>;Fmb8YuorjLrW&ndip8CN%_qp982r
-w1WEnz9^$&s1hkp_3#lPJQ~!HI7WYYjA7>z!`?f%npAh2%rB@vD|Lau$2O)#1n*aa+
-
-diff --git a/gradlew b/gradlew
-index c53aefaa5fc898b78c7265ea99a3bdc09349a7d0..1b6c787337ffb79f0e3cf8b1e9f00f680a959de1 100755
---- a/gradlew
-+++ b/gradlew
-@@ -1,7 +1,7 @@
- #!/bin/sh
- 
- #
--# Copyright © 2015-2021 the original authors.
-+# Copyright © 2015-2021 the original authors.
- #
- # Licensed under the Apache License, Version 2.0 (the "License");
- # you may not use this file except in compliance with the License.
-@@ -32,10 +32,10 @@
- #       Busybox and similar reduced shells will NOT work, because this script
- #       requires all of these POSIX shell features:
- #         * functions;
--#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
--#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
--#         * compound commands having a testable exit status, especially «case»;
--#         * various built-in commands including «command», «set», and «ulimit».
-+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-+#         * compound commands having a testable exit status, especially «case»;
-+#         * various built-in commands including «command», «set», and «ulimit».
- #
- #   Important for patching:
- #
diff --git a/FernFlower-Patches/0006-Make-methods-hold-a-reference-to-their-declaring-cla.patch b/FernFlower-Patches/0006-Make-methods-hold-a-reference-to-their-declaring-cla.patch
deleted file mode 100644
index cfa4d0f..0000000
--- a/FernFlower-Patches/0006-Make-methods-hold-a-reference-to-their-declaring-cla.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: zml <zml@stellardrift.ca>
-Date: Wed, 31 Mar 2021 16:12:46 -0700
-Subject: [PATCH] Make methods hold a reference to their declaring class
-
-This is used in several later commits.
-
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-index 470965603db2b5ffda4c2776549fcfbba5e7ee72..0a7e5ba44d82f1923dadd9f79627d91f82b1014c 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
-@@ -41,7 +41,7 @@ public class StructMethod extends StructMember {
-       attributes.putAll(code.codeAttributes);
-     }
- 
--    return new StructMethod(accessFlags, attributes, values[0], values[1], bytecodeVersion, own ? code : null);
-+    return new StructMethod(accessFlags, attributes, values[0], values[1], bytecodeVersion, own ? code : null, clQualifiedName);
-   }
- 
-   private static final int[] opr_iconst = {-1, 0, 1, 2, 3, 4, 5};
-@@ -57,13 +57,15 @@ public class StructMethod extends StructMember {
-   private final int codeFullLength;
-   private InstructionSequence seq = null;
-   private boolean expanded = false;
-+  private final String classQualifiedName;
- 
-   private StructMethod(int accessFlags,
-                        Map<String, StructGeneralAttribute> attributes,
-                        String name,
-                        String descriptor,
-                        int bytecodeVersion,
--                       StructCodeAttribute code) {
-+                       StructCodeAttribute code,
-+                       String classQualifiedName) {
-     super(accessFlags, attributes);
-     this.name = name;
-     this.descriptor = descriptor;
-@@ -76,6 +78,7 @@ public class StructMethod extends StructMember {
-     else {
-       this.localVariables = this.codeLength = this.codeFullLength = -1;
-     }
-+    this.classQualifiedName = classQualifiedName;
-   }
- 
-   public void expandData(StructClass classStruct) throws IOException {
-@@ -332,4 +335,8 @@ public class StructMethod extends StructMember {
-   public String toString() {
-     return name;
-   }
-+
-+  public String getClassQualifiedName() {
-+    return classQualifiedName;
-+  }
- }
diff --git a/FernFlower-Patches/0014-Add-better-debug-logging.patch b/FernFlower-Patches/0014-Add-better-debug-logging.patch
deleted file mode 100644
index 3377e7a..0000000
--- a/FernFlower-Patches/0014-Add-better-debug-logging.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Mon, 25 Sep 2017 13:46:14 -0700
-Subject: [PATCH] Add better debug logging
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index aa990406ef8d91838aa2d928bdfb183fe9e19333..410a83345e5e145962137536b95ca4f22185d678 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-@@ -824,7 +824,7 @@ public class ClassWriter {
-             tracer.addTracer(codeTracer);
-           }
-           catch (Throwable t) {
--            String message = "Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be written.";
-+            String message = "Method " + mt.getName() + " " + mt.getDescriptor() + " in class " + node.classStruct.qualifiedName + " couldn't be written.";
-             DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN, t);
-             methodWrapper.decompiledWithErrors = true;
-           }
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
-index 964bff5a00b35969fa08e48ca355801fe2882ce8..0c53385b28507ef4fb0ffb2ff6c58298dc9a5bde 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
-@@ -110,7 +110,7 @@ public class ClassWrapper {
-         }
-       }
-       catch (Throwable t) {
--        String message = "Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be decompiled.";
-+        String message = "Method " + mt.getName() + " " + mt.getDescriptor() + " in class " + classStruct.qualifiedName + " couldn't be decompiled.";
-         DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN, t);
-         isError = true;
-       }
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructContext.java b/src/org/jetbrains/java/decompiler/struct/StructContext.java
-index 85fc95d87bd7e672613f6c1beb75b2d56d1d759f..2b6448c01968ddb6bde275304e0073837d7fa575 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructContext.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructContext.java
-@@ -3,6 +3,7 @@ package org.jetbrains.java.decompiler.struct;
- 
- import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.main.extern.IResultSaver;
-+import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger.Severity;
- import org.jetbrains.java.decompiler.struct.lazy.LazyLoader;
- import org.jetbrains.java.decompiler.util.DataInputFullStream;
- import org.jetbrains.java.decompiler.util.InterpreterUtil;
-@@ -122,6 +123,7 @@ public class StructContext {
-   }
- 
-   private void addArchive(String path, File file, int type, boolean isOwn) throws IOException {
-+    DecompilerContext.getLogger().writeMessage("Adding Archive: " + file.getAbsolutePath(), Severity.INFO);
-     try (ZipFile archive = type == ContextUnit.TYPE_JAR ? new JarFile(file) : new ZipFile(file)) {
-       Enumeration<? extends ZipEntry> entries = archive.entries();
-       while (entries.hasMoreElements()) {
-@@ -145,6 +147,7 @@ public class StructContext {
-         if (!entry.isDirectory()) {
-           if (name.endsWith(".class")) {
-             byte[] bytes = InterpreterUtil.getBytes(archive, entry);
-+            DecompilerContext.getLogger().writeMessage("  Loading Class: " + name, Severity.INFO);
-             StructClass cl = StructClass.create(new DataInputFullStream(bytes), isOwn, loader);
-             classes.put(cl.qualifiedName, cl);
-             unit.addClass(cl, name);
-diff --git a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
-index 6da1e0d2c84e9c2c102bf0ffafabddeee2dcadd0..a824d326da2bc6a2c864d2da75af11545b8cf71e 100644
---- a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
-+++ b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
-@@ -94,7 +94,8 @@ public class ConstantPool implements NewClassNameBuilder {
-     int size = in.readUnsignedShort();
- 
-     for (int i = 1; i < size; i++) {
--      switch (in.readUnsignedByte()) {
-+      byte tag = (byte)in.readUnsignedByte();
-+      switch (tag) {
-         case CodeConstants.CONSTANT_Utf8 -> in.readUTF();
-         case CodeConstants.CONSTANT_Integer, CodeConstants.CONSTANT_Float, CodeConstants.CONSTANT_Fieldref, CodeConstants.CONSTANT_Methodref, CodeConstants.CONSTANT_InterfaceMethodref, CodeConstants.CONSTANT_NameAndType, CodeConstants.CONSTANT_Dynamic, CodeConstants.CONSTANT_InvokeDynamic ->
-           in.discard(4);
-@@ -102,8 +103,9 @@ public class ConstantPool implements NewClassNameBuilder {
-           in.discard(8);
-           i++;
-         }
--        case CodeConstants.CONSTANT_Class, CodeConstants.CONSTANT_String, CodeConstants.CONSTANT_MethodType -> in.discard(2);
-+        case CodeConstants.CONSTANT_Class, CodeConstants.CONSTANT_String, CodeConstants.CONSTANT_MethodType, CodeConstants.CONSTANT_Module, CodeConstants.CONSTANT_Package -> in.discard(2);
-         case CodeConstants.CONSTANT_MethodHandle -> in.discard(3);
-+        default -> throw new RuntimeException("Invalid Constant Pool entry #" + i + " Type: " + tag);
-       }
-     }
-   }
diff --git a/FernFlower-Patches/0021-Synthetic-getClass-Objects.requireNonNull-cleanup.patch b/FernFlower-Patches/0021-Synthetic-getClass-Objects.requireNonNull-cleanup.patch
deleted file mode 100644
index 4afe873..0000000
--- a/FernFlower-Patches/0021-Synthetic-getClass-Objects.requireNonNull-cleanup.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Justin <jrd2558@gmail.com>
-Date: Thu, 26 Jul 2018 13:28:40 -0700
-Subject: [PATCH] Synthetic getClass/Objects.requireNonNull cleanup
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-index bc8c421206b44539c2f2da859658102f2b71af73..b2963191fe5c6e162346fc98f9cefd122da23ee2 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-@@ -591,6 +591,23 @@ public class ExprProcessor implements CodeConstants {
-           break;
-         case opc_pop:
-           stack.pop();
-+          // check for synthetic getClass (J8) / Objects.requireNonNull() (J9+) calls added by the compiler
-+          // see https://stackoverflow.com/a/20130641
-+          if (i > 0) {
-+            Exprent last = exprList.get(exprList.size() - 1);
-+            if (last.type == Exprent.EXPRENT_ASSIGNMENT && ((AssignmentExprent)last).getRight().type == Exprent.EXPRENT_INVOCATION) {
-+              InvocationExprent invocation = (InvocationExprent) ((AssignmentExprent) last).getRight();
-+              if (i + 1 < seq.length()) {
-+                if ((!invocation.isStatic() && invocation.getName().equals("getClass") && invocation.getStringDescriptor().equals("()Ljava/lang/Class;")) // J8
-+                  || (invocation.isStatic() && invocation.getClassName().equals("java/util/Objects") && invocation.getName().equals("requireNonNull") && invocation.getStringDescriptor().equals("(Ljava/lang/Object;)Ljava/lang/Object;"))) { // J9+
-+                  int nextOpc = seq.getInstr(i + 1).opcode;
-+                  if (nextOpc >= opc_aconst_null && nextOpc <= opc_ldc2_w) {
-+                    invocation.setSyntheticNullCheck();
-+                  }
-+                }
-+              }
-+            }
-+          }
-           break;
-         case opc_pop2:
-           if (stack.getByOffset(-1).getExprType().getStackSize() == 1) {
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
-index dc3d20eed5ddcac36204fc9ed75d73c53a8c9805..efa677ae6cfdc08635eff080c7241ec086e5c945 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
-@@ -74,6 +74,10 @@ public class SimplifyExprentsHelper {
-           if (changed) {
-             break;
-           }
-+
-+          if (!st.getStats().isEmpty() && hasQualifiedNewGetClass(st, st.getStats().get(0))) {
-+            break;
-+          }
-         }
- 
-         res |= changed;
-@@ -508,21 +512,53 @@ public class SimplifyExprentsHelper {
-     return false;
-   }
- 
-+  private static boolean hasQualifiedNewGetClass(Statement parent, Statement child) {
-+    if (child.type == Statement.StatementType.BASIC_BLOCK && child.getExprents() != null && !child.getExprents().isEmpty()) {
-+      Exprent firstExpr = child.getExprents().get(child.getExprents().size() - 1);
-+
-+      if (parent.type == Statement.StatementType.IF) {
-+        if (isQualifiedNewGetClass(firstExpr, ((IfStatement)parent).getHeadexprent().getCondition())) {
-+          child.getExprents().remove(firstExpr);
-+          return true;
-+        }
-+      }
-+      // TODO DoStatements ?
-+    }
-+    return false;
-+  }
-+
-   private static boolean isQualifiedNewGetClass(Exprent first, Exprent second) {
-     if (first.type == Exprent.EXPRENT_INVOCATION) {
-       InvocationExprent invocation = (InvocationExprent)first;
- 
--      if (!invocation.isStatic() && invocation.getInstance().type == Exprent.EXPRENT_VAR && invocation.getName().equals("getClass") &&
--          invocation.getStringDescriptor().equals("()Ljava/lang/Class;")) {
-+      if ((!invocation.isStatic() &&
-+           invocation.getName().equals("getClass") && invocation.getStringDescriptor().equals("()Ljava/lang/Class;")) // J8
-+        || (invocation.isStatic() && invocation.getClassName().equals("java/util/Objects") && invocation.getName().equals("requireNonNull")
-+            && invocation.getStringDescriptor().equals("(Ljava/lang/Object;)Ljava/lang/Object;"))) { // J9+
- 
--        List<Exprent> lstExprents = second.getAllExprents();
-+        if (invocation.isSyntheticNullCheck()) {
-+          return true;
-+        }
-+
-+        LinkedList<Exprent> lstExprents = new LinkedList<>();
-         lstExprents.add(second);
- 
--        for (Exprent expr : lstExprents) {
-+        final Exprent target;
-+        if (invocation.isStatic()) { // Objects.requireNonNull(target) (J9+)
-+          // detect target type
-+          target = invocation.getParameters().get(0);
-+        } else { // target.getClass() (J8)
-+          target = invocation.getInstance();
-+        }
-+
-+        while (!lstExprents.isEmpty()) {
-+          Exprent expr = lstExprents.removeFirst();
-+          lstExprents.addAll(expr.getAllExprents());
-           if (expr.type == Exprent.EXPRENT_NEW) {
-             NewExprent newExpr = (NewExprent)expr;
-             if (newExpr.getConstructor() != null && !newExpr.getConstructor().getParameters().isEmpty() &&
--                newExpr.getConstructor().getParameters().get(0).equals(invocation.getInstance())) {
-+              (newExpr.getConstructor().getParameters().get(0).equals(target) ||
-+                isUnambiguouslySameParam(invocation.isStatic(), target, newExpr.getConstructor().getParameters()))) {
- 
-               String classname = newExpr.getNewType().getValue();
-               ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(classname);
-@@ -538,6 +574,27 @@ public class SimplifyExprentsHelper {
-     return false;
-   }
- 
-+  private static boolean isUnambiguouslySameParam(boolean isStatic, Exprent target, List<Exprent> parameters) {
-+    boolean firstParamOfSameType = parameters.get(0).getExprType().equals(target.getExprType());
-+    if (!isStatic) { // X.getClass()/J8, this is less likely to overlap with legitimate use
-+      return firstParamOfSameType;
-+    }
-+    // Calling Objects.requireNonNull and discarding the result is a common pattern in normal code, so we have to be a bit more
-+    // cautious about stripping calls when a constructor takes parameters of the instance type
-+    // ex. given a class X, `Objects.requireNonNull(someInstanceOfX); new X(someInstanceOfX)` should not have the rNN stripped.
-+    if (!firstParamOfSameType) {
-+      return false;
-+    }
-+
-+    for (int i = 1; i < parameters.size(); i++) {
-+      if (parameters.get(i).getExprType().equals(target.getExprType())) {
-+        return false;
-+      }
-+    }
-+
-+    return true;
-+  }
-+
-   // propagate (var = new X) forward to the <init> invocation
-   private static boolean isConstructorInvocationRemote(List<Exprent> list, int index) {
-     Exprent current = list.get(index);
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index f23110233f59728ab4b700bfc0fa2b625f0d7071..c77ac2f2e4f8936c131f932940878fab9f5c2eb8 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-@@ -61,6 +61,7 @@ public class InvocationExprent extends Exprent {
-   private List<VarType> genericArgs = new ArrayList<>();
-   private boolean forceBoxing = false;
-   private boolean forceUnboxing = false;
-+  private boolean isSyntheticNullCheck = false;
- 
-   public InvocationExprent() {
-     super(EXPRENT_INVOCATION);
-@@ -156,6 +157,7 @@ public class InvocationExprent extends Exprent {
- 
-     addBytecodeOffsets(expr.bytecode);
-     bootstrapArguments = expr.getBootstrapArguments();
-+    isSyntheticNullCheck = expr.isSyntheticNullCheck();
-   }
- 
-   @Override
-@@ -954,6 +956,14 @@ public class InvocationExprent extends Exprent {
-     return bootstrapArguments;
-   }
- 
-+  public void setSyntheticNullCheck() {
-+    isSyntheticNullCheck = true;
-+  }
-+
-+  public boolean isSyntheticNullCheck() {
-+    return isSyntheticNullCheck;
-+  }
-+
-   @Override
-   public void getBytecodeRange(BitSet values) {
-     measureBytecode(values, parameters);
diff --git a/FernFlower-Patches/0022-Fix-shortname-imports-that-are-shadowed-by-super-cla.patch b/FernFlower-Patches/0022-Fix-shortname-imports-that-are-shadowed-by-super-cla.patch
deleted file mode 100644
index 1158eb4..0000000
--- a/FernFlower-Patches/0022-Fix-shortname-imports-that-are-shadowed-by-super-cla.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Justin <jrd2558@gmail.com>
-Date: Fri, 27 Jul 2018 14:02:27 -0700
-Subject: [PATCH] Fix shortname imports that are shadowed by super class inner
- classes
-
-Adds an option (on by default) to force inner class references to be
-qualified to their outer class, -qin
-
-diff --git a/README.md b/README.md
-index 9b15cd643468b3852b0092f7bffd399518fc03b3..4621cadc55b0814bf7f20fc5fff482b7756b5c6c 100644
---- a/README.md
-+++ b/README.md
-@@ -67,6 +67,7 @@ The rest of options can be left as they are: they are aimed at professional reve
- - inn (1): check for IntelliJ IDEA-specific @NotNull annotation and remove inserted code if found
- - lac (0): decompile lambda expressions to anonymous classes
- - nls (0): define new line character to be used for output. 0 - '\r\n' (Windows), 1 - '\n' (Unix), default is OS-dependent
-+- qin (1): Whether to always qualify inner class references. If this is false, inner class names can be shortened depending on location
- - ind: indentation string (default is 3 spaces)
- - log (INFO): a logging level, possible values are TRACE, INFO, WARN, ERROR
- 
-diff --git a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
-index 6b7d72b6f599aaf04f122ff38ca872f469c9727e..cdd93212560a15372002c4d927a9debc325edbc3 100644
---- a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
-+++ b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
-@@ -20,7 +20,7 @@ public class ImportCollector {
-   private final Set<String> setNotImportedNames = new HashSet<>();
-   // set of field names in this class and all its predecessors.
-   private final Set<String> setFieldNames = new HashSet<>();
--  private final Set<String> setInnerClassNames = new HashSet<>();
-+  private final Map<String, Map<String, String>> mapInnerClassNames = new HashMap<>();
-   private final String currentPackageSlash;
-   private final String currentPackagePoint;
- 
-@@ -38,45 +38,18 @@ public class ImportCollector {
-     }
- 
-     Map<String, StructClass> classes = DecompilerContext.getStructContext().getClasses();
--    LinkedList<String> queue = new LinkedList<>();
--    Set<StructClass> processedClasses = new HashSet<>();
-     StructClass currentClass = root.classStruct;
-     while (currentClass != null) {
--      processedClasses.add(currentClass);
--      if (currentClass.superClass != null) {
--        queue.add(currentClass.superClass.getString());
--      }
--
--      Collections.addAll(queue, currentClass.getInterfaceNames());
--
-       // all field names for the current class ..
-       for (StructField f : currentClass.getFields()) {
-         setFieldNames.add(f.getName());
-       }
- 
--      // .. all inner classes for the current class ..
--      StructInnerClassesAttribute attribute = currentClass.getAttribute(StructGeneralAttribute.ATTRIBUTE_INNER_CLASSES);
--      if (attribute != null) {
--        for (StructInnerClassesAttribute.Entry entry : attribute.getEntries()) {
--          if (entry.enclosingName != null && entry.enclosingName.equals(currentClass.qualifiedName)) {
--            setInnerClassNames.add(entry.simpleName);
--          }
--        }
--      }
--
-       // .. and traverse through parent.
--      do {
--        currentClass = queue.isEmpty() ? null : classes.get(queue.removeFirst());
--
--        if (currentClass != null && processedClasses.contains(currentClass)) {
--          // Class already processed, skipping.
--
--          // This may be sign of circularity in the class hierarchy but in most cases this mean that same interface
--          // are listed as implemented several times in the class hierarchy.
--          currentClass = null;
--        }
--      } while (currentClass == null && !queue.isEmpty());
-+      currentClass = currentClass.superClass != null ? classes.get(currentClass.superClass.getString()) : null;
-     }
-+
-+    collectConflictingShortNames(root, new HashMap<>());
-   }
- 
-   /**
-@@ -152,11 +125,36 @@ public class ImportCollector {
-     // 3) inner class with the same short name in the current class, a super class, or an implemented interface
-     boolean existsDefaultClass =
-       (context.getClass(currentPackageSlash + outerShortName) != null && !packageName.equals(currentPackagePoint)) || // current package
--      (context.getClass(outerShortName) != null && !currentPackagePoint.isEmpty()) || // default package
--      setInnerClassNames.contains(outerShortName); // inner class
-+      (context.getClass(outerShortName) != null && !currentPackagePoint.isEmpty());
-+
-+    ClassNode currCls = (ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE);
-+    String mapKey = currCls == null ? "" : currCls.classStruct.qualifiedName;
-+    Map<String, String> innerClassNames = mapInnerClassNames.getOrDefault(mapKey, new HashMap<>());
-+    if (!existsDefaultClass && innerClassNames.containsKey(outerShortName) && !innerClassNames.get(outerShortName).equals(fullName)) {
-+      // if the class being accessed is also an inner class
-+      // attempt to import the outer class and reference OuterClass.InnerClass
-+      if (context.getClass(packageName.replace('.', '/') + "$" + outerShortName) != null) {
-+        lastDot = fullName.lastIndexOf(".", lastDot - 1);
-+        if (lastDot >= 0) {
-+          nestedName = fullName.substring(lastDot + 1);
-+          outerShortName = packageName.substring(lastDot + 1);
-+          packageName = packageName.substring(0, lastDot);
-+
-+          if (innerClassNames.containsKey(outerShortName)  && !innerClassNames.get(outerShortName).equals(packageName + '.' + outerShortName)) {
-+            existsDefaultClass = true;
-+            nestedName = null;
-+          }
-+        }
-+      }
-+      else {
-+        existsDefaultClass = true;
-+      }
-+    }
- 
--    if (existsDefaultClass || (mapSimpleNames.containsKey(outerShortName) && !packageName.equals(mapSimpleNames.get(outerShortName)))) {
--      return packageName + "." + nestedName;
-+    if (existsDefaultClass ||
-+        (mapSimpleNames.containsKey(outerShortName) && !packageName.equals(mapSimpleNames.get(outerShortName)))) {
-+      //  don't return full name because if the class is a inner class, full name refers to the parent full name, not the child full name
-+      return nestedName == null ? fullName : (packageName + "." + nestedName);
-     }
-     else if (!mapSimpleNames.containsKey(outerShortName)) {
-       mapSimpleNames.put(outerShortName, packageName);
-@@ -192,4 +190,43 @@ public class ImportCollector {
-       .map(ent -> ent.getValue() + "." + ent.getKey())
-       .collect(Collectors.toList());
-   }
--}
-+
-+  private void collectConflictingShortNames(ClassNode root, Map<String, String> rootNames) {
-+    Map<String, String> names = new HashMap<>(rootNames);
-+    getSuperClassInnerClasses(root, names);
-+    mapInnerClassNames.put(root.classStruct.qualifiedName, names);
-+
-+    for (ClassNode nested : root.nested) {
-+      collectConflictingShortNames(nested, names);
-+    }
-+  }
-+
-+  private void getSuperClassInnerClasses(ClassNode node, Map<String, String> names) {
-+    Map<String, StructClass> classes = DecompilerContext.getStructContext().getClasses();
-+    LinkedList<String> queue = new LinkedList<>();
-+    StructClass currentClass = node.classStruct;
-+    while (currentClass != null) {
-+      if (currentClass.superClass != null) {
-+        queue.add(currentClass.superClass.getString());
-+      }
-+
-+      Collections.addAll(queue, currentClass.getInterfaceNames());
-+
-+      // .. all inner classes for the current class ..
-+      StructInnerClassesAttribute attribute = currentClass.getAttribute(StructGeneralAttribute.ATTRIBUTE_INNER_CLASSES);
-+      if (attribute != null) {
-+        for (StructInnerClassesAttribute.Entry entry : attribute.getEntries()) {
-+          if (entry.enclosingName != null && entry.enclosingName.equals(currentClass.qualifiedName)) {
-+            names.put(entry.simpleName, entry.innerName.replace('/', '.').replace('$', '.'));
-+          }
-+        }
-+      }
-+
-+      // .. and traverse through parent.
-+      currentClass = !queue.isEmpty() ? classes.get(queue.removeFirst()) : null;
-+      while (currentClass == null && !queue.isEmpty()) {
-+        currentClass = classes.get(queue.removeFirst());
-+      }
-+    }
-+  }
-+}
-\ No newline at end of file
-diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-index f5fb8fc913c71b38ab0bffb5479d1f49725469ff..53349248a038cea0ef82cdc2138ca93e722d1d06 100644
---- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-@@ -37,6 +37,7 @@ public interface IFernflowerPreferences {
- 
-   String STANDARDIZE_FLOATING_POINT_NUMBERS = "sfn";
-   String INCLUDE_ENTIRE_CLASSPATH = "iec";
-+  String QUALIFY_INNER_CLASSES = "qin";
- 
-   String LOG_LEVEL = "log";
-   String MAX_PROCESSING_METHOD = "mpm";
-@@ -91,6 +92,7 @@ public interface IFernflowerPreferences {
- 
-     defaults.put(STANDARDIZE_FLOATING_POINT_NUMBERS, "1");
-     defaults.put(INCLUDE_ENTIRE_CLASSPATH, "0");
-+    defaults.put(QUALIFY_INNER_CLASSES, "1");
- 
-     defaults.put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name());
-     defaults.put(MAX_PROCESSING_METHOD, "0");
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-index b2963191fe5c6e162346fc98f9cefd122da23ee2..f7e086c560b6e1e5d67d93813c91ecc70db49ce1 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
-@@ -8,6 +8,7 @@ import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
- import org.jetbrains.java.decompiler.main.ClassesProcessor;
- import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
-+import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
- import org.jetbrains.java.decompiler.modules.decompiler.StatEdge.EdgeType;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.*;
- import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph;
-@@ -757,12 +758,14 @@ public class ExprProcessor implements CodeConstants {
-   ) {
-     List<ClassesProcessor.ClassNode> enclosingClasses = enclosingClassList();
-     StringBuilder curPathBldr = new StringBuilder(type.getValue().substring(0, type.getValue().lastIndexOf('/') + 1));
-+    boolean forceShouldWrite = DecompilerContext.getOption(IFernflowerPreferences.QUALIFY_INNER_CLASSES);
-     for (int i = 0; i < nestedTypes.size(); i++) {
-       String nestedType = nestedTypes.get(i);
-       boolean shouldWrite = true;
-       if (!enclosingClasses.isEmpty() && i != nestedTypes.size() - 1) {
-         String enclosingType = enclosingClasses.remove(0).simpleName;
--        shouldWrite = !nestedType.equals(enclosingType)
-+        shouldWrite = forceShouldWrite
-+          || !nestedType.equals(enclosingType)
-           // Also write out the enclosing class if we are the outermost, and we're in the type params
-           || enclosingClasses.isEmpty() && DecompilerContext.getOption(DecompilerContext.IN_CLASS_TYPE_PARAMS);
-       }
diff --git a/FernFlower-Patches/0023-Give-nicer-output-for-float-and-double-literals.patch b/FernFlower-Patches/0023-Give-nicer-output-for-float-and-double-literals.patch
deleted file mode 100644
index 980223a..0000000
--- a/FernFlower-Patches/0023-Give-nicer-output-for-float-and-double-literals.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Pokechu22 <Pokechu022@gmail.com>
-Date: Fri, 3 Aug 2018 14:15:46 -0700
-Subject: [PATCH] Give nicer output for float and double literals
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-index 401917e6947c0ae541c966777cf2deddf54ed644..f0c519aa31ca4ca83dac02d1bf729ff67e9e8992 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-@@ -48,6 +48,81 @@ public class ConstExprent extends Exprent {
-   );
- 
-   private StructMember parent;
-+
-+  private static final Map<Double, String[]> PI_DOUBLES = new HashMap<>();
-+  private static final Map<Float, String[]> PI_FLOATS = new HashMap<>();
-+  private static final Map<Float, String> FLOAT_CONSTANTS = new HashMap<>();
-+  private static final Map<Double, String> DOUBLE_CONSTANTS = new HashMap<>();
-+
-+  static {
-+    final double PI_D = Math.PI;
-+    final float PI_F = (float)Math.PI;
-+    PI_DOUBLES.put(PI_D, new String[] { "", "" });
-+    PI_DOUBLES.put(-PI_D, new String[] { "-", "" });
-+    PI_FLOATS.put(PI_F, new String[] { "", "" });
-+    PI_FLOATS.put(-PI_F, new String[] { "-", "" });
-+
-+    PI_DOUBLES.put(PI_D * 2D, new String[] { "(", " * 2D)" });
-+    PI_DOUBLES.put(-PI_D * 2D, new String[] { "(-", " * 2D)" });
-+    PI_FLOATS.put(PI_F * 2F, new String[] { "(", " * 2F)" });
-+    PI_FLOATS.put(-PI_F * 2F, new String[] { "(-", " * 2F)" });
-+
-+    PI_DOUBLES.put(PI_D / 2D, new String[] { "(", " / 2D)" });
-+    PI_DOUBLES.put(-PI_D / 2D, new String[] { "(-", " / 2D)" });
-+    PI_FLOATS.put(PI_F / 2F, new String[] { "(", " / 2F)" });
-+    PI_FLOATS.put(-PI_F / 2F, new String[] { "(-", " / 2F)" });
-+
-+    PI_DOUBLES.put(PI_D * 1.5D, new String[] { "(", " * 1.5D)" });
-+    PI_DOUBLES.put(-PI_D * 1.5D, new String[] { "(-", " * 1.5D)" });
-+    PI_FLOATS.put(PI_F * 1.5F, new String[] { "(", " * 1.5F)" });
-+    PI_FLOATS.put(-PI_F * 1.5F, new String[] { "(-", " * 1.5F)" });
-+
-+    PI_DOUBLES.put(PI_D / 3D, new String[] { "(", " / 3D)" });
-+    PI_DOUBLES.put(-PI_D / 3D, new String[] { "(-", " / 3D)" });
-+    PI_FLOATS.put(PI_F / 3F, new String[] { "(", " / 3F)" });
-+    PI_FLOATS.put(-PI_F / 3F, new String[] { "(-", " / 3F)" });
-+
-+    PI_DOUBLES.put(PI_D / 4D, new String[] { "(", " / 4D)" });
-+    PI_DOUBLES.put(-PI_D / 4D, new String[] { "(-", " / 4D)" });
-+    PI_FLOATS.put(PI_F / 4F, new String[] { "(", " / 4F)" });
-+    PI_FLOATS.put(-PI_F / 4F, new String[] { "(-", " / 4F)" });
-+
-+    PI_DOUBLES.put(PI_D / 5D, new String[] { "(", " / 5D)" });
-+    PI_DOUBLES.put(-PI_D / 5D, new String[] { "(-", " / 5D)" });
-+    PI_FLOATS.put(PI_F / 5F, new String[] { "(", " / 5F)" });
-+    PI_FLOATS.put(-PI_F / 5F, new String[] { "(-", " / 5F)" });
-+
-+    PI_DOUBLES.put(PI_D / 6D, new String[] { "(", " / 6D)" });
-+    PI_DOUBLES.put(-PI_D / 6D, new String[] { "(-", " / 6D)" });
-+    PI_FLOATS.put(PI_F / 6F, new String[] { "(", " / 6F)" });
-+    PI_FLOATS.put(-PI_F / 6F, new String[] { "(-", " / 6F)" });
-+
-+    PI_DOUBLES.put(PI_D / 8D, new String[] { "(", " / 8D)" });
-+    PI_DOUBLES.put(-PI_D / 8D, new String[] { "(-", " / 8D)" });
-+    PI_FLOATS.put(PI_F / 8F, new String[] { "(", " / 8F)" });
-+    PI_FLOATS.put(-PI_F / 8F, new String[] { "(-", " / 8F)" });
-+
-+    PI_DOUBLES.put(PI_D / 10D, new String[] { "(", " / 10D)" });
-+    PI_DOUBLES.put(-PI_D / 10D, new String[] { "(-", " / 10D)" });
-+    PI_FLOATS.put(PI_F / 10F, new String[] { "(", " / 10F)" });
-+    PI_FLOATS.put(-PI_F / 10F, new String[] { "(-", " / 10F)" });
-+
-+    // Radian/degree conversions
-+    PI_DOUBLES.put(PI_D / 180D, new String[] { "(", " / 180D)" });
-+    PI_DOUBLES.put(180D / PI_D, new String[] { "(180D / ", ")" });
-+    PI_FLOATS.put(PI_F / 180F, new String[] { "(", " / 180F)" });
-+    PI_FLOATS.put(180F / PI_F, new String[] { "(180F / ", ")" });
-+
-+    FLOAT_CONSTANTS.put((float)Integer.MAX_VALUE, "(float)Integer.MAX_VALUE");
-+    FLOAT_CONSTANTS.put((float)Integer.MIN_VALUE, "(float)Integer.MIN_VALUE");
-+    FLOAT_CONSTANTS.put((float)Long.MAX_VALUE, "(float)Long.MAX_VALUE");
-+    FLOAT_CONSTANTS.put((float)Long.MIN_VALUE, "(float)Long.MIN_VALUE");
-+    DOUBLE_CONSTANTS.put((double)Integer.MAX_VALUE, "(double)Integer.MAX_VALUE");
-+    DOUBLE_CONSTANTS.put((double)Integer.MIN_VALUE, "(double)Integer.MIN_VALUE");
-+    DOUBLE_CONSTANTS.put((double)Long.MAX_VALUE, "(double)Long.MAX_VALUE");
-+    DOUBLE_CONSTANTS.put((double)Long.MIN_VALUE, "(double)Long.MIN_VALUE");
-+  }
-+
-   private VarType constType;
-   private final Object value;
-   private final boolean boolPermitted;
-@@ -185,39 +260,7 @@ public class ConstExprent extends Exprent {
-         }
-         yield new TextBuffer(value.toString()).append('L');
-       }
--      case CodeConstants.TYPE_FLOAT -> {
--        float floatVal = (Float)value;
--        if (!literal) {
--          if (Float.isNaN(floatVal) && !inConstantVariable(FLOAT_SIG, NAN)) {
--            yield new FieldExprent(NAN, FLOAT_SIG, true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
--          }
--          else if (floatVal == Float.POSITIVE_INFINITY && !inConstantVariable(FLOAT_SIG, POS_INF)) {
--            yield new FieldExprent(POS_INF, FLOAT_SIG, true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
--          }
--          else if (floatVal == Float.NEGATIVE_INFINITY && !inConstantVariable(FLOAT_SIG, NEG_INF)) {
--            yield new FieldExprent(NEG_INF, FLOAT_SIG, true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
--          }
--          else if (floatVal == Float.MAX_VALUE && !inConstantVariable(FLOAT_SIG, MAX_VAL)) {
--            yield new FieldExprent(MAX_VAL, FLOAT_SIG, true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
--          }
--          else if (floatVal == Float.MIN_VALUE && !inConstantVariable(FLOAT_SIG, MIN_VAL)) {
--            yield new FieldExprent(MIN_VAL, FLOAT_SIG, true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
--          }
--          else if (floatVal == Float.MIN_NORMAL && !inConstantVariable(FLOAT_SIG, MIN_NORM)) {
--            yield new FieldExprent(MIN_NORM, FLOAT_SIG, true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
--          }
--        }
--        else if (Float.isNaN(floatVal)) {
--          yield new TextBuffer("0.0F / 0.0F");
--        }
--        else if (floatVal == Float.POSITIVE_INFINITY) {
--          yield new TextBuffer("1.0F / 0.0F");
--        }
--        else if (floatVal == Float.NEGATIVE_INFINITY) {
--          yield new TextBuffer("-1.0F / 0.0F");
--        }
--        yield new TextBuffer(trimFloat(Float.toString(floatVal), floatVal)).append('F');
--      }
-+      case CodeConstants.TYPE_FLOAT -> createFloat(literal, (Float)value, tracer);
-       case CodeConstants.TYPE_DOUBLE -> {
-         double doubleVal = (Double)value;
-         if (!literal) {
-@@ -242,8 +285,21 @@ public class ConstExprent extends Exprent {
-           else if (doubleVal == Math.E && !inConstantVariable(MATH_SIG, E)) {
-             yield new FieldExprent(E, MATH_SIG, true, null, FieldDescriptor.DOUBLE_DESCRIPTOR, bytecode).toJava(0, tracer);
-           }
--          else if (doubleVal == Math.PI && !inConstantVariable(MATH_SIG, PI)) {
--            yield new FieldExprent(PI, MATH_SIG, true, null, FieldDescriptor.DOUBLE_DESCRIPTOR, bytecode).toJava(0, tracer);
-+          else if (doubleVal == -Double.MAX_VALUE && !inConstantVariable(DOUBLE_SIG, MAX_VAL)) {
-+            yield new FieldExprent(MAX_VAL, DOUBLE_SIG, true, null, FieldDescriptor.DOUBLE_DESCRIPTOR, bytecode).toJava(0, tracer).prepend("-");
-+          }
-+          else if (doubleVal == -Double.MIN_NORMAL) {
-+            yield new FieldExprent(MIN_NORM, DOUBLE_SIG, true, null, FieldDescriptor.DOUBLE_DESCRIPTOR, bytecode).toJava(0, tracer).prepend("-");
-+          }
-+          else if (doubleVal == -Double.MIN_VALUE) {
-+            yield new FieldExprent(MIN_VAL, DOUBLE_SIG, true, null, FieldDescriptor.DOUBLE_DESCRIPTOR, bytecode).toJava(0, tracer).prepend("-");
-+          }
-+          else if (PI_DOUBLES.containsKey(doubleVal)) {
-+            String[] parts = PI_DOUBLES.get(doubleVal);
-+            yield getPiDouble(tracer).enclose(parts[0], parts[1]);
-+          }
-+          else if (DOUBLE_CONSTANTS.containsKey(doubleVal)) {
-+            yield new TextBuffer(DOUBLE_CONSTANTS.get(doubleVal));
-           }
-         }
-         else if (Double.isNaN(doubleVal)) {
-@@ -255,7 +311,26 @@ public class ConstExprent extends Exprent {
-         else if (doubleVal == Double.NEGATIVE_INFINITY) {
-           yield new TextBuffer("-1.0D / 0.0D");
-         }
--        yield new TextBuffer(trimDouble(Double.toString(doubleVal), doubleVal)).append('D');
-+
-+        TextBuffer doubleBuffer = new TextBuffer(trimDouble(Double.toString(doubleVal), doubleVal)).append('D');
-+
-+        if (!literal) {
-+          // Check for cases where a float literal has been upcasted to a double.
-+          // (for instance, double d = .01F results in 0.009999999776482582D without this)
-+          float nearestFloatVal = (float)doubleVal;
-+          if (doubleVal == (double)nearestFloatVal) {
-+            // Value can be represented precisely as both a float and a double.
-+            // Now check if the string representation as a float is nicer/shorter.
-+            // If they're the same, there's no point in the cast and such (e.g. don't decompile 1.0D as (double)1.0F).
-+            TextBuffer floatBuffer = createFloat(literal, nearestFloatVal, tracer);
-+            if (floatBuffer.length() != doubleBuffer.length()) {
-+              // Include a cast to prevent using the wrong method call in ambiguous cases.
-+              yield floatBuffer.prepend("(double)");
-+            }
-+          }
-+        }
-+
-+        yield doubleBuffer;
-       }
-       case CodeConstants.TYPE_NULL -> new TextBuffer("null");
-       case CodeConstants.TYPE_OBJECT -> {
-@@ -273,6 +348,73 @@ public class ConstExprent extends Exprent {
-     };
-   }
- 
-+  private TextBuffer createFloat(boolean literal, float floatVal, BytecodeMappingTracer tracer) {
-+    if (!literal) {
-+      // Float constants, some of which can't be represented directly
-+      if (Float.isNaN(floatVal) && !inConstantVariable(FLOAT_SIG, NAN)) {
-+        return new FieldExprent(NAN, FLOAT_SIG, true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
-+      }
-+      else if (floatVal == Float.POSITIVE_INFINITY && !inConstantVariable(FLOAT_SIG, POS_INF)) {
-+        return new FieldExprent(POS_INF, FLOAT_SIG, true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
-+      }
-+      else if (floatVal == Float.NEGATIVE_INFINITY && !inConstantVariable(FLOAT_SIG, NEG_INF)) {
-+        return new FieldExprent(NEG_INF, FLOAT_SIG, true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
-+      }
-+      else if (floatVal == Float.MAX_VALUE && !inConstantVariable(FLOAT_SIG, MAX_VAL)) {
-+        return new FieldExprent(MAX_VAL, FLOAT_SIG, true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
-+      }
-+      else if (floatVal == Float.MIN_NORMAL && !inConstantVariable(FLOAT_SIG, MIN_NORM)) {
-+        return new FieldExprent(MIN_NORM, FLOAT_SIG, true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
-+      }
-+      else if (floatVal == Float.MIN_VALUE && !inConstantVariable(FLOAT_SIG, MIN_VAL)) {
-+        return new FieldExprent(MIN_VAL, FLOAT_SIG, true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
-+      }
-+      else if (floatVal == -Float.MAX_VALUE && !inConstantVariable(FLOAT_SIG, MAX_VAL)) {
-+        return new FieldExprent(MAX_VAL, FLOAT_SIG, true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer).prepend("-");
-+      }
-+      else if (floatVal == -Float.MIN_NORMAL && !inConstantVariable(FLOAT_SIG, MIN_NORM)) {
-+        return new FieldExprent(MIN_NORM, FLOAT_SIG, true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer).prepend("-");
-+      }
-+      else if (floatVal == -Float.MIN_VALUE && !inConstantVariable(FLOAT_SIG, MIN_VAL)) {
-+        return new FieldExprent(MIN_VAL, FLOAT_SIG, true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer).prepend("-");
-+      }
-+      // Math constants
-+      else if (floatVal == (float)Math.E && !inConstantVariable(MATH_SIG, E)) {
-+        return new FieldExprent(E, MATH_SIG, true, null, FieldDescriptor.DOUBLE_DESCRIPTOR, bytecode).toJava(0, tracer).prepend("(float)");
-+      }
-+      else if (PI_FLOATS.containsKey(floatVal) && !inConstantVariable(MATH_SIG, PI)) {
-+        String[] parts = PI_FLOATS.get(floatVal);
-+        return getPiFloat(tracer).enclose(parts[0], parts[1]);
-+      }
-+      else if (FLOAT_CONSTANTS.containsKey(floatVal)) {
-+        return new TextBuffer(FLOAT_CONSTANTS.get(floatVal));
-+      }
-+    }
-+    else {
-+      // Check for special values that can't be used directly in code
-+      // (and we can't replace with the constant due to the user requesting not to)
-+      if (Float.isNaN(floatVal)) {
-+        return new TextBuffer("0.0F / 0.0F");
-+      }
-+      else if (floatVal == Float.POSITIVE_INFINITY) {
-+        return new TextBuffer("1.0F / 0.0F");
-+      }
-+      else if (floatVal == Float.NEGATIVE_INFINITY) {
-+        return new TextBuffer("-1.0F / 0.0F");
-+      }
-+    }
-+    return new TextBuffer(trimFloat(Float.toString(floatVal), floatVal)).append('F');
-+  }
-+
-+  private TextBuffer getPiDouble(BytecodeMappingTracer tracer) {
-+    return new FieldExprent(PI, MATH_SIG, true, null, FieldDescriptor.DOUBLE_DESCRIPTOR, bytecode).toJava(0, tracer);
-+  }
-+
-+  private TextBuffer getPiFloat(BytecodeMappingTracer tracer) {
-+    // java.lang.Math doesn't have a float version of pi, unfortunately
-+    return getPiDouble(tracer).prepend("(float)");
-+  }
-+
-   // Different JVM implementations/version display Floats and Doubles with different String representations
-   // for the same thing. This trims them all down to only the necessary amount.
-   private static String trimFloat(String value, float start) {
diff --git a/FernFlower-Patches/0024-Add-try-with-resource-support.patch b/FernFlower-Patches/0024-Add-try-with-resource-support.patch
deleted file mode 100644
index cab16c1..0000000
--- a/FernFlower-Patches/0024-Add-try-with-resource-support.patch
+++ /dev/null
@@ -1,1176 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Justin <jrd2558@gmail.com>
-Date: Mon, 6 Aug 2018 20:26:59 -0700
-Subject: [PATCH] Add try with resource support
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index fa4b5ed56fa58f2d864ea3acd758a36fa8e23e7a..4713a0212ee1ae4cc269dd24f2227a91a2c9beed 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-@@ -190,6 +190,10 @@ public class MethodProcessorRunnable implements Runnable {
- 
-       LabelHelper.identifyLabels(root);
- 
-+      if (TryHelper.enhanceTryStats(root, mt)) {
-+        continue;
-+      }
-+
-       if (InlineSingleBlockHelper.inlineSingleBlocks(root)) {
-         continue;
-       }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/TryHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/TryHelper.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..cdd05cd3d40ad85380e00ddeba7e289411671c75
---- /dev/null
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/TryHelper.java
-@@ -0,0 +1,723 @@
-+package org.jetbrains.java.decompiler.modules.decompiler;
-+
-+import org.jetbrains.java.decompiler.code.CodeConstants;
-+import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
-+import org.jetbrains.java.decompiler.main.DecompilerContext;
-+import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.*;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.*;
-+import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
-+import org.jetbrains.java.decompiler.struct.StructMethod;
-+import org.jetbrains.java.decompiler.struct.gen.VarType;
-+
-+import java.util.ArrayList;
-+import java.util.LinkedHashSet;
-+import java.util.List;
-+import java.util.Set;
-+import java.util.Stack;
-+import java.util.stream.Collectors;
-+
-+public class TryHelper
-+{
-+  public static boolean enhanceTryStats(RootStatement root, StructMethod mt) {
-+    boolean ret = makeTryWithResourceRec(root, mt, root.getDummyExit(), new Stack<>());
-+    if (ret) {
-+      SequenceHelper.condenseSequences(root);
-+      if (collapseTryRec(root, mt)) {
-+        SequenceHelper.condenseSequences(root);
-+      }
-+    }
-+    return ret;
-+  }
-+
-+  private static boolean makeTryWithResourceRec(Statement stat, StructMethod mt, DummyExitStatement exit, Stack<TryStatementJ11> stack) {
-+    boolean ret = false;
-+    if (stat.type == Statement.StatementType.CATCH_ALL && ((CatchAllStatement)stat).isFinally()) {
-+      if (makeTryWithResource((CatchAllStatement)stat)) {
-+        return true;
-+      }
-+    }
-+
-+    if (mt.getBytecodeVersion() >= CodeConstants.BYTECODE_JAVA_11 && stat.type == Statement.StatementType.TRY_CATCH) {
-+      ret |= addTryWithResourceJ11((CatchStatement) stat, exit, stack);
-+    }
-+
-+    for (int i = 0; i < stat.getStats().size(); i++) {
-+      Statement st = stat.getStats().get(i);
-+      ret |= makeTryWithResourceRec(st, mt, exit, stack);
-+    }
-+
-+    if (!stack.empty() && stack.peek().tryStatement() == stat) {
-+      makeTryStatementJ11(stack, exit);
-+    }
-+
-+    return ret;
-+  }
-+
-+  private static boolean collapseTryRec(Statement stat, StructMethod mt) {
-+    // This method uses two different algorithms as the J11 code expects to process everything that it can without returning, while the J8 expects to return early.
-+    // Future work could be done to improve the flow of things here.
-+    if (mt.getBytecodeVersion() >= CodeConstants.BYTECODE_JAVA_11) {
-+      boolean ret = false;
-+      if (stat.type == Statement.StatementType.TRY_CATCH) {
-+        CatchStatement tryStat = (CatchStatement) stat;
-+        if (collapseTryJ11(tryStat)) {
-+          ret = true;
-+        }
-+      }
-+
-+      for (Statement st : stat.getStats()) {
-+        ret |= collapseTryRec(st, mt);
-+      }
-+
-+      return ret;
-+    } else {
-+      if (stat.type == Statement.StatementType.TRY_CATCH) {
-+        CatchStatement tryStat = (CatchStatement) stat;
-+        if (collapseTry(tryStat)) {
-+          return true;
-+        }
-+      }
-+
-+      for (Statement st : stat.getStats()) {
-+        if (collapseTryRec(st, mt)) {
-+          return true;
-+        }
-+      }
-+
-+      return false;
-+    }
-+  }
-+
-+  private static boolean makeTryWithResource(CatchAllStatement finallyStat) {
-+    Statement handler = finallyStat.getHandler();
-+
-+    // The finally block has a specific statement structure we can check for
-+    if (handler.getStats().size() != 2) {
-+      return false;
-+    }
-+
-+    Statement toCheck = finallyStat.getHandler().getFirst();
-+    if (toCheck.type != Statement.StatementType.IF || ((IfStatement)toCheck).getIfstat().type != Statement.StatementType.IF) {
-+      return false;
-+    }
-+
-+    toCheck = ((IfStatement)toCheck).getIfstat();
-+
-+    if (((IfStatement)toCheck).getElsestat() == null) {
-+      return false;
-+    }
-+
-+    Statement elseBlock = ((IfStatement)toCheck).getElsestat();
-+    VarExprent var = null;
-+
-+    if (elseBlock.getExprents() != null && elseBlock.getExprents().size() == 1) {
-+      Exprent exp = elseBlock.getExprents().get(0);
-+
-+      if (isCloseable(exp)) {
-+        var = (VarExprent)((InvocationExprent)exp).getInstance();
-+      }
-+    }
-+
-+    if (var != null) {
-+      AssignmentExprent ass = null;
-+      BasicBlockStatement initBlock = null;
-+      for (StatEdge edge : finallyStat.getAllPredecessorEdges()) {
-+        if (edge.getDestination().equals(finallyStat) && edge.getSource().type == Statement.StatementType.BASIC_BLOCK) {
-+          ass = findResourceDef(var, edge.getSource());
-+          if (ass != null) {
-+            initBlock = (BasicBlockStatement)edge.getSource();
-+            break;
-+          }
-+        }
-+      }
-+
-+      if (ass != null) {
-+        Statement stat = finallyStat.getParent();
-+        Statement stat2 = finallyStat.getFirst();
-+
-+        if (stat2.type == Statement.StatementType.TRY_CATCH) {
-+          CatchStatement child = (CatchStatement)stat2;
-+
-+          AssignmentExprent resourceDef = (AssignmentExprent)ass.copy();
-+          if (ass.getRight().getExprType().equals(VarType.VARTYPE_NULL)) {
-+            if (child.getFirst() != null) {
-+              fixResourceAssignment(resourceDef, child.getFirst());
-+            }
-+          }
-+
-+          if (resourceDef.getRight().getExprType().equals(VarType.VARTYPE_NULL)) {
-+            return false;
-+          }
-+
-+          child.setTryType(CatchStatement.RESORCES);
-+          initBlock.getExprents().remove(ass);
-+          child.getResources().add(0, resourceDef);
-+
-+          if (!finallyStat.getVarDefinitions().isEmpty()) {
-+            child.getVarDefinitions().addAll(0, finallyStat.getVarDefinitions());
-+          }
-+
-+          stat.replaceStatement(finallyStat, child);
-+          removeRedundantThrow(initBlock, child);
-+          return true;
-+        }
-+      }
-+    }
-+
-+    return false;
-+  }
-+
-+  // Make try with resources with the new style bytecode (J11+)
-+  // It doesn't use finally blocks, and is just a try catch
-+  public static boolean addTryWithResourceJ11(CatchStatement tryStatement, DummyExitStatement exit, Stack<TryStatementJ11> stack) {
-+    // Doesn't have a catch block, probably already processed
-+    if (tryStatement.getStats().size() < 2) {
-+      return false;
-+    }
-+
-+    if (!tryStatement.getVars().get(0).getVarType().getValue().equals("java/lang/Throwable")) {
-+      return false;
-+    }
-+
-+    Statement inner = tryStatement.getStats().get(1); // Get catch block
-+
-+    VarExprent closeable = null;
-+
-+    boolean nullable = false;
-+
-+    if (inner instanceof SequenceStatement) {
-+      // Replace dummy inner with real inner
-+      inner = inner.getStats().get(0);
-+
-+      // If the catch statement contains a simple try catch, then it's a nonnull resource
-+      if (inner instanceof CatchStatement) {
-+        if (inner.getStats().isEmpty()) {
-+          return false;
-+        }
-+
-+        Statement inTry = inner.getStats().get(0);
-+
-+        // Catch block contains a basic block inside which has the closeable invocation
-+        if (inTry instanceof BasicBlockStatement && !inTry.getExprents().isEmpty()) {
-+          Exprent first = inTry.getExprents().get(0);
-+
-+          if (isCloseable(first)) {
-+            closeable = (VarExprent) ((InvocationExprent)first).getInstance();
-+          }
-+        }
-+      }
-+
-+      // Nullable resource, contains null checks
-+      if (inner instanceof IfStatement) {
-+        Exprent ifCase = ((IfStatement)inner).getHeadexprent().getCondition();
-+
-+        if (ifCase instanceof FunctionExprent) {
-+          // Will look like "if (!(!(var != null)))"
-+          FunctionExprent func = unwrapNegations((FunctionExprent) ifCase);
-+
-+          Exprent check = func.getLstOperands().get(0);
-+
-+          // If it's not a var, end processing early
-+          if (!(check instanceof VarExprent)) {
-+            return false;
-+          }
-+
-+          // Make sure it's checking against null
-+          if (func.getLstOperands().get(1).getExprType().equals(VarType.VARTYPE_NULL)) {
-+            // Ensured that the if stat is a null check
-+
-+            inner = ((IfStatement)inner).getIfstat();
-+
-+            if (inner == null) {
-+              return false;
-+            }
-+
-+            // Process try catch inside of if statement
-+            if (inner instanceof CatchStatement && !inner.getStats().isEmpty()) {
-+              Statement inTry = inner.getStats().get(0);
-+
-+              if (inTry instanceof BasicBlockStatement && !inTry.getExprents().isEmpty()) {
-+                Exprent first = inTry.getExprents().get(0);
-+
-+                // Check for closable invocation
-+                if (isCloseable(first)) {
-+                  closeable = (VarExprent) ((InvocationExprent)first).getInstance();
-+                  nullable = true;
-+
-+                  // Double check that the variables in the null check and the closeable match
-+                  if (!closeable.getVarVersionPair().equals(((VarExprent)check).getVarVersionPair())) {
-+                    closeable = null;
-+                  }
-+                }
-+              }
-+            }
-+          }
-+        }
-+      }
-+    }
-+
-+    // Didn't find an autocloseable, return early
-+    if (closeable == null) {
-+      return false;
-+    }
-+
-+    Set<Statement> destinations = findExitpoints(tryStatement);
-+    if (destinations.isEmpty()) {
-+      return false;
-+    }
-+
-+    Statement check = tryStatement;
-+    List<StatEdge> preds = new ArrayList<>();
-+    while (check != null && preds.isEmpty()) {
-+      preds = check.getPredecessorEdges(StatEdge.EdgeType.REGULAR);
-+      check = check.getParent();
-+    }
-+
-+    if (preds.isEmpty()) {
-+      return false;
-+    }
-+
-+    StatEdge edge = preds.get(0);
-+    if (edge.getSource() instanceof BasicBlockStatement) {
-+      AssignmentExprent assignment = findResourceDef(closeable, edge.getSource());
-+
-+      if (assignment == null) {
-+        return false;
-+      }
-+
-+      for (Statement destination : destinations) {
-+        if (!isValid(destination, closeable, nullable)) {
-+          return false;
-+        }
-+      }
-+
-+      stack.push(new TryStatementJ11(destinations, closeable, nullable, assignment, edge, tryStatement));
-+      return true;
-+    }
-+
-+    return false;
-+  }
-+
-+  private static void makeTryStatementJ11(Stack<TryStatementJ11> tryStatements, DummyExitStatement exit) {
-+    TryStatementJ11 tryStatementRecord = tryStatements.peek();
-+    Set<Statement> destinations = tryStatementRecord.destinations();
-+    boolean nullable = tryStatementRecord.nullable();
-+    AssignmentExprent assignment = tryStatementRecord.assignment();
-+    StatEdge edge = tryStatementRecord.pred();
-+    CatchStatement tryStatement = tryStatementRecord.tryStatement();
-+
-+    for (Statement destination : destinations) {
-+      removeTempAssignments(destination, nullable, tryStatements, exit);
-+    }
-+
-+    for (Statement destination : destinations) {
-+      removeClose(destination, nullable, exit);
-+    }
-+
-+    edge.getSource().getExprents().remove(assignment);
-+
-+    // Add resource assignment to try
-+    tryStatement.getResources().add(0, assignment);
-+
-+    // Get catch block
-+    Statement remove = tryStatement.getStats().get(1);
-+
-+    // Flatten references to statement
-+    SequenceHelper.destroyAndFlattenStatement(remove);
-+
-+    // Destroy catch block
-+    tryStatement.getStats().remove(1);
-+
-+    tryStatement.setTryType(CatchStatement.RESORCES);
-+    tryStatements.pop();
-+  }
-+
-+  private static boolean isValid(Statement stat, VarExprent closeable, boolean nullable) {
-+    if (nullable) {
-+      // Check for if statement that contains a null check and a close()
-+      if (stat instanceof IfStatement) {
-+        IfStatement ifStat = (IfStatement) stat;
-+        Exprent condition = ifStat.getHeadexprent().getCondition();
-+
-+        if (condition instanceof FunctionExprent) {
-+          // This can sometimes be double inverted negative conditions too, handle that case
-+          FunctionExprent func = unwrapNegations((FunctionExprent) condition);
-+
-+          // Ensure the exprent is the one we want to remove
-+          if (func.getFuncType() == FunctionExprent.FUNCTION_NE && func.getLstOperands().get(0) instanceof VarExprent && func.getLstOperands().get(1).getExprType().equals(VarType.VARTYPE_NULL)) {
-+            if (func.getLstOperands().get(0) instanceof VarExprent && ((VarExprent) func.getLstOperands().get(0)).getVarVersionPair().equals(closeable.getVarVersionPair())) {
-+              return true;
-+            }
-+          }
-+        }
-+      }
-+    } else {
-+      if (stat instanceof BasicBlockStatement) {
-+        if (stat.getExprents() != null && !stat.getExprents().isEmpty()) {
-+          Exprent exprent = stat.getExprents().get(0);
-+
-+          if (exprent instanceof InvocationExprent) {
-+            Exprent inst = ((InvocationExprent) exprent).getInstance();
-+
-+            // Ensure the var exprent we want to remove is the right one
-+            if (inst instanceof VarExprent && inst.equals(closeable) && isCloseable(exprent)) {
-+              return true;
-+            }
-+          }
-+        }
-+      }
-+    }
-+
-+    return false;
-+  }
-+
-+  private static void removeTempAssignments(Statement statement, boolean nullable, Stack<TryStatementJ11> stack, DummyExitStatement exitStat) {
-+    Statement stat = statement;
-+    int exprentIndex = 0;
-+    boolean previousNonNullable = false;
-+    for (int i = stack.size() - 1; i >= 0; i--) {
-+      TryStatementJ11 tryStatement = stack.get(i);
-+      if (tryStatement.nullable()) {
-+        if (stat.getAllSuccessorEdges().size() == 1) {
-+          stat = stat.getAllSuccessorEdges().get(0).getDestination();
-+          exprentIndex = 0;
-+          if (previousNonNullable) {
-+            if (stat.getAllSuccessorEdges().size() == 1) {
-+              stat = stat.getAllSuccessorEdges().get(0).getDestination();
-+            }
-+            previousNonNullable = false;
-+          }
-+        }
-+      } else {
-+        exprentIndex++;
-+        previousNonNullable = true;
-+      }
-+    }
-+
-+    List<StatEdge> edges = stat.getAllPredecessorEdges();
-+    edges.removeIf((edge) -> edge.getSource() instanceof CatchAllStatement catchAll && catchAll.isFinally());
-+    if (exprentIndex == 0 && edges.size() > 2) {
-+      return;
-+    }
-+
-+    ExitExprent exit = null;
-+    Runnable remove = null;
-+    if (stat.getExprents() != null && stat.getExprents().size() > exprentIndex) {
-+      Exprent exp = stat.getExprents().get(exprentIndex);
-+      if (exp.type == Exprent.EXPRENT_EXIT) {
-+        exit = (ExitExprent) exp;
-+        final Statement finalStat = stat;
-+        final int finalIndex = exprentIndex;
-+        remove = () -> {
-+          finalStat.getExprents().remove(finalIndex);
-+          if (finalStat.getExprents().isEmpty()) {
-+            addEnd(finalStat, exitStat);
-+          }
-+        };
-+      }
-+    }
-+
-+    if (exit != null && exit.getValue() != null && exit.getValue().type == Exprent.EXPRENT_VAR) {
-+      VarVersionPair returnVar = ((VarExprent) exit.getValue()).getVarVersionPair();
-+      if (!statement.getAllPredecessorEdges().isEmpty()) {
-+        StatEdge edge = statement.getAllPredecessorEdges().get(0);
-+        Statement ret = edge.getSource();
-+        if (ret.type == Statement.StatementType.BASIC_BLOCK && ret.getExprents() != null && !ret.getExprents().isEmpty()) {
-+          Exprent last = ret.getExprents().get(ret.getExprents().size() - 1);
-+          if (last.type == Exprent.EXPRENT_ASSIGNMENT) {
-+            AssignmentExprent assignment = (AssignmentExprent) last;
-+            if (assignment.getLeft().type == Exprent.EXPRENT_VAR) {
-+              VarVersionPair assigned = ((VarExprent) assignment.getLeft()).getVarVersionPair();
-+              if (returnVar.var == assigned.var) {
-+                exit.replaceExprent(exit.getValue(), assignment.getRight());
-+                ret.getExprents().set(ret.getExprents().size() - 1, exit);
-+                remove.run();
-+              }
-+            }
-+          }
-+        }
-+      }
-+    }
-+  }
-+
-+  private static void removeClose(Statement statement, boolean nullable, DummyExitStatement exit) {
-+    if (nullable) {
-+      // Breaking out of parent, remove label
-+      List<StatEdge> edges = statement.getAllSuccessorEdges();
-+      if (!edges.isEmpty() && edges.get(0).closure == statement.getParent()) {
-+        SequenceHelper.destroyAndFlattenStatement(statement);
-+      } else {
-+        for (StatEdge edge : statement.getFirst().getAllSuccessorEdges()) {
-+          edge.getDestination().removePredecessor(edge);
-+        }
-+
-+        for (StatEdge edge : ((IfStatement)statement).getIfstat().getAllSuccessorEdges()) {
-+          edge.getDestination().removePredecessor(edge);
-+
-+          if (edge.closure != null) {
-+            edge.closure.getLabelEdges().remove(edge);
-+          }
-+        }
-+
-+        if (!statement.getNeighboursSet(StatEdge.EdgeType.ALL, StatEdge.EdgeDirection.FORWARD).contains(exit)) {
-+          // Keep the label as it's not the parent
-+          BasicBlockStatement newStat = new BasicBlockStatement(new BasicBlock(
-+              DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.STATEMENT_COUNTER)));
-+
-+          newStat.setExprents(new ArrayList<>());
-+          statement.getParent().replaceStatement(statement, newStat);
-+        } else {
-+          addEnd(statement, exit);
-+        }
-+      }
-+    } else {
-+      statement.getExprents().remove(0);
-+      if (statement.getExprents().isEmpty() && statement.getNeighboursSet(StatEdge.EdgeType.ALL, StatEdge.EdgeDirection.FORWARD).contains(exit)) {
-+        addEnd(statement, exit);
-+      }
-+    }
-+  }
-+
-+  private static Set<Statement> findExitpoints(Statement stat) {
-+    Set<StatEdge> edges = new LinkedHashSet<>();
-+    findEdgesLeaving(stat.getFirst(), stat, edges);
-+
-+    return edges.stream().map(StatEdge::getDestination).collect(Collectors.toSet());
-+  }
-+
-+  private static void findEdgesLeaving(Statement curr, Statement check, Set<StatEdge> edges) {
-+    findEdgesLeaving(curr, check, edges, false);
-+  }
-+
-+  public static void findEdgesLeaving(Statement curr, Statement check, Set<StatEdge> edges, boolean allowExit) {
-+    for (StatEdge edge : curr.getAllSuccessorEdges()) {
-+      if (!check.containsStatement(edge.getDestination()) && (allowExit || !(edge.getDestination() instanceof DummyExitStatement))) {
-+        edges.add(edge);
-+      }
-+    }
-+
-+    for (Statement stat : curr.getStats()) {
-+      findEdgesLeaving(stat, check, edges, allowExit);
-+    }
-+  }
-+
-+  private static FunctionExprent unwrapNegations(FunctionExprent func) {
-+    while (func.getFuncType() == FunctionExprent.FUNCTION_BOOL_NOT) {
-+      Exprent expr = func.getLstOperands().get(0);
-+
-+      if (expr instanceof FunctionExprent) {
-+        func = (FunctionExprent) expr;
-+      } else {
-+        break;
-+      }
-+    }
-+
-+    return func;
-+  }
-+
-+  private static boolean collapseTry(CatchStatement catchStat) {
-+    Statement parent = catchStat;
-+    if (parent.getFirst() != null && parent.getFirst().type == Statement.StatementType.SEQUENCE) {
-+      parent = parent.getFirst();
-+    }
-+    if (parent != null && parent.getFirst() != null && parent.getFirst().type == Statement.StatementType.TRY_CATCH) {
-+      CatchStatement toRemove = (CatchStatement)parent.getFirst();
-+
-+      if (toRemove.getTryType() == CatchStatement.RESORCES) {
-+        catchStat.setTryType(CatchStatement.RESORCES);
-+        catchStat.getResources().addAll(toRemove.getResources());
-+
-+        catchStat.getVarDefinitions().addAll(toRemove.getVarDefinitions());
-+        parent.replaceStatement(toRemove, toRemove.getFirst());
-+
-+        if (!toRemove.getVars().isEmpty()) {
-+          for (int i = 0; i < toRemove.getVars().size(); ++i) {
-+            catchStat.getVars().add(i, toRemove.getVars().get(i));
-+            catchStat.getExctStrings().add(i, toRemove.getExctStrings().get(i));
-+
-+            catchStat.getStats().add(i + 1, catchStat.getStats().get(i + 1));
-+          }
-+        }
-+        return true;
-+      }
-+    }
-+    return false;
-+  }
-+
-+  // J11+
-+  // Merges try with resource statements that are nested within each other, as well as try with resources statements nested in a normal try.
-+  private static boolean collapseTryJ11(CatchStatement stat) {
-+    if (stat.getStats().isEmpty()) {
-+      return false;
-+    }
-+
-+    boolean ret = false;
-+    boolean merged = false;
-+    do {
-+      merged = false;
-+      // Get the statement inside of the current try
-+      Statement inner = stat.getStats().get(0);
-+  
-+      // Check if the inner statement is a try statement
-+      if (inner instanceof CatchStatement) {
-+        // Filter on try with resources statements
-+        List<Exprent> resources = ((CatchStatement) inner).getResources();
-+        if (!resources.isEmpty()) {
-+          // One try inside of the catch
-+  
-+          // Only merge trys that have an inner statement size of 1, a single block
-+          // TODO: how does this handle nested nullable try stats?
-+          if (inner.getStats().size() == 1) {
-+            stat.setTryType(CatchStatement.RESORCES);
-+            // Set the outer try to be resources, and initialize
-+            stat.getResources().addAll(resources);
-+            stat.getVarDefinitions().addAll(inner.getVarDefinitions());
-+  
-+            // Get inner block of inner try stat
-+            Statement innerBlock = inner.getStats().get(0);
-+  
-+            // Remove successors as the replaceStatement call will add the appropriate successor
-+            List<StatEdge> innerEdges = inner.getAllSuccessorEdges();
-+            for (StatEdge succ : innerBlock.getAllSuccessorEdges()) {
-+              boolean found = false;
-+              for (StatEdge innerEdge : innerEdges) {
-+                if (succ.getDestination() == innerEdge.getDestination() && succ.getType() == innerEdge.getType()) {
-+                  found = true;
-+                  break;
-+                }
-+              }
-+  
-+              if (found) {
-+                innerBlock.removeSuccessor(succ);
-+              }
-+            }
-+  
-+            // Replace the inner try statement with the block inside
-+            stat.replaceStatement(inner, innerBlock);
-+  
-+            ret = true;
-+            merged = true;
-+          }
-+        }
-+      }
-+    } while (merged);
-+
-+    return ret;
-+  }
-+
-+  private static AssignmentExprent findResourceDef(VarExprent var, Statement prevStatement) {
-+    for (Exprent exp : prevStatement.getExprents()) {
-+      if (exp.type == Exprent.EXPRENT_ASSIGNMENT) {
-+        AssignmentExprent ass = (AssignmentExprent)exp;
-+        if (ass.getLeft().type == Exprent.EXPRENT_VAR) { // cannot use equals as var's varType may be unknown and not match
-+          VarExprent left = (VarExprent)ass.getLeft();
-+          if (left.getVarVersionPair().equals(var.getVarVersionPair())) {
-+            return ass;
-+          }
-+        }
-+      }
-+    }
-+
-+    return null;
-+  }
-+
-+  private static boolean isCloseable(Exprent exp) {
-+    if (exp.type == Exprent.EXPRENT_INVOCATION) {
-+      InvocationExprent invocExp = (InvocationExprent)exp;
-+      if (invocExp.getName().equals("close") && invocExp.getStringDescriptor().equals("()V")) {
-+        if (invocExp.getInstance() != null && invocExp.getInstance().type == Exprent.EXPRENT_VAR) {
-+          return DecompilerContext.getStructContext().instanceOf(invocExp.getClassName(), "java/lang/AutoCloseable");
-+        }
-+      }
-+    }
-+
-+    return false;
-+  }
-+
-+  private static void fixResourceAssignment(AssignmentExprent ass, Statement statement) {
-+    if (statement.getExprents() != null) {
-+      for (Exprent exp : statement.getExprents()) {
-+        if (exp.type == Exprent.EXPRENT_ASSIGNMENT) {
-+          AssignmentExprent toRemove = (AssignmentExprent)exp;
-+          if (ass.getLeft().equals(toRemove.getLeft()) && !toRemove.getRight().getExprType().equals(VarType.VARTYPE_NULL)) {
-+            ass.setRight(toRemove.getRight());
-+            statement.getExprents().remove(toRemove);
-+            break;
-+          }
-+        }
-+      }
-+    }
-+  }
-+
-+  private static boolean removeRedundantThrow(BasicBlockStatement initBlock, CatchStatement catchStat) {
-+    if (catchStat.getStats().size() > 1) {
-+      boolean removed = false;
-+      Statement temp = null;
-+      int i = 1;
-+      for (; i < catchStat.getStats().size(); ++i) {
-+        temp = catchStat.getStats().get(i);
-+
-+        if (temp.type == Statement.StatementType.BASIC_BLOCK && temp.getExprents() != null) {
-+          if (temp.getExprents().size() >= 2 && catchStat.getVars().get(i - 1).getVarType().getValue().equals("java/lang/Throwable")) {
-+            if (temp.getExprents().get(temp.getExprents().size() - 1).type == Exprent.EXPRENT_EXIT) {
-+              ExitExprent exitExprent = (ExitExprent)temp.getExprents().get(temp.getExprents().size() - 1);
-+              if (exitExprent.getExitType() == ExitExprent.EXIT_THROW && exitExprent.getValue().equals(catchStat.getVars().get(i - 1))) {
-+
-+                catchStat.getExctStrings().remove(i - 1);
-+                catchStat.getVars().remove(i - 1);
-+                catchStat.getStats().remove(i);
-+
-+                for (StatEdge edge : temp.getAllPredecessorEdges()) {
-+                  edge.getSource().removeSuccessor(edge);
-+                }
-+
-+                for (StatEdge edge : temp.getAllSuccessorEdges()) {
-+                  edge.getDestination().removePredecessor(edge);
-+                }
-+
-+                removed = true;
-+                break;
-+              }
-+            }
-+          }
-+        }
-+      }
-+
-+      if (removed && temp.getExprents().get(temp.getExprents().size() - 2).type == Exprent.EXPRENT_ASSIGNMENT) {
-+        AssignmentExprent assignmentExp = (AssignmentExprent)temp.getExprents().get(temp.getExprents().size() - 2);
-+        if (assignmentExp.getLeft().getExprType().getValue().equals("java/lang/Throwable")) {
-+          for (Exprent exprent : initBlock.getExprents()) {
-+            if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
-+              AssignmentExprent toRemove = (AssignmentExprent)exprent;
-+              if (toRemove.getLeft().equals(assignmentExp.getLeft())) {
-+                initBlock.getExprents().remove(toRemove);
-+                return true;
-+              }
-+            }
-+          }
-+        }
-+      }
-+    }
-+    return false;
-+  }
-+  
-+  private static void addEnd(Statement stat, DummyExitStatement exit) {
-+    for (StatEdge edge : stat.getAllPredecessorEdges()) {
-+      edge.getSource().changeEdgeNode(StatEdge.EdgeDirection.FORWARD, edge, exit);
-+      exit.addPredecessor(edge);
-+      if (edge.closure != null) {
-+        edge.closure.getLabelEdges().remove(edge);
-+      }
-+    }
-+    
-+    for (StatEdge edge : stat.getAllSuccessorEdges()) {
-+      edge.getDestination().removePredecessor(edge);
-+    }
-+    stat.getParent().getStats().removeWithKey(stat.id);
-+  }
-+  
-+  private static record TryStatementJ11(Set<Statement> destinations, VarExprent closeable, boolean nullable, AssignmentExprent assignment, StatEdge pred, CatchStatement tryStatement) {
-+    
-+  }
-+}
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
-index 234a42e3a73426204cf3debdb9b77c28f4afbb10..940d41923c8df57fd82cf4b42c2a38d523f7e0c3 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
-@@ -128,6 +128,13 @@ public class FlattenStatementsHelper {
-           case CATCH_ALL, TRY_CATCH -> {
-             DirectNode firstnd = new DirectNode(DirectNodeType.TRY, stat, stat.id + "_try");
- 
-+            if (stat.type == Statement.StatementType.TRY_CATCH) {
-+              CatchStatement catchStat = (CatchStatement)stat;
-+              if (catchStat.getTryType() == CatchStatement.RESORCES) {
-+                firstnd.exprents = catchStat.getResources();
-+              }
-+            }
-+
-             mapDestinationNodes.put(stat.id, new String[]{firstnd.id, null});
-             graph.nodes.putWithKey(firstnd, firstnd.id);
- 
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
-index 7c83c48777e2dc683d1321fb297f89466f62e8ce..97c1d3f816dcfc21811da2097744bfe9e5747813 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
-@@ -10,18 +10,26 @@ import org.jetbrains.java.decompiler.modules.decompiler.DecHelper;
- import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
- import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
- import org.jetbrains.java.decompiler.modules.decompiler.StatEdge.EdgeType;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
- import org.jetbrains.java.decompiler.util.TextBuffer;
- 
- import java.util.ArrayList;
-+import java.util.BitSet;
- import java.util.Collections;
- import java.util.List;
- import java.util.Set;
- 
- public final class CatchStatement extends Statement {
-+  public static final int NORMAL = 0;
-+  public static final int RESORCES = 1;
-+
-   private final List<List<String>> exctstrings = new ArrayList<>();
-   private final List<VarExprent> vars = new ArrayList<>();
-+  private final List<Exprent> resources = new ArrayList<>();
-+
-+  private int tryType;
- 
-   // *****************************************************************************
-   // constructors
-@@ -29,6 +37,7 @@ public final class CatchStatement extends Statement {
- 
-   private CatchStatement() {
-     super(StatementType.TRY_CATCH);
-+    tryType = NORMAL;
-   }
- 
-   private CatchStatement(Statement head, Statement next, Set<Statement> setHandlers) {
-@@ -143,8 +152,25 @@ public final class CatchStatement extends Statement {
-       tracer.incrementCurrentSourceLine();
-     }
- 
--    buf.appendIndent(indent).append("try {").appendLineSeparator();
--    tracer.incrementCurrentSourceLine();
-+    if (tryType == NORMAL) {
-+      buf.appendIndent(indent).append("try {").appendLineSeparator();
-+      tracer.incrementCurrentSourceLine();
-+    }
-+    else {
-+      buf.appendIndent(indent).append("try (");
-+
-+      if (resources.size() > 1) {
-+        buf.appendLineSeparator();
-+        tracer.incrementCurrentSourceLine();
-+        buf.append(ExprProcessor.listToJava(resources, indent + 1, tracer));
-+        buf.appendIndent(indent);
-+      }
-+      else {
-+        buf.append(resources.get(0).toJava(indent + 1, tracer));
-+      }
-+      buf.append(") {").appendLineSeparator();
-+      tracer.incrementCurrentSourceLine();
-+    }
- 
-     buf.append(ExprProcessor.jmpWrapper(first, indent + 1, true, tracer));
-     buf.appendIndent(indent).append("}");
-@@ -181,6 +207,16 @@ public final class CatchStatement extends Statement {
-     return buf;
-   }
- 
-+  @Override
-+  public List<Object> getSequentialObjects() {
-+
-+    List<Object> lst = new ArrayList<>(resources);
-+    lst.addAll(stats);
-+    lst.addAll(vars);
-+
-+    return lst;
-+  }
-+
-   @Override
-   public Statement getSimpleCopy() {
-     CatchStatement cs = new CatchStatement();
-@@ -195,11 +231,36 @@ public final class CatchStatement extends Statement {
-     return cs;
-   }
- 
-+  @Override
-+  public void getOffset(BitSet values) {
-+    super.getOffset(values);
-+
-+    for (Exprent exp : this.getResources()) {
-+      exp.getBytecodeRange(values);
-+    }
-+  }
-+
-   // *****************************************************************************
-   // getter and setter methods
-   // *****************************************************************************
- 
-+  public List<List<String>> getExctStrings() {
-+    return exctstrings;
-+  }
-+
-   public List<VarExprent> getVars() {
-     return vars;
-   }
-+
-+  public int getTryType() {
-+    return tryType;
-+  }
-+
-+  public void setTryType(int tryType) {
-+    this.tryType = tryType;
-+  }
-+
-+  public List<Exprent> getResources() {
-+    return resources;
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-index b35985211d1f0488f76cbd6e87f18e3732b2d589..13d023de573ced3cde29f9b42212051a47232733 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
-@@ -110,7 +110,11 @@ public class VarDefinitionHelper {
-         lstVars = ((CatchAllStatement)st).getVars();
-       }
-       else if (st.type == StatementType.TRY_CATCH) {
--        lstVars = ((CatchStatement)st).getVars();
-+        lstVars = new ArrayList<>(((CatchStatement)st).getVars());
-+        // resource vars must also be included
-+        for (Exprent exp : ((CatchStatement)st).getResources()) {
-+          lstVars.add((VarExprent)((AssignmentExprent)exp).getLeft());
-+        }
-       }
- 
-       if (lstVars != null) {
-diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
-index 645d99f07322c311a20b5fd76a5235de6cdae74d..16ceb1e8e47c90da72ef3039cf625eec25b68223 100644
---- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
-+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
-@@ -143,6 +143,7 @@ public class SingleClassesTest extends SingleClassesTestBase {
-   @Test public void testRecordVararg() { doTest("records/TestRecordVararg"); }
-   @Test public void testRecordGenericVararg() { doTest("records/TestRecordGenericVararg"); }
-   @Test public void testRecordAnno() { doTest("records/TestRecordAnno"); }
-+  @Test public void testTryWithResources() { doTest("pkg/TestTryWithResources"); }
-   @Test public void testRootWithClassInner() { doTest("sealed/RootWithClassInner"); }
-   @Test public void testRootWithInterfaceInner() { doTest("sealed/RootWithInterfaceInner"); }
-   @Test public void testRootWithClassOuter() { doTest("sealed/RootWithClassOuter",
-diff --git a/testData/classes/pkg/TestTryWithResources.class b/testData/classes/pkg/TestTryWithResources.class
-new file mode 100644
-index 0000000000000000000000000000000000000000..dba49d9ec1c81714d3b6d7debe6db5697fc5a9bc
-GIT binary patch
-literal 2427
-zcmc&#-%nd*7=BJ^d&;4Ou53yN9fLWAwzLB_b?tufW8EtKfwY4V7n1^KPzG(&9^AMv
-zOEi%S6TL9;lAFbGVZ0zwoW{u=i8C=#{}2BJ@%he=wwNth%o0gB?|I+v{hsfApXdEf
-zpZ@*h&j8M2R>3QHUB(+O3@8{xP(cV`1w)9q5S4Mxg<%&)6pZ4$cwCV2rUDP%lJT~T
-zi!x#g;<%*XGOmaR*RRUBCc$~BSSo5)B(w|+&PuRPl$TTq9jRhT&1|eMsMUO7VT}=o
-zrq;A!37(u*SiGAqRP?xvF&;!LGhsx=xcNHDV<jlL@<w%0O%w%&KTnK&b#tz$t<0!3
-zeWeyzEqqXL<5hG?=&IaZjy@}i<z=#Y853?y;<}848#i!MM$(OUFvYT`$MQENcm-B;
-ztx#Hy=Co?Dv@F4v&vH4DOmWwk8!4pS$cVE#8@c(FYWbdM(~T^qC3NdcB~^>wnn~t1
-zOIqRn_4|uzMJtv|*2ZEvn#?vuyNo>y-(j!OY(*_)^$jxKbz=rOGUG-bw=4j?$|iuO
-z+OrF*>Y_$Ej$#TDbDK3yUAHhq5v9t8#%9$5qaBT&Ce{kInuNAxRkNs;&_9rBWEc#^
-z2aS-?Z7MFoZJeripAur0$pX0@IFgxUrvG{M@n8=RZZ0@z9&NH(Kh`3wkxO8io2Luf
-ziiG$xDt_<zO;~7RGjSY?YvmdT&r?`h%579CRkc=Amq=_gYF+)fxB$jjlq?`o7Q1OL
-zsrQaBov_-m67>_!%IdotQ(*PW^d=mZXs2?lh_^3^KG=B6#h)FLxDkB%=>=#dT1W7E
-zNV|NIaFS1_9&AG^x~){{B%=<lm3=l}%O31|a6E={N=gNNvf~L{^DVyC+`QeV<o3`u
-z7d*gZ=m4F;J-BypF&zr;p?wGE41X{kPKEa~ObRgRgc0<`>>)p4nI?<K(EbkWQ@fD)
-zDH`U7$^$RX@{$@h$x>!8i+TE!ysE+nR<Vu_(|XynXyz0Vpzmtu{tg`>NxMqC5{{vV
-ztCyi1@(7!ZfXodNAFc!+ll(tquH9U)7L}Gmog$3O=mmK?UFYd9^3+PmUtff$mM1v&
-z7{0WWAwQjS;R8$!kq|n^cW^CcA2JEKU_>G@yWgJi+xKG*rUn|RzL;~!?=-j*seZ>k
-z$xSpAh+7Jb7-WZZ1!D5QC2)oOu7(7D+0?+zPyAJklf?*s0`jK4%{K4ooO>91AHv_l
-zr}#`~`vJC1`;hT(u#0c$Z{sTnA2`4-x>mwkT1C*tmE-hJAWR$K)Q)mq^L)QeyG{F$
-z_JDLh<pc}uK7{X(rI`}R=&Oq)6uhA;=!Mfz&|I#kP)A!`c4QcD(%lP}sk^B6=pF_v
-z?fWh5ZQZ8!fBw(f@4%Jj<w?KP8EAju8Svr(KB9)genKTb#~1igpM@<vGVRwS@H_l~
-zpXfj0bO;~#4ZrI%A*?kMF|>1~hkk(baEkNL%XtWJ9(sx2$CFOuW7;kB6RC$t{lqzg
-dKk%A9AFSYI%?A}fGa+vLe;E{s^?=iM_8)B@@HPMd
-
-literal 0
-HcmV?d00001
-
-diff --git a/testData/results/TestTryWithResources.dec b/testData/results/TestTryWithResources.dec
-new file mode 100644
-index 0000000000000000000000000000000000000000..419b0df6fc1731027c783900f7b8e407826a6f5e
---- /dev/null
-+++ b/testData/results/TestTryWithResources.dec
-@@ -0,0 +1,176 @@
-+package pkg;
-+
-+import java.io.IOException;
-+import java.io.InputStream;
-+import java.net.URISyntaxException;
-+import java.nio.file.FileSystem;
-+import java.nio.file.FileSystems;
-+import java.nio.file.Files;
-+
-+public class TestTryWithResources {
-+   public static void test1() {
-+      try (FileSystem var0 = FileSystems.getFileSystem(TestTryWithResources.class.getResource("NOT").toURI())) {// 13
-+         var0.getPath("PATH", "TO", "FILE");// 14
-+      } catch (IOException | URISyntaxException var13) {// 16
-+         ;
-+      }
-+
-+   }// 17
-+
-+   public static void test2() {
-+      try (
-+         FileSystem var0 = FileSystems.getFileSystem(TestTryWithResources.class.getResource("NOT").toURI());// 20
-+         InputStream var2 = Files.newInputStream(var0.getPath("PATH", "TO", "FILE"));// 21
-+      ) {
-+         var2.read();// 22
-+      } catch (IOException | URISyntaxException var32) {// 24
-+         ;
-+      }
-+
-+   }// 25
-+
-+   public static void test3() {
-+      try (FileSystem var0 = FileSystems.getFileSystem(TestTryWithResources.class.getResource("NOT").toURI())) {// 28
-+         try (InputStream var2 = Files.newInputStream(var0.getPath("PATH", "TO", "FILE"))) {// 29
-+            var2.read();// 30
-+         } catch (IOException var34) {// 32
-+            ;
-+         } catch (Exception var35) {// 33
-+            ;
-+         }
-+      } catch (IOException | URISyntaxException var38) {// 35
-+         ;
-+      }
-+
-+   }// 36
-+}
-+
-+class 'pkg/TestTryWithResources' {
-+   method 'test1 ()V' {
-+      0      11
-+      1      11
-+      2      11
-+      3      11
-+      4      11
-+      5      11
-+      6      11
-+      7      11
-+      8      11
-+      9      11
-+      a      11
-+      b      11
-+      c      11
-+      d      11
-+      10      12
-+      11      12
-+      12      12
-+      19      12
-+      1a      12
-+      1e      12
-+      1f      12
-+      21      12
-+      22      12
-+      23      12
-+      6d      13
-+      6e      17
-+   }
-+
-+   method 'test2 ()V' {
-+      0      21
-+      1      21
-+      2      21
-+      3      21
-+      4      21
-+      5      21
-+      6      21
-+      7      21
-+      8      21
-+      9      21
-+      a      21
-+      b      21
-+      c      21
-+      d      21
-+      10      22
-+      11      22
-+      12      22
-+      19      22
-+      1a      22
-+      1e      22
-+      1f      22
-+      21      22
-+      22      22
-+      23      22
-+      28      22
-+      29      22
-+      2a      22
-+      2b      22
-+      2e      24
-+      2f      24
-+      30      24
-+      31      24
-+      c9      25
-+      ca      29
-+   }
-+
-+   method 'test3 ()V' {
-+      0      32
-+      1      32
-+      2      32
-+      3      32
-+      4      32
-+      5      32
-+      6      32
-+      7      32
-+      8      32
-+      9      32
-+      a      32
-+      b      32
-+      c      32
-+      d      32
-+      10      33
-+      11      33
-+      12      33
-+      19      33
-+      1a      33
-+      1e      33
-+      1f      33
-+      21      33
-+      22      33
-+      23      33
-+      28      33
-+      29      33
-+      2a      33
-+      2b      33
-+      2e      34
-+      2f      34
-+      30      34
-+      31      34
-+      82      35
-+      86      37
-+      d1      40
-+      d2      44
-+   }
-+}
-+
-+Lines mapping:
-+13 <-> 12
-+14 <-> 13
-+16 <-> 14
-+17 <-> 18
-+20 <-> 22
-+21 <-> 23
-+22 <-> 25
-+24 <-> 26
-+25 <-> 30
-+28 <-> 33
-+29 <-> 34
-+30 <-> 35
-+32 <-> 36
-+33 <-> 38
-+35 <-> 41
-+36 <-> 45
-+Not mapped:
-+15
-+23
-+31
-+34
-diff --git a/testData/src/pkg/TestTryWithResources.java b/testData/src/pkg/TestTryWithResources.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0c217fe0bc40af775d817bac86c68f26a11e7fb5
---- /dev/null
-+++ b/testData/src/pkg/TestTryWithResources.java
-@@ -0,0 +1,37 @@
-+package pkg;
-+
-+import java.io.IOException;
-+import java.io.InputStream;
-+import java.net.URISyntaxException;
-+import java.nio.file.FileSystem;
-+import java.nio.file.FileSystems;
-+import java.nio.file.Files;
-+import java.nio.file.Path;
-+
-+public class TestTryWithResources {
-+  public static void test1() {
-+     try(FileSystem fileSystem = FileSystems.getFileSystem(TestTryWithResources.class.getResource("NOT").toURI())) {
-+       fileSystem.getPath("PATH", "TO", "FILE");
-+     }
-+     catch (URISyntaxException | IOException e) {}
-+  }
-+
-+  public static void test2() {
-+    try(FileSystem fileSystem = FileSystems.getFileSystem(TestTryWithResources.class.getResource("NOT").toURI());
-+        InputStream stream = Files.newInputStream(fileSystem.getPath("PATH", "TO", "FILE"))) {
-+      stream.read();
-+    }
-+    catch (URISyntaxException | IOException e) {}
-+  }
-+
-+  public static void test3() {
-+    try(FileSystem fileSystem = FileSystems.getFileSystem(TestTryWithResources.class.getResource("NOT").toURI())) {
-+      try (InputStream stream = Files.newInputStream(fileSystem.getPath("PATH", "TO", "FILE"))) {
-+        stream.read();
-+      }
-+      catch (IOException e) {}
-+      catch (Exception e) {}
-+    }
-+    catch (URISyntaxException | IOException e) {}
-+  }
-+}
-\ No newline at end of file
diff --git a/FernFlower-Patches/0039-Expose-line-mapping-information-in-archive-mode.patch b/FernFlower-Patches/0039-Expose-line-mapping-information-in-archive-mode.patch
deleted file mode 100644
index 4501e39..0000000
--- a/FernFlower-Patches/0039-Expose-line-mapping-information-in-archive-mode.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: zml <zml@stellardrift.ca>
-Date: Fri, 23 Apr 2021 14:59:09 -0700
-Subject: [PATCH] Expose line mapping information in archive mode
-
-This allows modifying the input classes to have line numbers that match
-the decompiled source, allowing for easier debugging.
-
-Add -dcl {dump code lines} to dump this line data to a file in the output archive.
-This will allow external projects to do this remapping as well.
-
-diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
-index 7af078ed357349951585906564c1bf8239c0c810..b4869c2a756adb1c2da8b62fd8d4dc3f3f7cb2ca 100644
---- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
-+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
-@@ -255,7 +255,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
- 
-   @Override
-   public void saveDirEntry(String path, String archiveName, String entryName) {
--    saveClassEntry(path, archiveName, null, entryName, null);
-+    saveEntryData(path, archiveName, entryName, null, null);
-   }
- 
-   @Override
-@@ -285,7 +285,11 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
-   }
- 
-   @Override
--  public void saveClassEntry(String path, String archiveName, String qualifiedName, String entryName, String content) {
-+  public void saveClassEntry(String path, String archiveName, String qualifiedName, String entryName, String content, int[] mapping) {
-+    saveEntryData(path, archiveName, entryName, content.getBytes(StandardCharsets.UTF_8), getCodeLineData(mapping));
-+  }
-+
-+  public void saveEntryData(String path, String archiveName, String entryName, byte[] content, byte[] extra) {
-     String file = new File(getAbsolutePath(path), archiveName).getPath();
- 
-     if (!checkEntry(entryName, file)) {
-@@ -296,9 +300,12 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
-       ZipOutputStream out = mapArchiveStreams.get(file);
-       ZipEntry entry = new ZipEntry(entryName);
-       entry.setTime(STABLE_ZIP_TIMESTAMP);
-+      if (extra != null) {
-+        entry.setExtra(extra);
-+      }
-       out.putNextEntry(entry);
-       if (content != null) {
--        out.write(content.getBytes(StandardCharsets.UTF_8));
-+        out.write(content);
-       }
-     }
-     catch (IOException ex) {
-diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/SingleFileSaver.java b/src/org/jetbrains/java/decompiler/main/decompiler/SingleFileSaver.java
-index 651584c6758413e31edd5ee6952cb069246c10d4..272e4db3578da68aed40eb864f09eb547f85784d 100644
---- a/src/org/jetbrains/java/decompiler/main/decompiler/SingleFileSaver.java
-+++ b/src/org/jetbrains/java/decompiler/main/decompiler/SingleFileSaver.java
-@@ -4,6 +4,7 @@ import java.io.File;
- import java.io.FileOutputStream;
- import java.io.IOException;
- import java.io.InputStream;
-+import java.nio.charset.StandardCharsets;
- import java.util.HashSet;
- import java.util.Set;
- import java.util.jar.JarFile;
-@@ -62,7 +63,7 @@ public class SingleFileSaver implements IResultSaver {
- 
-   @Override
-   public void saveDirEntry(String path, String archiveName, String entryName) {
--    saveClassEntry(path, archiveName, null, entryName, null);
-+    saveEntryData(path, archiveName, entryName, null, null);
-   }
- 
-   @Override
-@@ -88,16 +89,22 @@ public class SingleFileSaver implements IResultSaver {
-   }
- 
-   @Override
--  public void saveClassEntry(String path, String archiveName, String qualifiedName, String entryName, String content) {
-+  public void saveClassEntry(String path, String archiveName, String qualifiedName, String entryName, String content, int[] mapping) {
-+    saveEntryData(path, archiveName, entryName, content.getBytes(StandardCharsets.UTF_8), getCodeLineData(mapping));
-+  }
-+
-+  private void saveEntryData(String path, String archiveName, String entryName, byte[] content, byte[] extra) {
-     if (!checkEntry(entryName))
-         return;
- 
-     try {
-       ZipEntry entry = new ZipEntry(entryName);
-       entry.setTime(STABLE_ZIP_TIMESTAMP);
-+      if (extra != null)
-+        entry.setExtra(extra);
-       output.putNextEntry(entry);
-       if (content != null)
--          output.write(content.getBytes("UTF-8"));
-+        output.write(content);
-     }
-     catch (IOException ex) {
-       String message = "Cannot write entry " + entryName + " to " + target;
-diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ThreadSafeResultSaver.java b/src/org/jetbrains/java/decompiler/main/decompiler/ThreadSafeResultSaver.java
-index 98fe00844f7b4d5bbdcef09e379bb8e634a96dff..114b7ab0681c661c5486e20f42993402f45debc6 100644
---- a/src/org/jetbrains/java/decompiler/main/decompiler/ThreadSafeResultSaver.java
-+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ThreadSafeResultSaver.java
-@@ -77,7 +77,7 @@ public class ThreadSafeResultSaver implements IResultSaver {
- 
-   @Override
-   public void saveDirEntry(String path, String archiveName, String entryName) {
--    saveClassEntry(path, archiveName, null, entryName, null);
-+    saveEntryData(path, archiveName, entryName, null, null);
-   }
- 
-   @Override
-@@ -106,7 +106,11 @@ public class ThreadSafeResultSaver implements IResultSaver {
-   }
- 
-   @Override
--  public void saveClassEntry(String path, String archiveName, String qualifiedName, String entryName, String content) {
-+  public void saveClassEntry(String path, String archiveName, String qualifiedName, String entryName, String content, int[] mapping) {
-+    saveEntryData(path, archiveName, entryName, content.getBytes(StandardCharsets.UTF_8), getCodeLineData(mapping));
-+  }
-+
-+  private void saveEntryData(String path, String archiveName, String entryName, byte[] content, byte[] extra) {
-     String file = new File(getAbsolutePath(path), archiveName).getPath();
-     ArchiveContext ctx = getCtx(file);
-     if (ctx == null) {
-@@ -118,9 +122,12 @@ public class ThreadSafeResultSaver implements IResultSaver {
-     try {
-       ZipEntry entry = new ZipEntry(entryName);
-       entry.setTime(STABLE_ZIP_TIMESTAMP);
-+      if (extra != null) {
-+        entry.setExtra(extra);
-+      }
-       ctx.stream.putNextEntry(entry);
-       if (content != null) {
--        ctx.stream.write(content.getBytes(StandardCharsets.UTF_8));
-+        ctx.stream.write(content);
-       }
-     } catch (IOException e) {
-       DecompilerContext.getLogger().writeMessage("Cannot write entry " + entryName + " to " + file, e);
-diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-index 19ba388f94dfd41c9a544ea58295ef6f69141738..2a5d4e6285a08d313ff3ba97ec07d1765d5db923 100644
---- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
-@@ -61,6 +61,8 @@ public interface IFernflowerPreferences {
- 
-   String SKIP_EXTRA_FILES = "sef";
- 
-+  String DUMP_CODE_LINES = "dcl";
-+
-   Map<String, Object> DEFAULTS = getDefaults();
- 
-   static Map<String, Object> getDefaults() {
-@@ -111,6 +113,7 @@ public interface IFernflowerPreferences {
-     defaults.put(USE_JAD_VARNAMING, "0");
-     defaults.put(USE_JAD_PARAMETER_RENAMING, "0");
-     defaults.put(SKIP_EXTRA_FILES, "0");
-+    defaults.put(DUMP_CODE_LINES, "1");
- 
-     return Collections.unmodifiableMap(defaults);
-   }
-diff --git a/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java b/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java
-index cf03900654e427bd435ba6dc2d5a0cec8c8708e4..017d3975a3cbe06e485b65ca1b75d6c64d62c249 100644
---- a/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java
-+++ b/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java
-@@ -1,6 +1,10 @@
- // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- package org.jetbrains.java.decompiler.main.extern;
- 
-+import org.jetbrains.java.decompiler.main.DecompilerContext;
-+
-+import java.nio.ByteBuffer;
-+import java.nio.ByteOrder;
- import java.util.jar.Manifest;
- 
- public interface IResultSaver {
-@@ -10,6 +14,7 @@ public interface IResultSaver {
- 
-   void copyFile(String source, String path, String entryName);
- 
-+  // mapping: a flat array of pairs of (input line number, output line number). null when -bsm=0
-   void saveClassFile(String path, String qualifiedName, String entryName, String content, int[] mapping);
- 
-   void createArchive(String path, String archiveName, Manifest manifest);
-@@ -18,7 +23,29 @@ public interface IResultSaver {
- 
-   void copyEntry(String source, String path, String archiveName, String entry);
- 
--  void saveClassEntry(String path, String archiveName, String qualifiedName, String entryName, String content);
-+  @Deprecated
-+  default void saveClassEntry(String path, String archiveName, String qualifiedName, String entryName, String content) {}
-+
-+  // mapping: a flat array of pairs of (input line number, output line number). null when -bsm=0
-+  default void saveClassEntry(String path, String archiveName, String qualifiedName, String entryName, String content, int[] mapping) {
-+    this.saveClassEntry(path, archiveName, qualifiedName, entryName, content);
-+  }
- 
-   void closeArchive(String path, String archiveName);
-+
-+  default byte[] getCodeLineData(int[] mappings) {
-+    if (mappings == null || mappings.length == 0 || !DecompilerContext.getOption(IFernflowerPreferences.DUMP_CODE_LINES)) {
-+      return null;
-+    }
-+    ByteBuffer buf = ByteBuffer.allocate(5 + (mappings.length * 2));
-+    buf.order(ByteOrder.LITTLE_ENDIAN);
-+    // Zip Extra entry header, described in http://www.info-zip.org/doc/appnote-19970311-iz.zip
-+    buf.putShort((short)0x4646); //FF - ForgeFlower
-+    buf.putShort((short)((mappings.length * 2) + 1)); // Mapping data + our version marker
-+    buf.put((byte)1); // Version code, in case we want to change it in the future.
-+    for (int line : mappings) {
-+        buf.putShort((short)line);
-+    }
-+    return buf.array();
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
-index 7d44617f437ad6e78e204d56c394be5e0d5962c4..32a48812223687f21030a448926e45a3f89061cb 100644
---- a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
-+++ b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
-@@ -193,6 +193,9 @@ public class ContextUnit {
-             futures.add(executor.submit(() -> {
-               DecompilerContext.setCurrentContext(clCtx.ctx);
-               clCtx.classContent = decompiledData.getClassContent(clCtx.cl);
-+              if (DecompilerContext.getOption(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING)) {
-+                clCtx.mapping = DecompilerContext.getBytecodeSourceMapper().getOriginalLinesMapping();
-+              }
-               DecompilerContext.setCurrentContext(null);
-             }));
-           }
-@@ -202,7 +205,7 @@ public class ContextUnit {
- 
-         for (final ClassContext clCtx : toProcess) {
-           if (clCtx.shouldContinue) {
--            resultSaver.saveClassEntry(archivePath, filename, clCtx.cl.qualifiedName, clCtx.entryName, clCtx.classContent);
-+            resultSaver.saveClassEntry(archivePath, filename, clCtx.cl.qualifiedName, clCtx.entryName, clCtx.classContent, clCtx.mapping);
-           }
-         }
- 
-@@ -239,6 +242,7 @@ public class ContextUnit {
-     public boolean shouldContinue;
-     public DecompilerContext ctx;
-     String classContent;
-+    int[] mapping;
- 
-     private ClassContext(StructClass cl, String entryName) {
-       this.cl = cl;
-diff --git a/test/org/jetbrains/java/decompiler/MinecraftTest.java b/test/org/jetbrains/java/decompiler/MinecraftTest.java
-index 1f9a9dd03dab30cdb464bfc4901b9c592d558b8f..1e60f70430e50430928ac902c8dd7bfb63ef0c8c 100644
---- a/test/org/jetbrains/java/decompiler/MinecraftTest.java
-+++ b/test/org/jetbrains/java/decompiler/MinecraftTest.java
-@@ -65,7 +65,7 @@ public class MinecraftTest extends SingleClassesTestBase {
-           }
- 
-           @Override
--          public void saveClassEntry(String path, String archiveName, String qualifiedName, String entryName, String content) {
-+          public void saveClassEntry(String path, String archiveName, String qualifiedName, String entryName, String content, int[] mapping) {
-             RESULTS.put(qualifiedName, content);
-           }
-         };
diff --git a/FernFlower-Patches/0040-Fixup-J9-string-concat.patch b/FernFlower-Patches/0040-Fixup-J9-string-concat.patch
deleted file mode 100644
index 8cff824..0000000
--- a/FernFlower-Patches/0040-Fixup-J9-string-concat.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: JDLogic <jrd2558@gmail.com>
-Date: Mon, 31 May 2021 21:28:33 -0600
-Subject: [PATCH] Fixup J9 string concat
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index 9ae846d540337db99dc054ec1a43271e2d41ab7d..74532a087d53613065490b1bd3bf545719e4b3e7 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-@@ -161,6 +161,10 @@ public class MethodProcessorRunnable implements Runnable {
-     }
-     while (new PPandMMHelper(varProc).findPPandMM(root));
- 
-+    if (cl.isVersion(CodeConstants.BYTECODE_JAVA_9)) {
-+      ConcatenationHelper.simplifyStringConcat(root);
-+    }
-+
-     while (true) {
-       LabelHelper.cleanUpEdges(root);
- 
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
-index 5d47c847133cf0413365eddd5f1a2104b2f6ac6b..2aa9f91fc062ba76939d915428e84f6183fb7f71 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
-@@ -4,6 +4,7 @@ package org.jetbrains.java.decompiler.modules.decompiler;
- import org.jetbrains.java.decompiler.ClassNameConstants;
- import org.jetbrains.java.decompiler.code.CodeConstants;
- import org.jetbrains.java.decompiler.modules.decompiler.exps.*;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
- import org.jetbrains.java.decompiler.struct.consts.PooledConstant;
- import org.jetbrains.java.decompiler.struct.consts.PrimitiveConstant;
- import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
-@@ -22,6 +23,38 @@ public final class ConcatenationHelper {
-   private static final VarType builderType = new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/StringBuilder");
-   private static final VarType bufferType = new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/StringBuffer");
- 
-+  public static void simplifyStringConcat(Statement stat) {
-+    for (Statement s : stat.getStats()) {
-+      simplifyStringConcat(s);
-+    }
-+
-+    if (stat.getExprents() != null) {
-+      for (int i = 0; i < stat.getExprents().size(); ++i) {
-+        Exprent ret = simplifyStringConcat(stat.getExprents().get(i));
-+        if (ret != null) {
-+          stat.getExprents().set(i, ret);
-+        }
-+      }
-+    }
-+  }
-+
-+  private static Exprent simplifyStringConcat(Exprent exprent) {
-+    for (Exprent cexp : exprent.getAllExprents()) {
-+      Exprent ret = simplifyStringConcat(cexp);
-+      if (ret != null) {
-+        exprent.replaceExprent(cexp, ret);
-+      }
-+    }
-+
-+    if (exprent.type == Exprent.EXPRENT_INVOCATION) {
-+      Exprent ret = ConcatenationHelper.contractStringConcat(exprent);
-+      if (!exprent.equals(ret)) {
-+        return ret;
-+      }
-+    }
-+
-+    return null;
-+  }
- 
-   public static Exprent contractStringConcat(Exprent expr) {
- 
-@@ -151,6 +184,7 @@ public final class ConcatenationHelper {
-         StringBuilder acc = new StringBuilder();
-         int parameterId = 0;
-         int bootstrapArgumentId = 1;
-+        int nonString = 0;
-         for (int i = 0; i < recipe.length(); i++) {
-           char c = recipe.charAt(i);
- 
-@@ -173,12 +207,12 @@ public final class ConcatenationHelper {
-             if (c == TAG_ARG) {
-               Exprent exprent = parameters.get(parameterId++);
- 
--              if ((exprent instanceof VarExprent varExprent) && res.isEmpty()) {
--
--                if (!VarType.VARTYPE_STRING.equals(varExprent.getVarType())) {
--                  // First item of concatenation is a variable and variable's type is not a String.
-+              if (!VarType.VARTYPE_STRING.equals(exprent.getExprType())) {
-+                nonString++;
-+                if (nonString == 2 && i == 1) {
-+                  // First two items of concatenation are a variable and variable's type is not a String.
-                   // Prepend it with empty string literal to force resulting expression type to be String.
--                  res.add(new ConstExprent(VarType.VARTYPE_STRING, "", expr.bytecode));
-+                  res.add(0, new ConstExprent(VarType.VARTYPE_STRING, "", expr.bytecode));
-                 }
-               }
- 
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
-index 969d6feb0133be481210b4e24a3db72637d0ccdd..17a1f62355d26d2142fa9957064ecf5a92774a3f 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructClass.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructClass.java
-@@ -286,6 +286,10 @@ public class StructClass extends StructMember {
-     return isVersion16() || (isVersion14() && isPreviewVersion());
-   }
- 
-+  public boolean isVersion(int minVersion) {
-+    return majorVersion >= minVersion;
-+  }
-+
-   @Override
-   public String toString() {
-     return qualifiedName;
-diff --git a/testData/classes/java11/TestJava11StringConcatEmptyAffix.class b/testData/classes/java11/TestJava11StringConcatEmptyAffix.class
-index 2b481af59af9a1e2faa68fef62e1f8cf79533791..2f75b2305743bf363663d8b29ff7f7aacc54a929 100644
-GIT binary patch
-literal 1730
-zcmb7^+foxj5QhIrAiKtJFbJref(BS15~3(-5QPY3EId?&(hIMaFu+3CP3=x7c@rN)
-zudK?258y*t_RJ<Euv1#*qUVrr{{E+XYJdH1{sgd!tt9%8P1D?xVLlBeXH3pwau$=b
-zIPRy>BSRc{8I}zc3_M^+tU0bD)*0f~{6~hKlDE$p26h~mziXWCaevp|tI<wc@IY*x
-z*2Vb;pC341%C2A-w#xH6$M%_>ui5Tlz9M|bJuK4x6*&BZVb+S$T7f<((3NPgvu<lC
-zL*znvsx%JBQ!8;uT-sN91h+Y*7jo^bq)b7Gy4Z+S*56DW45{|P3vG3KhB>SJKer5B
-zsI19~*YK-++mQvI*(E=3sJ4Ydh?G3HYKPa|khfiug-@X$0}O+ko+kp~+x53x9C`b}
-zKmrd<tfcS=Loy7Tcx+<T#1pxiF!5B585y3DWhqrC<o}hD5_P)$e(#u9MG{4<F)+q3
-zdTO8W(B&sb9MLQgwkrY#qpsczF$N1-t%}JbCc9YAY2Jpe2L_%?*BcDkju*#0^G<l{
-z0frW~?W*wna|0!M<U5{s(x@|}%C5`(Qq2wmPQJc&=WJ<&1$=G0`!yb9!-K_WL%Vh^
-z9o#*ya}EBviw_G|?0)zyiIQEbRUE;K242w%h}=)-jbZZd9Hx<?Z-o5y(RYE~3&lZN
-zP0+|_>|OW)_MIjSHz+35W}IRgLlh-CMPrOcW2`C1Z&zS><R*r%!i!D%(nR1SVIx}Q
-zo+#W;@TgX~Hww$o-Yu=N#`7q_x3$U|&*KE&(JCjRHZlZ{X_bvAoF#Z%wL;c8L)E49
-zFvrH5Fr&0Z^rW7?7Nv7UPmyNW!;W^YiDZ;sCT==P=cwh^qx1^-yh~1FxQCZC%C4?s
-a6ECQ!Gqld27qhfCr{aQ&iz?<+T>1kmcx4y>
-
-literal 2271
-zcma)+-BQy)6vzMDmNu61VO3B-1SwEHq@XBj5rs;nSiqTf@WQK50t8CZX|{~KiI1UI
-z&h)|u@Sz;f?xs*kqU7T2*)!+-_P@I)`}<Gx7l0+~#L<PhB>7K;d6ond9ur<jcp>41
-zv6Mtam@r-m^E!rX49g7BWz#bG3PU(OwaXC6+4}}VPtmlD?Z)YzQ7`LzRf;5wc15r5
-z>UC4h-C%?tnGVBL@mN387Zx&Q!{M9KE%CZ(9p-GSqVx6B8b4n>I559viNh&JMn2UI
-z3KcBQa4%g@j7(Lx4l}Blk~_}yYJ(PM1<JWrsFD~a(sK1HmA<f~H;<u9P}`LBUd~$!
-zNW~;miY_(8K3p{_<4RoeD7lp<c`C0Jii;&EMee*WT?p9vfmwIxXrhi$v8{auNm6Ak
-z(#2x(uo))P1@9hx&q6aTzN^l*(~;HgOd^$DsV`o#8}*8jH$@MOm;ZCWbD|Ft=td9e
-zU9)XYY`wN+@FRQQ>51ZvhLr@~qEDCs4evCpYFHDqF%3B}riFP=d%0mt(Ly3qUH{JB
-zu~Ff1tRqiN!x;Kc^%FyN;b)T{k>_yT;?%RTnruJHi805$)Q~9A*u{L(r?vcUD~1n3
-z^+$%(r54jVvri1Smz9LPUg38AJccd0*P?BoG-?cqf@K-?Tvc}*gLHjsU(;o%1KiN9
-z{i@-lRAJV8(`}I}h2`^_;gkNQEngj6w!K$eL{6_(OC~qywb-T(@a)e|8^iFw^Dv48
-zJzL`IqNj@bg={a)GBh$8JEnhv{U9fV+hn6M7>0P^5-I_AaF=HEC!&w6D9+LtqA@nu
-z6ytYt+smV}yicXL<&=zm+^0f@2N<{xnrYHg=>f$9L4y)B<f|y+1$764l%j{eiaNZY
-zWFSZ>8unG>b4LAvAf@P$uOgo_8VUp{MI*k7qTa2I1cH>JQC~$dFDMlVQi>j9%)S0R
-zwFqqq+Tc(VnwON8q!E>K(MTFnvXQ6`<K%^iHsQ~_<z>#^m^q2GN9Sx4aW8W|fH`%c
-za~gwE=Zu#*OFvPkm$`UDW*D>b_j`g(8snsR14R_*C(F=$1Ra>C*n+f+(mt2=g|sjK
-E0;Ip6ssI20
-
-diff --git a/testData/results/TestJava11StringConcatEmptyAffix.dec b/testData/results/TestJava11StringConcatEmptyAffix.dec
-index 6f9349f9123c863be861abde8f29aea3fe0496a9..fb1527258dda5a52c16827ff2439162f0764c272 100644
---- a/testData/results/TestJava11StringConcatEmptyAffix.dec
-+++ b/testData/results/TestJava11StringConcatEmptyAffix.dec
-@@ -42,7 +42,7 @@ public class TestJava11StringConcatEmptyAffix {
-    }
- 
-    public String testIntString(int intValue, String stringValue) {
--      return "" + intValue + stringValue;// 48
-+      return intValue + stringValue;// 48
-    }
- 
-    public String testStringInt(int intValue, String stringValue) {
-diff --git a/testData/src/java11/TestJava11StringConcatEmptyAffix.java b/testData/src/java11/TestJava11StringConcatEmptyAffix.java
-index b53609095131d2f029c6d6d7e03f773107f6e1e3..90e3f54180a4f2767daecf9b4a86cba4c4c53284 100644
---- a/testData/src/java11/TestJava11StringConcatEmptyAffix.java
-+++ b/testData/src/java11/TestJava11StringConcatEmptyAffix.java
-@@ -45,7 +45,7 @@ public class TestJava11StringConcatEmptyAffix {
-     }
- 
-     public String testIntString(int intValue, String stringValue) {
--        return "" + intValue + stringValue;
-+        return intValue + stringValue;
-     }
- 
-     public String testStringInt(int intValue, String stringValue) {
diff --git a/FernFlower-Patches/0041-Fix-compound-assignments.patch b/FernFlower-Patches/0041-Fix-compound-assignments.patch
deleted file mode 100644
index 284f3ab..0000000
--- a/FernFlower-Patches/0041-Fix-compound-assignments.patch
+++ /dev/null
@@ -1,625 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: SuperCoder79 <25208576+SuperCoder7979@users.noreply.github.com>
-Date: Fri, 18 Jun 2021 20:52:17 -0400
-Subject: [PATCH] Fix compound assignments
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index 74532a087d53613065490b1bd3bf545719e4b3e7..f66e835ab7cd7b03ada0a433b1edf357f5d6efcd 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-@@ -228,6 +228,8 @@ public class MethodProcessorRunnable implements Runnable {
- 
-     varProc.setVarDefinitions(root);
- 
-+    SecondaryFunctionsHelper.updateAssignments(root);
-+
-     // must be the last invocation, because it makes the statement structure inconsistent
-     // FIXME: new edge type needed
-     LabelHelper.replaceContinueWithBreak(root);
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
-index 4a1ad182cf4a3ac6ba57f498f87a9c3486b6f08c..5f53e116b874efa1053fdb94bb3b513b9647597b 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
-@@ -417,4 +417,46 @@ public final class SecondaryFunctionsHelper {
- 
-     return null;
-   }
-+
-+  // Updates assignments to make them compound assignments if possible
-+  public static void updateAssignments(Statement stat) {
-+    List<Object> objects = new ArrayList<>(stat.getExprents() == null ? stat.getSequentialObjects() : stat.getExprents());
-+
-+    for (Object obj : objects) {
-+      if (obj instanceof Statement) {
-+        updateAssignments((Statement) obj);
-+      } else if (obj instanceof Exprent) {
-+        Exprent exprent = (Exprent) obj;
-+
-+        if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
-+          AssignmentExprent assignment = (AssignmentExprent) exprent;
-+
-+          List<Exprent> params = exprent.getAllExprents();
-+
-+          Exprent lhs = params.get(0);
-+          Exprent rhs = params.get(1);
-+
-+          // Check for expressions that are standard assignments where the left hand side is a variable and the right hand side is a function
-+          if (assignment.getCondType() == -1 && lhs.type == Exprent.EXPRENT_VAR && rhs.type == Exprent.EXPRENT_FUNCTION) {
-+            VarExprent lhsVar = (VarExprent) lhs;
-+            FunctionExprent rhsFunc = (FunctionExprent) rhs;
-+
-+            List<Exprent> funcParams = rhsFunc.getAllExprents();
-+
-+            // Make sure that the function is a mathematical or bitwise function and function's lhs is a variable
-+            if (rhsFunc.getFuncType() <= FunctionExprent.FUNCTION_USHR && funcParams.get(0).type == Exprent.EXPRENT_VAR) {
-+              VarExprent lhsVarFunc = (VarExprent) funcParams.get(0);
-+
-+              // Check if the left hand side of the assignment and the left hand side of the function are the same variable
-+              if (lhsVar.getIndex() == lhsVarFunc.getIndex()) {
-+                // If all the checks succeed, set the assignment to be a compound assignment and set the right to the right hand side of the function
-+                assignment.setCondType(rhsFunc.getFuncType());
-+                assignment.setRight(funcParams.get(1));
-+              }
-+            }
-+          }
-+        }
-+      }
-+    }
-+  }
- }
-diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
-index c78c9554df9788b87028bcf181fc243db7a29f3f..58400b28b85b170d589655eae8355b5b11b4e722 100644
---- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
-+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
-@@ -213,4 +213,5 @@ public class SingleClassesTest extends SingleClassesTestBase {
- 
-   @Test(expected = ClassFormatException.class)
-   public void testUnsupportedConstantPoolEntry() { doTest("java11/TestUnsupportedConstantPoolEntry"); }
-+  @Test public void testCompoundAssignment() { doTest("pkg/TestCompoundAssignment"); }
- }
-diff --git a/testData/classes/pkg/TestCompoundAssignment.class b/testData/classes/pkg/TestCompoundAssignment.class
-new file mode 100644
-index 0000000000000000000000000000000000000000..8a940dae3be9898b8044cb4c670134f2fd640381
-GIT binary patch
-literal 1407
-zcmdUuOHUI~7>3_dIvp+LY73Q_@e)xBN-<vWR#B`XMYNbUF2KbMFexo`+Duym#t`B!
-zaBJeixY30hS0*luYkw5_o}Ox$q<_FRXXgFBb9%n#yY$z=_a6YRBN;^x5;{h7j0!|D
-zWv|?v73fJ#JQoOOYa6b>z*5<BpSG%Nu3vQ4w&{sB-A1!euGXcYrE<B6oItO1W^2;9
-z!>j0RyN3?BmmS~r8Uni9Z0`;q+AX@i=lHt<N7~yf^3uLS(^=no;?z5l+d<}h-`UOA
-z)xlMDQM6EN`Rnd{St1$54oa=%ZOk<q<&sx*y=J=NymVp+LlYRQZ<VII9}^gq2dB3k
-zuQZ)stGMe;oJNR+lAj1z7-)P(Xjyy<zO~735ML>nT;~w@10v!mpYmv>bH$`#+8M*#
-z;M(Nc=Gx=h=X%5Siff1Kb;kJe@4hs8sWk?U@J1amJ_mVo98n~>XVP;DeHceSQruyS
-z=v8s|$PwnRXARS`Wn{~iu`OFhw`>{TvL%6KO9so96qYSHEL)OTb{Cd7NfL}Yf?<r3
-zA&C<>&iG@Pgn>&WnqhG=I7x~a$rQ_bvS?&^A#Y8DHx&+rBBD@G6pD*Np;0J03I#}^
-z7%3DcMHkXDtkXCt&ywpL)p<;@Ml+beU9v9V0-oU_R*)uRKL!-3_)JpSwU0(Zdk5Y8
-z1l{8O1P<8b4%oyG*vukeGns(RoB}pe3)svsU^CHx-N`r9o;o!pm)ZX-oQA9H!ZqAu
-zrpx@J+qi)`Zeky|@D{i60e5%~_=)(U_$`yw5fbtvUyuJE7yC8D?*5%GtutR!iLkkv
-zXS<YOpOj#OlwfC+U`v!>FO*;tlwkFhVA+-EGGB9?ulpp(a=spLz8-SE=2`VeoUa9b
-SbDXb5&eswdkFnw*#Qy+u$=<90
-
-literal 0
-HcmV?d00001
-
-diff --git a/testData/results/TestCompoundAssignment.dec b/testData/results/TestCompoundAssignment.dec
-new file mode 100644
-index 0000000000000000000000000000000000000000..ef6bd4a14465342f35ec718df5fa47754b187ad9
---- /dev/null
-+++ b/testData/results/TestCompoundAssignment.dec
-@@ -0,0 +1,432 @@
-+package pkg;
-+
-+public class TestCompoundAssignment {
-+   public int testSimple(int var1, int var2) {
-+      var1 += var2;// 5
-+      var1 -= var2;// 6
-+      var1 *= var2;// 7
-+      var1 /= var2;// 8
-+      var1 &= var2;// 9
-+      var1 |= var2;// 10
-+      var1 ^= var2;// 11
-+      var1 >>= var2;// 12
-+      var1 <<= var2;// 13
-+      return var1 >>> var2;// 14 16
-+   }
-+
-+   public int testComplex(int var1, int var2, int var3) {
-+      var1 += var2 + var3;// 20
-+      var1 -= var2 + var3;// 21
-+      var1 *= var2 + var3;// 22
-+      var1 /= var2 + var3;// 23
-+      var1 &= var2 + var3;// 24
-+      var1 |= var2 + var3;// 25
-+      var1 ^= var2 + var3;// 26
-+      var1 >>= var2 + var3;// 27
-+      var1 <<= var2 + var3;// 28
-+      return var1 >>> var2 + var3;// 29 31
-+   }
-+
-+   public int testComplexParens(int var1, int var2, int var3, int var4) {
-+      var1 += (var2 + var3) * var4;// 35
-+      var1 -= (var2 + var3) * var4;// 36
-+      var1 *= (var2 + var3) * var4;// 37
-+      var1 /= (var2 + var3) * var4;// 38
-+      var1 &= (var2 + var3) * var4;// 39
-+      var1 |= (var2 + var3) * var4;// 40
-+      var1 ^= (var2 + var3) * var4;// 41
-+      var1 >>= (var2 + var3) * var4;// 42
-+      var1 <<= (var2 + var3) * var4;// 43
-+      return var1 >>> (var2 + var3) * var4;// 44 46
-+   }
-+
-+   public int testComplexTernary(int var1, int var2, int var3, int var4, boolean var5) {
-+      var1 += var5 ? var2 : var3 * var4;// 50
-+      var1 -= var5 ? var2 : var3 * var4;// 51
-+      var1 *= var5 ? var2 : var3 * var4;// 52
-+      var1 /= var5 ? var2 : var3 * var4;// 53
-+      var1 &= var5 ? var2 : var3 * var4;// 54
-+      var1 |= var5 ? var2 : var3 * var4;// 55
-+      var1 ^= var5 ? var2 : var3 * var4;// 56
-+      var1 >>= var5 ? var2 : var3 * var4;// 57
-+      var1 <<= var5 ? var2 : var3 * var4;// 58
-+      return var1 >>> (var5 ? var2 : var3 * var4);// 59 61
-+   }
-+
-+   public int testArrayOp(int var1, int var2, int[] var3, int var4) {
-+      var1 += var3[var4] = var2;// 65
-+      var1 -= var3[var4] = var2;// 66
-+      var1 *= var3[var4] = var2;// 67
-+      var1 /= var3[var4] = var2;// 68
-+      var1 &= var3[var4] = var2;// 69
-+      var1 |= var3[var4] = var2;// 70
-+      var1 ^= var3[var4] = var2;// 71
-+      var1 >>= var3[var4] = var2;// 72
-+      var1 <<= var3[var4] = var2;// 73
-+      return var1 >>> (var3[var4] = var2);// 74 76
-+   }
-+}
-+
-+class 'pkg/TestCompoundAssignment' {
-+   method 'testSimple (II)I' {
-+      1      4
-+      3      4
-+      5      5
-+      7      5
-+      9      6
-+      b      6
-+      d      7
-+      f      7
-+      11      8
-+      13      8
-+      15      9
-+      17      9
-+      19      10
-+      1b      10
-+      1d      11
-+      1f      11
-+      21      12
-+      23      12
-+      24      13
-+      25      13
-+      26      13
-+      29      13
-+   }
-+
-+   method 'testComplex (III)I' {
-+      1      17
-+      2      17
-+      3      17
-+      5      17
-+      7      18
-+      8      18
-+      9      18
-+      b      18
-+      d      19
-+      e      19
-+      f      19
-+      11      19
-+      13      20
-+      14      20
-+      15      20
-+      17      20
-+      19      21
-+      1a      21
-+      1b      21
-+      1d      21
-+      1f      22
-+      20      22
-+      21      22
-+      23      22
-+      25      23
-+      26      23
-+      27      23
-+      29      23
-+      2b      24
-+      2c      24
-+      2d      24
-+      2f      24
-+      31      25
-+      32      25
-+      33      25
-+      35      25
-+      36      26
-+      37      26
-+      38      26
-+      39      26
-+      3a      26
-+      3d      26
-+   }
-+
-+   method 'testComplexParens (IIII)I' {
-+      1      30
-+      2      30
-+      3      30
-+      4      30
-+      5      30
-+      6      30
-+      8      30
-+      a      31
-+      b      31
-+      c      31
-+      d      31
-+      e      31
-+      f      31
-+      11      31
-+      13      32
-+      14      32
-+      15      32
-+      16      32
-+      17      32
-+      18      32
-+      1a      32
-+      1c      33
-+      1d      33
-+      1e      33
-+      1f      33
-+      20      33
-+      21      33
-+      23      33
-+      25      34
-+      26      34
-+      27      34
-+      28      34
-+      29      34
-+      2a      34
-+      2c      34
-+      2e      35
-+      2f      35
-+      30      35
-+      31      35
-+      32      35
-+      33      35
-+      35      35
-+      37      36
-+      38      36
-+      39      36
-+      3a      36
-+      3b      36
-+      3c      36
-+      3e      36
-+      40      37
-+      41      37
-+      42      37
-+      43      37
-+      44      37
-+      45      37
-+      47      37
-+      49      38
-+      4a      38
-+      4b      38
-+      4c      38
-+      4d      38
-+      4e      38
-+      50      38
-+      51      39
-+      52      39
-+      53      39
-+      54      39
-+      55      39
-+      56      39
-+      57      39
-+      58      39
-+      5b      39
-+   }
-+
-+   method 'testComplexTernary (IIIIZ)I' {
-+      1      43
-+      2      43
-+      3      43
-+      6      43
-+      a      43
-+      b      43
-+      c      43
-+      d      43
-+      f      43
-+      11      44
-+      12      44
-+      13      44
-+      16      44
-+      1a      44
-+      1b      44
-+      1c      44
-+      1d      44
-+      1f      44
-+      21      45
-+      22      45
-+      23      45
-+      26      45
-+      2a      45
-+      2b      45
-+      2c      45
-+      2d      45
-+      2f      45
-+      31      46
-+      32      46
-+      33      46
-+      36      46
-+      3a      46
-+      3b      46
-+      3c      46
-+      3d      46
-+      3f      46
-+      41      47
-+      42      47
-+      43      47
-+      46      47
-+      4a      47
-+      4b      47
-+      4c      47
-+      4d      47
-+      4f      47
-+      51      48
-+      52      48
-+      53      48
-+      56      48
-+      5a      48
-+      5b      48
-+      5c      48
-+      5d      48
-+      5f      48
-+      61      49
-+      62      49
-+      63      49
-+      66      49
-+      6a      49
-+      6b      49
-+      6c      49
-+      6d      49
-+      6f      49
-+      71      50
-+      72      50
-+      73      50
-+      76      50
-+      7a      50
-+      7b      50
-+      7c      50
-+      7d      50
-+      7f      50
-+      81      51
-+      82      51
-+      83      51
-+      86      51
-+      8a      51
-+      8b      51
-+      8c      51
-+      8d      51
-+      8f      51
-+      90      52
-+      91      52
-+      92      52
-+      93      52
-+      96      52
-+      9a      52
-+      9b      52
-+      9c      52
-+      9d      52
-+      9e      52
-+      a1      52
-+   }
-+
-+   method 'testArrayOp (II[II)I' {
-+      1      56
-+      2      56
-+      3      56
-+      4      56
-+      6      56
-+      8      56
-+      a      57
-+      b      57
-+      c      57
-+      d      57
-+      f      57
-+      11      57
-+      13      58
-+      14      58
-+      15      58
-+      16      58
-+      18      58
-+      1a      58
-+      1c      59
-+      1d      59
-+      1e      59
-+      1f      59
-+      21      59
-+      23      59
-+      25      60
-+      26      60
-+      27      60
-+      28      60
-+      2a      60
-+      2c      60
-+      2e      61
-+      2f      61
-+      30      61
-+      31      61
-+      33      61
-+      35      61
-+      37      62
-+      38      62
-+      39      62
-+      3a      62
-+      3c      62
-+      3e      62
-+      40      63
-+      41      63
-+      42      63
-+      43      63
-+      45      63
-+      47      63
-+      49      64
-+      4a      64
-+      4b      64
-+      4c      64
-+      4e      64
-+      50      64
-+      51      65
-+      52      65
-+      53      65
-+      54      65
-+      55      65
-+      57      65
-+      58      65
-+      5b      65
-+   }
-+}
-+
-+Lines mapping:
-+5 <-> 5
-+6 <-> 6
-+7 <-> 7
-+8 <-> 8
-+9 <-> 9
-+10 <-> 10
-+11 <-> 11
-+12 <-> 12
-+13 <-> 13
-+14 <-> 14
-+16 <-> 14
-+20 <-> 18
-+21 <-> 19
-+22 <-> 20
-+23 <-> 21
-+24 <-> 22
-+25 <-> 23
-+26 <-> 24
-+27 <-> 25
-+28 <-> 26
-+29 <-> 27
-+31 <-> 27
-+35 <-> 31
-+36 <-> 32
-+37 <-> 33
-+38 <-> 34
-+39 <-> 35
-+40 <-> 36
-+41 <-> 37
-+42 <-> 38
-+43 <-> 39
-+44 <-> 40
-+46 <-> 40
-+50 <-> 44
-+51 <-> 45
-+52 <-> 46
-+53 <-> 47
-+54 <-> 48
-+55 <-> 49
-+56 <-> 50
-+57 <-> 51
-+58 <-> 52
-+59 <-> 53
-+61 <-> 53
-+65 <-> 57
-+66 <-> 58
-+67 <-> 59
-+68 <-> 60
-+69 <-> 61
-+70 <-> 62
-+71 <-> 63
-+72 <-> 64
-+73 <-> 65
-+74 <-> 66
-+76 <-> 66
-diff --git a/testData/src/pkg/TestCompoundAssignment.java b/testData/src/pkg/TestCompoundAssignment.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..e356c63affc489c36e01a7bb8404c98bf432ac7e
---- /dev/null
-+++ b/testData/src/pkg/TestCompoundAssignment.java
-@@ -0,0 +1,78 @@
-+package pkg;
-+
-+public class TestCompoundAssignment {
-+    public int testSimple(int i, int j) {
-+        i += j;
-+        i -= j;
-+        i *= j;
-+        i /= j;
-+        i &= j;
-+        i |= j;
-+        i ^= j;
-+        i >>= j;
-+        i <<= j;
-+        i >>>= j;
-+        
-+        return i;
-+    }
-+
-+    public int testComplex(int i, int j, int k) {
-+        i += j + k;
-+        i -= j + k;
-+        i *= j + k;
-+        i /= j + k;
-+        i &= j + k;
-+        i |= j + k;
-+        i ^= j + k;
-+        i >>= j + k;
-+        i <<= j + k;
-+        i >>>= j + k;
-+
-+        return i;
-+    }
-+
-+    public int testComplexParens(int i, int j, int k, int m) {
-+        i += (j + k) * m;
-+        i -= (j + k) * m;
-+        i *= (j + k) * m;
-+        i /= (j + k) * m;
-+        i &= (j + k) * m;
-+        i |= (j + k) * m;
-+        i ^= (j + k) * m;
-+        i >>= (j + k) * m;
-+        i <<= (j + k) * m;
-+        i >>>= (j + k) * m;
-+
-+        return i;
-+    }
-+
-+    public int testComplexTernary(int i, int j, int k, int m, boolean b) {
-+        i += b ? j : k * m;
-+        i -= b ? j : k * m;
-+        i *= b ? j : k * m;
-+        i /= b ? j : k * m;
-+        i &= b ? j : k * m;
-+        i |= b ? j : k * m;
-+        i ^= b ? j : k * m;
-+        i >>= b ? j : k * m;
-+        i <<= b ? j : k * m;
-+        i >>>= b ? j : k * m;
-+
-+        return i;
-+    }
-+
-+    public int testArrayOp(int i, int j, int[] a, int b) {
-+        i += a[b] = j;
-+        i -= a[b] = j;
-+        i *= a[b] = j;
-+        i /= a[b] = j;
-+        i &= a[b] = j;
-+        i |= a[b] = j;
-+        i ^= a[b] = j;
-+        i >>= a[b] = j;
-+        i <<= a[b] = j;
-+        i >>>= a[b] = j;
-+
-+        return i;
-+    }
-+}
diff --git a/FernFlower-Patches/0042-Filter-out-generated-Record-getters-and-constructor..patch b/FernFlower-Patches/0042-Filter-out-generated-Record-getters-and-constructor..patch
deleted file mode 100644
index c0a73cd..0000000
--- a/FernFlower-Patches/0042-Filter-out-generated-Record-getters-and-constructor..patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Thu, 11 Nov 2021 23:44:28 -0800
-Subject: [PATCH] Filter out generated Record getters and constructor. Make
- canonical constructors that can be compact compact
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-index d9c338ff9189953329a0812250fb494656eb749a..f217e235da064b672d7ec6b40f6d4bdce27cc65a 100644
---- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
-@@ -355,6 +355,18 @@ public class ClassWriter {
-           return str.startsWith("return this." + name + "<invokedynamic>(this");
-         }
-       }
-+
-+      // Default getters
-+      for (StructRecordComponent rec : cl.getRecordComponents()) {
-+        if (name.equals(rec.getName()) && descriptor.equals("()" + rec.getDescriptor())) {
-+          if (code.countLines() == 1) {
-+            String str = code.toString().trim();
-+            return str.startsWith("return this." + mt.getName() + ';');
-+          } else {
-+            return false;
-+          }
-+        }
-+      }
-     }
-     return false;
-   }
-@@ -680,7 +692,7 @@ public class ClassWriter {
-       boolean isInterface = cl.hasModifier(CodeConstants.ACC_INTERFACE);
-       boolean isAnnotation = cl.hasModifier(CodeConstants.ACC_ANNOTATION);
-       boolean isDeprecated = mt.hasAttribute(StructGeneralAttribute.ATTRIBUTE_DEPRECATED);
--      boolean clInit = false, dInit = false;
-+      boolean clInit = false, dInit = false, compact = false;
- 
-       MethodDescriptor md = MethodDescriptor.parseDescriptor(mt, node);
- 
-@@ -733,6 +745,41 @@ public class ClassWriter {
-           name = node.simpleName;
-           init = true;
-         }
-+
-+        if (cl.getRecordComponents() != null) {
-+          StringBuilder buf = new StringBuilder("(");
-+          for (StructRecordComponent rec : cl.getRecordComponents()) {
-+            buf.append(rec.getDescriptor());
-+          }
-+          String desc = buf.append(")V").toString();
-+          if (desc.equals(mt.getDescriptor())) {
-+            boolean[] found = new boolean[1];
-+            compact = methodWrapper.getOrBuildGraph().iterateExprents((exprent) -> {
-+              if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
-+                AssignmentExprent assignment = (AssignmentExprent) exprent;
-+                if (assignment.getLeft().type == Exprent.EXPRENT_FIELD && assignment.getRight().type != Exprent.EXPRENT_VAR) {
-+                  return 1;
-+                } else if (assignment.getLeft().type == Exprent.EXPRENT_FIELD) {
-+                  found[0] = true;
-+                  return 0;
-+                }
-+              }
-+              return found[0] ? 1 : 0;
-+            });
-+            if (compact) {
-+              methodWrapper.getOrBuildGraph().iterateExprents((exprent) -> {
-+                if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
-+                  AssignmentExprent assignment = (AssignmentExprent) exprent;
-+                  if (assignment.getLeft().type == Exprent.EXPRENT_FIELD) {
-+                    return 2;
-+                  }
-+                }
-+                return 0;
-+              });
-+              hideMethod = methodWrapper.getOrBuildGraph().iterateExprents((exprent) -> 1);
-+            }
-+          }
-+        }
-       }
-       else if (CodeConstants.CLINIT_NAME.equals(name)) {
-         name = "";
-@@ -757,6 +804,7 @@ public class ClassWriter {
-         }
- 
-         buffer.append(toValidJavaIdentifier(name));
-+        if (!compact) {
-         buffer.append('(');
- 
-         List<VarVersionPair> mask = methodWrapper.synthParameters;
-@@ -843,6 +891,7 @@ public class ClassWriter {
-             buffer.append(ExprProcessor.getCastTypeName(type, Collections.emptyList()));
-           }
-         }
-+        }
-       }
- 
-       tracer.incrementCurrentSourceLine(buffer.countLines(start_index_method));
-@@ -876,7 +925,7 @@ public class ClassWriter {
-             BytecodeMappingTracer codeTracer = new BytecodeMappingTracer(tracer.getCurrentSourceLine());
-             TextBuffer code = root.toJava(indent + 1, codeTracer);
- 
--            hideMethod = code.length() == 0 &&
-+            hideMethod |= code.length() == 0 &&
-               (clInit || dInit || hideConstructor(node, !typeAnnotations.isEmpty(), init, throwsExceptions, paramCount, flags)) ||
-               isSyntheticRecordMethod(cl, mt, code);
- 
diff --git a/FernFlower-Patches/0043-Fix-variables-in-finally-blocks-not-getting-renamed.patch b/FernFlower-Patches/0043-Fix-variables-in-finally-blocks-not-getting-renamed.patch
deleted file mode 100644
index f6d9e05..0000000
--- a/FernFlower-Patches/0043-Fix-variables-in-finally-blocks-not-getting-renamed.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: coehlrich <coehlrich@users.noreply.github.com>
-Date: Wed, 17 Nov 2021 15:42:06 +1300
-Subject: [PATCH] Fix variables in finally blocks not getting renamed
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
-index 13317a543c5122c97c86801e63e0872a49df8f77..b929df14dd217b8ca79c9170eeb3719d847cbec0 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
-@@ -706,23 +706,29 @@ public class FinallyProcessor {
-                                        int finallyType,
-                                        List<int[]> lstStoreVars) {
-     InstructionSequence seqPattern = pattern.getSeq();
-+    List<Integer> instrOldOffsetsPattern = pattern.getOriginalOffsets();
-     InstructionSequence seqSample = sample.getSeq();
-+    List<Integer> instrOldOffsetsSample = sample.getOriginalOffsets();
- 
-     if (type != 0) {
-       seqPattern = seqPattern.clone();
-+      instrOldOffsetsPattern = new ArrayList<>(instrOldOffsetsPattern);
- 
-       if ((type & 1) > 0) { // first
-         if (finallyType > 0) {
-+          instrOldOffsetsPattern.remove(0);
-           seqPattern.removeInstruction(0);
-         }
-       }
- 
-       if ((type & 2) > 0) { // last
-         if (finallyType == 0 || finallyType == 2) {
-+          instrOldOffsetsPattern.remove(instrOldOffsetsPattern.size() - 1);
-           seqPattern.removeLast();
-         }
- 
-         if (finallyType == 2) {
-+          instrOldOffsetsPattern.remove(instrOldOffsetsPattern.size() - 1);
-           seqPattern.removeLast();
-         }
-       }
-@@ -749,6 +755,7 @@ public class FinallyProcessor {
-         seq.addInstruction(0, seqSample.getInstr(i), -1);
-         oldOffsets.addFirst(sample.getOriginalOffset(i));
-         seqSample.removeInstruction(i);
-+        instrOldOffsetsSample.remove(i);
-       }
- 
-       BasicBlock newBlock = new BasicBlock(++graph.last_id, seq);
-@@ -910,26 +917,31 @@ public class FinallyProcessor {
- 
-   private static void removeExceptionInstructionsEx(BasicBlock block, int blockType, int finallyType) {
-     InstructionSequence seq = block.getSeq();
-+    List<Integer> instrOldOffsets = block.getOriginalOffsets();
- 
-     if (finallyType == 3) { // empty finally handler
-       for (int i = seq.length() - 1; i >= 0; i--) {
-         seq.removeInstruction(i);
-+        instrOldOffsets.remove(i);
-       }
-     }
-     else {
-       if ((blockType & 1) > 0) { // first
-         if (finallyType == 2 || finallyType == 1) { // `AStore` or `Pop`
-           seq.removeInstruction(0);
-+          instrOldOffsets.remove(0);
-         }
-       }
- 
-       if ((blockType & 2) > 0) { // last
-         if (finallyType == 2 || finallyType == 0) {
-           seq.removeLast();
-+          instrOldOffsets.remove(instrOldOffsets.size() - 1);
-         }
- 
-         if (finallyType == 2) { // `AStore`
-           seq.removeLast();
-+          instrOldOffsets.remove(instrOldOffsets.size() - 1);
-         }
-       }
-     }
diff --git a/FernFlower-Patches/0044-Search-generics-when-finding-where-to-inject-local-c.patch b/FernFlower-Patches/0044-Search-generics-when-finding-where-to-inject-local-c.patch
deleted file mode 100644
index 51c7254..0000000
--- a/FernFlower-Patches/0044-Search-generics-when-finding-where-to-inject-local-c.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: LexManos <LexManos@gmail.com>
-Date: Wed, 17 Nov 2021 13:09:07 -0800
-Subject: [PATCH] Search generics when finding where to inject local classes.
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-index 1518aae1cf006454e11471b52c54267991b65596..fe68098cb9bc2ecfb002438a7b1ed9748d957497 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
-@@ -25,6 +25,7 @@ import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
- import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute.LocalVariable;
- import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
- import org.jetbrains.java.decompiler.struct.gen.VarType;
-+import org.jetbrains.java.decompiler.struct.gen.generics.GenericType;
- import org.jetbrains.java.decompiler.util.DotExporter;
- import org.jetbrains.java.decompiler.util.InterpreterUtil;
- 
-@@ -924,9 +925,15 @@ public class NestedClassProcessor {
-         case Exprent.EXPRENT_VAR -> {
-           VarExprent varExpr = (VarExprent)expr;
-           if (varExpr.isDefinition()) {
--            VarType varType = varExpr.getVarType();
--            if (classType.equals(varType) || (varType.getArrayDim() > 0 && classType.getValue().equals(varType.getValue()))) {
--              res = true;
-+            Stack<VarType> stack = new Stack<>();
-+            stack.push(varExpr.getDefinitionType());
-+            while (!stack.isEmpty()) {
-+              VarType varType = stack.pop();
-+              if (classType.equals(varType) || (varType != null && varType.getArrayDim() > 0 && classType.getValue().equals(varType.getValue()))) {
-+                res = true;
-+              } else if (varType != null && varType.isGeneric()) {
-+                ((GenericType)varType).getArguments().forEach(stack::push);
-+              }
-             }
-           }
-         }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index 8807a1534a587af70c2779f2bf8f7cdf3ec9d7f2..0dd8768a10a4edb5901d3112145df58c871b68c9 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-@@ -151,7 +151,8 @@ public class VarExprent extends Exprent {
-   }
-   */
- 
--  private void appendDefinitionType(TextBuffer buffer) {
-+
-+  public VarType getDefinitionType() {
-     if (DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_VAR_NAMES)) {
- 
-       if (lvt != null) {
-@@ -159,13 +160,11 @@ public class VarExprent extends Exprent {
-           if (lvt.getSignature() != null) {
-             GenericFieldDescriptor descriptor = GenericMain.parseFieldSignature(lvt.getSignature());
-             if (descriptor != null) {
--              buffer.append(ExprProcessor.getCastTypeName(descriptor.type, Collections.emptyList()));
--              return;
-+              return descriptor.type;
-             }
-           }
-         }
--        buffer.append(ExprProcessor.getCastTypeName(getVarType(), Collections.emptyList()));
--        return;
-+        return getVarType();
-       }
- 
-       MethodWrapper method = (MethodWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_WRAPPER);
-@@ -185,8 +184,7 @@ public class VarExprent extends Exprent {
-               if (signature != null) {
-                 GenericFieldDescriptor descriptor = GenericMain.parseFieldSignature(signature);
-                 if (descriptor != null) {
--                  buffer.append(ExprProcessor.getCastTypeName(descriptor.type, Collections.emptyList()));
--                  return;
-+                  return descriptor.type;
-                 }
-               }
-             }
-@@ -197,15 +195,17 @@ public class VarExprent extends Exprent {
-           if (attr != null) {
-             String descriptor = attr.getDescriptor(originalIndex, visibleOffset);
-             if (descriptor != null) {
--              buffer.append(ExprProcessor.getCastTypeName(new VarType(descriptor), Collections.emptyList()));
--              return;
-+              return new VarType(descriptor);
-             }
-           }
-         }
-       }
-     }
-+    return getVarType();
-+  }
- 
--    buffer.append(ExprProcessor.getCastTypeName(getVarType(), Collections.emptyList()));
-+  private void appendDefinitionType(TextBuffer buffer) {
-+    buffer.append(ExprProcessor.getCastTypeName(getDefinitionType(), Collections.emptyList()));
-   }
- 
-   @Override
diff --git a/FernFlower-Patches/0045-Reduce-allocations-in-getAllExprents.patch b/FernFlower-Patches/0045-Reduce-allocations-in-getAllExprents.patch
deleted file mode 100644
index 5657a2e..0000000
--- a/FernFlower-Patches/0045-Reduce-allocations-in-getAllExprents.patch
+++ /dev/null
@@ -1,318 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: SuperCoder79 <25208576+SuperCoder7979@users.noreply.github.com>
-Date: Sun, 21 Nov 2021 17:33:09 -0500
-Subject: [PATCH] Reduce allocations in getAllExprents
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
-index 4beaf1ee874de373d956177ece541f0ecce64dc4..7bd39cb6416fa4703bab38a04b3922d2823fe3e5 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
-@@ -26,6 +26,13 @@ public class AnnotationExprent extends Exprent {
-     this.parValues = parValues;
-   }
- 
-+  @Override
-+  protected List<Exprent> getAllExprents(List<Exprent> list) {
-+    list.addAll(this.parValues);
-+
-+    return list;
-+  }
-+
-   @Override
-   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
-     TextBuffer buffer = new TextBuffer();
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
-index e14e8821ea5e7642ff49b04eb4cf1e4d0aa32190..6fcc4845d6912512f52026c13a7b77d9437ce6f3 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
-@@ -64,8 +64,7 @@ public class ArrayExprent extends Exprent {
-   }
- 
-   @Override
--  public List<Exprent> getAllExprents() {
--    List<Exprent> lst = new ArrayList<>();
-+  public List<Exprent> getAllExprents(List<Exprent> lst) {
-     lst.add(array);
-     lst.add(index);
-     return lst;
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
-index 097c10a32ed819368c48efa51866420c01584395..34d99a13692ca6a7cedc59b7d4d9de4ede6a0358 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
-@@ -18,6 +18,12 @@ public class AssertExprent extends Exprent {
-     this.parameters = parameters;
-   }
- 
-+  @Override
-+  protected List<Exprent> getAllExprents(List<Exprent> list) {
-+    list.addAll(this.parameters);
-+    return list;
-+  }
-+
-   @Override
-   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
-     TextBuffer buffer = new TextBuffer();
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
-index ed470ffbbf57c7aea4e82174a99c8d31a097bc32..3adb833472bca27bb0d2084a1ad09061d56012fe 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
-@@ -74,8 +74,7 @@ public class AssignmentExprent extends Exprent {
-   }
- 
-   @Override
--  public List<Exprent> getAllExprents() {
--    List<Exprent> lst = new ArrayList<>();
-+  public List<Exprent> getAllExprents(List<Exprent> lst) {
-     lst.add(left);
-     lst.add(right);
-     return lst;
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-index df602b646b7ab2b6f13c42617634f334f828cc0e..c9d1cab8dedad63498cd003ba6aece1308b2719b 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
-@@ -199,8 +199,8 @@ public class ConstExprent extends Exprent {
-   }
- 
-   @Override
--  public List<Exprent> getAllExprents() {
--    return new ArrayList<>();
-+  public List<Exprent> getAllExprents(List<Exprent> list) {
-+    return list;
-   }
- 
-   @Override
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
-index 9b9a0b4198688968201783fb804130a3312aa522..dcc98dfa3fe511a5028ed756717373f9e9e46b90 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
-@@ -16,7 +16,6 @@ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
- import org.jetbrains.java.decompiler.struct.match.MatchNode;
- import org.jetbrains.java.decompiler.util.TextBuffer;
- 
--import java.util.ArrayList;
- import java.util.BitSet;
- import java.util.List;
- import java.util.Objects;
-@@ -59,8 +58,7 @@ public class ExitExprent extends Exprent {
-   }
- 
-   @Override
--  public List<Exprent> getAllExprents() {
--    List<Exprent> lst = new ArrayList<>();
-+  public List<Exprent> getAllExprents(List<Exprent> lst) {
-     if (value != null) {
-       lst.add(value);
-     }
-@@ -157,7 +155,7 @@ public class ExitExprent extends Exprent {
-     measureBytecode(values);
-   }
- 
--  
-+
-   // *****************************************************************************
-   // IMatchable implementation
-   // *****************************************************************************
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-index 0509360d7637650341acca72e72e49026dc535a7..1a21f128c31aff9338e3be8cf5d8c6036770a152 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
-@@ -98,14 +98,25 @@ public abstract class Exprent implements IMatchable {
-     return false;
-   }
- 
--  public List<Exprent> getAllExprents(boolean recursive) {
--    List<Exprent> lst = getAllExprents();
-+  public final List<Exprent> getAllExprents(boolean recursive) {
-+    List<Exprent> lst = new ArrayList<>();
-+    getAllExprents(recursive, lst);
-+
-+    return lst;
-+  }
-+
-+  private List<Exprent> getAllExprents(boolean recursive, List<Exprent> list) {
-+    int start = list.size();
-+    getAllExprents(list);
-+    int end = list.size();
-+
-     if (recursive) {
--      for (int i = lst.size() - 1; i >= 0; i--) {
--        lst.addAll(lst.get(i).getAllExprents(true));
-+      for (int i = end - 1; i >= start; i--) {
-+        list.get(i).getAllExprents(true, list);
-       }
-     }
--    return lst;
-+
-+    return list;
-   }
- 
-   public Set<VarVersionPair> getAllVariables() {
-@@ -121,10 +132,17 @@ public abstract class Exprent implements IMatchable {
-     return set;
-   }
- 
--  public List<Exprent> getAllExprents() {
--    throw new RuntimeException("not implemented");
-+  public final List<Exprent> getAllExprents() {
-+    List<Exprent> list = new ArrayList<>();
-+    getAllExprents(list);
-+
-+    return list;
-   }
- 
-+  // Get all the exprents contained within the current one
-+  // Preconditions: this list must never be removed from! Only added to!
-+  protected abstract List<Exprent> getAllExprents(List<Exprent> list);
-+
-   public Exprent copy() {
-     throw new RuntimeException("not implemented");
-   }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-index 34ee7377dfef29d73f4cd0e5bf53944befafbd7d..926a3d1bd1baa27879b29c7482e69acdcad042f4 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
-@@ -21,7 +21,6 @@ import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
- import org.jetbrains.java.decompiler.util.TextBuffer;
- import org.jetbrains.java.decompiler.util.TextUtil;
- 
--import java.util.ArrayList;
- import java.util.BitSet;
- import java.util.Collections;
- import java.util.HashMap;
-@@ -115,8 +114,7 @@ public class FieldExprent extends Exprent {
-   }
- 
-   @Override
--  public List<Exprent> getAllExprents() {
--    List<Exprent> lst = new ArrayList<>();
-+  public List<Exprent> getAllExprents(List<Exprent> lst) {
-     if (instance != null) {
-       lst.add(instance);
-     }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-index e74a3c65c126f3378a4551bc96dd82aff9dc4601..54a1becbeb480e2f021d6db8236fe8d36da745b3 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
-@@ -427,8 +427,9 @@ public class FunctionExprent extends Exprent {
-   }
- 
-   @Override
--  public List<Exprent> getAllExprents() {
--    return new ArrayList<>(lstOperands);
-+  public List<Exprent> getAllExprents(List<Exprent> lst) {
-+    lst.addAll(this.lstOperands);
-+    return lst;
-   }
- 
-   @Override
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
-index 7c9ee0a57cd291ae20b466d70f57a8f11bf4abaa..9644863730e5cda55fa3b2556c90903c578d7408 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
-@@ -8,7 +8,6 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
- import org.jetbrains.java.decompiler.util.ListStack;
- import org.jetbrains.java.decompiler.util.TextBuffer;
- 
--import java.util.ArrayList;
- import java.util.BitSet;
- import java.util.List;
- import java.util.Objects;
-@@ -95,8 +94,7 @@ public class IfExprent extends Exprent {
-   }
- 
-   @Override
--  public List<Exprent> getAllExprents() {
--    List<Exprent> lst = new ArrayList<>();
-+  public List<Exprent> getAllExprents(List<Exprent> lst) {
-     lst.add(condition);
-     return lst;
-   }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-index 1a3bd9c6b051447ef2aca98b58ff70b3b89da52c..7f4127e65c89b2f63c94cc6a58a96ec9d2f701f0 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
-@@ -523,8 +523,7 @@ public class InvocationExprent extends Exprent {
-   }
- 
-   @Override
--  public List<Exprent> getAllExprents() {
--    List<Exprent> lst = new ArrayList<>();
-+  public List<Exprent> getAllExprents(List<Exprent> lst) {
-     if (instance != null) {
-       lst.add(instance);
-     }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
-index cd465813bc3e9076d3bbafd1c7b10c9bed0a1407..29b2c217335ce379e779f80427287de5b33d61ba 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
-@@ -6,7 +6,6 @@ package org.jetbrains.java.decompiler.modules.decompiler.exps;
- import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
- import org.jetbrains.java.decompiler.util.TextBuffer;
- 
--import java.util.ArrayList;
- import java.util.BitSet;
- import java.util.List;
- import java.util.Objects;
-@@ -33,8 +32,7 @@ public class MonitorExprent extends Exprent {
-   }
- 
-   @Override
--  public List<Exprent> getAllExprents() {
--    List<Exprent> lst = new ArrayList<>();
-+  public List<Exprent> getAllExprents(List<Exprent> lst) {
-     lst.add(value);
-     return lst;
-   }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-index 72205fbd81840cda91ca303d15758df4a2e79699..b962f9154d44bf276816bf109e6a236fec0184e1 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
-@@ -270,9 +270,8 @@ public class NewExprent extends Exprent {
-   }
- 
-   @Override
--  public List<Exprent> getAllExprents() {
--    List<Exprent> lst = new ArrayList<>();
- 
-+  public List<Exprent> getAllExprents(List<Exprent> lst) {
-     if (newType.getArrayDim() != 0) {
-       lst.addAll(lstDims);
-       lst.addAll(lstArrayElements);
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
-index 11000d30cbdc93e360cb1bc96b53987bc692e3bd..048e49d62e902485ac89643350d750e7eb57995c 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
-@@ -67,8 +67,7 @@ public class SwitchExprent extends Exprent {
-   }
- 
-   @Override
--  public List<Exprent> getAllExprents() {
--    List<Exprent> lst = new ArrayList<>();
-+  public List<Exprent> getAllExprents(List<Exprent> lst) {
-     lst.add(value);
-     return lst;
-   }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-index 0dd8768a10a4edb5901d3112145df58c871b68c9..e79c4571e227ad532760bdbc4ecf52030b31bfb6 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
-@@ -27,7 +27,6 @@ import org.jetbrains.java.decompiler.struct.match.MatchNode;
- import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
- import org.jetbrains.java.decompiler.util.TextBuffer;
- 
--import java.util.ArrayList;
- import java.util.BitSet;
- import java.util.Collections;
- import java.util.List;
-@@ -87,8 +86,8 @@ public class VarExprent extends Exprent {
-   }
- 
-   @Override
--  public List<Exprent> getAllExprents() {
--    return new ArrayList<>();
-+  public List<Exprent> getAllExprents(List<Exprent> lst) {
-+    return lst;
-   }
- 
-   @Override
diff --git a/FernFlower-Patches/0046-Cache-zip-file-instances-and-source-class-data.patch b/FernFlower-Patches/0046-Cache-zip-file-instances-and-source-class-data.patch
deleted file mode 100644
index 5258b41..0000000
--- a/FernFlower-Patches/0046-Cache-zip-file-instances-and-source-class-data.patch
+++ /dev/null
@@ -1,318 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: zml <zml@stellardrift.ca>
-Date: Wed, 23 Mar 2022 21:41:32 -0700
-Subject: [PATCH] Cache zip file instances and source class data
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-index 8e8abfd701a61accbd67ca4e661d7d329fd48c0b..2dafbbd4ea22bdeeef24d0a0dbc533efc613b4e6 100644
---- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
-+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
-@@ -138,6 +138,7 @@ public class Fernflower implements IDecompiledData {
-   }
- 
-   public void clearContext() {
-+    structContext.clear();
-     DecompilerContext.setCurrentContext(null);
-   }
- 
-diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
-index b4869c2a756adb1c2da8b62fd8d4dc3f3f7cb2ca..1172775610851755373694f48903594af615f816 100644
---- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
-+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
-@@ -7,6 +7,7 @@ import org.jetbrains.java.decompiler.main.extern.IBytecodeProvider;
- import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
- import org.jetbrains.java.decompiler.main.extern.IResultSaver;
- import org.jetbrains.java.decompiler.util.InterpreterUtil;
-+import org.jetbrains.java.decompiler.util.ZipFileCache;
- 
- import java.io.*;
- import java.nio.charset.StandardCharsets;
-@@ -144,6 +145,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
-   private final Fernflower engine;
-   private final Map<String, ZipOutputStream> mapArchiveStreams = new HashMap<>();
-   private final Map<String, Set<String>> mapArchiveEntries = new HashMap<>();
-+  private final ZipFileCache openZips = new ZipFileCache();
- 
-   protected ConsoleDecompiler(File destination, Map<String, Object> options, IFernflowerLogger logger) {
-     root = destination;
-@@ -179,16 +181,15 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
- 
-   @Override
-   public byte[] getBytecode(String externalPath, String internalPath) throws IOException {
--    File file = new File(externalPath);
-     if (internalPath == null) {
-+      File file = new File(externalPath);
-       return InterpreterUtil.getBytes(file);
-     }
-     else {
--      try (ZipFile archive = new ZipFile(file)) {
--        ZipEntry entry = archive.getEntry(internalPath);
--        if (entry == null) throw new IOException("Entry not found: " + internalPath);
--        return InterpreterUtil.getBytes(archive, entry);
--      }
-+      final ZipFile archive = this.openZips.get(externalPath);
-+      ZipEntry entry = archive.getEntry(internalPath);
-+      if (entry == null) throw new IOException("Entry not found: " + internalPath);
-+      return InterpreterUtil.getBytes(archive, entry);
-     }
-   }
- 
-@@ -266,7 +267,8 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
-       return;
-     }
- 
--    try (ZipFile srcArchive = new ZipFile(new File(source))) {
-+    try {
-+      ZipFile srcArchive = this.openZips.get(source);
-       ZipEntry entry = srcArchive.getEntry(entryName);
-       if (entry != null) {
-         try (InputStream in = srcArchive.getInputStream(entry)) {
-@@ -336,4 +338,9 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
-       DecompilerContext.getLogger().writeMessage("Cannot close " + file, IFernflowerLogger.Severity.WARN);
-     }
-   }
-+
-+  @Override
-+  public void close() throws IOException {
-+    this.openZips.close();
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/SingleFileSaver.java b/src/org/jetbrains/java/decompiler/main/decompiler/SingleFileSaver.java
-index 272e4db3578da68aed40eb864f09eb547f85784d..0052821de22c460136632b2e09003427b473c6ad 100644
---- a/src/org/jetbrains/java/decompiler/main/decompiler/SingleFileSaver.java
-+++ b/src/org/jetbrains/java/decompiler/main/decompiler/SingleFileSaver.java
-@@ -16,11 +16,13 @@ import java.util.zip.ZipOutputStream;
- import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
- import org.jetbrains.java.decompiler.main.extern.IResultSaver;
-+import org.jetbrains.java.decompiler.util.ZipFileCache;
- 
- public class SingleFileSaver implements IResultSaver {
-   private final File target;
-   private ZipOutputStream output;
-   private Set<String> entries = new HashSet<>();
-+  private final ZipFileCache openZips = new ZipFileCache();
- 
-   public SingleFileSaver(File target) {
-     this.target = target;
-@@ -71,7 +73,8 @@ public class SingleFileSaver implements IResultSaver {
-     if (!checkEntry(entryName))
-       return;
- 
--    try (ZipFile srcArchive = new ZipFile(new File(source))) {
-+    try {
-+      final ZipFile srcArchive = this.openZips.get(source);
-       ZipEntry entry = srcArchive.getEntry(entryName);
-       if (entry != null) {
-         try (InputStream in = srcArchive.getInputStream(entry)) {
-@@ -124,6 +127,11 @@ public class SingleFileSaver implements IResultSaver {
-     }
-   }
- 
-+  @Override
-+  public void close() throws IOException {
-+    this.openZips.close();
-+  }
-+
-   private boolean checkEntry(String entryName) {
-     boolean added = entries.add(entryName);
-     if (!added) {
-diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ThreadSafeResultSaver.java b/src/org/jetbrains/java/decompiler/main/decompiler/ThreadSafeResultSaver.java
-index 114b7ab0681c661c5486e20f42993402f45debc6..376f1501c2933a523714d50ed646a5b0ad801e50 100644
---- a/src/org/jetbrains/java/decompiler/main/decompiler/ThreadSafeResultSaver.java
-+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ThreadSafeResultSaver.java
-@@ -5,13 +5,14 @@ import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
- import org.jetbrains.java.decompiler.main.extern.IResultSaver;
- import org.jetbrains.java.decompiler.util.InterpreterUtil;
-+import org.jetbrains.java.decompiler.util.ZipFileCache;
- 
- import java.io.*;
- import java.nio.charset.StandardCharsets;
--import java.util.HashMap;
- import java.util.HashSet;
- import java.util.Map;
- import java.util.Set;
-+import java.util.concurrent.ConcurrentHashMap;
- import java.util.jar.JarFile;
- import java.util.jar.Manifest;
- import java.util.zip.ZipEntry;
-@@ -23,11 +24,11 @@ import java.util.zip.ZipOutputStream;
-  */
- //TODO, Split off default impl inside ConsoleDecompiler and make this extend that.
- public class ThreadSafeResultSaver implements IResultSaver {
--
--  private final Map<String, ArchiveContext> archiveContexts = new HashMap<>();
-+  private final Map<String, ArchiveContext> archiveContexts = new ConcurrentHashMap<>();
-   private final File target;
-   private final boolean archiveMode;//Latch for Archive mode.
-   private ArchiveContext singeArchiveCtx;
-+  private final ZipFileCache sources = new ZipFileCache();
- 
-   public ThreadSafeResultSaver(File target) {
-     this.target = target;
-@@ -90,7 +91,8 @@ public class ThreadSafeResultSaver implements IResultSaver {
-     if (!ctx.addEntry(entryName)) {
-       return;
-     }
--    try (ZipFile srcArchive = new ZipFile(new File(source))) {
-+    try {
-+      final ZipFile srcArchive = this.sources.get(source);
-       ZipEntry entry = srcArchive.getEntry(entryName);
-       if (entry != null) {
-         try (InputStream in = srcArchive.getInputStream(entry)) {
-@@ -194,6 +196,19 @@ public class ThreadSafeResultSaver implements IResultSaver {
-     }
-   }
- 
-+  @Override
-+  public void close() throws IOException {
-+    if (!this.archiveContexts.isEmpty()) {
-+      for (final Map.Entry<String, ArchiveContext> entry : this.archiveContexts.entrySet()) {
-+        DecompilerContext.getLogger().writeMessage("Unclosed archive detected at end of run in " + entry.getKey(), IFernflowerLogger.Severity.ERROR);
-+        entry.getValue().stream.close();
-+      }
-+      this.archiveContexts.clear();
-+    }
-+
-+    this.sources.close();
-+  }
-+
-   private String getAbsolutePath(String path) {
-     return new File(target, path).getAbsolutePath();
-   }
-diff --git a/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java b/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java
-index 017d3975a3cbe06e485b65ca1b75d6c64d62c249..e4583691c76eee3a12c27f9e4d7538cd37d8279f 100644
---- a/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java
-+++ b/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java
-@@ -3,11 +3,12 @@ package org.jetbrains.java.decompiler.main.extern;
- 
- import org.jetbrains.java.decompiler.main.DecompilerContext;
- 
-+import java.io.IOException;
- import java.nio.ByteBuffer;
- import java.nio.ByteOrder;
- import java.util.jar.Manifest;
- 
--public interface IResultSaver {
-+public interface IResultSaver extends AutoCloseable {
-   long STABLE_ZIP_TIMESTAMP = 0x386D4380; // 01/01/2000 00:00:00 java 8 breaks when using 0.
- 
-   void saveFolder(String path);
-@@ -33,6 +34,9 @@ public interface IResultSaver {
- 
-   void closeArchive(String path, String archiveName);
- 
-+  @Override
-+  default void close() throws IOException {}
-+
-   default byte[] getCodeLineData(int[] mappings) {
-     if (mappings == null || mappings.length == 0 || !DecompilerContext.getOption(IFernflowerPreferences.DUMP_CODE_LINES)) {
-       return null;
-diff --git a/src/org/jetbrains/java/decompiler/struct/StructContext.java b/src/org/jetbrains/java/decompiler/struct/StructContext.java
-index 80ad6c5234031d18947bebfb87eda7895ace2550..87aacfb1b80ae371754ccf86ee1dec38bc029c80 100644
---- a/src/org/jetbrains/java/decompiler/struct/StructContext.java
-+++ b/src/org/jetbrains/java/decompiler/struct/StructContext.java
-@@ -3,6 +3,7 @@ package org.jetbrains.java.decompiler.struct;
- 
- import org.jetbrains.java.decompiler.main.DecompilerContext;
- import org.jetbrains.java.decompiler.main.extern.IResultSaver;
-+import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
- import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger.Severity;
- import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
- import org.jetbrains.java.decompiler.struct.gen.generics.GenericMethodDescriptor;
-@@ -158,7 +159,7 @@ public class StructContext {
-             StructClass cl = StructClass.create(new DataInputFullStream(bytes), isOwn, loader);
-             classes.put(cl.qualifiedName, cl);
-             unit.addClass(cl, name);
--            loader.addClassLink(cl.qualifiedName, new LazyLoader.Link(file.getAbsolutePath(), name));
-+            loader.addClassLink(cl.qualifiedName, new LazyLoader.Link(file.getAbsolutePath(), name, bytes));
-           }
-           else {
-             unit.addOtherEntry(file.getAbsolutePath(), name);
-@@ -251,4 +252,12 @@ public class StructContext {
-     List<String> params = this.abstractNames.get(className + ' ' + methodName + ' ' + descriptor);
-     return params != null && index < params.size() ? params.get(index) : _default;
-   }
-+
-+  public void clear() {
-+    try {
-+      this.saver.close();
-+    } catch (final IOException ex) {
-+      DecompilerContext.getLogger().writeMessage("Failed to close out result saver", IFernflowerLogger.Severity.ERROR, ex);
-+    }
-+  }
- }
-diff --git a/src/org/jetbrains/java/decompiler/util/ZipFileCache.java b/src/org/jetbrains/java/decompiler/util/ZipFileCache.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..f6eabd65a54198170927ef523deb63e5f2e7b3c0
---- /dev/null
-+++ b/src/org/jetbrains/java/decompiler/util/ZipFileCache.java
-@@ -0,0 +1,44 @@
-+// Copyright 2022 ForgeFlower contributors and JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-+package org.jetbrains.java.decompiler.util;
-+
-+import java.io.File;
-+import java.io.IOException;
-+import java.io.UncheckedIOException;
-+import java.util.Map;
-+import java.util.concurrent.ConcurrentHashMap;
-+import java.util.zip.ZipFile;
-+
-+public final class ZipFileCache implements AutoCloseable {
-+  private final Map<String, ZipFile> files = new ConcurrentHashMap<>();
-+
-+  public ZipFile get(final String path) throws IOException {
-+    try {
-+      return this.files.computeIfAbsent(path, pth -> {
-+        try {
-+          return new ZipFile(new File(pth));
-+        } catch (final IOException ex) {
-+          throw new UncheckedIOException(ex);
-+        }
-+      });
-+    } catch (final UncheckedIOException ex) {
-+      throw ex.getCause();
-+    }
-+  }
-+
-+  @Override
-+  public void close() throws IOException {
-+    IOException failure = null;
-+    for (final Map.Entry<String, ZipFile> entry : this.files.entrySet()) {
-+      try {
-+        entry.getValue().close();
-+      } catch (final IOException ex) {
-+        if (failure == null) {
-+          failure = ex;
-+        } else {
-+          failure.addSuppressed(ex);
-+        }
-+      }
-+    }
-+    this.files.clear();
-+  }
-+}
-diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
-index 49cbf8407df5952f3da980e6a10f284ff2f27817..ab0c999a20a8a4598993baf09affe91a3cdf5fc9 100644
---- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
-+++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
-@@ -62,7 +62,7 @@ public class DecompilerTestFixture {
-       }
-     }
-     finally {
--      decompiler.close();
-+      decompiler.clear();
-     }
-   }
- 
-@@ -157,7 +157,7 @@ public class DecompilerTestFixture {
-       }
-     }
- 
--    void close() {
-+    void clear() {
-       for (ZipFile file : zipFiles.values()) {
-         try {
-           file.close();
diff --git a/FernFlower-Patches/0047-Fix-signature-polymorphic-methods.patch b/FernFlower-Patches/0047-Fix-signature-polymorphic-methods.patch
deleted file mode 100644
index a541a91..0000000
--- a/FernFlower-Patches/0047-Fix-signature-polymorphic-methods.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: coehlrich <coehlrich@users.noreply.github.com>
-Date: Mon, 14 Nov 2022 23:46:16 +1300
-Subject: [PATCH] Fix signature polymorphic methods
-
-
-diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-index f66e835ab7cd7b03ada0a433b1edf357f5d6efcd..c825f65f521ba8c1123217aa22bc731bc91b13e7 100644
---- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
-@@ -193,6 +193,8 @@ public class MethodProcessorRunnable implements Runnable {
-       stackProc.simplifyStackVars(root, mt, cl);
-       varProc.setVarVersions(root);
- 
-+      MethodHandleDescriptorHelper.changeMethodHandleDescriptorsStats(root);
-+
-       LabelHelper.identifyLabels(root);
- 
-       if (TryHelper.enhanceTryStats(root, mt)) {
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MethodHandleDescriptorHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MethodHandleDescriptorHelper.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..641d616a4a99bb0a779f42737b883076a9e98deb
---- /dev/null
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MethodHandleDescriptorHelper.java
-@@ -0,0 +1,92 @@
-+package org.jetbrains.java.decompiler.modules.decompiler;
-+
-+import java.util.ArrayList;
-+import java.util.Collections;
-+import java.util.List;
-+
-+import org.jetbrains.java.decompiler.main.DecompilerContext;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.AnnotationExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.exps.NewExprent;
-+import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
-+import org.jetbrains.java.decompiler.struct.StructClass;
-+import org.jetbrains.java.decompiler.struct.StructMethod;
-+import org.jetbrains.java.decompiler.struct.attr.StructAnnotationAttribute;
-+import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
-+import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
-+import org.jetbrains.java.decompiler.struct.gen.VarType;
-+
-+public class MethodHandleDescriptorHelper
-+{
-+
-+    private static final String OBJECT_ARRAY_PARAM = "([Ljava/lang/Object;)";
-+
-+    public static void changeMethodHandleDescriptorsStats(Statement stat) {
-+        for (Statement inner : stat.getStats()) {
-+            changeMethodHandleDescriptorsStats(inner);
-+        }
-+
-+        if (stat.getExprents() != null) {
-+            for (int i = 0; i < stat.getExprents().size(); i++) {
-+                Exprent exprent = stat.getExprents().get(i);
-+                Exprent updated = updateExprent(exprent);
-+                if (updated != null) {
-+                    stat.getExprents().set(i, updated);
-+                }
-+            }
-+        }
-+    }
-+
-+    private static Exprent updateExprent(Exprent exprent) {
-+        for (Exprent inner : exprent.getAllExprents()) {
-+            Exprent updated = updateExprent(inner);
-+            if (updated != null) {
-+                exprent.replaceExprent(inner, updated);
-+            }
-+        }
-+
-+        if (exprent.type == Exprent.EXPRENT_INVOCATION) {
-+            InvocationExprent invocation = (InvocationExprent) exprent;
-+            StructClass cl = DecompilerContext.getStructContext().getClass(invocation.getClassName());
-+            if (cl != null) {
-+                StructMethod mtd = cl.getMethod(invocation.getName(), OBJECT_ARRAY_PARAM + "Ljava/lang/Object;");
-+                if (mtd == null) {
-+                    mtd = cl.getMethod(invocation.getName(), OBJECT_ARRAY_PARAM + invocation.getDescriptor().ret);
-+                }
-+                if (mtd != null) {
-+                    StructAnnotationAttribute annotations = mtd.getAttribute(StructGeneralAttribute.ATTRIBUTE_RUNTIME_VISIBLE_ANNOTATIONS);
-+                    if (annotations != null) {
-+                        for (AnnotationExprent annotation : annotations.getAnnotations()) {
-+                            if (annotation.getClassName().equals("java/lang/invoke/MethodHandle$PolymorphicSignature")) {
-+                                MethodDescriptor oldDesc = invocation.getDescriptor();
-+                                invocation.setStringDescriptor(mtd.getDescriptor());
-+                                invocation.setDescriptor(MethodDescriptor.parseDescriptor(mtd.getDescriptor()));
-+
-+                                List<Exprent> params = invocation.getParameters();
-+                                NewExprent newParam = new NewExprent(VarType.VARTYPE_OBJECT.resizeArrayDim(1), Collections.emptyList(), null);
-+                                newParam.setLstArrayElements(params);
-+                                List<Exprent> newParams = new ArrayList<>();
-+                                newParams.add(newParam);
-+                                invocation.setParameters(newParams);
-+
-+                                if (!VarType.VARTYPE_VOID.equals(oldDesc.ret)) {
-+                                  List<Exprent> castExprents = new ArrayList<>();
-+                                  castExprents.add(invocation);
-+                                  castExprents.add(new ConstExprent(oldDesc.ret, null, null));
-+                                  FunctionExprent cast = new FunctionExprent(FunctionExprent.FUNCTION_CAST, castExprents, null);
-+                                  return cast;
-+                                }
-+                                return null;
-+                            }
-+                        }
-+                    }
-+                }
-+            }
-+        }
-+        return null;
-+    }
-+
-+}
diff --git a/FernFlower-Patches/0048-Improve-output-of-loops-inside-trycatch.patch b/FernFlower-Patches/0048-Improve-output-of-loops-inside-trycatch.patch
deleted file mode 100644
index 92b6bbb..0000000
--- a/FernFlower-Patches/0048-Improve-output-of-loops-inside-trycatch.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: SuperCoder79 <25208576+SuperCoder7979@users.noreply.github.com>
-Date: Tue, 15 Nov 2022 13:57:49 -0500
-Subject: [PATCH] Improve output of loops inside trycatch
-
-
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
-index b95ef0727bc66c3401161abbbcc935c88f9abd42..0286e728d8cce195ff6be89f7c8af8190713591e 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
-@@ -192,6 +192,26 @@ public final class DecHelper {
-     return setHandlers;
-   }
- 
-+  public static boolean invalidHeadMerge(Statement head) {
-+    // Don't build a trycatch around a loop-head if statement, as we know that DoStatement should be built first.
-+    // Since CatchStatement's isHead is run after DoStatement's, we can assume that a loop was not able to be built.
-+    Statement ifhead = findIfHead(head);
-+
-+    return ifhead != null && head.getContinueSet().contains(ifhead.getFirst());
-+  }
-+
-+  private static Statement findIfHead(Statement head) {
-+    while (head != null && head.type != Statement.StatementType.IF) {
-+      if (head.type != Statement.StatementType.SEQUENCE) {
-+        return null;
-+      }
-+
-+      head = head.getFirst();
-+    }
-+
-+    return head;
-+  }
-+
-   public static List<Exprent> copyExprentList(List<? extends Exprent> lst) {
-     List<Exprent> ret = new ArrayList<>();
-     for (Exprent expr : lst) {
-@@ -199,4 +219,4 @@ public final class DecHelper {
-     }
-     return ret;
-   }
--}
-\ No newline at end of file
-+}
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
-index 499968a156b91709d769ac5867e9fa9ce6f23232..89664837c365d106d53c89fb94da9bed6b9cfc72 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
-@@ -85,6 +85,10 @@ public final class CatchAllStatement extends Statement {
-             return null;
-           }
- 
-+          if (DecHelper.invalidHeadMerge(head)) {
-+            return null;
-+          }
-+
-           if (DecHelper.checkStatementExceptions(Arrays.asList(head, exc))) {
-             return new CatchAllStatement(head, exc);
-           }
-diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
-index 97c1d3f816dcfc21811da2097744bfe9e5747813..5444b3ce893eafbc1fac90313a1a20debcc89d0f 100644
---- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
-+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
-@@ -133,6 +133,10 @@ public final class CatchStatement extends Statement {
-           }
-         }
- 
-+        if (DecHelper.invalidHeadMerge(head)) {
-+          return null;
-+        }
-+
-         if (DecHelper.checkStatementExceptions(lst)) {
-           return new CatchStatement(head, next, setHandlers);
-         }

From 377e49f608d70c4de740973c654f6d0d5554b450 Mon Sep 17 00:00:00 2001
From: SizableShrimp <sizableshrimp@sizableshrimp.me>
Date: Tue, 21 Mar 2023 20:17:37 -0500
Subject: [PATCH 20/22] Delete old reference to ForgeFlower9 subproject

---
 settings.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 00ceac5..da17e03 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,6 +6,5 @@ pluginManagement {
 }
 
 include 'ForgeFlower'
-include 'ForgeFlower9'
 
 project(':ForgeFlower').buildFileName = 'TeamCityIsAnnoying'

From b2500c18c20cb7058e770ec7486db29dfbc4a726 Mon Sep 17 00:00:00 2001
From: SizableShrimp <sizableshrimp@sizableshrimp.me>
Date: Tue, 21 Mar 2023 23:11:03 -0500
Subject: [PATCH 21/22] Bump legacy ForgeFlower down to J8

---
 fernflower.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fernflower.gradle b/fernflower.gradle
index d827a23..b1e8b95 100644
--- a/fernflower.gradle
+++ b/fernflower.gradle
@@ -29,9 +29,9 @@ dependencies {
     testImplementation 'net.minecraftforge:DiffPatch:2.0.5:all'
 }
 
-// Default all standard Java compile tasks to Java 17
+// Default all standard Java compile tasks to Java 8
 java.toolchain {
-    languageVersion = JavaLanguageVersion.of(17)
+    languageVersion = JavaLanguageVersion.of(8)
 }
 
 tasks.withType(JavaCompile) {

From 2b3da330fd2efd6c44d6b5dea669c70ab5e43bc9 Mon Sep 17 00:00:00 2001
From: Curle <curle@gemwire.uk>
Date: Thu, 23 Mar 2023 01:11:46 +0000
Subject: [PATCH 22/22] Adjust to ForgeFlowerLegacy basename

---
 build.gradle      | 4 ----
 fernflower.gradle | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index a426d06..27674a2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -43,7 +43,3 @@ project(':ForgeFlower') {
 
 if (tasks.findByName('eclipse') == null) tasks.create('eclipse')
 tasks.findByName('eclipse').dependsOn('applyPatches', 'ForgeFlower:eclipse')
-
-changelog {
-    fromMergeBase()
-}
diff --git a/fernflower.gradle b/fernflower.gradle
index b1e8b95..f591489 100644
--- a/fernflower.gradle
+++ b/fernflower.gradle
@@ -3,7 +3,7 @@ apply plugin: 'maven-publish'
 apply plugin: 'eclipse'
 apply plugin: 'net.minecraftforge.gradleutils'
 
-archivesBaseName = 'forgeflower'
+archivesBaseName = 'forgeflowerlegacy'
 ext {
     CHANGELOG = rootProject.file('build/changelog.txt')
 }