Rename dev.openrs2 package to org.openrs2

Signed-off-by: Graham <gpe@openrs2.org>
4 years ago · ce5b76ef0f
parent 6cda83b4bc
commit ce5b76ef0f
448 changed files with 1016 additions and 1012 deletions
--- a/.idea/runConfigurations/AstDeobfuscator.xml
+++ b/.idea/runConfigurations/AstDeobfuscator.xml
@ -1,12 +1,12 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="AstDeobfuscator" type="JetRunConfigurationType" factoryName="Kotlin">
+  <configuration default="false" name="AstDeobfuscator" type="JetRunConfigurationType">
    <module name="openrs2.deob-ast.main" />
    <option name="VM_PARAMETERS" value="" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" />
    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="MAIN_CLASS_NAME" value="dev.openrs2.deob.ast.DeobfuscateAstCommandKt" />
+    <option name="MAIN_CLASS_NAME" value="org.openrs2.deob.ast.DeobfuscateAstCommandKt" />
    <option name="WORKING_DIRECTORY" value="" />
    <method v="2">
      <option name="Make" enabled="true" />
--- a/.idea/runConfigurations/Bundler.xml
+++ b/.idea/runConfigurations/Bundler.xml
@ -1,12 +1,12 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Bundler" type="JetRunConfigurationType" factoryName="Kotlin">
+  <configuration default="false" name="Bundler" type="JetRunConfigurationType">
    <module name="openrs2.bundler.main" />
    <option name="VM_PARAMETERS" value="" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" />
    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="MAIN_CLASS_NAME" value="dev.openrs2.bundler.BundleCommandKt" />
+    <option name="MAIN_CLASS_NAME" value="org.openrs2.bundler.BundleCommandKt" />
    <option name="WORKING_DIRECTORY" value="" />
    <method v="2">
      <option name="Make" enabled="true" />
--- a/.idea/runConfigurations/Decompiler.xml
+++ b/.idea/runConfigurations/Decompiler.xml
@ -1,12 +1,12 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Decompiler" type="JetRunConfigurationType" factoryName="Kotlin">
+  <configuration default="false" name="Decompiler" type="JetRunConfigurationType">
    <module name="openrs2.decompiler.main" />
    <option name="VM_PARAMETERS" value="-Xmx3G" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" />
    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="MAIN_CLASS_NAME" value="dev.openrs2.decompiler.DecompileCommandKt" />
+    <option name="MAIN_CLASS_NAME" value="org.openrs2.decompiler.DecompileCommandKt" />
    <option name="WORKING_DIRECTORY" value="" />
    <method v="2">
      <option name="Make" enabled="true" />
--- a/.idea/runConfigurations/Deobfuscator.xml
+++ b/.idea/runConfigurations/Deobfuscator.xml
@ -1,12 +1,12 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Deobfuscator" type="JetRunConfigurationType" factoryName="Kotlin">
+  <configuration default="false" name="Deobfuscator" type="JetRunConfigurationType">
    <module name="openrs2.deob.main" />
    <option name="VM_PARAMETERS" value="" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" />
    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="MAIN_CLASS_NAME" value="dev.openrs2.deob.DeobfuscateCommandKt" />
+    <option name="MAIN_CLASS_NAME" value="org.openrs2.deob.DeobfuscateCommandKt" />
    <option name="WORKING_DIRECTORY" value="" />
    <method v="2">
      <option name="Make" enabled="true" />
--- a/.idea/runConfigurations/GameServer.xml
+++ b/.idea/runConfigurations/GameServer.xml
@ -1,12 +1,12 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="GameServer" type="JetRunConfigurationType" factoryName="Kotlin">
+  <configuration default="false" name="GameServer" type="JetRunConfigurationType">
    <module name="openrs2.game.main" />
    <option name="VM_PARAMETERS" value="-Dio.netty.leakDetection.level=PARANOID" />
    <option name="PROGRAM_PARAMETERS" value="" />
    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
    <option name="ALTERNATIVE_JRE_PATH" />
    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="MAIN_CLASS_NAME" value="dev.openrs2.game.GameCommandKt" />
+    <option name="MAIN_CLASS_NAME" value="org.openrs2.game.GameCommandKt" />
    <option name="WORKING_DIRECTORY" value="" />
    <method v="2">
      <option name="Make" enabled="true" />
--- a/.idea/runConfigurations/org_openrs2.xml
+++ b/.idea/runConfigurations/org_openrs2.xml
@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="dev.openrs2" type="JUnit" factoryName="JUnit">
+  <configuration default="false" name="org.openrs2" type="JUnit" factoryName="JUnit">
    <useClassPathOnly />
    <extension name="coverage">
      <pattern>
@ -7,7 +7,7 @@
        <option name="ENABLED" value="true" />
      </pattern>
    </extension>
-    <option name="PACKAGE_NAME" value="dev.openrs2" />
+    <option name="PACKAGE_NAME" value="org.openrs2" />
    <option name="MAIN_CLASS_NAME" value="" />
    <option name="METHOD_NAME" value="" />
    <option name="TEST_OBJECT" value="package" />
