replace ComposedGeneralCleanTransformer in favor of ComposedPeepholeC…

…leanTransformer
narumii · Sep 24, 2024 · da92448 · da92448
1 parent 4318c48
commit da92448
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 33 deletions.
diff --git 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/...s/src/main/java/uwu/narumi/deobfuscator/core/other/composed/ComposedZelixTransformer.java b/...s/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<String, String> classInitializationOrder) {
         UniversalNumberTransformer::new,
 
         // Cleanup
-        PeepholeCleanTransformer::new
+        ComposedPeepholeCleanTransformer::new
     );
   }
 }
diff --git a/.../uwu/narumi/deobfuscator/core/other/composed/general/ComposedGeneralCleanTransformer.java b/.../uwu/narumi/deobfuscator/core/other/composed/general/ComposedGeneralCleanTransformer.java
diff --git a/...a/uwu/narumi/deobfuscator/core/other/composed/general/ComposedGeneralFlowTransformer.java b/...a/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/...uwu/narumi/deobfuscator/core/other/composed/general/ComposedGeneralRepairTransformer.java b/...uwu/narumi/deobfuscator/core/other/composed/general/ComposedGeneralRepairTransformer.java
@@ -2,14 +2,16 @@
 
 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;
 import uwu.narumi.deobfuscator.core.other.impl.universal.AccessRepairTransformer;
 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/.../impl/clean/PeepholeCleanTransformer.java → ...ral/ComposedPeepholeCleanTransformer.java b/.../impl/clean/PeepholeCleanTransformer.java → ...ral/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,