From 0bd10234b831ceb519b413be8875bc315d364691 Mon Sep 17 00:00:00 2001 From: Graham Date: Sat, 30 May 2020 21:29:57 +0100 Subject: [PATCH] Run RemapTransformer as early as possible The aim of this change is to ensure that the automatically chosen class, field and method names stay as similar as possible between runs. Signed-off-by: Graham --- deob/src/main/java/dev/openrs2/deob/DeobfuscatorModule.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deob/src/main/java/dev/openrs2/deob/DeobfuscatorModule.kt b/deob/src/main/java/dev/openrs2/deob/DeobfuscatorModule.kt index cbde7517..f1896c8f 100644 --- a/deob/src/main/java/dev/openrs2/deob/DeobfuscatorModule.kt +++ b/deob/src/main/java/dev/openrs2/deob/DeobfuscatorModule.kt @@ -47,6 +47,9 @@ object DeobfuscatorModule : AbstractModule() { val binder = Multibinder.newSetBinder(binder(), Transformer::class.java, DeobfuscatorQualifier::class.java) binder.addBinding().to(OriginalPcSaveTransformer::class.java) binder.addBinding().to(OriginalNameTransformer::class.java) + binder.addBinding().to(ClassLiteralTransformer::class.java) + binder.addBinding().to(InvokeSpecialTransformer::class.java) + binder.addBinding().to(RemapTransformer::class.java) binder.addBinding().to(BundlerTransformer::class.java) binder.addBinding().to(ResourceTransformer::class.java) binder.addBinding().to(OpaquePredicateTransformer::class.java) @@ -56,9 +59,6 @@ object DeobfuscatorModule : AbstractModule() { binder.addBinding().to(CanvasTransformer::class.java) binder.addBinding().to(FieldOrderTransformer::class.java) binder.addBinding().to(BitwiseOpTransformer::class.java) - binder.addBinding().to(ClassLiteralTransformer::class.java) - binder.addBinding().to(InvokeSpecialTransformer::class.java) - binder.addBinding().to(RemapTransformer::class.java) binder.addBinding().to(ConstantArgTransformer::class.java) binder.addBinding().to(UnusedLocalTransformer::class.java) binder.addBinding().to(UnusedMethodTransformer::class.java)