Rename signlink to signLink for consistency

Signed-off-by: Graham <gpe@openrs2.dev>
Graham 5 years ago
parent 9331e78bba
commit f4d8b29747
  1. 8
      deob-util/src/main/java/dev/openrs2/deob/util/Module.kt
  2. 18
      deob/src/main/java/dev/openrs2/deob/Deobfuscator.kt

@ -10,12 +10,12 @@ class Module(val name: String, val dependencies: Set<Module> = emptySet()) {
companion object { companion object {
private val gl = Module("gl") private val gl = Module("gl")
private val signlink = Module("signlink") private val signLink = Module("signlink")
private val unpack = Module("unpack") private val unpack = Module("unpack")
private val client = Module("client", setOf(gl, signlink)) private val client = Module("client", setOf(gl, signLink))
private val loader = Module("loader", setOf(signlink, unpack)) private val loader = Module("loader", setOf(signLink, unpack))
private val unpackClass = Module("unpackclass", setOf(unpack)) private val unpackClass = Module("unpackclass", setOf(unpack))
val all = setOf(client, gl, loader, signlink, unpack, unpackClass) val all = setOf(client, gl, loader, signLink, unpack, unpackClass)
} }
} }

@ -28,8 +28,8 @@ class Deobfuscator @Inject constructor(
// overwrite client's classes with signed classes from the loader // overwrite client's classes with signed classes from the loader
logger.info { "Moving signed classes from loader to signlink" } logger.info { "Moving signed classes from loader to signlink" }
val signlink = Library("signlink") val signLink = Library("signlink")
SignedClassUtils.move(loader, client, signlink) SignedClassUtils.move(loader, client, signLink)
// move unpack class out of the loader (so the unpacker and loader can both depend on it) // move unpack class out of the loader (so the unpacker and loader can both depend on it)
logger.info { "Moving unpack from loader to unpack" } logger.info { "Moving unpack from loader to unpack" }
@ -64,17 +64,17 @@ class Deobfuscator @Inject constructor(
* different sets of fields/methods, presumably as a result of the * different sets of fields/methods, presumably as a result of the
* obfuscator removing unused code.) * obfuscator removing unused code.)
*/ */
val clientRemapper = ClassNamePrefixRemapper(client, gl, signlink) val clientRemapper = ClassNamePrefixRemapper(client, gl, signLink)
val glRemapper = ClassNamePrefixRemapper(gl) val glRemapper = ClassNamePrefixRemapper(gl)
val loaderRemapper = ClassNamePrefixRemapper(loader, signlink, unpack) val loaderRemapper = ClassNamePrefixRemapper(loader, signLink, unpack)
val signlinkRemapper = ClassNamePrefixRemapper(signlink) val signLinkRemapper = ClassNamePrefixRemapper(signLink)
val unpackClassRemapper = ClassNamePrefixRemapper(unpackClass, unpack) val unpackClassRemapper = ClassNamePrefixRemapper(unpackClass, unpack)
val unpackRemapper = ClassNamePrefixRemapper(unpack) val unpackRemapper = ClassNamePrefixRemapper(unpack)
client.remap(clientRemapper) client.remap(clientRemapper)
gl.remap(glRemapper) gl.remap(glRemapper)
loader.remap(loaderRemapper) loader.remap(loaderRemapper)
signlink.remap(signlinkRemapper) signLink.remap(signLinkRemapper)
unpack.remap(unpackRemapper) unpack.remap(unpackRemapper)
unpackClass.remap(unpackClassRemapper) unpackClass.remap(unpackClassRemapper)
@ -83,7 +83,7 @@ class Deobfuscator @Inject constructor(
val classPath = ClassPath( val classPath = ClassPath(
runtime, runtime,
dependencies = emptyList(), dependencies = emptyList(),
libraries = listOf(client, gl, loader, signlink, unpack, unpackClass) libraries = listOf(client, gl, loader, signLink, unpack, unpackClass)
) )
// deobfuscate // deobfuscate
@ -97,7 +97,7 @@ class Deobfuscator @Inject constructor(
client.remap(StripClassNamePrefixRemapper) client.remap(StripClassNamePrefixRemapper)
gl.remap(StripClassNamePrefixRemapper) gl.remap(StripClassNamePrefixRemapper)
loader.remap(StripClassNamePrefixRemapper) loader.remap(StripClassNamePrefixRemapper)
signlink.remap(StripClassNamePrefixRemapper) signLink.remap(StripClassNamePrefixRemapper)
unpack.remap(StripClassNamePrefixRemapper) unpack.remap(StripClassNamePrefixRemapper)
unpackClass.remap(StripClassNamePrefixRemapper) unpackClass.remap(StripClassNamePrefixRemapper)
@ -109,7 +109,7 @@ class Deobfuscator @Inject constructor(
client.write(output.resolve("client.jar"), JarLibraryWriter, classPath) client.write(output.resolve("client.jar"), JarLibraryWriter, classPath)
gl.write(output.resolve("gl.jar"), JarLibraryWriter, classPath) gl.write(output.resolve("gl.jar"), JarLibraryWriter, classPath)
loader.write(output.resolve("loader.jar"), JarLibraryWriter, classPath) loader.write(output.resolve("loader.jar"), JarLibraryWriter, classPath)
signlink.write(output.resolve("signlink.jar"), JarLibraryWriter, classPath) signLink.write(output.resolve("signlink.jar"), JarLibraryWriter, classPath)
unpack.write(output.resolve("unpack.jar"), JarLibraryWriter, classPath) unpack.write(output.resolve("unpack.jar"), JarLibraryWriter, classPath)
unpackClass.write(output.resolve("unpackclass.jar"), JarLibraryWriter, classPath) unpackClass.write(output.resolve("unpackclass.jar"), JarLibraryWriter, classPath)
} }

Loading…
Cancel
Save