Rename deob-map to deob-util

Signed-off-by: Graham <gpe@openrs2.dev>
Graham 4 years ago
parent 3a70333380
commit 35e4e035ef
  1. 2
      deob-processor/build.gradle.kts
  2. 2
      deob-processor/src/main/java/dev/openrs2/deob/processor/DeobfuscatorProcessorModule.kt
  3. 6
      deob-processor/src/main/java/dev/openrs2/deob/processor/NameMapProcessor.kt
  4. 5
      deob-util/build.gradle.kts
  5. 2
      deob-util/src/main/java/dev/openrs2/deob/util/map/DeobfuscatorMapModule.kt
  6. 2
      deob-util/src/main/java/dev/openrs2/deob/util/map/Field.kt
  7. 2
      deob-util/src/main/java/dev/openrs2/deob/util/map/Method.kt
  8. 2
      deob-util/src/main/java/dev/openrs2/deob/util/map/NameMap.kt
  9. 2
      deob-util/src/main/java/dev/openrs2/deob/util/map/NameMapProvider.kt
  10. 2
      deob/build.gradle.kts
  11. 2
      deob/src/main/java/dev/openrs2/deob/DeobfuscatorModule.kt
  12. 2
      deob/src/main/java/dev/openrs2/deob/remap/ClassMappingGenerator.kt
  13. 2
      deob/src/main/java/dev/openrs2/deob/remap/FieldMappingGenerator.kt
  14. 2
      deob/src/main/java/dev/openrs2/deob/remap/MethodMappingGenerator.kt
  15. 2
      deob/src/main/java/dev/openrs2/deob/remap/StaticFieldUnscrambler.kt
  16. 2
      deob/src/main/java/dev/openrs2/deob/remap/StaticMethodUnscrambler.kt
  17. 2
      deob/src/main/java/dev/openrs2/deob/remap/TypedRemapper.kt
  18. 2
      deob/src/main/java/dev/openrs2/deob/transform/RemapTransformer.kt
  19. 2
      settings.gradle.kts

