Update Procyon and CFR (#515)

* Update Procyon to 0.6.0

* Update CFR to 0.2.1

3 files changed, 7 insertions, 8 deletions

diff --git a/enigma/build.gradle b/enigma/build.gradle
index 810b35db..8cbfec28 100644
--- a/enigma/build.gradle
+++ b/enigma/build.gradle
@@ -8,8 +8,8 @@ dependencies {
         implementation 'org.ow2.asm:asm-tree:9.4'
         implementation 'org.ow2.asm:asm-util:9.4'
 
-        implementation 'net.fabricmc:procyon-fabric-compilertools:0.5.35.13'
-        implementation 'net.fabricmc:cfr:0.2.0'
+        implementation 'org.bitbucket.mstrobel:procyon-compilertools:0.6.0'
+        implementation 'net.fabricmc:cfr:0.2.1'
 
         proGuard 'com.guardsquare:proguard-base:7.3.0'
 
diff --git a/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/DropVarModifiersAstTransform.java b/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/DropVarModifiersAstTransform.java
index defd2511..14b5cc09 100644
--- a/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/DropVarModifiersAstTransform.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/DropVarModifiersAstTransform.java
@@ -1,7 +1,6 @@
 package cuchaz.enigma.source.procyon.transformers;
 
-import javax.lang.model.element.Modifier;
-
+import com.strobel.assembler.metadata.Flags;
 import com.strobel.decompiler.languages.java.ast.AstNode;
 import com.strobel.decompiler.languages.java.ast.DepthFirstAstVisitor;
 import com.strobel.decompiler.languages.java.ast.EntityDeclaration;
@@ -25,7 +24,7 @@ public final class DropVarModifiersAstTransform implements IAstTransform {
                 @Override
                 public Void visitParameterDeclaration(ParameterDeclaration node, Void data) {
                         for (JavaModifierToken modifierToken : node.getChildrenByRole(EntityDeclaration.MODIFIER_ROLE)) {
-                                if (modifierToken.getModifier() == Modifier.FINAL) {
+                                if (modifierToken.getModifier() == Flags.Flag.FINAL) {
                                         modifierToken.remove();
                                 }
                         }
@@ -35,7 +34,7 @@ public final class DropVarModifiersAstTransform implements IAstTransform {
 
                 @Override
                 public Void visitVariableDeclaration(VariableDeclarationStatement node, Void data) {
-                        node.removeModifier(Modifier.FINAL);
+                        node.removeModifier(Flags.Flag.FINAL);
                         return null;
                 }
         }
diff --git a/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/ObfuscatedEnumSwitchRewriterTransform.java b/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/ObfuscatedEnumSwitchRewriterTransform.java
index 204351ec..4f34b33c 100644
--- a/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/ObfuscatedEnumSwitchRewriterTransform.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/procyon/transformers/ObfuscatedEnumSwitchRewriterTransform.java
@@ -89,7 +89,7 @@ public class ObfuscatedEnumSwitchRewriterTransform implements IAstTransform {
                 }
 
                 @Override
-                public Void visitTypeDeclaration(final TypeDeclaration typeDeclaration, final Void p) {
+                public Void visitTypeDeclarationOverride(final TypeDeclaration typeDeclaration, final Void p) {
                         final boolean oldIsSwitchMapWrapper = _isSwitchMapWrapper;
                         final TypeDefinition typeDefinition = typeDeclaration.getUserData(Keys.TYPE_DEFINITION);
                         final boolean isSwitchMapWrapper = isSwitchMapWrapper(typeDefinition);
@@ -109,7 +109,7 @@ public class ObfuscatedEnumSwitchRewriterTransform implements IAstTransform {
                         _isSwitchMapWrapper = isSwitchMapWrapper;
 
                         try {
-                                super.visitTypeDeclaration(typeDeclaration, p);
+                                super.visitTypeDeclarationOverride(typeDeclaration, p);
                         } finally {
                                 _isSwitchMapWrapper = oldIsSwitchMapWrapper;
                         }