From 717d14b489dbb030935f0747edadf3c3cd9be679 Mon Sep 17 00:00:00 2001 From: Graham Date: Thu, 6 Aug 2020 09:03:48 +0100 Subject: [PATCH] Rename DeobfuscatorMapModule to DeobfuscatorUtilModule Signed-off-by: Graham --- .../openrs2/deob/processor/DeobfuscatorProcessorModule.kt | 4 ++-- .../DeobfuscatorMapModule.kt => DeobfuscatorUtilModule.kt} | 6 ++++-- deob/src/main/java/dev/openrs2/deob/DeobfuscatorModule.kt | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) rename deob-util/src/main/java/dev/openrs2/deob/util/{map/DeobfuscatorMapModule.kt => DeobfuscatorUtilModule.kt} (63%) diff --git a/deob-processor/src/main/java/dev/openrs2/deob/processor/DeobfuscatorProcessorModule.kt b/deob-processor/src/main/java/dev/openrs2/deob/processor/DeobfuscatorProcessorModule.kt index 69f70c256c..2ca07ba44f 100644 --- a/deob-processor/src/main/java/dev/openrs2/deob/processor/DeobfuscatorProcessorModule.kt +++ b/deob-processor/src/main/java/dev/openrs2/deob/processor/DeobfuscatorProcessorModule.kt @@ -1,12 +1,12 @@ package dev.openrs2.deob.processor import com.google.inject.AbstractModule -import dev.openrs2.deob.util.map.DeobfuscatorMapModule +import dev.openrs2.deob.util.DeobfuscatorUtilModule import dev.openrs2.yaml.YamlModule object DeobfuscatorProcessorModule : AbstractModule() { override fun configure() { - install(DeobfuscatorMapModule) + install(DeobfuscatorUtilModule) install(YamlModule) } } diff --git a/deob-util/src/main/java/dev/openrs2/deob/util/map/DeobfuscatorMapModule.kt b/deob-util/src/main/java/dev/openrs2/deob/util/DeobfuscatorUtilModule.kt similarity index 63% rename from deob-util/src/main/java/dev/openrs2/deob/util/map/DeobfuscatorMapModule.kt rename to deob-util/src/main/java/dev/openrs2/deob/util/DeobfuscatorUtilModule.kt index f63ed0a209..c7b191ecc6 100644 --- a/deob-util/src/main/java/dev/openrs2/deob/util/map/DeobfuscatorMapModule.kt +++ b/deob-util/src/main/java/dev/openrs2/deob/util/DeobfuscatorUtilModule.kt @@ -1,10 +1,12 @@ -package dev.openrs2.deob.util.map +package dev.openrs2.deob.util import com.google.inject.AbstractModule import com.google.inject.Scopes import dev.openrs2.asm.AsmModule +import dev.openrs2.deob.util.map.NameMap +import dev.openrs2.deob.util.map.NameMapProvider -object DeobfuscatorMapModule : AbstractModule() { +object DeobfuscatorUtilModule : AbstractModule() { override fun configure() { install(AsmModule) diff --git a/deob/src/main/java/dev/openrs2/deob/DeobfuscatorModule.kt b/deob/src/main/java/dev/openrs2/deob/DeobfuscatorModule.kt index 2b37059494..247fde060e 100644 --- a/deob/src/main/java/dev/openrs2/deob/DeobfuscatorModule.kt +++ b/deob/src/main/java/dev/openrs2/deob/DeobfuscatorModule.kt @@ -35,12 +35,12 @@ import dev.openrs2.deob.transform.UnusedArgTransformer import dev.openrs2.deob.transform.UnusedLocalTransformer import dev.openrs2.deob.transform.UnusedMethodTransformer import dev.openrs2.deob.transform.VisibilityTransformer -import dev.openrs2.deob.util.map.DeobfuscatorMapModule +import dev.openrs2.deob.util.DeobfuscatorUtilModule object DeobfuscatorModule : AbstractModule() { override fun configure() { install(BundlerModule) - install(DeobfuscatorMapModule) + install(DeobfuscatorUtilModule) bind(Profile::class.java) .toProvider(ProfileProvider::class.java)