Rename deob to deob-bytecode

This is in preparation for adding a new deob module which invokes the bytecode deobfuscator, decompiler and AST deobfuscator in turn. Signed-off-by: Graham <gpe@openrs2.org>
4 years ago · 3cb7ee13f9
parent ded1d99924
commit 3cb7ee13f9
73 changed files with 155 additions and 155 deletions
--- a/.idea/runConfigurations/BytecodeDeobfuscator.xml
+++ b/.idea/runConfigurations/BytecodeDeobfuscator.xml
@ -1,12 +1,12 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Deobfuscator" type="JetRunConfigurationType">
-    <module name="openrs2.deob.main" />
+  <configuration default="false" name="BytecodeDeobfuscator" type="JetRunConfigurationType">
+    <module name="openrs2.deob-bytecode.main" />
    <option name="VM_PARAMETERS" value="" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" />
    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="MAIN_CLASS_NAME" value="org.openrs2.deob.DeobfuscateCommandKt" />
+    <option name="MAIN_CLASS_NAME" value="org.openrs2.deob.bytecode.DeobfuscateBytecodeCommandKt" />
    <option name="WORKING_DIRECTORY" value="" />
    <method v="2">
      <option name="Make" enabled="true" />
--- a/all/build.gradle.kts
+++ b/all/build.gradle.kts
@ -19,8 +19,8 @@ dependencies {
    implementation(project(":compress-cli"))
    implementation(project(":crc32"))
    implementation(project(":decompiler"))
-    implementation(project(":deob"))
    implementation(project(":deob-ast"))
+    implementation(project(":deob-bytecode"))
    implementation(project(":game"))
    implementation(project(":patcher"))
 }
--- a/all/src/main/kotlin/org/openrs2/Command.kt
+++ b/all/src/main/kotlin/org/openrs2/Command.kt
@ -6,8 +6,8 @@ import org.openrs2.archive.ArchiveCommand
 import org.openrs2.compress.cli.CompressCommand
 import org.openrs2.crc32.Crc32Command
 import org.openrs2.decompiler.DecompileCommand
-import org.openrs2.deob.DeobfuscateCommand
 import org.openrs2.deob.ast.DeobfuscateAstCommand
+import org.openrs2.deob.bytecode.DeobfuscateBytecodeCommand
 import org.openrs2.game.GameCommand
 import org.openrs2.patcher.PatchCommand

@ -20,8 +20,8 @@ public class Command : NoOpCliktCommand(name = "openrs2") {
            CompressCommand(),
            Crc32Command(),
            DecompileCommand(),
-            DeobfuscateCommand(),
            DeobfuscateAstCommand(),
+            DeobfuscateBytecodeCommand(),
            GameCommand(),
            PatchCommand()
        )
