diff --git a/archive/src/main/kotlin/org/openrs2/archive/ArchiveConfigProvider.kt b/archive/src/main/kotlin/org/openrs2/archive/ArchiveConfigProvider.kt index 9d05d71017..8f846f22de 100644 --- 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 diff --git a/archive/src/main/kotlin/org/openrs2/archive/DataSourceProvider.kt b/archive/src/main/kotlin/org/openrs2/archive/DataSourceProvider.kt index dbd54c7520..45f0c05c72 100644 --- 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( diff --git a/archive/src/main/kotlin/org/openrs2/archive/DatabaseProvider.kt b/archive/src/main/kotlin/org/openrs2/archive/DatabaseProvider.kt index 823bb39075..35d1a5a126 100644 --- 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( diff --git a/archive/src/main/kotlin/org/openrs2/archive/cache/CacheDownloader.kt b/archive/src/main/kotlin/org/openrs2/archive/cache/CacheDownloader.kt index 2467692522..dbda80c7a0 100644 --- 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 diff --git a/archive/src/main/kotlin/org/openrs2/archive/cache/CacheExporter.kt b/archive/src/main/kotlin/org/openrs2/archive/cache/CacheExporter.kt index 8b5eba9006..7c788b9524 100644 --- 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( diff --git a/archive/src/main/kotlin/org/openrs2/archive/cache/CacheImporter.kt b/archive/src/main/kotlin/org/openrs2/archive/cache/CacheImporter.kt index 31d374aa0f..eaea710ad3 100644 --- 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( diff --git a/archive/src/main/kotlin/org/openrs2/archive/cache/CrossPollinator.kt b/archive/src/main/kotlin/org/openrs2/archive/cache/CrossPollinator.kt index 91a7c19402..1db77692de 100644 --- 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( diff --git a/archive/src/main/kotlin/org/openrs2/archive/game/GameDatabase.kt b/archive/src/main/kotlin/org/openrs2/archive/game/GameDatabase.kt index ad1b77aa18..7edb320c81 100644 --- 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( diff --git a/archive/src/main/kotlin/org/openrs2/archive/key/HdosKeyDownloader.kt b/archive/src/main/kotlin/org/openrs2/archive/key/HdosKeyDownloader.kt index 5c8fd4e326..970883f1b0 100644 --- 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( diff --git a/archive/src/main/kotlin/org/openrs2/archive/key/JsonKeyReader.kt b/archive/src/main/kotlin/org/openrs2/archive/key/JsonKeyReader.kt index 4b0e724d2d..453912d10c 100644 --- 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( diff --git a/archive/src/main/kotlin/org/openrs2/archive/key/KeyBruteForcer.kt b/archive/src/main/kotlin/org/openrs2/archive/key/KeyBruteForcer.kt index 269e5689cf..8fb54d2c27 100644 --- 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( diff --git a/archive/src/main/kotlin/org/openrs2/archive/key/KeyExporter.kt b/archive/src/main/kotlin/org/openrs2/archive/key/KeyExporter.kt index 2f82ec8923..faabcc280c 100644 --- 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( diff --git a/archive/src/main/kotlin/org/openrs2/archive/key/KeyImporter.kt b/archive/src/main/kotlin/org/openrs2/archive/key/KeyImporter.kt index 3932edf61f..569a681be3 100644 --- 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( diff --git a/archive/src/main/kotlin/org/openrs2/archive/key/RuneLiteKeyDownloader.kt b/archive/src/main/kotlin/org/openrs2/archive/key/RuneLiteKeyDownloader.kt index 030e3f37c3..9a4540b7a5 100644 --- 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( diff --git a/archive/src/main/kotlin/org/openrs2/archive/map/MapRenderer.kt b/archive/src/main/kotlin/org/openrs2/archive/map/MapRenderer.kt index 019922909e..8e28e417f1 100644 --- 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 diff --git a/archive/src/main/kotlin/org/openrs2/archive/name/NameImporter.kt b/archive/src/main/kotlin/org/openrs2/archive/name/NameImporter.kt index 6a48e87893..fa83fbe39d 100644 --- 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( diff --git a/archive/src/main/kotlin/org/openrs2/archive/name/RuneStarNameDownloader.kt b/archive/src/main/kotlin/org/openrs2/archive/name/RuneStarNameDownloader.kt index 87589017ff..a1079255b3 100644 --- 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 diff --git a/archive/src/main/kotlin/org/openrs2/archive/web/CachesController.kt b/archive/src/main/kotlin/org/openrs2/archive/web/CachesController.kt index e835895ead..7ec34fb5a8 100644 --- 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( diff --git a/archive/src/main/kotlin/org/openrs2/archive/web/KeysController.kt b/archive/src/main/kotlin/org/openrs2/archive/web/KeysController.kt index 9b1b324d0b..4b340a83e8 100644 --- 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( diff --git a/archive/src/main/kotlin/org/openrs2/archive/web/WebServer.kt b/archive/src/main/kotlin/org/openrs2/archive/web/WebServer.kt index f1cb8d034b..67fc822e8b 100644 --- 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( diff --git a/asm/src/main/kotlin/org/openrs2/asm/AsmJacksonModule.kt b/asm/src/main/kotlin/org/openrs2/asm/AsmJacksonModule.kt index 0e1a247ab2..4640990894 100644 --- 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() { diff --git a/asm/src/main/kotlin/org/openrs2/asm/io/PackClassLibraryReader.kt b/asm/src/main/kotlin/org/openrs2/asm/io/PackClassLibraryReader.kt index c11abab2a4..17c9947b6a 100644 --- 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( diff --git a/asm/src/main/kotlin/org/openrs2/asm/io/PackClassLibraryWriter.kt b/asm/src/main/kotlin/org/openrs2/asm/io/PackClassLibraryWriter.kt index d73f48f9e3..779d31b3f5 100644 --- 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( diff --git a/buffer/src/main/kotlin/org/openrs2/buffer/ByteBufBodyHandler.kt b/buffer/src/main/kotlin/org/openrs2/buffer/ByteBufBodyHandler.kt index eb7f5c3e10..75d1dd641b 100644 --- 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( diff --git 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 index 3aadab0191..968efc6cc2 100644 --- 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( diff --git 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 index 0900dbcc58..1138f55421 100644 --- 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( diff --git 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 index 0c90ead43f..ed2fb22562 100644 --- 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( diff --git 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 index 1a0574e2d8..f42f59d71b 100644 --- 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( diff --git 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 index b458b55544..88136949e2 100644 --- 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( diff --git 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 index 518586f5e7..e655f27530 100644 --- 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( diff --git a/cache/src/main/kotlin/org/openrs2/cache/RuneLiteStore.kt b/cache/src/main/kotlin/org/openrs2/cache/RuneLiteStore.kt index 8ce5c8a387..038143f133 100644 --- 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 diff --git a/conf/src/main/kotlin/org/openrs2/conf/ConfigProvider.kt b/conf/src/main/kotlin/org/openrs2/conf/ConfigProvider.kt index ae8c9d218d..093b67e8f9 100644 --- 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 { override fun get(): Config { diff --git a/conf/src/main/kotlin/org/openrs2/conf/RsaKeyProvider.kt b/conf/src/main/kotlin/org/openrs2/conf/RsaKeyProvider.kt index c752d51cbc..b1e46699eb 100644 --- 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 { override fun get(): RSAPrivateCrtKeyParameters { diff --git a/crypto/src/main/kotlin/org/openrs2/crypto/CryptoJacksonModule.kt b/crypto/src/main/kotlin/org/openrs2/crypto/CryptoJacksonModule.kt index 1d0c4f0cca..e1dceba2e0 100644 --- 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() { diff --git a/decompiler/src/main/kotlin/org/openrs2/decompiler/Decompiler.kt b/decompiler/src/main/kotlin/org/openrs2/decompiler/Decompiler.kt index 2090fb947f..ddcb3fba58 100644 --- 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 { diff --git a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/AstDeobfuscator.kt b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/AstDeobfuscator.kt index de3762f4cd..40041cc8ea 100644 --- 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( diff --git 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 index d6a8d65bf9..85f0f790ea 100644 --- 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 { override fun get(): GlRegistry { diff --git 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 index 6fc743667f..a9080b6704 100644 --- 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() { diff --git 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 index 66543dccea..8ddb9c4499 100644 --- 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() { diff --git 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 index 2cf52619a4..b96288f0b0 100644 --- 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() { diff --git 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 index 6ba7479fa8..525b4e80b9 100644 --- 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() { diff --git 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 index 087b87bf0d..f69315cc2e 100644 --- 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() { diff --git 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 index 433e8be497..0b69e5528b 100644 --- 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() { diff --git 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 index 0b47909be0..3821ff55cd 100644 --- 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() { diff --git 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 index 5c49474252..707553a203 100644 --- 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() { diff --git 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 index b76597e7cb..1d934e1cdd 100644 --- 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() { diff --git 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 index c5134198c8..97a2969394 100644 --- 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() { diff --git 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 index 2e3ac08134..4a541914bc 100644 --- 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() { diff --git 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 index fef0169a5e..f82899f222 100644 --- 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() { diff --git 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 index 98c746d2e0..60837ff9d6 100644 --- 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() { diff --git 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 index a61d3f9dc3..e9fa076c12 100644 --- 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() { diff --git 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 index bba8aea505..ebefd1001b 100644 --- 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() { diff --git 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 index 315bd68163..a622ef0afc 100644 --- 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() { diff --git 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 index a07ad92785..48e3ac784e 100644 --- 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() { diff --git 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 index 795666f35b..2893508ecc 100644 --- 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() { diff --git 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 index 5cd23106e8..9ea181b76c 100644 --- 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() { diff --git a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/BytecodeDeobfuscator.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/BytecodeDeobfuscator.kt index 5d952e4a12..20ec41d8a8 100644 --- 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( diff --git a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/DeobfuscatorQualifier.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/DeobfuscatorQualifier.kt index 5575a7c9eb..42a3bd1a7e 100644 --- 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) diff --git a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/ProfileProvider.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/ProfileProvider.kt index 5d1ba8b7dd..879f960dd8 100644 --- 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 { override fun get(): Profile { diff --git 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 index 3ffb6dd22d..22f4b397d0 100644 --- 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() { diff --git 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 index 8aedb6aa02..4ed2c7e5a2 100644 --- 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() { diff --git 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 index 97d405db65..02d8d7c180 100644 --- 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() { diff --git 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 index 450d89747f..a394195a49 100644 --- 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() { diff --git 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 index 736ba6c3d4..785aeb84e7 100644 --- 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() { diff --git 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 index 094e373f8f..864b2d9d48 100644 --- 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 diff --git 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 index 16c7b40ea6..f9bd41f9dc 100644 --- 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() { diff --git 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 index 19d6ce3f80..9f5ebd0ecb 100644 --- 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() { diff --git 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 index 5835f6c119..251d2f6b87 100644 --- 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 diff --git 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 index 25ce4a3c12..96b81a6c8b 100644 --- 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() { diff --git 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 index b19a3f0a87..8729c9a0d4 100644 --- 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() { diff --git 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 index c1ac09bf29..2f360abd7f 100644 --- 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() { diff --git 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 index 0957a54dff..24c683e81b 100644 --- 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() { diff --git 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 index 4bf46df2bc..86138d54f6 100644 --- 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() { diff --git 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 index c1e4ea8746..02fe718df3 100644 --- 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 diff --git 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 index 750d3bdd8e..d241cf38e7 100644 --- 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() { diff --git 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 index 4d525aaf60..647294567e 100644 --- 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 diff --git 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 index 2907ac197f..7fbd65c89f 100644 --- 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() { diff --git 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 index e8a38accd1..50fe4d4a73 100644 --- 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() { diff --git 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 index dcee18a032..0c0e1f4165 100644 --- 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() { diff --git 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 index 28df5cd012..32339f70b8 100644 --- 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() { diff --git 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 index 4cdc9a9515..ebb1b390ce 100644 --- 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() { diff --git 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 index 12ebdfb955..d5d6d84068 100644 --- 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( diff --git 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 index 3222c536b6..60eb6f08fa 100644 --- 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() { diff --git 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 index 742f1516b2..5b6dc1c1b1 100644 --- 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( diff --git 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 index 3ac4dbaf44..80c8374f7a 100644 --- 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() { diff --git 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 index 35800bc1fd..5a1f3f754a 100644 --- 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() { diff --git 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 index 4a03b6153d..114679b14f 100644 --- 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() { diff --git 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 index ef4c4de840..50634722cd 100644 --- 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() { diff --git 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 index 7132c2b304..ca806eb861 100644 --- 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() { diff --git 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 index 2448cfdfd5..2575c0c692 100644 --- 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 { override fun get(): NameMap { diff --git a/deob/src/main/kotlin/org/openrs2/deob/Deobfuscator.kt b/deob/src/main/kotlin/org/openrs2/deob/Deobfuscator.kt index 44919bec90..9874c82c8f 100644 --- 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( diff --git a/game/src/main/kotlin/org/openrs2/game/GameServer.kt b/game/src/main/kotlin/org/openrs2/game/GameServer.kt index 0ab5ceb40f..119c8287e5 100644 --- 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( diff --git a/game/src/main/kotlin/org/openrs2/game/GameService.kt b/game/src/main/kotlin/org/openrs2/game/GameService.kt index de9058d712..27a5e45597 100644 --- 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() { diff --git a/game/src/main/kotlin/org/openrs2/game/cache/CacheProvider.kt b/game/src/main/kotlin/org/openrs2/game/cache/CacheProvider.kt index c5da097584..0316f6934d 100644 --- 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, diff --git a/game/src/main/kotlin/org/openrs2/game/cache/Js5MasterIndexProvider.kt b/game/src/main/kotlin/org/openrs2/game/cache/Js5MasterIndexProvider.kt index 9165e00407..e0e2eff4e4 100644 --- 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 diff --git a/game/src/main/kotlin/org/openrs2/game/cache/StoreProvider.kt b/game/src/main/kotlin/org/openrs2/game/cache/StoreProvider.kt index e31bf20e70..b1ad6d03bc 100644 --- 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 diff --git a/game/src/main/kotlin/org/openrs2/game/cluster/CountryList.kt b/game/src/main/kotlin/org/openrs2/game/cluster/CountryList.kt index b1a47999fc..5ebc645ba8 100644 --- 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( diff --git a/game/src/main/kotlin/org/openrs2/game/cluster/SingleWorldCluster.kt b/game/src/main/kotlin/org/openrs2/game/cluster/SingleWorldCluster.kt index 5bd6e18227..e08360a7ca 100644 --- 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( diff --git a/game/src/main/kotlin/org/openrs2/game/net/FileProvider.kt b/game/src/main/kotlin/org/openrs2/game/net/FileProvider.kt index 73050a044c..1a70a904b2 100644 --- 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 { diff --git a/game/src/main/kotlin/org/openrs2/game/net/NetworkService.kt b/game/src/main/kotlin/org/openrs2/game/net/NetworkService.kt index ae264def73..c7e1ecbe5e 100644 --- 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( diff --git a/game/src/main/kotlin/org/openrs2/game/net/Rs2ChannelInitializer.kt b/game/src/main/kotlin/org/openrs2/game/net/Rs2ChannelInitializer.kt index 4bb7d9f381..a1fcaae5e9 100644 --- a/game/src/main/kotlin/org/openrs2/game/net/Rs2ChannelInitializer.kt +++ b/game/src/main/kotlin/org/openrs2/game/net/Rs2ChannelInitializer.kt @@ -3,6 +3,9 @@ package org.openrs2.game.net import io.netty.channel.Channel import io.netty.channel.ChannelInitializer import io.netty.handler.timeout.IdleStateHandler +import jakarta.inject.Inject +import jakarta.inject.Provider +import jakarta.inject.Singleton import org.openrs2.game.net.login.LoginChannelHandler import org.openrs2.protocol.Protocol import org.openrs2.protocol.Rs2Decoder @@ -10,9 +13,6 @@ import org.openrs2.protocol.Rs2Encoder import org.openrs2.protocol.login.downstream.LoginDownstream import org.openrs2.protocol.login.upstream.LoginUpstream import java.util.concurrent.TimeUnit -import javax.inject.Inject -import javax.inject.Provider -import javax.inject.Singleton @Singleton public class Rs2ChannelInitializer @Inject constructor( diff --git a/game/src/main/kotlin/org/openrs2/game/net/http/HttpChannelHandler.kt b/game/src/main/kotlin/org/openrs2/game/net/http/HttpChannelHandler.kt index 462f5c1ece..a0b2558e5f 100644 --- a/game/src/main/kotlin/org/openrs2/game/net/http/HttpChannelHandler.kt +++ b/game/src/main/kotlin/org/openrs2/game/net/http/HttpChannelHandler.kt @@ -8,10 +8,10 @@ import io.netty.handler.codec.http.HttpMethod import io.netty.handler.codec.http.HttpRequest import io.netty.handler.codec.http.HttpResponseStatus import io.netty.handler.timeout.IdleStateEvent +import jakarta.inject.Inject +import jakarta.inject.Singleton import org.openrs2.buffer.use import org.openrs2.game.net.FileProvider -import javax.inject.Inject -import javax.inject.Singleton @Singleton @ChannelHandler.Sharable diff --git a/game/src/main/kotlin/org/openrs2/game/net/http/HttpChannelInitializer.kt b/game/src/main/kotlin/org/openrs2/game/net/http/HttpChannelInitializer.kt index 3b5dbbeb8e..f93f3acdd0 100644 --- a/game/src/main/kotlin/org/openrs2/game/net/http/HttpChannelInitializer.kt +++ b/game/src/main/kotlin/org/openrs2/game/net/http/HttpChannelInitializer.kt @@ -6,9 +6,9 @@ import io.netty.handler.codec.http.HttpObjectAggregator import io.netty.handler.codec.http.HttpRequestDecoder import io.netty.handler.codec.http.HttpResponseEncoder import io.netty.handler.timeout.IdleStateHandler +import jakarta.inject.Inject +import jakarta.inject.Singleton import java.util.concurrent.TimeUnit -import javax.inject.Inject -import javax.inject.Singleton @Singleton public class HttpChannelInitializer @Inject constructor( diff --git a/game/src/main/kotlin/org/openrs2/game/net/jaggrab/JaggrabChannelHandler.kt b/game/src/main/kotlin/org/openrs2/game/net/jaggrab/JaggrabChannelHandler.kt index dedd6ae2bc..e4cba835a3 100644 --- a/game/src/main/kotlin/org/openrs2/game/net/jaggrab/JaggrabChannelHandler.kt +++ b/game/src/main/kotlin/org/openrs2/game/net/jaggrab/JaggrabChannelHandler.kt @@ -5,11 +5,11 @@ import io.netty.channel.ChannelHandler import io.netty.channel.ChannelHandlerContext import io.netty.channel.SimpleChannelInboundHandler import io.netty.handler.timeout.IdleStateEvent +import jakarta.inject.Inject +import jakarta.inject.Singleton import org.openrs2.buffer.use import org.openrs2.game.net.FileProvider import org.openrs2.protocol.jaggrab.upstream.JaggrabRequest -import javax.inject.Inject -import javax.inject.Singleton @Singleton @ChannelHandler.Sharable diff --git a/game/src/main/kotlin/org/openrs2/game/net/js5/Js5ChannelHandler.kt b/game/src/main/kotlin/org/openrs2/game/net/js5/Js5ChannelHandler.kt index cd05646031..c29b4e6f66 100644 --- a/game/src/main/kotlin/org/openrs2/game/net/js5/Js5ChannelHandler.kt +++ b/game/src/main/kotlin/org/openrs2/game/net/js5/Js5ChannelHandler.kt @@ -3,9 +3,9 @@ package org.openrs2.game.net.js5 import io.netty.channel.ChannelHandlerContext import io.netty.channel.SimpleChannelInboundHandler import io.netty.handler.timeout.IdleStateEvent +import jakarta.inject.Inject import org.openrs2.protocol.js5.downstream.XorEncoder import org.openrs2.protocol.js5.upstream.Js5Request -import javax.inject.Inject public class Js5ChannelHandler @Inject constructor( private val service: Js5Service diff --git a/game/src/main/kotlin/org/openrs2/game/net/js5/Js5Service.kt b/game/src/main/kotlin/org/openrs2/game/net/js5/Js5Service.kt index 48514176f3..b0c129e1d7 100644 --- a/game/src/main/kotlin/org/openrs2/game/net/js5/Js5Service.kt +++ b/game/src/main/kotlin/org/openrs2/game/net/js5/Js5Service.kt @@ -2,6 +2,8 @@ package org.openrs2.game.net.js5 import com.google.common.util.concurrent.AbstractExecutionThreadService import io.netty.buffer.ByteBufAllocator +import jakarta.inject.Inject +import jakarta.inject.Singleton import org.openrs2.buffer.use import org.openrs2.cache.Js5Archive import org.openrs2.cache.Js5Compression @@ -13,8 +15,6 @@ import org.openrs2.protocol.js5.downstream.Js5Response import org.openrs2.protocol.js5.upstream.Js5Request import org.openrs2.util.collect.UniqueQueue import java.io.FileNotFoundException -import javax.inject.Inject -import javax.inject.Singleton @Singleton public class Js5Service @Inject constructor( diff --git a/game/src/main/kotlin/org/openrs2/game/net/login/LoginChannelHandler.kt b/game/src/main/kotlin/org/openrs2/game/net/login/LoginChannelHandler.kt index 17c17efbe6..75315f9797 100644 --- a/game/src/main/kotlin/org/openrs2/game/net/login/LoginChannelHandler.kt +++ b/game/src/main/kotlin/org/openrs2/game/net/login/LoginChannelHandler.kt @@ -16,6 +16,8 @@ import io.netty.handler.codec.http.HttpRequestDecoder import io.netty.handler.codec.http.HttpResponseEncoder import io.netty.handler.codec.string.StringDecoder import io.netty.handler.timeout.IdleStateEvent +import jakarta.inject.Inject +import jakarta.inject.Provider import kotlinx.coroutines.CoroutineExceptionHandler import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.asCoroutineDispatcher @@ -47,8 +49,6 @@ import org.openrs2.protocol.world.downstream.WorldListDownstream import org.openrs2.protocol.world.downstream.WorldListResponse import java.time.DateTimeException import java.time.LocalDate -import javax.inject.Inject -import javax.inject.Provider public class LoginChannelHandler @Inject constructor( private val cluster: Cluster, diff --git a/game/src/main/kotlin/org/openrs2/game/store/DummyPlayerStore.kt b/game/src/main/kotlin/org/openrs2/game/store/DummyPlayerStore.kt index 3d513454af..9ace88cff3 100644 --- a/game/src/main/kotlin/org/openrs2/game/store/DummyPlayerStore.kt +++ b/game/src/main/kotlin/org/openrs2/game/store/DummyPlayerStore.kt @@ -2,10 +2,10 @@ package org.openrs2.game.store import com.github.michaelbull.result.Ok import com.github.michaelbull.result.Result +import jakarta.inject.Singleton import org.openrs2.conf.CountryCode import org.openrs2.protocol.create.downstream.CreateResponse import java.time.LocalDate -import javax.inject.Singleton @Singleton public class DummyPlayerStore : PlayerStore { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index dde959ff21..5e4fb7ab5a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ asm = "9.5" commons-compress = "1.23.0" guava = "32.1.2-jre" -guice = "5.1.0" +guice = "7.0.0" jackson = "2.15.2" jimfs = "1.3.0" junit = "5.10.0" diff --git a/http/src/main/kotlin/org/openrs2/http/HttpClientProvider.kt b/http/src/main/kotlin/org/openrs2/http/HttpClientProvider.kt index cf879af4c5..231c8b2c2c 100644 --- a/http/src/main/kotlin/org/openrs2/http/HttpClientProvider.kt +++ b/http/src/main/kotlin/org/openrs2/http/HttpClientProvider.kt @@ -1,10 +1,10 @@ package org.openrs2.http +import jakarta.inject.Provider import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.asExecutor import java.net.http.HttpClient import java.time.Duration -import javax.inject.Provider public class HttpClientProvider : Provider { override fun get(): HttpClient { diff --git a/json/src/main/kotlin/org/openrs2/json/Json.kt b/json/src/main/kotlin/org/openrs2/json/Json.kt index 6178b0cebe..54ad91244f 100644 --- a/json/src/main/kotlin/org/openrs2/json/Json.kt +++ b/json/src/main/kotlin/org/openrs2/json/Json.kt @@ -1,6 +1,6 @@ package org.openrs2.json -import javax.inject.Qualifier +import jakarta.inject.Qualifier @Qualifier @Retention(AnnotationRetention.RUNTIME) diff --git a/json/src/main/kotlin/org/openrs2/json/ObjectMapperProvider.kt b/json/src/main/kotlin/org/openrs2/json/ObjectMapperProvider.kt index aacdb1d726..078d32e447 100644 --- a/json/src/main/kotlin/org/openrs2/json/ObjectMapperProvider.kt +++ b/json/src/main/kotlin/org/openrs2/json/ObjectMapperProvider.kt @@ -5,8 +5,8 @@ import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.SerializationFeature import com.fasterxml.jackson.module.kotlin.registerKotlinModule -import javax.inject.Inject -import javax.inject.Provider +import jakarta.inject.Inject +import jakarta.inject.Provider public class ObjectMapperProvider @Inject constructor( private val modules: Set diff --git a/net/src/main/kotlin/org/openrs2/net/BootstrapFactory.kt b/net/src/main/kotlin/org/openrs2/net/BootstrapFactory.kt index df57044235..92390b4b58 100644 --- a/net/src/main/kotlin/org/openrs2/net/BootstrapFactory.kt +++ b/net/src/main/kotlin/org/openrs2/net/BootstrapFactory.kt @@ -19,8 +19,8 @@ import io.netty.channel.socket.nio.NioSocketChannel import io.netty.incubator.channel.uring.IOUringEventLoopGroup import io.netty.incubator.channel.uring.IOUringServerSocketChannel import io.netty.incubator.channel.uring.IOUringSocketChannel -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton public class BootstrapFactory @Inject constructor( diff --git a/patcher/src/main/kotlin/org/openrs2/patcher/Patcher.kt b/patcher/src/main/kotlin/org/openrs2/patcher/Patcher.kt index abb9065a8c..ec9382e4e9 100644 --- a/patcher/src/main/kotlin/org/openrs2/patcher/Patcher.kt +++ b/patcher/src/main/kotlin/org/openrs2/patcher/Patcher.kt @@ -1,6 +1,8 @@ package org.openrs2.patcher 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 @@ -19,8 +21,6 @@ import java.nio.file.Path import java.util.jar.Attributes import java.util.jar.Attributes.Name.MANIFEST_VERSION import java.util.jar.Manifest -import javax.inject.Inject -import javax.inject.Singleton @Singleton public class Patcher @Inject constructor( diff --git a/patcher/src/main/kotlin/org/openrs2/patcher/PatcherQualifier.kt b/patcher/src/main/kotlin/org/openrs2/patcher/PatcherQualifier.kt index 2ef3aba543..4b43bb74bc 100644 --- a/patcher/src/main/kotlin/org/openrs2/patcher/PatcherQualifier.kt +++ b/patcher/src/main/kotlin/org/openrs2/patcher/PatcherQualifier.kt @@ -1,6 +1,6 @@ package org.openrs2.patcher -import javax.inject.Qualifier +import jakarta.inject.Qualifier @Qualifier @Retention(AnnotationRetention.RUNTIME) diff --git a/patcher/src/main/kotlin/org/openrs2/patcher/transform/BufferSizeTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/BufferSizeTransformer.kt index 5d20e1da71..04e27f555a 100644 --- a/patcher/src/main/kotlin/org/openrs2/patcher/transform/BufferSizeTransformer.kt +++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/BufferSizeTransformer.kt @@ -1,6 +1,7 @@ package org.openrs2.patcher.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.LdcInsnNode @@ -12,7 +13,6 @@ import org.openrs2.asm.classpath.Library import org.openrs2.asm.hasCode import org.openrs2.asm.toAbstractInsnNode import org.openrs2.asm.transform.Transformer -import javax.inject.Singleton @Singleton public class BufferSizeTransformer : Transformer() { diff --git a/patcher/src/main/kotlin/org/openrs2/patcher/transform/CachePathTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/CachePathTransformer.kt index eb537c8c3d..87d32afb95 100644 --- a/patcher/src/main/kotlin/org/openrs2/patcher/transform/CachePathTransformer.kt +++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/CachePathTransformer.kt @@ -1,6 +1,8 @@ package org.openrs2.patcher.transform import com.github.michaelbull.logging.InlineLogger +import jakarta.inject.Inject +import jakarta.inject.Singleton import org.objectweb.asm.tree.ClassNode import org.objectweb.asm.tree.LdcInsnNode import org.objectweb.asm.tree.MethodNode @@ -8,8 +10,6 @@ import org.openrs2.asm.classpath.ClassPath import org.openrs2.asm.classpath.Library import org.openrs2.asm.transform.Transformer import org.openrs2.conf.Config -import javax.inject.Inject -import javax.inject.Singleton @Singleton public class CachePathTransformer @Inject constructor( diff --git a/patcher/src/main/kotlin/org/openrs2/patcher/transform/DomainTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/DomainTransformer.kt index 0e20011a13..66ef9bc1c9 100644 --- a/patcher/src/main/kotlin/org/openrs2/patcher/transform/DomainTransformer.kt +++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/DomainTransformer.kt @@ -1,6 +1,8 @@ package org.openrs2.patcher.transform import com.github.michaelbull.logging.InlineLogger +import jakarta.inject.Inject +import jakarta.inject.Singleton import org.objectweb.asm.tree.ClassNode import org.objectweb.asm.tree.LdcInsnNode import org.objectweb.asm.tree.MethodNode @@ -8,8 +10,6 @@ import org.openrs2.asm.classpath.ClassPath import org.openrs2.asm.classpath.Library import org.openrs2.asm.transform.Transformer import org.openrs2.conf.Config -import javax.inject.Inject -import javax.inject.Singleton @Singleton public class DomainTransformer @Inject constructor( diff --git a/patcher/src/main/kotlin/org/openrs2/patcher/transform/HighDpiTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/HighDpiTransformer.kt index 3799ff1665..56787e1e2d 100644 --- a/patcher/src/main/kotlin/org/openrs2/patcher/transform/HighDpiTransformer.kt +++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/HighDpiTransformer.kt @@ -1,6 +1,7 @@ package org.openrs2.patcher.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 @@ -23,7 +24,6 @@ import org.openrs2.asm.getExpression import org.openrs2.asm.previousReal import org.openrs2.asm.stackMetadata import org.openrs2.asm.transform.Transformer -import javax.inject.Singleton import kotlin.math.max @Singleton diff --git a/patcher/src/main/kotlin/org/openrs2/patcher/transform/HostCheckTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/HostCheckTransformer.kt index a144041a93..ba3f2b69cc 100644 --- a/patcher/src/main/kotlin/org/openrs2/patcher/transform/HostCheckTransformer.kt +++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/HostCheckTransformer.kt @@ -1,6 +1,7 @@ package org.openrs2.patcher.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 @@ -11,7 +12,6 @@ import org.openrs2.asm.InsnMatcher 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 HostCheckTransformer : Transformer() { diff --git a/patcher/src/main/kotlin/org/openrs2/patcher/transform/InvalidKeyTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/InvalidKeyTransformer.kt index efddb9da52..05fe0b8612 100644 --- a/patcher/src/main/kotlin/org/openrs2/patcher/transform/InvalidKeyTransformer.kt +++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/InvalidKeyTransformer.kt @@ -1,6 +1,7 @@ package org.openrs2.patcher.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 @@ -16,7 +17,6 @@ import org.openrs2.asm.InsnMatcher 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 InvalidKeyTransformer : Transformer() { diff --git a/patcher/src/main/kotlin/org/openrs2/patcher/transform/LoadLibraryTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/LoadLibraryTransformer.kt index 040e0f272b..60171156b7 100644 --- a/patcher/src/main/kotlin/org/openrs2/patcher/transform/LoadLibraryTransformer.kt +++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/LoadLibraryTransformer.kt @@ -1,6 +1,7 @@ package org.openrs2.patcher.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.InsnMatcher 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 LoadLibraryTransformer : Transformer() { diff --git a/patcher/src/main/kotlin/org/openrs2/patcher/transform/MacResizeTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/MacResizeTransformer.kt index 9be54e99d1..60f41887c4 100644 --- a/patcher/src/main/kotlin/org/openrs2/patcher/transform/MacResizeTransformer.kt +++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/MacResizeTransformer.kt @@ -1,6 +1,7 @@ package org.openrs2.patcher.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 @@ -12,7 +13,6 @@ import org.openrs2.asm.InsnMatcher 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 MacResizeTransformer : Transformer() { diff --git a/patcher/src/main/kotlin/org/openrs2/patcher/transform/MemoryAllocationTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/MemoryAllocationTransformer.kt index 26e6c6a768..d9c58f6002 100644 --- a/patcher/src/main/kotlin/org/openrs2/patcher/transform/MemoryAllocationTransformer.kt +++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/MemoryAllocationTransformer.kt @@ -1,6 +1,7 @@ package org.openrs2.patcher.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 @@ -12,7 +13,6 @@ import org.openrs2.asm.classpath.ClassPath import org.openrs2.asm.classpath.Library import org.openrs2.asm.replaceExpression import org.openrs2.asm.transform.Transformer -import javax.inject.Singleton @Singleton public class MemoryAllocationTransformer : Transformer() { diff --git a/patcher/src/main/kotlin/org/openrs2/patcher/transform/NameTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/NameTransformer.kt index 6594a4a662..826bf8765f 100644 --- a/patcher/src/main/kotlin/org/openrs2/patcher/transform/NameTransformer.kt +++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/NameTransformer.kt @@ -1,6 +1,8 @@ package org.openrs2.patcher.transform import com.github.michaelbull.logging.InlineLogger +import jakarta.inject.Inject +import jakarta.inject.Singleton import org.objectweb.asm.tree.ClassNode import org.objectweb.asm.tree.LdcInsnNode import org.objectweb.asm.tree.MethodNode @@ -8,8 +10,6 @@ import org.openrs2.asm.classpath.ClassPath import org.openrs2.asm.classpath.Library import org.openrs2.asm.transform.Transformer import org.openrs2.conf.Config -import javax.inject.Inject -import javax.inject.Singleton @Singleton public class NameTransformer @Inject constructor( diff --git a/patcher/src/main/kotlin/org/openrs2/patcher/transform/PlatformDetectionTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/PlatformDetectionTransformer.kt index 3dcc3622a8..026064e49d 100644 --- a/patcher/src/main/kotlin/org/openrs2/patcher/transform/PlatformDetectionTransformer.kt +++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/PlatformDetectionTransformer.kt @@ -1,6 +1,7 @@ package org.openrs2.patcher.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 @@ -18,7 +19,6 @@ import org.openrs2.asm.classpath.Library import org.openrs2.asm.toAbstractInsnNode import org.openrs2.asm.transform.Transformer import org.openrs2.patcher.OperatingSystem -import javax.inject.Singleton @Singleton public class PlatformDetectionTransformer : Transformer() { diff --git a/patcher/src/main/kotlin/org/openrs2/patcher/transform/PublicKeyTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/PublicKeyTransformer.kt index ce31bdd87d..4860c998a0 100644 --- a/patcher/src/main/kotlin/org/openrs2/patcher/transform/PublicKeyTransformer.kt +++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/PublicKeyTransformer.kt @@ -1,6 +1,8 @@ package org.openrs2.patcher.transform import com.github.michaelbull.logging.InlineLogger +import jakarta.inject.Inject +import jakarta.inject.Singleton import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters import org.objectweb.asm.tree.ClassNode import org.objectweb.asm.tree.LdcInsnNode @@ -8,8 +10,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.Inject -import javax.inject.Singleton @Singleton public class PublicKeyTransformer @Inject constructor(private val key: RSAPrivateCrtKeyParameters) : Transformer() { diff --git a/patcher/src/main/kotlin/org/openrs2/patcher/transform/RightClickTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/RightClickTransformer.kt index c9f60f2c5d..a5ff65ad30 100644 --- a/patcher/src/main/kotlin/org/openrs2/patcher/transform/RightClickTransformer.kt +++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/RightClickTransformer.kt @@ -1,6 +1,7 @@ package org.openrs2.patcher.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 @@ -11,7 +12,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 @Singleton public class RightClickTransformer : Transformer() { diff --git a/patcher/src/main/kotlin/org/openrs2/patcher/transform/TypoTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/TypoTransformer.kt index fcfc388e2f..ab1b6c68ca 100644 --- a/patcher/src/main/kotlin/org/openrs2/patcher/transform/TypoTransformer.kt +++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/TypoTransformer.kt @@ -1,13 +1,13 @@ package org.openrs2.patcher.transform import com.github.michaelbull.logging.InlineLogger +import jakarta.inject.Singleton import org.objectweb.asm.tree.ClassNode import org.objectweb.asm.tree.LdcInsnNode 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 TypoTransformer : Transformer() { diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/Protocol.kt b/protocol/src/main/kotlin/org/openrs2/protocol/Protocol.kt index 9345880ad6..ca487eed3b 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/Protocol.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/Protocol.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton @Singleton public class Protocol @Inject constructor(codecs: Set>) { diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CannotCreateAtThisTimeCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CannotCreateAtThisTimeCodec.kt index 81250e6620..911167587b 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CannotCreateAtThisTimeCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CannotCreateAtThisTimeCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.create.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class CannotCreateAtThisTimeCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CountryInvalidCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CountryInvalidCodec.kt index 743200386d..e9e6fa1beb 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CountryInvalidCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CountryInvalidCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.create.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class CountryInvalidCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CreateClientOutOfDateCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CreateClientOutOfDateCodec.kt index e885d73c88..d8b394b199 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CreateClientOutOfDateCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CreateClientOutOfDateCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.create.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class CreateClientOutOfDateCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CreateDownstream.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CreateDownstream.kt index 8f0f1e97c2..f6d90a9d3c 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CreateDownstream.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CreateDownstream.kt @@ -1,6 +1,6 @@ package org.openrs2.protocol.create.downstream -import javax.inject.Qualifier +import jakarta.inject.Qualifier @Qualifier @Retention(AnnotationRetention.RUNTIME) diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CreateIpLimitCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CreateIpLimitCodec.kt index 9d6221b8de..7eb083b31e 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CreateIpLimitCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CreateIpLimitCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.create.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class CreateIpLimitCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CreateServerFullCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CreateServerFullCodec.kt index 345d0b756f..c75e8fad0e 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CreateServerFullCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CreateServerFullCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.create.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class CreateServerFullCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CreateServerOfflineCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CreateServerOfflineCodec.kt index 846ba01494..72fca5d86b 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CreateServerOfflineCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/CreateServerOfflineCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.create.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class CreateServerOfflineCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/DateOfBirthFutureCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/DateOfBirthFutureCodec.kt index 3224dc2db5..6fca692db9 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/DateOfBirthFutureCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/DateOfBirthFutureCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.create.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class DateOfBirthFutureCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/DateOfBirthInvalidCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/DateOfBirthInvalidCodec.kt index 6d3dac0f08..2359e6ac5a 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/DateOfBirthInvalidCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/DateOfBirthInvalidCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.create.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class DateOfBirthInvalidCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/DateOfBirthLastYearCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/DateOfBirthLastYearCodec.kt index e8aa4905b2..7c7a01e18c 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/DateOfBirthLastYearCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/DateOfBirthLastYearCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.create.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class DateOfBirthLastYearCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/DateOfBirthThisYearCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/DateOfBirthThisYearCodec.kt index 2543a195a5..b3f7ad55be 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/DateOfBirthThisYearCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/DateOfBirthThisYearCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.create.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class DateOfBirthThisYearCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/EmailInvalid1Codec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/EmailInvalid1Codec.kt index 822f5709f2..8fad0c14fc 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/EmailInvalid1Codec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/EmailInvalid1Codec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.create.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class EmailInvalid1Codec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/EmailInvalid2Codec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/EmailInvalid2Codec.kt index 6bb538776a..0ff2b523a9 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/EmailInvalid2Codec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/EmailInvalid2Codec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.create.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class EmailInvalid2Codec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/EmailInvalidCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/EmailInvalidCodec.kt index 0733842ace..1709469ee5 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/EmailInvalidCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/EmailInvalidCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.create.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class EmailInvalidCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/NameInvalidCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/NameInvalidCodec.kt index bea2966899..d5da7fe3fc 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/NameInvalidCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/NameInvalidCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.create.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class NameInvalidCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/NameUnavailableCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/NameUnavailableCodec.kt index b7cade240d..d9e501a902 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/NameUnavailableCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/NameUnavailableCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.create.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class NameUnavailableCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordGuessable1Codec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordGuessable1Codec.kt index 0122258be4..532ad5eb90 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordGuessable1Codec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordGuessable1Codec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.create.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class PasswordGuessable1Codec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordGuessableCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordGuessableCodec.kt index b113de58e2..35553c4795 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordGuessableCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordGuessableCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.create.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class PasswordGuessableCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordInvalidCharsCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordInvalidCharsCodec.kt index e1fe8645a5..57e77e2e7a 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordInvalidCharsCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordInvalidCharsCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.create.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class PasswordInvalidCharsCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordInvalidLengthCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordInvalidLengthCodec.kt index 8aaec4b767..082a6de723 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordInvalidLengthCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordInvalidLengthCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.create.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class PasswordInvalidLengthCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordSimilarToName1Codec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordSimilarToName1Codec.kt index 07fd4e0e88..08ce656ab4 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordSimilarToName1Codec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordSimilarToName1Codec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.create.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class PasswordSimilarToName1Codec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordSimilarToName2Codec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordSimilarToName2Codec.kt index d5014a2dba..077fe3fc63 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordSimilarToName2Codec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordSimilarToName2Codec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.create.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class PasswordSimilarToName2Codec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordSimilarToNameCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordSimilarToNameCodec.kt index c098a07cab..1cbc76253d 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordSimilarToNameCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/create/downstream/PasswordSimilarToNameCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.create.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class PasswordSimilarToNameCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5ClientOutOfDateCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5ClientOutOfDateCodec.kt index ad28fee219..8fba8a4ae3 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5ClientOutOfDateCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5ClientOutOfDateCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.js5.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class Js5ClientOutOfDateCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5IpLimitCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5IpLimitCodec.kt index 785dffe88b..e53d56b8c6 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5IpLimitCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5IpLimitCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.js5.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class Js5IpLimitCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5OkCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5OkCodec.kt index 95cfcd013c..fb67909401 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5OkCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5OkCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.js5.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class Js5OkCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5RemoteDownstream.kt b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5RemoteDownstream.kt index 8bbf2a1631..f89d70fbe8 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5RemoteDownstream.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5RemoteDownstream.kt @@ -1,6 +1,6 @@ package org.openrs2.protocol.js5.downstream -import javax.inject.Qualifier +import jakarta.inject.Qualifier @Qualifier @Retention(AnnotationRetention.RUNTIME) diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5ServerFullCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5ServerFullCodec.kt index 24bf31f0bf..ea0b1fc6bd 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5ServerFullCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/js5/downstream/Js5ServerFullCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.js5.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class Js5ServerFullCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/BadSessionIdCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/BadSessionIdCodec.kt index f59dea9327..1856182183 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/BadSessionIdCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/BadSessionIdCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class BadSessionIdCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/BannedCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/BannedCodec.kt index eb5dfec05e..e293ef167a 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/BannedCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/BannedCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class BannedCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ClientMembersOnlyCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ClientMembersOnlyCodec.kt index 153d72832e..2ede94e510 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ClientMembersOnlyCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ClientMembersOnlyCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class ClientMembersOnlyCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ClientOutOfDateCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ClientOutOfDateCodec.kt index c7391f3efd..a367c35cc6 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ClientOutOfDateCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ClientOutOfDateCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class ClientOutOfDateCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/DisallowedByScriptCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/DisallowedByScriptCodec.kt index ef473991f0..b74f86de66 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/DisallowedByScriptCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/DisallowedByScriptCodec.kt @@ -1,9 +1,9 @@ package org.openrs2.protocol.login.downstream import io.netty.buffer.ByteBuf +import jakarta.inject.Singleton import org.openrs2.crypto.StreamCipher import org.openrs2.protocol.FixedPacketCodec -import javax.inject.Singleton @Singleton public class DisallowedByScriptCodec : FixedPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/DuplicateCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/DuplicateCodec.kt index 8f2d7caf5a..c61fe7e05d 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/DuplicateCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/DuplicateCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class DuplicateCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ExchangeSessionKeyCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ExchangeSessionKeyCodec.kt index 0e600af005..9bd453eff3 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ExchangeSessionKeyCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ExchangeSessionKeyCodec.kt @@ -1,9 +1,9 @@ package org.openrs2.protocol.login.downstream import io.netty.buffer.ByteBuf +import jakarta.inject.Singleton import org.openrs2.crypto.StreamCipher import org.openrs2.protocol.FixedPacketCodec -import javax.inject.Singleton @Singleton public class ExchangeSessionKeyCodec : FixedPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ForcePasswordChangeCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ForcePasswordChangeCodec.kt index 7e74d85d95..1edcd7fb10 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ForcePasswordChangeCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ForcePasswordChangeCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class ForcePasswordChangeCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/FullscreenMembersOnlyCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/FullscreenMembersOnlyCodec.kt index 6e4bffb963..82e9f36342 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/FullscreenMembersOnlyCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/FullscreenMembersOnlyCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class FullscreenMembersOnlyCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/HopBlockedCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/HopBlockedCodec.kt index 1517ed61b2..65f96f2572 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/HopBlockedCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/HopBlockedCodec.kt @@ -1,9 +1,9 @@ package org.openrs2.protocol.login.downstream import io.netty.buffer.ByteBuf +import jakarta.inject.Singleton import org.openrs2.crypto.StreamCipher import org.openrs2.protocol.FixedPacketCodec -import javax.inject.Singleton @Singleton public class HopBlockedCodec : FixedPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/InvalidLoginPacketCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/InvalidLoginPacketCodec.kt index 10c7992f51..1cf2950cc7 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/InvalidLoginPacketCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/InvalidLoginPacketCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class InvalidLoginPacketCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/InvalidLoginServerCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/InvalidLoginServerCodec.kt index 27642cc781..2e65e249fd 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/InvalidLoginServerCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/InvalidLoginServerCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class InvalidLoginServerCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/InvalidSaveCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/InvalidSaveCodec.kt index 129f217110..1cfe59d621 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/InvalidSaveCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/InvalidSaveCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class InvalidSaveCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/InvalidUsernameOrPasswordCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/InvalidUsernameOrPasswordCodec.kt index 216d03380d..86167794bb 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/InvalidUsernameOrPasswordCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/InvalidUsernameOrPasswordCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class InvalidUsernameOrPasswordCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/IpBlockedCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/IpBlockedCodec.kt index 49ddb14960..b0933ea8a8 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/IpBlockedCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/IpBlockedCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class IpBlockedCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/IpLimitCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/IpLimitCodec.kt index 07b53e25ef..97318f602f 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/IpLimitCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/IpLimitCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class IpLimitCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/LockedCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/LockedCodec.kt index 56e9b24182..9cbe56fca8 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/LockedCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/LockedCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class LockedCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/LoginDownstream.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/LoginDownstream.kt index 13f2e6f648..dc6190eede 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/LoginDownstream.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/LoginDownstream.kt @@ -1,6 +1,6 @@ package org.openrs2.protocol.login.downstream -import javax.inject.Qualifier +import jakarta.inject.Qualifier @Qualifier @Retention(AnnotationRetention.RUNTIME) diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/LoginServerLoadErrorCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/LoginServerLoadErrorCodec.kt index d6f0bce450..433a977f0b 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/LoginServerLoadErrorCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/LoginServerLoadErrorCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class LoginServerLoadErrorCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/LoginServerOfflineCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/LoginServerOfflineCodec.kt index 2eb63e397c..a73fcf95f1 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/LoginServerOfflineCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/LoginServerOfflineCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class LoginServerOfflineCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/MapMembersOnlyCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/MapMembersOnlyCodec.kt index 5de23cfd8a..074552e3c4 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/MapMembersOnlyCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/MapMembersOnlyCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class MapMembersOnlyCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/NeedMembersAccountCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/NeedMembersAccountCodec.kt index 4aaf880160..299e20c11d 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/NeedMembersAccountCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/NeedMembersAccountCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class NeedMembersAccountCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/NoReplyFromLoginServerCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/NoReplyFromLoginServerCodec.kt index 4885081c55..1444c63450 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/NoReplyFromLoginServerCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/NoReplyFromLoginServerCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class NoReplyFromLoginServerCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ReconnectOkCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ReconnectOkCodec.kt index 625f17dcbf..c7819945b1 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ReconnectOkCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ReconnectOkCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class ReconnectOkCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ServerFullCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ServerFullCodec.kt index b94ee6cce0..2c37aba66b 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ServerFullCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ServerFullCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class ServerFullCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ServiceUnavailableCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ServiceUnavailableCodec.kt index d913e4141d..2ecdbf95df 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ServiceUnavailableCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ServiceUnavailableCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class ServiceUnavailableCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ShowVideoAdCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ShowVideoAdCodec.kt index 81e2b4925c..07541aa74a 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ShowVideoAdCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/ShowVideoAdCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class ShowVideoAdCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/SwitchWorldCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/SwitchWorldCodec.kt index 1ebc77bb64..c56ffc081a 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/SwitchWorldCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/SwitchWorldCodec.kt @@ -1,9 +1,9 @@ package org.openrs2.protocol.login.downstream import io.netty.buffer.ByteBuf +import jakarta.inject.Singleton import org.openrs2.crypto.StreamCipher import org.openrs2.protocol.FixedPacketCodec -import javax.inject.Singleton @Singleton public class SwitchWorldCodec : FixedPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/TooManyAttemptsCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/TooManyAttemptsCodec.kt index 7dedf64573..49d6a1cff2 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/TooManyAttemptsCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/TooManyAttemptsCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class TooManyAttemptsCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/UnknownReplyFromLoginServerCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/UnknownReplyFromLoginServerCodec.kt index 8d5f865fe4..46e98dbcd9 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/UnknownReplyFromLoginServerCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/UnknownReplyFromLoginServerCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class UnknownReplyFromLoginServerCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/UpdateInProgressCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/UpdateInProgressCodec.kt index 33a3b4eb1e..304c22961d 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/UpdateInProgressCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/downstream/UpdateInProgressCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.downstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class UpdateInProgressCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/CheckWorldSuitabilityCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/CheckWorldSuitabilityCodec.kt index fd9c431bf2..4e17c25e03 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/CheckWorldSuitabilityCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/CheckWorldSuitabilityCodec.kt @@ -1,6 +1,8 @@ package org.openrs2.protocol.login.upstream import io.netty.buffer.ByteBuf +import jakarta.inject.Inject +import jakarta.inject.Singleton import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters import org.openrs2.buffer.readString import org.openrs2.buffer.use @@ -12,8 +14,6 @@ import org.openrs2.crypto.rsa import org.openrs2.crypto.secureRandom import org.openrs2.protocol.VariableBytePacketCodec import org.openrs2.util.Base37 -import javax.inject.Inject -import javax.inject.Singleton @Singleton public class CheckWorldSuitabilityCodec @Inject constructor( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/CreateAccountCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/CreateAccountCodec.kt index 707624235c..1b9f185dea 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/CreateAccountCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/CreateAccountCodec.kt @@ -1,6 +1,8 @@ package org.openrs2.protocol.login.upstream import io.netty.buffer.ByteBuf +import jakarta.inject.Inject +import jakarta.inject.Singleton import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters import org.openrs2.buffer.readString import org.openrs2.buffer.use @@ -16,8 +18,6 @@ import org.openrs2.crypto.xteaDecrypt import org.openrs2.crypto.xteaEncrypt import org.openrs2.protocol.VariableShortPacketCodec import org.openrs2.util.Base37 -import javax.inject.Inject -import javax.inject.Singleton @Singleton public class CreateAccountCodec @Inject constructor( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/CreateCheckDateOfBirthCountryCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/CreateCheckDateOfBirthCountryCodec.kt index 7884b21cad..5a4961e26d 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/CreateCheckDateOfBirthCountryCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/CreateCheckDateOfBirthCountryCodec.kt @@ -1,9 +1,9 @@ package org.openrs2.protocol.login.upstream import io.netty.buffer.ByteBuf +import jakarta.inject.Singleton import org.openrs2.crypto.StreamCipher import org.openrs2.protocol.FixedPacketCodec -import javax.inject.Singleton @Singleton public class CreateCheckDateOfBirthCountryCodec : FixedPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/CreateCheckNameCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/CreateCheckNameCodec.kt index eecd8f08db..6da0986556 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/CreateCheckNameCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/CreateCheckNameCodec.kt @@ -1,10 +1,10 @@ package org.openrs2.protocol.login.upstream import io.netty.buffer.ByteBuf +import jakarta.inject.Singleton import org.openrs2.crypto.StreamCipher import org.openrs2.protocol.FixedPacketCodec import org.openrs2.util.Base37 -import javax.inject.Singleton @Singleton public class CreateCheckNameCodec : FixedPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitCrossDomainConnectionCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitCrossDomainConnectionCodec.kt index ab9d509395..5aeeb4a0c0 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitCrossDomainConnectionCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitCrossDomainConnectionCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.upstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class InitCrossDomainConnectionCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitGameConnectionCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitGameConnectionCodec.kt index 9a0584f7d3..44a070825a 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitGameConnectionCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitGameConnectionCodec.kt @@ -1,9 +1,9 @@ package org.openrs2.protocol.login.upstream import io.netty.buffer.ByteBuf +import jakarta.inject.Singleton import org.openrs2.crypto.StreamCipher import org.openrs2.protocol.FixedPacketCodec -import javax.inject.Singleton @Singleton public class InitGameConnectionCodec : FixedPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitJaggrabConnectionCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitJaggrabConnectionCodec.kt index 1db742c5d7..7bd05421f9 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitJaggrabConnectionCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitJaggrabConnectionCodec.kt @@ -1,7 +1,7 @@ package org.openrs2.protocol.login.upstream +import jakarta.inject.Singleton import org.openrs2.protocol.EmptyPacketCodec -import javax.inject.Singleton @Singleton public class InitJaggrabConnectionCodec : EmptyPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitJs5RemoteConnectionCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitJs5RemoteConnectionCodec.kt index 01607c2ca5..803fb79b76 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitJs5RemoteConnectionCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/InitJs5RemoteConnectionCodec.kt @@ -1,9 +1,9 @@ package org.openrs2.protocol.login.upstream import io.netty.buffer.ByteBuf +import jakarta.inject.Singleton import org.openrs2.crypto.StreamCipher import org.openrs2.protocol.FixedPacketCodec -import javax.inject.Singleton @Singleton public class InitJs5RemoteConnectionCodec : FixedPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/LoginUpstream.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/LoginUpstream.kt index 0c30383173..cf3618e960 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/LoginUpstream.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/LoginUpstream.kt @@ -1,6 +1,6 @@ package org.openrs2.protocol.login.upstream -import javax.inject.Qualifier +import jakarta.inject.Qualifier @Qualifier @Retention(AnnotationRetention.RUNTIME) diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/RequestWorldListCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/RequestWorldListCodec.kt index 0c24382453..dd17010d8c 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/RequestWorldListCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/login/upstream/RequestWorldListCodec.kt @@ -1,9 +1,9 @@ package org.openrs2.protocol.login.upstream import io.netty.buffer.ByteBuf +import jakarta.inject.Singleton import org.openrs2.crypto.StreamCipher import org.openrs2.protocol.FixedPacketCodec -import javax.inject.Singleton @Singleton public class RequestWorldListCodec : FixedPacketCodec( diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/world/downstream/WorldListDownstream.kt b/protocol/src/main/kotlin/org/openrs2/protocol/world/downstream/WorldListDownstream.kt index 8c15294189..76e270f796 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/world/downstream/WorldListDownstream.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/world/downstream/WorldListDownstream.kt @@ -1,6 +1,6 @@ package org.openrs2.protocol.world.downstream -import javax.inject.Qualifier +import jakarta.inject.Qualifier @Qualifier @Retention(AnnotationRetention.RUNTIME) diff --git a/protocol/src/main/kotlin/org/openrs2/protocol/world/downstream/WorldListResponseCodec.kt b/protocol/src/main/kotlin/org/openrs2/protocol/world/downstream/WorldListResponseCodec.kt index e0bb86a2b0..c5ecc3a0cc 100644 --- a/protocol/src/main/kotlin/org/openrs2/protocol/world/downstream/WorldListResponseCodec.kt +++ b/protocol/src/main/kotlin/org/openrs2/protocol/world/downstream/WorldListResponseCodec.kt @@ -1,13 +1,13 @@ package org.openrs2.protocol.world.downstream import io.netty.buffer.ByteBuf +import jakarta.inject.Singleton import org.openrs2.buffer.readUnsignedShortSmart import org.openrs2.buffer.readVersionedString import org.openrs2.buffer.writeUnsignedShortSmart import org.openrs2.buffer.writeVersionedString import org.openrs2.crypto.StreamCipher import org.openrs2.protocol.VariableShortPacketCodec -import javax.inject.Singleton @Singleton public class WorldListResponseCodec : VariableShortPacketCodec( diff --git a/yaml/src/main/kotlin/org/openrs2/yaml/ObjectMapperProvider.kt b/yaml/src/main/kotlin/org/openrs2/yaml/ObjectMapperProvider.kt index ef1edb464d..e6ac63706e 100644 --- a/yaml/src/main/kotlin/org/openrs2/yaml/ObjectMapperProvider.kt +++ b/yaml/src/main/kotlin/org/openrs2/yaml/ObjectMapperProvider.kt @@ -6,8 +6,8 @@ import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.SerializationFeature import com.fasterxml.jackson.dataformat.yaml.YAMLFactory import com.fasterxml.jackson.module.kotlin.registerKotlinModule -import javax.inject.Inject -import javax.inject.Provider +import jakarta.inject.Inject +import jakarta.inject.Provider public class ObjectMapperProvider @Inject constructor( private val modules: Set diff --git a/yaml/src/main/kotlin/org/openrs2/yaml/Yaml.kt b/yaml/src/main/kotlin/org/openrs2/yaml/Yaml.kt index 3071da26bc..44c81203c8 100644 --- a/yaml/src/main/kotlin/org/openrs2/yaml/Yaml.kt +++ b/yaml/src/main/kotlin/org/openrs2/yaml/Yaml.kt @@ -1,6 +1,6 @@ package org.openrs2.yaml -import javax.inject.Qualifier +import jakarta.inject.Qualifier @Qualifier @Retention(AnnotationRetention.RUNTIME)