From ccf7056a93d60459990ff1d96e06a8e853a59607 Mon Sep 17 00:00:00 2001
From: Graham <gpe@openrs2.dev>
Date: Sun, 10 May 2020 10:23:28 +0100
Subject: [PATCH] Use private companion objects where possible

Signed-off-by: Graham <gpe@openrs2.dev>
---
 asm/src/main/java/dev/openrs2/asm/filter/GlobMemberFilter.kt    | 2 +-
 bundler/src/main/java/dev/openrs2/bundler/Bundler.kt            | 2 +-
 .../java/dev/openrs2/bundler/transform/BufferSizeTransformer.kt | 2 +-
 .../java/dev/openrs2/bundler/transform/CachePathTransformer.kt  | 2 +-
 .../java/dev/openrs2/bundler/transform/DomainTransformer.kt     | 2 +-
 .../java/dev/openrs2/bundler/transform/HostCheckTransformer.kt  | 2 +-
 .../dev/openrs2/bundler/transform/LoadLibraryTransformer.kt     | 2 +-
 .../java/dev/openrs2/bundler/transform/MacResizeTransformer.kt  | 2 +-
 .../openrs2/bundler/transform/MemoryAllocationTransformer.kt    | 2 +-
 .../main/java/dev/openrs2/bundler/transform/NameTransformer.kt  | 2 +-
 .../openrs2/bundler/transform/PlatformDetectionTransformer.kt   | 2 +-
 .../java/dev/openrs2/bundler/transform/PublicKeyTransformer.kt  | 2 +-
 .../java/dev/openrs2/bundler/transform/ResourceTransformer.kt   | 2 +-
 .../java/dev/openrs2/bundler/transform/RightClickTransformer.kt | 2 +-
 .../main/java/dev/openrs2/bundler/transform/TypoTransformer.kt  | 2 +-
 conf/src/main/java/dev/openrs2/conf/Config.kt                   | 2 +-
 conf/src/main/java/dev/openrs2/conf/ConfigProvider.kt           | 2 +-
 crypto/src/main/java/dev/openrs2/crypto/RsaKeyProvider.kt       | 2 +-
 .../src/main/java/dev/openrs2/decompiler/DecompileCommand.kt    | 2 +-
 decompiler/src/main/java/dev/openrs2/decompiler/Decompiler.kt   | 2 +-
 deob-ast/src/main/java/dev/openrs2/deob/ast/AstDeobfuscator.kt  | 2 +-
 .../java/dev/openrs2/deob/ast/transform/BitMaskTransformer.kt   | 2 +-
 .../dev/openrs2/deob/ast/transform/ComplementTransformer.kt     | 2 +-
 .../java/dev/openrs2/deob/ast/transform/EncloseTransformer.kt   | 2 +-
 .../main/java/dev/openrs2/deob/ast/transform/GlTransformer.kt   | 2 +-
 .../dev/openrs2/deob/ast/transform/NewInstanceTransformer.kt    | 2 +-
 deob-map/src/main/java/dev/openrs2/deob/map/NameMapProvider.kt  | 2 +-
 deob/src/main/java/dev/openrs2/deob/Deobfuscator.kt             | 2 +-
 deob/src/main/java/dev/openrs2/deob/analysis/IntInterpreter.kt  | 2 +-
 .../main/java/dev/openrs2/deob/transform/BitShiftTransformer.kt | 2 +-
 .../java/dev/openrs2/deob/transform/BitwiseOpTransformer.kt     | 2 +-
 .../main/java/dev/openrs2/deob/transform/BundlerTransformer.kt  | 2 +-
 .../java/dev/openrs2/deob/transform/ClassLiteralTransformer.kt  | 2 +-
 .../java/dev/openrs2/deob/transform/ConstantArgTransformer.kt   | 2 +-
 .../main/java/dev/openrs2/deob/transform/CounterTransformer.kt  | 2 +-
 .../java/dev/openrs2/deob/transform/EmptyClassTransformer.kt    | 2 +-
 .../dev/openrs2/deob/transform/ExceptionTracingTransformer.kt   | 2 +-
 .../java/dev/openrs2/deob/transform/FieldOrderTransformer.kt    | 2 +-
 .../main/java/dev/openrs2/deob/transform/FinalTransformer.kt    | 2 +-
 .../java/dev/openrs2/deob/transform/InvokeSpecialTransformer.kt | 2 +-
 .../java/dev/openrs2/deob/transform/MethodOrderTransformer.kt   | 2 +-
 .../main/java/dev/openrs2/deob/transform/MonitorTransformer.kt  | 2 +-
 .../dev/openrs2/deob/transform/OpaquePredicateTransformer.kt    | 2 +-
 .../java/dev/openrs2/deob/transform/OriginalNameTransformer.kt  | 2 +-
 .../dev/openrs2/deob/transform/OriginalPcRestoreTransformer.kt  | 2 +-
 .../dev/openrs2/deob/transform/OriginalPcSaveTransformer.kt     | 2 +-
 .../main/java/dev/openrs2/deob/transform/OverrideTransformer.kt | 2 +-
 .../main/java/dev/openrs2/deob/transform/ResetTransformer.kt    | 2 +-
 .../dev/openrs2/deob/transform/StaticScramblingTransformer.kt   | 2 +-
 .../java/dev/openrs2/deob/transform/UnusedArgTransformer.kt     | 2 +-
 .../java/dev/openrs2/deob/transform/UnusedLocalTransformer.kt   | 2 +-
 .../java/dev/openrs2/deob/transform/VisibilityTransformer.kt    | 2 +-
 .../java/dev/openrs2/util/io/DeterministicJarOutputStream.kt    | 2 +-
 53 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/asm/src/main/java/dev/openrs2/asm/filter/GlobMemberFilter.kt b/asm/src/main/java/dev/openrs2/asm/filter/GlobMemberFilter.kt