--- a/deob-bytecode/build.gradle.kts
+++ b/deob-bytecode/build.gradle.kts
@ -5,7 +5,7 @@ plugins {
 }

 application {
-    mainClass.set("org.openrs2.deob.DeobfuscateCommandKt")
+    mainClass.set("org.openrs2.deob.bytecode.DeobfuscateBytecodeCommandKt")
 }

 dependencies {
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/ArgPartition.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/ArgPartition.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob
+package org.openrs2.deob.bytecode

 import org.openrs2.asm.MemberRef
 import org.openrs2.util.collect.DisjointSet
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/ArgRef.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/ArgRef.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob
+package org.openrs2.deob.bytecode

 import org.openrs2.asm.MemberRef

--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/BytecodeDeobfuscator.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/BytecodeDeobfuscator.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob
+package org.openrs2.deob.bytecode

 import com.github.michaelbull.logging.InlineLogger
 import org.openrs2.asm.classpath.ClassPath
@ -7,15 +7,15 @@ import org.openrs2.asm.io.JarLibraryReader
 import org.openrs2.asm.io.JarLibraryWriter
 import org.openrs2.asm.io.Pack200LibraryReader
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.deob.remap.ClassNamePrefixRemapper
-import org.openrs2.deob.remap.StripClassNamePrefixRemapper
+import org.openrs2.deob.bytecode.remap.ClassNamePrefixRemapper
+import org.openrs2.deob.bytecode.remap.StripClassNamePrefixRemapper
 import java.nio.file.Files
 import java.nio.file.Path
 import javax.inject.Inject
 import javax.inject.Singleton

@Singleton
-public class Deobfuscator @Inject constructor(
+public class BytecodeDeobfuscator @Inject constructor(
    @DeobfuscatorQualifier private val transformers: Set<Transformer>
 ) {
    public fun run(input: Path, output: Path) {
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/BytecodeDeobfuscatorModule.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/BytecodeDeobfuscatorModule.kt
@ -1,43 +1,43 @@
-package org.openrs2.deob
+package org.openrs2.deob.bytecode

 import com.google.inject.AbstractModule
 import com.google.inject.Scopes
 import com.google.inject.multibindings.Multibinder
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.deob.transform.BitShiftTransformer
-import org.openrs2.deob.transform.BitwiseOpTransformer
-import org.openrs2.deob.transform.CanvasTransformer
-import org.openrs2.deob.transform.ClassLiteralTransformer
-import org.openrs2.deob.transform.ConstantArgTransformer
-import org.openrs2.deob.transform.CopyPropagationTransformer
-import org.openrs2.deob.transform.CounterTransformer
-import org.openrs2.deob.transform.EmptyClassTransformer
-import org.openrs2.deob.transform.ExceptionTracingTransformer
-import org.openrs2.deob.transform.FernflowerExceptionTransformer
-import org.openrs2.deob.transform.FieldOrderTransformer
-import org.openrs2.deob.transform.FinalFieldTransformer
-import org.openrs2.deob.transform.FinalTransformer
-import org.openrs2.deob.transform.InvokeSpecialTransformer
-import org.openrs2.deob.transform.MethodOrderTransformer
-import org.openrs2.deob.transform.MonitorTransformer
-import org.openrs2.deob.transform.OpaquePredicateTransformer
-import org.openrs2.deob.transform.OriginalNameTransformer
-import org.openrs2.deob.transform.OriginalPcRestoreTransformer
-import org.openrs2.deob.transform.OriginalPcSaveTransformer
-import org.openrs2.deob.transform.OverrideTransformer
-import org.openrs2.deob.transform.PatcherTransformer
-import org.openrs2.deob.transform.RedundantGotoTransformer
-import org.openrs2.deob.transform.RemapTransformer
-import org.openrs2.deob.transform.ResetTransformer
-import org.openrs2.deob.transform.UnusedArgTransformer
-import org.openrs2.deob.transform.UnusedLocalTransformer
-import org.openrs2.deob.transform.UnusedMethodTransformer
-import org.openrs2.deob.transform.VisibilityTransformer
+import org.openrs2.deob.bytecode.transform.BitShiftTransformer
+import org.openrs2.deob.bytecode.transform.BitwiseOpTransformer
+import org.openrs2.deob.bytecode.transform.CanvasTransformer
+import org.openrs2.deob.bytecode.transform.ClassLiteralTransformer
+import org.openrs2.deob.bytecode.transform.ConstantArgTransformer
+import org.openrs2.deob.bytecode.transform.CopyPropagationTransformer
+import org.openrs2.deob.bytecode.transform.CounterTransformer
+import org.openrs2.deob.bytecode.transform.EmptyClassTransformer
+import org.openrs2.deob.bytecode.transform.ExceptionTracingTransformer
+import org.openrs2.deob.bytecode.transform.FernflowerExceptionTransformer
+import org.openrs2.deob.bytecode.transform.FieldOrderTransformer
+import org.openrs2.deob.bytecode.transform.FinalFieldTransformer
+import org.openrs2.deob.bytecode.transform.FinalTransformer
+import org.openrs2.deob.bytecode.transform.InvokeSpecialTransformer
+import org.openrs2.deob.bytecode.transform.MethodOrderTransformer
+import org.openrs2.deob.bytecode.transform.MonitorTransformer
+import org.openrs2.deob.bytecode.transform.OpaquePredicateTransformer
+import org.openrs2.deob.bytecode.transform.OriginalNameTransformer
+import org.openrs2.deob.bytecode.transform.OriginalPcRestoreTransformer
+import org.openrs2.deob.bytecode.transform.OriginalPcSaveTransformer
+import org.openrs2.deob.bytecode.transform.OverrideTransformer
+import org.openrs2.deob.bytecode.transform.PatcherTransformer
+import org.openrs2.deob.bytecode.transform.RedundantGotoTransformer
+import org.openrs2.deob.bytecode.transform.RemapTransformer
+import org.openrs2.deob.bytecode.transform.ResetTransformer
+import org.openrs2.deob.bytecode.transform.UnusedArgTransformer
+import org.openrs2.deob.bytecode.transform.UnusedLocalTransformer
+import org.openrs2.deob.bytecode.transform.UnusedMethodTransformer
+import org.openrs2.deob.bytecode.transform.VisibilityTransformer
 import org.openrs2.deob.util.DeobfuscatorUtilModule
 import org.openrs2.patcher.PatcherModule
 import org.openrs2.patcher.transform.ResourceTransformer

-public object DeobfuscatorModule : AbstractModule() {
+public object BytecodeDeobfuscatorModule : AbstractModule() {
    override fun configure() {
        install(PatcherModule)
        install(DeobfuscatorUtilModule)
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/DeobfuscateBytecodeCommand.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/DeobfuscateBytecodeCommand.kt
@ -0,0 +1,18 @@
+package org.openrs2.deob.bytecode
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.google.inject.Guice
+import java.nio.file.Paths
+
+public fun main(args: Array<String>): Unit = DeobfuscateBytecodeCommand().main(args)
+
+public class DeobfuscateBytecodeCommand : CliktCommand(name = "deob-bytecode") {
+    override fun run() {
+        val injector = Guice.createInjector(BytecodeDeobfuscatorModule)
+        val deobfuscator = injector.getInstance(BytecodeDeobfuscator::class.java)
+        deobfuscator.run(
+            input = Paths.get("nonfree/share/client"),
+            output = Paths.get("nonfree/var/cache/deob")
+        )
+    }
+}
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/DeobfuscatorQualifier.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/DeobfuscatorQualifier.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob
+package org.openrs2.deob.bytecode

 import javax.inject.Qualifier

--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/OriginalPcTable.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/OriginalPcTable.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob
+package org.openrs2.deob.bytecode

 import org.objectweb.asm.Attribute
 import org.objectweb.asm.ByteVector
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/Profile.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/Profile.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob
+package org.openrs2.deob.bytecode

 import org.openrs2.asm.filter.GlobClassFilter
 import org.openrs2.asm.filter.GlobMemberFilter
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/ProfileProvider.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/ProfileProvider.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob
+package org.openrs2.deob.bytecode

 import com.fasterxml.jackson.databind.ObjectMapper
 import org.openrs2.yaml.Yaml
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/SignedClassUtils.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/SignedClassUtils.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob
+package org.openrs2.deob.bytecode

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Type
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ConstSourceInterpreter.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ConstSourceInterpreter.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis

 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ConstSourceValue.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ConstSourceValue.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis

 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.analysis.BasicValue
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ControlFlowAnalyzer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ControlFlowAnalyzer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis

 import org.jgrapht.Graph
 import org.jgrapht.graph.AsUnmodifiableGraph
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/CopyAssignment.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/CopyAssignment.kt
@ -1,3 +1,3 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis

 public data class CopyAssignment(val destination: Int, val source: Int)
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/CopyPropagationAnalyzer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/CopyPropagationAnalyzer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis

 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/DataFlowAnalyzer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/DataFlowAnalyzer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis

 import org.jgrapht.Graph
 import org.jgrapht.graph.DefaultEdge
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/FieldWriteAnalyzer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/FieldWriteAnalyzer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis

 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/FieldWriteCount.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/FieldWriteCount.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis

 public enum class FieldWriteCount {
    NEVER,
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntBranch.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntBranch.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis

 import org.objectweb.asm.Opcodes.IFEQ
 import org.objectweb.asm.Opcodes.IFGE
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntBranchResult.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntBranchResult.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis

 public enum class IntBranchResult {
    ALWAYS_TAKEN, NEVER_TAKEN, UNKNOWN;
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntInterpreter.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntInterpreter.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis

 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntValue.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntValue.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis

 import org.objectweb.asm.tree.analysis.BasicValue
 import org.objectweb.asm.tree.analysis.Value
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntValueSet.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/IntValueSet.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis

 public sealed class IntValueSet {
    public data class Constant(val values: Set<Int>) : IntValueSet() {
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/LiveVariableAnalyzer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/LiveVariableAnalyzer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis

 import it.unimi.dsi.fastutil.ints.IntOpenHashSet
 import it.unimi.dsi.fastutil.ints.IntSet
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ThisInterpreter.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ThisInterpreter.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis

 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ThisValue.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/analysis/ThisValue.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.analysis
+package org.openrs2.deob.bytecode.analysis

 import org.objectweb.asm.tree.analysis.BasicValue
 import org.objectweb.asm.tree.analysis.Value
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/filter/ReflectedConstructorFilter.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/filter/ReflectedConstructorFilter.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.filter
+package org.openrs2.deob.bytecode.filter

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.tree.MethodNode
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/ArgumentMappingGenerator.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/ArgumentMappingGenerator.kt
@ -1,6 +1,6 @@
-package org.openrs2.deob.remap
+package org.openrs2.deob.bytecode.remap

-import org.openrs2.deob.ArgRef
+import org.openrs2.deob.bytecode.ArgRef
 import org.openrs2.deob.util.map.NameMap

 public class ArgumentMappingGenerator(
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/ClassMappingGenerator.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/ClassMappingGenerator.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.remap
+package org.openrs2.deob.bytecode.remap

 import org.objectweb.asm.Opcodes
 import org.openrs2.asm.classpath.ClassMetadata
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/ClassNamePrefix.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/ClassNamePrefix.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.remap
+package org.openrs2.deob.bytecode.remap

 import org.openrs2.asm.classpath.ExtendedRemapper
 import org.openrs2.asm.classpath.Library
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/FieldMappingGenerator.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/FieldMappingGenerator.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.remap
+package org.openrs2.deob.bytecode.remap

 import org.objectweb.asm.Type
 import org.openrs2.asm.MemberRef
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/MethodMappingGenerator.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/MethodMappingGenerator.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.remap
+package org.openrs2.deob.bytecode.remap

 import org.objectweb.asm.Opcodes
 import org.openrs2.asm.MemberDesc
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/NameGenerator.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/NameGenerator.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.remap
+package org.openrs2.deob.bytecode.remap

 public class NameGenerator {
    private val prefixes = mutableMapOf<String, Int>()
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/StaticClassMapping.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/StaticClassMapping.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.remap
+package org.openrs2.deob.bytecode.remap

 public class StaticClassMapping {
    private val nameGenerator = NameGenerator()
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/StaticField.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/StaticField.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.remap
+package org.openrs2.deob.bytecode.remap

 import org.objectweb.asm.tree.AbstractInsnNode

--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/StaticFieldUnscrambler.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/StaticFieldUnscrambler.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.remap
+package org.openrs2.deob.bytecode.remap

 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/StaticMethodUnscrambler.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/StaticMethodUnscrambler.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.remap
+package org.openrs2.deob.bytecode.remap

 import org.objectweb.asm.Opcodes
 import org.openrs2.asm.MemberRef
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/TypedRemapper.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/remap/TypedRemapper.kt
@ -1,12 +1,12 @@
-package org.openrs2.deob.remap
+package org.openrs2.deob.bytecode.remap

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.openrs2.asm.MemberRef
 import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.ExtendedRemapper
-import org.openrs2.deob.ArgRef
-import org.openrs2.deob.Profile
+import org.openrs2.deob.bytecode.ArgRef
+import org.openrs2.deob.bytecode.Profile
 import org.openrs2.deob.util.map.NameMap
 import org.openrs2.util.collect.DisjointSet

--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/BitShiftTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/BitShiftTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/BitwiseOpTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/BitwiseOpTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/CanvasTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/CanvasTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ClassLiteralTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ClassLiteralTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ConstantArgTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ConstantArgTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes.GOTO
@ -36,15 +36,15 @@ import org.openrs2.asm.replaceExpression
 import org.openrs2.asm.stackMetadata
 import org.openrs2.asm.toAbstractInsnNode
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.deob.ArgPartition
-import org.openrs2.deob.Profile
-import org.openrs2.deob.analysis.IntBranch
-import org.openrs2.deob.analysis.IntBranchResult.ALWAYS_TAKEN
-import org.openrs2.deob.analysis.IntBranchResult.NEVER_TAKEN
-import org.openrs2.deob.analysis.IntInterpreter
-import org.openrs2.deob.analysis.IntValueSet
-import org.openrs2.deob.filter.ReflectedConstructorFilter
-import org.openrs2.deob.remap.MethodMappingGenerator
+import org.openrs2.deob.bytecode.ArgPartition
+import org.openrs2.deob.bytecode.Profile
+import org.openrs2.deob.bytecode.analysis.IntBranch
+import org.openrs2.deob.bytecode.analysis.IntBranchResult.ALWAYS_TAKEN
+import org.openrs2.deob.bytecode.analysis.IntBranchResult.NEVER_TAKEN
+import org.openrs2.deob.bytecode.analysis.IntInterpreter
+import org.openrs2.deob.bytecode.analysis.IntValueSet
+import org.openrs2.deob.bytecode.filter.ReflectedConstructorFilter
+import org.openrs2.deob.bytecode.remap.MethodMappingGenerator
 import org.openrs2.util.collect.DisjointSet
 import org.openrs2.util.collect.removeFirstOrNull
 import javax.inject.Inject
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/CopyPropagationTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/CopyPropagationTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
@ -8,7 +8,7 @@ import org.objectweb.asm.tree.VarInsnNode
 import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.deob.analysis.CopyPropagationAnalyzer
+import org.openrs2.deob.bytecode.analysis.CopyPropagationAnalyzer
 import javax.inject.Singleton

 /**
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/CounterTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/CounterTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.tree.ClassNode
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/EmptyClassTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/EmptyClassTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Type
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ExceptionTracingTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ExceptionTracingTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.tree.ClassNode
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FernflowerExceptionTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FernflowerExceptionTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FieldOrderTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FieldOrderTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FinalFieldTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FinalFieldTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
@ -13,9 +13,9 @@ import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.removeDeadCode
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.deob.analysis.FieldWriteAnalyzer
-import org.openrs2.deob.analysis.FieldWriteCount
-import org.openrs2.deob.analysis.ThisInterpreter
+import org.openrs2.deob.bytecode.analysis.FieldWriteAnalyzer
+import org.openrs2.deob.bytecode.analysis.FieldWriteCount
+import org.openrs2.deob.bytecode.analysis.ThisInterpreter
 import org.openrs2.util.collect.DisjointSet
 import javax.inject.Singleton

--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FinalTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FinalTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/InvokeSpecialTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/InvokeSpecialTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/MethodOrderTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/MethodOrderTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/MonitorTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/MonitorTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OpaquePredicateTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OpaquePredicateTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OriginalNameTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OriginalNameTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.AnnotationNode
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OriginalPcRestoreTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OriginalPcRestoreTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Type
@ -10,8 +10,8 @@ import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.removeDeadCode
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.deob.OriginalPcTable
 import org.openrs2.deob.annotation.OriginalMember
+import org.openrs2.deob.bytecode.OriginalPcTable
 import org.openrs2.deob.util.map.NameMap
 import javax.inject.Inject
 import javax.inject.Singleton
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OriginalPcSaveTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OriginalPcSaveTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.tree.ClassNode
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OverrideTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OverrideTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/PatcherTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/PatcherTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import org.openrs2.asm.classpath.ClassPath
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/RedundantGotoTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/RedundantGotoTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/RemapTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/RemapTransformer.kt
@ -1,9 +1,9 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.deob.Profile
-import org.openrs2.deob.remap.TypedRemapper
+import org.openrs2.deob.bytecode.Profile
+import org.openrs2.deob.bytecode.remap.TypedRemapper
 import org.openrs2.deob.util.map.NameMap
 import javax.inject.Inject
 import javax.inject.Singleton
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ResetTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/ResetTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/UnusedArgTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/UnusedArgTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
@ -17,11 +17,11 @@ import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.hasCode
 import org.openrs2.asm.removeArgument
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.deob.ArgPartition
-import org.openrs2.deob.Profile
-import org.openrs2.deob.analysis.ConstSourceInterpreter
-import org.openrs2.deob.analysis.ConstSourceValue
-import org.openrs2.deob.remap.MethodMappingGenerator
+import org.openrs2.deob.bytecode.ArgPartition
+import org.openrs2.deob.bytecode.Profile
+import org.openrs2.deob.bytecode.analysis.ConstSourceInterpreter
+import org.openrs2.deob.bytecode.analysis.ConstSourceValue
+import org.openrs2.deob.bytecode.remap.MethodMappingGenerator
 import org.openrs2.util.collect.DisjointSet
 import javax.inject.Inject
 import javax.inject.Singleton
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/UnusedLocalTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/UnusedLocalTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
@ -11,7 +11,7 @@ import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.deleteExpression
 import org.openrs2.asm.isPure
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.deob.analysis.LiveVariableAnalyzer
+import org.openrs2.deob.bytecode.analysis.LiveVariableAnalyzer
 import javax.inject.Singleton

@Singleton
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/UnusedMethodTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/UnusedMethodTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import com.google.common.collect.HashMultimap
@ -13,8 +13,8 @@ import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.filter.MemberFilter
 import org.openrs2.asm.filter.UnionMemberFilter
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.deob.Profile
-import org.openrs2.deob.filter.ReflectedConstructorFilter
+import org.openrs2.deob.bytecode.Profile
+import org.openrs2.deob.bytecode.filter.ReflectedConstructorFilter
 import org.openrs2.util.collect.DisjointSet
 import org.openrs2.util.collect.removeFirst
 import javax.inject.Inject
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/VisibilityTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/VisibilityTransformer.kt
@ -1,4 +1,4 @@
-package org.openrs2.deob.transform
+package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
 import com.google.common.collect.HashMultimap
@ -16,8 +16,8 @@ import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.filter.MemberFilter
 import org.openrs2.asm.filter.UnionMemberFilter
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.deob.Profile
-import org.openrs2.deob.filter.ReflectedConstructorFilter
+import org.openrs2.deob.bytecode.Profile
+import org.openrs2.deob.bytecode.filter.ReflectedConstructorFilter
 import org.openrs2.util.collect.DisjointSet
 import javax.inject.Inject
 import javax.inject.Singleton
@ -91,7 +91,7 @@ public class VisibilityTransformer @Inject constructor(private val profile: Prof
            // reduce it to the weakest level required to override a dependency's method
            partition.filter { classPath[it.owner]!!.dependency }
                .mapNotNull { classPath[it.owner]!!.getMethodAccess(MemberDesc(it)) }
-                .fold(visibility, ::weakestVisibility)
+                .fold(visibility, Companion::weakestVisibility)
        } else {
            visibility
        }
--- a/deob/src/main/kotlin/org/openrs2/deob/DeobfuscateCommand.kt
+++ b/deob/src/main/kotlin/org/openrs2/deob/DeobfuscateCommand.kt
@ -1,18 +0,0 @@
-package org.openrs2.deob
-
-import com.github.ajalt.clikt.core.CliktCommand
-import com.google.inject.Guice
-import java.nio.file.Paths
-
-public fun main(args: Array<String>): Unit = DeobfuscateCommand().main(args)
-
-public class DeobfuscateCommand : CliktCommand(name = "deob") {
-    override fun run() {
-        val injector = Guice.createInjector(DeobfuscatorModule)
-        val deobfuscator = injector.getInstance(Deobfuscator::class.java)
-        deobfuscator.run(
-            input = Paths.get("nonfree/share/client"),
-            output = Paths.get("nonfree/var/cache/deob")
-        )
-    }
-}
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@ -13,9 +13,9 @@ include(
    "crypto",
    "db",
    "decompiler",
-    "deob",
    "deob-annotations",
    "deob-ast",
+    "deob-bytecode",
    "deob-processor",
    "deob-util",
    "game",