diff --git a/deobfuscator-impl/src/test/java/uwu/narumi/deobfuscator/TestDeobfuscation.java b/deobfuscator-impl/src/test/java/uwu/narumi/deobfuscator/TestDeobfuscation.java index 249b6d24..1eb14463 100644 --- a/deobfuscator-impl/src/test/java/uwu/narumi/deobfuscator/TestDeobfuscation.java +++ b/deobfuscator-impl/src/test/java/uwu/narumi/deobfuscator/TestDeobfuscation.java @@ -2,7 +2,7 @@ import uwu.narumi.deobfuscator.core.other.composed.ComposedZelixTransformer; import uwu.narumi.deobfuscator.core.other.composed.general.ComposedGeneralFlowTransformer; -import uwu.narumi.deobfuscator.core.other.impl.clean.PeepholeCleanTransformer; +import uwu.narumi.deobfuscator.core.other.composed.general.ComposedPeepholeCleanTransformer; import uwu.narumi.deobfuscator.core.other.impl.clean.peephole.JsrInlinerTransformer; import uwu.narumi.deobfuscator.core.other.impl.pool.InlineLocalVariablesTransformer; import uwu.narumi.deobfuscator.core.other.impl.pool.InlineStaticFieldTransformer; @@ -19,7 +19,7 @@ public class TestDeobfuscation extends TestDeobfuscationBase { protected void registerAll() { register("Inlining local variables", InputType.JAVA_CODE, List.of( InlineLocalVariablesTransformer::new, - PeepholeCleanTransformer::new + ComposedPeepholeCleanTransformer::new ), Source.of("TestInlineLocalVariables")); register("Simple flow obfuscation", InputType.JAVA_CODE, List.of(ComposedGeneralFlowTransformer::new), Source.of("TestSimpleFlowObfuscation")); register("Universal Number Transformer", InputType.JAVA_CODE, List.of(UniversalNumberTransformer::new), Source.of("TestUniversalNumberTransformer")); diff --git a/deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/composed/ComposedZelixTransformer.java b/deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/composed/ComposedZelixTransformer.java index 92dfb1a5..0e04ac73 100644 --- a/deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/composed/ComposedZelixTransformer.java +++ b/deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/composed/ComposedZelixTransformer.java @@ -1,7 +1,7 @@ package uwu.narumi.deobfuscator.core.other.composed; import uwu.narumi.deobfuscator.api.transformer.ComposedTransformer; -import uwu.narumi.deobfuscator.core.other.impl.clean.PeepholeCleanTransformer; +import uwu.narumi.deobfuscator.core.other.composed.general.ComposedPeepholeCleanTransformer; import uwu.narumi.deobfuscator.core.other.impl.clean.peephole.JsrInlinerTransformer; import uwu.narumi.deobfuscator.core.other.impl.pool.InlineStaticFieldTransformer; import uwu.narumi.deobfuscator.core.other.impl.universal.RecoverSyntheticsTransformer; @@ -39,7 +39,7 @@ public ComposedZelixTransformer(Map classInitializationOrder) { UniversalNumberTransformer::new, // Cleanup - PeepholeCleanTransformer::new + ComposedPeepholeCleanTransformer::new ); } } diff --git a/deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/composed/general/ComposedGeneralCleanTransformer.java b/deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/composed/general/ComposedGeneralCleanTransformer.java deleted file mode 100644 index 5c146993..00000000 --- a/deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/composed/general/ComposedGeneralCleanTransformer.java +++ /dev/null @@ -1,23 +0,0 @@ -package uwu.narumi.deobfuscator.core.other.composed.general; - -import uwu.narumi.deobfuscator.api.transformer.ComposedTransformer; -import uwu.narumi.deobfuscator.core.other.impl.clean.*; -import uwu.narumi.deobfuscator.core.other.impl.clean.peephole.NopCleanTransformer; -import uwu.narumi.deobfuscator.core.other.impl.clean.peephole.UnUsedLabelCleanTransformer; -import uwu.narumi.deobfuscator.core.other.impl.universal.TryCatchRepairTransformer; - -public class ComposedGeneralCleanTransformer extends ComposedTransformer { - - public ComposedGeneralCleanTransformer() { - super( - AnnotationCleanTransformer::new, - ClassDebugInfoCleanTransformer::new, - LineNumberCleanTransformer::new, - MethodDebugInfoCleanTransformer::new, - NopCleanTransformer::new, - TryCatchRepairTransformer::new, - UnknownAttributeCleanTransformer::new, - UnUsedLabelCleanTransformer::new - ); - } -} diff --git a/deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/composed/general/ComposedGeneralFlowTransformer.java b/deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/composed/general/ComposedGeneralFlowTransformer.java index 2ec0cf96..e12a956c 100644 --- a/deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/composed/general/ComposedGeneralFlowTransformer.java +++ b/deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/composed/general/ComposedGeneralFlowTransformer.java @@ -2,7 +2,6 @@ import uwu.narumi.deobfuscator.api.transformer.ComposedTransformer; import uwu.narumi.deobfuscator.core.other.impl.clean.InvalidMethodCleanTransformer; -import uwu.narumi.deobfuscator.core.other.impl.clean.PeepholeCleanTransformer; import uwu.narumi.deobfuscator.core.other.impl.pool.InlineLocalVariablesTransformer; import uwu.narumi.deobfuscator.core.other.impl.pool.InlineStaticFieldTransformer; import uwu.narumi.deobfuscator.core.other.impl.universal.UniversalFlowTransformer; @@ -20,7 +19,7 @@ public ComposedGeneralFlowTransformer() { UniversalFlowTransformer::new, // Clean up garbage - PeepholeCleanTransformer::new + ComposedPeepholeCleanTransformer::new ); } } diff --git a/deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/composed/general/ComposedGeneralRepairTransformer.java b/deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/composed/general/ComposedGeneralRepairTransformer.java index 345adade..588fcd5f 100644 --- a/deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/composed/general/ComposedGeneralRepairTransformer.java +++ b/deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/composed/general/ComposedGeneralRepairTransformer.java @@ -2,7 +2,6 @@ import uwu.narumi.deobfuscator.api.transformer.ComposedTransformer; import uwu.narumi.deobfuscator.core.other.impl.clean.ClassDebugInfoCleanTransformer; -import uwu.narumi.deobfuscator.core.other.impl.clean.LocalVariableNamesCleanTransformer; import uwu.narumi.deobfuscator.core.other.impl.clean.MethodDebugInfoCleanTransformer; import uwu.narumi.deobfuscator.core.other.impl.clean.SignatureCleanTransformer; import uwu.narumi.deobfuscator.core.other.impl.clean.UnknownAttributeCleanTransformer; @@ -10,6 +9,9 @@ import uwu.narumi.deobfuscator.core.other.impl.universal.AnnotationFilterTransformer; import uwu.narumi.deobfuscator.core.other.impl.universal.TryCatchRepairTransformer; +/** + * If methods are hidden from decompiler, or something uncommon happen, then this transformer will try to fix it. + */ public class ComposedGeneralRepairTransformer extends ComposedTransformer { public ComposedGeneralRepairTransformer() { diff --git a/deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/impl/clean/PeepholeCleanTransformer.java b/deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/composed/general/ComposedPeepholeCleanTransformer.java similarity index 86% rename from deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/impl/clean/PeepholeCleanTransformer.java rename to deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/composed/general/ComposedPeepholeCleanTransformer.java index 10fb16be..d7505156 100644 --- a/deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/impl/clean/PeepholeCleanTransformer.java +++ b/deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/composed/general/ComposedPeepholeCleanTransformer.java @@ -1,4 +1,4 @@ -package uwu.narumi.deobfuscator.core.other.impl.clean; +package uwu.narumi.deobfuscator.core.other.composed.general; import uwu.narumi.deobfuscator.api.transformer.ComposedTransformer; import uwu.narumi.deobfuscator.core.other.impl.clean.peephole.DeadCodeCleanTransformer; @@ -11,9 +11,9 @@ /** * A transformer that cleans up garbage instructions. */ -public class PeepholeCleanTransformer extends ComposedTransformer { +public class ComposedPeepholeCleanTransformer extends ComposedTransformer { - public PeepholeCleanTransformer() { + public ComposedPeepholeCleanTransformer() { super( // Remove dead code DeadCodeCleanTransformer::new,