Update Guice

Signed-off-by: Graham <gpe@openrs2.org>
1 year ago · 651b2f8b5f
parent e62941b00a
commit 651b2f8b5f
203 changed files with 271 additions and 271 deletions
--- a/archive/src/main/kotlin/org/openrs2/archive/ArchiveConfigProvider.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/ArchiveConfigProvider.kt
@ -1,11 +1,11 @@
 package org.openrs2.archive

 import com.fasterxml.jackson.databind.ObjectMapper
+import jakarta.inject.Inject
+import jakarta.inject.Provider
 import org.openrs2.yaml.Yaml
 import java.nio.file.Files
 import java.nio.file.Path
-import javax.inject.Inject
-import javax.inject.Provider

 public class ArchiveConfigProvider @Inject constructor(
    @Yaml private val mapper: ObjectMapper
--- a/archive/src/main/kotlin/org/openrs2/archive/DataSourceProvider.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/DataSourceProvider.kt
@ -2,10 +2,10 @@ package org.openrs2.archive

 import com.zaxxer.hikari.HikariConfig
 import com.zaxxer.hikari.HikariDataSource
+import jakarta.inject.Inject
+import jakarta.inject.Provider
 import org.flywaydb.core.Flyway
 import org.postgresql.ds.PGSimpleDataSource
-import javax.inject.Inject
-import javax.inject.Provider
 import javax.sql.DataSource

 public class DataSourceProvider @Inject constructor(
--- a/archive/src/main/kotlin/org/openrs2/archive/DatabaseProvider.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/DatabaseProvider.kt
@ -1,9 +1,9 @@
 package org.openrs2.archive

+import jakarta.inject.Inject
+import jakarta.inject.Provider
 import org.openrs2.db.Database
 import org.openrs2.db.PostgresDeadlockDetector
-import javax.inject.Inject
-import javax.inject.Provider
 import javax.sql.DataSource

 public class DatabaseProvider @Inject constructor(
--- a/archive/src/main/kotlin/org/openrs2/archive/cache/CacheDownloader.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/cache/CacheDownloader.kt
@ -1,5 +1,7 @@
 package org.openrs2.archive.cache

+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.archive.cache.nxt.MusicStreamClient
 import org.openrs2.archive.game.GameDatabase
 import org.openrs2.archive.jav.JavConfig
@ -8,8 +10,6 @@ import org.openrs2.net.BootstrapFactory
 import org.openrs2.net.awaitSuspend
 import java.net.URI
 import java.net.http.HttpClient
-import javax.inject.Inject
-import javax.inject.Singleton
 import kotlin.coroutines.suspendCoroutine

@Singleton
--- a/archive/src/main/kotlin/org/openrs2/archive/cache/CacheExporter.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/cache/CacheExporter.kt
@ -6,6 +6,8 @@ import com.fasterxml.jackson.annotation.JsonUnwrapped
 import io.netty.buffer.ByteBuf
 import io.netty.buffer.ByteBufAllocator
 import io.netty.buffer.Unpooled
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.buffer.use
 import org.openrs2.cache.ChecksumTable
 import org.openrs2.cache.DiskStore
@ -22,8 +24,6 @@ import java.time.Instant
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 import java.util.SortedSet
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class CacheExporter @Inject constructor(
--- a/archive/src/main/kotlin/org/openrs2/archive/cache/CacheImporter.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/cache/CacheImporter.kt
@ -6,6 +6,8 @@ import io.netty.buffer.ByteBufAllocator
 import io.netty.buffer.ByteBufUtil
 import io.netty.buffer.DefaultByteBufHolder
 import io.netty.buffer.Unpooled
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.buffer.crc32
 import org.openrs2.buffer.use
 import org.openrs2.cache.ChecksumTable
@ -30,8 +32,6 @@ import java.sql.SQLException
 import java.sql.Types
 import java.time.Instant
 import java.time.ZoneOffset
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class CacheImporter @Inject constructor(
--- a/archive/src/main/kotlin/org/openrs2/archive/cache/CrossPollinator.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/cache/CrossPollinator.kt
@ -4,6 +4,8 @@ import io.netty.buffer.ByteBuf
 import io.netty.buffer.ByteBufAllocator
 import io.netty.buffer.ByteBufInputStream
 import io.netty.buffer.Unpooled
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.buffer.crc32
 import org.openrs2.buffer.use
 import org.openrs2.cache.Js5Compression
@ -11,8 +13,6 @@ import org.openrs2.cache.Js5CompressionType
 import org.openrs2.db.Database
 import java.sql.Connection
 import java.util.zip.GZIPInputStream
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class CrossPollinator @Inject constructor(
--- a/archive/src/main/kotlin/org/openrs2/archive/game/GameDatabase.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/game/GameDatabase.kt
@ -1,8 +1,8 @@
 package org.openrs2.archive.game

+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.db.Database
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class GameDatabase @Inject constructor(
--- a/archive/src/main/kotlin/org/openrs2/archive/key/HdosKeyDownloader.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/key/HdosKeyDownloader.kt
@ -1,5 +1,7 @@
 package org.openrs2.archive.key

+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.future.await
 import kotlinx.coroutines.withContext
@ -10,8 +12,6 @@ import java.net.http.HttpClient
 import java.net.http.HttpRequest
 import java.net.http.HttpResponse
 import java.time.Duration
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class HdosKeyDownloader @Inject constructor(
--- a/archive/src/main/kotlin/org/openrs2/archive/key/JsonKeyReader.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/key/JsonKeyReader.kt
@ -2,12 +2,12 @@ package org.openrs2.archive.key

 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.kotlin.treeToValue
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.crypto.XteaKey
 import org.openrs2.json.Json
 import java.io.IOException
 import java.io.InputStream
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class JsonKeyReader @Inject constructor(
--- a/archive/src/main/kotlin/org/openrs2/archive/key/KeyBruteForcer.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/key/KeyBruteForcer.kt
@ -1,6 +1,8 @@
 package org.openrs2.archive.key

 import io.netty.buffer.Unpooled
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.buffer.crc32
 import org.openrs2.buffer.use
 import org.openrs2.cache.Js5Compression
@ -8,8 +10,6 @@ import org.openrs2.crypto.XteaKey
 import org.openrs2.db.Database
 import java.sql.Connection
 import java.sql.Types
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class KeyBruteForcer @Inject constructor(
--- a/archive/src/main/kotlin/org/openrs2/archive/key/KeyExporter.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/key/KeyExporter.kt
@ -1,11 +1,11 @@
 package org.openrs2.archive.key

+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.crypto.XteaKey
 import org.openrs2.db.Database
 import java.io.BufferedOutputStream
 import java.io.DataOutputStream
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class KeyExporter @Inject constructor(
--- a/archive/src/main/kotlin/org/openrs2/archive/key/KeyImporter.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/key/KeyImporter.kt
@ -1,6 +1,8 @@
 package org.openrs2.archive.key

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.crypto.XteaKey
 import org.openrs2.db.Database
 import java.io.IOException
@ -10,8 +12,6 @@ import java.sql.Connection
 import java.sql.Types
 import java.time.Instant
 import java.time.ZoneOffset
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class KeyImporter @Inject constructor(
--- a/archive/src/main/kotlin/org/openrs2/archive/key/RuneLiteKeyDownloader.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/key/RuneLiteKeyDownloader.kt
@ -1,5 +1,7 @@
 package org.openrs2.archive.key

+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.future.await
 import kotlinx.coroutines.withContext
@ -10,8 +12,6 @@ import java.net.http.HttpClient
 import java.net.http.HttpRequest
 import java.net.http.HttpResponse
 import java.time.Duration
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class RuneLiteKeyDownloader @Inject constructor(
--- a/archive/src/main/kotlin/org/openrs2/archive/map/MapRenderer.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/map/MapRenderer.kt
@ -3,6 +3,7 @@ package org.openrs2.archive.map
 import io.netty.buffer.ByteBuf
 import io.netty.buffer.Unpooled
 import it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap
+import jakarta.inject.Inject
 import org.openrs2.buffer.use
 import org.openrs2.cache.Group
 import org.openrs2.cache.Js5Archive
@ -14,7 +15,6 @@ import java.awt.Color
 import java.awt.Graphics2D
 import java.awt.image.BufferedImage
 import java.sql.Connection
-import javax.inject.Inject
 import kotlin.math.max
 import kotlin.math.min

--- a/archive/src/main/kotlin/org/openrs2/archive/name/NameImporter.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/name/NameImporter.kt
@ -1,9 +1,9 @@
 package org.openrs2.archive.name

+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.db.Database
 import org.openrs2.util.krHashCode
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class NameImporter @Inject constructor(
--- a/archive/src/main/kotlin/org/openrs2/archive/name/RuneStarNameDownloader.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/name/RuneStarNameDownloader.kt
@ -1,5 +1,7 @@
 package org.openrs2.archive.name

+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import kotlinx.coroutines.future.await
 import org.openrs2.http.checkStatusCode
 import java.io.IOException
@ -8,8 +10,6 @@ import java.net.http.HttpClient
 import java.net.http.HttpRequest
 import java.net.http.HttpResponse
 import java.time.Duration
-import javax.inject.Inject
-import javax.inject.Singleton
 import kotlin.streams.asSequence

@Singleton
--- a/archive/src/main/kotlin/org/openrs2/archive/web/CachesController.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/web/CachesController.kt
@ -18,6 +18,8 @@ import io.ktor.server.response.respondOutputStream
 import io.ktor.server.thymeleaf.ThymeleafContent
 import io.netty.buffer.ByteBufAllocator
 import io.netty.buffer.ByteBufUtil
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withPermit
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream
@ -37,8 +39,6 @@ import java.util.zip.Deflater
 import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
 import javax.imageio.ImageIO
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class CachesController @Inject constructor(
--- a/archive/src/main/kotlin/org/openrs2/archive/web/KeysController.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/web/KeysController.kt
@ -5,12 +5,12 @@ import io.ktor.server.application.ApplicationCall
 import io.ktor.server.request.receive
 import io.ktor.server.response.respond
 import io.ktor.server.thymeleaf.ThymeleafContent
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.archive.key.KeyExporter
 import org.openrs2.archive.key.KeyImporter
 import org.openrs2.archive.key.KeySource
 import org.openrs2.crypto.XteaKey
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class KeysController @Inject constructor(
--- a/archive/src/main/kotlin/org/openrs2/archive/web/WebServer.kt
+++ b/archive/src/main/kotlin/org/openrs2/archive/web/WebServer.kt
@ -27,12 +27,12 @@ import io.ktor.server.routing.routing
 import io.ktor.server.thymeleaf.Thymeleaf
 import io.ktor.server.thymeleaf.ThymeleafContent
 import io.ktor.server.webjars.Webjars
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.json.Json
 import org.thymeleaf.extras.java8time.dialect.Java8TimeDialect
 import org.thymeleaf.templatemode.TemplateMode
 import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class WebServer @Inject constructor(
--- a/asm/src/main/kotlin/org/openrs2/asm/AsmJacksonModule.kt
+++ b/asm/src/main/kotlin/org/openrs2/asm/AsmJacksonModule.kt
@ -1,7 +1,7 @@
 package org.openrs2.asm

 import com.fasterxml.jackson.databind.module.SimpleModule
-import javax.inject.Singleton
+import jakarta.inject.Singleton

@Singleton
 public class AsmJacksonModule : SimpleModule() {
--- a/asm/src/main/kotlin/org/openrs2/asm/io/PackClassLibraryReader.kt
+++ b/asm/src/main/kotlin/org/openrs2/asm/io/PackClassLibraryReader.kt
@ -1,14 +1,14 @@
 package org.openrs2.asm.io

 import io.netty.buffer.ByteBufAllocator
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.objectweb.asm.tree.ClassNode
 import org.openrs2.asm.packclass.ConstantPool
 import org.openrs2.asm.packclass.PackClass
 import org.openrs2.buffer.use
 import org.openrs2.cache.Js5Pack
 import java.io.InputStream
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class PackClassLibraryReader @Inject constructor(
--- a/asm/src/main/kotlin/org/openrs2/asm/io/PackClassLibraryWriter.kt
+++ b/asm/src/main/kotlin/org/openrs2/asm/io/PackClassLibraryWriter.kt
@ -1,6 +1,8 @@
 package org.openrs2.asm.io

 import io.netty.buffer.ByteBufAllocator
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.objectweb.asm.tree.ClassNode
 import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.packclass.ConstantPool
@ -8,8 +10,6 @@ import org.openrs2.asm.packclass.PackClass
 import org.openrs2.buffer.use
 import org.openrs2.cache.Js5Pack
 import java.io.OutputStream
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class PackClassLibraryWriter @Inject constructor(
--- a/buffer/src/main/kotlin/org/openrs2/buffer/ByteBufBodyHandler.kt
+++ b/buffer/src/main/kotlin/org/openrs2/buffer/ByteBufBodyHandler.kt
@ -3,13 +3,13 @@ package org.openrs2.buffer
 import io.netty.buffer.ByteBuf
 import io.netty.buffer.ByteBufAllocator
 import io.netty.buffer.Unpooled
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import java.net.http.HttpResponse
 import java.nio.ByteBuffer
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.CompletionStage
 import java.util.concurrent.Flow
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class ByteBufBodyHandler @Inject constructor(
--- a/cache-550/src/main/kotlin/org/openrs2/cache/config/enum/EnumTypeList.kt
+++ b/cache-550/src/main/kotlin/org/openrs2/cache/config/enum/EnumTypeList.kt
@ -1,10 +1,10 @@
 package org.openrs2.cache.config.enum

+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.cache.Cache
 import org.openrs2.cache.Js5Archive
 import org.openrs2.cache.config.ArchiveConfigTypeList
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class EnumTypeList @Inject constructor(cache: Cache) : ArchiveConfigTypeList<EnumType>(
--- a/cache-550/src/main/kotlin/org/openrs2/cache/config/inv/InvTypeList.kt
+++ b/cache-550/src/main/kotlin/org/openrs2/cache/config/inv/InvTypeList.kt
@ -1,11 +1,11 @@
 package org.openrs2.cache.config.inv

+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.cache.Cache
 import org.openrs2.cache.Js5Archive
 import org.openrs2.cache.Js5ConfigGroup
 import org.openrs2.cache.config.GroupConfigTypeList
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class InvTypeList @Inject constructor(cache: Cache) : GroupConfigTypeList<InvType>(
--- a/cache-550/src/main/kotlin/org/openrs2/cache/config/param/ParamTypeList.kt
+++ b/cache-550/src/main/kotlin/org/openrs2/cache/config/param/ParamTypeList.kt
@ -1,11 +1,11 @@
 package org.openrs2.cache.config.param

+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.cache.Cache
 import org.openrs2.cache.Js5Archive
 import org.openrs2.cache.Js5ConfigGroup
 import org.openrs2.cache.config.GroupConfigTypeList
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class ParamTypeList @Inject constructor(cache: Cache) : GroupConfigTypeList<ParamType>(
--- a/cache-550/src/main/kotlin/org/openrs2/cache/config/struct/StructTypeList.kt
+++ b/cache-550/src/main/kotlin/org/openrs2/cache/config/struct/StructTypeList.kt
@ -1,11 +1,11 @@
 package org.openrs2.cache.config.struct

+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.cache.Cache
 import org.openrs2.cache.Js5Archive
 import org.openrs2.cache.Js5ConfigGroup
 import org.openrs2.cache.config.GroupConfigTypeList
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class StructTypeList @Inject constructor(cache: Cache) : GroupConfigTypeList<StructType>(
--- a/cache-550/src/main/kotlin/org/openrs2/cache/config/varbit/VarbitTypeList.kt
+++ b/cache-550/src/main/kotlin/org/openrs2/cache/config/varbit/VarbitTypeList.kt
@ -1,10 +1,10 @@
 package org.openrs2.cache.config.varbit

+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.cache.Cache
 import org.openrs2.cache.Js5Archive
 import org.openrs2.cache.config.ArchiveConfigTypeList
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class VarbitTypeList @Inject constructor(cache: Cache) : ArchiveConfigTypeList<VarbitType>(
--- a/cache-550/src/main/kotlin/org/openrs2/cache/config/varp/VarpTypeList.kt
+++ b/cache-550/src/main/kotlin/org/openrs2/cache/config/varp/VarpTypeList.kt
@ -1,11 +1,11 @@
 package org.openrs2.cache.config.varp

+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.cache.Cache
 import org.openrs2.cache.Js5Archive
 import org.openrs2.cache.Js5ConfigGroup
 import org.openrs2.cache.config.GroupConfigTypeList
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class VarpTypeList @Inject constructor(cache: Cache) : GroupConfigTypeList<VarpType>(
--- a/cache/src/main/kotlin/org/openrs2/cache/RuneLiteStore.kt
+++ b/cache/src/main/kotlin/org/openrs2/cache/RuneLiteStore.kt
@ -2,13 +2,13 @@ package org.openrs2.cache

 import io.netty.buffer.ByteBufAllocator
 import io.netty.buffer.Unpooled
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.buffer.crc32
 import org.openrs2.buffer.use
 import java.nio.file.Files
 import java.nio.file.Path
 import java.util.Base64
-import javax.inject.Inject
-import javax.inject.Singleton
 import kotlin.io.path.name

@Singleton
--- a/conf/src/main/kotlin/org/openrs2/conf/ConfigProvider.kt
+++ b/conf/src/main/kotlin/org/openrs2/conf/ConfigProvider.kt
@ -1,11 +1,11 @@
 package org.openrs2.conf

 import com.fasterxml.jackson.databind.ObjectMapper
+import jakarta.inject.Inject
+import jakarta.inject.Provider
 import org.openrs2.yaml.Yaml
 import java.nio.file.Files
 import java.nio.file.Path
-import javax.inject.Inject
-import javax.inject.Provider

 public class ConfigProvider @Inject constructor(@Yaml private val mapper: ObjectMapper) : Provider<Config> {
    override fun get(): Config {
--- a/conf/src/main/kotlin/org/openrs2/conf/RsaKeyProvider.kt
+++ b/conf/src/main/kotlin/org/openrs2/conf/RsaKeyProvider.kt
@ -1,10 +1,10 @@
 package org.openrs2.conf

+import jakarta.inject.Provider
 import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters
 import org.openrs2.crypto.Rsa
 import java.nio.file.Files
 import java.nio.file.Path
-import javax.inject.Provider

 public class RsaKeyProvider : Provider<RSAPrivateCrtKeyParameters> {
    override fun get(): RSAPrivateCrtKeyParameters {
--- a/crypto/src/main/kotlin/org/openrs2/crypto/CryptoJacksonModule.kt
+++ b/crypto/src/main/kotlin/org/openrs2/crypto/CryptoJacksonModule.kt
@ -1,7 +1,7 @@
 package org.openrs2.crypto

 import com.fasterxml.jackson.databind.module.SimpleModule
-import javax.inject.Singleton
+import jakarta.inject.Singleton

@Singleton
 public class CryptoJacksonModule : SimpleModule() {
--- a/decompiler/src/main/kotlin/org/openrs2/decompiler/Decompiler.kt
+++ b/decompiler/src/main/kotlin/org/openrs2/decompiler/Decompiler.kt
@ -1,9 +1,9 @@
 package org.openrs2.decompiler

+import jakarta.inject.Singleton
 import org.jetbrains.java.decompiler.main.Fernflower
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences
 import org.openrs2.deob.util.Module
-import javax.inject.Singleton

@Singleton
 public class Decompiler {
--- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/AstDeobfuscator.kt
+++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/AstDeobfuscator.kt
@ -1,10 +1,10 @@
 package org.openrs2.deob.ast

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.deob.ast.transform.Transformer
 import org.openrs2.deob.util.Module
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class AstDeobfuscator @Inject constructor(
--- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/gl/GlRegistryProvider.kt
+++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/gl/GlRegistryProvider.kt
@ -1,8 +1,8 @@
 package org.openrs2.deob.ast.gl

+import jakarta.inject.Provider
 import java.nio.file.Files
 import java.nio.file.Path
-import javax.inject.Provider

 public class GlRegistryProvider : Provider<GlRegistry> {
    override fun get(): GlRegistry {
--- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/AddSubTransformer.kt
+++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/AddSubTransformer.kt
@ -7,13 +7,13 @@ import com.github.javaparser.ast.expr.IntegerLiteralExpr
 import com.github.javaparser.ast.expr.LiteralExpr
 import com.github.javaparser.ast.expr.LongLiteralExpr
 import com.github.javaparser.ast.expr.UnaryExpr
+import jakarta.inject.Singleton
 import org.openrs2.deob.ast.Library
 import org.openrs2.deob.ast.LibraryGroup
 import org.openrs2.deob.ast.util.hasSideEffects
 import org.openrs2.deob.ast.util.isString
 import org.openrs2.deob.ast.util.negate
 import org.openrs2.deob.ast.util.walk
-import javax.inject.Singleton

@Singleton
 public class AddSubTransformer : Transformer() {
--- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/BinaryExprOrderTransformer.kt
+++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/BinaryExprOrderTransformer.kt
@ -5,12 +5,12 @@ import com.github.javaparser.ast.expr.BinaryExpr
 import com.github.javaparser.ast.expr.Expression
 import com.github.javaparser.ast.expr.LiteralExpr
 import com.github.javaparser.ast.expr.ThisExpr
+import jakarta.inject.Singleton
 import org.openrs2.deob.ast.Library
 import org.openrs2.deob.ast.LibraryGroup
 import org.openrs2.deob.ast.util.flip
 import org.openrs2.deob.ast.util.isString
 import org.openrs2.deob.ast.util.walk
-import javax.inject.Singleton

@Singleton
 public class BinaryExprOrderTransformer : Transformer() {
--- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/BitMaskTransformer.kt
+++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/BitMaskTransformer.kt
@ -4,13 +4,13 @@ import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.BinaryExpr
 import com.github.javaparser.ast.expr.IntegerLiteralExpr
 import com.github.javaparser.ast.expr.LongLiteralExpr
+import jakarta.inject.Singleton
 import org.openrs2.deob.ast.Library
 import org.openrs2.deob.ast.LibraryGroup
 import org.openrs2.deob.ast.util.checkedAsInt
 import org.openrs2.deob.ast.util.checkedAsLong
 import org.openrs2.deob.ast.util.toLongLiteralExpr
 import org.openrs2.deob.ast.util.walk
-import javax.inject.Singleton

@Singleton
 public class BitMaskTransformer : Transformer() {
--- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/CharLiteralTransformer.kt
+++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/CharLiteralTransformer.kt
@ -14,6 +14,7 @@ import com.github.javaparser.ast.expr.Expression
 import com.github.javaparser.ast.expr.IntegerLiteralExpr
 import com.github.javaparser.ast.expr.UnaryExpr
 import com.github.javaparser.resolution.types.ResolvedPrimitiveType
+import jakarta.inject.Singleton
 import org.openrs2.deob.ast.Library
 import org.openrs2.deob.ast.LibraryGroup
 import org.openrs2.deob.ast.util.checkedAsInt
@ -25,7 +26,6 @@ import java.lang.Character.PARAGRAPH_SEPARATOR
 import java.lang.Character.PRIVATE_USE
 import java.lang.Character.SURROGATE
 import java.lang.Character.UNASSIGNED
-import javax.inject.Singleton

@Singleton
 public class CharLiteralTransformer : Transformer() {
--- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/ComplementTransformer.kt
+++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/ComplementTransformer.kt
@ -6,6 +6,7 @@ import com.github.javaparser.ast.expr.Expression
 import com.github.javaparser.ast.expr.IntegerLiteralExpr
 import com.github.javaparser.ast.expr.LongLiteralExpr
 import com.github.javaparser.ast.expr.UnaryExpr
+import jakarta.inject.Singleton
 import org.openrs2.deob.ast.Library
 import org.openrs2.deob.ast.LibraryGroup
 import org.openrs2.deob.ast.util.checkedAsInt
@ -13,7 +14,6 @@ import org.openrs2.deob.ast.util.checkedAsLong
 import org.openrs2.deob.ast.util.isIntegerOrLongLiteral
 import org.openrs2.deob.ast.util.toLongLiteralExpr
 import org.openrs2.deob.ast.util.walk
-import javax.inject.Singleton

@Singleton
 public class ComplementTransformer : Transformer() {
--- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/EncloseTransformer.kt
+++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/EncloseTransformer.kt
@ -14,10 +14,10 @@ import com.github.javaparser.ast.expr.InstanceOfExpr
 import com.github.javaparser.ast.expr.MethodCallExpr
 import com.github.javaparser.ast.expr.ObjectCreationExpr
 import com.github.javaparser.ast.expr.UnaryExpr
+import jakarta.inject.Singleton
 import org.openrs2.deob.ast.Library
 import org.openrs2.deob.ast.LibraryGroup
 import org.openrs2.deob.ast.util.walk
-import javax.inject.Singleton

@Singleton
 public class EncloseTransformer : Transformer() {
--- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/ForLoopConditionTransformer.kt
+++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/ForLoopConditionTransformer.kt
@ -10,12 +10,12 @@ import com.github.javaparser.ast.expr.UnaryExpr.Operator.POSTFIX_INCREMENT
 import com.github.javaparser.ast.expr.UnaryExpr.Operator.PREFIX_DECREMENT
 import com.github.javaparser.ast.expr.UnaryExpr.Operator.PREFIX_INCREMENT
 import com.github.javaparser.ast.stmt.ForStmt
+import jakarta.inject.Singleton
 import org.openrs2.deob.ast.Library
 import org.openrs2.deob.ast.LibraryGroup
 import org.openrs2.deob.ast.util.flip
 import org.openrs2.deob.ast.util.hasSideEffects
 import org.openrs2.deob.ast.util.walk
-import javax.inject.Singleton

@Singleton
 public class ForLoopConditionTransformer : Transformer() {
--- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/GlTransformer.kt
+++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/GlTransformer.kt
@ -22,6 +22,8 @@ import com.github.javaparser.resolution.types.ResolvedPrimitiveType
 import com.github.javaparser.resolution.types.ResolvedReferenceType
 import com.github.javaparser.resolution.types.ResolvedType
 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.deob.ast.Library
 import org.openrs2.deob.ast.LibraryGroup
 import org.openrs2.deob.ast.gl.GlCommand
@ -31,8 +33,6 @@ import org.openrs2.deob.ast.gl.GlRegistry
 import org.openrs2.deob.ast.util.checkedAsInt
 import org.openrs2.deob.ast.util.toHexLiteralExpr
 import org.openrs2.deob.ast.util.walk
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class GlTransformer @Inject constructor(private val registry: GlRegistry) : Transformer() {
--- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/HexLiteralTransformer.kt
+++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/HexLiteralTransformer.kt
@ -6,13 +6,13 @@ import com.github.javaparser.ast.expr.BinaryExpr
 import com.github.javaparser.ast.expr.Expression
 import com.github.javaparser.ast.expr.IntegerLiteralExpr
 import com.github.javaparser.ast.expr.LongLiteralExpr
+import jakarta.inject.Singleton
 import org.openrs2.deob.ast.Library
 import org.openrs2.deob.ast.LibraryGroup
 import org.openrs2.deob.ast.util.checkedAsInt
 import org.openrs2.deob.ast.util.checkedAsLong
 import org.openrs2.deob.ast.util.toHexLiteralExpr
 import org.openrs2.deob.ast.util.walk
-import javax.inject.Singleton

@Singleton
 public class HexLiteralTransformer : Transformer() {
--- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/IdentityTransformer.kt
+++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/IdentityTransformer.kt
@ -8,10 +8,10 @@ import com.github.javaparser.ast.expr.IntegerLiteralExpr
 import com.github.javaparser.ast.expr.LongLiteralExpr
 import com.github.javaparser.ast.expr.UnaryExpr
 import com.github.javaparser.ast.stmt.ExpressionStmt
+import jakarta.inject.Singleton
 import org.openrs2.deob.ast.Library
 import org.openrs2.deob.ast.LibraryGroup
 import org.openrs2.deob.ast.util.walk
-import javax.inject.Singleton

@Singleton
 public class IdentityTransformer : Transformer() {
--- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/IfElseTransformer.kt
+++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/IfElseTransformer.kt
@ -11,12 +11,12 @@ import com.github.javaparser.ast.stmt.ReturnStmt
 import com.github.javaparser.ast.stmt.Statement
 import com.github.javaparser.ast.stmt.ThrowStmt
 import com.github.javaparser.ast.type.VoidType
+import jakarta.inject.Singleton
 import org.openrs2.deob.ast.Library
 import org.openrs2.deob.ast.LibraryGroup
 import org.openrs2.deob.ast.util.countNots
 import org.openrs2.deob.ast.util.not
 import org.openrs2.deob.ast.util.walk
-import javax.inject.Singleton

@Singleton
 public class IfElseTransformer : Transformer() {
--- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/IncrementTransformer.kt
+++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/IncrementTransformer.kt
@ -4,10 +4,10 @@ import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.UnaryExpr
 import com.github.javaparser.ast.stmt.ExpressionStmt
 import com.github.javaparser.ast.stmt.ForStmt
+import jakarta.inject.Singleton
 import org.openrs2.deob.ast.Library
 import org.openrs2.deob.ast.LibraryGroup
 import org.openrs2.deob.ast.util.walk
-import javax.inject.Singleton

@Singleton
 public class IncrementTransformer : Transformer() {
--- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/NegativeLiteralTransformer.kt
+++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/NegativeLiteralTransformer.kt
@ -2,12 +2,12 @@ package org.openrs2.deob.ast.transform

 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.UnaryExpr
+import jakarta.inject.Singleton
 import org.openrs2.deob.ast.Library
 import org.openrs2.deob.ast.LibraryGroup
 import org.openrs2.deob.ast.util.isIntegerOrLongLiteral
 import org.openrs2.deob.ast.util.negate
 import org.openrs2.deob.ast.util.walk
-import javax.inject.Singleton

@Singleton
 public class NegativeLiteralTransformer : Transformer() {
--- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/NewInstanceTransformer.kt
+++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/NewInstanceTransformer.kt
@ -2,11 +2,11 @@ package org.openrs2.deob.ast.transform

 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.MethodCallExpr
+import jakarta.inject.Singleton
 import org.openrs2.deob.ast.Library
 import org.openrs2.deob.ast.LibraryGroup
 import org.openrs2.deob.ast.util.isClass
 import org.openrs2.deob.ast.util.walk
-import javax.inject.Singleton

@Singleton
 public class NewInstanceTransformer : Transformer() {
--- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/NotTransformer.kt
+++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/NotTransformer.kt
@ -8,11 +8,11 @@ import com.github.javaparser.ast.expr.BooleanLiteralExpr
 import com.github.javaparser.ast.expr.Expression
 import com.github.javaparser.ast.expr.UnaryExpr
 import com.github.javaparser.ast.expr.UnaryExpr.Operator.LOGICAL_COMPLEMENT
+import jakarta.inject.Singleton
 import org.openrs2.deob.ast.Library
 import org.openrs2.deob.ast.LibraryGroup
 import org.openrs2.deob.ast.util.not
 import org.openrs2.deob.ast.util.walk
-import javax.inject.Singleton

@Singleton
 public class NotTransformer : Transformer() {
--- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/RedundantCastTransformer.kt
+++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/RedundantCastTransformer.kt
@ -19,10 +19,10 @@ import com.github.javaparser.resolution.types.ResolvedPrimitiveType.INT
 import com.github.javaparser.resolution.types.ResolvedPrimitiveType.LONG
 import com.github.javaparser.resolution.types.ResolvedPrimitiveType.SHORT
 import com.google.common.collect.ImmutableSetMultimap
+import jakarta.inject.Singleton
 import org.openrs2.deob.ast.Library
 import org.openrs2.deob.ast.LibraryGroup
 import org.openrs2.deob.ast.util.walk
-import javax.inject.Singleton

@Singleton
 public class RedundantCastTransformer : Transformer() {
--- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/TernaryTransformer.kt
+++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/TernaryTransformer.kt
@ -2,12 +2,12 @@ package org.openrs2.deob.ast.transform

 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.ConditionalExpr
+import jakarta.inject.Singleton
 import org.openrs2.deob.ast.Library
 import org.openrs2.deob.ast.LibraryGroup
 import org.openrs2.deob.ast.util.countNots
 import org.openrs2.deob.ast.util.not
 import org.openrs2.deob.ast.util.walk
-import javax.inject.Singleton

@Singleton
 public class TernaryTransformer : Transformer() {
--- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/UnencloseTransformer.kt
+++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/UnencloseTransformer.kt
@ -2,10 +2,10 @@ package org.openrs2.deob.ast.transform

 import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.EnclosedExpr
+import jakarta.inject.Singleton
 import org.openrs2.deob.ast.Library
 import org.openrs2.deob.ast.LibraryGroup
 import org.openrs2.deob.ast.util.walk
-import javax.inject.Singleton

@Singleton
 public class UnencloseTransformer : Transformer() {
--- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/ValueOfTransformer.kt
+++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/ValueOfTransformer.kt
@ -4,10 +4,10 @@ import com.github.javaparser.ast.CompilationUnit
 import com.github.javaparser.ast.expr.MethodCallExpr
 import com.github.javaparser.ast.expr.ObjectCreationExpr
 import com.github.javaparser.ast.expr.TypeExpr
+import jakarta.inject.Singleton
 import org.openrs2.deob.ast.Library
 import org.openrs2.deob.ast.LibraryGroup
 import org.openrs2.deob.ast.util.walk
-import javax.inject.Singleton

@Singleton
 public class ValueOfTransformer : Transformer() {
--- 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,6 +1,8 @@
 package org.openrs2.deob.bytecode

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.io.JarLibraryReader
@ -11,8 +13,6 @@ 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 BytecodeDeobfuscator @Inject constructor(
--- 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,6 +1,6 @@
 package org.openrs2.deob.bytecode

-import javax.inject.Qualifier
+import jakarta.inject.Qualifier

@Qualifier
@Retention(AnnotationRetention.RUNTIME)
--- 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,11 +1,11 @@
 package org.openrs2.deob.bytecode

 import com.fasterxml.jackson.databind.ObjectMapper
+import jakarta.inject.Inject
+import jakarta.inject.Provider
 import org.openrs2.yaml.Yaml
 import java.nio.file.Files
 import java.nio.file.Path
-import javax.inject.Inject
-import javax.inject.Provider

 public class ProfileProvider @Inject constructor(@Yaml private val mapper: ObjectMapper) : Provider<Profile> {
    override fun get(): Profile {
--- 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,6 +1,7 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Singleton
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodNode
@ -10,7 +11,6 @@ import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.intConstant
 import org.openrs2.asm.toAbstractInsnNode
 import org.openrs2.asm.transform.Transformer
-import javax.inject.Singleton

@Singleton
 public class BitShiftTransformer : Transformer() {
--- 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,6 +1,7 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Singleton
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.InsnNode
@ -13,7 +14,6 @@ import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.hasCode
 import org.openrs2.asm.transform.Transformer
-import javax.inject.Singleton

@Singleton
 public class BitwiseOpTransformer : Transformer() {
--- 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,11 +1,11 @@
 package org.openrs2.deob.bytecode.transform

+import jakarta.inject.Singleton
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.transform.Transformer
-import javax.inject.Singleton

@Singleton
 public class CanvasTransformer : Transformer() {
--- 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,6 +1,7 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Singleton
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.ClassNode
@ -15,7 +16,6 @@ import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.toInternalClassName
 import org.openrs2.asm.transform.Transformer
-import javax.inject.Singleton

@Singleton
 public class ClassLiteralTransformer : Transformer() {
--- 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,6 +1,8 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.objectweb.asm.Opcodes.GOTO
 import org.objectweb.asm.Opcodes.IFEQ
 import org.objectweb.asm.Opcodes.IFGE
@ -47,8 +49,6 @@ 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.UniqueQueue
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class ConstantArgTransformer @Inject constructor(private val profile: Profile) : Transformer() {
--- 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,6 +1,7 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Singleton
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodNode
@ -9,7 +10,6 @@ import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.transform.Transformer
 import org.openrs2.deob.bytecode.analysis.CopyPropagationAnalyzer
-import javax.inject.Singleton

 /**
 * A [Transformer] that performs
--- 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,6 +1,7 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Singleton
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldInsnNode
 import org.objectweb.asm.tree.MethodNode
@ -10,7 +11,6 @@ import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.hasCode
 import org.openrs2.asm.transform.Transformer
-import javax.inject.Singleton

@Singleton
 public class CounterTransformer : Transformer() {
--- 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,6 +1,7 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Singleton
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldNode
@ -10,7 +11,6 @@ import org.objectweb.asm.tree.TypeInsnNode
 import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.transform.Transformer
-import javax.inject.Singleton

@Singleton
 public class EmptyClassTransformer : Transformer() {
--- 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,6 +1,7 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Singleton
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodNode
 import org.openrs2.asm.InsnMatcher
@ -8,7 +9,6 @@ import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.nextReal
 import org.openrs2.asm.transform.Transformer
-import javax.inject.Singleton

 /**
 * A [Transformer] responsible for removing two kinds of redundant exception
--- 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,6 +1,7 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Singleton
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.InsnNode
@ -9,7 +10,6 @@ import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.nextReal
 import org.openrs2.asm.transform.Transformer
-import javax.inject.Singleton

@Singleton
 public class FernflowerExceptionTransformer : Transformer() {
--- 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,5 +1,6 @@
 package org.openrs2.deob.bytecode.transform

+import jakarta.inject.Singleton
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldInsnNode
@ -8,7 +9,6 @@ import org.openrs2.asm.MemberDesc
 import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.transform.Transformer
-import javax.inject.Singleton

@Singleton
 public class FieldOrderTransformer : Transformer() {
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FinalClassTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FinalClassTransformer.kt
@ -1,12 +1,12 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Singleton
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.transform.Transformer
-import javax.inject.Singleton

@Singleton
 public class FinalClassTransformer : Transformer() {
--- 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,6 +1,7 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Singleton
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldInsnNode
@ -17,7 +18,6 @@ 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

@Singleton
 public class FinalFieldTransformer : Transformer() {
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FinalMethodTransformer.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/FinalMethodTransformer.kt
@ -1,6 +1,7 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Singleton
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodNode
@ -9,7 +10,6 @@ import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.transform.Transformer
 import org.openrs2.util.collect.DisjointSet
-import javax.inject.Singleton

@Singleton
 public class FinalMethodTransformer : Transformer() {
--- 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,6 +1,7 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Singleton
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodInsnNode
@ -8,7 +9,6 @@ import org.objectweb.asm.tree.MethodNode
 import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.transform.Transformer
-import javax.inject.Singleton

 /**
 * A [Transformer] that replaces `INVOKESPECIAL` instructions in static methods
--- 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,12 +1,12 @@
 package org.openrs2.deob.bytecode.transform

+import jakarta.inject.Singleton
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodNode
 import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.transform.Transformer
-import javax.inject.Singleton

@Singleton
 public class MethodOrderTransformer : Transformer() {
--- 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,6 +1,7 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Singleton
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.commons.JSRInlinerAdapter
 import org.objectweb.asm.tree.AbstractInsnNode
@ -15,7 +16,6 @@ import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.nextReal
 import org.openrs2.asm.previousReal
 import org.openrs2.asm.transform.Transformer
-import javax.inject.Singleton

 /**
 * A [Transformer] that rewrites `synchronized` blocks produced by older
--- 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,6 +1,7 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Singleton
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.ClassNode
@ -14,7 +15,6 @@ import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.hasCode
 import org.openrs2.asm.transform.Transformer
-import javax.inject.Singleton

@Singleton
 public class OpaquePredicateTransformer : Transformer() {
--- 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,5 +1,6 @@
 package org.openrs2.deob.bytecode.transform

+import jakarta.inject.Singleton
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.AnnotationNode
 import org.objectweb.asm.tree.ClassNode
@ -11,7 +12,6 @@ import org.openrs2.asm.transform.Transformer
 import org.openrs2.deob.annotation.OriginalArg
 import org.openrs2.deob.annotation.OriginalClass
 import org.openrs2.deob.annotation.OriginalMember
-import javax.inject.Singleton

@Singleton
 public class OriginalNameTransformer : Transformer() {
--- 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,6 +1,8 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.LabelNode
@ -13,8 +15,6 @@ import org.openrs2.asm.transform.Transformer
 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

@Singleton
 public class OriginalPcRestoreTransformer @Inject constructor(private val nameMap: NameMap) : Transformer() {
--- 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,12 +1,12 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Singleton
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodNode
 import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.transform.Transformer
-import javax.inject.Singleton

@Singleton
 public class OriginalPcSaveTransformer : Transformer() {
--- 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,6 +1,7 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Singleton
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.AnnotationNode
@ -10,7 +11,6 @@ import org.openrs2.asm.MemberDesc
 import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.transform.Transformer
-import javax.inject.Singleton

@Singleton
 public class OverrideTransformer : Transformer() {
--- 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,11 +1,11 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.transform.Transformer
 import org.openrs2.patcher.PatcherQualifier
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class PatcherTransformer @Inject constructor(
--- 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,6 +1,7 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Singleton
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.JumpInsnNode
@ -10,7 +11,6 @@ import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.nextReal
 import org.openrs2.asm.removeDeadCode
 import org.openrs2.asm.transform.Transformer
-import javax.inject.Singleton

@Singleton
 public class RedundantGotoTransformer : Transformer() {
--- 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,12 +1,12 @@
 package org.openrs2.deob.bytecode.transform

+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.transform.Transformer
 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

@Singleton
 public class RemapTransformer @Inject constructor(
--- 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,6 +1,7 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Singleton
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.ClassNode
@ -16,7 +17,6 @@ import org.openrs2.asm.hasCode
 import org.openrs2.asm.nextReal
 import org.openrs2.asm.removeDeadCode
 import org.openrs2.asm.transform.Transformer
-import javax.inject.Singleton

@Singleton
 public class ResetTransformer : Transformer() {
--- 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,6 +1,8 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.AbstractInsnNode
@ -23,8 +25,6 @@ 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

@Singleton
 public class UnusedArgTransformer @Inject constructor(private val profile: Profile) : Transformer() {
--- 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,6 +1,7 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Singleton
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.ClassNode
@ -12,7 +13,6 @@ import org.openrs2.asm.deleteExpression
 import org.openrs2.asm.isPure
 import org.openrs2.asm.transform.Transformer
 import org.openrs2.deob.bytecode.analysis.LiveVariableAnalyzer
-import javax.inject.Singleton

@Singleton
 public class UnusedLocalTransformer : Transformer() {
--- 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,6 +1,8 @@
 package org.openrs2.deob.bytecode.transform

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.MethodInsnNode
 import org.openrs2.asm.MemberRef
@ -14,8 +16,6 @@ import org.openrs2.deob.bytecode.Profile
 import org.openrs2.deob.bytecode.filter.ReflectedConstructorFilter
 import org.openrs2.util.collect.DisjointSet
 import org.openrs2.util.collect.UniqueQueue
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class UnusedMethodTransformer @Inject constructor(private val profile: Profile) : Transformer() {
--- 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
@ -3,6 +3,8 @@ package org.openrs2.deob.bytecode.transform
 import com.github.michaelbull.logging.InlineLogger
 import com.google.common.collect.HashMultimap
 import com.google.common.collect.Multimap
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.ClassNode
@ -19,8 +21,6 @@ import org.openrs2.asm.transform.Transformer
 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

@Singleton
 public class VisibilityTransformer @Inject constructor(private val profile: Profile) : Transformer() {
--- a/deob-util/src/main/kotlin/org/openrs2/deob/util/map/NameMapProvider.kt
+++ b/deob-util/src/main/kotlin/org/openrs2/deob/util/map/NameMapProvider.kt
@ -1,11 +1,11 @@
 package org.openrs2.deob.util.map

 import com.fasterxml.jackson.databind.ObjectMapper
+import jakarta.inject.Inject
+import jakarta.inject.Provider
 import org.openrs2.yaml.Yaml
 import java.nio.file.Files
 import java.nio.file.Path
-import javax.inject.Inject
-import javax.inject.Provider

 public class NameMapProvider @Inject constructor(@Yaml private val mapper: ObjectMapper) : Provider<NameMap> {
    override fun get(): NameMap {
--- a/deob/src/main/kotlin/org/openrs2/deob/Deobfuscator.kt
+++ b/deob/src/main/kotlin/org/openrs2/deob/Deobfuscator.kt
@ -1,13 +1,13 @@
 package org.openrs2.deob

 import com.github.michaelbull.logging.InlineLogger
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.decompiler.Decompiler
 import org.openrs2.deob.ast.AstDeobfuscator
 import org.openrs2.deob.bytecode.BytecodeDeobfuscator
 import org.openrs2.deob.util.Module
 import java.nio.file.Path
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class Deobfuscator @Inject constructor(
--- a/game/src/main/kotlin/org/openrs2/game/GameServer.kt
+++ b/game/src/main/kotlin/org/openrs2/game/GameServer.kt
@ -3,8 +3,8 @@ package org.openrs2.game
 import com.github.michaelbull.logging.InlineLogger
 import com.google.common.util.concurrent.Service
 import com.google.common.util.concurrent.ServiceManager
-import javax.inject.Inject
-import javax.inject.Singleton
+import jakarta.inject.Inject
+import jakarta.inject.Singleton

@Singleton
 public class GameServer @Inject constructor(
--- a/game/src/main/kotlin/org/openrs2/game/GameService.kt
+++ b/game/src/main/kotlin/org/openrs2/game/GameService.kt
@ -1,8 +1,8 @@
 package org.openrs2.game

 import com.google.common.util.concurrent.AbstractScheduledService
+import jakarta.inject.Singleton
 import java.util.concurrent.TimeUnit
-import javax.inject.Singleton

@Singleton
 public class GameService : AbstractScheduledService() {
--- a/game/src/main/kotlin/org/openrs2/game/cache/CacheProvider.kt
+++ b/game/src/main/kotlin/org/openrs2/game/cache/CacheProvider.kt
@ -1,10 +1,10 @@
 package org.openrs2.game.cache

 import io.netty.buffer.ByteBufAllocator
+import jakarta.inject.Inject
+import jakarta.inject.Provider
 import org.openrs2.cache.Cache
 import org.openrs2.cache.Store
-import javax.inject.Inject
-import javax.inject.Provider

 public class CacheProvider @Inject constructor(
    private val store: Store,
--- a/game/src/main/kotlin/org/openrs2/game/cache/Js5MasterIndexProvider.kt
+++ b/game/src/main/kotlin/org/openrs2/game/cache/Js5MasterIndexProvider.kt
@ -1,10 +1,10 @@
 package org.openrs2.game.cache

+import jakarta.inject.Inject
+import jakarta.inject.Provider
 import org.openrs2.cache.Js5MasterIndex
 import org.openrs2.cache.MasterIndexFormat
 import org.openrs2.cache.Store
-import javax.inject.Inject
-import javax.inject.Provider

 public class Js5MasterIndexProvider @Inject constructor(
    private val store: Store
--- a/game/src/main/kotlin/org/openrs2/game/cache/StoreProvider.kt
+++ b/game/src/main/kotlin/org/openrs2/game/cache/StoreProvider.kt
@ -1,10 +1,10 @@
 package org.openrs2.game.cache

 import io.netty.buffer.ByteBufAllocator
+import jakarta.inject.Inject
+import jakarta.inject.Provider
 import org.openrs2.cache.Store
 import java.nio.file.Path
-import javax.inject.Inject
-import javax.inject.Provider

 public class StoreProvider @Inject constructor(
    private val alloc: ByteBufAllocator
--- a/game/src/main/kotlin/org/openrs2/game/cluster/CountryList.kt
+++ b/game/src/main/kotlin/org/openrs2/game/cluster/CountryList.kt
@ -1,10 +1,10 @@
 package org.openrs2.game.cluster

+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.cache.config.enum.EnumTypeList
 import org.openrs2.conf.CountryCode
 import org.openrs2.protocol.world.downstream.WorldListResponse
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class CountryList @Inject constructor(
--- a/game/src/main/kotlin/org/openrs2/game/cluster/SingleWorldCluster.kt
+++ b/game/src/main/kotlin/org/openrs2/game/cluster/SingleWorldCluster.kt
@ -1,10 +1,10 @@
 package org.openrs2.game.cluster

+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.conf.Config
 import org.openrs2.protocol.world.downstream.WorldListResponse
 import java.util.SortedMap
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class SingleWorldCluster @Inject constructor(
--- a/game/src/main/kotlin/org/openrs2/game/net/FileProvider.kt
+++ b/game/src/main/kotlin/org/openrs2/game/net/FileProvider.kt
@ -2,10 +2,10 @@ package org.openrs2.game.net

 import io.netty.channel.DefaultFileRegion
 import io.netty.channel.FileRegion
+import jakarta.inject.Singleton
 import java.nio.channels.FileChannel
 import java.nio.file.Files
 import java.nio.file.Path
-import javax.inject.Singleton

@Singleton
 public class FileProvider {
--- a/game/src/main/kotlin/org/openrs2/game/net/NetworkService.kt
+++ b/game/src/main/kotlin/org/openrs2/game/net/NetworkService.kt
@ -2,12 +2,12 @@ package org.openrs2.game.net

 import com.google.common.util.concurrent.AbstractService
 import io.netty.channel.EventLoopGroup
+import jakarta.inject.Inject
+import jakarta.inject.Singleton
 import org.openrs2.game.net.http.HttpChannelInitializer
 import org.openrs2.net.BootstrapFactory
 import org.openrs2.net.asCompletableFuture
 import java.util.concurrent.CompletableFuture
-import javax.inject.Inject
-import javax.inject.Singleton

@Singleton
 public class NetworkService @Inject constructor(
--- a/Show More
+++ b/Show More