@ -5,7 +5,7 @@ plugins {
dependencies {
implementation(project(":deob-annotations"))
implementation(project(":deob-map"))
implementation(project(":deob-util"))
implementation(project(":yaml"))
}

@ -1,7 +1,7 @@
package dev.openrs2.deob.processor
import com.google.inject.AbstractModule
import dev.openrs2.deob.map.DeobfuscatorMapModule
import dev.openrs2.deob.util.map.DeobfuscatorMapModule
import dev.openrs2.yaml.YamlModule
object DeobfuscatorProcessorModule : AbstractModule() {

@ -8,9 +8,9 @@ import dev.openrs2.asm.toInternalClassName
import dev.openrs2.deob.annotation.OriginalArg
import dev.openrs2.deob.annotation.OriginalClass
import dev.openrs2.deob.annotation.OriginalMember
import dev.openrs2.deob.map.Field
import dev.openrs2.deob.map.Method
import dev.openrs2.deob.map.NameMap
import dev.openrs2.deob.util.map.Field
import dev.openrs2.deob.util.map.Method
import dev.openrs2.deob.util.map.NameMap
import dev.openrs2.util.io.useAtomicBufferedWriter
import java.nio.file.Files
import java.nio.file.Path

@ -13,11 +13,10 @@ publishing {
pom {
packaging = "jar"
name.set("OpenRS2 Deobfuscator Map")
name.set("OpenRS2 Deobfuscator Utilities")
description.set(
"""
Data structures for representing a map of obfuscated to
refactored names.
Common utility code used by all deobfuscator modules.
""".trimIndent()
)
}

@ -1,4 +1,4 @@
package dev.openrs2.deob.map
package dev.openrs2.deob.util.map
import com.google.inject.AbstractModule
import com.google.inject.Scopes

@ -1,3 +1,3 @@
package dev.openrs2.deob.map
package dev.openrs2.deob.util.map
data class Field(val owner: String, val name: String)

@ -1,4 +1,4 @@
package dev.openrs2.deob.map
package dev.openrs2.deob.util.map
import java.util.SortedMap

@ -1,4 +1,4 @@
package dev.openrs2.deob.map
package dev.openrs2.deob.util.map
import dev.openrs2.asm.MemberRef
import dev.openrs2.util.collect.DisjointSet

@ -1,4 +1,4 @@
package dev.openrs2.deob.map
package dev.openrs2.deob.util.map
import com.fasterxml.jackson.databind.ObjectMapper
import java.nio.file.Files

@ -13,7 +13,7 @@ dependencies {
implementation(project(":bundler"))
implementation(project(":deob-annotations"))
implementation(project(":deob-map"))
implementation(project(":deob-util"))
implementation("com.google.guava:guava:${Versions.guava}")
implementation("it.unimi.dsi:fastutil:${Versions.fastutil}")
implementation("org.jgrapht:jgrapht-core:${Versions.jgrapht}")

@ -6,7 +6,6 @@ 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
@ -35,6 +34,7 @@ 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
object DeobfuscatorModule : AbstractModule() {
override fun configure() {

@ -3,7 +3,7 @@ package dev.openrs2.deob.remap
import dev.openrs2.asm.classpath.ClassMetadata
import dev.openrs2.asm.classpath.ClassPath
import dev.openrs2.asm.filter.ClassFilter
import dev.openrs2.deob.map.NameMap
import dev.openrs2.deob.util.map.NameMap
import org.objectweb.asm.Opcodes
class ClassMappingGenerator(

@ -3,7 +3,7 @@ package dev.openrs2.deob.remap
import dev.openrs2.asm.MemberRef
import dev.openrs2.asm.classpath.ClassPath
import dev.openrs2.asm.filter.MemberFilter
import dev.openrs2.deob.map.NameMap
import dev.openrs2.deob.util.map.NameMap
import dev.openrs2.util.collect.DisjointSet
import dev.openrs2.util.indefiniteArticle
import org.objectweb.asm.Type

@ -4,7 +4,7 @@ import dev.openrs2.asm.MemberDesc
import dev.openrs2.asm.MemberRef
import dev.openrs2.asm.classpath.ClassPath
import dev.openrs2.asm.filter.MemberFilter
import dev.openrs2.deob.map.NameMap
import dev.openrs2.deob.util.map.NameMap
import dev.openrs2.util.collect.DisjointSet
import org.objectweb.asm.Opcodes

@ -6,7 +6,7 @@ import dev.openrs2.asm.classpath.ClassPath
import dev.openrs2.asm.filter.MemberFilter
import dev.openrs2.asm.getExpression
import dev.openrs2.asm.isSequential
import dev.openrs2.deob.map.NameMap
import dev.openrs2.deob.util.map.NameMap
import dev.openrs2.util.collect.DisjointSet
import org.objectweb.asm.Opcodes
import org.objectweb.asm.tree.AbstractInsnNode

@ -3,7 +3,7 @@ package dev.openrs2.deob.remap
import dev.openrs2.asm.MemberRef
import dev.openrs2.asm.classpath.ClassPath
import dev.openrs2.asm.filter.MemberFilter
import dev.openrs2.deob.map.NameMap
import dev.openrs2.deob.util.map.NameMap
import dev.openrs2.util.collect.DisjointSet
import org.objectweb.asm.Opcodes

@ -7,7 +7,7 @@ import dev.openrs2.asm.classpath.ExtendedRemapper
import dev.openrs2.asm.filter.UnionMemberFilter
import dev.openrs2.deob.Profile
import dev.openrs2.deob.filter.BrowserControlFilter
import dev.openrs2.deob.map.NameMap
import dev.openrs2.deob.util.map.NameMap
import dev.openrs2.util.collect.DisjointSet
import org.objectweb.asm.tree.AbstractInsnNode

@ -3,8 +3,8 @@ package dev.openrs2.deob.transform
import dev.openrs2.asm.classpath.ClassPath
import dev.openrs2.asm.transform.Transformer
import dev.openrs2.deob.Profile
import dev.openrs2.deob.map.NameMap
import dev.openrs2.deob.remap.TypedRemapper
import dev.openrs2.deob.util.map.NameMap
import javax.inject.Inject
import javax.inject.Singleton

@ -13,8 +13,8 @@ include(
"deob",
"deob-annotations",
"deob-ast",
"deob-map",
"deob-processor",
"deob-util",
"game",
"nonfree",
"nonfree:client",

Loading…
Cancel
Save