index b8e60728e8..6827f15535 100644
--- a/asm/src/main/java/dev/openrs2/asm/filter/GlobMemberFilter.kt
+++ b/asm/src/main/java/dev/openrs2/asm/filter/GlobMemberFilter.kt
@@ -13,7 +13,7 @@ class GlobMemberFilter(@Suppress("CanBeParameter") private val patterns: List<Me
         return compiledPatterns.any { it.owner.matches(owner) && it.name.matches(name) && it.desc.matches(desc) }
     }
 
-    companion object {
+    private companion object {
         private fun compile(member: MemberRef): CompiledPattern {
             return CompiledPattern(
                 Glob.compileClass(member.owner),
diff --git a/bundler/src/main/java/dev/openrs2/bundler/Bundler.kt b/bundler/src/main/java/dev/openrs2/bundler/Bundler.kt
index aafdc46de7..d25a913ec0 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/Bundler.kt
+++ b/bundler/src/main/java/dev/openrs2/bundler/Bundler.kt
@@ -146,7 +146,7 @@ class Bundler @Inject constructor(
         glLoader.write(output.resolve("loader_gl.jar"), SignedJarLibraryWriter(signedManifest, keyStore), glClassPath)
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
 
         private val APPLICATION_NAME = Attributes.Name("Application-Name")
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/BufferSizeTransformer.kt b/bundler/src/main/java/dev/openrs2/bundler/transform/BufferSizeTransformer.kt
index a10c8c37b6..2c5e6461f5 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/BufferSizeTransformer.kt
+++ b/bundler/src/main/java/dev/openrs2/bundler/transform/BufferSizeTransformer.kt
@@ -58,7 +58,7 @@ class BufferSizeTransformer : Transformer() {
         logger.info { "Resized $buffersResized buffers to 65536 bytes" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
         private val GPP1_POS_MATCHER = InsnMatcher.compile("LDC (INVOKESPECIAL | INVOKEVIRTUAL) GETSTATIC")
         private val NEW_BUFFER_MATCHER = InsnMatcher.compile("NEW DUP (SIPUSH | LDC) INVOKESPECIAL PUTSTATIC")
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/CachePathTransformer.kt b/bundler/src/main/java/dev/openrs2/bundler/transform/CachePathTransformer.kt
index cb3522a4b8..59a4cda9fe 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/CachePathTransformer.kt
+++ b/bundler/src/main/java/dev/openrs2/bundler/transform/CachePathTransformer.kt
@@ -50,7 +50,7 @@ class CachePathTransformer @Inject constructor(
         logger.info { "Updated $paths cache paths" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
     }
 }
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/DomainTransformer.kt b/bundler/src/main/java/dev/openrs2/bundler/transform/DomainTransformer.kt
index a52a1728c2..091fcd8f9a 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/DomainTransformer.kt
+++ b/bundler/src/main/java/dev/openrs2/bundler/transform/DomainTransformer.kt
@@ -45,7 +45,7 @@ class DomainTransformer @Inject constructor(
         logger.info { "Replaced $domains domains" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
     }
 }
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/HostCheckTransformer.kt b/bundler/src/main/java/dev/openrs2/bundler/transform/HostCheckTransformer.kt
index cec919c312..b30f188d09 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/HostCheckTransformer.kt
+++ b/bundler/src/main/java/dev/openrs2/bundler/transform/HostCheckTransformer.kt
@@ -62,7 +62,7 @@ class HostCheckTransformer : Transformer() {
         logger.info { "Removed $hostChecks host checks" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
         private val GET_HOST_MATCHER = InsnMatcher.compile("INVOKEVIRTUAL INVOKEVIRTUAL INVOKEVIRTUAL")
     }
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/LoadLibraryTransformer.kt b/bundler/src/main/java/dev/openrs2/bundler/transform/LoadLibraryTransformer.kt
index bc8d060de9..7957cefcdf 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/LoadLibraryTransformer.kt
+++ b/bundler/src/main/java/dev/openrs2/bundler/transform/LoadLibraryTransformer.kt
@@ -41,7 +41,7 @@ class LoadLibraryTransformer : Transformer() {
         logger.info { "Replaced $jnilibs jnilibs with dylibs and removed $amd64Checks amd64 jagmisc checks" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
         private val AMD64_CHECK_MATCHER =
             InsnMatcher.compile("GETSTATIC LDC INVOKEVIRTUAL IFNE GETSTATIC LDC INVOKEVIRTUAL IFNE")
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/MacResizeTransformer.kt b/bundler/src/main/java/dev/openrs2/bundler/transform/MacResizeTransformer.kt
index 3f3b089a95..ef8127eef4 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/MacResizeTransformer.kt
+++ b/bundler/src/main/java/dev/openrs2/bundler/transform/MacResizeTransformer.kt
@@ -68,7 +68,7 @@ class MacResizeTransformer : Transformer() {
         logger.info { "Removed $branchesRemoved branches to macOS-specific resize logic" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
         private val DETECT_MAC_MATCHER = InsnMatcher.compile("GETSTATIC LDC INVOKEVIRTUAL (IFEQ | IFNE)")
     }
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/MemoryAllocationTransformer.kt b/bundler/src/main/java/dev/openrs2/bundler/transform/MemoryAllocationTransformer.kt
index 50116b0825..76a6ba7a49 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/MemoryAllocationTransformer.kt
+++ b/bundler/src/main/java/dev/openrs2/bundler/transform/MemoryAllocationTransformer.kt
@@ -56,7 +56,7 @@ class MemoryAllocationTransformer : Transformer() {
         logger.info { "Zeroed $usedMemoryExprsZeroed used memory expressions" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
 
         private val USED_MEMORY_MATCHER = InsnMatcher.compile("ALOAD INVOKEVIRTUAL ALOAD INVOKEVIRTUAL LSUB")
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/NameTransformer.kt b/bundler/src/main/java/dev/openrs2/bundler/transform/NameTransformer.kt
index fb1730822d..133d724442 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/NameTransformer.kt
+++ b/bundler/src/main/java/dev/openrs2/bundler/transform/NameTransformer.kt
@@ -46,7 +46,7 @@ class NameTransformer @Inject constructor(
         logger.info { "Replaced $names operator and game names" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
     }
 }
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/PlatformDetectionTransformer.kt b/bundler/src/main/java/dev/openrs2/bundler/transform/PlatformDetectionTransformer.kt
index 97400a3821..e987302004 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/PlatformDetectionTransformer.kt
+++ b/bundler/src/main/java/dev/openrs2/bundler/transform/PlatformDetectionTransformer.kt
@@ -151,7 +151,7 @@ class PlatformDetectionTransformer : Transformer() {
         logger.info { "Replaced $glBlocks jaggl and $miscBlocks jagmisc platform detection blocks" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
         private val GL_PLATFORM_DETECTION_MATCHER = InsnMatcher.compile(
             """
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/PublicKeyTransformer.kt b/bundler/src/main/java/dev/openrs2/bundler/transform/PublicKeyTransformer.kt
index 9cbdc9315c..3de9983ebd 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/PublicKeyTransformer.kt
+++ b/bundler/src/main/java/dev/openrs2/bundler/transform/PublicKeyTransformer.kt
@@ -46,7 +46,7 @@ class PublicKeyTransformer @Inject constructor(private val key: RSAPrivateCrtKey
         logger.info { "Replaced $exponents exponents and $moduli moduli" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
         private const val JAGEX_EXPONENT =
             "58778699976184461502525193738213253649000149147835990136706041084440742975821"
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/ResourceTransformer.kt b/bundler/src/main/java/dev/openrs2/bundler/transform/ResourceTransformer.kt
index da3fec9d42..933ffeb4f7 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/ResourceTransformer.kt
+++ b/bundler/src/main/java/dev/openrs2/bundler/transform/ResourceTransformer.kt
@@ -182,7 +182,7 @@ class ResourceTransformer(
         logger.info { "Replaced $glBlocks jaggl and $miscBlocks jagmisc resource constructor blocks" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
 
         private const val RESOURCE_CONSTRUCTOR = """
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/RightClickTransformer.kt b/bundler/src/main/java/dev/openrs2/bundler/transform/RightClickTransformer.kt
index 63d82a2603..24c19fe144 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/RightClickTransformer.kt
+++ b/bundler/src/main/java/dev/openrs2/bundler/transform/RightClickTransformer.kt
@@ -53,7 +53,7 @@ class RightClickTransformer : Transformer() {
         logger.info { "Replaced $metaDownCalls isMetaDown calls with getModifiersEx" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
     }
 }
diff --git a/bundler/src/main/java/dev/openrs2/bundler/transform/TypoTransformer.kt b/bundler/src/main/java/dev/openrs2/bundler/transform/TypoTransformer.kt
index 53d86d2964..13a2e997c3 100644
--- a/bundler/src/main/java/dev/openrs2/bundler/transform/TypoTransformer.kt
+++ b/bundler/src/main/java/dev/openrs2/bundler/transform/TypoTransformer.kt
@@ -36,7 +36,7 @@ class TypoTransformer : Transformer() {
         logger.info { "Fixed $errorsFixed typographical errors" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
     }
 }
diff --git a/conf/src/main/java/dev/openrs2/conf/Config.kt b/conf/src/main/java/dev/openrs2/conf/Config.kt
index 2a00b041b0..46fd688b53 100644
--- a/conf/src/main/java/dev/openrs2/conf/Config.kt
+++ b/conf/src/main/java/dev/openrs2/conf/Config.kt
@@ -13,7 +13,7 @@ data class Config(
         internalOperator = operator.toInternalName()
     }
 
-    companion object {
+    private companion object {
         private val INTERNAL_NAME_REGEX = Regex("(?i)[^a-z0-9]+")
 
         private fun String.toInternalName(): String {
diff --git a/conf/src/main/java/dev/openrs2/conf/ConfigProvider.kt b/conf/src/main/java/dev/openrs2/conf/ConfigProvider.kt
index 61f509bfbe..8481187592 100644
--- a/conf/src/main/java/dev/openrs2/conf/ConfigProvider.kt
+++ b/conf/src/main/java/dev/openrs2/conf/ConfigProvider.kt
@@ -17,7 +17,7 @@ class ConfigProvider @Inject constructor(private val mapper: ObjectMapper) : Pro
         }
     }
 
-    companion object {
+    private companion object {
         private val CONFIG_PATH = Paths.get("etc/config.yaml")
         private val EXAMPLE_CONFIG_PATH = Paths.get("etc/config.example.yaml")
     }
diff --git a/crypto/src/main/java/dev/openrs2/crypto/RsaKeyProvider.kt b/crypto/src/main/java/dev/openrs2/crypto/RsaKeyProvider.kt
index eeba03ef2a..f6a2b2f864 100644
--- a/crypto/src/main/java/dev/openrs2/crypto/RsaKeyProvider.kt
+++ b/crypto/src/main/java/dev/openrs2/crypto/RsaKeyProvider.kt
@@ -16,7 +16,7 @@ class RsaKeyProvider : Provider<RSAPrivateCrtKeyParameters> {
         }
     }
 
-    companion object {
+    private companion object {
         private val PATH = Paths.get("etc/game.key")
     }
 }
diff --git a/decompiler/src/main/java/dev/openrs2/decompiler/DecompileCommand.kt b/decompiler/src/main/java/dev/openrs2/decompiler/DecompileCommand.kt
index a55b9044f6..40f6b0a75f 100644
--- a/decompiler/src/main/java/dev/openrs2/decompiler/DecompileCommand.kt
+++ b/decompiler/src/main/java/dev/openrs2/decompiler/DecompileCommand.kt
@@ -31,7 +31,7 @@ class DecompileCommand : CliktCommand(name = "decompile") {
         return Paths.get("nonfree").resolve(dir).resolve("src/main/java")
     }
 
-    companion object {
+    private companion object {
         private val JAR_SUFFIX_REGEX = Regex("(?:_gl)?[.]jar$")
     }
 }
diff --git a/decompiler/src/main/java/dev/openrs2/decompiler/Decompiler.kt b/decompiler/src/main/java/dev/openrs2/decompiler/Decompiler.kt
index cf29f778d5..8e8ac4304a 100644
--- a/decompiler/src/main/java/dev/openrs2/decompiler/Decompiler.kt
+++ b/decompiler/src/main/java/dev/openrs2/decompiler/Decompiler.kt
@@ -23,7 +23,7 @@ class Decompiler(
         io.close()
     }
 
-    companion object {
+    private companion object {
         private val OPTIONS = mapOf(
             IFernflowerPreferences.INDENT_STRING to "\t",
             IFernflowerPreferences.SYNTHETIC_NOT_SET to "1"
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/AstDeobfuscator.kt b/deob-ast/src/main/java/dev/openrs2/deob/ast/AstDeobfuscator.kt
index 4369851695..5298744f26 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/AstDeobfuscator.kt
+++ b/deob-ast/src/main/java/dev/openrs2/deob/ast/AstDeobfuscator.kt
@@ -75,7 +75,7 @@ class AstDeobfuscator(private val modules: List<Path>) {
         }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
 
         private val TRANSFORMERS = listOf(
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/BitMaskTransformer.kt b/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/BitMaskTransformer.kt
index 0da3ae86aa..657e442603 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/BitMaskTransformer.kt
+++ b/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/BitMaskTransformer.kt
@@ -59,7 +59,7 @@ class BitMaskTransformer : Transformer() {
         }
     }
 
-    companion object {
+    private companion object {
         private val SHIFT_OPS = setOf(
             BinaryExpr.Operator.SIGNED_RIGHT_SHIFT,
             BinaryExpr.Operator.UNSIGNED_RIGHT_SHIFT
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/ComplementTransformer.kt b/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/ComplementTransformer.kt
index 2d54fa1f69..78cc0b0165 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/ComplementTransformer.kt
+++ b/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/ComplementTransformer.kt
@@ -31,7 +31,7 @@ class ComplementTransformer : Transformer() {
         }
     }
 
-    companion object {
+    private companion object {
         private fun Expression.isComplement(): Boolean {
             return isUnaryExpr && asUnaryExpr().operator == UnaryExpr.Operator.BITWISE_COMPLEMENT
         }
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/EncloseTransformer.kt b/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/EncloseTransformer.kt
index 39194d65be..58ee8b3880 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/EncloseTransformer.kt
+++ b/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/EncloseTransformer.kt
@@ -124,7 +124,7 @@ class EncloseTransformer : Transformer() {
         }
     }
 
-    companion object {
+    private companion object {
         private fun encloseLeft(parent: Expression, child: Expression) {
             val parentOp = Op.from(parent) ?: throw IllegalArgumentException()
             val childOp = Op.from(child) ?: return
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/GlTransformer.kt b/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/GlTransformer.kt
index 739975b87e..5ac5fa216c 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/GlTransformer.kt
+++ b/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/GlTransformer.kt
@@ -306,7 +306,7 @@ class GlTransformer(private val registry: GlRegistry = GlRegistry.parse()) : Tra
         }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
         private const val GL_METHOD_PREFIX = "gl"
         private const val GL_CLASS_UNQUALIFIED = "GL"
diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/NewInstanceTransformer.kt b/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/NewInstanceTransformer.kt
index 56d8c25e02..10e9af88bb 100644
--- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/NewInstanceTransformer.kt
+++ b/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/NewInstanceTransformer.kt
@@ -22,7 +22,7 @@ class NewInstanceTransformer : Transformer() {
         }
     }
 
-    companion object {
+    private companion object {
         private val CONSTRUCTOR_METHODS = setOf("getConstructor", "getDeclaredConstructor")
     }
 }
diff --git a/deob-map/src/main/java/dev/openrs2/deob/map/NameMapProvider.kt b/deob-map/src/main/java/dev/openrs2/deob/map/NameMapProvider.kt
index 85cd5aa8cd..598e3dec0a 100644
--- a/deob-map/src/main/java/dev/openrs2/deob/map/NameMapProvider.kt
+++ b/deob-map/src/main/java/dev/openrs2/deob/map/NameMapProvider.kt
@@ -25,7 +25,7 @@ class NameMapProvider @Inject constructor(private val mapper: ObjectMapper) : Pr
         return Files.isRegularFile(path) && path.fileName.toString().endsWith(YAML_SUFFIX)
     }
 
-    companion object {
+    private companion object {
         private val PATH = Paths.get("share/deob/map")
         private const val YAML_SUFFIX = ".yaml"
     }
diff --git a/deob/src/main/java/dev/openrs2/deob/Deobfuscator.kt b/deob/src/main/java/dev/openrs2/deob/Deobfuscator.kt
index 24ff4cd1e2..b6488b7ac7 100644
--- a/deob/src/main/java/dev/openrs2/deob/Deobfuscator.kt
+++ b/deob/src/main/java/dev/openrs2/deob/Deobfuscator.kt
@@ -120,7 +120,7 @@ class Deobfuscator @Inject constructor(
         unsignedClient.write(output.resolve("runescape_unsigned.jar"), JarLibraryWriter, unsignedClassPath)
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
     }
 }
diff --git a/deob/src/main/java/dev/openrs2/deob/analysis/IntInterpreter.kt b/deob/src/main/java/dev/openrs2/deob/analysis/IntInterpreter.kt
index 920b12eecc..02d132adc9 100644
--- a/deob/src/main/java/dev/openrs2/deob/analysis/IntInterpreter.kt
+++ b/deob/src/main/java/dev/openrs2/deob/analysis/IntInterpreter.kt
@@ -145,7 +145,7 @@ class IntInterpreter(private val args: Array<IntValueSet>) : Interpreter<IntValu
         }
     }
 
-    companion object {
+    private companion object {
         private const val MAX_TRACKED_VALUES = 1
     }
 }
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/BitShiftTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/BitShiftTransformer.kt
index b0d937d507..79f895cf19 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/BitShiftTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/BitShiftTransformer.kt
@@ -47,7 +47,7 @@ class BitShiftTransformer : Transformer() {
         logger.info { "Simplified $simplified bit shifts" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
         private val CONST_SHIFT_MATCHER =
             InsnMatcher.compile("(ICONST | BIPUSH | SIPUSH | LDC) (ISHL | ISHR | IUSHR | LSHL | LSHR | LUSHR)")
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/BitwiseOpTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/BitwiseOpTransformer.kt
index 14961f5564..14d7fe9be4 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/BitwiseOpTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/BitwiseOpTransformer.kt
@@ -81,7 +81,7 @@ class BitwiseOpTransformer : Transformer() {
         logger.info { "Inlined $inlinedOps bitwise ops and removed ${methodOps.size} redundant methods" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
         private val BITWISE_OP_MATCHER = InsnMatcher.compile("^ILOAD ILOAD (IXOR | IAND | IOR) IRETURN$")
         private const val BITWISE_OP_DESC = "(II)I"
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/BundlerTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/BundlerTransformer.kt
index 4f0a992281..91eee615df 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/BundlerTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/BundlerTransformer.kt
@@ -18,7 +18,7 @@ class BundlerTransformer @Inject constructor(
         }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
     }
 }
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/ClassLiteralTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/ClassLiteralTransformer.kt
index 1f6b4cf7d3..bf60564ada 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/ClassLiteralTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/ClassLiteralTransformer.kt
@@ -110,7 +110,7 @@ class ClassLiteralTransformer : Transformer() {
         logger.info { "Updated $classLiterals class literals to Java 5 style" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
         private val CLASS_FOR_NAME_MATCHER = InsnMatcher.compile(
             """
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/ConstantArgTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/ConstantArgTransformer.kt
index 63e0077b9a..349b0d3ca1 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/ConstantArgTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/ConstantArgTransformer.kt
@@ -307,7 +307,7 @@ class ConstantArgTransformer @Inject constructor(private val profile: Profile) :
         logger.info { "Simplified $branchesSimplified branches and inlined $constantsInlined constants" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
     }
 }
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/CounterTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/CounterTransformer.kt
index 8d26696d91..cf0ca00e94 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/CounterTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/CounterTransformer.kt
@@ -113,7 +113,7 @@ class CounterTransformer : Transformer() {
         logger.info { "Removed ${counters.size} counters" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
         private val RESET_PATTERN = InsnMatcher.compile("ICONST_0 PUTSTATIC")
         private val INCREMENT_PATTERN = InsnMatcher.compile("GETSTATIC ICONST_1 IADD PUTSTATIC")
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/EmptyClassTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/EmptyClassTransformer.kt
index 3f1b90f2cf..4a40b524bd 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/EmptyClassTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/EmptyClassTransformer.kt
@@ -102,7 +102,7 @@ class EmptyClassTransformer : Transformer() {
         logger.info { "Removed $removedClasses unused classes" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
     }
 }
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/ExceptionTracingTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/ExceptionTracingTransformer.kt
index 1a3cd29593..97dff4a8bc 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/ExceptionTracingTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/ExceptionTracingTransformer.kt
@@ -59,7 +59,7 @@ class ExceptionTracingTransformer : Transformer() {
         logger.info { "Removed $tracingTryCatches tracing try/catch blocks" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
         private val CATCH_MATCHER = InsnMatcher.compile(
             """
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/FieldOrderTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/FieldOrderTransformer.kt
index 56ea815029..9a67087ef8 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/FieldOrderTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/FieldOrderTransformer.kt
@@ -18,7 +18,7 @@ class FieldOrderTransformer : Transformer() {
         return false
     }
 
-    companion object {
+    private companion object {
         private const val CONSTRUCTOR = "<init>"
         private const val STATIC_CONSTRUCTOR = "<clinit>"
         private val STATIC_COMPARATOR = Comparator<FieldNode> { a, b ->
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/FinalTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/FinalTransformer.kt
index b1662aa9b7..4c1efb72fe 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/FinalTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/FinalTransformer.kt
@@ -113,7 +113,7 @@ class FinalTransformer : Transformer() {
         logger.info { "Updated final modifier on $classesChanged classes and $methodsChanged methods" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
     }
 }
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/InvokeSpecialTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/InvokeSpecialTransformer.kt
index 734cc5435b..e6105d4914 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/InvokeSpecialTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/InvokeSpecialTransformer.kt
@@ -86,7 +86,7 @@ class InvokeSpecialTransformer : Transformer() {
         logger.info { "Replaced $invokeSpecialsReplaced INVOKESPECIALs with INVOKEVIRTUAL" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
     }
 }
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/MethodOrderTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/MethodOrderTransformer.kt
index 23057a9fca..e16d62e4b4 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/MethodOrderTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/MethodOrderTransformer.kt
@@ -15,7 +15,7 @@ class MethodOrderTransformer : Transformer() {
         return false
     }
 
-    companion object {
+    private companion object {
         private val STATIC_COMPARATOR = Comparator<MethodNode> { a, b ->
             val aStatic = a.access and Opcodes.ACC_STATIC != 0
             val bStatic = b.access and Opcodes.ACC_STATIC != 0
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/MonitorTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/MonitorTransformer.kt
index b1d9aac6ed..a88db6f942 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/MonitorTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/MonitorTransformer.kt
@@ -131,7 +131,7 @@ class MonitorTransformer : Transformer() {
         logger.info { "Replaced $loadsReplaced ASTORE ALOAD sequences with DUP ASTORE" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
 
         // these regexes rely on JSRInlinerAdapter running first
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/OpaquePredicateTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/OpaquePredicateTransformer.kt
index 1dd6aeb0ad..718a5a1041 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/OpaquePredicateTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/OpaquePredicateTransformer.kt
@@ -115,7 +115,7 @@ class OpaquePredicateTransformer : Transformer() {
         logger.info { "Removed $opaquePredicates opaque predicates and $stores redundant stores" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
         private val FLOW_OBSTRUCTOR_INITIALIZER_MATCHER = InsnMatcher.compile(
             """
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/OriginalNameTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/OriginalNameTransformer.kt
index d5142008e2..6e99dfc6d7 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/OriginalNameTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/OriginalNameTransformer.kt
@@ -67,7 +67,7 @@ class OriginalNameTransformer : Transformer() {
         return false
     }
 
-    companion object {
+    private companion object {
         private fun createOriginalClassAnnotation(name: String): AnnotationNode {
             val annotation = AnnotationNode(Type.getDescriptor(OriginalClass::class.java))
             annotation.values = listOf("value", name)
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/OriginalPcRestoreTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/OriginalPcRestoreTransformer.kt
index 7d55f3c135..5984566ade 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/OriginalPcRestoreTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/OriginalPcRestoreTransformer.kt
@@ -51,7 +51,7 @@ class OriginalPcRestoreTransformer : Transformer() {
         logger.info { "Restored $originalPcsRestored original instruction indexes" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
     }
 }
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/OriginalPcSaveTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/OriginalPcSaveTransformer.kt
index a7077a3c1e..3ca9d5742f 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/OriginalPcSaveTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/OriginalPcSaveTransformer.kt
@@ -22,7 +22,7 @@ class OriginalPcSaveTransformer : Transformer() {
         logger.info { "Saved ${classPath.originalPcs.size} original instruction indexes" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
     }
 }
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/OverrideTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/OverrideTransformer.kt
index 282c29751e..311f869eb7 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/OverrideTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/OverrideTransformer.kt
@@ -51,7 +51,7 @@ class OverrideTransformer : Transformer() {
         logger.info { "Added $overrides override annotations" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
         private val OVERRIDE_DESC: String = Type.getDescriptor(Override::class.java)
     }
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/ResetTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/ResetTransformer.kt
index 2d59aa8b36..6b4e43e4b1 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/ResetTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/ResetTransformer.kt
@@ -59,7 +59,7 @@ class ResetTransformer : Transformer() {
         logger.info { "Removed ${resetMethods.size} reset methods" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
 
         private fun findMasterReset(method: MethodNode): MemberRef? {
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/StaticScramblingTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/StaticScramblingTransformer.kt
index 36ecdc083a..f819e5a83b 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/StaticScramblingTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/StaticScramblingTransformer.kt
@@ -213,7 +213,7 @@ class StaticScramblingTransformer @Inject constructor(private val profile: Profi
         logger.info { "Moved ${fieldClasses.size} fields and ${methodClasses.size} methods" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
         private const val MAX_FIELDS = 500
         private const val MAX_METHODS = 50
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/UnusedArgTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/UnusedArgTransformer.kt
index 9297e72274..0960d58a0e 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/UnusedArgTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/UnusedArgTransformer.kt
@@ -171,7 +171,7 @@ class UnusedArgTransformer @Inject constructor(private val profile: Profile) : T
         logger.info { "Removed $deletedArgs unused arguments" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
         private val INT_SORTS = setOf(
             Type.BOOLEAN,
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/UnusedLocalTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/UnusedLocalTransformer.kt
index 5f6078a768..b1c4de7320 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/UnusedLocalTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/UnusedLocalTransformer.kt
@@ -54,7 +54,7 @@ class UnusedLocalTransformer : Transformer() {
         logger.info { "Removed $localsRemoved unused local variables" }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
     }
 }
diff --git a/deob/src/main/java/dev/openrs2/deob/transform/VisibilityTransformer.kt b/deob/src/main/java/dev/openrs2/deob/transform/VisibilityTransformer.kt
index 332aacc8c9..aa246425c6 100644
--- a/deob/src/main/java/dev/openrs2/deob/transform/VisibilityTransformer.kt
+++ b/deob/src/main/java/dev/openrs2/deob/transform/VisibilityTransformer.kt
@@ -154,7 +154,7 @@ class VisibilityTransformer @Inject constructor(private val profile: Profile) :
         }
     }
 
-    companion object {
+    private companion object {
         private val logger = InlineLogger()
         private const val VISIBILITY_FLAGS = Opcodes.ACC_PUBLIC or Opcodes.ACC_PROTECTED or Opcodes.ACC_PRIVATE
 
diff --git a/util/src/main/java/dev/openrs2/util/io/DeterministicJarOutputStream.kt b/util/src/main/java/dev/openrs2/util/io/DeterministicJarOutputStream.kt
index 71d2a4791b..ffd46e99ef 100644
--- a/util/src/main/java/dev/openrs2/util/io/DeterministicJarOutputStream.kt
+++ b/util/src/main/java/dev/openrs2/util/io/DeterministicJarOutputStream.kt
@@ -22,7 +22,7 @@ class DeterministicJarOutputStream : JarOutputStream {
         super.putNextEntry(ze)
     }
 
-    companion object {
+    private companion object {
         private val UNIX_EPOCH = FileTime.fromMillis(0)
     }
 }