Fix naming of Module constants

Signed-off-by: Graham <gpe@openrs2.dev>
pull/132/head
Graham 4 years ago
parent 717d14b489
commit 1833221bc8
  1. 2
      decompiler/src/main/java/dev/openrs2/decompiler/DecompileCommand.kt
  2. 2
      deob-ast/src/main/java/dev/openrs2/deob/ast/DeobfuscateAstCommand.kt
  3. 14
      deob-util/src/main/java/dev/openrs2/deob/util/Module.kt

@ -7,7 +7,7 @@ fun main(args: Array<String>) = DecompileCommand().main(args)
class DecompileCommand : CliktCommand(name = "decompile") { class DecompileCommand : CliktCommand(name = "decompile") {
override fun run() { override fun run() {
val decompiler = Decompiler(Module.all) val decompiler = Decompiler(Module.ALL)
decompiler.run() decompiler.run()
} }
} }

@ -10,6 +10,6 @@ class DeobfuscateAstCommand : CliktCommand(name = "deob-ast") {
override fun run() { override fun run() {
val injector = Guice.createInjector(AstDeobfuscatorModule) val injector = Guice.createInjector(AstDeobfuscatorModule)
val deobfuscator = injector.getInstance(AstDeobfuscator::class.java) val deobfuscator = injector.getInstance(AstDeobfuscator::class.java)
deobfuscator.run(Module.all) deobfuscator.run(Module.ALL)
} }
} }

@ -9,13 +9,13 @@ class Module(val name: String, val dependencies: Set<Module> = emptySet()) {
val transitiveDependencies: Set<Module> = dependencies.plus(dependencies.flatMap { it.transitiveDependencies }) val transitiveDependencies: Set<Module> = dependencies.plus(dependencies.flatMap { it.transitiveDependencies })
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)
} }
} }

Loading…
Cancel
Save