--- a/all/build.gradle.kts
+++ b/all/build.gradle.kts
@ -11,7 +11,7 @@ plugins {

 application {
    applicationName = "openrs2"
-    mainClassName = "dev.openrs2.CommandKt"
+    mainClassName = "org.openrs2.CommandKt"
 }

 dependencies {
--- a/all/src/main/java/org/openrs2/Command.kt
+++ b/all/src/main/java/org/openrs2/Command.kt
@ -1,15 +1,15 @@
-package dev.openrs2
+package org.openrs2

 import com.github.ajalt.clikt.core.NoOpCliktCommand
 import com.github.ajalt.clikt.core.subcommands
-import dev.openrs2.archive.ArchiveCommand
-import dev.openrs2.bundler.BundleCommand
-import dev.openrs2.compress.cli.CompressCommand
-import dev.openrs2.crc32.Crc32Command
-import dev.openrs2.decompiler.DecompileCommand
-import dev.openrs2.deob.DeobfuscateCommand
-import dev.openrs2.deob.ast.DeobfuscateAstCommand
-import dev.openrs2.game.GameCommand
+import org.openrs2.archive.ArchiveCommand
+import org.openrs2.bundler.BundleCommand
+import org.openrs2.compress.cli.CompressCommand
+import org.openrs2.crc32.Crc32Command
+import org.openrs2.decompiler.DecompileCommand
+import org.openrs2.deob.DeobfuscateCommand
+import org.openrs2.deob.ast.DeobfuscateAstCommand
+import org.openrs2.game.GameCommand

 public fun main(args: Array<String>): Unit = Command().main(args)

--- a/archive/build.gradle.kts
+++ b/archive/build.gradle.kts
@ -5,7 +5,7 @@ plugins {
 }

 application {
-    mainClassName = "dev.openrs2.archive.ArchiveCommandKt"
+    mainClassName = "org.openrs2.archive.ArchiveCommandKt"
 }

 dependencies {
--- a/archive/src/main/java/org/openrs2/archive/ArchiveCommand.kt
+++ b/archive/src/main/java/org/openrs2/archive/ArchiveCommand.kt
@ -1,10 +1,10 @@
-package dev.openrs2.archive
+package org.openrs2.archive

 import com.github.ajalt.clikt.core.NoOpCliktCommand
 import com.github.ajalt.clikt.core.subcommands
-import dev.openrs2.archive.cache.CacheCommand
-import dev.openrs2.archive.key.KeyCommand
-import dev.openrs2.archive.name.NameCommand
+import org.openrs2.archive.cache.CacheCommand
+import org.openrs2.archive.key.KeyCommand
+import org.openrs2.archive.name.NameCommand

 public fun main(args: Array<String>): Unit = ArchiveCommand().main(args)

--- a/archive/src/main/java/org/openrs2/archive/ArchiveModule.kt
+++ b/archive/src/main/java/org/openrs2/archive/ArchiveModule.kt
@ -1,10 +1,10 @@
-package dev.openrs2.archive
+package org.openrs2.archive

 import com.google.inject.AbstractModule
 import com.google.inject.Scopes
-import dev.openrs2.buffer.BufferModule
-import dev.openrs2.db.Database
-import dev.openrs2.json.JsonModule
+import org.openrs2.buffer.BufferModule
+import org.openrs2.db.Database
+import org.openrs2.json.JsonModule

 public object ArchiveModule : AbstractModule() {
    override fun configure() {
--- a/archive/src/main/java/org/openrs2/archive/DatabaseProvider.kt
+++ b/archive/src/main/java/org/openrs2/archive/DatabaseProvider.kt
@ -1,8 +1,8 @@
-package dev.openrs2.archive
+package org.openrs2.archive

-import dev.openrs2.db.Database
-import dev.openrs2.db.PostgresDeadlockDetector
 import org.flywaydb.core.Flyway
+import org.openrs2.db.Database
+import org.openrs2.db.PostgresDeadlockDetector
 import org.postgresql.ds.PGSimpleDataSource
 import javax.inject.Provider

@ -14,7 +14,7 @@ public class DatabaseProvider : Provider<Database> {

        Flyway.configure()
            .dataSource(dataSource)
-            .locations("classpath:/dev/openrs2/archive")
+            .locations("classpath:/org/openrs2/archive")
            .load()
            .migrate()

--- a/archive/src/main/java/org/openrs2/archive/cache/CacheCommand.kt
+++ b/archive/src/main/java/org/openrs2/archive/cache/CacheCommand.kt
@ -1,4 +1,4 @@
-package dev.openrs2.archive.cache
+package org.openrs2.archive.cache

 import com.github.ajalt.clikt.core.NoOpCliktCommand
 import com.github.ajalt.clikt.core.subcommands
--- a/archive/src/main/java/org/openrs2/archive/cache/CacheExporter.kt
+++ b/archive/src/main/java/org/openrs2/archive/cache/CacheExporter.kt
@ -1,10 +1,10 @@
-package dev.openrs2.archive.cache
+package org.openrs2.archive.cache

-import dev.openrs2.buffer.use
-import dev.openrs2.cache.Store
-import dev.openrs2.db.Database
 import io.netty.buffer.ByteBufAllocator
 import io.netty.buffer.Unpooled
+import org.openrs2.buffer.use
+import org.openrs2.cache.Store
+import org.openrs2.db.Database
 import javax.inject.Inject
 import javax.inject.Singleton

--- a/archive/src/main/java/org/openrs2/archive/cache/CacheImporter.kt
+++ b/archive/src/main/java/org/openrs2/archive/cache/CacheImporter.kt
@ -1,18 +1,18 @@
-package dev.openrs2.archive.cache
-
-import dev.openrs2.buffer.crc32
-import dev.openrs2.buffer.use
-import dev.openrs2.cache.Js5Archive
-import dev.openrs2.cache.Js5Compression
-import dev.openrs2.cache.Js5Index
-import dev.openrs2.cache.Store
-import dev.openrs2.cache.VersionTrailer
-import dev.openrs2.crypto.Whirlpool
-import dev.openrs2.db.Database
+package org.openrs2.archive.cache
+
 import io.netty.buffer.ByteBuf
 import io.netty.buffer.ByteBufAllocator
 import io.netty.buffer.ByteBufUtil
 import io.netty.buffer.DefaultByteBufHolder
+import org.openrs2.buffer.crc32
+import org.openrs2.buffer.use
+import org.openrs2.cache.Js5Archive
+import org.openrs2.cache.Js5Compression
+import org.openrs2.cache.Js5Index
+import org.openrs2.cache.Store
+import org.openrs2.cache.VersionTrailer
+import org.openrs2.crypto.Whirlpool
+import org.openrs2.db.Database
 import java.io.IOException
 import java.sql.Connection
 import java.sql.Types
--- a/archive/src/main/java/org/openrs2/archive/cache/ExportCommand.kt
+++ b/archive/src/main/java/org/openrs2/archive/cache/ExportCommand.kt
@ -1,13 +1,13 @@
-package dev.openrs2.archive.cache
+package org.openrs2.archive.cache

 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.types.long
 import com.github.ajalt.clikt.parameters.types.path
 import com.google.inject.Guice
-import dev.openrs2.archive.ArchiveModule
-import dev.openrs2.cache.DiskStore
 import kotlinx.coroutines.runBlocking
+import org.openrs2.archive.ArchiveModule
+import org.openrs2.cache.DiskStore

 public class ExportCommand : CliktCommand(name = "export") {
    private val id by argument().long()
--- a/archive/src/main/java/org/openrs2/archive/cache/ImportCommand.kt
+++ b/archive/src/main/java/org/openrs2/archive/cache/ImportCommand.kt
@ -1,12 +1,12 @@
-package dev.openrs2.archive.cache
+package org.openrs2.archive.cache

 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.types.path
 import com.google.inject.Guice
-import dev.openrs2.archive.ArchiveModule
-import dev.openrs2.cache.Store
 import kotlinx.coroutines.runBlocking
+import org.openrs2.archive.ArchiveModule
+import org.openrs2.cache.Store

 public class ImportCommand : CliktCommand(name = "import") {
    private val input by argument().path(
--- a/archive/src/main/java/org/openrs2/archive/key/BruteForceCommand.kt
+++ b/archive/src/main/java/org/openrs2/archive/key/BruteForceCommand.kt
@ -1,9 +1,9 @@
-package dev.openrs2.archive.key
+package org.openrs2.archive.key

 import com.github.ajalt.clikt.core.CliktCommand
 import com.google.inject.Guice
-import dev.openrs2.archive.ArchiveModule
 import kotlinx.coroutines.runBlocking
+import org.openrs2.archive.ArchiveModule

 public class BruteForceCommand : CliktCommand(name = "brute-force") {
    override fun run(): Unit = runBlocking {
--- a/archive/src/main/java/org/openrs2/archive/key/HexKeyReader.kt
+++ b/archive/src/main/java/org/openrs2/archive/key/HexKeyReader.kt
@ -1,6 +1,6 @@
-package dev.openrs2.archive.key
+package org.openrs2.archive.key

-import dev.openrs2.crypto.XteaKey
+import org.openrs2.crypto.XteaKey
 import java.io.InputStream

 public object HexKeyReader : KeyReader {
--- a/archive/src/main/java/org/openrs2/archive/key/ImportCommand.kt
+++ b/archive/src/main/java/org/openrs2/archive/key/ImportCommand.kt
@ -1,11 +1,11 @@
-package dev.openrs2.archive.key
+package org.openrs2.archive.key

 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.types.path
 import com.google.inject.Guice
-import dev.openrs2.archive.ArchiveModule
 import kotlinx.coroutines.runBlocking
+import org.openrs2.archive.ArchiveModule

 public class ImportCommand : CliktCommand(name = "import") {
    private val input by argument().path(
--- a/archive/src/main/java/org/openrs2/archive/key/JsonKeyReader.kt
+++ b/archive/src/main/java/org/openrs2/archive/key/JsonKeyReader.kt
@ -1,8 +1,8 @@
-package dev.openrs2.archive.key
+package org.openrs2.archive.key

 import com.fasterxml.jackson.databind.ObjectMapper
-import dev.openrs2.crypto.XteaKey
-import dev.openrs2.json.Json
+import org.openrs2.crypto.XteaKey
+import org.openrs2.json.Json
 import java.io.InputStream
 import javax.inject.Inject
 import javax.inject.Singleton
--- a/archive/src/main/java/org/openrs2/archive/key/KeyBruteForcer.kt
+++ b/archive/src/main/java/org/openrs2/archive/key/KeyBruteForcer.kt
@ -1,10 +1,10 @@
-package dev.openrs2.archive.key
+package org.openrs2.archive.key

-import dev.openrs2.buffer.use
-import dev.openrs2.cache.Js5Compression
-import dev.openrs2.crypto.XteaKey
-import dev.openrs2.db.Database
 import io.netty.buffer.Unpooled
+import org.openrs2.buffer.use
+import org.openrs2.cache.Js5Compression
+import org.openrs2.crypto.XteaKey
+import org.openrs2.db.Database
 import java.sql.Connection
 import java.sql.Types
 import javax.inject.Inject
--- a/archive/src/main/java/org/openrs2/archive/key/KeyCommand.kt
+++ b/archive/src/main/java/org/openrs2/archive/key/KeyCommand.kt
@ -1,4 +1,4 @@
-package dev.openrs2.archive.key
+package org.openrs2.archive.key

 import com.github.ajalt.clikt.core.NoOpCliktCommand
 import com.github.ajalt.clikt.core.subcommands
--- a/archive/src/main/java/org/openrs2/archive/key/KeyImporter.kt
+++ b/archive/src/main/java/org/openrs2/archive/key/KeyImporter.kt
@ -1,7 +1,7 @@
-package dev.openrs2.archive.key
+package org.openrs2.archive.key

-import dev.openrs2.crypto.XteaKey
-import dev.openrs2.db.Database
+import org.openrs2.crypto.XteaKey
+import org.openrs2.db.Database
 import java.nio.file.Files
 import java.nio.file.Path
 import javax.inject.Inject
--- a/archive/src/main/java/org/openrs2/archive/key/KeyReader.kt
+++ b/archive/src/main/java/org/openrs2/archive/key/KeyReader.kt
@ -1,6 +1,6 @@
-package dev.openrs2.archive.key
+package org.openrs2.archive.key

-import dev.openrs2.crypto.XteaKey
+import org.openrs2.crypto.XteaKey
 import java.io.InputStream

 public interface KeyReader {
--- a/archive/src/main/java/org/openrs2/archive/key/TextKeyReader.kt
+++ b/archive/src/main/java/org/openrs2/archive/key/TextKeyReader.kt
@ -1,6 +1,6 @@
-package dev.openrs2.archive.key
+package org.openrs2.archive.key

-import dev.openrs2.crypto.XteaKey
+import org.openrs2.crypto.XteaKey
 import java.io.InputStream

 public object TextKeyReader : KeyReader {
--- a/archive/src/main/java/org/openrs2/archive/name/GenerateCommand.kt
+++ b/archive/src/main/java/org/openrs2/archive/name/GenerateCommand.kt
@ -1,9 +1,9 @@
-package dev.openrs2.archive.name
+package org.openrs2.archive.name

 import com.github.ajalt.clikt.core.CliktCommand
 import com.google.inject.Guice
-import dev.openrs2.archive.ArchiveModule
 import kotlinx.coroutines.runBlocking
+import org.openrs2.archive.ArchiveModule

 public class GenerateCommand : CliktCommand(name = "generate") {
    override fun run(): Unit = runBlocking {
--- a/archive/src/main/java/org/openrs2/archive/name/ImportCommand.kt
+++ b/archive/src/main/java/org/openrs2/archive/name/ImportCommand.kt
@ -1,12 +1,12 @@
-package dev.openrs2.archive.name
+package org.openrs2.archive.name

 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.parameters.options.option
 import com.github.ajalt.clikt.parameters.types.defaultStdin
 import com.github.ajalt.clikt.parameters.types.inputStream
 import com.google.inject.Guice
-import dev.openrs2.archive.ArchiveModule
 import kotlinx.coroutines.runBlocking
+import org.openrs2.archive.ArchiveModule

 public class ImportCommand : CliktCommand(name = "import") {
    private val input by option().inputStream().defaultStdin()
--- a/archive/src/main/java/org/openrs2/archive/name/NameCommand.kt
+++ b/archive/src/main/java/org/openrs2/archive/name/NameCommand.kt
@ -1,4 +1,4 @@
-package dev.openrs2.archive.name
+package org.openrs2.archive.name

 import com.github.ajalt.clikt.core.NoOpCliktCommand
 import com.github.ajalt.clikt.core.subcommands
--- a/archive/src/main/java/org/openrs2/archive/name/NameImporter.kt
+++ b/archive/src/main/java/org/openrs2/archive/name/NameImporter.kt
@ -1,7 +1,7 @@
-package dev.openrs2.archive.name
+package org.openrs2.archive.name

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

--- a/asm/src/main/java/org/openrs2/asm/AsmJacksonModule.kt
+++ b/asm/src/main/java/org/openrs2/asm/AsmJacksonModule.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm

 import com.fasterxml.jackson.databind.module.SimpleModule
 import javax.inject.Singleton
--- a/asm/src/main/java/org/openrs2/asm/AsmModule.kt
+++ b/asm/src/main/java/org/openrs2/asm/AsmModule.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm

 import com.fasterxml.jackson.databind.Module
 import com.google.inject.AbstractModule
--- a/asm/src/main/java/org/openrs2/asm/ClassForNameUtils.kt
+++ b/asm/src/main/java/org/openrs2/asm/ClassForNameUtils.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm

 import org.objectweb.asm.commons.Remapper
 import org.objectweb.asm.tree.AbstractInsnNode
--- a/asm/src/main/java/org/openrs2/asm/ClassNameExtensions.kt
+++ b/asm/src/main/java/org/openrs2/asm/ClassNameExtensions.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm

 public fun String.toBinaryClassName(): String {
    return replace('/', '.')
--- a/asm/src/main/java/org/openrs2/asm/ClassNodeRemapper.kt
+++ b/asm/src/main/java/org/openrs2/asm/ClassNodeRemapper.kt
@ -1,6 +1,5 @@
-package dev.openrs2.asm
+package org.openrs2.asm

-import dev.openrs2.asm.classpath.ExtendedRemapper
 import org.objectweb.asm.Type
 import org.objectweb.asm.commons.Remapper
 import org.objectweb.asm.tree.AbstractInsnNode
@ -17,6 +16,7 @@ import org.objectweb.asm.tree.MultiANewArrayInsnNode
 import org.objectweb.asm.tree.ParameterNode
 import org.objectweb.asm.tree.TryCatchBlockNode
 import org.objectweb.asm.tree.TypeInsnNode
+import org.openrs2.asm.classpath.ExtendedRemapper

 public fun ClassNode.remap(remapper: ExtendedRemapper) {
    val originalName = name
--- a/asm/src/main/java/org/openrs2/asm/ClassVersionUtils.kt
+++ b/asm/src/main/java/org/openrs2/asm/ClassVersionUtils.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm

 public object ClassVersionUtils {
    private fun swapWords(v: Int): Int {
--- a/asm/src/main/java/org/openrs2/asm/InsnListUtils.kt
+++ b/asm/src/main/java/org/openrs2/asm/InsnListUtils.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm

 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.InsnList
--- a/asm/src/main/java/org/openrs2/asm/InsnMatcher.kt
+++ b/asm/src/main/java/org/openrs2/asm/InsnMatcher.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm

 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
--- a/asm/src/main/java/org/openrs2/asm/InsnNodeUtils.kt
+++ b/asm/src/main/java/org/openrs2/asm/InsnNodeUtils.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm

 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
--- a/asm/src/main/java/org/openrs2/asm/MemberDesc.kt
+++ b/asm/src/main/java/org/openrs2/asm/MemberDesc.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm

 import org.objectweb.asm.tree.FieldInsnNode
 import org.objectweb.asm.tree.FieldNode
--- a/asm/src/main/java/org/openrs2/asm/MemberRef.kt
+++ b/asm/src/main/java/org/openrs2/asm/MemberRef.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm

 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldInsnNode
--- a/asm/src/main/java/org/openrs2/asm/MemberRefDeserializer.kt
+++ b/asm/src/main/java/org/openrs2/asm/MemberRefDeserializer.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm

 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.databind.DeserializationContext
--- a/asm/src/main/java/org/openrs2/asm/MemberRefKeyDeserializer.kt
+++ b/asm/src/main/java/org/openrs2/asm/MemberRefKeyDeserializer.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm

 import com.fasterxml.jackson.databind.DeserializationContext
 import com.fasterxml.jackson.databind.KeyDeserializer
--- a/asm/src/main/java/org/openrs2/asm/MethodNodeUtils.kt
+++ b/asm/src/main/java/org/openrs2/asm/MethodNodeUtils.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm

 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
--- a/asm/src/main/java/org/openrs2/asm/NopClassVisitor.kt
+++ b/asm/src/main/java/org/openrs2/asm/NopClassVisitor.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm

 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.Opcodes
--- a/asm/src/main/java/org/openrs2/asm/StackMetadata.kt
+++ b/asm/src/main/java/org/openrs2/asm/StackMetadata.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm
+package org.openrs2.asm

 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
--- a/asm/src/main/java/org/openrs2/asm/classpath/AsmClassMetadata.kt
+++ b/asm/src/main/java/org/openrs2/asm/classpath/AsmClassMetadata.kt
@ -1,8 +1,8 @@
-package dev.openrs2.asm.classpath
+package org.openrs2.asm.classpath

-import dev.openrs2.asm.MemberDesc
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
+import org.openrs2.asm.MemberDesc

 public class AsmClassMetadata(
    private val classPath: ClassPath,
--- a/asm/src/main/java/org/openrs2/asm/classpath/ClassMetadata.kt
+++ b/asm/src/main/java/org/openrs2/asm/classpath/ClassMetadata.kt
@ -1,6 +1,6 @@
-package dev.openrs2.asm.classpath
+package org.openrs2.asm.classpath

-import dev.openrs2.asm.MemberDesc
+import org.openrs2.asm.MemberDesc

 public abstract class ClassMetadata {
    public abstract val name: String
--- a/asm/src/main/java/org/openrs2/asm/classpath/ClassPath.kt
+++ b/asm/src/main/java/org/openrs2/asm/classpath/ClassPath.kt
@ -1,13 +1,13 @@
-package dev.openrs2.asm.classpath
+package org.openrs2.asm.classpath

-import dev.openrs2.asm.MemberDesc
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.toBinaryClassName
-import dev.openrs2.util.collect.DisjointSet
-import dev.openrs2.util.collect.ForestDisjointSet
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.ClassNode
+import org.openrs2.asm.MemberDesc
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.toBinaryClassName
+import org.openrs2.util.collect.DisjointSet
+import org.openrs2.util.collect.ForestDisjointSet
 import java.util.IdentityHashMap

 public class ClassPath(
--- a/asm/src/main/java/org/openrs2/asm/classpath/ExtendedRemapper.kt
+++ b/asm/src/main/java/org/openrs2/asm/classpath/ExtendedRemapper.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm.classpath
+package org.openrs2.asm.classpath

 import org.objectweb.asm.commons.Remapper
 import org.objectweb.asm.tree.AbstractInsnNode
--- a/asm/src/main/java/org/openrs2/asm/classpath/JsrInliner.kt
+++ b/asm/src/main/java/org/openrs2/asm/classpath/JsrInliner.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm.classpath
+package org.openrs2.asm.classpath

 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.MethodVisitor
--- a/asm/src/main/java/org/openrs2/asm/classpath/Library.kt
+++ b/asm/src/main/java/org/openrs2/asm/classpath/Library.kt
@ -1,10 +1,10 @@
-package dev.openrs2.asm.classpath
+package org.openrs2.asm.classpath

 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.io.LibraryReader
-import dev.openrs2.asm.io.LibraryWriter
-import dev.openrs2.util.io.useAtomicOutputStream
 import org.objectweb.asm.tree.ClassNode
+import org.openrs2.asm.io.LibraryReader
+import org.openrs2.asm.io.LibraryWriter
+import org.openrs2.util.io.useAtomicOutputStream
 import java.nio.file.Files
 import java.nio.file.Path
 import java.util.SortedMap
--- a/asm/src/main/java/org/openrs2/asm/classpath/LibraryRemapper.kt
+++ b/asm/src/main/java/org/openrs2/asm/classpath/LibraryRemapper.kt
@ -1,9 +1,5 @@
-package dev.openrs2.asm.classpath
+package org.openrs2.asm.classpath

-import dev.openrs2.asm.ClassVersionUtils
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.nextReal
-import dev.openrs2.asm.remap
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldInsnNode
@ -11,6 +7,10 @@ import org.objectweb.asm.tree.FieldNode
 import org.objectweb.asm.tree.InsnList
 import org.objectweb.asm.tree.InsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.ClassVersionUtils
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.nextReal
+import org.openrs2.asm.remap
 import java.util.SortedMap
 import java.util.TreeMap
 import kotlin.math.max
--- a/asm/src/main/java/org/openrs2/asm/classpath/ReflectionClassMetadata.kt
+++ b/asm/src/main/java/org/openrs2/asm/classpath/ReflectionClassMetadata.kt
@ -1,8 +1,8 @@
-package dev.openrs2.asm.classpath
+package org.openrs2.asm.classpath

-import dev.openrs2.asm.MemberDesc
-import dev.openrs2.asm.toInternalClassName
 import org.objectweb.asm.Type
+import org.openrs2.asm.MemberDesc
+import org.openrs2.asm.toInternalClassName

 private val Class<*>.asmName: String
    get() = name.toInternalClassName()
--- a/asm/src/main/java/org/openrs2/asm/classpath/StackFrameClassWriter.kt
+++ b/asm/src/main/java/org/openrs2/asm/classpath/StackFrameClassWriter.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm.classpath
+package org.openrs2.asm.classpath

 import org.objectweb.asm.ClassWriter

--- a/asm/src/main/java/org/openrs2/asm/filter/AnyClassFilter.kt
+++ b/asm/src/main/java/org/openrs2/asm/filter/AnyClassFilter.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm.filter
+package org.openrs2.asm.filter

 public object AnyClassFilter : ClassFilter {
    override fun matches(name: String): Boolean {
--- a/asm/src/main/java/org/openrs2/asm/filter/AnyMemberFilter.kt
+++ b/asm/src/main/java/org/openrs2/asm/filter/AnyMemberFilter.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm.filter
+package org.openrs2.asm.filter

 public object AnyMemberFilter : MemberFilter {
    override fun matches(owner: String, name: String, desc: String): Boolean {
--- a/asm/src/main/java/org/openrs2/asm/filter/ClassFilter.kt
+++ b/asm/src/main/java/org/openrs2/asm/filter/ClassFilter.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm.filter
+package org.openrs2.asm.filter

 public interface ClassFilter {
    public fun matches(name: String): Boolean
--- a/asm/src/main/java/org/openrs2/asm/filter/Glob.kt
+++ b/asm/src/main/java/org/openrs2/asm/filter/Glob.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm.filter
+package org.openrs2.asm.filter

 public object Glob {
    public fun compile(pattern: String): Regex {
--- a/asm/src/main/java/org/openrs2/asm/filter/GlobClassFilter.kt
+++ b/asm/src/main/java/org/openrs2/asm/filter/GlobClassFilter.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm.filter
+package org.openrs2.asm.filter

 import com.fasterxml.jackson.annotation.JsonIgnore

--- a/asm/src/main/java/org/openrs2/asm/filter/GlobMemberFilter.kt
+++ b/asm/src/main/java/org/openrs2/asm/filter/GlobMemberFilter.kt
@ -1,7 +1,7 @@
-package dev.openrs2.asm.filter
+package org.openrs2.asm.filter

 import com.fasterxml.jackson.annotation.JsonIgnore
-import dev.openrs2.asm.MemberRef
+import org.openrs2.asm.MemberRef

 public class GlobMemberFilter(@Suppress("CanBeParameter") private val patterns: List<MemberRef>) : MemberFilter {
    private data class CompiledPattern(val owner: Regex, val name: Regex, val desc: Regex)
--- a/asm/src/main/java/org/openrs2/asm/filter/MemberFilter.kt
+++ b/asm/src/main/java/org/openrs2/asm/filter/MemberFilter.kt
@ -1,6 +1,6 @@
-package dev.openrs2.asm.filter
+package org.openrs2.asm.filter

-import dev.openrs2.asm.MemberRef
+import org.openrs2.asm.MemberRef

 public interface MemberFilter {
    public fun matches(owner: String, name: String, desc: String): Boolean
--- a/asm/src/main/java/org/openrs2/asm/filter/UnionClassFilter.kt
+++ b/asm/src/main/java/org/openrs2/asm/filter/UnionClassFilter.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm.filter
+package org.openrs2.asm.filter

 public class UnionClassFilter(vararg filters: ClassFilter) : ClassFilter {
    private val filters = filters.toList()
--- a/asm/src/main/java/org/openrs2/asm/filter/UnionMemberFilter.kt
+++ b/asm/src/main/java/org/openrs2/asm/filter/UnionMemberFilter.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm.filter
+package org.openrs2.asm.filter

 public class UnionMemberFilter(vararg filters: MemberFilter) : MemberFilter {
    private val filters = filters.toList()
--- a/asm/src/main/java/org/openrs2/asm/io/AbstractJarLibraryWriter.kt
+++ b/asm/src/main/java/org/openrs2/asm/io/AbstractJarLibraryWriter.kt
@ -1,13 +1,13 @@
-package dev.openrs2.asm.io
+package org.openrs2.asm.io

-import dev.openrs2.asm.ClassVersionUtils
-import dev.openrs2.asm.NopClassVisitor
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.StackFrameClassWriter
 import org.objectweb.asm.ClassWriter
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.util.CheckClassAdapter
+import org.openrs2.asm.ClassVersionUtils
+import org.openrs2.asm.NopClassVisitor
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.StackFrameClassWriter
 import java.io.OutputStream
 import java.util.jar.JarEntry
 import java.util.jar.JarOutputStream
--- a/asm/src/main/java/org/openrs2/asm/io/JarLibraryReader.kt
+++ b/asm/src/main/java/org/openrs2/asm/io/JarLibraryReader.kt
@ -1,9 +1,9 @@
-package dev.openrs2.asm.io
+package org.openrs2.asm.io

-import dev.openrs2.asm.classpath.JsrInliner
-import dev.openrs2.util.io.entries
 import org.objectweb.asm.ClassReader
 import org.objectweb.asm.tree.ClassNode
+import org.openrs2.asm.classpath.JsrInliner
+import org.openrs2.util.io.entries
 import java.io.InputStream
 import java.util.jar.JarInputStream

--- a/asm/src/main/java/org/openrs2/asm/io/JarLibraryWriter.kt
+++ b/asm/src/main/java/org/openrs2/asm/io/JarLibraryWriter.kt
@ -1,6 +1,6 @@
-package dev.openrs2.asm.io
+package org.openrs2.asm.io

-import dev.openrs2.util.io.DeterministicJarOutputStream
+import org.openrs2.util.io.DeterministicJarOutputStream
 import java.io.OutputStream
 import java.util.jar.JarOutputStream

--- a/asm/src/main/java/org/openrs2/asm/io/LibraryReader.kt
+++ b/asm/src/main/java/org/openrs2/asm/io/LibraryReader.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm.io
+package org.openrs2.asm.io

 import org.objectweb.asm.tree.ClassNode
 import java.io.InputStream
--- a/asm/src/main/java/org/openrs2/asm/io/LibraryWriter.kt
+++ b/asm/src/main/java/org/openrs2/asm/io/LibraryWriter.kt
@ -1,7 +1,7 @@
-package dev.openrs2.asm.io
+package org.openrs2.asm.io

-import dev.openrs2.asm.classpath.ClassPath
 import org.objectweb.asm.tree.ClassNode
+import org.openrs2.asm.classpath.ClassPath
 import java.io.OutputStream

 public interface LibraryWriter {
--- a/asm/src/main/java/org/openrs2/asm/io/ManifestJarLibraryWriter.kt
+++ b/asm/src/main/java/org/openrs2/asm/io/ManifestJarLibraryWriter.kt
@ -1,6 +1,6 @@
-package dev.openrs2.asm.io
+package org.openrs2.asm.io

-import dev.openrs2.util.io.DeterministicJarOutputStream
+import org.openrs2.util.io.DeterministicJarOutputStream
 import java.io.OutputStream
 import java.util.jar.JarOutputStream
 import java.util.jar.Manifest
--- a/asm/src/main/java/org/openrs2/asm/io/Pack200LibraryReader.kt
+++ b/asm/src/main/java/org/openrs2/asm/io/Pack200LibraryReader.kt
@ -1,7 +1,7 @@
-package dev.openrs2.asm.io
+package org.openrs2.asm.io

-import dev.openrs2.compress.gzip.Gzip
 import org.objectweb.asm.tree.ClassNode
+import org.openrs2.compress.gzip.Gzip
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
--- a/asm/src/main/java/org/openrs2/asm/io/Pack200LibraryWriter.kt
+++ b/asm/src/main/java/org/openrs2/asm/io/Pack200LibraryWriter.kt
@ -1,8 +1,8 @@
-package dev.openrs2.asm.io
+package org.openrs2.asm.io

-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.compress.gzip.Gzip
 import org.objectweb.asm.tree.ClassNode
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.compress.gzip.Gzip
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.OutputStream
--- a/asm/src/main/java/org/openrs2/asm/io/PackClassLibraryReader.kt
+++ b/asm/src/main/java/org/openrs2/asm/io/PackClassLibraryReader.kt
@ -1,4 +1,4 @@
-package dev.openrs2.asm.io
+package org.openrs2.asm.io

 import org.objectweb.asm.tree.ClassNode
 import java.io.InputStream
--- a/asm/src/main/java/org/openrs2/asm/io/PackClassLibraryWriter.kt
+++ b/asm/src/main/java/org/openrs2/asm/io/PackClassLibraryWriter.kt
@ -1,7 +1,7 @@
-package dev.openrs2.asm.io
+package org.openrs2.asm.io

-import dev.openrs2.asm.classpath.ClassPath
 import org.objectweb.asm.tree.ClassNode
+import org.openrs2.asm.classpath.ClassPath
 import java.io.OutputStream

 public object PackClassLibraryWriter : LibraryWriter {
--- a/asm/src/main/java/org/openrs2/asm/io/SignedJarLibraryWriter.kt
+++ b/asm/src/main/java/org/openrs2/asm/io/SignedJarLibraryWriter.kt
@ -1,11 +1,11 @@
-package dev.openrs2.asm.io
+package org.openrs2.asm.io

-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.crypto.Pkcs12KeyStore
-import dev.openrs2.util.io.DeterministicJarOutputStream
-import dev.openrs2.util.io.entries
-import dev.openrs2.util.io.useTempFile
 import org.objectweb.asm.tree.ClassNode
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.crypto.Pkcs12KeyStore
+import org.openrs2.util.io.DeterministicJarOutputStream
+import org.openrs2.util.io.entries
+import org.openrs2.util.io.useTempFile
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
--- a/asm/src/main/java/org/openrs2/asm/transform/Transformer.kt
+++ b/asm/src/main/java/org/openrs2/asm/transform/Transformer.kt
@ -1,11 +1,11 @@
-package dev.openrs2.asm.transform
+package org.openrs2.asm.transform

-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.hasCode
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.hasCode

 public abstract class Transformer {
    public open fun transform(classPath: ClassPath) {
--- a/buffer/src/main/java/org/openrs2/buffer/BufferModule.kt
+++ b/buffer/src/main/java/org/openrs2/buffer/BufferModule.kt
@ -1,4 +1,4 @@
-package dev.openrs2.buffer
+package org.openrs2.buffer

 import com.google.inject.AbstractModule
 import io.netty.buffer.ByteBufAllocator
--- a/buffer/src/main/java/org/openrs2/buffer/ByteBufExtensions.kt
+++ b/buffer/src/main/java/org/openrs2/buffer/ByteBufExtensions.kt
@ -1,4 +1,4 @@
-package dev.openrs2.buffer
+package org.openrs2.buffer

 import com.google.common.base.Preconditions
 import io.netty.buffer.ByteBuf
--- a/buffer/src/main/java/org/openrs2/buffer/ReferenceCountedExtensions.kt
+++ b/buffer/src/main/java/org/openrs2/buffer/ReferenceCountedExtensions.kt
@ -1,4 +1,4 @@
-package dev.openrs2.buffer
+package org.openrs2.buffer

 import io.netty.util.ReferenceCounted

--- a/buffer/src/test/java/org/openrs2/buffer/ByteBufExtensionsTest.kt
+++ b/buffer/src/test/java/org/openrs2/buffer/ByteBufExtensionsTest.kt
@ -1,4 +1,4 @@
-package dev.openrs2.buffer
+package org.openrs2.buffer

 import io.netty.buffer.ByteBufAllocator
 import io.netty.buffer.Unpooled
--- a/buildSrc/src/main/java/Versions.kt
+++ b/buildSrc/src/main/java/Versions.kt
@ -7,7 +7,7 @@ object Versions {
    const val dependencyLicenseReport = "1.14"
    const val dokka = "1.4.10"
    const val fastutil = "8.4.2"
-    const val fernflower = "1.0.4-SNAPSHOT"
+    const val fernflower = "1.1.0"
    const val flyway = "7.0.0"
    const val guava = "29.0-jre"
    const val guice = "4.2.3"
@ -24,7 +24,7 @@ object Versions {
    const val kotlinter = "3.2.0"
    const val logback = "1.2.3"
    const val netty = "4.1.52.Final"
-    const val openrs2Natives = "2.0.1"
+    const val openrs2Natives = "3.0.0"
    const val postgres = "42.2.16"
    const val shadowPlugin = "6.0.0"
    const val versionsPlugin = "0.33.0"
--- a/bundler/build.gradle.kts
+++ b/bundler/build.gradle.kts
@ -5,7 +5,7 @@ plugins {
 }

 application {
-    mainClassName = "dev.openrs2.bundler.BundleCommandKt"
+    mainClassName = "org.openrs2.bundler.BundleCommandKt"
 }

 dependencies {
@ -15,7 +15,7 @@ dependencies {

    implementation(project(":conf"))
    implementation(project(":crypto"))
-    implementation("dev.openrs2:openrs2-natives-all:${Versions.openrs2Natives}")
+    implementation("org.openrs2:openrs2-natives-all:${Versions.openrs2Natives}")
 }

 publishing {
--- a/bundler/src/main/java/org/openrs2/bundler/BundleCommand.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/BundleCommand.kt
@ -1,4 +1,4 @@
-package dev.openrs2.bundler
+package org.openrs2.bundler

 import com.github.ajalt.clikt.core.CliktCommand
 import com.google.inject.Guice
--- a/bundler/src/main/java/org/openrs2/bundler/Bundler.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/Bundler.kt
@ -1,19 +1,19 @@
-package dev.openrs2.bundler
+package org.openrs2.bundler

 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.io.JarLibraryReader
-import dev.openrs2.asm.io.JarLibraryWriter
-import dev.openrs2.asm.io.ManifestJarLibraryWriter
-import dev.openrs2.asm.io.Pack200LibraryReader
-import dev.openrs2.asm.io.Pack200LibraryWriter
-import dev.openrs2.asm.io.PackClassLibraryWriter
-import dev.openrs2.asm.io.SignedJarLibraryWriter
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.bundler.transform.ResourceTransformer
-import dev.openrs2.conf.Config
-import dev.openrs2.crypto.Pkcs12KeyStore
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.io.JarLibraryReader
+import org.openrs2.asm.io.JarLibraryWriter
+import org.openrs2.asm.io.ManifestJarLibraryWriter
+import org.openrs2.asm.io.Pack200LibraryReader
+import org.openrs2.asm.io.Pack200LibraryWriter
+import org.openrs2.asm.io.PackClassLibraryWriter
+import org.openrs2.asm.io.SignedJarLibraryWriter
+import org.openrs2.asm.transform.Transformer
+import org.openrs2.bundler.transform.ResourceTransformer
+import org.openrs2.conf.Config
+import org.openrs2.crypto.Pkcs12KeyStore
 import java.nio.file.Files
 import java.nio.file.Path
 import java.util.jar.Attributes
--- a/bundler/src/main/java/org/openrs2/bundler/BundlerModule.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/BundlerModule.kt
@ -1,23 +1,23 @@
-package dev.openrs2.bundler
+package org.openrs2.bundler

 import com.google.inject.AbstractModule
 import com.google.inject.multibindings.Multibinder
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.bundler.transform.BufferSizeTransformer
-import dev.openrs2.bundler.transform.CachePathTransformer
-import dev.openrs2.bundler.transform.DomainTransformer
-import dev.openrs2.bundler.transform.HighDpiTransformer
-import dev.openrs2.bundler.transform.HostCheckTransformer
-import dev.openrs2.bundler.transform.LoadLibraryTransformer
-import dev.openrs2.bundler.transform.MacResizeTransformer
-import dev.openrs2.bundler.transform.MemoryAllocationTransformer
-import dev.openrs2.bundler.transform.NameTransformer
-import dev.openrs2.bundler.transform.PlatformDetectionTransformer
-import dev.openrs2.bundler.transform.PublicKeyTransformer
-import dev.openrs2.bundler.transform.RightClickTransformer
-import dev.openrs2.bundler.transform.TypoTransformer
-import dev.openrs2.conf.ConfigModule
-import dev.openrs2.crypto.CryptoModule
+import org.openrs2.asm.transform.Transformer
+import org.openrs2.bundler.transform.BufferSizeTransformer
+import org.openrs2.bundler.transform.CachePathTransformer
+import org.openrs2.bundler.transform.DomainTransformer
+import org.openrs2.bundler.transform.HighDpiTransformer
+import org.openrs2.bundler.transform.HostCheckTransformer
+import org.openrs2.bundler.transform.LoadLibraryTransformer
+import org.openrs2.bundler.transform.MacResizeTransformer
+import org.openrs2.bundler.transform.MemoryAllocationTransformer
+import org.openrs2.bundler.transform.NameTransformer
+import org.openrs2.bundler.transform.PlatformDetectionTransformer
+import org.openrs2.bundler.transform.PublicKeyTransformer
+import org.openrs2.bundler.transform.RightClickTransformer
+import org.openrs2.bundler.transform.TypoTransformer
+import org.openrs2.conf.ConfigModule
+import org.openrs2.crypto.CryptoModule

 public object BundlerModule : AbstractModule() {
    override fun configure() {
--- a/bundler/src/main/java/org/openrs2/bundler/BundlerQualifier.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/BundlerQualifier.kt
@ -1,4 +1,4 @@
-package dev.openrs2.bundler
+package org.openrs2.bundler

 import javax.inject.Qualifier

--- a/bundler/src/main/java/org/openrs2/bundler/Resource.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/Resource.kt
@ -1,9 +1,9 @@
-package dev.openrs2.bundler
+package org.openrs2.bundler

 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.io.LibraryWriter
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.io.LibraryWriter
 import java.io.ByteArrayOutputStream
 import java.nio.file.Files
 import java.nio.file.Path
@ -80,7 +80,7 @@ public class Resource(
        }

        private fun compressNative(source: String, destination: String, resource: String): Resource {
-            val path = "/dev/openrs2/natives/$resource"
+            val path = "/org/openrs2/natives/$resource"
            val uncompressed = Resource::class.java.getResourceAsStream(path).use { it.readBytes() }
            return compress(source, destination, uncompressed)
        }
--- a/bundler/src/main/java/org/openrs2/bundler/transform/BufferSizeTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/BufferSizeTransformer.kt
@ -1,17 +1,17 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform

 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.hasCode
-import dev.openrs2.asm.toAbstractInsnNode
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldInsnNode
 import org.objectweb.asm.tree.LdcInsnNode
 import org.objectweb.asm.tree.MethodNode
+import org.openrs2.asm.InsnMatcher
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.classpath.ClassPath
+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
--- a/bundler/src/main/java/org/openrs2/bundler/transform/CachePathTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/CachePathTransformer.kt
@ -1,13 +1,13 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform

 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.conf.Config
 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 org.openrs2.conf.Config
 import javax.inject.Inject
 import javax.inject.Singleton

--- a/bundler/src/main/java/org/openrs2/bundler/transform/DomainTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/DomainTransformer.kt
@ -1,13 +1,13 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform

 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.conf.Config
 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 org.openrs2.conf.Config
 import javax.inject.Inject
 import javax.inject.Singleton

--- a/bundler/src/main/java/org/openrs2/bundler/transform/HighDpiTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/HighDpiTransformer.kt
@ -1,13 +1,6 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform

 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.getExpression
-import dev.openrs2.asm.previousReal
-import dev.openrs2.asm.stackMetadata
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.ClassNode
@ -23,6 +16,13 @@ import org.objectweb.asm.tree.MethodNode
 import org.objectweb.asm.tree.ParameterNode
 import org.objectweb.asm.tree.TypeInsnNode
 import org.objectweb.asm.tree.VarInsnNode
+import org.openrs2.asm.InsnMatcher
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+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

@ -225,12 +225,14 @@ public class HighDpiTransformer : Transformer() {

        list.add(VarInsnNode(Opcodes.ALOAD, graphicsVar))
        list.add(TypeInsnNode(Opcodes.CHECKCAST, "java/awt/Graphics2D"))
-        list.add(MethodInsnNode(
-            Opcodes.INVOKEVIRTUAL,
-            "java/awt/Graphics2D",
-            "getTransform",
-            "()Ljava/awt/geom/AffineTransform;"
-        ))
+        list.add(
+            MethodInsnNode(
+                Opcodes.INVOKEVIRTUAL,
+                "java/awt/Graphics2D",
+                "getTransform",
+                "()Ljava/awt/geom/AffineTransform;"
+            )
+        )
        list.add(MethodInsnNode(Opcodes.INVOKEVIRTUAL, "java/awt/geom/AffineTransform", "getScaleX", "()D"))
        list.add(FieldInsnNode(Opcodes.PUTSTATIC, gameShell, "canvasScale", "D"))
        list.add(JumpInsnNode(Opcodes.GOTO, endLabel))
@ -349,9 +351,11 @@ public class HighDpiTransformer : Transformer() {
        private val GL_CONTEXTS = setOf("javax/media/opengl/GLContext", "gl!javax/media/opengl/GLContext")
        private val GET_GL_DESCRIPTORS = setOf("()Ljavax/media/opengl/GL;", "()Lgl!javax/media/opengl/GL;")

-        private val DRAW_PIXELS_MATCHER = InsnMatcher.compile("""
+        private val DRAW_PIXELS_MATCHER = InsnMatcher.compile(
+            """
            ALOAD ILOAD ILOAD LDC GETSTATIC IFEQ LDC GOTO SIPUSH ALOAD INVOKESTATIC INVOKEINTERFACE
-        """.trimIndent())
+        """.trimIndent()
+        )
        private val GET_GL_MATCHER = InsnMatcher.compile("GETSTATIC INVOKEVIRTUAL PUTSTATIC")
        private val SET_CANVAS_VISIBLE_MATCHER = InsnMatcher.compile("GETSTATIC ICONST_1 INVOKEVIRTUAL")
    }
--- a/bundler/src/main/java/org/openrs2/bundler/transform/HostCheckTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/HostCheckTransformer.kt
@ -1,16 +1,16 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform

 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.InsnNode
 import org.objectweb.asm.tree.MethodInsnNode
 import org.objectweb.asm.tree.MethodNode
+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
--- a/bundler/src/main/java/org/openrs2/bundler/transform/LoadLibraryTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/LoadLibraryTransformer.kt
@ -1,15 +1,15 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform

 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.JumpInsnNode
 import org.objectweb.asm.tree.LdcInsnNode
 import org.objectweb.asm.tree.MethodNode
+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
--- a/bundler/src/main/java/org/openrs2/bundler/transform/MacResizeTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/MacResizeTransformer.kt
@ -1,10 +1,6 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform

 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldInsnNode
@ -12,6 +8,10 @@ import org.objectweb.asm.tree.JumpInsnNode
 import org.objectweb.asm.tree.LdcInsnNode
 import org.objectweb.asm.tree.MethodInsnNode
 import org.objectweb.asm.tree.MethodNode
+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
--- a/bundler/src/main/java/org/openrs2/bundler/transform/MemoryAllocationTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/MemoryAllocationTransformer.kt
@ -1,17 +1,17 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform

 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.replaceExpression
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.InsnNode
 import org.objectweb.asm.tree.MethodInsnNode
 import org.objectweb.asm.tree.MethodNode
 import org.objectweb.asm.tree.VarInsnNode
+import org.openrs2.asm.InsnMatcher
+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
--- a/bundler/src/main/java/org/openrs2/bundler/transform/NameTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/NameTransformer.kt
@ -1,13 +1,13 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform

 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.conf.Config
 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 org.openrs2.conf.Config
 import javax.inject.Inject
 import javax.inject.Singleton

--- a/bundler/src/main/java/org/openrs2/bundler/transform/PlatformDetectionTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/PlatformDetectionTransformer.kt
@ -1,13 +1,6 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform

 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.MemberRef
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.intConstant
-import dev.openrs2.asm.toAbstractInsnNode
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.AbstractInsnNode
 import org.objectweb.asm.tree.ClassNode
@ -19,6 +12,13 @@ import org.objectweb.asm.tree.LdcInsnNode
 import org.objectweb.asm.tree.MethodInsnNode
 import org.objectweb.asm.tree.MethodNode
 import org.objectweb.asm.tree.VarInsnNode
+import org.openrs2.asm.InsnMatcher
+import org.openrs2.asm.MemberRef
+import org.openrs2.asm.classpath.ClassPath
+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
--- a/bundler/src/main/java/org/openrs2/bundler/transform/PublicKeyTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/PublicKeyTransformer.kt
@ -1,13 +1,13 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform

 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
 import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters
 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.Inject
 import javax.inject.Singleton

--- a/bundler/src/main/java/org/openrs2/bundler/transform/ResourceTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/ResourceTransformer.kt
@ -1,12 +1,6 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform

 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.InsnMatcher
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.toAbstractInsnNode
-import dev.openrs2.asm.transform.Transformer
-import dev.openrs2.bundler.Resource
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.InsnList
@ -16,6 +10,12 @@ import org.objectweb.asm.tree.LdcInsnNode
 import org.objectweb.asm.tree.MethodInsnNode
 import org.objectweb.asm.tree.MethodNode
 import org.objectweb.asm.tree.TypeInsnNode
+import org.openrs2.asm.InsnMatcher
+import org.openrs2.asm.classpath.ClassPath
+import org.openrs2.asm.classpath.Library
+import org.openrs2.asm.toAbstractInsnNode
+import org.openrs2.asm.transform.Transformer
+import org.openrs2.bundler.Resource

 public class ResourceTransformer(
    private val resources: List<Resource>? = null,
--- a/bundler/src/main/java/org/openrs2/bundler/transform/RightClickTransformer.kt
+++ b/bundler/src/main/java/org/openrs2/bundler/transform/RightClickTransformer.kt
@ -1,9 +1,6 @@
-package dev.openrs2.bundler.transform
+package org.openrs2.bundler.transform

 import com.github.michaelbull.logging.InlineLogger
-import dev.openrs2.asm.classpath.ClassPath
-import dev.openrs2.asm.classpath.Library
-import dev.openrs2.asm.transform.Transformer
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldInsnNode
@ -11,6 +8,9 @@ import org.objectweb.asm.tree.InsnList
 import org.objectweb.asm.tree.InsnNode
 import org.objectweb.asm.tree.MethodInsnNode
 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
--- a/Show More
+++ b/Show More