various fixes

skidfuscatordev · Nov 16, 2022 · 40dd99b · 40dd99b
1 parent 9e6b1eb
commit 40dd99b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/...tor.obfuscator/src/main/java/dev/skidfuscator/obfuscator/creator/SkidFlowGraphDumper.java b/...tor.obfuscator/src/main/java/dev/skidfuscator/obfuscator/creator/SkidFlowGraphDumper.java
@@ -55,7 +55,7 @@ public class SkidFlowGraphDumper implements BytecodeFrontend {
 
 	private int beginIndex;
 
-	public static boolean TEST_COMPUTE = true;
+	public static boolean TEST_COMPUTE = false;
 
 	public SkidFlowGraphDumper(Skidfuscator skidfuscator, ControlFlowGraph cfg, MethodNode m) {
 		this.skidfuscator = skidfuscator;

diff --git a/...fuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/exempt/ExclusionHelper.java b/...fuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/exempt/ExclusionHelper.java
@@ -78,12 +78,9 @@ public boolean test(ClassNode var) {
                                             .match("private", var.isPrivate())
                                             .check();
 
-                                    if (!initialMatch) {
-                                        System.out.println("Oh?");
-                                    }
 
                                     return initialMatch
-                                            && regex.matcher(var.getName()).find();
+                                            && (regex.matcher(var.getName()).find() || parsed.equals(var.getName()));
                                 }
                             });
 
@@ -116,7 +113,7 @@ public boolean test(MethodNode var) {
                                         return false;
                                     }
 
-                                    return regexMethod.matcher(var.getName()).find();
+                                    return regexMethod.matcher(var.getName()).find() || parsed.equals(var.getName());
                                             //&& regexClazz.matcher(var.owner.getDisplayName()).matches();
                                 }
 

diff --git a/...r.obfuscator/src/main/java/dev/skidfuscator/obfuscator/transform/AbstractTransformer.java b/...r.obfuscator/src/main/java/dev/skidfuscator/obfuscator/transform/AbstractTransformer.java
@@ -14,7 +14,6 @@ public AbstractTransformer(Skidfuscator skidfuscator, String name) {
         this(skidfuscator, name, Collections.emptyList());
     }
 
-
     public AbstractTransformer(Skidfuscator skidfuscator, String name, List<Transformer> children) {
         this.skidfuscator = skidfuscator;
         this.name = name;