From 0d4daca1a1064b9feb23c7e187013debaae7e32e Mon Sep 17 00:00:00 2001 From: Graham Date: Sun, 3 May 2020 12:03:49 +0100 Subject: [PATCH] Add deob-map dependency to the deobfuscator Signed-off-by: Graham --- deob/build.gradle.kts | 1 + deob/src/main/java/dev/openrs2/deob/DeobfuscatorModule.kt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/deob/build.gradle.kts b/deob/build.gradle.kts index cf2c8b1760..2eb4f3f8a7 100644 --- a/deob/build.gradle.kts +++ b/deob/build.gradle.kts @@ -13,6 +13,7 @@ dependencies { implementation(project(":bundler")) implementation(project(":deob-annotations")) + implementation(project(":deob-map")) implementation("com.google.guava:guava:${Versions.guava}") implementation("it.unimi.dsi:fastutil:${Versions.fastutil}") implementation("org.jgrapht:jgrapht-core:${Versions.jgrapht}") diff --git a/deob/src/main/java/dev/openrs2/deob/DeobfuscatorModule.kt b/deob/src/main/java/dev/openrs2/deob/DeobfuscatorModule.kt index 4788819040..7f91852ff6 100644 --- a/deob/src/main/java/dev/openrs2/deob/DeobfuscatorModule.kt +++ b/deob/src/main/java/dev/openrs2/deob/DeobfuscatorModule.kt @@ -5,6 +5,7 @@ import com.google.inject.multibindings.Multibinder import dev.openrs2.asm.transform.Transformer import dev.openrs2.bundler.BundlerModule import dev.openrs2.bundler.transform.ResourceTransformer +import dev.openrs2.deob.map.DeobfuscatorMapModule import dev.openrs2.deob.transform.BitShiftTransformer import dev.openrs2.deob.transform.BitwiseOpTransformer import dev.openrs2.deob.transform.BundlerTransformer @@ -37,6 +38,7 @@ import dev.openrs2.deob.transform.VisibilityTransformer object DeobfuscatorModule : AbstractModule() { override fun configure() { install(BundlerModule) + install(DeobfuscatorMapModule) val binder = Multibinder.newSetBinder(binder(), Transformer::class.java, DeobfuscatorQualifier::class.java) binder.addBinding().to(OriginalPcSaveTransformer::class.java)