diff --git a/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/creator/SkidFlowGraphDumper.java b/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/creator/SkidFlowGraphDumper.java index 4798fbd5..170786b1 100644 --- a/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/creator/SkidFlowGraphDumper.java +++ b/dev.skidfuscator.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/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/exempt/ExclusionHelper.java b/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/exempt/ExclusionHelper.java index 471406a4..92d89db7 100644 --- a/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/exempt/ExclusionHelper.java +++ b/dev.skidfuscator.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/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/transform/AbstractTransformer.java b/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/transform/AbstractTransformer.java index b5035a7f..6d1393d6 100644 --- a/dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obfuscator/transform/AbstractTransformer.java +++ b/dev.skidfuscator.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 children) { this.skidfuscator = skidfuscator; this.name = name;