chore(release): 15.0.0-dev.2 [skip ci]

# [15.0.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v15.0.0-dev.1...v15.0.0-dev.2) (2023-09-06)
build(Needs bump): Use correct Maven repository URL
2026-01-12 14:26:17 +00:00 · 2023-09-06 03:36:03 +00:00 · 2023-09-06 05:32:58 +02:00 · 2023-09-06 02:53:31 +02:00 · 2023-09-04 03:51:04 +00:00 · 2023-09-04 05:48:20 +02:00
128 changed files with 4210 additions and 2726 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -36,7 +36,7 @@ jobs:
      - name: Build with Gradle
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew clean --no-daemon
+        run: ./gradlew build clean --no-daemon
      - name: Setup semantic-release
        run: npm install
      - name: Release
--- a/.releaserc
+++ b/.releaserc
@@ -7,7 +7,13 @@
    }
  ],
  "plugins": [
-    "@semantic-release/commit-analyzer",
+    [
+      "@semantic-release/commit-analyzer", {
+        "releaseRules": [
+          { "type": "build", "scope": "Needs bump", "release": "patch" }
+        ]
+      }
+    ],
    "@semantic-release/release-notes-generator",
    "@semantic-release/changelog",
    "gradle-semantic-release-plugin",
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,294 @@
+# [15.0.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v15.0.0-dev.1...v15.0.0-dev.2) (2023-09-06)
+
+# [15.0.0-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v14.2.2...v15.0.0-dev.1) (2023-09-04)
+
+
+* feat!: Add patch annotation processor ([3fc6a13](https://github.com/ReVanced/revanced-patcher/commit/3fc6a139eef67237c116fb4e3e29bf9542d3a981))
+* feat!: Remove patch annotations ([3b4db3d](https://github.com/ReVanced/revanced-patcher/commit/3b4db3ddb72cdcee8af2f787eadf58eeb37543de))
+
+
+### Features
+
+* Add patch annotation processor ([#231](https://github.com/ReVanced/revanced-patcher/issues/231)) ([a29931f](https://github.com/ReVanced/revanced-patcher/commit/a29931f2ec0a666dba209b54855425d9dc2f4462))
+
+
+### BREAKING CHANGES
+
+* The manifest for patches has been removed, and the properties have been added to patches. Patches are now `OptionsContainer`. The `@Patch` annotation has been removed in favour of the `@Patch` annotation from the annotation processor.
+* Patch annotations have been removed. PatcherException is now thrown in various places. PatchBundleLoader is now a map of patches associated by their name. Patches are now instances.
+
+## [14.2.2](https://github.com/ReVanced/revanced-patcher/compare/v14.2.1...v14.2.2) (2023-08-30)
+
+
+### Bug Fixes
+
+* allow setting `DexClassLoader.optimizedDirectory` ([11a3378](https://github.com/ReVanced/revanced-patcher/commit/11a337865947a6ac74a63ebb3f3f9bc2610f7771))
+
+## [14.2.2-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v14.2.1...v14.2.2-dev.1) (2023-08-29)
+
+
+### Bug Fixes
+
+* allow setting `DexClassLoader.optimizedDirectory` ([11a3378](https://github.com/ReVanced/revanced-patcher/commit/11a337865947a6ac74a63ebb3f3f9bc2610f7771))
+
+## [14.2.1](https://github.com/ReVanced/revanced-patcher/compare/v14.2.0...v14.2.1) (2023-08-27)
+
+
+### Bug Fixes
+
+* do not flag resource table as sparse when main package is not loaded ([b832812](https://github.com/ReVanced/revanced-patcher/commit/b832812767a06ec6ec232291e6d14c8c2f14118c))
+
+## [14.2.1-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v14.2.0...v14.2.1-dev.1) (2023-08-27)
+
+
+### Bug Fixes
+
+* do not flag resource table as sparse when main package is not loaded ([b832812](https://github.com/ReVanced/revanced-patcher/commit/b832812767a06ec6ec232291e6d14c8c2f14118c))
+
+# [14.2.0](https://github.com/ReVanced/revanced-patcher/compare/v14.1.0...v14.2.0) (2023-08-27)
+
+
+### Features
+
+* load patches in lexicographical order ([e8f2087](https://github.com/ReVanced/revanced-patcher/commit/e8f2087a6ffa6077fb3a6a69e29f3aec72e2fc1b))
+* log when merging integrations ([983563e](https://github.com/ReVanced/revanced-patcher/commit/983563efb6d7c8d289464b8bf71a016b8a735630))
+
+
+### Performance Improvements
+
+* compare types of classes ([55d6945](https://github.com/ReVanced/revanced-patcher/commit/55d694579ac2718b9e2c61ca5f38419c3775ef87))
+
+# [14.2.0-dev.3](https://github.com/ReVanced/revanced-patcher/compare/v14.2.0-dev.2...v14.2.0-dev.3) (2023-08-26)
+
+
+### Performance Improvements
+
+* compare types of classes ([55d6945](https://github.com/ReVanced/revanced-patcher/commit/55d694579ac2718b9e2c61ca5f38419c3775ef87))
+
+# [14.2.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v14.2.0-dev.1...v14.2.0-dev.2) (2023-08-26)
+
+
+### Features
+
+* log when merging integrations ([983563e](https://github.com/ReVanced/revanced-patcher/commit/983563efb6d7c8d289464b8bf71a016b8a735630))
+
+# [14.2.0-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v14.1.0...v14.2.0-dev.1) (2023-08-25)
+
+
+### Features
+
+* load patches in lexicographical order ([e8f2087](https://github.com/ReVanced/revanced-patcher/commit/e8f2087a6ffa6077fb3a6a69e29f3aec72e2fc1b))
+
+# [14.1.0](https://github.com/ReVanced/revanced-patcher/compare/v14.0.0...v14.1.0) (2023-08-24)
+
+
+### Bug Fixes
+
+* move version properties file to correct package ([e985676](https://github.com/ReVanced/revanced-patcher/commit/e985676c2d8e5d6cb907d371de30428caaa6da43))
+
+
+### Features
+
+* properly make use of logging facade ([ba56a6a](https://github.com/ReVanced/revanced-patcher/commit/ba56a6a2eef503c0d6cdd846ddce2e1474d8ed1a))
+
+# [14.1.0-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v14.0.1-dev.1...v14.1.0-dev.1) (2023-08-24)
+
+
+### Features
+
+* properly make use of logging facade ([ba56a6a](https://github.com/ReVanced/revanced-patcher/commit/ba56a6a2eef503c0d6cdd846ddce2e1474d8ed1a))
+
+## [14.0.1-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v14.0.0...v14.0.1-dev.1) (2023-08-23)
+
+
+### Bug Fixes
+
+* move version properties file to correct package ([e985676](https://github.com/ReVanced/revanced-patcher/commit/e985676c2d8e5d6cb907d371de30428caaa6da43))
+
+# [14.0.0](https://github.com/ReVanced/revanced-patcher/compare/v13.0.0...v14.0.0) (2023-08-22)
+
+
+### Bug Fixes
+
+* log decoding resources after logging deleting resource cache directory ([db62a16](https://github.com/ReVanced/revanced-patcher/commit/db62a1607b4a9d6256b5f5153decb088d9680553))
+* only emit closed patches that did not throw an exception with the `@Patch` annotation ([5938f6b](https://github.com/ReVanced/revanced-patcher/commit/5938f6b7ea25103a0a1b56ceebe49139bc80c6f5))
+* supply the parent classloader to `DexClassLoader` ([0f15077](https://github.com/ReVanced/revanced-patcher/commit/0f15077225600b65200022c1a318e504deb472b9))
+
+
+### Code Refactoring
+
+* improve structure and public API ([6b8977f](https://github.com/ReVanced/revanced-patcher/commit/6b8977f17854ef0344d868e6391cb18134eceadc))
+
+
+### Features
+
+* do not log instantiation of ReVanced Patcher ([273dd8d](https://github.com/ReVanced/revanced-patcher/commit/273dd8d388f8e9b7436c6d6145a94c12c1fabe55))
+
+
+### BREAKING CHANGES
+
+* Various public APIs have been changed. The `Version` annotation has been removed. Patches do not return anything anymore and instead throw `PatchException`. Multiple patch bundles can now be loaded in a single ClassLoader to bypass class loader isolation.
+
+# [14.0.0-dev.4](https://github.com/ReVanced/revanced-patcher/compare/v14.0.0-dev.3...v14.0.0-dev.4) (2023-08-22)
+
+
+### Bug Fixes
+
+* only emit closed patches that did not throw an exception with the `@Patch` annotation ([5938f6b](https://github.com/ReVanced/revanced-patcher/commit/5938f6b7ea25103a0a1b56ceebe49139bc80c6f5))
+
+# [14.0.0-dev.3](https://github.com/ReVanced/revanced-patcher/compare/v14.0.0-dev.2...v14.0.0-dev.3) (2023-08-20)
+
+
+### Bug Fixes
+
+* supply the parent classloader to `DexClassLoader` ([0f15077](https://github.com/ReVanced/revanced-patcher/commit/0f15077225600b65200022c1a318e504deb472b9))
+
+
+### Features
+
+* do not log instantiation of ReVanced Patcher ([273dd8d](https://github.com/ReVanced/revanced-patcher/commit/273dd8d388f8e9b7436c6d6145a94c12c1fabe55))
+
+# [14.0.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v14.0.0-dev.1...v14.0.0-dev.2) (2023-08-19)
+
+# [14.0.0-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v13.0.0...v14.0.0-dev.1) (2023-08-18)
+
+
+### Bug Fixes
+
+* log decoding resources after logging deleting resource cache directory ([db62a16](https://github.com/ReVanced/revanced-patcher/commit/db62a1607b4a9d6256b5f5153decb088d9680553))
+
+
+### Code Refactoring
+
+* improve structure and public API ([6b8977f](https://github.com/ReVanced/revanced-patcher/commit/6b8977f17854ef0344d868e6391cb18134eceadc))
+
+
+### BREAKING CHANGES
+
+* Various public APIs have been changed. The `Version` annotation has been removed. Patches do not return anything anymore and instead throw `PatchException`. Multiple patch bundles can now be loaded in a single ClassLoader to bypass class loader isolation.
+
+# [13.0.0](https://github.com/ReVanced/revanced-patcher/compare/v12.1.1...v13.0.0) (2023-08-14)
+
+
+### Bug Fixes
+
+* decode in correct order ([8fb2f2d](https://github.com/ReVanced/revanced-patcher/commit/8fb2f2dc1d3b9b1e9fd13b39485985d2886d52ae))
+* disable correct loggers ([c2d89c6](https://github.com/ReVanced/revanced-patcher/commit/c2d89c622e06e58e5042e1a00ef67cee8a246e53))
+* get framework ids to compile resources ([f2cb7ee](https://github.com/ReVanced/revanced-patcher/commit/f2cb7ee7dffa573c31df497cf235a3f5d120f91f))
+* only enable logging for ReVanced ([783ccf8](https://github.com/ReVanced/revanced-patcher/commit/783ccf8529f5d16aa463982da6977328306232bb))
+* set package metadata correctly ([02d6ff1](https://github.com/ReVanced/revanced-patcher/commit/02d6ff15fe87c2352de29749610e9d72db8ba418))
+
+
+* build(Needs bump)!: Bump dependencies ([d5f89a9](https://github.com/ReVanced/revanced-patcher/commit/d5f89a903f019c199bdb27a50287124fc4b4978e))
+
+
+### BREAKING CHANGES
+
+* This bump updates smali, a crucial dependency
+
+# [13.0.0-dev.3](https://github.com/ReVanced/revanced-patcher/compare/v13.0.0-dev.2...v13.0.0-dev.3) (2023-08-14)
+
+
+### Bug Fixes
+
+* decode in correct order ([8fb2f2d](https://github.com/ReVanced/revanced-patcher/commit/8fb2f2dc1d3b9b1e9fd13b39485985d2886d52ae))
+* only enable logging for ReVanced ([783ccf8](https://github.com/ReVanced/revanced-patcher/commit/783ccf8529f5d16aa463982da6977328306232bb))
+
+# [13.0.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v13.0.0-dev.1...v13.0.0-dev.2) (2023-08-12)
+
+
+### Bug Fixes
+
+* disable correct loggers ([c2d89c6](https://github.com/ReVanced/revanced-patcher/commit/c2d89c622e06e58e5042e1a00ef67cee8a246e53))
+* get framework ids to compile resources ([f2cb7ee](https://github.com/ReVanced/revanced-patcher/commit/f2cb7ee7dffa573c31df497cf235a3f5d120f91f))
+* set package metadata correctly ([02d6ff1](https://github.com/ReVanced/revanced-patcher/commit/02d6ff15fe87c2352de29749610e9d72db8ba418))
+
+# [13.0.0-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v12.1.1...v13.0.0-dev.1) (2023-08-11)
+
+
+* build(Needs bump)!: Bump dependencies ([d5f89a9](https://github.com/ReVanced/revanced-patcher/commit/d5f89a903f019c199bdb27a50287124fc4b4978e))
+
+
+### BREAKING CHANGES
+
+* This bump updates smali, a crucial dependency
+
+## [12.1.1](https://github.com/ReVanced/revanced-patcher/compare/v12.1.0...v12.1.1) (2023-08-03)
+
+
+### Bug Fixes
+
+* clear method lookup maps before initializing them ([#210](https://github.com/ReVanced/revanced-patcher/issues/210)) ([746544f](https://github.com/ReVanced/revanced-patcher/commit/746544f9d51d1013bb160075709cd26bffd425b3))
+
+## [12.1.1-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v12.1.1-dev.1...v12.1.1-dev.2) (2023-08-03)
+
+## [12.1.1-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v12.1.0...v12.1.1-dev.1) (2023-08-03)
+
+
+### Bug Fixes
+
+* clear method lookup maps before initializing them ([#210](https://github.com/ReVanced/revanced-patcher/issues/210)) ([746544f](https://github.com/ReVanced/revanced-patcher/commit/746544f9d51d1013bb160075709cd26bffd425b3))
+
+# [12.1.0](https://github.com/ReVanced/revanced-patcher/compare/v12.0.0...v12.1.0) (2023-08-03)
+
+
+### Features
+
+* add `MutableMethod.getInstructions` extension function ([fae4029](https://github.com/ReVanced/revanced-patcher/commit/fae4029cfccfad7aa3dd8f7fbef1c63ee26b85b3))
+
+# [12.1.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v12.1.0-dev.1...v12.1.0-dev.2) (2023-08-03)
+
+# [12.1.0-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v12.0.0...v12.1.0-dev.1) (2023-08-01)
+
+
+### Features
+
+* add `MutableMethod.getInstructions` extension function ([fae4029](https://github.com/ReVanced/revanced-patcher/commit/fae4029cfccfad7aa3dd8f7fbef1c63ee26b85b3))
+
+# [12.0.0](https://github.com/ReVanced/revanced-patcher/compare/v11.0.4...v12.0.0) (2023-07-30)
+
+
+### Bug Fixes
+
+* correct access flags of `PackageMetadata` ([416d691](https://github.com/ReVanced/revanced-patcher/commit/416d69142f50dab49c9ea3f027e9d53e4777f257))
+* set resource table via resource decoder ([e0f8e1b](https://github.com/ReVanced/revanced-patcher/commit/e0f8e1b71a295948b610029c89a48f52762396b6))
+
+
+### Features
+
+* Deprecate `Version` annotation ([c9bbcf2](https://github.com/ReVanced/revanced-patcher/commit/c9bbcf2bf2b0f50ab9100380a3a66c6346ad42ac))
+* remove `Path` option ([#202](https://github.com/ReVanced/revanced-patcher/issues/202)) ([69e4a49](https://github.com/ReVanced/revanced-patcher/commit/69e4a490659ebc4fb4bf46148634f4b064ef1713))
+
+
+### BREAKING CHANGES
+
+* This removes the previously available `Path` option
+
+# [12.0.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v12.0.0-dev.1...v12.0.0-dev.2) (2023-07-28)
+
+
+### Features
+
+* Deprecate `Version` annotation ([400442f](https://github.com/ReVanced/revanced-patcher/commit/400442f70ee56cafd4493b2ce64a294db9836509))
+
+# [12.0.0-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v11.0.4...v12.0.0-dev.1) (2023-07-26)
+
+
+### Bug Fixes
+
+* correct access flags of `PackageMetadata` ([416d691](https://github.com/ReVanced/revanced-patcher/commit/416d69142f50dab49c9ea3f027e9d53e4777f257))
+* set resource table via resource decoder ([e0f8e1b](https://github.com/ReVanced/revanced-patcher/commit/e0f8e1b71a295948b610029c89a48f52762396b6))
+
+
+### Features
+
+* remove `Path` option ([#202](https://github.com/ReVanced/revanced-patcher/issues/202)) ([69e4a49](https://github.com/ReVanced/revanced-patcher/commit/69e4a490659ebc4fb4bf46148634f4b064ef1713))
+
+
+### BREAKING CHANGES
+
+* This removes the previously available `Path` option
+
 ## [11.0.4](https://github.com/revanced/revanced-patcher/compare/v11.0.3...v11.0.4) (2023-07-01)


--- a/arsclib-utils/.gitignore
+++ b/arsclib-utils/.gitignore
@@ -1,42 +0,0 @@
-.gradle
-build/
-!gradle/wrapper/gradle-wrapper.jar
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### IntelliJ IDEA ###
-.idea/modules.xml
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
-*.iws
-*.iml
-*.ipr
-out/
-!**/src/main/**/out/
-!**/src/test/**/out/
-
-### Eclipse ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-bin/
-!**/src/main/**/bin/
-!**/src/test/**/bin/
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-
-### VS Code ###
-.vscode/
-
-### Mac OS ###
-.DS_Store
--- a/arsclib-utils/build.gradle.kts
+++ b/arsclib-utils/build.gradle.kts
@@ -1,18 +0,0 @@
-plugins {
-    kotlin("jvm")
-    `maven-publish`
-}
-
-group = "app.revanced"
-
-dependencies {
-    implementation("io.github.reandroid:ARSCLib:1.1.7")
-}
-
-java {
-    withSourcesJar()
-}
-
-kotlin {
-    jvmToolchain(11)
-}
--- a/arsclib-utils/src/main/kotlin/app/revanced/arsc/ApkResourceException.kt
+++ b/arsclib-utils/src/main/kotlin/app/revanced/arsc/ApkResourceException.kt
@@ -1,72 +0,0 @@
-package app.revanced.arsc
-
-/**
- * An exception thrown when there is an error with APK resources.
- *
- * @param message The exception message.
- * @param throwable The corresponding [Throwable].
- */
-sealed class ApkResourceException(message: String, throwable: Throwable? = null) : Exception(message, throwable) {
-    /**
-     * An exception when locking resources.
-     *
-     * @param message The exception message.
-     * @param throwable The corresponding [Throwable].
-     */
-    class Locked(message: String, throwable: Throwable? = null) : ApkResourceException(message, throwable)
-
-    /**
-     * An exception when writing resources.
-     *
-     * @param message The exception message.
-     * @param throwable The corresponding [Throwable].
-     */
-     class Write(message: String, throwable: Throwable? = null) : ApkResourceException(message, throwable)
-
-    /**
-     * An exception when reading resources.
-     *
-     * @param message The exception message.
-     * @param throwable The corresponding [Throwable].
-     */
-    class Read(message: String, throwable: Throwable? = null) : ApkResourceException(message, throwable)
-    /**
-     * An exception when decoding resources.
-     *
-     * @param message The exception message.
-     * @param throwable The corresponding [Throwable].
-     */
-    class Decode(message: String, throwable: Throwable? = null) : ApkResourceException(message, throwable)
-
-    /**
-     * An exception when encoding resources.
-     *
-     * @param message The exception message.
-     * @param throwable The corresponding [Throwable].
-     */
-    class Encode(message: String, throwable: Throwable? = null) : ApkResourceException(message, throwable)
-
-    /**
-     * An exception thrown when a reference could not be resolved.
-     *
-     * @param reference The invalid reference.
-     * @param throwable The corresponding [Throwable].
-     */
-    class InvalidReference(reference: String, throwable: Throwable? = null) :
-        ApkResourceException("Failed to resolve: $reference", throwable) {
-
-        /**
-         * An exception thrown when a reference could not be resolved.
-         *
-         * @param type The type of the reference.
-         * @param name The name of the reference.
-         * @param throwable The corresponding [Throwable].
-         */
-        constructor(type: String, name: String, throwable: Throwable? = null) : this("@$type/$name", throwable)
-    }
-
-    /**
-     * An exception thrown when the Apk file not have a resource table, but was expected to have one.
-     */
-    class MissingResourceTable : ApkResourceException("Apk does not have a resource table.")
-}
--- a/arsclib-utils/src/main/kotlin/app/revanced/arsc/archive/Archive.kt
+++ b/arsclib-utils/src/main/kotlin/app/revanced/arsc/archive/Archive.kt
@@ -1,28 +0,0 @@
-@file:Suppress("MemberVisibilityCanBePrivate")
-
-package app.revanced.arsc.archive
-
-import app.revanced.arsc.resource.ResourceContainer
-import com.reandroid.apk.ApkModule
-import com.reandroid.apk.DexFileInputSource
-import com.reandroid.archive.InputSource
-import java.io.File
-import java.io.Flushable
-
-/**
- * A class for reading/writing files in an [ApkModule].
- *
- * @param module The [ApkModule] to operate on.
- */
-class Archive(internal val module: ApkModule) : Flushable {
-    val mainPackageResources = ResourceContainer(this, module.tableBlock)
-
-    fun save(output: File) {
-        flush()
-        module.writeApk(output)
-    }
-    fun readDexFiles(): MutableList<DexFileInputSource> = module.listDexFiles()
-    fun write(inputSource: InputSource) = module.apkArchive.add(inputSource) // Overwrites existing files.
-    fun read(name: String): InputSource? = module.apkArchive.getInputSource(name)
-    override fun flush() = mainPackageResources.flush()
-}
--- a/arsclib-utils/src/main/kotlin/app/revanced/arsc/logging/Logger.kt
+++ b/arsclib-utils/src/main/kotlin/app/revanced/arsc/logging/Logger.kt
@@ -1,7 +0,0 @@
-package app.revanced.arsc.logging
-interface Logger {
-    fun error(msg: String)
-    fun warn(msg: String)
-    fun info(msg: String)
-    fun trace(msg: String)
-}
--- a/arsclib-utils/src/main/kotlin/app/revanced/arsc/resource/Resource.kt
+++ b/arsclib-utils/src/main/kotlin/app/revanced/arsc/resource/Resource.kt
@@ -1,166 +0,0 @@
-package app.revanced.arsc.resource
-
-import app.revanced.arsc.ApkResourceException
-import com.reandroid.arsc.coder.EncodeResult
-import com.reandroid.arsc.coder.ValueDecoder
-import com.reandroid.arsc.value.Entry
-import com.reandroid.arsc.value.ValueType
-import com.reandroid.arsc.value.array.ArrayBag
-import com.reandroid.arsc.value.array.ArrayBagItem
-import com.reandroid.arsc.value.plurals.PluralsBag
-import com.reandroid.arsc.value.plurals.PluralsBagItem
-import com.reandroid.arsc.value.plurals.PluralsQuantity
-import com.reandroid.arsc.value.style.StyleBag
-import com.reandroid.arsc.value.style.StyleBagItem
-
-/**
- * A resource value.
- */
-sealed class Resource {
-    internal abstract fun write(entry: Entry, resources: ResourceContainer)
-}
-
-internal val Resource.isComplex get() = when (this) {
-    is Scalar -> false
-    is Complex -> true
-}
-
-/**
- * A simple resource.
- */
-open class Scalar internal constructor(private val valueType: ValueType, private val value: Int) : Resource() {
-    protected open fun data(resources: ResourceContainer) = value
-
-    override fun write(entry: Entry, resources: ResourceContainer) {
-        entry.setValueAsRaw(valueType, data(resources))
-    }
-
-    internal open fun toArrayItem(resources: ResourceContainer) = ArrayBagItem.create(valueType, data(resources))
-    internal open fun toStyleItem(resources: ResourceContainer) = StyleBagItem.create(valueType, data(resources))
-}
-
-/**
- * A marker class for complex resources.
- */
-sealed class Complex : Resource()
-
-private fun encoded(encodeResult: EncodeResult?) = encodeResult?.let { Scalar(it.valueType, it.value) }
-    ?: throw ApkResourceException.Encode("Failed to encode value")
-
-/**
- * Encode a color.
- *
- * @param hex The hex value of the color.
- * @return The encoded [Resource].
- */
-fun color(hex: String) = encoded(ValueDecoder.encodeColor(hex))
-
-/**
- * Encode a dimension or fraction.
- *
- * @param value The dimension value such as 24dp.
- * @return The encoded [Resource].
- */
-fun dimension(value: String) = encoded(ValueDecoder.encodeDimensionOrFraction(value))
-
-/**
- * Encode a boolean resource.
- *
- * @param value The boolean.
- * @return The encoded [Resource].
- */
-fun boolean(value: Boolean) = Scalar(ValueType.INT_BOOLEAN, if (value) -Int.MAX_VALUE else 0)
-
-/**
- * Encode a float.
- *
- * @param n The number to encode.
- * @return The encoded [Resource].
- */
-fun float(n: Float) = Scalar(ValueType.FLOAT, n.toBits())
-
-/**
- * Create an integer [Resource].
- *
- * @param n The number to encode.
- * @return The integer [Resource].
- */
-fun integer(n: Int) = Scalar(ValueType.INT_DEC, n)
-
-/**
- * Create a reference [Resource].
- *
- * @param resourceId The target resource.
- * @return The reference resource.
- */
-fun reference(resourceId: Int) = Scalar(ValueType.REFERENCE, resourceId)
-
-/**
- * Resolve and create a reference [Resource].
- *
- * @see reference
- * @param ref The reference string to resolve.
- * @param resourceTable The resource table to resolve the reference with.
- * @return The reference resource.
- */
-fun reference(resourceTable: ResourceTable, ref: String) = reference(resourceTable.resolve(ref))
-
-/**
- * An array [Resource].
- *
- * @param elements The elements of the array.
- */
-class Array(private val elements: Collection<Scalar>) : Complex() {
-    override fun write(entry: Entry, resources: ResourceContainer) {
-        ArrayBag.create(entry).addAll(elements.map { it.toArrayItem(resources) })
-    }
-}
-
-/**
- * A style resource.
- *
- * @param elements The attributes to override.
- * @param parent A reference to the parent style.
- */
-class Style(private val elements: Map<String, Scalar>, private val parent: String? = null) : Complex() {
-    override fun write(entry: Entry, resources: ResourceContainer) {
-        val resTable = resources.resourceTable
-        val style = StyleBag.create(entry)
-        parent?.let {
-            style.parentId = resTable.resolve(parent)
-        }
-
-        style.putAll(
-            elements.asIterable().associate {
-                StyleBag.resolve(resTable.encodeMaterials, it.key) to it.value.toStyleItem(resources)
-            })
-    }
-}
-
-/**
- * A quantity string [Resource].
- *
- * @param elements A map of the quantity to the corresponding string.
- */
-class Plurals(private val elements: Map<String, String>) : Complex() {
-    override fun write(entry: Entry, resources: ResourceContainer) {
-        val plurals = PluralsBag.create(entry)
-
-        plurals.putAll(elements.asIterable().associate { (k, v) ->
-            PluralsQuantity.value(k) to PluralsBagItem.string(resources.getOrCreateString(v))
-        })
-    }
-}
-
-/**
- * A string [Resource].
- *
- * @param value The string value.
- */
-class StringResource(val value: String) : Scalar(ValueType.STRING, 0) {
-    private fun tableString(resources: ResourceContainer) = resources.getOrCreateString(value)
-
-    override fun data(resources: ResourceContainer) = tableString(resources).index
-    override fun toArrayItem(resources: ResourceContainer) = ArrayBagItem.string(tableString(resources))
-    override fun toStyleItem(resources: ResourceContainer) = StyleBagItem.string(tableString(resources))
-}
--- a/arsclib-utils/src/main/kotlin/app/revanced/arsc/resource/ResourceContainer.kt
+++ b/arsclib-utils/src/main/kotlin/app/revanced/arsc/resource/ResourceContainer.kt
@@ -1,167 +0,0 @@
-package app.revanced.arsc.resource
-
-import app.revanced.arsc.ApkResourceException
-import app.revanced.arsc.archive.Archive
-import com.reandroid.apk.xmlencoder.EncodeUtil
-import com.reandroid.arsc.chunk.TableBlock
-import com.reandroid.arsc.chunk.xml.ResXmlDocument
-import com.reandroid.arsc.value.Entry
-import com.reandroid.arsc.value.ResConfig
-import java.io.Closeable
-import java.io.File
-import java.io.Flushable
-
-class ResourceContainer(private val archive: Archive, internal val tableBlock: TableBlock) : Flushable {
-    private val packageBlock = tableBlock.pickOne() // Pick the main package block.
-    internal lateinit var resourceTable: ResourceTable // TODO: Set this.
-
-    private val lockedResourceFileNames = mutableSetOf<String>()
-
-    private fun lock(resourceFile: ResourceFile) {
-        if (resourceFile.name in lockedResourceFileNames) {
-            throw ApkResourceException.Locked("Resource file ${resourceFile.name} is already locked.")
-        }
-
-        lockedResourceFileNames.add(resourceFile.name)
-    }
-
-    private fun unlock(resourceFile: ResourceFile) {
-        lockedResourceFileNames.remove(resourceFile.name)
-    }
-
-
-    fun <T : ResourceFile> openResource(name: String): ResourceFileEditor<T> {
-        val inputSource = archive.read(name)
-            ?: throw ApkResourceException.Read("Resource file $name not found.")
-
-        val resourceFile = when {
-            ResXmlDocument.isResXmlBlock(inputSource.openStream()) -> {
-                val xmlDocument = archive.module
-                    .loadResXmlDocument(inputSource)
-                    .decodeToXml(resourceTable.entryStore, packageBlock.id)
-
-                ResourceFile.XmlResourceFile(name, xmlDocument)
-            }
-
-            else -> {
-                val bytes = inputSource.openStream().use { it.readAllBytes() }
-
-                ResourceFile.BinaryResourceFile(name, bytes)
-            }
-        }
-
-        try {
-            @Suppress("UNCHECKED_CAST")
-            return ResourceFileEditor(resourceFile as T).also {
-                lockedResourceFileNames.add(name)
-            }
-        } catch (e: ClassCastException) {
-            throw ApkResourceException.Decode("Resource file $name is not ${resourceFile::class}.", e)
-        }
-    }
-
-    inner class ResourceFileEditor<T : ResourceFile> internal constructor(
-        private val resourceFile: T,
-    ) : Closeable {
-        fun use(block: (T) -> Unit) = block(resourceFile)
-        override fun close() {
-            lockedResourceFileNames.remove(resourceFile.name)
-        }
-    }
-
-    override fun flush() {
-        TODO("Not yet implemented")
-    }
-
-    /**
-     * Open a resource file, creating it if the file does not exist.
-     *
-     * @param path The resource file path.
-     * @return The corresponding [ResourceFiles],
-     */
-    fun openFile(path: String) = ResourceFiles(createHandle(path), archive)
-
-    private fun getPackageBlock() = packageBlock ?: throw ApkResourceException.MissingResourceTable
-
-    internal fun getOrCreateString(value: String) =
-        tableBlock?.stringPool?.getOrCreate(value) ?: throw ApkResourceException.MissingResourceTable
-
-    private fun Entry.set(resource: Resource) {
-        val existingEntryNameReference = specReference
-
-        // Sets this.specReference if the entry is not yet initialized.
-        // Sets this.specReference to 0 if the resource type of the existing entry changes.
-        ensureComplex(resource.isComplex)
-
-        if (existingEntryNameReference != 0) {
-            // Preserve the entry name by restoring the previous spec block reference (if present).
-            specReference = existingEntryNameReference
-        }
-
-        resource.write(this, this@ResourceContainer)
-        resourceTable.registerChanged(this)
-    }
-
-    /**
-     * Retrieve an [Entry] from the resource table.
-     *
-     * @param type The resource type.
-     * @param name The resource name.
-     * @param qualifiers The variant to use.
-     */
-    private fun getEntry(type: String, name: String, qualifiers: String?): Entry? {
-        val resourceId = try {
-            resourceTable.resolve("@$type/$name")
-        } catch (_: ApkResourceException.InvalidReference) {
-            return null
-        }
-
-        val config = ResConfig.parse(qualifiers)
-        return tableBlock?.resolveReference(resourceId)?.singleOrNull { it.resConfig == config }
-    }
-
-    /**
-     * Create a [ResourceFiles.Handle] that can be used to open a [ResourceFiles].
-     * This may involve looking it up in the resource table to find the actual location in the archive.
-     *
-     * @param path The path of the resource.
-     */
-    private fun createHandle(path: String): ResourceFiles.Handle {
-        if (path.startsWith("res/values")) throw ApkResourceException.Decode("Decoding the resource table as a file is not supported")
-
-        var onClose = {}
-        var archivePath = path
-
-        if (tableBlock != null && path.startsWith("res/") && path.count { it == '/' } == 2) {
-            val file = File(path)
-
-            val qualifiers = EncodeUtil.getQualifiersFromResFile(file)
-            val type = EncodeUtil.getTypeNameFromResFile(file)
-            val name = file.nameWithoutExtension
-
-            // The resource file names that the app developers used may have been minified, so we have to resolve it with the resource table.
-            // Example: res/drawable-hdpi/icon.png -> res/4a.png
-            getEntry(type, name, qualifiers)?.resValue?.valueAsString?.let {
-                archivePath = it
-            } ?: run {
-                // An entry for this specific resource file was not found in the resource table, so we have to register it after we save.
-                onClose = { setResource(type, name, StringResource(archivePath), qualifiers) }
-            }
-        }
-
-        return ResourceFiles.Handle(path, archivePath, onClose)
-    }
-
-    fun setResource(type: String, entryName: String, resource: Resource, qualifiers: String? = null) =
-        getPackageBlock().getOrCreate(qualifiers, type, entryName).also { it.set(resource) }.resourceId
-
-    fun setResources(type: String, resources: Map<String, Resource>, configuration: String? = null) {
-        getPackageBlock().getOrCreateSpecTypePair(type).getOrCreateTypeBlock(configuration).apply {
-            resources.forEach { (entryName, resource) -> getOrCreateEntry(entryName).set(resource) }
-        }
-    }
-
-    override fun flush() {
-        packageBlock?.name = archive
-    }
-}
--- a/arsclib-utils/src/main/kotlin/app/revanced/arsc/resource/ResourceFiles.kt
+++ b/arsclib-utils/src/main/kotlin/app/revanced/arsc/resource/ResourceFiles.kt
@@ -1,91 +0,0 @@
-package app.revanced.arsc.resource
-
-import app.revanced.arsc.ApkResourceException
-import app.revanced.arsc.archive.Archive
-import com.reandroid.archive.InputSource
-import com.reandroid.xml.XMLDocument
-import com.reandroid.xml.XMLException
-import java.io.*
-
-
-abstract class ResourceFile(val name: String) {
-    internal var realName: String? = null
-
-    class XmlResourceFile(name: String, val document: XMLDocument) : ResourceFile(name)
-    class BinaryResourceFile(name: String, var bytes: ByteArray) : ResourceFile(name)
-}
-
-
-class ResourceFiles private constructor(
-) : Closeable {
-
-    /**
-     * Instantiate a [ResourceFiles].
-     *
-     * @param handle The [Handle] associated with this file.
-     * @param archive The [Archive] that the file resides in.
-     */
-    internal constructor(handle: Handle, archive: Archive) : this(
-        handle,
-        archive,
-        try {
-            archive.read(handle.archivePath)
-        } catch (e: XMLException) {
-            throw ApkResourceException.Decode("Failed to decode XML while reading ${handle.virtualPath}", e)
-        } catch (e: IOException) {
-            throw ApkResourceException.Decode("Could not read ${handle.virtualPath}", e)
-        }
-    )
-
-    companion object {
-        const val DEFAULT_BUFFER_SIZE = 1024
-    }
-
-    var contents = readResult?.data ?: ByteArray(0)
-        set(value) {
-            pendingWrite = true
-            field = value
-        }
-
-    val exists = readResult != null
-
-    override fun toString() = handle.virtualPath
-
-    override fun close() {
-        if (pendingWrite) {
-            val path = handle.archivePath
-
-            if (isXmlResource) archive.writeXml(
-                path,
-                try {
-                    XMLDocument.load(inputStream())
-                } catch (e: XMLException) {
-                    throw ApkResourceException.Encode("Failed to parse XML while writing ${handle.virtualPath}", e)
-                }
-
-            ) else archive.writeRaw(path, contents)
-        }
-
-        handle.onClose()
-
-
-        archive.unlock(this)
-    }
-
-    fun inputStream(): InputStream = ByteArrayInputStream(contents)
-
-    fun outputStream(bufferSize: Int = DEFAULT_BUFFER_SIZE): OutputStream =
-        object : ByteArrayOutputStream(bufferSize) {
-            override fun close() {
-                this@ResourceFiles.contents = if (buf.size > count) buf.copyOf(count) else buf
-                super.close()
-            }
-        }
-
-    /**
-     * @param virtualPath The resource file path. Example: /res/drawable-hdpi/icon.png.
-     * @param archivePath The actual file path in the archive. Example: res/4a.png.
-     * @param onClose An action to perform when the file associated with this handle is closed
-     */
-    internal data class Handle(val virtualPath: String, val archivePath: String, val onClose: () -> Unit)
-}
--- a/arsclib-utils/src/main/kotlin/app/revanced/arsc/resource/ResourceTable.kt
+++ b/arsclib-utils/src/main/kotlin/app/revanced/arsc/resource/ResourceTable.kt
@@ -1,100 +0,0 @@
-package app.revanced.arsc.resource
-
-import app.revanced.arsc.ApkResourceException
-import com.reandroid.apk.xmlencoder.EncodeException
-import com.reandroid.apk.xmlencoder.EncodeMaterials
-import com.reandroid.arsc.util.FrameworkTable
-import com.reandroid.arsc.value.Entry
-import com.reandroid.common.TableEntryStore
-
-/**
- * A high-level API for resolving resources in the resource table, which spans the entire ApkBundle.
- */
-class ResourceTable(base: ResourceContainer, all: Sequence<ResourceContainer>) {
-    private val packageName = base.tableBlock!!.name
-
-    /**
-     * A [TableEntryStore] used to decode XML.
-     */
-    internal val entryStore = TableEntryStore()
-
-    /**
-     * The [EncodeMaterials] to use for resolving resources and encoding XML.
-     */
-    internal val encodeMaterials: EncodeMaterials = object : EncodeMaterials() {
-        /*
-        Our implementation is more efficient because it does not have to loop through every single entry group
-        when the resource id cannot be found in the TableIdentifier, which does not update when you create a new resource.
-        It also looks at the entire table instead of just the current package.
-        */
-        override fun resolveLocalResourceId(type: String, name: String) = resolveLocal(type, name)
-    }
-
-    /**
-     * The resource mappings which are generated when the ApkBundle is created.
-     */
-    private val tableIdentifier = encodeMaterials.tableIdentifier
-
-    /**
-     * A table of all the resources that have been changed or added.
-     */
-    private val modifiedResources = HashMap<String, HashMap<String, Int>>()
-
-
-    /**
-     * Resolve a resource id for the specified resource.
-     * Cannot resolve resources from the android framework.
-     *
-     * @param type The type of the resource.
-     * @param name The name of the resource.
-     * @return The id of the resource.
-     */
-    fun resolveLocal(type: String, name: String) =
-        modifiedResources[type]?.get(name)
-            ?: tableIdentifier.get(packageName, type, name)?.resourceId
-            ?: throw ApkResourceException.InvalidReference(
-                type,
-                name
-            )
-
-    /**
-     * Resolve a resource id for the specified resource.
-     *
-     * @param reference The resource reference string.
-     * @return The id of the resource.
-     */
-    fun resolve(reference: String) = try {
-        encodeMaterials.resolveReference(reference)
-    } catch (e: EncodeException) {
-        throw ApkResourceException.InvalidReference(reference, e)
-    }
-
-    /**
-     * Notify the [ResourceTable] that an [Entry] has been created or modified.
-     */
-    internal fun registerChanged(entry: Entry) {
-        modifiedResources.getOrPut(entry.typeName, ::HashMap)[entry.name] = entry.resourceId
-    }
-
-    init {
-        all.forEach {
-            it.tableBlock?.let { table ->
-                entryStore.add(table)
-                tableIdentifier.load(table)
-            }
-
-            it.resourceTable = this
-        }
-
-        base.also {
-            encodeMaterials.currentPackage = it.tableBlock
-
-            it.tableBlock!!.frameWorks.forEach { fw ->
-                if (fw is FrameworkTable) {
-                    entryStore.add(fw)
-                    encodeMaterials.addFramework(fw)
-                }
-            }
-        }
-    }
-}
--- a/arsclib-utils/src/main/kotlin/app/revanced/arsc/xml/LazyXMLEncodeSource.kt
+++ b/arsclib-utils/src/main/kotlin/app/revanced/arsc/xml/LazyXMLEncodeSource.kt
@@ -1,56 +0,0 @@
-package app.revanced.arsc.xml
-
-import app.revanced.arsc.resource.ResourceContainer
-import app.revanced.arsc.resource.boolean
-import com.reandroid.apk.xmlencoder.EncodeException
-import com.reandroid.apk.xmlencoder.XMLEncodeSource
-import com.reandroid.arsc.chunk.xml.ResXmlDocument
-import com.reandroid.xml.XMLDocument
-import com.reandroid.xml.XMLElement
-import com.reandroid.xml.source.XMLDocumentSource
-
-/**
- * Archive input source to lazily encode an [XMLDocument] after it has been modified.
- *
- * @param name The file name of this input source.
- * @param document The [XMLDocument] to encode.
- * @param resources The [ResourceContainer] to use for encoding.
- */
-internal class LazyXMLEncodeSource(
-    name: String,
-    val document: XMLDocument,
-    private val resources: ResourceContainer
-) : XMLEncodeSource(resources.resourceTable.encodeMaterials, XMLDocumentSource(name, document)) {
-    private var encoded = false
-
-    override fun getResXmlBlock(): ResXmlDocument {
-        if (encoded) return super.getResXmlBlock()
-
-        XMLEncodeSource(resources.resourceTable.encodeMaterials, XMLDocumentSource(name, document))
-        
-        fun XMLElement.registerIds() {
-            listAttributes().forEach { attr ->
-                if (!attr.value.startsWith("@+id/")) return@forEach
-
-                val name = attr.value.split('/').last()
-                resources.setResource("id", name, boolean(false))
-                attr.value = "@id/$name"
-            }
-
-            listChildElements().forEach { it.registerIds() }
-        }
-
-        // Handle all @+id/id_name references in the document.
-        document.documentElement.registerIds()
-
-        encoded = true
-
-        // This will call XMLEncodeSource.getResXmlBlock(),
-        // which will encode the document if it has not already been encoded.
-        try {
-            return super.getResXmlBlock()
-        } catch (e: EncodeException) {
-            throw EncodeException("Failed to encode $name", e)
-        }
-    }
-}
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,3 +1,10 @@
 plugins {
-    kotlin("jvm") version "1.8.20" apply false
+    kotlin("jvm") version "1.9.0" apply false
+    alias(libs.plugins.binary.compatibility.validator)
 }
+
+allprojects {
+    apply(plugin = "maven-publish")
+
+    group = "app.revanced"
+}
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-org.gradle.parallel=true
-org.gradle.caching=true
+org.gradle.parallel = true
+org.gradle.caching = true
 kotlin.code.style = official
-version = 11.0.4
+version = 15.0.0-dev.2
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,31 @@
+[versions]
+android = "4.1.1.4"
+kotlin-reflect = "1.9.0"
+apktool-lib = "2.8.2-6"
+kotlin-test = "1.8.20-RC"
+kotlinx-coroutines-core = "1.7.1"
+multidexlib2 = "3.0.3.r2"
+smali = "3.0.3"
+symbol-processing-api = "1.9.0-1.0.11"
+xpp3 = "1.1.4c"
+binary-compatibility-validator = "0.13.2"
+kotlin-compile-testing-ksp = "1.5.0"
+kotlinpoet-ksp = "1.14.2"
+ksp = "1.9.0-1.0.11"
+
+[libraries]
+android = { module = "com.google.android:android", version.ref = "android" }
+kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin-reflect" }
+apktool-lib = { module = "app.revanced:apktool-lib", version.ref = "apktool-lib" }
+kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin-test" }
+kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines-core" }
+multidexlib2 = { module = "app.revanced:multidexlib2", version.ref = "multidexlib2" }
+smali = { module = "com.android.tools.smali:smali", version.ref = "smali" }
+symbol-processing-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "symbol-processing-api" }
+xpp3 = { module = "xpp3:xpp3", version.ref = "xpp3" }
+kotlin-compile-testing = { module = "com.github.tschuchortdev:kotlin-compile-testing-ksp", version.ref = "kotlin-compile-testing-ksp" }
+kotlinpoet-ksp = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlinpoet-ksp" }
+
+[plugins]
+binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-compatibility-validator" }
+ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
--- a/revanced-patch-annotations-processor/api/revanced-patch-annotations-processor.api
+++ b/revanced-patch-annotations-processor/api/revanced-patch-annotations-processor.api
@@ -0,0 +1,25 @@
+public abstract interface annotation class app/revanced/patcher/patch/annotations/CompatiblePackage : java/lang/annotation/Annotation {
+	public abstract fun name ()Ljava/lang/String;
+	public abstract fun versions ()[Ljava/lang/String;
+}
+
+public abstract interface annotation class app/revanced/patcher/patch/annotations/Patch : java/lang/annotation/Annotation {
+	public abstract fun compatiblePackages ()[Lapp/revanced/patcher/patch/annotations/CompatiblePackage;
+	public abstract fun dependencies ()[Ljava/lang/Class;
+	public abstract fun description ()Ljava/lang/String;
+	public abstract fun name ()Ljava/lang/String;
+	public abstract fun requiresIntegrations ()Z
+	public abstract fun use ()Z
+}
+
+public final class app/revanced/patcher/patch/annotations/processor/PatchProcessor : com/google/devtools/ksp/processing/SymbolProcessor {
+	public fun <init> (Lcom/google/devtools/ksp/processing/CodeGenerator;Lcom/google/devtools/ksp/processing/KSPLogger;)V
+	public fun process (Lcom/google/devtools/ksp/processing/Resolver;)Ljava/util/List;
+}
+
+public final class app/revanced/patcher/patch/annotations/processor/PatchProcessorProvider : com/google/devtools/ksp/processing/SymbolProcessorProvider {
+	public fun <init> ()V
+	public fun create (Lcom/google/devtools/ksp/processing/SymbolProcessorEnvironment;)Lapp/revanced/patcher/patch/annotations/processor/PatchProcessor;
+	public synthetic fun create (Lcom/google/devtools/ksp/processing/SymbolProcessorEnvironment;)Lcom/google/devtools/ksp/processing/SymbolProcessor;
+}
+
--- a/revanced-patch-annotations-processor/build.gradle.kts
+++ b/revanced-patch-annotations-processor/build.gradle.kts
@@ -0,0 +1,74 @@
+plugins {
+    kotlin("jvm") version "1.9.0"
+    alias(libs.plugins.ksp)
+}
+
+dependencies {
+    implementation(libs.symbol.processing.api)
+    implementation(libs.kotlinpoet.ksp)
+    implementation(project(":revanced-patcher"))
+
+    testImplementation(libs.kotlin.test)
+    testImplementation(libs.kotlin.compile.testing)
+}
+
+tasks {
+    test {
+        useJUnitPlatform()
+        testLogging {
+            events("PASSED", "SKIPPED", "FAILED")
+        }
+    }
+}
+
+kotlin { jvmToolchain(11) }
+
+java {
+    withSourcesJar()
+}
+
+publishing {
+    repositories {
+        mavenLocal()
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
+            credentials {
+                username = System.getenv("GITHUB_ACTOR")
+                password = System.getenv("GITHUB_TOKEN")
+            }
+        }
+    }
+    publications {
+        create<MavenPublication>("gpr") {
+            from(components["java"])
+
+            version = project.version.toString()
+
+            pom {
+                name = "ReVanced Patch annotations processor"
+                description = "Annotation processor for patches."
+                url = "https://revanced.app"
+
+                licenses {
+                    license {
+                        name = "GNU General Public License v3.0"
+                        url = "https://www.gnu.org/licenses/gpl-3.0.en.html"
+                    }
+                }
+                developers {
+                    developer {
+                        id = "ReVanced"
+                        name = "ReVanced"
+                        email = "contact@revanced.app"
+                    }
+                }
+                scm {
+                    connection = "scm:git:git://github.com/revanced/revanced-patcher.git"
+                    developerConnection = "scm:git:git@github.com:revanced/revanced-patcher.git"
+                    url = "https://github.com/revanced/revanced-patcher"
+                }
+            }
+        }
+    }
+}
--- a/revanced-patch-annotations-processor/settings.gradle.kts
+++ b/revanced-patch-annotations-processor/settings.gradle.kts
@@ -0,0 +1,2 @@
+rootProject.name = "revanced-patch-annotations-processor"
+
--- a/revanced-patch-annotations-processor/src/main/kotlin/app/revanced/patcher/patch/annotations/PatchAnnotations.kt
+++ b/revanced-patch-annotations-processor/src/main/kotlin/app/revanced/patcher/patch/annotations/PatchAnnotations.kt
@@ -0,0 +1,38 @@
+package app.revanced.patcher.patch.annotations
+
+import java.lang.annotation.Inherited
+import kotlin.reflect.KClass
+
+/**
+ * Annotation for [app.revanced.patcher.patch.Patch] classes.
+ *
+ * @param name The name of the patch. If empty, the patch will be unnamed.
+ * @param description The description of the patch. If empty, no description will be used.
+ * @param dependencies The patches this patch depends on.
+ * @param compatiblePackages The packages this patch is compatible with.
+ * @param use Whether this patch should be used.
+ * @param requiresIntegrations Whether this patch requires integrations.
+ */
+@Retention(AnnotationRetention.SOURCE)
+@Target(AnnotationTarget.CLASS)
+@Inherited
+annotation class Patch(
+    val name: String = "",
+    val description: String = "",
+    val dependencies: Array<KClass<out app.revanced.patcher.patch.Patch<*>>> = [],
+    val compatiblePackages: Array<CompatiblePackage> = [],
+    val use: Boolean = true,
+    // TODO: Remove this property, once integrations are coupled with patches.
+    val requiresIntegrations: Boolean = false,
+)
+
+/**
+ * A package that a [app.revanced.patcher.patch.Patch] is compatible with.
+ *
+ * @param name The name of the package.
+ * @param versions The versions of the package.
+ */
+annotation class CompatiblePackage(
+    val name: String,
+    val versions: Array<String> = [],
+)
--- a/revanced-patch-annotations-processor/src/main/kotlin/app/revanced/patcher/patch/annotations/processor/PatchProcessor.kt
+++ b/revanced-patch-annotations-processor/src/main/kotlin/app/revanced/patcher/patch/annotations/processor/PatchProcessor.kt
@@ -0,0 +1,205 @@
+package app.revanced.patcher.patch.annotations.processor
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotations.Patch
+import com.google.devtools.ksp.processing.*
+import com.google.devtools.ksp.symbol.KSAnnotated
+import com.google.devtools.ksp.symbol.KSAnnotation
+import com.google.devtools.ksp.symbol.KSClassDeclaration
+import com.google.devtools.ksp.symbol.KSType
+import com.google.devtools.ksp.validate
+import com.squareup.kotlinpoet.*
+import com.squareup.kotlinpoet.ksp.toClassName
+import com.squareup.kotlinpoet.ksp.writeTo
+import kotlin.reflect.KClass
+
+class PatchProcessor(
+    private val codeGenerator: CodeGenerator,
+    private val logger: KSPLogger
+) : SymbolProcessor {
+
+    private fun KSAnnotated.isSubclassOf(cls: KClass<*>): Boolean {
+        if (this !is KSClassDeclaration) return false
+
+        if (qualifiedName?.asString() == cls.qualifiedName) return true
+
+        return superTypes.any { it.resolve().declaration.isSubclassOf(cls) }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun process(resolver: Resolver): List<KSAnnotated> {
+        val executablePatches = buildMap {
+            resolver.getSymbolsWithAnnotation(Patch::class.qualifiedName!!).filter {
+                // Do not check here if Patch is super of the class, because it is expensive.
+                // Check it later when processing.
+                it.validate() && it.isSubclassOf(app.revanced.patcher.patch.Patch::class)
+            }.map {
+                it as KSClassDeclaration
+            }.forEach { patchDeclaration ->
+                patchDeclaration.annotations.find {
+                    it.annotationType.resolve().declaration.qualifiedName!!.asString() == Patch::class.qualifiedName!!
+                }?.let { annotation ->
+                    fun KSAnnotation.property(name: String) =
+                        arguments.find { it.name!!.asString() == name }?.value!!
+
+                    val name =
+                        annotation.property("name").toString().ifEmpty { null }
+
+                    val description =
+                        annotation.property("description").toString().ifEmpty { null }
+
+                    val dependencies =
+                        (annotation.property("dependencies") as List<KSType>).ifEmpty { null }
+
+                    val compatiblePackages =
+                        (annotation.property("compatiblePackages") as List<KSAnnotation>).ifEmpty { null }
+
+                    val use =
+                        annotation.property("use") as Boolean
+
+                    val requiresIntegrations =
+                        annotation.property("requiresIntegrations") as Boolean
+
+                    // Data class for KotlinPoet
+                    data class PatchData(
+                        val name: String?,
+                        val description: String?,
+                        val dependencies: List<ClassName>?,
+                        val compatiblePackages: List<CodeBlock>?,
+                        val use: Boolean,
+                        val requiresIntegrations: Boolean
+                    )
+
+                    this[patchDeclaration] = PatchData(
+                        name,
+                        description,
+                        dependencies?.map { dependency -> dependency.toClassName() },
+                        compatiblePackages?.map {
+                            val packageName = it.property("name")
+                            val packageVersions = (it.property("versions") as List<String>)
+                                .joinToString(", ") { version -> "\"$version\"" }
+
+                            CodeBlock.of(
+                                "%T(%S, setOf(%L))",
+                                app.revanced.patcher.patch.Patch.CompatiblePackage::class,
+                                packageName,
+                                packageVersions
+                            )
+                        },
+                        use,
+                        requiresIntegrations
+                    )
+                }
+            }
+        }
+
+        // If a patch depends on another, that is annotated, the dependency should be replaced with the generated patch,
+        // because the generated patch has all the necessary properties to invoke the super constructor,
+        // unlike the annotated patch.
+        val dependencyResolutionMap = buildMap {
+            executablePatches.values.filter { it.dependencies != null }.flatMap {
+                it.dependencies!!
+            }.distinct().forEach { dependency ->
+                executablePatches.keys.find { it.qualifiedName?.asString() == dependency.toString() }
+                    ?.let { patch ->
+                        this[dependency] = ClassName(
+                            patch.packageName.asString(),
+                            patch.simpleName.asString() + "Generated"
+                        )
+                    }
+            }
+        }
+
+        executablePatches.forEach { (patchDeclaration, patchAnnotation) ->
+            val isBytecodePatch = patchDeclaration.isSubclassOf(BytecodePatch::class)
+
+            val superClass = if (isBytecodePatch) {
+                BytecodePatch::class
+            } else {
+                ResourcePatch::class
+            }
+
+            val contextClass = if (isBytecodePatch) {
+                BytecodeContext::class
+            } else {
+                ResourceContext::class
+            }
+
+            val generatedPatchClassName = ClassName(
+                patchDeclaration.packageName.asString(),
+                patchDeclaration.simpleName.asString() + "Generated"
+            )
+
+            FileSpec.builder(generatedPatchClassName)
+                .addType(
+                    TypeSpec.objectBuilder(generatedPatchClassName)
+                        .superclass(superClass).apply {
+                            patchAnnotation.name?.let { name ->
+                                addSuperclassConstructorParameter("name = %S", name)
+                            }
+
+                            patchAnnotation.description?.let { description ->
+                                addSuperclassConstructorParameter("description = %S", description)
+                            }
+
+                            patchAnnotation.compatiblePackages?.let { compatiblePackages ->
+                                addSuperclassConstructorParameter(
+                                    "compatiblePackages = setOf(%L)",
+                                    compatiblePackages.joinToString(", ")
+                                )
+                            }
+
+                            patchAnnotation.dependencies?.let { dependencies ->
+                                addSuperclassConstructorParameter(
+                                    "dependencies = setOf(%L)",
+                                    buildList {
+                                        addAll(dependencies)
+                                        // Also add the source class of the generated class so that it is also executed.
+                                        add(patchDeclaration.toClassName())
+                                    }.joinToString(", ") { dependency ->
+                                        "${(dependencyResolutionMap[dependency] ?: dependency)}::class"
+                                    }
+                                )
+                            }
+                            addSuperclassConstructorParameter(
+                                "use = %L", patchAnnotation.use
+                            )
+
+                            addSuperclassConstructorParameter(
+                                "requiresIntegrations = %L",
+                                patchAnnotation.requiresIntegrations
+                            )
+                        }
+                        .addFunction(
+                            FunSpec.builder("execute")
+                                .addModifiers(KModifier.OVERRIDE)
+                                .addParameter("context", contextClass)
+                                .build()
+                        )
+                        .addInitializerBlock(
+                            CodeBlock.builder()
+                                .add(
+                                    "%T.options.forEach { (key, option) ->",
+                                    patchDeclaration.toClassName()
+                                )
+                                .addStatement(
+                                    "options.register(option)"
+                                )
+                                .add(
+                                    "}"
+                                )
+                                .build()
+                        )
+                        .build()
+                ).build().writeTo(
+                    codeGenerator,
+                    Dependencies(false, patchDeclaration.containingFile!!)
+                )
+        }
+
+        return emptyList()
+    }
+}
--- a/revanced-patch-annotations-processor/src/main/kotlin/app/revanced/patcher/patch/annotations/processor/PatchProcessorProvider.kt
+++ b/revanced-patch-annotations-processor/src/main/kotlin/app/revanced/patcher/patch/annotations/processor/PatchProcessorProvider.kt
@@ -0,0 +1,9 @@
+package app.revanced.patcher.patch.annotations.processor
+
+import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
+import com.google.devtools.ksp.processing.SymbolProcessorProvider
+
+class PatchProcessorProvider : SymbolProcessorProvider {
+    override fun create(environment: SymbolProcessorEnvironment) =
+        PatchProcessor(environment.codeGenerator, environment.logger)
+}
--- a/revanced-patch-annotations-processor/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider
+++ b/revanced-patch-annotations-processor/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider
@@ -0,0 +1 @@
+app.revanced.patcher.patch.annotations.processor.PatchProcessorProvider
--- a/revanced-patch-annotations-processor/src/test/kotlin/app/revanced/patcher/patch/annotations/processor/TestPatchAnnotationProcessor.kt
+++ b/revanced-patch-annotations-processor/src/test/kotlin/app/revanced/patcher/patch/annotations/processor/TestPatchAnnotationProcessor.kt
@@ -0,0 +1,130 @@
+package app.revanced.patcher.patch.annotations.processor
+
+import app.revanced.patcher.patch.Patch
+import com.tschuchort.compiletesting.KotlinCompilation
+import com.tschuchort.compiletesting.SourceFile
+import com.tschuchort.compiletesting.kspWithCompilation
+import com.tschuchort.compiletesting.symbolProcessorProviders
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
+
+class TestPatchAnnotationProcessor {
+    // region Processing
+
+    @Test
+    fun testProcessing() = assertEquals(
+        "Processable patch", compile(
+            getSourceFile(
+                "processing", "ProcessablePatch"
+            )
+        ).loadPatch("$SAMPLE_PACKAGE.processing.ProcessablePatchGenerated").name
+    )
+
+    // endregion
+
+    // region Dependencies
+
+    @Test
+    fun testDependencies() {
+        compile(
+            getSourceFile(
+                "dependencies", "DependentPatch"
+            ), getSourceFile(
+                "dependencies", "DependencyPatch"
+            )
+        ).let { result ->
+            result.loadPatch("$SAMPLE_PACKAGE.dependencies.DependentPatchGenerated").let {
+                // Dependency as well as the source class of the generated class.
+                assertEquals(
+                    2,
+                    it.dependencies!!.size
+                )
+
+                // The last dependency is always the source class of the generated class to respect
+                // order of dependencies.
+                assertEquals(
+                    result.loadPatch("$SAMPLE_PACKAGE.dependencies.DependentPatch")::class,
+                    it.dependencies!!.last()
+                )
+            }
+        }
+    }
+
+    // endregion
+
+    // region Options
+
+    @Test
+    fun testOptions() {
+        val patch = compile(
+            getSourceFile(
+                "options", "OptionsPatch"
+            )
+        ).loadPatch("$SAMPLE_PACKAGE.options.OptionsPatchGenerated")
+
+        assert(patch.options.isNotEmpty())
+        assertEquals(patch.options["print"].title, "Print message")
+    }
+
+    // endregion
+
+    // region Limitations
+    @Test
+    fun failingManualDependency() = assertNull(
+        compile(
+            getSourceFile(
+                "limitations/manualdependency", "DependentPatch"
+            ), getSourceFile(
+                "limitations/manualdependency", "DependencyPatch"
+            )
+        ).loadPatch("$SAMPLE_PACKAGE.limitations.manualdependency.DependentPatchGenerated").dependencies
+    )
+
+    // endregion
+
+    private companion object Utils {
+        const val SAMPLE_PACKAGE = "app.revanced.patcher.patch.annotations.processor.samples"
+
+        /**
+         * Get a source file from the given sample and class name.
+         *
+         * @param sample The sample to get the source file from.
+         * @param className The name of the class to get the source file from.
+         * @return The source file.
+         */
+        fun getSourceFile(sample: String, className: String) = SourceFile.kotlin(
+            "$className.kt", TestPatchAnnotationProcessor::class.java.classLoader.getResourceAsStream(
+                "app/revanced/patcher/patch/annotations/processor/samples/$sample/$className.kt"
+            )?.readAllBytes()?.toString(Charsets.UTF_8) ?: error("Could not find resource $className")
+        )
+
+        /**
+         * Compile the given source files and return the result.
+         *
+         * @param sourceFiles The source files to compile.
+         * @return The result of the compilation.
+         */
+        fun compile(vararg sourceFiles: SourceFile) = KotlinCompilation().apply {
+            sources = sourceFiles.asList()
+
+            symbolProcessorProviders = listOf(PatchProcessorProvider())
+
+            // Required until https://github.com/tschuchortdev/kotlin-compile-testing/issues/312 closed.
+            kspWithCompilation = true
+
+            inheritClassPath = true
+            messageOutputStream = System.out
+        }.compile().also { result ->
+            assertEquals(KotlinCompilation.ExitCode.OK, result.exitCode)
+        }
+
+        // region Class loading
+
+        fun KotlinCompilation.Result.loadPatch(name: String) = classLoader.loadClass(name).loadPatch()
+
+        fun Class<*>.loadPatch() = this.getField("INSTANCE").get(null) as Patch<*>
+
+        // endregion
+    }
+}
--- a/revanced-patch-annotations-processor/src/test/resources/app/revanced/patcher/patch/annotations/processor/samples/dependencies/DependencyPatch.kt
+++ b/revanced-patch-annotations-processor/src/test/resources/app/revanced/patcher/patch/annotations/processor/samples/dependencies/DependencyPatch.kt
@@ -0,0 +1,10 @@
+package app.revanced.patcher.patch.annotations.processor.samples.dependencies
+
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotations.Patch
+
+@Patch(name = "Dependency patch")
+object DependencyPatch : ResourcePatch() {
+    override fun execute(context: ResourceContext) {}
+}
--- a/revanced-patch-annotations-processor/src/test/resources/app/revanced/patcher/patch/annotations/processor/samples/dependencies/DependentPatch.kt
+++ b/revanced-patch-annotations-processor/src/test/resources/app/revanced/patcher/patch/annotations/processor/samples/dependencies/DependentPatch.kt
@@ -0,0 +1,12 @@
+package app.revanced.patcher.patch.annotations.processor.samples.dependencies
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotations.Patch
+
+@Patch(
+    name = "Dependent patch",
+    dependencies = [DependencyPatch::class],
+)
+object DependentPatch : BytecodePatch() {
+    override fun execute(context: BytecodeContext) {}
+}
--- a/revanced-patch-annotations-processor/src/test/resources/app/revanced/patcher/patch/annotations/processor/samples/limitations/manualdependency/DependencyPatch.kt
+++ b/revanced-patch-annotations-processor/src/test/resources/app/revanced/patcher/patch/annotations/processor/samples/limitations/manualdependency/DependencyPatch.kt
@@ -0,0 +1,10 @@
+package app.revanced.patcher.patch.annotations.processor.samples.limitations.manualdependency
+
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotations.Patch
+
+@Patch(name = "Dependency patch")
+object DependencyPatch : ResourcePatch() {
+    override fun execute(context: ResourceContext) { }
+}
--- a/revanced-patch-annotations-processor/src/test/resources/app/revanced/patcher/patch/annotations/processor/samples/limitations/manualdependency/DependentPatch.kt
+++ b/revanced-patch-annotations-processor/src/test/resources/app/revanced/patcher/patch/annotations/processor/samples/limitations/manualdependency/DependentPatch.kt
@@ -0,0 +1,17 @@
+package app.revanced.patcher.patch.annotations.processor.samples.limitations.manualdependency
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotations.Patch
+
+@Patch(name = "Dependent patch")
+object DependentPatch : BytecodePatch(
+    // Dependency will not be executed correctly if it is manually specified.
+    // The reason for this is that the dependency patch is annotated too,
+    // so the processor will generate a new patch class for it embedding the annotated information.
+    // Because the dependency is manually specified,
+    // the processor will not be able to change this dependency to the generated class,
+    // which means that the dependency will lose the annotated information.
+    dependencies = setOf(DependencyPatch::class)
+) {
+    override fun execute(context: BytecodeContext) {}
+}
--- a/revanced-patch-annotations-processor/src/test/resources/app/revanced/patcher/patch/annotations/processor/samples/options/OptionsPatch.kt
+++ b/revanced-patch-annotations-processor/src/test/resources/app/revanced/patcher/patch/annotations/processor/samples/options/OptionsPatch.kt
@@ -0,0 +1,19 @@
+package app.revanced.patcher.patch.annotations.processor.samples.options
+
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.options.types.StringPatchOption.Companion.stringPatchOption
+
+@Patch(name = "Options patch")
+object OptionsPatch : ResourcePatch() {
+    override fun execute(context: ResourceContext) {}
+
+    @Suppress("unused")
+    private val printOption by stringPatchOption(
+        "print",
+        null,
+        "Print message",
+        "The message to print."
+    )
+}
--- a/revanced-patch-annotations-processor/src/test/resources/app/revanced/patcher/patch/annotations/processor/samples/processing/ProcessablePatch.kt
+++ b/revanced-patch-annotations-processor/src/test/resources/app/revanced/patcher/patch/annotations/processor/samples/processing/ProcessablePatch.kt
@@ -0,0 +1,10 @@
+package app.revanced.patcher.patch.annotations.processor.samples.processing
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotations.Patch
+
+@Patch("Processable patch")
+object ProcessablePatch : BytecodePatch() {
+    override fun execute(context: BytecodeContext) {}
+}
--- a/revanced-patcher/api/revanced-patcher.api
+++ b/revanced-patcher/api/revanced-patcher.api
@@ -0,0 +1,924 @@
+public abstract interface class app/revanced/patcher/IntegrationsConsumer {
+	public abstract fun acceptIntegrations (Ljava/util/List;)V
+}
+
+public final class app/revanced/patcher/PackageMetadata {
+	public final fun getPackageName ()Ljava/lang/String;
+	public final fun getPackageVersion ()Ljava/lang/String;
+}
+
+public abstract class app/revanced/patcher/PatchBundleLoader : java/util/Map, kotlin/jvm/internal/markers/KMappedMarker {
+	public synthetic fun <init> (Ljava/lang/ClassLoader;[Ljava/io/File;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun clear ()V
+	public synthetic fun compute (Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object;
+	public fun compute (Ljava/lang/String;Ljava/util/function/BiFunction;)Lapp/revanced/patcher/patch/Patch;
+	public synthetic fun computeIfAbsent (Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;
+	public fun computeIfAbsent (Ljava/lang/String;Ljava/util/function/Function;)Lapp/revanced/patcher/patch/Patch;
+	public synthetic fun computeIfPresent (Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object;
+	public fun computeIfPresent (Ljava/lang/String;Ljava/util/function/BiFunction;)Lapp/revanced/patcher/patch/Patch;
+	public final fun containsKey (Ljava/lang/Object;)Z
+	public fun containsKey (Ljava/lang/String;)Z
+	public fun containsValue (Lapp/revanced/patcher/patch/Patch;)Z
+	public final fun containsValue (Ljava/lang/Object;)Z
+	public final fun entrySet ()Ljava/util/Set;
+	public final fun get (Ljava/lang/Object;)Lapp/revanced/patcher/patch/Patch;
+	public final synthetic fun get (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun get (Ljava/lang/String;)Lapp/revanced/patcher/patch/Patch;
+	public fun getEntries ()Ljava/util/Set;
+	public fun getKeys ()Ljava/util/Set;
+	public fun getSize ()I
+	public fun getValues ()Ljava/util/Collection;
+	public fun isEmpty ()Z
+	public final fun keySet ()Ljava/util/Set;
+	public synthetic fun merge (Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object;
+	public fun merge (Ljava/lang/String;Lapp/revanced/patcher/patch/Patch;Ljava/util/function/BiFunction;)Lapp/revanced/patcher/patch/Patch;
+	public synthetic fun put (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun put (Ljava/lang/String;Lapp/revanced/patcher/patch/Patch;)Lapp/revanced/patcher/patch/Patch;
+	public fun putAll (Ljava/util/Map;)V
+	public synthetic fun putIfAbsent (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun putIfAbsent (Ljava/lang/String;Lapp/revanced/patcher/patch/Patch;)Lapp/revanced/patcher/patch/Patch;
+	public fun remove (Ljava/lang/Object;)Lapp/revanced/patcher/patch/Patch;
+	public synthetic fun remove (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun remove (Ljava/lang/Object;Ljava/lang/Object;)Z
+	public synthetic fun replace (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public synthetic fun replace (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
+	public fun replace (Ljava/lang/String;Lapp/revanced/patcher/patch/Patch;)Lapp/revanced/patcher/patch/Patch;
+	public fun replace (Ljava/lang/String;Lapp/revanced/patcher/patch/Patch;Lapp/revanced/patcher/patch/Patch;)Z
+	public fun replaceAll (Ljava/util/function/BiFunction;)V
+	public final fun size ()I
+	public final fun values ()Ljava/util/Collection;
+}
+
+public final class app/revanced/patcher/PatchBundleLoader$Dex : app/revanced/patcher/PatchBundleLoader {
+	public fun <init> ([Ljava/io/File;)V
+	public fun <init> ([Ljava/io/File;Ljava/io/File;)V
+	public synthetic fun <init> ([Ljava/io/File;Ljava/io/File;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
+public final class app/revanced/patcher/PatchBundleLoader$Jar : app/revanced/patcher/PatchBundleLoader {
+	public fun <init> ([Ljava/io/File;)V
+}
+
+public abstract interface class app/revanced/patcher/PatchExecutorFunction : java/util/function/Function {
+}
+
+public final class app/revanced/patcher/Patcher : app/revanced/patcher/IntegrationsConsumer, app/revanced/patcher/PatchExecutorFunction, app/revanced/patcher/PatchesConsumer, java/io/Closeable, java/util/function/Supplier {
+	public fun <init> (Lapp/revanced/patcher/PatcherOptions;)V
+	public fun acceptIntegrations (Ljava/util/List;)V
+	public fun acceptPatches (Ljava/util/List;)V
+	public synthetic fun apply (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun apply (Z)Lkotlinx/coroutines/flow/Flow;
+	public fun close ()V
+	public fun get ()Lapp/revanced/patcher/PatcherResult;
+	public synthetic fun get ()Ljava/lang/Object;
+	public final fun getContext ()Lapp/revanced/patcher/PatcherContext;
+}
+
+public final class app/revanced/patcher/PatcherContext {
+	public final fun getPackageMetadata ()Lapp/revanced/patcher/PackageMetadata;
+}
+
+public abstract class app/revanced/patcher/PatcherException : java/lang/Exception {
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Throwable;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
+public final class app/revanced/patcher/PatcherException$CircularDependencyException : app/revanced/patcher/PatcherException {
+}
+
+public final class app/revanced/patcher/PatcherOptions {
+	public fun <init> (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;)V
+	public synthetic fun <init> (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patcher/logging/Logger;)V
+	public synthetic fun <init> (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patcher/logging/Logger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun copy (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patcher/logging/Logger;)Lapp/revanced/patcher/PatcherOptions;
+	public static synthetic fun copy$default (Lapp/revanced/patcher/PatcherOptions;Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;Lapp/revanced/patcher/logging/Logger;ILjava/lang/Object;)Lapp/revanced/patcher/PatcherOptions;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun hashCode ()I
+	public final fun recreateResourceCacheDirectory ()Ljava/io/File;
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class app/revanced/patcher/PatcherResult {
+	public fun <init> (Ljava/util/List;Ljava/io/File;Ljava/util/List;)V
+	public synthetic fun <init> (Ljava/util/List;Ljava/io/File;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/util/List;
+	public final fun component2 ()Ljava/io/File;
+	public final fun component3 ()Ljava/util/List;
+	public final fun copy (Ljava/util/List;Ljava/io/File;Ljava/util/List;)Lapp/revanced/patcher/PatcherResult;
+	public static synthetic fun copy$default (Lapp/revanced/patcher/PatcherResult;Ljava/util/List;Ljava/io/File;Ljava/util/List;ILjava/lang/Object;)Lapp/revanced/patcher/PatcherResult;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getDexFiles ()Ljava/util/List;
+	public final fun getDoNotCompress ()Ljava/util/List;
+	public final fun getResourceFile ()Ljava/io/File;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class app/revanced/patcher/PatcherResult$PatchedDexFile {
+	public fun <init> (Ljava/lang/String;Ljava/io/InputStream;)V
+	public final fun getName ()Ljava/lang/String;
+	public final fun getStream ()Ljava/io/InputStream;
+}
+
+public abstract interface class app/revanced/patcher/PatchesConsumer {
+	public abstract fun acceptPatches (Ljava/util/List;)V
+}
+
+public final class app/revanced/patcher/data/BytecodeContext : app/revanced/patcher/data/Context {
+	public final fun findClass (Ljava/lang/String;)Lapp/revanced/patcher/util/proxy/ClassProxy;
+	public final fun findClass (Lkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/util/proxy/ClassProxy;
+	public synthetic fun get ()Ljava/lang/Object;
+	public fun get ()Ljava/util/List;
+	public final fun getClasses ()Lapp/revanced/patcher/util/ProxyClassList;
+	public final fun proxy (Lcom/android/tools/smali/dexlib2/iface/ClassDef;)Lapp/revanced/patcher/util/proxy/ClassProxy;
+	public final fun toMethodWalker (Lcom/android/tools/smali/dexlib2/iface/Method;)Lapp/revanced/patcher/util/method/MethodWalker;
+}
+
+public abstract interface class app/revanced/patcher/data/Context : java/util/function/Supplier {
+}
+
+public final class app/revanced/patcher/data/ResourceContext : app/revanced/patcher/data/Context, java/lang/Iterable, kotlin/jvm/internal/markers/KMappedMarker {
+	public fun get ()Ljava/io/File;
+	public synthetic fun get ()Ljava/lang/Object;
+	public final fun get (Ljava/lang/String;)Ljava/io/File;
+	public final fun getXmlEditor ()Lapp/revanced/patcher/data/ResourceContext$XmlFileHolder;
+	public fun iterator ()Ljava/util/Iterator;
+}
+
+public final class app/revanced/patcher/data/ResourceContext$XmlFileHolder {
+	public fun <init> (Lapp/revanced/patcher/data/ResourceContext;)V
+	public final fun get (Ljava/io/InputStream;)Lapp/revanced/patcher/util/DomFileEditor;
+	public final fun get (Ljava/lang/String;)Lapp/revanced/patcher/util/DomFileEditor;
+}
+
+public final class app/revanced/patcher/extensions/ExtensionsKt {
+	public static final fun newLabel (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;I)Lcom/android/tools/smali/dexlib2/builder/Label;
+	public static final fun or (ILcom/android/tools/smali/dexlib2/AccessFlags;)I
+	public static final fun or (Lcom/android/tools/smali/dexlib2/AccessFlags;I)I
+	public static final fun or (Lcom/android/tools/smali/dexlib2/AccessFlags;Lcom/android/tools/smali/dexlib2/AccessFlags;)I
+}
+
+public final class app/revanced/patcher/extensions/InstructionExtensions {
+	public static final field INSTANCE Lapp/revanced/patcher/extensions/InstructionExtensions;
+	public final fun addInstruction (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILcom/android/tools/smali/dexlib2/builder/BuilderInstruction;)V
+	public final fun addInstruction (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILjava/lang/String;)V
+	public final fun addInstruction (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Lcom/android/tools/smali/dexlib2/builder/BuilderInstruction;)V
+	public final fun addInstruction (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Ljava/lang/String;)V
+	public final fun addInstructions (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILjava/lang/String;)V
+	public final fun addInstructions (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILjava/util/List;)V
+	public final fun addInstructions (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Ljava/lang/String;)V
+	public final fun addInstructions (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Ljava/util/List;)V
+	public final fun addInstructions (Lcom/android/tools/smali/dexlib2/builder/MutableMethodImplementation;ILjava/util/List;)V
+	public final fun addInstructions (Lcom/android/tools/smali/dexlib2/builder/MutableMethodImplementation;Ljava/util/List;)V
+	public final fun addInstructionsWithLabels (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILjava/lang/String;[Lapp/revanced/patcher/util/smali/ExternalLabel;)V
+	public final fun getInstruction (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;I)Lcom/android/tools/smali/dexlib2/builder/BuilderInstruction;
+	public final fun getInstruction (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;I)Ljava/lang/Object;
+	public final fun getInstruction (Lcom/android/tools/smali/dexlib2/builder/MutableMethodImplementation;I)Lcom/android/tools/smali/dexlib2/builder/BuilderInstruction;
+	public final fun getInstruction (Lcom/android/tools/smali/dexlib2/builder/MutableMethodImplementation;I)Ljava/lang/Object;
+	public final fun getInstructions (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;)Ljava/util/List;
+	public final fun removeInstruction (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;I)V
+	public final fun removeInstructions (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;I)V
+	public final fun removeInstructions (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;II)V
+	public final fun removeInstructions (Lcom/android/tools/smali/dexlib2/builder/MutableMethodImplementation;I)V
+	public final fun removeInstructions (Lcom/android/tools/smali/dexlib2/builder/MutableMethodImplementation;II)V
+	public final fun replaceInstruction (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILcom/android/tools/smali/dexlib2/builder/BuilderInstruction;)V
+	public final fun replaceInstruction (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILjava/lang/String;)V
+	public final fun replaceInstructions (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILjava/lang/String;)V
+	public final fun replaceInstructions (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILjava/util/List;)V
+	public final fun replaceInstructions (Lcom/android/tools/smali/dexlib2/builder/MutableMethodImplementation;ILjava/util/List;)V
+}
+
+public final class app/revanced/patcher/extensions/MethodFingerprintExtensions {
+	public static final field INSTANCE Lapp/revanced/patcher/extensions/MethodFingerprintExtensions;
+	public final fun getFuzzyPatternScanMethod (Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprint;)Lapp/revanced/patcher/fingerprint/method/annotation/FuzzyPatternScanMethod;
+}
+
+public abstract interface class app/revanced/patcher/fingerprint/Fingerprint {
+}
+
+public abstract interface annotation class app/revanced/patcher/fingerprint/method/annotation/FuzzyPatternScanMethod : java/lang/annotation/Annotation {
+	public abstract fun threshold ()I
+}
+
+public abstract class app/revanced/patcher/fingerprint/method/impl/MethodFingerprint : app/revanced/patcher/fingerprint/Fingerprint {
+	public static final field Companion Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprint$Companion;
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Iterable;Ljava/lang/Iterable;Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Iterable;Ljava/lang/Iterable;Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getResult ()Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult;
+	public final fun setResult (Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult;)V
+}
+
+public final class app/revanced/patcher/fingerprint/method/impl/MethodFingerprint$Companion {
+	public final fun resolve (Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprint;Lapp/revanced/patcher/data/BytecodeContext;Lcom/android/tools/smali/dexlib2/iface/ClassDef;)Z
+	public final fun resolve (Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprint;Lapp/revanced/patcher/data/BytecodeContext;Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/ClassDef;)Z
+	public final fun resolve (Ljava/lang/Iterable;Lapp/revanced/patcher/data/BytecodeContext;Ljava/lang/Iterable;)V
+}
+
+public final class app/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult {
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult;Lapp/revanced/patcher/data/BytecodeContext;)V
+	public final fun component1 ()Lcom/android/tools/smali/dexlib2/iface/Method;
+	public final fun component2 ()Lcom/android/tools/smali/dexlib2/iface/ClassDef;
+	public final fun component3 ()Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult;
+	public final fun copy (Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult;Lapp/revanced/patcher/data/BytecodeContext;)Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult;
+	public static synthetic fun copy$default (Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult;Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult;Lapp/revanced/patcher/data/BytecodeContext;ILjava/lang/Object;)Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getClassDef ()Lcom/android/tools/smali/dexlib2/iface/ClassDef;
+	public final fun getMethod ()Lcom/android/tools/smali/dexlib2/iface/Method;
+	public final fun getMutableClass ()Lapp/revanced/patcher/util/proxy/mutableTypes/MutableClass;
+	public final fun getMutableMethod ()Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;
+	public final fun getScanResult ()Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class app/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult {
+	public fun <init> (Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$PatternScanResult;Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$StringsScanResult;)V
+	public final fun component1 ()Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$PatternScanResult;
+	public final fun component2 ()Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$StringsScanResult;
+	public final fun copy (Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$PatternScanResult;Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$StringsScanResult;)Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult;
+	public static synthetic fun copy$default (Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult;Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$PatternScanResult;Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$StringsScanResult;ILjava/lang/Object;)Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getPatternScanResult ()Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$PatternScanResult;
+	public final fun getStringsScanResult ()Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$StringsScanResult;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class app/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$PatternScanResult {
+	public fun <init> (IILjava/util/List;)V
+	public synthetic fun <init> (IILjava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()I
+	public final fun component2 ()I
+	public final fun component3 ()Ljava/util/List;
+	public final fun copy (IILjava/util/List;)Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$PatternScanResult;
+	public static synthetic fun copy$default (Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$PatternScanResult;IILjava/util/List;ILjava/lang/Object;)Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$PatternScanResult;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getEndIndex ()I
+	public final fun getStartIndex ()I
+	public final fun getWarnings ()Ljava/util/List;
+	public fun hashCode ()I
+	public final fun setWarnings (Ljava/util/List;)V
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class app/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$PatternScanResult$Warning {
+	public fun <init> (Lcom/android/tools/smali/dexlib2/Opcode;Lcom/android/tools/smali/dexlib2/Opcode;II)V
+	public final fun component1 ()Lcom/android/tools/smali/dexlib2/Opcode;
+	public final fun component2 ()Lcom/android/tools/smali/dexlib2/Opcode;
+	public final fun component3 ()I
+	public final fun component4 ()I
+	public final fun copy (Lcom/android/tools/smali/dexlib2/Opcode;Lcom/android/tools/smali/dexlib2/Opcode;II)Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$PatternScanResult$Warning;
+	public static synthetic fun copy$default (Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$PatternScanResult$Warning;Lcom/android/tools/smali/dexlib2/Opcode;Lcom/android/tools/smali/dexlib2/Opcode;IIILjava/lang/Object;)Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$PatternScanResult$Warning;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getCorrectOpcode ()Lcom/android/tools/smali/dexlib2/Opcode;
+	public final fun getInstructionIndex ()I
+	public final fun getPatternIndex ()I
+	public final fun getWrongOpcode ()Lcom/android/tools/smali/dexlib2/Opcode;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class app/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$StringsScanResult {
+	public fun <init> (Ljava/util/List;)V
+	public final fun component1 ()Ljava/util/List;
+	public final fun copy (Ljava/util/List;)Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$StringsScanResult;
+	public static synthetic fun copy$default (Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$StringsScanResult;Ljava/util/List;ILjava/lang/Object;)Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$StringsScanResult;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getMatches ()Ljava/util/List;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class app/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$StringsScanResult$StringMatch {
+	public fun <init> (Ljava/lang/String;I)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component2 ()I
+	public final fun copy (Ljava/lang/String;I)Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$StringsScanResult$StringMatch;
+	public static synthetic fun copy$default (Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$StringsScanResult$StringMatch;Ljava/lang/String;IILjava/lang/Object;)Lapp/revanced/patcher/fingerprint/method/impl/MethodFingerprintResult$MethodFingerprintScanResult$StringsScanResult$StringMatch;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getIndex ()I
+	public final fun getString ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public abstract interface class app/revanced/patcher/logging/Logger {
+	public abstract fun error (Ljava/lang/String;)V
+	public abstract fun info (Ljava/lang/String;)V
+	public abstract fun trace (Ljava/lang/String;)V
+	public abstract fun warn (Ljava/lang/String;)V
+}
+
+public final class app/revanced/patcher/logging/Logger$DefaultImpls {
+	public static fun error (Lapp/revanced/patcher/logging/Logger;Ljava/lang/String;)V
+	public static fun info (Lapp/revanced/patcher/logging/Logger;Ljava/lang/String;)V
+	public static fun trace (Lapp/revanced/patcher/logging/Logger;Ljava/lang/String;)V
+	public static fun warn (Lapp/revanced/patcher/logging/Logger;Ljava/lang/String;)V
+}
+
+public final class app/revanced/patcher/logging/impl/NopLogger : app/revanced/patcher/logging/Logger {
+	public static final field INSTANCE Lapp/revanced/patcher/logging/impl/NopLogger;
+	public fun error (Ljava/lang/String;)V
+	public fun info (Ljava/lang/String;)V
+	public fun trace (Ljava/lang/String;)V
+	public fun warn (Ljava/lang/String;)V
+}
+
+public abstract class app/revanced/patcher/patch/BytecodePatch : app/revanced/patcher/patch/Patch {
+	public fun <init> ()V
+	public fun <init> (Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;ZZ)V
+	public synthetic fun <init> (Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
+public abstract class app/revanced/patcher/patch/Patch {
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;ZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun equals (Ljava/lang/Object;)Z
+	public abstract fun execute (Lapp/revanced/patcher/data/Context;)V
+	public final fun getCompatiblePackages ()Ljava/util/Set;
+	public final fun getDependencies ()Ljava/util/Set;
+	public final fun getDescription ()Ljava/lang/String;
+	public final fun getName ()Ljava/lang/String;
+	public final fun getOptions ()Lapp/revanced/patcher/patch/options/PatchOptions;
+	public final fun getRequiresIntegrations ()Z
+	public final fun getUse ()Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class app/revanced/patcher/patch/Patch$CompatiblePackage {
+	public fun <init> (Ljava/lang/String;Ljava/util/Set;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getName ()Ljava/lang/String;
+}
+
+public final class app/revanced/patcher/patch/PatchException : java/lang/Exception {
+	public fun <init> (Ljava/lang/String;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
+	public fun <init> (Ljava/lang/Throwable;)V
+}
+
+public final class app/revanced/patcher/patch/PatchResult {
+	public final fun getException ()Lapp/revanced/patcher/patch/PatchException;
+	public final fun getPatch ()Lapp/revanced/patcher/patch/Patch;
+}
+
+public abstract class app/revanced/patcher/patch/ResourcePatch : app/revanced/patcher/patch/Patch {
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;ZZ)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
+public abstract class app/revanced/patcher/patch/options/PatchOption {
+	public fun <init> (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)V
+	public final fun getDescription ()Ljava/lang/String;
+	public final fun getKey ()Ljava/lang/String;
+	public final fun getRequired ()Z
+	public final fun getTitle ()Ljava/lang/String;
+	public final fun getValidate ()Lkotlin/jvm/functions/Function1;
+	public final fun getValue ()Ljava/lang/Object;
+	public final fun getValue (Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+	public final fun setValue (Ljava/lang/Object;)V
+	public final fun setValue (Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
+}
+
+public abstract class app/revanced/patcher/patch/options/PatchOptionException : java/lang/Exception {
+	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
+public final class app/revanced/patcher/patch/options/PatchOptionException$InvalidValueTypeException : app/revanced/patcher/patch/options/PatchOptionException {
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
+}
+
+public final class app/revanced/patcher/patch/options/PatchOptionException$PatchOptionNotFoundException : java/lang/Exception {
+	public fun <init> (Ljava/lang/String;)V
+}
+
+public final class app/revanced/patcher/patch/options/PatchOptionException$ValueRequiredException : java/lang/Exception {
+	public fun <init> (Lapp/revanced/patcher/patch/options/PatchOption;)V
+}
+
+public final class app/revanced/patcher/patch/options/PatchOptionException$ValueValidationException : java/lang/Exception {
+	public fun <init> (Ljava/lang/Object;Lapp/revanced/patcher/patch/options/PatchOption;)V
+}
+
+public final class app/revanced/patcher/patch/options/PatchOptions : java/util/Map, kotlin/jvm/internal/markers/KMutableMap {
+	public fun <init> ()V
+	public fun clear ()V
+	public final fun containsKey (Ljava/lang/Object;)Z
+	public fun containsKey (Ljava/lang/String;)Z
+	public fun containsValue (Lapp/revanced/patcher/patch/options/PatchOption;)Z
+	public final fun containsValue (Ljava/lang/Object;)Z
+	public final fun entrySet ()Ljava/util/Set;
+	public final fun get (Ljava/lang/Object;)Lapp/revanced/patcher/patch/options/PatchOption;
+	public final synthetic fun get (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun get (Ljava/lang/String;)Lapp/revanced/patcher/patch/options/PatchOption;
+	public fun getEntries ()Ljava/util/Set;
+	public fun getKeys ()Ljava/util/Set;
+	public fun getSize ()I
+	public fun getValues ()Ljava/util/Collection;
+	public fun isEmpty ()Z
+	public final fun keySet ()Ljava/util/Set;
+	public synthetic fun put (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun put (Ljava/lang/String;Lapp/revanced/patcher/patch/options/PatchOption;)Lapp/revanced/patcher/patch/options/PatchOption;
+	public fun putAll (Ljava/util/Map;)V
+	public final fun register (Lapp/revanced/patcher/patch/options/PatchOption;)V
+	public final fun remove (Ljava/lang/Object;)Lapp/revanced/patcher/patch/options/PatchOption;
+	public final synthetic fun remove (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun remove (Ljava/lang/String;)Lapp/revanced/patcher/patch/options/PatchOption;
+	public final fun size ()I
+	public final fun values ()Ljava/util/Collection;
+}
+
+public final class app/revanced/patcher/patch/options/types/BooleanPatchOption : app/revanced/patcher/patch/options/PatchOption {
+	public static final field Companion Lapp/revanced/patcher/patch/options/types/BooleanPatchOption$Companion;
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
+public final class app/revanced/patcher/patch/options/types/BooleanPatchOption$Companion {
+	public final fun booleanPatchOption (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/patch/options/types/BooleanPatchOption;
+	public static synthetic fun booleanPatchOption$default (Lapp/revanced/patcher/patch/options/types/BooleanPatchOption$Companion;Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/options/types/BooleanPatchOption;
+}
+
+public final class app/revanced/patcher/patch/options/types/FloatPatchOption : app/revanced/patcher/patch/options/PatchOption {
+	public static final field Companion Lapp/revanced/patcher/patch/options/types/FloatPatchOption$Companion;
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Float;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
+public final class app/revanced/patcher/patch/options/types/FloatPatchOption$Companion {
+	public final fun floatPatchOption (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;Ljava/lang/Float;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/patch/options/types/FloatPatchOption;
+	public static synthetic fun floatPatchOption$default (Lapp/revanced/patcher/patch/options/types/FloatPatchOption$Companion;Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;Ljava/lang/Float;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/options/types/FloatPatchOption;
+}
+
+public final class app/revanced/patcher/patch/options/types/IntPatchOption : app/revanced/patcher/patch/options/PatchOption {
+	public static final field Companion Lapp/revanced/patcher/patch/options/types/IntPatchOption$Companion;
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
+public final class app/revanced/patcher/patch/options/types/IntPatchOption$Companion {
+	public final fun intPatchOption (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/patch/options/types/IntPatchOption;
+	public static synthetic fun intPatchOption$default (Lapp/revanced/patcher/patch/options/types/IntPatchOption$Companion;Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/options/types/IntPatchOption;
+}
+
+public final class app/revanced/patcher/patch/options/types/LongPatchOption : app/revanced/patcher/patch/options/PatchOption {
+	public static final field Companion Lapp/revanced/patcher/patch/options/types/LongPatchOption$Companion;
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
+public final class app/revanced/patcher/patch/options/types/LongPatchOption$Companion {
+	public final fun longPatchOption (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/patch/options/types/LongPatchOption;
+	public static synthetic fun longPatchOption$default (Lapp/revanced/patcher/patch/options/types/LongPatchOption$Companion;Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/options/types/LongPatchOption;
+}
+
+public final class app/revanced/patcher/patch/options/types/StringPatchOption : app/revanced/patcher/patch/options/PatchOption {
+	public static final field Companion Lapp/revanced/patcher/patch/options/types/StringPatchOption$Companion;
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
+public final class app/revanced/patcher/patch/options/types/StringPatchOption$Companion {
+	public final fun stringPatchOption (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/patch/options/types/StringPatchOption;
+	public static synthetic fun stringPatchOption$default (Lapp/revanced/patcher/patch/options/types/StringPatchOption$Companion;Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/options/types/StringPatchOption;
+}
+
+public final class app/revanced/patcher/patch/options/types/array/BooleanArrayPatchOption : app/revanced/patcher/patch/options/PatchOption {
+	public static final field Companion Lapp/revanced/patcher/patch/options/types/array/BooleanArrayPatchOption$Companion;
+	public synthetic fun <init> (Ljava/lang/String;[Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
+public final class app/revanced/patcher/patch/options/types/array/BooleanArrayPatchOption$Companion {
+	public final fun booleanArrayPatchOption (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;[Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/patch/options/types/array/BooleanArrayPatchOption;
+	public static synthetic fun booleanArrayPatchOption$default (Lapp/revanced/patcher/patch/options/types/array/BooleanArrayPatchOption$Companion;Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;[Ljava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/options/types/array/BooleanArrayPatchOption;
+}
+
+public final class app/revanced/patcher/patch/options/types/array/FloatArrayPatchOption : app/revanced/patcher/patch/options/PatchOption {
+	public static final field Companion Lapp/revanced/patcher/patch/options/types/array/FloatArrayPatchOption$Companion;
+	public synthetic fun <init> (Ljava/lang/String;[Ljava/lang/Float;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
+public final class app/revanced/patcher/patch/options/types/array/FloatArrayPatchOption$Companion {
+	public final fun floatArrayPatchOption (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;[Ljava/lang/Float;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/patch/options/types/array/FloatArrayPatchOption;
+	public static synthetic fun floatArrayPatchOption$default (Lapp/revanced/patcher/patch/options/types/array/FloatArrayPatchOption$Companion;Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;[Ljava/lang/Float;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/options/types/array/FloatArrayPatchOption;
+}
+
+public final class app/revanced/patcher/patch/options/types/array/IntArrayPatchOption : app/revanced/patcher/patch/options/PatchOption {
+	public static final field Companion Lapp/revanced/patcher/patch/options/types/array/IntArrayPatchOption$Companion;
+	public synthetic fun <init> (Ljava/lang/String;[Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
+public final class app/revanced/patcher/patch/options/types/array/IntArrayPatchOption$Companion {
+	public final fun intArrayPatchOption (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;[Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/patch/options/types/array/IntArrayPatchOption;
+	public static synthetic fun intArrayPatchOption$default (Lapp/revanced/patcher/patch/options/types/array/IntArrayPatchOption$Companion;Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;[Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/options/types/array/IntArrayPatchOption;
+}
+
+public final class app/revanced/patcher/patch/options/types/array/LongArrayPatchOption : app/revanced/patcher/patch/options/PatchOption {
+	public static final field Companion Lapp/revanced/patcher/patch/options/types/array/LongArrayPatchOption$Companion;
+	public synthetic fun <init> (Ljava/lang/String;[Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
+public final class app/revanced/patcher/patch/options/types/array/LongArrayPatchOption$Companion {
+	public final fun longArrayPatchOption (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;[Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/patch/options/types/array/LongArrayPatchOption;
+	public static synthetic fun longArrayPatchOption$default (Lapp/revanced/patcher/patch/options/types/array/LongArrayPatchOption$Companion;Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;[Ljava/lang/Long;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/options/types/array/LongArrayPatchOption;
+}
+
+public final class app/revanced/patcher/patch/options/types/array/StringArrayPatchOption : app/revanced/patcher/patch/options/PatchOption {
+	public static final field Companion Lapp/revanced/patcher/patch/options/types/array/StringArrayPatchOption$Companion;
+	public synthetic fun <init> (Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
+public final class app/revanced/patcher/patch/options/types/array/StringArrayPatchOption$Companion {
+	public final fun stringArrayPatchOption (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/patch/options/types/array/StringArrayPatchOption;
+	public static synthetic fun stringArrayPatchOption$default (Lapp/revanced/patcher/patch/options/types/array/StringArrayPatchOption$Companion;Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/options/types/array/StringArrayPatchOption;
+}
+
+public final class app/revanced/patcher/util/DomFileEditor : java/io/Closeable {
+	public fun <init> (Ljava/io/File;)V
+	public fun close ()V
+	public final fun getFile ()Lorg/w3c/dom/Document;
+}
+
+public final class app/revanced/patcher/util/ProxyClassList : java/util/Set, kotlin/jvm/internal/markers/KMutableSet {
+	public final fun add (Lapp/revanced/patcher/util/proxy/ClassProxy;)Z
+	public fun add (Lcom/android/tools/smali/dexlib2/iface/ClassDef;)Z
+	public synthetic fun add (Ljava/lang/Object;)Z
+	public fun addAll (Ljava/util/Collection;)Z
+	public fun clear ()V
+	public fun contains (Lcom/android/tools/smali/dexlib2/iface/ClassDef;)Z
+	public final fun contains (Ljava/lang/Object;)Z
+	public fun containsAll (Ljava/util/Collection;)Z
+	public fun getSize ()I
+	public fun isEmpty ()Z
+	public fun iterator ()Ljava/util/Iterator;
+	public fun remove (Lcom/android/tools/smali/dexlib2/iface/ClassDef;)Z
+	public final fun remove (Ljava/lang/Object;)Z
+	public fun removeAll (Ljava/util/Collection;)Z
+	public fun retainAll (Ljava/util/Collection;)Z
+	public final fun size ()I
+	public fun toArray ()[Ljava/lang/Object;
+	public fun toArray ([Ljava/lang/Object;)[Ljava/lang/Object;
+}
+
+public final class app/revanced/patcher/util/method/MethodWalker {
+	public final fun getMethod ()Lcom/android/tools/smali/dexlib2/iface/Method;
+	public final fun nextMethod (IZ)Lapp/revanced/patcher/util/method/MethodWalker;
+	public static synthetic fun nextMethod$default (Lapp/revanced/patcher/util/method/MethodWalker;IZILjava/lang/Object;)Lapp/revanced/patcher/util/method/MethodWalker;
+}
+
+public final class app/revanced/patcher/util/proxy/ClassProxy {
+	public final fun getImmutableClass ()Lcom/android/tools/smali/dexlib2/iface/ClassDef;
+	public final fun getMutableClass ()Lapp/revanced/patcher/util/proxy/mutableTypes/MutableClass;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation : com/android/tools/smali/dexlib2/base/BaseAnnotation {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/Annotation;)V
+	public fun getElements ()Ljava/util/Set;
+	public fun getType ()Ljava/lang/String;
+	public fun getVisibility ()I
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/Annotation;)Lapp/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement : com/android/tools/smali/dexlib2/base/BaseAnnotationElement {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/AnnotationElement;)V
+	public fun getName ()Ljava/lang/String;
+	public fun getValue ()Lcom/android/tools/smali/dexlib2/iface/value/EncodedValue;
+	public final fun setName (Ljava/lang/String;)V
+	public final fun setValue (Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue;)V
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/AnnotationElement;)Lapp/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/MutableClass : com/android/tools/smali/dexlib2/base/reference/BaseTypeReference, com/android/tools/smali/dexlib2/iface/ClassDef {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/MutableClass$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/ClassDef;)V
+	public final fun charAt (I)C
+	public fun get (I)C
+	public fun getAccessFlags ()I
+	public fun getAnnotations ()Ljava/util/Set;
+	public synthetic fun getDirectMethods ()Ljava/lang/Iterable;
+	public fun getDirectMethods ()Ljava/util/Set;
+	public synthetic fun getFields ()Ljava/lang/Iterable;
+	public fun getFields ()Ljava/util/Set;
+	public synthetic fun getInstanceFields ()Ljava/lang/Iterable;
+	public fun getInstanceFields ()Ljava/util/Set;
+	public fun getInterfaces ()Ljava/util/List;
+	public fun getLength ()I
+	public synthetic fun getMethods ()Ljava/lang/Iterable;
+	public fun getMethods ()Ljava/util/Set;
+	public fun getSourceFile ()Ljava/lang/String;
+	public synthetic fun getStaticFields ()Ljava/lang/Iterable;
+	public fun getStaticFields ()Ljava/util/Set;
+	public fun getSuperclass ()Ljava/lang/String;
+	public fun getType ()Ljava/lang/String;
+	public synthetic fun getVirtualMethods ()Ljava/lang/Iterable;
+	public fun getVirtualMethods ()Ljava/util/Set;
+	public final fun length ()I
+	public final fun setAccessFlags (I)V
+	public final fun setSourceFile (Ljava/lang/String;)V
+	public final fun setSuperClass (Ljava/lang/String;)V
+	public final fun setType (Ljava/lang/String;)V
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/MutableClass$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/ClassDef;)Lapp/revanced/patcher/util/proxy/mutableTypes/MutableClass;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/MutableField : com/android/tools/smali/dexlib2/base/reference/BaseFieldReference, com/android/tools/smali/dexlib2/iface/Field {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/MutableField$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/Field;)V
+	public fun getAccessFlags ()I
+	public fun getAnnotations ()Ljava/util/Set;
+	public fun getDefiningClass ()Ljava/lang/String;
+	public fun getHiddenApiRestrictions ()Ljava/util/Set;
+	public fun getInitialValue ()Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue;
+	public synthetic fun getInitialValue ()Lcom/android/tools/smali/dexlib2/iface/value/EncodedValue;
+	public fun getName ()Ljava/lang/String;
+	public fun getType ()Ljava/lang/String;
+	public final fun setAccessFlags (I)V
+	public final fun setDefiningClass (Ljava/lang/String;)V
+	public final fun setInitialValue (Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue;)V
+	public final fun setName (Ljava/lang/String;)V
+	public final fun setType (Ljava/lang/String;)V
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/MutableField$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/Field;)Lapp/revanced/patcher/util/proxy/mutableTypes/MutableField;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/MutableMethod : com/android/tools/smali/dexlib2/base/reference/BaseMethodReference, com/android/tools/smali/dexlib2/iface/Method {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/Method;)V
+	public fun getAccessFlags ()I
+	public fun getAnnotations ()Ljava/util/Set;
+	public fun getDefiningClass ()Ljava/lang/String;
+	public fun getHiddenApiRestrictions ()Ljava/util/Set;
+	public fun getImplementation ()Lcom/android/tools/smali/dexlib2/builder/MutableMethodImplementation;
+	public synthetic fun getImplementation ()Lcom/android/tools/smali/dexlib2/iface/MethodImplementation;
+	public fun getName ()Ljava/lang/String;
+	public fun getParameterTypes ()Ljava/util/List;
+	public fun getParameters ()Ljava/util/List;
+	public fun getReturnType ()Ljava/lang/String;
+	public final fun setAccessFlags (I)V
+	public final fun setDefiningClass (Ljava/lang/String;)V
+	public final fun setName (Ljava/lang/String;)V
+	public final fun setReturnType (Ljava/lang/String;)V
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/MutableMethod$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/Method;)Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter : com/android/tools/smali/dexlib2/base/BaseMethodParameter, com/android/tools/smali/dexlib2/iface/MethodParameter {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/MethodParameter;)V
+	public final fun charAt (I)C
+	public fun get (I)C
+	public fun getAnnotations ()Ljava/util/Set;
+	public fun getLength ()I
+	public fun getName ()Ljava/lang/String;
+	public fun getSignature ()Ljava/lang/String;
+	public fun getType ()Ljava/lang/String;
+	public final fun length ()I
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/MethodParameter;)Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseAnnotationEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/AnnotationEncodedValue;)V
+	public fun getElements ()Ljava/util/Set;
+	public fun getType ()Ljava/lang/String;
+	public final fun setType (Ljava/lang/String;)V
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/AnnotationEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseArrayEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/ArrayEncodedValue;)V
+	public fun getValue ()Ljava/util/List;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/ArrayEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseBooleanEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/BooleanEncodedValue;)V
+	public fun getValue ()Z
+	public final fun setValue (Z)V
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/BooleanEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseByteEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/ByteEncodedValue;)V
+	public fun getValue ()B
+	public final fun setValue (B)V
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/ByteEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseCharEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/CharEncodedValue;)V
+	public fun getValue ()C
+	public final fun setValue (C)V
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/CharEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseDoubleEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/DoubleEncodedValue;)V
+	public fun getValue ()D
+	public final fun setValue (D)V
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/DoubleEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue;
+}
+
+public abstract interface class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue : com/android/tools/smali/dexlib2/iface/value/EncodedValue {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue$Companion;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/EncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEnumEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseEnumEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEnumEncodedValue$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/EnumEncodedValue;)V
+	public fun getValue ()Lcom/android/tools/smali/dexlib2/iface/reference/FieldReference;
+	public final fun setValue (Lcom/android/tools/smali/dexlib2/iface/reference/FieldReference;)V
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEnumEncodedValue$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/EnumEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEnumEncodedValue;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFieldEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseFieldEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFieldEncodedValue$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/FieldEncodedValue;)V
+	public fun getValue ()Lcom/android/tools/smali/dexlib2/iface/reference/FieldReference;
+	public fun getValueType ()I
+	public final fun setValue (Lcom/android/tools/smali/dexlib2/iface/reference/FieldReference;)V
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFieldEncodedValue$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/FieldEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFieldEncodedValue;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFloatEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseFloatEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFloatEncodedValue$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/FloatEncodedValue;)V
+	public fun getValue ()F
+	public final fun setValue (F)V
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFloatEncodedValue$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/FloatEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFloatEncodedValue;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableIntEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseIntEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableIntEncodedValue$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/IntEncodedValue;)V
+	public fun getValue ()I
+	public final fun setValue (I)V
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableIntEncodedValue$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/IntEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableIntEncodedValue;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableLongEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseLongEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableLongEncodedValue$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/LongEncodedValue;)V
+	public fun getValue ()J
+	public final fun setValue (J)V
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableLongEncodedValue$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/LongEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableLongEncodedValue;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseMethodEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodEncodedValue$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/MethodEncodedValue;)V
+	public fun getValue ()Lcom/android/tools/smali/dexlib2/iface/reference/MethodReference;
+	public final fun setValue (Lcom/android/tools/smali/dexlib2/iface/reference/MethodReference;)V
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodEncodedValue$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/MethodEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodEncodedValue;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodHandleEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseMethodHandleEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodHandleEncodedValue$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/MethodHandleEncodedValue;)V
+	public fun getValue ()Lcom/android/tools/smali/dexlib2/iface/reference/MethodHandleReference;
+	public final fun setValue (Lcom/android/tools/smali/dexlib2/iface/reference/MethodHandleReference;)V
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodHandleEncodedValue$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/MethodHandleEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodHandleEncodedValue;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodTypeEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseMethodTypeEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodTypeEncodedValue$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/MethodTypeEncodedValue;)V
+	public fun getValue ()Lcom/android/tools/smali/dexlib2/iface/reference/MethodProtoReference;
+	public final fun setValue (Lcom/android/tools/smali/dexlib2/iface/reference/MethodProtoReference;)V
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodTypeEncodedValue$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/MethodTypeEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodTypeEncodedValue;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableNullEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseNullEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableNullEncodedValue$Companion;
+	public fun <init> ()V
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableNullEncodedValue$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/ByteEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableShortEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseShortEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableShortEncodedValue$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/ShortEncodedValue;)V
+	public fun getValue ()S
+	public final fun setValue (S)V
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableShortEncodedValue$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/ShortEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableShortEncodedValue;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableStringEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseStringEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableStringEncodedValue$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/StringEncodedValue;)V
+	public fun getValue ()Ljava/lang/String;
+	public final fun setValue (Ljava/lang/String;)V
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableStringEncodedValue$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/ByteEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue;
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableTypeEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseTypeEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
+	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableTypeEncodedValue$Companion;
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/TypeEncodedValue;)V
+	public fun getValue ()Ljava/lang/String;
+	public final fun setValue (Ljava/lang/String;)V
+}
+
+public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableTypeEncodedValue$Companion {
+	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/TypeEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableTypeEncodedValue;
+}
+
+public final class app/revanced/patcher/util/smali/ExternalLabel {
+	public fun <init> (Ljava/lang/String;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;)V
+	public final fun copy (Ljava/lang/String;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;)Lapp/revanced/patcher/util/smali/ExternalLabel;
+	public static synthetic fun copy$default (Lapp/revanced/patcher/util/smali/ExternalLabel;Ljava/lang/String;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;ILjava/lang/Object;)Lapp/revanced/patcher/util/smali/ExternalLabel;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class app/revanced/patcher/util/smali/InlineSmaliCompiler {
+	public static final field Companion Lapp/revanced/patcher/util/smali/InlineSmaliCompiler$Companion;
+	public fun <init> ()V
+}
+
+public final class app/revanced/patcher/util/smali/InlineSmaliCompiler$Companion {
+	public final fun compile (Ljava/lang/String;Ljava/lang/String;IZ)Ljava/util/List;
+}
+
+public final class app/revanced/patcher/util/smali/InlineSmaliCompilerKt {
+	public static final fun toInstruction (Ljava/lang/String;Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;)Lcom/android/tools/smali/dexlib2/builder/BuilderInstruction;
+	public static synthetic fun toInstruction$default (Ljava/lang/String;Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILjava/lang/Object;)Lcom/android/tools/smali/dexlib2/builder/BuilderInstruction;
+	public static final fun toInstructions (Ljava/lang/String;Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;)Ljava/util/List;
+	public static synthetic fun toInstructions$default (Ljava/lang/String;Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILjava/lang/Object;)Ljava/util/List;
+}
+
--- a/revanced-patcher/build.gradle.kts
+++ b/revanced-patcher/build.gradle.kts
@@ -1,22 +1,19 @@
 plugins {
-    kotlin("jvm")
-    `maven-publish`
+    kotlin("jvm") version "1.9.0"
 }

-group = "app.revanced"
-
 dependencies {
-    implementation("xpp3:xpp3:1.1.4c")
-    implementation("app.revanced:smali:2.5.3-a3836654")
-    implementation("app.revanced:multidexlib2:2.5.3-a3836654")
-    implementation("io.github.reandroid:ARSCLib:1.1.7")
-    implementation(project(":arsclib-utils"))
+    implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.xpp3)
+    implementation(libs.smali)
+    implementation(libs.multidexlib2)
+    implementation(libs.apktool.lib)
+    implementation(libs.kotlin.reflect)

-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC")
-    testImplementation("org.jetbrains.kotlin:kotlin-test:1.8.20-RC")
+    compileOnly(libs.android)

-    compileOnly("com.google.android:android:4.1.1.4")
+    testImplementation(project(":revanced-patch-annotations-processor"))
+    testImplementation(libs.kotlin.test)
 }

 tasks {
@@ -26,36 +23,60 @@ tasks {
            events("PASSED", "SKIPPED", "FAILED")
        }
    }
+
    processResources {
        expand("projectVersion" to project.version)
    }
 }

+kotlin { jvmToolchain(11) }
+
 java {
    withSourcesJar()
 }

-kotlin {
-    jvmToolchain(11)
-}
-
 publishing {
    repositories {
-        if (System.getenv("GITHUB_ACTOR") != null)
-            maven {
-                name = "GitHubPackages"
-                url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
-                credentials {
-                    username = System.getenv("GITHUB_ACTOR")
-                    password = System.getenv("GITHUB_TOKEN")
-                }
+        mavenLocal()
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
+            credentials {
+                username = System.getenv("GITHUB_ACTOR")
+                password = System.getenv("GITHUB_TOKEN")
            }
-        else
-            mavenLocal()
+        }
    }
    publications {
-        register<MavenPublication>("gpr") {
+        create<MavenPublication>("gpr") {
            from(components["java"])
+
+            version = project.version.toString()
+
+            pom {
+                name = "ReVanced Patcher"
+                description = "Patcher used by ReVanced."
+                url = "https://revanced.app"
+
+                licenses {
+                    license {
+                        name = "GNU General Public License v3.0"
+                        url = "https://www.gnu.org/licenses/gpl-3.0.en.html"
+                    }
+                }
+                developers {
+                    developer {
+                        id = "ReVanced"
+                        name = "ReVanced"
+                        email = "contact@revanced.app"
+                    }
+                }
+                scm {
+                    connection = "scm:git:git://github.com/revanced/revanced-patcher.git"
+                    developerConnection = "scm:git:git@github.com:revanced/revanced-patcher.git"
+                    url = "https://github.com/revanced/revanced-patcher"
+                }
+            }
        }
    }
 }
--- a/revanced-patcher/settings.gradle.kts
+++ b/revanced-patcher/settings.gradle.kts
@@ -1 +1 @@
-rootProject.name = "revanced-patcher"
+rootProject.name = "revanced-patcher"
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/Context.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/Context.kt
@@ -1,113 +0,0 @@
-package app.revanced.patcher
-
-import app.revanced.arsc.resource.ResourceContainer
-import app.revanced.patcher.apk.Apk
-import app.revanced.patcher.apk.ApkBundle
-import app.revanced.arsc.resource.ResourceFiles
-import app.revanced.patcher.util.method.MethodWalker
-import org.jf.dexlib2.iface.Method
-import org.w3c.dom.Document
-import java.io.Closeable
-import java.io.InputStream
-import java.io.StringWriter
-import javax.xml.parsers.DocumentBuilderFactory
-import javax.xml.transform.TransformerFactory
-import javax.xml.transform.dom.DOMSource
-import javax.xml.transform.stream.StreamResult
-
-/**
- * A common class to constrain [Context] to [BytecodeContext] and [ResourceContext].
- * @param apkBundle The [ApkBundle] for this context.
- */
-sealed class Context(val apkBundle: ApkBundle)
-
-/**
- * A context for the bytecode of an [Apk.Base] file.
- *
- * @param apkBundle The [ApkBundle] for this context.
- */
-class BytecodeContext internal constructor(apkBundle: ApkBundle) : Context(apkBundle) {
-    /**
-     * The list of classes.
-     */
-    val classes = apkBundle.base.bytecodeData.classes
-
-    /**
-     * Create a [MethodWalker] instance for the current [BytecodeContext].
-     *
-     * @param startMethod The method to start at.
-     * @return A [MethodWalker] instance.
-     */
-    fun traceMethodCalls(startMethod: Method) = MethodWalker(this, startMethod)
-}
-
-/**
- * A context for [Apk] file resources.
- *
- * @param apkBundle the [ApkBundle] for this context.
- */
-class ResourceContext internal constructor(apkBundle: ApkBundle) : Context(apkBundle) {
-
-    /**
-     * Open an [DomFileEditor] for a given DOM file.
-     *
-     * @param inputStream The input stream to read the DOM file from.
-     * @return A [DomFileEditor] instance.
-     */
-    fun openXmlFile(inputStream: InputStream) = DomFileEditor(inputStream)
-}
-
-
-/**
- * Open a [DomFileEditor] for a resource file in the archive.
- *
- * @see [ResourceContainer.openFile]
- * @param path The resource file path.
- * @return A [DomFileEditor].
- */
-fun ResourceContainer.openXmlFile(path: String) = DomFileEditor(openFile(path))
-
-/**
- * Wrapper for a file that can be edited as a dom document.
- *
- * @param inputStream the input stream to read the xml file from.
- * @param onSave A callback that will be called when the editor is closed to save the file.
- */
-class DomFileEditor internal constructor(
-    private val inputStream: InputStream,
-    private val onSave: ((String) -> Unit)? = null
-) : Closeable {
-    private var closed: Boolean = false
-
-    /**
-     * The document of the xml file.
-     */
-    val file: Document = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(inputStream)
-        .also(Document::normalize)
-
-    internal constructor(file: ResourceFiles) : this(
-        file.inputStream(),
-        {
-            file.contents = it.toByteArray()
-            file.close()
-        }
-    )
-
-    /**
-     * Closes the editor and writes back to the file.
-     */
-    override fun close() {
-        if (closed) return
-
-        inputStream.close()
-
-        onSave?.let { callback ->
-            // Save the updated file.
-            val writer = StringWriter()
-            TransformerFactory.newInstance().newTransformer().transform(DOMSource(file), StreamResult(writer))
-            callback(writer.toString())
-        }
-
-        closed = true
-    }
-}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/IntegrationsConsumer.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/IntegrationsConsumer.kt
@@ -0,0 +1,8 @@
+package app.revanced.patcher
+
+import java.io.File
+
+@FunctionalInterface
+interface IntegrationsConsumer {
+    fun acceptIntegrations(integrations: List<File>)
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/PackageMetadata.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/PackageMetadata.kt
@@ -0,0 +1,14 @@
+package app.revanced.patcher
+
+import brut.androlib.apk.ApkInfo
+
+/**
+ * Metadata about a package.
+ */
+class PackageMetadata internal constructor(internal val apkInfo: ApkInfo) {
+    lateinit var packageName: String
+        internal set
+
+    lateinit var packageVersion: String
+        internal set
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/PatchBundleLoader.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/PatchBundleLoader.kt
@@ -0,0 +1,124 @@
+@file:Suppress("unused")
+
+package app.revanced.patcher
+
+import app.revanced.patcher.patch.Patch
+import dalvik.system.DexClassLoader
+import lanchon.multidexlib2.BasicDexFileNamer
+import lanchon.multidexlib2.MultiDexIO
+import java.io.File
+import java.net.URLClassLoader
+import java.util.jar.JarFile
+import java.util.logging.Logger
+import kotlin.reflect.KClass
+
+/**
+ * [Patch]es mapped by their name.
+ */
+typealias PatchMap = Map<String, Patch<*>>
+
+/**
+ * A [Patch] class.
+ */
+typealias PatchClass = KClass<out Patch<*>>
+
+/**
+ * A loader of [Patch]es from patch bundles.
+ * This will load all [Patch]es from the given patch bundles that have a name.
+ *
+ * @param getBinaryClassNames A function that returns the binary names of all classes in a patch bundle.
+ * @param classLoader The [ClassLoader] to use for loading the classes.
+ */
+sealed class PatchBundleLoader private constructor(
+    classLoader: ClassLoader,
+    patchBundles: Array<out File>,
+    getBinaryClassNames: (patchBundle: File) -> List<String>,
+) : PatchMap by mutableMapOf() {
+    private val logger = Logger.getLogger(PatchBundleLoader::class.java.name)
+
+    init {
+        patchBundles.flatMap(getBinaryClassNames).asSequence().map {
+            classLoader.loadClass(it)
+        }.filter {
+            it.isInstance(Patch::class.java)
+        }.mapNotNull { patchClass ->
+            patchClass.getInstance(logger)
+        }.filter {
+            it.name != null
+        }.associateBy {
+            it.name!!
+        }.let { patches ->
+            @Suppress("UNCHECKED_CAST")
+            (this as MutableMap<String, Patch<*>>).putAll(patches)
+        }
+    }
+
+    internal companion object Utils {
+        /**
+         * Instantiates a [Patch]. If the class is a singleton, the INSTANCE field will be used.
+         *
+         * @param logger The [Logger] to use for logging.
+         * @return The instantiated [Patch] or `null` if the [Patch] could not be instantiated.
+         */
+        internal fun Class<*>.getInstance(logger: Logger): Patch<*>? {
+            return try {
+                getField("INSTANCE").get(null)
+            } catch (exception: NoSuchFileException) {
+                logger.fine(
+                    "Patch class '${name}' has no INSTANCE field, therefor not a singleton. " +
+                            "Will try to instantiate it."
+                )
+
+                try {
+                    getDeclaredConstructor().newInstance()
+                } catch (exception: Exception) {
+                    logger.severe(
+                        "Patch class '${name}' is not singleton and has no suitable constructor, " +
+                                "therefor cannot be instantiated and will be ignored."
+                    )
+
+                    return null
+                }
+            } as Patch<*>
+        }
+    }
+
+    /**
+     * A [PatchBundleLoader] for JAR files.
+     *
+     * @param patchBundles The path to patch bundles of JAR format.
+     */
+    class Jar(vararg patchBundles: File) : PatchBundleLoader(
+        URLClassLoader(patchBundles.map { it.toURI().toURL() }.toTypedArray()),
+        patchBundles,
+        { patchBundle ->
+            JarFile(patchBundle).entries().toList().filter { it.name.endsWith(".class") }
+                .map { it.name.replace('/', '.').replace(".class", "") }
+        }
+    )
+
+    /**
+     * A [PatchBundleLoader] for [Dex] files.
+     *
+     * @param patchBundles The path to patch bundles of DEX format.
+     * @param optimizedDexDirectory The directory to store optimized DEX files in.
+     * This parameter is deprecated and has no effect since API level 26.
+     */
+    class Dex(vararg patchBundles: File, optimizedDexDirectory: File? = null) : PatchBundleLoader(
+        DexClassLoader(
+            patchBundles.joinToString(File.pathSeparator) { it.absolutePath }, optimizedDexDirectory?.absolutePath,
+            null,
+            PatchBundleLoader::class.java.classLoader
+        ),
+        patchBundles,
+        { patchBundle ->
+            MultiDexIO.readDexFile(true, patchBundle, BasicDexFileNamer(), null, null).classes
+                .map { classDef ->
+                    classDef.type.substring(1, classDef.length - 1)
+                }
+        }
+    ) {
+        @Deprecated("This constructor is deprecated. Use the constructor with the second parameter instead.")
+        constructor(vararg patchBundles: File) : this(*patchBundles, optimizedDexDirectory = null)
+    }
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/PatchExecutorFunction.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/PatchExecutorFunction.kt
@@ -0,0 +1,8 @@
+package app.revanced.patcher
+
+import app.revanced.patcher.patch.PatchResult
+import kotlinx.coroutines.flow.Flow
+import java.util.function.Function
+
+@FunctionalInterface
+interface PatchExecutorFunction : Function<Boolean, Flow<PatchResult>>
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/Patcher.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/Patcher.kt
@@ -1,222 +1,276 @@
 package app.revanced.patcher

-import app.revanced.patcher.apk.Apk
-import app.revanced.patcher.extensions.PatchExtensions.dependencies
-import app.revanced.patcher.extensions.PatchExtensions.patchName
-import app.revanced.patcher.extensions.PatchExtensions.requiresIntegrations
+import app.revanced.patcher.PatchBundleLoader.Utils.getInstance
+import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolveUsingLookupMap
 import app.revanced.patcher.patch.*
-import app.revanced.patcher.util.VersionReader
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import lanchon.multidexlib2.BasicDexFileNamer
 import java.io.Closeable
 import java.io.File
-import java.util.function.Function
-
-typealias ExecutedPatchResults = Flow<Pair<String, PatchException?>>
+import java.util.function.Supplier
+import java.util.logging.Level
+import java.util.logging.LogManager
+import java.util.logging.Logger

 /**
- * The ReVanced Patcher.
+ * ReVanced Patcher.
+ *
 * @param options The options for the patcher.
- * @param patches The patches to use.
- * @param integrations The integrations to merge if necessary. Must be dex files or dex file container such as ZIP, APK or DEX files.
 */
-class Patcher(private val options: PatcherOptions, patches: Iterable<PatchClass>, integrations: Iterable<File>) :
-    Function<Boolean, ExecutedPatchResults> {
-    private val context = PatcherContext(options, patches.toList(), integrations)
-    private val logger = options.logger
+class Patcher(
+    private val options: PatcherOptions
+) : PatchExecutorFunction, PatchesConsumer, IntegrationsConsumer, Supplier<PatcherResult>, Closeable {
+    private val logger = Logger.getLogger(Patcher::class.java.name)

-    companion object {
-        /**
-         * The version of the ReVanced Patcher.
-         */
-        @JvmStatic
-        val version = VersionReader.read()
-
-        @Suppress("SpellCheckingInspection")
-        internal val dexFileNamer = BasicDexFileNamer()
-    }
+    /**
+     * The context of ReVanced [Patcher].
+     * This holds the current state of the patcher.
+     */
+    val context = PatcherContext(options)

    init {
-        /**
-         * Returns true if at least one patches or its dependencies matches the given predicate.
-         */
-        fun PatchClass.anyRecursively(predicate: (PatchClass) -> Boolean): Boolean =
-            predicate(this) || dependencies?.any { it.java.anyRecursively(predicate) } == true
+        LogManager.getLogManager().let { manager ->
+            // Disable root logger.
+            manager.getLogger("").level = Level.OFF

-        // Determine if merging integrations is required.
-        for (patch in context.patches) {
-            if (patch.anyRecursively { it.requiresIntegrations }) {
-                context.integrations.merge = true
-                break
+            // Enable ReVanced logging only.
+            manager.loggerNames
+                .toList()
+                .filter { it.startsWith("app.revanced") }
+                .map { manager.getLogger(it) }
+                .forEach { it.level = Level.INFO }
+        }
+
+        context.resourceContext.decodeResources(ResourceContext.ResourceDecodingMode.MANIFEST_ONLY)
+    }
+
+    // TODO: Fix circular dependency detection.
+    // /**
+    //  * Add [Patch]es to ReVanced [Patcher].
+    //  * It is not guaranteed that all supplied [Patch]es will be accepted, if an exception is thrown.
+    //  *
+    //  * @param patches The [Patch]es to add.
+    //  * @throws PatcherException.CircularDependencyException If a circular dependency is detected.
+    // */
+    /**
+     * Add [Patch]es to ReVanced [Patcher].
+     *
+     * @param patches The [Patch]es to add.
+    */
+    @Suppress("NAME_SHADOWING")
+    override fun acceptPatches(patches: List<Patch<*>>) {
+        /**
+         * Add dependencies of a [Patch] recursively to [PatcherContext.allPatches].
+         * If a [Patch] is already in [PatcherContext.allPatches], it will not be added again.
+         */
+        fun PatchClass.putDependenciesRecursively() {
+            if (context.allPatches.contains(this)) return
+
+            val dependency = this.java.getInstance(logger)!!
+            context.allPatches[this] = dependency
+
+            dependency.dependencies?.forEach { it.putDependenciesRecursively() }
+        }
+
+        // Add all patches and their dependencies to the context.
+        for (patch in patches) context.executablePatches.putIfAbsent(patch::class, patch) ?: {
+            context.allPatches[patch::class] = patch
+
+            patch.dependencies?.forEach { it.putDependenciesRecursively() }
+        }
+
+        /* TODO: Fix circular dependency detection.
+        val graph = mutableMapOf<PatchClass, MutableList<PatchClass>>()
+        fun PatchClass.visit() {
+            if (this in graph) return
+
+            val group = graph.getOrPut(this) { mutableListOf(this) }
+
+            val dependencies = context.allPatches[this]!!.manifest.dependencies ?: return
+            dependencies.forEach { dependency ->
+                if (group == graph[dependency])
+                    throw PatcherException.CircularDependencyException(context.allPatches[this]!!.manifest.name)
+
+                graph[dependency] = group.apply { add(dependency) }
+                dependency.visit()
            }
        }
+        */
+
+        /**
+         * Returns true if at least one patch or its dependencies matches the given predicate.
+         *
+         * @param predicate The predicate to match.
+         */
+        fun Patch<*>.anyRecursively(predicate: (Patch<*>) -> Boolean): Boolean =
+            predicate(this) || dependencies?.any { dependency ->
+                context.allPatches[dependency]!!.anyRecursively(predicate)
+            } ?: false
+
+        context.allPatches.values.let { patches ->
+            // Determine, if resource patching is required.
+            for (patch in patches)
+                if (patch.anyRecursively { patch is ResourcePatch }) {
+                    options.resourceDecodingMode = ResourceContext.ResourceDecodingMode.FULL
+                    break
+                }
+
+            // Determine, if merging integrations is required.
+            for (patch in patches)
+                if (!patch.anyRecursively { it.requiresIntegrations }) {
+                    context.bytecodeContext.integrations.merge = true
+                    break
+                }
+        }
    }

    /**
-     * Execute the patcher.
+     * Add integrations to the [Patcher].
     *
-     * @param stopOnError If true, the patches will stop on the first error.
-     * @return A pair of the name of the [Patch] and a [PatchException] if it failed.
+     * @param integrations The integrations to add. Must be a DEX file or container of DEX files.
     */
-    override fun apply(stopOnError: Boolean) = flow {
+    override fun acceptIntegrations(integrations: List<File>) {
+        context.bytecodeContext.integrations.addAll(integrations)
+    }
+
+    /**
+     * Execute [Patch]es that were added to ReVanced [Patcher].
+     *
+     * @param returnOnError If true, ReVanced [Patcher] will return immediately if a [Patch] fails.
+     * @return A pair of the name of the [Patch] and its [PatchResult].
+     */
+    override fun apply(returnOnError: Boolean) = flow {
+
        /**
         * Execute a [Patch] and its dependencies recursively.
         *
-         * @param patchClass The [Patch] to execute.
-         * @param executedPatches A map of [Patch]es paired to a boolean indicating their success, to prevent infinite recursion.
+         * @param patch The [Patch] to execute.
+         * @param executedPatches A map to prevent [Patch]es from being executed twice due to dependencies.
+         * @return The result of executing the [Patch].
         */
-        suspend fun executePatch(
-            patchClass: PatchClass,
-            executedPatches: HashMap<String, ExecutedPatch>
-        ) {
-            val patchName = patchClass.patchName
+        fun executePatch(
+            patch: Patch<*>,
+            executedPatches: LinkedHashMap<Patch<*>, PatchResult>
+        ): PatchResult {
+            val patchName = patch.name

-            // If the patch has already executed silently skip it.
-            if (executedPatches.contains(patchName)) {
-                if (!executedPatches[patchName]!!.success)
-                    throw PatchException("'$patchName' did not succeed previously")
+            executedPatches[patch]?.let { patchResult ->
+                patchResult.exception ?: return patchResult

-                logger.trace("Skipping '$patchName' because it has already been executed")
-
-                return
+                // Return a new result with an exception indicating that the patch was not executed previously,
+                // because it is a dependency of another patch that failed.
+                return PatchResult(patch, PatchException("'$patchName' did not succeed previously"))
            }

            // Recursively execute all dependency patches.
-            patchClass.dependencies?.forEach { dependencyClass ->
-                val dependency = dependencyClass.java
+            patch.dependencies?.forEach { dependencyName ->
+                val dependency = context.executablePatches[dependencyName]!!
+                val result = executePatch(dependency, executedPatches)

-                try {
-                    executePatch(dependency, executedPatches)
-                } catch (throwable: Throwable) {
-                    throw PatchException(
-                        "'$patchName' depends on '${dependency.patchName}' " +
-                                "but the following exception was raised: ${throwable.cause?.stackTraceToString() ?: throwable.message}",
-                        throwable
+                result.exception?.let {
+                    return PatchResult(
+                        patch,
+                        PatchException("'$patchName' depends on '${dependency}' that raised an exception: $it")
                    )
                }
            }

-            val isResourcePatch = ResourcePatch::class.java.isAssignableFrom(patchClass)
-            val patchInstance = patchClass.getDeclaredConstructor().newInstance()
-
-            // TODO: implement this in a more polymorphic way.
-            val patchContext = if (isResourcePatch) {
-                context.resourceContext
-            } else {
-                context.bytecodeContext.apply {
-                    val bytecodePatch = patchInstance as BytecodePatch
-                    bytecodePatch.fingerprints?.resolveUsingLookupMap(context.bytecodeContext)
+            return try {
+                // TODO: Implement this in a more polymorphic way.
+                when (patch) {
+                    is BytecodePatch -> {
+                        patch.fingerprints.toList().resolveUsingLookupMap(context.bytecodeContext)
+                        patch.execute(context.bytecodeContext)
+                    }
+                    is ResourcePatch -> {
+                        patch.execute(context.resourceContext)
+                    }
                }
-            }

-            logger.trace("Executing '$patchName' of type: ${if (isResourcePatch) "resource" else "bytecode"}")
-
-            var success = false
-            try {
-                patchInstance.execute(patchContext)
-
-                success = true
-            } catch (patchException: PatchException) {
-                throw patchException
-            } catch (throwable: Throwable) {
-                throw PatchException("Unhandled patch exception: ${throwable.message}", throwable)
-            } finally {
-                executedPatches[patchName] = ExecutedPatch(patchInstance, success)
-            }
+                PatchResult(patch)
+            } catch (exception: PatchException) {
+                PatchResult(patch, exception)
+            } catch (exception: Exception) {
+                PatchResult(patch, PatchException(exception))
+            }.also { executedPatches[patch] = it }
        }

-        if (context.integrations.merge) context.integrations.merge(logger)
-
-        logger.trace("Initialize lookup maps for method MethodFingerprint resolution")
+        if (context.bytecodeContext.integrations.merge) context.bytecodeContext.integrations.flush()

        MethodFingerprint.initializeFingerprintResolutionLookupMaps(context.bytecodeContext)

+        // Prevent from decoding the app manifest twice if it is not needed.
+        if (options.resourceDecodingMode == ResourceContext.ResourceDecodingMode.FULL)
+            context.resourceContext.decodeResources(ResourceContext.ResourceDecodingMode.FULL)
+
        logger.info("Executing patches")

-        // Key is patch name.
-        LinkedHashMap<String, ExecutedPatch>().apply {
-            context.patches.forEach { patch ->
-                var exception: PatchException? = null
+        val executedPatches = LinkedHashMap<Patch<*>, PatchResult>() // Key is name.

-                try {
-                    executePatch(patch, this)
-                } catch (patchException: PatchException) {
-                    exception = patchException
-                }
+        context.executablePatches.map { it.value }.sortedBy { it.name }.forEach { patch ->
+            val patchResult = executePatch(patch, executedPatches)

-                // TODO: only emit if the patch is not a closeable.
-                //  If it is a closeable, this should be done when closing the patch.
-                emit(patch.patchName to exception)
+            // If the patch failed, emit the result, even if it is closeable.
+            // Results of executed patches that are closeable will be emitted later.
+            patchResult.exception?.let {
+                // Propagate exception to caller instead of wrapping it in a new exception.
+                emit(patchResult)

-                if (stopOnError && exception != null) return@flow
+                if (returnOnError) return@flow
+            } ?: run {
+                if (patch is Closeable) return@run
+
+                emit(patchResult)
            }
-        }.let {
-            it.values
-                .filter(ExecutedPatch::success)
-                .map(ExecutedPatch::patchInstance)
-                .filterIsInstance(Closeable::class.java)
-                .asReversed().forEach { patch ->
-                    try {
-                        patch.close()
-                    } catch (throwable: Throwable) {
-                        val patchException =
-                            if (throwable is PatchException) throwable
-                            else PatchException(throwable)
-
-                        val patchName = (patch as Patch<Context>).javaClass.patchName
-
-                        logger.error("Failed to close '$patchName': ${patchException.stackTraceToString()}")
-
-                        emit(patchName to patchException)
-
-                        // This is not failsafe. If a patch throws an exception while closing,
-                        // the other patches that depend on it may fail.
-                        if (stopOnError) return@flow
-                    }
-                }
        }

-        MethodFingerprint.clearFingerprintResolutionLookupMaps()
+        executedPatches.values
+            .filter { it.exception == null }
+            .filter { it.patch is Closeable }.asReversed().forEach { executedPatch ->
+                val patch = executedPatch.patch
+
+                val result = try {
+                    (patch as Closeable).close()
+
+                    executedPatch
+                } catch (exception: PatchException) {
+                    PatchResult(patch, exception)
+                } catch (exception: Exception) {
+                    PatchResult(patch, PatchException(exception))
+                }
+
+                result.exception?.let {
+                    emit(
+                        PatchResult(
+                            patch,
+                            PatchException(
+                                "'${patch.name}' raised an exception while being closed: $it",
+                                result.exception
+                            )
+                        )
+                    )
+
+                    if (returnOnError) return@flow
+                } ?: run {
+                    patch.name ?: return@run
+
+                    emit(result)
+                }
+            }
    }

+    override fun close() = MethodFingerprint.clearFingerprintResolutionLookupMaps()
+
    /**
-     * Finish patching all [Apk]s.
+     * Compile and save the patched APK file.
     *
-     * @return The [PatcherResult] of the [Patcher].
+     * @return The [PatcherResult] containing the patched input files.
     */
-    fun finish(): PatcherResult {
-        val patchResults = buildList {
-            logger.info("Processing patched apks")
-            options.apkBundle.cleanup(options).forEach { result ->
-                if (result.exception != null) {
-                    logger.error("Got exception while processing ${result.apk}: ${result.exception.stackTraceToString()}")
-                    return@forEach
-                }
-
-                val patch = result.let {
-                    when (it.apk) {
-                        is Apk.Base -> PatcherResult.Patch.Base(it.apk)
-                        is Apk.Split -> PatcherResult.Patch.Split(it.apk)
-                    }
-                }
-
-                add(patch)
-
-                logger.info("Patched ${result.apk}")
-            }
-        }
-
-        return PatcherResult(patchResults)
-    }
+    override fun get() = PatcherResult(
+        context.bytecodeContext.get(),
+        context.resourceContext.get(),
+        context.packageMetadata.apkInfo.doNotCompress?.toList()
+    )
 }

-/**
- * A result of executing a [Patch].
- *
- * @param patchInstance The instance of the [Patch] that was executed.
- * @param success The result of the [Patch].
- */
-internal data class ExecutedPatch(val patchInstance: Patch<Context>, val success: Boolean)
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/PatcherContext.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/PatcherContext.kt
@@ -1,55 +1,40 @@
 package app.revanced.patcher

-import app.revanced.patcher.logging.Logger
-import app.revanced.patcher.patch.PatchClass
-import app.revanced.patcher.util.ClassMerger.merge
-import lanchon.multidexlib2.MultiDexIO
-import java.io.File
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.Patch
+import brut.androlib.apk.ApkInfo
+import brut.directory.ExtFile

-class PatcherContext(
-    options: PatcherOptions,
-    internal val patches: List<PatchClass>,
-    integrations: Iterable<File>
-) {
-    internal val integrations = Integrations(this, integrations)
-    internal val bytecodeContext = BytecodeContext(options.apkBundle)
-    internal val resourceContext = ResourceContext(options.apkBundle)
+/**
+ * A context for ReVanced [Patcher].
+ *
+ * @param options The [PatcherOptions] used to create this context.
+ */
+class PatcherContext internal constructor(options: PatcherOptions) {
+    /**
+     * [PackageMetadata] of the supplied [PatcherOptions.inputFile].
+     */
+    val packageMetadata = PackageMetadata(ApkInfo(ExtFile(options.inputFile)))

-    internal class Integrations(val context: PatcherContext, private val dexContainers: Iterable<File>) {
-        var merge = false
+    /**
+     * The map of [Patch]es associated by their [PatchClass].
+     */
+    internal val executablePatches = mutableMapOf<PatchClass, Patch<*>>()

-        /**
-         * Merge integrations.
-         * @param logger A logger.
-         */
-        fun merge(logger: Logger) {
-            context.bytecodeContext.classes.apply {
-                for (integrations in dexContainers) {
-                    logger.info("Merging $integrations")
+    /**
+     * The map of all [Patch]es and their dependencies associated by their [PatchClass].
+     */
+    internal val allPatches = mutableMapOf<PatchClass, Patch<*>>()

-                    for (classDef in MultiDexIO.readDexFile(true, integrations, Patcher.dexFileNamer, null, null).classes) {
-                        val type = classDef.type
+    /**
+     * The [ResourceContext] of this [PatcherContext].
+     * This holds the current state of the resources.
+     */
+    internal val resourceContext = ResourceContext(this, options)

-                        val existingClassIndex = this.indexOfFirst { it.type == type }
-                        if (existingClassIndex == -1) {
-                            logger.trace("Merging type $type")
-                            add(classDef)
-                            continue
-                        }
-
-
-                        logger.trace("Type $type exists. Adding missing methods and fields.")
-
-                        get(existingClassIndex).apply {
-                            merge(classDef, context.bytecodeContext, logger).let { mergedClass ->
-                                if (mergedClass !== this) // referential equality check
-                                    set(existingClassIndex, mergedClass)
-                            }
-                        }
-
-                    }
-                }
-            }
-        }
-    }
-}
+    /**
+     * The [BytecodeContext] of this [PatcherContext].
+     * This holds the current state of the bytecode.
+     */
+    internal val bytecodeContext = BytecodeContext(options) }
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/PatcherException.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/PatcherException.kt
@@ -0,0 +1,16 @@
+package app.revanced.patcher
+
+/**
+ * An exception thrown by ReVanced [Patcher].
+ *
+ * @param errorMessage The exception message.
+ * @param cause The corresponding [Throwable].
+ */
+sealed class PatcherException(errorMessage: String?, cause: Throwable?) : Exception(errorMessage, cause) {
+    constructor(errorMessage: String) : this(errorMessage, null)
+
+
+    class CircularDependencyException internal constructor(dependant: String) : PatcherException(
+        "Patch '$dependant' causes a circular dependency"
+    )
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/PatcherOptions.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/PatcherOptions.kt
@@ -1,14 +1,73 @@
 package app.revanced.patcher

-import app.revanced.patcher.apk.ApkBundle
-import app.revanced.patcher.logging.Logger
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.logging.impl.NopLogger
+import brut.androlib.Config
+import java.io.File
+import java.util.logging.Logger

 /**
- * Options for the [Patcher].
- * @param apkBundle The [ApkBundle].
- * @param logger Custom logger implementation for the [Patcher].
+ * Options for ReVanced [Patcher].
+ * @param inputFile The input file to patch.
+ * @param resourceCachePath The path to the directory to use for caching resources.
+ * @param aaptBinaryPath The path to a custom aapt binary.
+ * @param frameworkFileDirectory The path to the directory to cache the framework file in.
+ * @param unusedLogger The logger to use for logging.
 */
-class PatcherOptions(
-    internal val apkBundle: ApkBundle,
-    internal val logger: Logger = Logger.Nop
-)
+data class PatcherOptions
+@Deprecated("Use the constructor without the logger parameter instead")
+constructor(
+    internal val inputFile: File,
+    internal val resourceCachePath: File = File("revanced-resource-cache"),
+    internal val aaptBinaryPath: String? = null,
+    internal val frameworkFileDirectory: String? = null,
+    internal val unusedLogger: app.revanced.patcher.logging.Logger = NopLogger
+) {
+    private val logger = Logger.getLogger(PatcherOptions::class.java.name)
+
+    /**
+     * The mode to use for resource decoding.
+     * @see ResourceContext.ResourceDecodingMode
+     */
+    internal var resourceDecodingMode = ResourceContext.ResourceDecodingMode.MANIFEST_ONLY
+
+    /**
+     * The configuration to use for resource decoding and compiling.
+     */
+    internal val resourceConfig = Config.getDefaultConfig().apply {
+        useAapt2 = true
+        aaptPath = aaptBinaryPath ?: ""
+        frameworkDirectory = frameworkFileDirectory
+    }
+
+    /**
+     * Options for ReVanced [Patcher].
+     * @param inputFile The input file to patch.
+     * @param resourceCachePath The path to the directory to use for caching resources.
+     * @param aaptBinaryPath The path to a custom aapt binary.
+     * @param frameworkFileDirectory The path to the directory to cache the framework file in.
+     */
+    constructor(
+        inputFile: File,
+        resourceCachePath: File = File("revanced-resource-cache"),
+        aaptBinaryPath: String? = null,
+        frameworkFileDirectory: String? = null,
+    ) : this(
+        inputFile,
+        resourceCachePath,
+        aaptBinaryPath,
+        frameworkFileDirectory,
+        NopLogger
+    )
+
+    fun recreateResourceCacheDirectory() = resourceCachePath.also {
+        if (it.exists()) {
+            logger.info("Deleting existing resource cache directory")
+
+            if (!it.deleteRecursively())
+                logger.severe("Failed to delete existing resource cache directory")
+        }
+
+        it.mkdirs()
+    }
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/PatcherResult.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/PatcherResult.kt
@@ -1,33 +1,23 @@
 package app.revanced.patcher

-import app.revanced.patcher.apk.Apk
 import java.io.File
+import java.io.InputStream

 /**
 * The result of a patcher.
- * @param apkFiles The patched [Apk] files.
+ * @param dexFiles The patched dex files.
+ * @param resourceFile File containing resources that need to be extracted into the APK.
+ * @param doNotCompress List of relative paths of files to exclude from compressing.
 */
-data class PatcherResult(val apkFiles: List<Patch>) {
-
+data class PatcherResult(
+    val dexFiles: List<PatchedDexFile>,
+    val resourceFile: File?,
+    val doNotCompress: List<String>? = null
+) {
    /**
-     * The result of a patch.
-     *
-     * @param apk The patched [Apk] file.
+     * Wrapper for dex files.
+     * @param name The original name of the dex file.
+     * @param stream The dex file as [InputStream].
     */
-    sealed class Patch(val apk: Apk) {
-
-        /**
-         * The result of a patch of an [Apk.Split] file.
-         *
-         * @param apk The patched [Apk.Split] file.
-         */
-        class Split(apk: Apk.Split) : Patch(apk)
-
-        /**
-         * The result of a patch of an [Apk.Split] file.
-         *
-         * @param apk The patched [Apk.Base] file.
-         */
-        class Base(apk: Apk.Base) : Patch(apk)
-    }
+    class PatchedDexFile(val name: String, val stream: InputStream)
 }
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/PatchesConsumer.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/PatchesConsumer.kt
@@ -0,0 +1,8 @@
+package app.revanced.patcher
+
+import app.revanced.patcher.patch.Patch
+
+@FunctionalInterface
+interface PatchesConsumer {
+    fun acceptPatches(patches: List<Patch<*>>)
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/annotation/CompatibilityAnnotation.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/annotation/CompatibilityAnnotation.kt
@@ -1,23 +0,0 @@
-package app.revanced.patcher.annotation
-
-import app.revanced.patcher.patch.Patch
-
-/**
- * Annotation to constrain a [Patch] to compatible packages.
- * @param compatiblePackages A list of packages a [Patch] is compatible with.
- */
-@Target(AnnotationTarget.CLASS)
-annotation class Compatibility(
-    val compatiblePackages: Array<Package>,
-)
-
-/**
- * Annotation to represent packages a patch can be compatible with.
- * @param name The package identifier name.
- * @param versions The versions of the package the [Patch] is compatible with.
- */
-@Target()
-annotation class Package(
-    val name: String,
-    val versions: Array<String> = [],
-)
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/annotation/MetadataAnnotation.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/annotation/MetadataAnnotation.kt
@@ -1,32 +0,0 @@
-package app.revanced.patcher.annotation
-
-import app.revanced.patcher.patch.Patch
-
-/**
- * Annotation to name a [Patch].
- * @param name A suggestive name for the [Patch].
- */
-@Target(AnnotationTarget.CLASS)
-annotation class Name(
-    val name: String,
-)
-
-/**
- * Annotation to describe a [Patch].
- * @param description A description for the [Patch].
- */
-@Target(AnnotationTarget.CLASS)
-annotation class Description(
-    val description: String,
-)
-
-
-/**
- * Annotation to version a [Patch].
- * @param version The version of a [Patch].
- */
-@Target(AnnotationTarget.CLASS)
-@Deprecated("This annotation is deprecated and will be removed in the future.")
-annotation class Version(
-    val version: String,
-)
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/apk/Apk.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/apk/Apk.kt
@@ -1,285 +0,0 @@
-@file:Suppress("MemberVisibilityCanBePrivate")
-
-package app.revanced.patcher.apk
-
-import app.revanced.arsc.ApkResourceException
-import app.revanced.arsc.archive.Archive
-import app.revanced.patcher.Patcher
-import app.revanced.patcher.PatcherOptions
-import app.revanced.patcher.logging.asArscLogger
-import app.revanced.patcher.util.ProxyBackedClassList
-import com.reandroid.apk.ApkModule
-import com.reandroid.apk.xmlencoder.EncodeException
-import com.reandroid.archive.InputSource
-import com.reandroid.arsc.chunk.xml.AndroidManifestBlock
-import com.reandroid.arsc.value.ResConfig
-import lanchon.multidexlib2.*
-import org.jf.dexlib2.Opcodes
-import org.jf.dexlib2.dexbacked.DexBackedDexFile
-import org.jf.dexlib2.iface.DexFile
-import org.jf.dexlib2.iface.MultiDexContainer
-import org.jf.dexlib2.writer.io.MemoryDataStore
-import java.io.File
-
-/**
- * An [Apk] file.
- */
-sealed class Apk private constructor(module: ApkModule) {
-    /**
-     * A wrapper around the zip archive of this [Apk].
-     *
-     * @see Archive
-     */
-    private val archive = Archive(module)
-
-    /**
-     * The metadata of the [Apk].
-     */
-    val packageMetadata = PackageMetadata(module.androidManifestBlock)
-
-    /**
-     * Refresh updated resources and close any open files.
-     *
-     * @param options The [PatcherOptions] of the [Patcher].
-     */
-    internal open fun cleanup(options: PatcherOptions) {
-        try {
-            archive.cleanup(options.logger.asArscLogger())
-        } catch (e: EncodeException) {
-            throw ApkResourceException.Encode(e.message!!, e)
-        }
-
-        archive.mainPackageResources.refreshPackageName()
-    }
-
-    /**
-     * Write the [Apk] to a file.
-     *
-     * @param output The target file.
-     */
-    fun write(output: File) = archive.save(output)
-
-    companion object {
-        const val MANIFEST_FILE_NAME = "AndroidManifest.xml"
-
-        /**
-         * Determine the [Module] and [Type] of an [ApkModule].
-         *
-         * @return A [Pair] containing the [Module] and [Type] of the [ApkModule].
-         */
-        fun ApkModule.identify(): Pair<Module, Type> {
-            val manifestElement = androidManifestBlock.manifestElement
-            return when {
-                isBaseModule -> Module.Main to Type.Base
-                // The module is a base apk for a dynamic feature module if the "isFeatureModule" attribute is set to true.
-                manifestElement.searchAttributeByName("isFeatureModule")?.valueAsBoolean == true -> Module.DynamicFeature(
-                    split
-                ) to Type.Base
-
-                else -> {
-                    val module = manifestElement.searchAttributeByName("configForSplit")
-                    ?.let { Module.DynamicFeature(it.valueAsString) } ?: Module.Main
-
-                    // Examples:
-                    // config.xhdpi
-                    // df_my_feature.config.en
-                    val config = this.split.split(".").last()
-
-                    val type = when {
-                        // Language splits have a two-letter country code.
-                        config.length == 2 -> Type.Language(config)
-                        // Library splits use the target CPU architecture.
-                        Split.Library.architectures.contains(config) -> Type.Library(config)
-                        // Asset splits use the density.
-                        ResConfig.Density.valueOf(config) != null -> Type.Asset(config)
-                        else -> throw IllegalArgumentException("Invalid split config: $config")
-                    }
-
-                    module to type
-                }
-            }
-        }
-    }
-
-    internal inner class BytecodeData {
-        private val opcodes: Opcodes
-
-        /**
-         * The classes and proxied classes of the [Base] apk file.
-         */
-        val classes: ProxyBackedClassList
-
-        init {
-            MultiDexContainerBackedDexFile(object : MultiDexContainer<DexBackedDexFile> {
-                // Load all dex files from the apk module and create a dex entry for each of them.
-                private val entries = archive.readDexFiles().associateBy { it.name }
-                    .mapValues { (name, inputSource) ->
-                        BasicDexEntry(
-                            this,
-                            name,
-                            RawDexIO.readRawDexFile(inputSource.openStream(), inputSource.length, null)
-                        )
-                    }
-
-                override fun getDexEntryNames() = entries.keys.toList()
-                override fun getEntry(entryName: String) = entries[entryName]
-            }).let {
-                opcodes = it.opcodes
-                classes = ProxyBackedClassList(it.classes)
-            }
-        }
-
-        /**
-         * Write [classes] to the archive.
-         */
-        internal fun writeDexFiles() {
-            // Create patched dex files.
-            mutableMapOf<String, MemoryDataStore>().also {
-                val newDexFile = object : DexFile {
-                    override fun getClasses() =
-                        this@BytecodeData.classes.also(ProxyBackedClassList::applyProxies).toSet()
-                    override fun getOpcodes() = this@BytecodeData.opcodes
-                }
-
-                // Write modified dex files.
-                MultiDexIO.writeDexFile(
-                    true, -1, // Core count.
-                    it, Patcher.dexFileNamer, newDexFile, DexIO.DEFAULT_MAX_DEX_POOL_SIZE, null
-                )
-            }.forEach { (name, store) ->
-                val dexFileInputSource = object : InputSource(name) {
-                    override fun openStream() = store.readAt(0)
-                }
-
-                archive.write(dexFileInputSource)
-            }
-        }
-    }
-
-    /**
-     * Metadata about an [Apk] file.
-     *
-     * @param packageName The package name of the [Apk] file.
-     * @param packageVersion The package version of the [Apk] file.
-     */
-    data class PackageMetadata(val packageName: String?, val packageVersion: String?) {
-        internal constructor(manifestBlock: AndroidManifestBlock) : this(
-            manifestBlock.packageName,
-            manifestBlock.versionName
-        )
-    }
-
-    /**
-     * An [Apk] of type [Split].
-     *
-     * @param config The device configuration associated with this [Split], such as arm64_v8a, en or xhdpi.
-     * @see Apk
-     */
-    sealed class Split(val config: String, module: ApkModule) : Apk(module) {
-        override fun toString() = "split_config.$config.apk"
-
-        /**
-         * The split apk file which contains libraries.
-         *
-         * @see Split
-         */
-        class Library internal constructor(config: String, module: ApkModule) : Split(config, module) {
-            companion object {
-                /**
-                 * A set of all architectures supported by android.
-                 */
-                val architectures = setOf("armeabi_v7a", "arm64_v8a", "x86", "x86_64")
-            }
-        }
-
-        /**
-         * The split apk file which contains language strings.
-         *
-         * @see Split
-         */
-        class Language internal constructor(config: String, module: ApkModule) : Split(config, module)
-
-        /**
-         * The split apk file which contains assets.
-         *
-         * @see Split
-         */
-        class Asset internal constructor(config: String, module: ApkModule) : Split(config, module)
-    }
-
-    /**
-     * The base [Apk] file..
-     *
-     * @see Apk
-     */
-    class Base internal constructor(module: ApkModule) : Apk(module) {
-        /**
-         * Data of the [Base] apk file.
-         */
-        internal val bytecodeData = BytecodeData()
-
-        override fun toString() = "base.apk"
-
-        override fun cleanup(options: PatcherOptions) {
-            super.cleanup(options)
-
-            options.logger.info("Writing patched dex files")
-            bytecodeData.writeDexFiles()
-        }
-    }
-
-    /**
-     * The module that the [ApkModule] belongs to.
-     */
-    sealed class Module {
-        /**
-         * The default [Module] that is always installed by software repositories.
-         */
-        object Main : Module()
-
-        /**
-         * A [Module] that can be installed later by software repositories when requested by the application.
-         *
-         * @param name The name of the feature.
-         */
-        data class DynamicFeature(val name: String) : Module()
-    }
-
-    /**
-     * The type of the [ApkModule].
-     */
-    sealed class Type {
-        /**
-         * The main Apk of a [Module].
-         */
-        object Base : Type()
-
-        /**
-         * A superclass for all split configuration types.
-         *
-         * @param target The target device configuration.
-         */
-        sealed class SplitConfig(val target: String) : Type()
-
-        /**
-         * The [Type] of an apk containing native libraries.
-         *
-         * @param architecture The target CPU architecture.
-         */
-        data class Library(val architecture: String) : SplitConfig(architecture)
-
-        /**
-         * The [Type] for an Apk containing language resources.
-         *
-         * @param language The target language code.
-         */
-        data class Language(val language: String) : SplitConfig(language)
-
-        /**
-         * The [Type] for an Apk containing assets.
-         *
-         * @param pixelDensity The target screen density.
-         */
-        data class Asset(val pixelDensity: String) : SplitConfig(pixelDensity)
-    }
-}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/apk/ApkBundle.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/apk/ApkBundle.kt
@@ -1,105 +0,0 @@
-@file:Suppress("MemberVisibilityCanBePrivate")
-
-package app.revanced.patcher.apk
-
-import app.revanced.arsc.ApkResourceException
-import app.revanced.arsc.resource.ResourceTable
-import app.revanced.patcher.Patcher
-import app.revanced.patcher.PatcherOptions
-import app.revanced.patcher.apk.Apk.Companion.identify
-import com.reandroid.apk.ApkModule
-import java.io.File
-
-/**
- * An [Apk] file of type [Apk.Split].
- *
- * @param files A list of apk files to load.
- */
-class ApkBundle(files: List<File>) : Sequence<Apk> {
-    /**
-     * The [Apk.Base] of this [ApkBundle].
-     */
-    val base: Apk.Base
-
-    /**
-     * A map containing all the [Apk.Split]s in this bundle associated by their configuration.
-     */
-    val splits: Map<String, Apk.Split>?
-
-    init {
-        var baseApk: Apk.Base? = null
-
-        splits = buildMap {
-            files.forEach {
-                val apk = ApkModule.loadApkFile(it)
-                val (module, type) = apk.identify()
-                if (module is Apk.Module.DynamicFeature) {
-                    return@forEach // Dynamic feature modules are not supported yet.
-                }
-
-                when (type) {
-                    Apk.Type.Base -> {
-                        if (baseApk != null) {
-                            throw IllegalArgumentException("Cannot have more than one base apk")
-                        }
-                        baseApk = Apk.Base(apk)
-                    }
-
-                    is Apk.Type.SplitConfig -> {
-                        val target = type.target
-                        if (this.contains(target)) {
-                            throw IllegalArgumentException("Duplicate split: $target")
-                        }
-
-                        val constructor = when (type) {
-                            is Apk.Type.Asset -> Apk.Split::Asset
-                            is Apk.Type.Library -> Apk.Split::Library
-                            is Apk.Type.Language -> Apk.Split::Language
-                        }
-
-                        this[target] = constructor(target, apk)
-                    }
-                }
-            }
-        }.takeIf { it.isNotEmpty() }
-
-        base = baseApk ?: throw IllegalArgumentException("Base apk not found")
-    }
-
-    /**
-     * The [ResourceTable] of this [ApkBundle].
-     */
-    val resources = ResourceTable(base.resources, map { it.resources })
-
-    override fun iterator() = sequence {
-        yield(base)
-        splits?.values?.let {
-            yieldAll(it)
-        }
-    }.iterator()
-
-    /**
-     * Refresh all updated resources in an [ApkBundle].
-     *
-     * @param options The [PatcherOptions] of the [Patcher].
-     * @return A sequence of the [Apk] files which are being refreshed.
-     */
-    internal fun cleanup(options: PatcherOptions) = map {
-        var exception: ApkResourceException? = null
-        try {
-            it.cleanup(options)
-        } catch (e: ApkResourceException) {
-            exception = e
-        }
-
-        SplitApkResult(it, exception)
-    }
-
-    /**
-     * The result of writing an [Apk] file.
-     *
-     * @param apk The corresponding [Apk] file.
-     * @param exception The optional [ApkResourceException] when an exception occurred.
-     */
-    data class SplitApkResult(val apk: Apk, val exception: ApkResourceException? = null)
-}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/data/BytecodeContext.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/data/BytecodeContext.kt
@@ -0,0 +1,157 @@
+package app.revanced.patcher.data
+
+import app.revanced.patcher.PatcherContext
+import app.revanced.patcher.PatcherOptions
+import app.revanced.patcher.PatcherResult
+import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.util.ClassMerger.merge
+import app.revanced.patcher.util.ProxyClassList
+import app.revanced.patcher.util.method.MethodWalker
+import app.revanced.patcher.util.proxy.ClassProxy
+import com.android.tools.smali.dexlib2.Opcodes
+import com.android.tools.smali.dexlib2.iface.ClassDef
+import com.android.tools.smali.dexlib2.iface.DexFile
+import com.android.tools.smali.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.writer.io.MemoryDataStore
+import lanchon.multidexlib2.BasicDexFileNamer
+import lanchon.multidexlib2.DexIO
+import lanchon.multidexlib2.MultiDexIO
+import java.io.File
+import java.io.Flushable
+import java.util.logging.Logger
+
+/**
+ * A context for bytecode.
+ * This holds the current state of the bytecode.
+ *
+ * @param options The [PatcherOptions] used to create this context.
+ */
+class BytecodeContext internal constructor(private val options: PatcherOptions) :
+    Context<List<PatcherResult.PatchedDexFile>> {
+    private val logger = Logger.getLogger(BytecodeContext::class.java.name)
+
+    /**
+     * [Opcodes] of the supplied [PatcherOptions.inputFile].
+     */
+    internal lateinit var opcodes: Opcodes
+
+    /**
+     * The list of classes.
+     */
+    val classes by lazy {
+        ProxyClassList(
+            MultiDexIO.readDexFile(
+                true, options.inputFile, BasicDexFileNamer(), null, null
+            ).also { opcodes = it.opcodes }.classes.toMutableSet()
+        )
+    }
+
+    /**
+     * The [Integrations] of this [PatcherContext].
+     */
+    internal val integrations = Integrations()
+
+    /**
+     * Find a class by a given class name.
+     *
+     * @param className The name of the class.
+     * @return A proxy for the first class that matches the class name.
+     */
+    fun findClass(className: String) = findClass { it.type.contains(className) }
+
+    /**
+     * Find a class by a given predicate.
+     *
+     * @param predicate A predicate to match the class.
+     * @return A proxy for the first class that matches the predicate.
+     */
+    fun findClass(predicate: (ClassDef) -> Boolean) =
+        // if we already proxied the class matching the predicate...
+        classes.proxies.firstOrNull { predicate(it.immutableClass) } ?:
+        // else resolve the class to a proxy and return it, if the predicate is matching a class
+        classes.find(predicate)?.let { proxy(it) }
+
+    /**
+     * Proxy a class.
+     * This will allow the class to be modified.
+     *
+     * @param classDef The class to proxy.
+     * @return A proxy for the class.
+     */
+    fun proxy(classDef: ClassDef) = this.classes.proxies.find { it.immutableClass.type == classDef.type } ?: let {
+        ClassProxy(classDef).also { this.classes.add(it) }
+    }
+
+    /**
+     * Create a [MethodWalker] instance for the current [BytecodeContext].
+     *
+     * @param startMethod The method to start at.
+     * @return A [MethodWalker] instance.
+     */
+    fun toMethodWalker(startMethod: Method) = MethodWalker(this, startMethod)
+
+    /**
+     * The integrations of a [PatcherContext].
+     */
+    internal inner class Integrations : MutableList<File> by mutableListOf(), Flushable {
+        /**
+         * Whether to merge integrations.
+         * True when any supplied [Patch] is annotated with [RequiresIntegrations].
+         */
+        var merge = false
+
+        /**
+         * Merge integrations into the [BytecodeContext] and flush all [Integrations].
+         */
+        override fun flush() {
+            if (!merge) return
+
+            logger.info("Merging integrations")
+
+            // TODO: Multi-thread this.
+            this@Integrations.forEach { integrations ->
+                MultiDexIO.readDexFile(
+                    true,
+                    integrations, BasicDexFileNamer(),
+                    null,
+                    null
+                ).classes.forEach classDef@{ classDef ->
+                    val existingClass = classes.find { it.type == classDef.type } ?: run {
+                        logger.fine("Merging $classDef")
+                        classes.add(classDef)
+                        return@classDef
+                    }
+
+                    logger.fine("$classDef exists. Adding missing methods and fields.")
+
+                    existingClass.merge(classDef, this@BytecodeContext).let { mergedClass ->
+                        // If the class was merged, replace the original class with the merged class.
+                        if (mergedClass === existingClass) return@let
+                        classes.apply { remove(existingClass); add(mergedClass) }
+                    }
+                }
+            }
+
+            clear()
+        }
+    }
+
+    /**
+     * Compile bytecode from the [BytecodeContext].
+     *
+     * @return The compiled bytecode.
+     */
+    override fun get(): List<PatcherResult.PatchedDexFile> {
+        logger.info("Compiling modified dex files")
+
+        return mutableMapOf<String, MemoryDataStore>().apply {
+            MultiDexIO.writeDexFile(
+                true, -1, // Defaults to amount of available cores.
+                this, BasicDexFileNamer(), object : DexFile {
+                    override fun getClasses() = this@BytecodeContext.classes.also(ProxyClassList::replaceClasses)
+                    override fun getOpcodes() = this@BytecodeContext.opcodes
+                }, DexIO.DEFAULT_MAX_DEX_POOL_SIZE, null
+            )
+        }.map { PatcherResult.PatchedDexFile(it.key, it.value.readAt(0)) }
+    }
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/data/Context.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/data/Context.kt
@@ -0,0 +1,9 @@
+package app.revanced.patcher.data
+
+import java.util.function.Supplier
+
+/**
+ * A common interface for contexts such as [ResourceContext] and [BytecodeContext].
+ */
+
+sealed interface Context<T> : Supplier<T>
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/data/ResourceContext.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/data/ResourceContext.kt
@@ -0,0 +1,170 @@
+package app.revanced.patcher.data
+
+import app.revanced.patcher.PatcherContext
+import app.revanced.patcher.PatcherOptions
+import app.revanced.patcher.util.DomFileEditor
+import brut.androlib.AaptInvoker
+import brut.androlib.ApkDecoder
+import brut.androlib.apk.UsesFramework
+import brut.androlib.res.Framework
+import brut.androlib.res.ResourcesDecoder
+import brut.androlib.res.decoder.AndroidManifestResourceParser
+import brut.androlib.res.decoder.XmlPullStreamDecoder
+import brut.androlib.res.xml.ResXmlPatcher
+import brut.directory.ExtFile
+import java.io.File
+import java.io.InputStream
+import java.io.OutputStream
+import java.nio.file.Files
+import java.util.logging.Logger
+
+/**
+ * A context for resources.
+ * This holds the current state of the resources.
+ *
+ * @param context The [PatcherContext] to create the context for.
+ */
+class ResourceContext internal constructor(
+    private val context: PatcherContext,
+    private val options: PatcherOptions
+) : Context<File?>, Iterable<File> {
+    private val logger = Logger.getLogger(ResourceContext::class.java.name)
+
+    val xmlEditor = XmlFileHolder()
+
+    /**
+     * Decode resources for the patcher.
+     *
+     * @param mode The [ResourceDecodingMode] to use when decoding.
+     */
+    internal fun decodeResources(mode: ResourceDecodingMode) = with(context.packageMetadata.apkInfo) {
+        // Needed to decode resources.
+        val resourcesDecoder = ResourcesDecoder(options.resourceConfig, this)
+
+        when (mode) {
+            ResourceDecodingMode.FULL -> {
+                val outDir = options.recreateResourceCacheDirectory()
+
+                logger.info("Decoding resources")
+
+                resourcesDecoder.decodeResources(outDir)
+                resourcesDecoder.decodeManifest(outDir)
+
+                // Needed to record uncompressed files.
+                val apkDecoder = ApkDecoder(options.resourceConfig, this)
+                apkDecoder.recordUncompressedFiles(resourcesDecoder.resFileMapping)
+
+                usesFramework = UsesFramework().apply {
+                    ids = resourcesDecoder.resTable.listFramePackages().map { it.id }
+                }
+            }
+
+            ResourceDecodingMode.MANIFEST_ONLY -> {
+                logger.info("Decoding app manifest")
+
+                // Decode manually instead of using resourceDecoder.decodeManifest
+                // because it does not support decoding to an OutputStream.
+                XmlPullStreamDecoder(
+                    AndroidManifestResourceParser(resourcesDecoder.resTable),
+                    resourcesDecoder.resXmlSerializer
+                ).decodeManifest(
+                    apkFile.directory.getFileInput("AndroidManifest.xml"),
+                    // Older Android versions do not support OutputStream.nullOutputStream()
+                    object : OutputStream() {
+                        override fun write(b: Int) { /* do nothing */
+                        }
+                    }
+                )
+
+                // Get the package name and version from the manifest using the XmlPullStreamDecoder.
+                // XmlPullStreamDecoder.decodeManifest() sets metadata.apkInfo.
+                context.packageMetadata.let { metadata ->
+                    metadata.packageName = resourcesDecoder.resTable.packageRenamed
+                    versionInfo.let {
+                        metadata.packageVersion = it.versionName ?: it.versionCode
+                    }
+
+                    /*
+                     The ResTable if flagged as sparse if the main package is not loaded, which is the case here,
+                     because ResourcesDecoder.decodeResources loads the main package
+                     and not XmlPullStreamDecoder.decodeManifest.
+                     See ARSCDecoder.readTableType for more info.
+
+                     Set this to false again to prevent the ResTable from being flagged as sparse falsely.
+                     */
+                    metadata.apkInfo.sparseResources = false
+                }
+            }
+        }
+
+    }
+
+    operator fun get(path: String) = options.resourceCachePath.resolve(path)
+
+    override fun iterator() = options.resourceCachePath.walkTopDown().iterator()
+
+
+    /**
+     * Compile resources from the [ResourceContext].
+     *
+     * @return The compiled resources.
+     */
+    override fun get(): File? {
+        var resourceFile: File? = null
+
+        if (options.resourceDecodingMode == ResourceDecodingMode.FULL) {
+            logger.info("Compiling modified resources")
+
+            val cacheDirectory = ExtFile(options.resourceCachePath)
+            val aaptFile = cacheDirectory.resolve("aapt_temp_file").also {
+                Files.deleteIfExists(it.toPath())
+            }.also { resourceFile = it }
+
+            try {
+                AaptInvoker(
+                    options.resourceConfig, context.packageMetadata.apkInfo
+                ).invokeAapt(aaptFile,
+                    cacheDirectory.resolve("AndroidManifest.xml").also {
+                        ResXmlPatcher.fixingPublicAttrsInProviderAttributes(it)
+                    },
+                    cacheDirectory.resolve("res"),
+                    null,
+                    null,
+                    context.packageMetadata.apkInfo.usesFramework.let { usesFramework ->
+                        usesFramework.ids.map { id ->
+                            Framework(options.resourceConfig).getFrameworkApk(id, usesFramework.tag)
+                        }.toTypedArray()
+                    })
+            } finally {
+                cacheDirectory.close()
+            }
+        }
+
+        return resourceFile
+    }
+
+    /**
+     * The type of decoding the resources.
+     */
+    internal enum class ResourceDecodingMode {
+        /**
+         * Decode all resources.
+         */
+        FULL,
+
+        /**
+         * Decode the manifest file only.
+         */
+        MANIFEST_ONLY,
+    }
+
+    inner class XmlFileHolder {
+        operator fun get(inputStream: InputStream) =
+            DomFileEditor(inputStream)
+
+        operator fun get(path: String): DomFileEditor {
+            return DomFileEditor(this@ResourceContext[path])
+        }
+
+    }
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/extensions/Extensions.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/extensions/Extensions.kt
@@ -1,7 +1,7 @@
 package app.revanced.patcher.extensions

 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import org.jf.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.AccessFlags

 /**
 * Create a label for the instruction at given index.
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/extensions/InstructionExtensions.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/extensions/InstructionExtensions.kt
@@ -4,12 +4,12 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patcher.util.smali.toInstructions
-import org.jf.dexlib2.builder.BuilderInstruction
-import org.jf.dexlib2.builder.BuilderOffsetInstruction
-import org.jf.dexlib2.builder.Label
-import org.jf.dexlib2.builder.MutableMethodImplementation
-import org.jf.dexlib2.builder.instruction.*
-import org.jf.dexlib2.iface.instruction.Instruction
+import com.android.tools.smali.dexlib2.builder.BuilderInstruction
+import com.android.tools.smali.dexlib2.builder.BuilderOffsetInstruction
+import com.android.tools.smali.dexlib2.builder.Label
+import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
+import com.android.tools.smali.dexlib2.builder.instruction.*
+import com.android.tools.smali.dexlib2.iface.instruction.Instruction

 object InstructionExtensions {

@@ -22,8 +22,7 @@ object InstructionExtensions {
    fun MutableMethodImplementation.addInstructions(
        index: Int,
        instructions: List<BuilderInstruction>
-    ) =
-        instructions.asReversed().forEach { addInstruction(index, it) }
+    ) = instructions.asReversed().forEach { addInstruction(index, it) }

    /**
     * Add instructions to a method.
@@ -321,6 +320,11 @@ object InstructionExtensions {
     * @param T The type of instruction to return.
     * @return The instruction.
     */
-    @Suppress("UNCHECKED_CAST")
    fun <T> MutableMethod.getInstruction(index: Int): T = implementation!!.getInstruction<T>(index)
+
+    /**
+     * Get the instructions of a method.
+     * @return The instructions.
+     */
+    fun MutableMethod.getInstructions(): MutableList<BuilderInstruction> = implementation!!.instructions
 }
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/extensions/MethodFingerprintExtensions.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/extensions/MethodFingerprintExtensions.kt
@@ -5,13 +5,7 @@ import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

 object MethodFingerprintExtensions {
-
-    /**
-     * The name of a [MethodFingerprint].
-     */
-    val MethodFingerprint.name: String
-        get() = this.javaClass.simpleName
-
+    // TODO: Make this a property.
    /**
     * The [FuzzyPatternScanMethod] annotation of a [MethodFingerprint].
     */
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/extensions/PatchExtensions.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/extensions/PatchExtensions.kt
@@ -1,72 +0,0 @@
-package app.revanced.patcher.extensions
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.AnnotationExtensions.findAnnotationRecursively
-import app.revanced.patcher.patch.OptionsContainer
-import app.revanced.patcher.patch.Patch
-import app.revanced.patcher.patch.PatchClass
-import app.revanced.patcher.patch.PatchOptions
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.RequiresIntegrations
-import kotlin.reflect.KVisibility
-import kotlin.reflect.full.companionObject
-import kotlin.reflect.full.companionObjectInstance
-
-object PatchExtensions {
-    /**
-     * The name of a [Patch].
-     */
-    val PatchClass.patchName: String
-        get() = findAnnotationRecursively(Name::class)?.name ?: this.simpleName
-
-    /**
-     * The version of a [Patch].
-     */
-    @Deprecated("This property is deprecated and will be removed in the future.")
-    val PatchClass.version
-        get() = findAnnotationRecursively(Version::class)?.version
-
-    /**
-     * Weather or not a [Patch] should be included.
-     */
-    val PatchClass.include
-        get() = findAnnotationRecursively(app.revanced.patcher.patch.annotations.Patch::class)!!.include
-
-    /**
-     * The description of a [Patch].
-     */
-    val PatchClass.description
-        get() = findAnnotationRecursively(Description::class)?.description
-
-    /**
-     * The dependencies of a [Patch].
-     */
-    val PatchClass.dependencies
-        get() = findAnnotationRecursively(DependsOn::class)?.dependencies
-
-    /**
-     * The packages a [Patch] is compatible with.
-     */
-    val PatchClass.compatiblePackages
-        get() = findAnnotationRecursively(Compatibility::class)?.compatiblePackages
-
-    /**
-     * Weather or not a [Patch] requires integrations.
-     */
-    internal val PatchClass.requiresIntegrations
-        get() = findAnnotationRecursively(RequiresIntegrations::class) != null
-
-    /**
-     * The options of a [Patch].
-     */
-    val PatchClass.options: PatchOptions?
-        get() = kotlin.companionObject?.let { cl ->
-            if (cl.visibility != KVisibility.PUBLIC) return null
-            kotlin.companionObjectInstance?.let {
-                (it as? OptionsContainer)?.options
-            }
-        }
-}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/fingerprint/method/impl/MethodFingerprint.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/fingerprint/method/impl/MethodFingerprint.kt
@@ -1,19 +1,19 @@
 package app.revanced.patcher.fingerprint.method.impl

-import app.revanced.patcher.BytecodeContext
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.MethodFingerprintExtensions.fuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.Fingerprint
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.util.proxy.ClassProxy
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.ClassDef
-import org.jf.dexlib2.iface.Method
-import org.jf.dexlib2.iface.instruction.Instruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.StringReference
-import org.jf.dexlib2.util.MethodUtil
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.ClassDef
+import com.android.tools.smali.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.iface.instruction.Instruction
+import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.reference.StringReference
+import com.android.tools.smali.dexlib2.util.MethodUtil
 import java.util.*

 private typealias StringMatch = MethodFingerprintResult.MethodFingerprintScanResult.StringsScanResult.StringMatch
@@ -99,7 +99,7 @@ abstract class MethodFingerprint(
                methodClassPairs!!.add(methodClassPair)
            }

-            if (methods.isNotEmpty()) throw PatchException("Map already initialized")
+            if (methods.isNotEmpty()) clearFingerprintResolutionLookupMaps()

            context.classes.forEach { classDef ->
                classDef.methods.forEach { method ->
@@ -159,7 +159,7 @@ abstract class MethodFingerprint(
         * - Faster: Specify [accessFlags], [returnType] and [parameters].
         * - Fastest: Specify [strings], with at least one string being an exact (non-partial) match.
         */
-        internal fun Iterable<MethodFingerprint>.resolveUsingLookupMap(context: BytecodeContext) {
+        internal fun List<MethodFingerprint>.resolveUsingLookupMap(context: BytecodeContext) {
            if (methods.isEmpty()) throw PatchException("lookup map not initialized")

            for (fingerprint in this) {
@@ -362,18 +362,18 @@ abstract class MethodFingerprint(
                            val patternOpcode = pattern.elementAt(patternIndex)

                            if (patternOpcode != null && patternOpcode.ordinal != originalOpcode.ordinal) {
-                                // Reaching maximum threshold (0) means,
-                                // the pattern does not match to the current instructions.
+                                // reaching maximum threshold (0) means,
+                                // the pattern does not match to the current instructions
                                if (threshold-- == 0) break
                            }

                            if (patternIndex < patternLength - 1) {
-                                // If the entire pattern has not been scanned yet
-                                // continue the scan.
+                                // if the entire pattern has not been scanned yet
+                                // continue the scan
                                patternIndex++
                                continue
                            }
-                            // The pattern is valid, generate warnings if fuzzyPatternScanMethod is FuzzyPatternScanMethod
+                            // the pattern is valid, generate warnings if fuzzyPatternScanMethod is FuzzyPatternScanMethod
                            val result =
                                MethodFingerprintResult.MethodFingerprintScanResult.PatternScanResult(
                                    index,
@@ -448,7 +448,7 @@ data class MethodFingerprintResult(
     * Use [classDef] where possible.
     */
    @Suppress("MemberVisibilityCanBePrivate")
-    val mutableClass by lazy { context.classes.proxy(classDef).mutableClass }
+    val mutableClass by lazy { context.proxy(classDef).mutableClass }

    /**
     * Returns a mutable clone of [method]
@@ -510,4 +510,4 @@ data class MethodFingerprintResult(
            )
        }
    }
-}
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/logging/Logger.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/logging/Logger.kt
@@ -1,20 +1,9 @@
 package app.revanced.patcher.logging

+@Deprecated("This will be removed in a future release")
 interface Logger {
    fun error(msg: String) {}
    fun warn(msg: String) {}
    fun info(msg: String) {}
    fun trace(msg: String) {}
-
-    object Nop : Logger
-}
-
-/**
- * Turn a Patcher [Logger] into an [app.revanced.arsc.logging.Logger].
- */
-internal fun Logger.asArscLogger() = object : app.revanced.arsc.logging.Logger {
-    override fun error(msg: String) = this@asArscLogger.error(msg)
-    override fun warn(msg: String) = this@asArscLogger.warn(msg)
-    override fun info(msg: String) = this@asArscLogger.info(msg)
-    override fun trace(msg: String) = this@asArscLogger.error(msg)
 }
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/logging/impl/NopLogger.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/logging/impl/NopLogger.kt
@@ -0,0 +1,6 @@
+package app.revanced.patcher.logging.impl
+
+import app.revanced.patcher.logging.Logger
+
+@Deprecated("This will be removed in a future release")
+object NopLogger : Logger
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/BytecodePatch.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/BytecodePatch.kt
@@ -0,0 +1,27 @@
+package app.revanced.patcher.patch
+
+import app.revanced.patcher.PatchClass
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+/**
+ * A ReVanced [Patch] that works on [BytecodeContext].
+ *
+ * @param fingerprints A list of [MethodFingerprint]s which will be resolved before the patch is executed.
+ * @param name The name of the patch.
+ * @param description The description of the patch.
+ * @param compatiblePackages The packages the patch is compatible with.
+ * @param dependencies The names of patches this patch depends on.
+ * @param use Weather or not the patch should be used.
+ * @param requiresIntegrations Weather or not the patch requires integrations.
+ */
+abstract class BytecodePatch(
+    internal val fingerprints: Set<MethodFingerprint> = emptySet(),
+    name: String? = null,
+    description: String? = null,
+    compatiblePackages: Set<CompatiblePackage>? = null,
+    dependencies: Set<PatchClass>? = null,
+    use: Boolean = true,
+    // TODO: Remove this property, once integrations are coupled with patches.
+    requiresIntegrations: Boolean = false,
+) : Patch<BytecodeContext>(name, description, compatiblePackages, dependencies, use, requiresIntegrations)
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/OptionsContainer.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/OptionsContainer.kt
@@ -1,18 +0,0 @@
-package app.revanced.patcher.patch
-
-/**
- * A container for patch options.
- */
-abstract class OptionsContainer {
-    /**
-     * A list of [PatchOption]s.
-     * @see PatchOptions
-     */
-    @Suppress("MemberVisibilityCanBePrivate")
-    val options = PatchOptions()
-
-    protected fun <T> option(opt: PatchOption<T>): PatchOption<T> {
-        options.register(opt)
-        return opt
-    }
-}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/Patch.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/Patch.kt
@@ -1,42 +1,71 @@
+@file:Suppress("MemberVisibilityCanBePrivate", "UNUSED_PARAMETER")
+
 package app.revanced.patcher.patch

-import app.revanced.patcher.BytecodeContext
-import app.revanced.patcher.Context
-import app.revanced.patcher.ResourceContext
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.PatchClass
+import app.revanced.patcher.Patcher
+import app.revanced.patcher.data.Context
+import app.revanced.patcher.patch.options.PatchOptions
 import java.io.Closeable

 /**
 * A ReVanced patch.
 *
- * If it implements [Closeable], it will be closed after all patches have been executed.
- * Closing will be done in reverse execution order.
+ * If an implementation of [Patch] also implements [Closeable]
+ * it will be closed in reverse execution order of patches executed by ReVanced [Patcher].
+ *
+ * @param name The name of the patch.
+ * @param description The description of the patch.
+ * @param compatiblePackages The packages the patch is compatible with.
+ * @param dependencies The names of patches this patch depends on.
+ * @param use Weather or not the patch should be used.
+ * @param requiresIntegrations Weather or not the patch requires integrations.
+ * @param T The [Context] type this patch will work on.
 */
-sealed interface Patch<out T : Context> {
+sealed class Patch<out T : Context<*>>(
+    val name: String? = null,
+    val description: String? = null,
+    val compatiblePackages: Set<CompatiblePackage>? = null,
+    val dependencies: Set<PatchClass>? = null,
+    val use: Boolean = true,
+    // TODO: Remove this property, once integrations are coupled with patches.
+    val requiresIntegrations: Boolean = false,
+) {
    /**
-     * The main function of the [Patch] which the patcher will call.
+     * The options of the patch associated by the options key.
+     */
+    val options = PatchOptions()
+
+    /**
+     * The execution function of the patch.
     *
     * @param context The [Context] the patch will work on.
+     * @return The result of executing the patch.
     */
-    suspend fun execute(context: @UnsafeVariance T)
+    abstract fun execute(context: @UnsafeVariance T)
+
+    override fun hashCode() = name.hashCode()
+
+    override fun toString() = name ?: this::class.simpleName ?: "Unnamed patch"
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as Patch<*>
+
+        return name == other.name
+    }
+
+    /**
+     * A package a [Patch] is compatible with.
+     *
+     * @param name The name of the package.
+     * @param versions The versions of the package.
+     */
+    class CompatiblePackage(
+        val name: String,
+        versions: Set<String>? = null,
+    )
 }

-/**
- * Resource patch for the Patcher.
- */
-interface ResourcePatch : Patch<ResourceContext>
-
-/**
- * Bytecode patch for the Patcher.
- *
- * @param fingerprints A list of [MethodFingerprint] this patch relies on.
- */
-abstract class BytecodePatch(
-    internal val fingerprints: Iterable<MethodFingerprint>? = null
-) : Patch<BytecodeContext>
-
-// TODO: populate this everywhere where the alias is not used yet
-/**
- * The class type of [Patch].
- */
-typealias PatchClass = Class<out Patch<Context>>
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/PatchOption.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/PatchOption.kt
@@ -1,230 +0,0 @@
-@file:Suppress("CanBeParameter", "MemberVisibilityCanBePrivate", "UNCHECKED_CAST")
-
-package app.revanced.patcher.patch
-
-import kotlin.reflect.KProperty
-
-class NoSuchOptionException(val option: String) : Exception("No such option: $option")
-class IllegalValueException(val value: Any?) : Exception("Illegal value: $value")
-class InvalidTypeException(val got: String, val expected: String) :
-    Exception("Invalid option value type: $got, expected $expected")
-
-object RequirementNotMetException : Exception("null was passed into an option that requires a value")
-
-/**
- * A registry for an array of [PatchOption]s.
- * @param options An array of [PatchOption]s.
- */
-class PatchOptions(vararg options: PatchOption<*>) : Iterable<PatchOption<*>> {
-    private val register = mutableMapOf<String, PatchOption<*>>()
-
-    init {
-        options.forEach { register(it) }
-    }
-
-    internal fun register(option: PatchOption<*>) {
-        if (register.containsKey(option.key)) {
-            throw IllegalStateException("Multiple options found with the same key")
-        }
-        register[option.key] = option
-    }
-
-    /**
-     * Get a [PatchOption] by its key.
-     * @param key The key of the [PatchOption].
-     */
-    @JvmName("getUntyped")
-    operator fun get(key: String) = register[key] ?: throw NoSuchOptionException(key)
-
-    /**
-     * Get a [PatchOption] by its key.
-     * @param key The key of the [PatchOption].
-     */
-    inline operator fun <reified T> get(key: String): PatchOption<T> {
-        val opt = get(key)
-        if (opt.value !is T) throw InvalidTypeException(
-            opt.value?.let { it::class.java.canonicalName } ?: "null",
-            T::class.java.canonicalName
-        )
-        return opt as PatchOption<T>
-    }
-
-    /**
-     * Set the value of a [PatchOption].
-     * @param key The key of the [PatchOption].
-     * @param value The value you want it to be.
-     * Please note that using the wrong value type results in a runtime error.
-     */
-    inline operator fun <reified T> set(key: String, value: T) {
-        val opt = get<T>(key)
-        if (opt.value !is T) throw InvalidTypeException(
-            T::class.java.canonicalName,
-            opt.value?.let { it::class.java.canonicalName } ?: "null"
-        )
-        opt.value = value
-    }
-
-    /**
-     * Sets the value of a [PatchOption] to `null`.
-     * @param key The key of the [PatchOption].
-     */
-    fun nullify(key: String) {
-        get(key).value = null
-    }
-
-    override fun iterator() = register.values.iterator()
-}
-
-/**
- * A [Patch] option.
- * @param key Unique identifier of the option. Example: _`settings.microg.enabled`_
- * @param default The default value of the option.
- * @param title A human-readable title of the option. Example: _MicroG Settings_
- * @param description A human-readable description of the option. Example: _Settings integration for MicroG._
- * @param required Whether the option is required.
- */
-@Suppress("MemberVisibilityCanBePrivate")
-sealed class PatchOption<T>(
-    val key: String,
-    default: T?,
-    val title: String,
-    val description: String,
-    val required: Boolean,
-    val validator: (T?) -> Boolean
-) {
-    var value: T? = default
-        get() {
-            if (field == null && required) {
-                throw RequirementNotMetException
-            }
-            return field
-        }
-        set(value) {
-            if (value == null && required) {
-                throw RequirementNotMetException
-            }
-            if (!validator(value)) {
-                throw IllegalValueException(value)
-            }
-            field = value
-        }
-
-    /**
-     * Gets the value of the option.
-     * Please note that using the wrong value type results in a runtime error.
-     */
-    @JvmName("getValueTyped")
-    inline operator fun <reified V> getValue(thisRef: Nothing?, property: KProperty<*>): V? {
-        if (value !is V?) throw InvalidTypeException(
-            V::class.java.canonicalName,
-            value?.let { it::class.java.canonicalName } ?: "null"
-        )
-        return value as? V?
-    }
-
-    operator fun getValue(thisRef: Any?, property: KProperty<*>) = value
-
-    /**
-     * Gets the value of the option.
-     * Please note that using the wrong value type results in a runtime error.
-     */
-    @JvmName("setValueTyped")
-    inline operator fun <reified V> setValue(thisRef: Nothing?, property: KProperty<*>, new: V) {
-        if (value !is V) throw InvalidTypeException(
-            V::class.java.canonicalName,
-            value?.let { it::class.java.canonicalName } ?: "null"
-        )
-        value = new as T
-    }
-
-    operator fun setValue(thisRef: Any?, property: KProperty<*>, new: T?) {
-        value = new
-    }
-
-    /**
-     * A [PatchOption] representing a [String].
-     * @see PatchOption
-     */
-    class StringOption(
-        key: String,
-        default: String?,
-        title: String,
-        description: String,
-        required: Boolean = false,
-        validator: (String?) -> Boolean = { true }
-    ) : PatchOption<String>(
-        key, default, title, description, required, validator
-    )
-
-    /**
-     * A [PatchOption] representing a [Boolean].
-     * @see PatchOption
-     */
-    class BooleanOption(
-        key: String,
-        default: Boolean?,
-        title: String,
-        description: String,
-        required: Boolean = false,
-        validator: (Boolean?) -> Boolean = { true }
-    ) : PatchOption<Boolean>(
-        key, default, title, description, required, validator
-    )
-
-    /**
-     * A [PatchOption] with a list of allowed options.
-     * @param options A list of allowed options for the [ListOption].
-     * @see PatchOption
-     */
-    sealed class ListOption<E>(
-        key: String,
-        default: E?,
-        val options: Iterable<E>,
-        title: String,
-        description: String,
-        required: Boolean = false,
-        validator: (E?) -> Boolean = { true }
-    ) : PatchOption<E>(
-        key, default, title, description, required, {
-            (it?.let { it in options } ?: true) && validator(it)
-        }
-    ) {
-        init {
-            if (default != null && default !in options) {
-                throw IllegalStateException("Default option must be an allowed option")
-            }
-        }
-    }
-
-    /**
-     * A [ListOption] of type [String].
-     * @see ListOption
-     */
-    class StringListOption(
-        key: String,
-        default: String?,
-        options: Iterable<String>,
-        title: String,
-        description: String,
-        required: Boolean = false,
-        validator: (String?) -> Boolean = { true }
-    ) : ListOption<String>(
-        key, default, options, title, description, required, validator
-    )
-
-    /**
-     * A [ListOption] of type [Int].
-     * @see ListOption
-     */
-    class IntListOption(
-        key: String,
-        default: Int?,
-        options: Iterable<Int>,
-        title: String,
-        description: String,
-        required: Boolean = false,
-        validator: (Int?) -> Boolean = { true }
-    ) : ListOption<Int>(
-        key, default, options, title, description, required, validator
-    )
-}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/PatchResult.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/PatchResult.kt
@@ -0,0 +1,10 @@
+package app.revanced.patcher.patch
+
+/**
+ * A result of executing a [Patch].
+ *
+ * @param patch The [Patch] that was executed.
+ * @param exception The [PatchException] thrown, if any.
+ */
+@Suppress("MemberVisibilityCanBePrivate")
+class PatchResult internal constructor(val patch: Patch<*>, val exception: PatchException? = null)
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/ResourcePatch.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/ResourcePatch.kt
@@ -0,0 +1,24 @@
+package app.revanced.patcher.patch
+
+import app.revanced.patcher.PatchClass
+import app.revanced.patcher.data.ResourceContext
+
+/**
+ * A ReVanced [Patch] that works on [ResourceContext].
+ *
+ * @param name The name of the patch.
+ * @param description The description of the patch.
+ * @param compatiblePackages The packages the patch is compatible with.
+ * @param dependencies The names of patches this patch depends on.
+ * @param use Weather or not the patch should be used.
+ * @param requiresIntegrations Weather or not the patch requires integrations.
+ */
+abstract class ResourcePatch(
+    name: String? = null,
+    description: String? = null,
+    compatiblePackages: Set<CompatiblePackage>? = null,
+    dependencies: Set<PatchClass>? = null,
+    use: Boolean = true,
+    // TODO: Remove this property, once integrations are coupled with patches.
+    requiresIntegrations: Boolean = false,
+) : Patch<ResourceContext>(name, description, compatiblePackages, dependencies, use, requiresIntegrations)
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/annotations/PatchAnnotation.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/annotations/PatchAnnotation.kt
@@ -1,27 +0,0 @@
-package app.revanced.patcher.patch.annotations
-
-import app.revanced.patcher.Context
-import app.revanced.patcher.patch.Patch
-import kotlin.reflect.KClass
-
-/**
- * Annotation to mark a class as a patch.
- * @param include If false, the patch should be treated as optional by default.
- */
-@Target(AnnotationTarget.CLASS)
-annotation class Patch(val include: Boolean = true)
-
-/**
- * Annotation for dependencies of [Patch]es.
- */
-@Target(AnnotationTarget.CLASS)
-annotation class DependsOn(
-    val dependencies: Array<KClass<out Patch<Context>>> = [] // TODO: This should be a list of PatchClass instead
-)
-
-
-/**
- * Annotation to mark [Patch]es which depend on integrations.
- */
-@Target(AnnotationTarget.CLASS)
-annotation class RequiresIntegrations // TODO: Remove this annotation and replace it with a proper system
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/PatchOption.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/PatchOption.kt
@@ -0,0 +1,40 @@
+package app.revanced.patcher.patch.options
+
+import app.revanced.patcher.patch.Patch
+import kotlin.reflect.KProperty
+
+/**
+ * A [Patch] option.
+ * @param key The identifier.
+ * @param default The default value.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ * @param validate The function to validate values of the option.
+ * @param T The value type of the option.
+ */
+abstract class PatchOption<T>(
+    val key: String,
+    default: T?,
+    val title: String?,
+    val description: String?,
+    val required: Boolean,
+    val validate: (T?) -> Boolean
+) {
+    /**
+     * The value of the [PatchOption].
+     */
+    var value: T? = default
+        set(value) {
+            if (required && value == null) throw PatchOptionException.ValueRequiredException(this)
+            if (!validate(value)) throw PatchOptionException.ValueValidationException(value, this)
+
+            field = value
+        }
+
+    operator fun getValue(thisRef: Any?, property: KProperty<*>) = value
+
+    operator fun setValue(thisRef: Any?, property: KProperty<*>, value: T?) {
+        this.value = value
+    }
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/PatchOptionException.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/PatchOptionException.kt
@@ -0,0 +1,41 @@
+package app.revanced.patcher.patch.options
+
+/**
+ * An exception thrown when using [PatchOption]s.
+ *
+ * @param errorMessage The exception message.
+ */
+sealed class PatchOptionException(errorMessage: String) : Exception(errorMessage, null) {
+    /**
+     * An exception thrown when a [PatchOption] is set to an invalid value.
+     *
+     * @param invalidType The type of the value that was passed.
+     * @param expectedType The type of the value that was expected.
+     */
+    class InvalidValueTypeException(invalidType: String, expectedType: String) :
+        PatchOptionException("Type $expectedType was expected but received type $invalidType")
+
+    /**
+     * An exception thrown when a value did not satisfy the value conditions specified by the [PatchOption].
+     *
+     * @param value The value that failed validation.
+     */
+    class ValueValidationException(value: Any?, option: PatchOption<*>) :
+        Exception("The option value \"$value\" failed validation for ${option.key}")
+
+    /**
+     * An exception thrown when a value is required but null was passed.
+     *
+     * @param option The [PatchOption] that requires a value.
+     */
+    class ValueRequiredException(option: PatchOption<*>) :
+        Exception("The option ${option.key} requires a value, but null was passed")
+
+    /**
+     * An exception thrown when a [PatchOption] is not found.
+     *
+     * @param key The key of the [PatchOption].
+     */
+    class PatchOptionNotFoundException(key: String)
+        : Exception("No option with key $key")
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/PatchOptions.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/PatchOptions.kt
@@ -0,0 +1,43 @@
+package app.revanced.patcher.patch.options
+
+
+/**
+ * A map of [PatchOption]s associated by their keys.
+ *
+ * @param options The [PatchOption]s to initialize with.
+ */
+class PatchOptions internal constructor(
+    private val options: MutableMap<String, PatchOption<*>> = mutableMapOf()
+) : MutableMap<String, PatchOption<*>> by options {
+    /**
+     * Register a [PatchOption]. Acts like [MutableMap.put].
+     * @param value The [PatchOption] to register.
+     */
+    fun register(value: PatchOption<*>) {
+        options[value.key] = value
+    }
+
+    /**
+     * Set an option's value.
+     * @param key The identifier.
+     * @param value The value.
+     * @throws PatchOptionException.PatchOptionNotFoundException If the option does not exist.
+     */
+    inline operator fun <reified T: Any> set(key: String, value: T?) {
+        val option = this[key]
+
+        if (option.value !is T) throw PatchOptionException.InvalidValueTypeException(
+            T::class.java.name,
+            option.value?.let { it::class.java.name } ?: "null",
+        )
+
+        @Suppress("UNCHECKED_CAST")
+        (option as PatchOption<T>).value = value
+    }
+
+    /**
+     * Get an option.
+     */
+    override operator fun get(key: String) =
+        options[key] ?: throw PatchOptionException.PatchOptionNotFoundException(key)
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/types/BooleanPatchOption.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/types/BooleanPatchOption.kt
@@ -0,0 +1,48 @@
+package app.revanced.patcher.patch.options.types
+
+import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.patch.options.PatchOption
+
+/**
+ * A [PatchOption] representing a [Boolean].
+ *
+ * @param key The identifier.
+ * @param default The default value.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ *
+ * @see PatchOption
+ */
+class BooleanPatchOption private constructor(
+    key: String,
+    default: Boolean?,
+    title: String?,
+    description: String?,
+    required: Boolean,
+    validator: (Boolean?) -> Boolean
+) : PatchOption<Boolean>(key, default, title, description, required, validator) {
+    companion object {
+        /**
+         * Create a new [BooleanPatchOption] and add it to the current [Patch].
+         *
+         * @param key The identifier.
+         * @param default The default value.
+         * @param title The title.
+         * @param description A description.
+         * @param required Whether the option is required.
+         * @return The created [BooleanPatchOption].
+         *
+         * @see BooleanPatchOption
+         * @see PatchOption
+         */
+        fun <T : Patch<*>> T.booleanPatchOption(
+            key: String,
+            default: Boolean? = null,
+            title: String? = null,
+            description: String? = null,
+            required: Boolean = false,
+            validator: (Boolean?) -> Boolean = { true }
+        ) = BooleanPatchOption(key, default, title, description, required, validator).also  { options.register(it) }
+    }
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/types/FloatPatchOption.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/types/FloatPatchOption.kt
@@ -0,0 +1,48 @@
+package app.revanced.patcher.patch.options.types
+
+import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.patch.options.PatchOption
+
+/**
+ * A [PatchOption] representing a [Float].
+ *
+ * @param key The identifier.
+ * @param default The default value.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ *
+ * @see PatchOption
+ */
+class FloatPatchOption private constructor(
+    key: String,
+    default: Float?,
+    title: String?,
+    description: String?,
+    required: Boolean,
+    validator: (Float?) -> Boolean
+) : PatchOption<Float>(key, default, title, description, required, validator) {
+    companion object {
+        /**
+         * Create a new [FloatPatchOption] and add it to the current [Patch].
+         *
+         * @param key The identifier.
+         * @param default The default value.
+         * @param title The title.
+         * @param description A description.
+         * @param required Whether the option is required.
+         * @return The created [FloatPatchOption].
+         *
+         * @see FloatPatchOption
+         * @see PatchOption
+         */
+        fun <T : Patch<*>> T.floatPatchOption(
+            key: String,
+            default: Float? = null,
+            title: String? = null,
+            description: String? = null,
+            required: Boolean = false,
+            validator: (Float?) -> Boolean = { true }
+        ) = FloatPatchOption(key, default, title, description, required, validator).also  { options.register(it) }
+    }
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/types/IntPatchOption.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/types/IntPatchOption.kt
@@ -0,0 +1,48 @@
+package app.revanced.patcher.patch.options.types
+
+import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.patch.options.PatchOption
+
+/**
+ * A [PatchOption] representing an [Integer].
+ *
+ * @param key The identifier.
+ * @param default The default value.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ *
+ * @see PatchOption
+ */
+class IntPatchOption private constructor(
+    key: String,
+    default: Int?,
+    title: String?,
+    description: String?,
+    required: Boolean,
+    validator: (Int?) -> Boolean
+) : PatchOption<Int>(key, default, title, description, required, validator) {
+    companion object {
+        /**
+         * Create a new [IntPatchOption] and add it to the current [Patch].
+         *
+         * @param key The identifier.
+         * @param default The default value.
+         * @param title The title.
+         * @param description A description.
+         * @param required Whether the option is required.
+         * @return The created [IntPatchOption].
+         *
+         * @see IntPatchOption
+         * @see PatchOption
+         */
+        fun <T : Patch<*>> T.intPatchOption(
+            key: String,
+            default: Int? = null,
+            title: String? = null,
+            description: String? = null,
+            required: Boolean = false,
+            validator: (Int?) -> Boolean = { true }
+        ) = IntPatchOption(key, default, title, description, required, validator).also  { options.register(it) }
+    }
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/types/LongPatchOption.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/types/LongPatchOption.kt
@@ -0,0 +1,48 @@
+package app.revanced.patcher.patch.options.types
+
+import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.patch.options.PatchOption
+
+/**
+ * A [PatchOption] representing a [Long].
+ *
+ * @param key The identifier.
+ * @param default The default value.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ *
+ * @see PatchOption
+ */
+class LongPatchOption private constructor(
+    key: String,
+    default: Long?,
+    title: String?,
+    description: String?,
+    required: Boolean,
+    validator: (Long?) -> Boolean
+) : PatchOption<Long>(key, default, title, description, required, validator) {
+    companion object {
+        /**
+         * Create a new [LongPatchOption] and add it to the current [Patch].
+         *
+         * @param key The identifier.
+         * @param default The default value.
+         * @param title The title.
+         * @param description A description.
+         * @param required Whether the option is required.
+         * @return The created [LongPatchOption].
+         *
+         * @see LongPatchOption
+         * @see PatchOption
+         */
+        fun <T : Patch<*>> T.longPatchOption(
+            key: String,
+            default: Long? = null,
+            title: String? = null,
+            description: String? = null,
+            required: Boolean = false,
+            validator: (Long?) -> Boolean = { true }
+        ) = LongPatchOption(key, default, title, description, required, validator).also { options.register(it) }
+    }
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/types/StringPatchOption.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/types/StringPatchOption.kt
@@ -0,0 +1,48 @@
+package app.revanced.patcher.patch.options.types
+
+import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.patch.options.PatchOption
+
+/**
+ * A [PatchOption] representing a [String].
+ *
+ * @param key The identifier.
+ * @param default The default value.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ *
+ * @see PatchOption
+ */
+class StringPatchOption private constructor(
+    key: String,
+    default: String?,
+    title: String?,
+    description: String?,
+    required: Boolean,
+    validator: (String?) -> Boolean
+) : PatchOption<String>(key, default, title, description, required, validator) {
+    companion object {
+        /**
+         * Create a new [StringPatchOption] and add it to the current [Patch].
+         *
+         * @param key The identifier.
+         * @param default The default value.
+         * @param title The title.
+         * @param description A description.
+         * @param required Whether the option is required.
+         * @return The created [StringPatchOption].
+         *
+         * @see StringPatchOption
+         * @see PatchOption
+         */
+        fun <T : Patch<*>> T.stringPatchOption(
+            key: String,
+            default: String? = null,
+            title: String? = null,
+            description: String? = null,
+            required: Boolean = false,
+            validator: (String?) -> Boolean = { true }
+        ) = StringPatchOption(key, default, title, description, required, validator).also  { options.register(it) }
+    }
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/types/array/BooleanArrayPatchOption.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/types/array/BooleanArrayPatchOption.kt
@@ -0,0 +1,48 @@
+package app.revanced.patcher.patch.options.types.array
+
+import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.patch.options.PatchOption
+
+/**
+ * A [PatchOption] representing a [Boolean] array.
+ *
+ * @param key The identifier.
+ * @param default The default value.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ *
+ * @see PatchOption
+ */
+class BooleanArrayPatchOption private constructor(
+    key: String,
+    default: Array<Boolean>?,
+    title: String?,
+    description: String?,
+    required: Boolean,
+    validator: (Array<Boolean>?) -> Boolean
+) : PatchOption<Array<Boolean>>(key, default, title, description, required, validator) {
+    companion object {
+        /**
+         * Create a new [BooleanArrayPatchOption] and add it to the current [Patch].
+         *
+         * @param key The identifier.
+         * @param default The default value.
+         * @param title The title.
+         * @param description A description.
+         * @param required Whether the option is required.
+         * @return The created [BooleanArrayPatchOption].
+         *
+         * @see BooleanArrayPatchOption
+         * @see PatchOption
+         */
+        fun <T : Patch<*>> T.booleanArrayPatchOption(
+            key: String,
+            default: Array<Boolean>? = null,
+            title: String? = null,
+            description: String? = null,
+            required: Boolean = false,
+            validator: (Array<Boolean>?) -> Boolean = { true }
+        ) = BooleanArrayPatchOption(key, default, title, description, required, validator).also  { options.register(it) }
+    }
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/types/array/FloatArrayPatchOption.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/types/array/FloatArrayPatchOption.kt
@@ -0,0 +1,48 @@
+package app.revanced.patcher.patch.options.types.array
+
+import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.patch.options.PatchOption
+
+/**
+ * A [PatchOption] representing a [Float] array.
+ *
+ * @param key The identifier.
+ * @param default The default value.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ *
+ * @see PatchOption
+ */
+class FloatArrayPatchOption private constructor(
+    key: String,
+    default: Array<Float>?,
+    title: String?,
+    description: String?,
+    required: Boolean,
+    validator: (Array<Float>?) -> Boolean
+) : PatchOption<Array<Float>>(key, default, title, description, required, validator) {
+    companion object {
+        /**
+         * Create a new [FloatArrayPatchOption] and add it to the current [Patch].
+         *
+         * @param key The identifier.
+         * @param default The default value.
+         * @param title The title.
+         * @param description A description.
+         * @param required Whether the option is required.
+         * @return The created [FloatArrayPatchOption].
+         *
+         * @see FloatArrayPatchOption
+         * @see PatchOption
+         */
+        fun <T : Patch<*>> T.floatArrayPatchOption(
+            key: String,
+            default: Array<Float>? = null,
+            title: String? = null,
+            description: String? = null,
+            required: Boolean = false,
+            validator: (Array<Float>?) -> Boolean = { true }
+        ) = FloatArrayPatchOption(key, default, title, description, required, validator).also  { options.register(it) }
+    }
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/types/array/IntArrayPatchOption.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/types/array/IntArrayPatchOption.kt
@@ -0,0 +1,48 @@
+package app.revanced.patcher.patch.options.types.array
+
+import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.patch.options.PatchOption
+
+/**
+ * A [PatchOption] representing an [Integer] array.
+ *
+ * @param key The identifier.
+ * @param default The default value.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ *
+ * @see PatchOption
+ */
+class IntArrayPatchOption private constructor(
+    key: String,
+    default: Array<Int>?,
+    title: String?,
+    description: String?,
+    required: Boolean,
+    validator: (Array<Int>?) -> Boolean
+) : PatchOption<Array<Int>>(key, default, title, description, required, validator) {
+    companion object {
+        /**
+         * Create a new [IntArrayPatchOption] and add it to the current [Patch].
+         *
+         * @param key The identifier.
+         * @param default The default value.
+         * @param title The title.
+         * @param description A description.
+         * @param required Whether the option is required.
+         * @return The created [IntArrayPatchOption].
+         *
+         * @see IntArrayPatchOption
+         * @see PatchOption
+         */
+        fun <T : Patch<*>> T.intArrayPatchOption(
+            key: String,
+            default: Array<Int>? = null,
+            title: String? = null,
+            description: String? = null,
+            required: Boolean = false,
+            validator: (Array<Int>?) -> Boolean = { true }
+        ) = IntArrayPatchOption(key, default, title, description, required, validator).also { options.register(it) }
+    }
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/types/array/LongArrayPatchOption.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/types/array/LongArrayPatchOption.kt
@@ -0,0 +1,48 @@
+package app.revanced.patcher.patch.options.types.array
+
+import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.patch.options.PatchOption
+
+/**
+ * A [PatchOption] representing a [Long] array.
+ *
+ * @param key The identifier.
+ * @param default The default value.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ *
+ * @see PatchOption
+ */
+class LongArrayPatchOption private constructor(
+    key: String,
+    default: Array<Long>?,
+    title: String?,
+    description: String?,
+    required: Boolean,
+    validator: (Array<Long>?) -> Boolean
+) : PatchOption<Array<Long>>(key, default, title, description, required, validator) {
+    companion object {
+        /**
+         * Create a new [LongArrayPatchOption] and add it to the current [Patch].
+         *
+         * @param key The identifier.
+         * @param default The default value.
+         * @param title The title.
+         * @param description A description.
+         * @param required Whether the option is required.
+         * @return The created [LongArrayPatchOption].
+         *
+         * @see LongArrayPatchOption
+         * @see PatchOption
+         */
+        fun <T : Patch<*>> T.longArrayPatchOption(
+            key: String,
+            default: Array<Long>? = null,
+            title: String? = null,
+            description: String? = null,
+            required: Boolean = false,
+            validator: (Array<Long>?) -> Boolean = { true }
+        ) = LongArrayPatchOption(key, default, title, description, required, validator).also  { options.register(it) }
+    }
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/types/array/StringArrayPatchOption.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/patch/options/types/array/StringArrayPatchOption.kt
@@ -0,0 +1,48 @@
+package app.revanced.patcher.patch.options.types.array
+
+import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.patch.options.PatchOption
+
+/**
+ * A [PatchOption] representing a [String] array.
+ *
+ * @param key The identifier.
+ * @param default The default value.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ *
+ * @see PatchOption
+ */
+class StringArrayPatchOption private constructor(
+    key: String,
+    default: Array<String>?,
+    title: String?,
+    description: String?,
+    required: Boolean,
+    validator: (Array<String>?) -> Boolean
+) : PatchOption<Array<String>>(key, default, title, description, required, validator) {
+    companion object {
+        /**
+         * Create a new [StringArrayPatchOption] and add it to the current [Patch].
+         *
+         * @param key The identifier.
+         * @param default The default value.
+         * @param title The title.
+         * @param description A description.
+         * @param required Whether the option is required.
+         * @return The created [StringArrayPatchOption].
+         *
+         * @see StringArrayPatchOption
+         * @see PatchOption
+         */
+        fun <T : Patch<*>> T.stringArrayPatchOption(
+            key: String,
+            default: Array<String>? = null,
+            title: String? = null,
+            description: String? = null,
+            required: Boolean = false,
+            validator: (Array<String>?) -> Boolean = { true }
+        ) = StringArrayPatchOption(key, default, title, description, required, validator).also { options.register(it) }
+    }
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/ClassMerger.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/ClassMerger.kt
@@ -1,23 +1,23 @@
 package app.revanced.patcher.util

-import app.revanced.patcher.BytecodeContext
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.logging.Logger
 import app.revanced.patcher.util.ClassMerger.Utils.asMutableClass
 import app.revanced.patcher.util.ClassMerger.Utils.filterAny
 import app.revanced.patcher.util.ClassMerger.Utils.filterNotAny
 import app.revanced.patcher.util.ClassMerger.Utils.isPublic
 import app.revanced.patcher.util.ClassMerger.Utils.toPublic
-import app.revanced.patcher.util.TypeUtil.traverseClassHierarchy
+import app.revanced.patcher.util.ClassMerger.Utils.traverseClassHierarchy
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass.Companion.toMutable
 import app.revanced.patcher.util.proxy.mutableTypes.MutableField
 import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMutable
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.iface.ClassDef
-import org.jf.dexlib2.util.MethodUtil
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.iface.ClassDef
+import com.android.tools.smali.dexlib2.util.MethodUtil
+import java.util.logging.Logger
 import kotlin.reflect.KFunction2

 /**
@@ -25,27 +25,28 @@ import kotlin.reflect.KFunction2
 * Note: This will not consider method implementations or if the class is missing a superclass or interfaces.
 */
 internal object ClassMerger {
+    private val logger = Logger.getLogger(ClassMerger::class.java.name)
+
    /**
     * Merge a class with [otherClass].
     *
     * @param otherClass The class to merge with
     * @param context The context to traverse the class hierarchy in.
-     * @param logger A logger.
+     * @return The merged class or the original class if no merge was needed.
     */
-    fun ClassDef.merge(otherClass: ClassDef, context: BytecodeContext, logger: Logger? = null) = this
-        //.fixFieldAccess(otherClass, logger)
-        //.fixMethodAccess(otherClass, logger)
-        .addMissingFields(otherClass, logger)
-        .addMissingMethods(otherClass, logger)
-        .publicize(otherClass, context, logger)
+    fun ClassDef.merge(otherClass: ClassDef, context: BytecodeContext) = this
+        //.fixFieldAccess(otherClass)
+        //.fixMethodAccess(otherClass)
+        .addMissingFields(otherClass)
+        .addMissingMethods(otherClass)
+        .publicize(otherClass, context)

    /**
     * Add methods which are missing but existing in [fromClass].
     *
     * @param fromClass The class to add missing methods from.
-     * @param logger A logger.
     */
-    private fun ClassDef.addMissingMethods(fromClass: ClassDef, logger: Logger? = null): ClassDef {
+    private fun ClassDef.addMissingMethods(fromClass: ClassDef): ClassDef {
        val missingMethods = fromClass.methods.let { fromMethods ->
            methods.filterNot { method ->
                fromMethods.any { fromMethod ->
@@ -56,7 +57,7 @@ internal object ClassMerger {

        if (missingMethods.isEmpty()) return this

-        logger?.trace("Found ${missingMethods.size} missing methods")
+        logger.fine("Found ${missingMethods.size} missing methods")

        return asMutableClass().apply {
            methods.addAll(missingMethods.map { it.toMutable() })
@@ -67,16 +68,15 @@ internal object ClassMerger {
     * Add fields which are missing but existing in [fromClass].
     *
     * @param fromClass The class to add missing fields from.
-     * @param logger A logger.
     */
-    private fun ClassDef.addMissingFields(fromClass: ClassDef, logger: Logger? = null): ClassDef {
+    private fun ClassDef.addMissingFields(fromClass: ClassDef): ClassDef {
        val missingFields = fields.filterNotAny(fromClass.fields) { field, fromField ->
            fromField.name == field.name
        }

        if (missingFields.isEmpty()) return this

-        logger?.trace("Found ${missingFields.size} missing fields")
+        logger.fine("Found ${missingFields.size} missing fields")

        return asMutableClass().apply {
            fields.addAll(missingFields.map { it.toMutable() })
@@ -87,15 +87,14 @@ internal object ClassMerger {
     * Make a class and its super class public recursively.
     * @param reference The class to check the [AccessFlags] of.
     * @param context The context to traverse the class hierarchy in.
-     * @param logger A logger.
     */
-    private fun ClassDef.publicize(reference: ClassDef, context: BytecodeContext, logger: Logger? = null) =
+    private fun ClassDef.publicize(reference: ClassDef, context: BytecodeContext) =
        if (reference.accessFlags.isPublic() && !accessFlags.isPublic())
            this.asMutableClass().apply {
                context.traverseClassHierarchy(this) {
                    if (accessFlags.isPublic()) return@traverseClassHierarchy

-                    logger?.trace("Publicizing ${this.type}")
+                    logger.fine("Publicizing ${this.type}")

                    accessFlags = accessFlags.toPublic()
                }
@@ -106,9 +105,8 @@ internal object ClassMerger {
     * Publicize fields if they are public in [reference].
     *
     * @param reference The class to check the [AccessFlags] of the fields in.
-     * @param logger A logger.
     */
-    private fun ClassDef.fixFieldAccess(reference: ClassDef, logger: Logger? = null): ClassDef {
+    private fun ClassDef.fixFieldAccess(reference: ClassDef): ClassDef {
        val brokenFields = fields.filterAny(reference.fields) { field, referenceField ->
            if (field.name != referenceField.name) return@filterAny false

@@ -117,7 +115,7 @@ internal object ClassMerger {

        if (brokenFields.isEmpty()) return this

-        logger?.trace("Found ${brokenFields.size} broken fields")
+        logger.fine("Found ${brokenFields.size} broken fields")

        /**
         * Make a field public.
@@ -135,9 +133,8 @@ internal object ClassMerger {
     * Publicize methods if they are public in [reference].
     *
     * @param reference The class to check the [AccessFlags] of the methods in.
-     * @param logger A logger.
     */
-    private fun ClassDef.fixMethodAccess(reference: ClassDef, logger: Logger? = null): ClassDef {
+    private fun ClassDef.fixMethodAccess(reference: ClassDef): ClassDef {
        val brokenMethods = methods.filterAny(reference.methods) { method, referenceMethod ->
            if (!MethodUtil.methodSignaturesMatch(method, referenceMethod)) return@filterAny false

@@ -146,7 +143,7 @@ internal object ClassMerger {

        if (brokenMethods.isEmpty()) return this

-        logger?.trace("Found ${brokenMethods.size} methods")
+        logger.fine("Found ${brokenMethods.size} methods")

        /**
         * Make a method public.
@@ -161,6 +158,19 @@ internal object ClassMerger {
    }

    private object Utils {
+        /**
+         * traverse the class hierarchy starting from the given root class
+         *
+         * @param targetClass the class to start traversing the class hierarchy from
+         * @param callback function that is called for every class in the hierarchy
+         */
+        fun BytecodeContext.traverseClassHierarchy(targetClass: MutableClass, callback: MutableClass.() -> Unit) {
+            callback(targetClass)
+            this.findClass(targetClass.superclass ?: return)?.mutableClass?.let {
+                traverseClassHierarchy(it, callback)
+            }
+        }
+
        fun ClassDef.asMutableClass() = if (this is MutableClass) this else this.toMutable()

        /**
@@ -180,7 +190,6 @@ internal object ClassMerger {
        /**
         * Filter [this] on [needles] matching the given [predicate].
         *
-         * @param this The hay to filter for [needles].
         * @param needles The needles to filter [this] with.
         * @param predicate The filter.
         * @return The [this] filtered on [needles] matching the given [predicate].
@@ -192,7 +201,6 @@ internal object ClassMerger {
        /**
         * Filter [this] on [needles] not matching the given [predicate].
         *
-         * @param this The hay to filter for [needles].
         * @param needles The needles to filter [this] with.
         * @param predicate The filter.
         * @return The [this] filtered on [needles] not matching the given [predicate].
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/DomFileEditor.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/DomFileEditor.kt
@@ -0,0 +1,87 @@
+package app.revanced.patcher.util
+
+import org.w3c.dom.Document
+import java.io.Closeable
+import java.io.File
+import java.io.InputStream
+import java.io.OutputStream
+import javax.xml.parsers.DocumentBuilderFactory
+import javax.xml.transform.TransformerFactory
+import javax.xml.transform.dom.DOMSource
+import javax.xml.transform.stream.StreamResult
+
+/**
+ * Wrapper for a file that can be edited as a dom document.
+ *
+ * This constructor does not check for locks to the file when writing.
+ * Use the secondary constructor.
+ *
+ * @param inputStream the input stream to read the xml file from.
+ * @param outputStream the output stream to write the xml file to. If null, the file will be read only.
+ *
+ */
+class DomFileEditor internal constructor(
+    private val inputStream: InputStream,
+    private val outputStream: Lazy<OutputStream>? = null,
+) : Closeable {
+    // path to the xml file to unlock the resource when closing the editor
+    private var filePath: String? = null
+    private var closed: Boolean = false
+
+    /**
+     * The document of the xml file
+     */
+    val file: Document = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(inputStream)
+        .also(Document::normalize)
+
+
+    // lazily open an output stream
+    // this is required because when constructing a DomFileEditor the output stream is created along with the input stream, which is not allowed
+    // the workaround is to lazily create the output stream. This way it would be used after the input stream is closed, which happens in the constructor
+    constructor(file: File) : this(file.inputStream(), lazy { file.outputStream() }) {
+        // increase the lock
+        locks.merge(file.path, 1, Integer::sum)
+        filePath = file.path
+    }
+
+    /**
+     * Closes the editor. Write backs and decreases the lock count.
+     *
+     * Will not write back to the file if the file is still locked.
+     */
+    override fun close() {
+        if (closed) return
+
+        inputStream.close()
+
+        // if the output stream is not null, do not close it
+        outputStream?.let {
+            // prevent writing to same file, if it is being locked
+            // isLocked will be false if the editor was created through a stream
+            val isLocked = filePath?.let { path ->
+                val isLocked = locks[path]!! > 1
+                // decrease the lock count if the editor was opened for a file
+                locks.merge(path, -1, Integer::sum)
+                isLocked
+            } ?: false
+
+            // if unlocked, write back to the file
+            if (!isLocked) {
+                it.value.use { stream ->
+                    val result = StreamResult(stream)
+                    TransformerFactory.newInstance().newTransformer().transform(DOMSource(file), result)
+                }
+
+                it.value.close()
+                return
+            }
+        }
+
+        closed = true
+    }
+
+    private companion object {
+        // map of concurrent open files
+        val locks = mutableMapOf<String, Int>()
+    }
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/ListBackedSet.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/ListBackedSet.kt
@@ -1,15 +0,0 @@
-package app.revanced.patcher.util
-
-internal class ListBackedSet<E>(private val list: MutableList<E>) : MutableSet<E> {
-    override val size get() = list.size
-    override fun add(element: E) = list.add(element)
-    override fun addAll(elements: Collection<E>) = list.addAll(elements)
-    override fun clear() = list.clear()
-    override fun iterator() = list.listIterator()
-    override fun remove(element: E) = list.remove(element)
-    override fun removeAll(elements: Collection<E>) = list.removeAll(elements)
-    override fun retainAll(elements: Collection<E>) = list.retainAll(elements)
-    override fun contains(element: E) = list.contains(element)
-    override fun containsAll(elements: Collection<E>) = list.containsAll(elements)
-    override fun isEmpty() = list.isEmpty()
-}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/ProxyBackedClassList.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/ProxyBackedClassList.kt
@@ -1,89 +0,0 @@
-package app.revanced.patcher.util
-
-import app.revanced.patcher.util.proxy.ClassProxy
-import org.jf.dexlib2.iface.ClassDef
-
-/**
- * A class that represents a list of classes and proxies.
- *
- * @param classes The classes to be backed by proxies.
- */
-class ProxyBackedClassList(classes: Set<ClassDef>) : Iterable<ClassDef> {
-    // A list for pending proxied classes to be added to the current ProxyBackedClassList instance.
-    private val proxiedClasses = mutableListOf<ClassProxy>()
-    private val mutableClasses = classes.toMutableList()
-
-    /**
-     * Replace the [mutableClasses]es with their proxies.
-     */
-    internal fun applyProxies() {
-        proxiedClasses.removeIf { proxy ->
-            // If the proxy is unused, keep it in the proxiedClasses list.
-            if (!proxy.resolved) return@removeIf false
-
-            with(mutableClasses) {
-                remove(proxy.immutableClass)
-                add(proxy.mutableClass)
-            }
-
-            return@removeIf true
-        }
-    }
-
-    /**
-     * Replace a [ClassDef] at a given [index].
-     *
-     * @param index The index of the class to be replaced.
-     * @param classDef The new class to replace the old one.
-     */
-    operator fun set(index: Int, classDef: ClassDef) {
-        mutableClasses[index] = classDef
-    }
-
-    /**
-     * Get a [ClassDef] at a given [index].
-     *
-     * @param index The index of the class.
-     */
-    operator fun get(index: Int) = mutableClasses[index]
-
-    /**
-     * Iterator for the classes in [ProxyBackedClassList].
-     *
-     * @return The iterator for the classes.
-     */
-    override fun iterator() = mutableClasses.iterator()
-
-    /**
-     * Proxy a [ClassDef].
-     *
-     * Note: This creates a [ClassProxy] of the [ClassDef], if not already present.
-     *
-     * @return A proxy for the given class.
-     */
-    fun proxy(classDef: ClassDef) = proxiedClasses
-        .find { it.immutableClass.type == classDef.type } ?: ClassProxy(classDef).also(proxiedClasses::add)
-
-    /**
-     * Add a [ClassDef].
-     */
-    fun add(classDef: ClassDef) = mutableClasses.add(classDef)
-
-    /**
-     * Find a class by a given class name.
-     *
-     * @param className The name of the class.
-     * @return A proxy for the first class that matches the class name.
-     */
-    fun findClassProxied(className: String) = findClassProxied { it.type.contains(className) }
-
-    /**
-     * Find a class by a given predicate.
-     *
-     * @param predicate A predicate to match the class.
-     * @return A proxy for the first class that matches the predicate.
-     */
-    fun findClassProxied(predicate: (ClassDef) -> Boolean) = this.find(predicate)?.let(::proxy)
-
-    val size get() = mutableClasses.size
-}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/ProxyClassList.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/ProxyClassList.kt
@@ -0,0 +1,33 @@
+package app.revanced.patcher.util
+
+import app.revanced.patcher.util.proxy.ClassProxy
+import com.android.tools.smali.dexlib2.iface.ClassDef
+
+/**
+ * A class that represents a set of classes and proxies.
+ *
+ * @param classes The classes to be backed by proxies.
+ */
+class ProxyClassList internal constructor(classes: MutableSet<ClassDef>) : MutableSet<ClassDef> by classes {
+    internal val proxies = mutableListOf<ClassProxy>()
+
+    /**
+     * Add a [ClassProxy].
+     */
+    fun add(classProxy: ClassProxy) = proxies.add(classProxy)
+
+    /**
+     * Replace all classes with their mutated versions.
+     */
+    internal fun replaceClasses() = proxies.removeIf { proxy ->
+        // If the proxy is unused, return false to keep it in the proxies list.
+            if (!proxy.resolved) return@removeIf false
+
+        // If it has been used, replace the original class with the mutable class.
+        remove(proxy.immutableClass)
+        add(proxy.mutableClass)
+
+        // Return true to remove the proxy from the proxies list.
+            return@removeIf true
+        }
+}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/TypeUtil.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/TypeUtil.kt
@@ -1,19 +0,0 @@
-package app.revanced.patcher.util
-
-import app.revanced.patcher.BytecodeContext
-import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
-
-object TypeUtil {
-    /**
-     * Traverse the class hierarchy starting from the given root class.
-     *
-     * @param targetClass The class to start traversing the class hierarchy from.
-     * @param callback The function that is called for every class in the hierarchy.
-     */
-    fun BytecodeContext.traverseClassHierarchy(targetClass: MutableClass, callback: MutableClass.() -> Unit) {
-        callback(targetClass)
-        this.classes.findClassProxied(targetClass.superclass ?: return)?.mutableClass?.let {
-            traverseClassHierarchy(it, callback)
-        }
-    }
-}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/VersionReader.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/VersionReader.kt
@@ -1,19 +0,0 @@
-package app.revanced.patcher.util
-
-import java.util.*
-
-@Deprecated("This class serves no purpose anymore")
-internal object VersionReader {
-    @JvmStatic
-    private val properties = Properties().apply {
-        load(
-            VersionReader::class.java.getResourceAsStream("/app/revanced/patcher/version.properties")
-                ?: throw IllegalStateException("Could not load version.properties")
-        )
-    }
-
-    @JvmStatic
-    fun read(): String {
-        return properties.getProperty("version") ?: throw IllegalStateException("Version not found")
-    }
-}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/method/MethodWalker.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/method/MethodWalker.kt
@@ -1,11 +1,11 @@
 package app.revanced.patcher.util.method

-import app.revanced.patcher.BytecodeContext
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import org.jf.dexlib2.iface.Method
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.MethodReference
-import org.jf.dexlib2.util.MethodUtil
+import com.android.tools.smali.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+import com.android.tools.smali.dexlib2.util.MethodUtil

 /**
 * Find a method from another method via instruction offsets.
@@ -41,7 +41,7 @@ class MethodWalker internal constructor(
            val instruction = instructions.elementAt(offset)

            val newMethod = (instruction as ReferenceInstruction).reference as MethodReference
-            val proxy = bytecodeContext.classes.findClassProxied(newMethod.definingClass)!!
+            val proxy = bytecodeContext.findClass(newMethod.definingClass)!!

            val methods = if (walkMutable) proxy.mutableClass.methods else proxy.immutableClass.methods
            currentMethod = methods.first {
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/patch/PatchBundle.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/patch/PatchBundle.kt
@@ -1,59 +0,0 @@
-@file:Suppress("unused")
-
-package app.revanced.patcher.util.patch
-
-import app.revanced.patcher.extensions.AnnotationExtensions.findAnnotationRecursively
-import app.revanced.patcher.patch.Patch
-import app.revanced.patcher.patch.PatchClass
-import dalvik.system.PathClassLoader
-import org.jf.dexlib2.DexFileFactory
-import java.io.File
-import java.net.URLClassLoader
-import java.util.jar.JarFile
-import kotlin.streams.toList
-
-/**
- * A patch bundle.
- *
- * @param fromClasses The classes to get [Patch]es from.
- */
-sealed class PatchBundle private constructor(fromClasses: Iterable<Class<*>>) : Iterable<PatchClass> {
-    private val patches = fromClasses.filter {
-        if (it.isAnnotation) return@filter false
-
-        it.findAnnotationRecursively(app.revanced.patcher.patch.annotations.Patch::class) != null
-    }.map {
-        @Suppress("UNCHECKED_CAST")
-        it as PatchClass
-    }
-
-    override fun iterator() = patches.iterator()
-
-    /**
-     * A patch bundle of type [Jar].
-     *
-     * @param patchBundlePath The path to a patch bundle.
-     */
-    class Jar(private val patchBundlePath: File) : PatchBundle(
-        with(URLClassLoader(arrayOf(patchBundlePath.toURI().toURL()), PatchBundle::class.java.classLoader)) {
-            JarFile(patchBundlePath).stream().filter { it.name.endsWith(".class") }.map {
-                loadClass(
-                    it.realName.replace('/', '.').replace(".class", "")
-                )
-            }.toList()
-        }
-    )
-
-    /**
-     * A patch bundle of type [Dex] format.
-     *
-     * @param patchBundlePath The path to a patch bundle of dex format.
-     */
-    class Dex(private val patchBundlePath: File) : PatchBundle(
-        with(PathClassLoader(patchBundlePath.absolutePath, null, PatchBundle::class.java.classLoader)) {
-            DexFileFactory.loadDexFile(patchBundlePath, null).classes.map { classDef ->
-                classDef.type.substring(1, classDef.length - 1).replace('/', '.')
-            }.map { loadClass(it) }
-        }
-    )
-}
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/ClassProxy.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/ClassProxy.kt
@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy

 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
-import org.jf.dexlib2.iface.ClassDef
+import com.android.tools.smali.dexlib2.iface.ClassDef

 /**
 * A proxy class for a [ClassDef].
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation.kt
@@ -1,8 +1,8 @@
 package app.revanced.patcher.util.proxy.mutableTypes

 import app.revanced.patcher.util.proxy.mutableTypes.MutableAnnotationElement.Companion.toMutable
-import org.jf.dexlib2.base.BaseAnnotation
-import org.jf.dexlib2.iface.Annotation
+import com.android.tools.smali.dexlib2.base.BaseAnnotation
+import com.android.tools.smali.dexlib2.iface.Annotation

 class MutableAnnotation(annotation: Annotation) : BaseAnnotation() {
    private val visibility = annotation.visibility
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement.kt
@@ -2,9 +2,9 @@ package app.revanced.patcher.util.proxy.mutableTypes

 import app.revanced.patcher.util.proxy.mutableTypes.encodedValue.MutableEncodedValue
 import app.revanced.patcher.util.proxy.mutableTypes.encodedValue.MutableEncodedValue.Companion.toMutable
-import org.jf.dexlib2.base.BaseAnnotationElement
-import org.jf.dexlib2.iface.AnnotationElement
-import org.jf.dexlib2.iface.value.EncodedValue
+import com.android.tools.smali.dexlib2.base.BaseAnnotationElement
+import com.android.tools.smali.dexlib2.iface.AnnotationElement
+import com.android.tools.smali.dexlib2.iface.value.EncodedValue

 class MutableAnnotationElement(annotationElement: AnnotationElement) : BaseAnnotationElement() {
    private var name = annotationElement.name
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableClass.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableClass.kt
@@ -4,10 +4,10 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableAnnotation.Companion.
 import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMutable
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import com.google.common.collect.Iterables
-import org.jf.dexlib2.base.reference.BaseTypeReference
-import org.jf.dexlib2.iface.ClassDef
-import org.jf.dexlib2.util.FieldUtil
-import org.jf.dexlib2.util.MethodUtil
+import com.android.tools.smali.dexlib2.base.reference.BaseTypeReference
+import com.android.tools.smali.dexlib2.iface.ClassDef
+import com.android.tools.smali.dexlib2.util.FieldUtil
+import com.android.tools.smali.dexlib2.util.MethodUtil

 class MutableClass(classDef: ClassDef) : ClassDef, BaseTypeReference() {
    // Class
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableField.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableField.kt
@@ -3,9 +3,9 @@ package app.revanced.patcher.util.proxy.mutableTypes
 import app.revanced.patcher.util.proxy.mutableTypes.MutableAnnotation.Companion.toMutable
 import app.revanced.patcher.util.proxy.mutableTypes.encodedValue.MutableEncodedValue
 import app.revanced.patcher.util.proxy.mutableTypes.encodedValue.MutableEncodedValue.Companion.toMutable
-import org.jf.dexlib2.HiddenApiRestriction
-import org.jf.dexlib2.base.reference.BaseFieldReference
-import org.jf.dexlib2.iface.Field
+import com.android.tools.smali.dexlib2.HiddenApiRestriction
+import com.android.tools.smali.dexlib2.base.reference.BaseFieldReference
+import com.android.tools.smali.dexlib2.iface.Field

 class MutableField(field: Field) : Field, BaseFieldReference() {
    private var definingClass = field.definingClass
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethod.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethod.kt
@@ -2,10 +2,10 @@ package app.revanced.patcher.util.proxy.mutableTypes

 import app.revanced.patcher.util.proxy.mutableTypes.MutableAnnotation.Companion.toMutable
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethodParameter.Companion.toMutable
-import org.jf.dexlib2.HiddenApiRestriction
-import org.jf.dexlib2.base.reference.BaseMethodReference
-import org.jf.dexlib2.builder.MutableMethodImplementation
-import org.jf.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.HiddenApiRestriction
+import com.android.tools.smali.dexlib2.base.reference.BaseMethodReference
+import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
+import com.android.tools.smali.dexlib2.iface.Method

 class MutableMethod(method: Method) : Method, BaseMethodReference() {
    private var definingClass = method.definingClass
@@ -13,7 +13,7 @@ class MutableMethod(method: Method) : Method, BaseMethodReference() {
    private var accessFlags = method.accessFlags
    private var returnType = method.returnType

-    // TODO: Create own mutable MethodImplementation (due to not being able to change members like register count).
+    // Create own mutable MethodImplementation (due to not being able to change members like register count)
    private val _implementation by lazy { method.implementation?.let { MutableMethodImplementation(it) } }
    private val _annotations by lazy { method.annotations.map { annotation -> annotation.toMutable() }.toMutableSet() }
    private val _parameters by lazy { method.parameters.map { parameter -> parameter.toMutable() }.toMutableList() }
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter.kt
@@ -1,10 +1,10 @@
 package app.revanced.patcher.util.proxy.mutableTypes

 import app.revanced.patcher.util.proxy.mutableTypes.MutableAnnotation.Companion.toMutable
-import org.jf.dexlib2.base.BaseMethodParameter
-import org.jf.dexlib2.iface.MethodParameter
+import com.android.tools.smali.dexlib2.base.BaseMethodParameter
+import com.android.tools.smali.dexlib2.iface.MethodParameter

-// TODO: Finish overriding all members if necessary.
+// TODO: finish overriding all members if necessary
 class MutableMethodParameter(parameter: MethodParameter) : MethodParameter, BaseMethodParameter() {
    private var type = parameter.type
    private var name = parameter.name
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue.kt
@@ -1,9 +1,9 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue

 import app.revanced.patcher.util.proxy.mutableTypes.MutableAnnotationElement.Companion.toMutable
-import org.jf.dexlib2.base.value.BaseAnnotationEncodedValue
-import org.jf.dexlib2.iface.AnnotationElement
-import org.jf.dexlib2.iface.value.AnnotationEncodedValue
+import com.android.tools.smali.dexlib2.base.value.BaseAnnotationEncodedValue
+import com.android.tools.smali.dexlib2.iface.AnnotationElement
+import com.android.tools.smali.dexlib2.iface.value.AnnotationEncodedValue

 class MutableAnnotationEncodedValue(annotationEncodedValue: AnnotationEncodedValue) : BaseAnnotationEncodedValue(),
    MutableEncodedValue {
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue.kt
@@ -1,9 +1,9 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue

 import app.revanced.patcher.util.proxy.mutableTypes.encodedValue.MutableEncodedValue.Companion.toMutable
-import org.jf.dexlib2.base.value.BaseArrayEncodedValue
-import org.jf.dexlib2.iface.value.ArrayEncodedValue
-import org.jf.dexlib2.iface.value.EncodedValue
+import com.android.tools.smali.dexlib2.base.value.BaseArrayEncodedValue
+import com.android.tools.smali.dexlib2.iface.value.ArrayEncodedValue
+import com.android.tools.smali.dexlib2.iface.value.EncodedValue

 class MutableArrayEncodedValue(arrayEncodedValue: ArrayEncodedValue) : BaseArrayEncodedValue(), MutableEncodedValue {
    private val _value by lazy {
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue.kt
@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue

-import org.jf.dexlib2.base.value.BaseBooleanEncodedValue
-import org.jf.dexlib2.iface.value.BooleanEncodedValue
+import com.android.tools.smali.dexlib2.base.value.BaseBooleanEncodedValue
+import com.android.tools.smali.dexlib2.iface.value.BooleanEncodedValue

 class MutableBooleanEncodedValue(booleanEncodedValue: BooleanEncodedValue) : BaseBooleanEncodedValue(),
    MutableEncodedValue {
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue.kt
@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue

-import org.jf.dexlib2.base.value.BaseByteEncodedValue
-import org.jf.dexlib2.iface.value.ByteEncodedValue
+import com.android.tools.smali.dexlib2.base.value.BaseByteEncodedValue
+import com.android.tools.smali.dexlib2.iface.value.ByteEncodedValue

 class MutableByteEncodedValue(byteEncodedValue: ByteEncodedValue) : BaseByteEncodedValue(), MutableEncodedValue {
    private var value = byteEncodedValue.value
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue.kt
@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue

-import org.jf.dexlib2.base.value.BaseCharEncodedValue
-import org.jf.dexlib2.iface.value.CharEncodedValue
+import com.android.tools.smali.dexlib2.base.value.BaseCharEncodedValue
+import com.android.tools.smali.dexlib2.iface.value.CharEncodedValue

 class MutableCharEncodedValue(charEncodedValue: CharEncodedValue) : BaseCharEncodedValue(), MutableEncodedValue {
    private var value = charEncodedValue.value
--- a/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue.kt
+++ b/revanced-patcher/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue.kt
@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue

-import org.jf.dexlib2.base.value.BaseDoubleEncodedValue
-import org.jf.dexlib2.iface.value.DoubleEncodedValue
+import com.android.tools.smali.dexlib2.base.value.BaseDoubleEncodedValue
+import com.android.tools.smali.dexlib2.iface.value.DoubleEncodedValue

 class MutableDoubleEncodedValue(doubleEncodedValue: DoubleEncodedValue) : BaseDoubleEncodedValue(),
    MutableEncodedValue {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
semantic-release-bot	d3721229bf	chore(release): 15.0.0-dev.2 [skip ci] # [15.0.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v15.0.0-dev.1...v15.0.0-dev.2) (2023-09-06)	2023-09-06 03:36:03 +00:00
oSumAtrIX	86c1c9c772	build(Needs bump): Use correct Maven repository URL	2023-09-06 05:32:58 +02:00
oSumAtrIX	c299817193	feat!: Use Kotlin DSL for patch options (#234 )	2023-09-06 02:53:31 +02:00
semantic-release-bot	fcc1de45ed	chore(release): 15.0.0-dev.1 [skip ci] # [15.0.0-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v14.2.2...v15.0.0-dev.1) (2023-09-04) * feat!: Add patch annotation processor ([`3fc6a13`](`3fc6a139ee`)) * feat!: Remove patch annotations ([`3b4db3d`](`3b4db3ddb7`)) ### Features * Add patch annotation processor ([#231](https://github.com/ReVanced/revanced-patcher/issues/231)) ([`a29931f`](`a29931f2ec`)) ### BREAKING CHANGES * The manifest for patches has been removed, and the properties have been added to patches. Patches are now `OptionsContainer`. The `@Patch` annotation has been removed in favour of the `@Patch` annotation from the annotation processor. * Patch annotations have been removed. PatcherException is now thrown in various places. PatchBundleLoader is now a map of patches associated by their name. Patches are now instances.	2023-09-04 03:51:04 +00:00
oSumAtrIX	a29931f2ec	feat: Add patch annotation processor (#231 )	2023-09-04 05:48:20 +02:00
oSumAtrIX	3fc6a139ee	feat!: Add patch annotation processor This commit introduces an annotation processor for patches. Patches can use the `@Patch` instead of super constructor parameters. BREAKING CHANGE: The manifest for patches has been removed, and the properties have been added to patches. Patches are now `OptionsContainer`. The `@Patch` annotation has been removed in favour of the `@Patch` annotation from the annotation processor.	2023-09-04 05:43:41 +02:00
oSumAtrIX	4dd04975d9	refactor: Move ReVanced Patcher to sub-project This allows other sub-projects to exist.	2023-09-04 05:37:13 +02:00
oSumAtrIX	3b4db3ddb7	feat!: Remove patch annotations Annotations required reflection and working with them turned out to be rather cumbersome. The annotations have been replaced with properties for the most part. BREAKING CHANGE: Patch annotations have been removed. PatcherException is now thrown in various places. PatchBundleLoader is now a map of patches associated by their name. Patches are now instances.	2023-09-04 05:24:29 +02:00
semantic-release-bot	c4a7117ee8	chore(release): 14.2.2 [skip ci] ## [14.2.2](https://github.com/ReVanced/revanced-patcher/compare/v14.2.1...v14.2.2) (2023-08-30) ### Bug Fixes * allow setting `DexClassLoader.optimizedDirectory` ([`11a3378`](`11a3378659`))	2023-08-30 17:25:12 +00:00
oSumAtrIX	b4e900fde8	chore: merge branch `dev` to `main` (#226 )	2023-08-30 19:22:46 +02:00
semantic-release-bot	9818d730e4	chore(release): 14.2.2-dev.1 [skip ci] ## [14.2.2-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v14.2.1...v14.2.2-dev.1) (2023-08-29) ### Bug Fixes * allow setting `DexClassLoader.optimizedDirectory` ([`11a3378`](`11a3378659`))	2023-08-29 02:12:54 +00:00
oSumAtrIX	11a3378659	fix: allow setting `DexClassLoader.optimizedDirectory` This is required for API level below 26, otherwise an NPE is thrown	2023-08-29 04:09:17 +02:00
oSumAtrIX	1bb05f22d3	chore: add initial API dump This is necessary for the binary compatibility validation.	2023-08-29 04:05:18 +02:00
oSumAtrIX	26b70554c4	build: use binary compatibility validator This prevents releasing breaking changes accidentally.	2023-08-29 03:47:21 +02:00
oSumAtrIX	93b29d2e83	chore: assert instead of printing in tests	2023-08-29 03:38:11 +02:00
semantic-release-bot	072986374a	chore(release): 14.2.1 [skip ci] ## [14.2.1](https://github.com/ReVanced/revanced-patcher/compare/v14.2.0...v14.2.1) (2023-08-27) ### Bug Fixes * do not flag resource table as sparse when main package is not loaded ([`b832812`](`b832812767`))	2023-08-27 20:23:09 +00:00
oSumAtrIX	2c590d212a	chore: merge branch `dev` to `main` (#225 )	2023-08-27 22:21:36 +02:00
semantic-release-bot	6cc863efb3	chore(release): 14.2.1-dev.1 [skip ci] ## [14.2.1-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v14.2.0...v14.2.1-dev.1) (2023-08-27) ### Bug Fixes * do not flag resource table as sparse when main package is not loaded ([`b832812`](`b832812767`))	2023-08-27 20:17:31 +00:00
oSumAtrIX	b832812767	fix: do not flag resource table as sparse when main package is not loaded	2023-08-27 22:14:43 +02:00
oSumAtrIX	c44558cacd	build: bump dependencies This fixes an issue with flagging the resource table with sparse incorrectly.	2023-08-27 22:14:11 +02:00
semantic-release-bot	6d83a720cd	chore(release): 14.2.0 [skip ci] # [14.2.0](https://github.com/ReVanced/revanced-patcher/compare/v14.1.0...v14.2.0) (2023-08-27) ### Features * load patches in lexicographical order ([`e8f2087`](`e8f2087a6f`)) * log when merging integrations ([`983563e`](`983563efb6`)) ### Performance Improvements * compare types of classes ([`55d6945`](`55d694579a`))	2023-08-27 00:55:36 +00:00
oSumAtrIX	8d0dd9c448	chore: merge branch `dev` to `main` (#222 )	2023-08-27 02:53:47 +02:00
oSumAtrIX	64020eec49	chore: add multi-threading opportunity notice	2023-08-26 20:58:19 +02:00
semantic-release-bot	4dedfb85cb	chore(release): 14.2.0-dev.3 [skip ci] # [14.2.0-dev.3](https://github.com/ReVanced/revanced-patcher/compare/v14.2.0-dev.2...v14.2.0-dev.3) (2023-08-26) ### Performance Improvements * compare types of classes ([`55d6945`](`55d694579a`))	2023-08-26 17:44:12 +00:00
oSumAtrIX	55d694579a	perf: compare types of classes	2023-08-26 19:42:33 +02:00
semantic-release-bot	86db64edff	chore(release): 14.2.0-dev.2 [skip ci] # [14.2.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v14.2.0-dev.1...v14.2.0-dev.2) (2023-08-26) ### Features * log when merging integrations ([`983563e`](`983563efb6`))	2023-08-26 17:16:08 +00:00
oSumAtrIX	983563efb6	feat: log when merging integrations	2023-08-26 19:14:29 +02:00
oSumAtrIX	37abb2db99	build: package the Java sources	2023-08-26 19:10:29 +02:00
semantic-release-bot	5ba0b47e60	chore(release): 14.2.0-dev.1 [skip ci] # [14.2.0-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v14.1.0...v14.2.0-dev.1) (2023-08-25) ### Features * load patches in lexicographical order ([`e8f2087`](`e8f2087a6f`))	2023-08-25 15:12:46 +00:00
oSumAtrIX	e8f2087a6f	feat: load patches in lexicographical order This feature was lost in past commits	2023-08-25 17:10:44 +02:00
semantic-release-bot	6ce99f5cdf	chore(release): 14.1.0 [skip ci] # [14.1.0](https://github.com/ReVanced/revanced-patcher/compare/v14.0.0...v14.1.0) (2023-08-24) ### Bug Fixes * move version properties file to correct package ([`e985676`](`e985676c2d`)) ### Features * properly make use of logging facade ([`ba56a6a`](`ba56a6a2ee`))	2023-08-24 02:50:15 +00:00
oSumAtrIX	13c0c9cdd3	chore: merge branch `dev` to `main` (#220 )	2023-08-24 04:48:39 +02:00
semantic-release-bot	58ffdb60d7	chore(release): 14.1.0-dev.1 [skip ci] # [14.1.0-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v14.0.1-dev.1...v14.1.0-dev.1) (2023-08-24) ### Features * properly make use of logging facade ([`ba56a6a`](`ba56a6a2ee`))	2023-08-24 02:45:16 +00:00
oSumAtrIX	ba56a6a2ee	feat: properly make use of logging facade This deprecates the primary constructor of `PatcherOptions` with the `logger` parameter	2023-08-24 04:43:16 +02:00
oSumAtrIX	ccccf5b1d2	build: migrate dependencies to version catalogs	2023-08-23 04:30:31 +02:00
semantic-release-bot	b507ac0a54	chore(release): 14.0.1-dev.1 [skip ci] ## [14.0.1-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v14.0.0...v14.0.1-dev.1) (2023-08-23) ### Bug Fixes * move version properties file to correct package ([`e985676`](`e985676c2d`))	2023-08-23 01:39:26 +00:00
oSumAtrIX	e985676c2d	fix: move version properties file to correct package	2023-08-23 03:36:48 +02:00
oSumAtrIX	f7f4ba6c55	build: update dependencies	2023-08-23 03:36:48 +02:00
semantic-release-bot	4292f43814	chore(release): 14.0.0 [skip ci] # [14.0.0](https://github.com/ReVanced/revanced-patcher/compare/v13.0.0...v14.0.0) (2023-08-22) ### Bug Fixes * log decoding resources after logging deleting resource cache directory ([`db62a16`](`db62a1607b`)) * only emit closed patches that did not throw an exception with the `@Patch` annotation ([`5938f6b`](`5938f6b7ea`)) * supply the parent classloader to `DexClassLoader` ([`0f15077`](`0f15077225`)) ### Code Refactoring * improve structure and public API ([`6b8977f`](`6b8977f178`)) ### Features * do not log instantiation of ReVanced Patcher ([`273dd8d`](`273dd8d388`)) ### BREAKING CHANGES * Various public APIs have been changed. The `Version` annotation has been removed. Patches do not return anything anymore and instead throw `PatchException`. Multiple patch bundles can now be loaded in a single ClassLoader to bypass class loader isolation.	2023-08-22 17:16:51 +00:00
oSumAtrIX	30bd4fd9fe	chore: merge branch `dev` to `main` (#217 )	2023-08-22 19:15:09 +02:00
semantic-release-bot	76de39369d	chore(release): 14.0.0-dev.4 [skip ci] # [14.0.0-dev.4](https://github.com/ReVanced/revanced-patcher/compare/v14.0.0-dev.3...v14.0.0-dev.4) (2023-08-22) ### Bug Fixes * only emit closed patches that did not throw an exception with the `@Patch` annotation ([`5938f6b`](`5938f6b7ea`))	2023-08-22 17:04:25 +00:00
oSumAtrIX	88a703ce36	build: bump dependencies	2023-08-22 19:01:59 +02:00
oSumAtrIX	5938f6b7ea	fix: only emit closed patches that did not throw an exception with the `@Patch` annotation	2023-08-22 19:00:34 +02:00
semantic-release-bot	5c0c0d6c37	chore(release): 14.0.0-dev.3 [skip ci] # [14.0.0-dev.3](https://github.com/ReVanced/revanced-patcher/compare/v14.0.0-dev.2...v14.0.0-dev.3) (2023-08-20) ### Bug Fixes * supply the parent classloader to `DexClassLoader` ([`0f15077`](`0f15077225`)) ### Features * do not log instantiation of ReVanced Patcher ([`273dd8d`](`273dd8d388`))	2023-08-20 17:16:00 +00:00
oSumAtrIX	0f15077225	fix: supply the parent classloader to `DexClassLoader`	2023-08-20 19:14:10 +02:00
oSumAtrIX	273dd8d388	feat: do not log instantiation of ReVanced Patcher	2023-08-20 19:14:09 +02:00
semantic-release-bot	1795f376ef	chore(release): 14.0.0-dev.2 [skip ci] # [14.0.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v14.0.0-dev.1...v14.0.0-dev.2) (2023-08-19)	2023-08-19 15:26:18 +00:00
oSumAtrIX	e7360a7692	build(Needs bump): Bump dependencies This fixes an issue with a library not working on Android	2023-08-19 17:23:31 +02:00
semantic-release-bot	e1fc86934f	chore(release): 14.0.0-dev.1 [skip ci] # [14.0.0-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v13.0.0...v14.0.0-dev.1) (2023-08-18) ### Bug Fixes * log decoding resources after logging deleting resource cache directory ([`db62a16`](`db62a1607b`)) ### Code Refactoring * improve structure and public API ([`6b8977f`](`6b8977f178`)) ### BREAKING CHANGES * Various public APIs have been changed. The `Version` annotation has been removed. Patches do not return anything anymore and instead throw `PatchException`. Multiple patch bundles can now be loaded in a single ClassLoader to bypass class loader isolation.	2023-08-18 23:47:18 +00:00
oSumAtrIX	6b8977f178	refactor: improve structure and public API This commit introduces a couple changes besides the refactor. Executing patches can be cancelled, multiple bundles loaded into the same class loader and `Patch.execute` does not have to return anymore. BREAKING CHANGE: Various public APIs have been changed. The `Version` annotation has been removed. Patches do not return anything anymore and instead throw `PatchException`. Multiple patch bundles can now be loaded in a single ClassLoader to bypass class loader isolation.	2023-08-19 01:45:27 +02:00
oSumAtrIX	12c6c73de0	build: add `mavenLocal` to repositories	2023-08-16 16:53:47 +02:00
oSumAtrIX	db62a1607b	fix: log decoding resources after logging deleting resource cache directory	2023-08-16 16:53:45 +02:00
semantic-release-bot	58bb879ef5	chore(release): 13.0.0 [skip ci] # [13.0.0](https://github.com/ReVanced/revanced-patcher/compare/v12.1.1...v13.0.0) (2023-08-14) ### Bug Fixes * decode in correct order ([`8fb2f2d`](`8fb2f2dc1d`)) * disable correct loggers ([`c2d89c6`](`c2d89c622e`)) * get framework ids to compile resources ([`f2cb7ee`](`f2cb7ee7df`)) * only enable logging for ReVanced ([`783ccf8`](`783ccf8529`)) * set package metadata correctly ([`02d6ff1`](`02d6ff15fe`)) * build(Needs bump)!: Bump dependencies ([`d5f89a9`](`d5f89a903f`)) ### BREAKING CHANGES * This bump updates smali, a crucial dependency	2023-08-14 02:11:55 +00:00
oSumAtrIX	254912438a	chore: merge branch `dev` to `main` (#213 )	2023-08-14 04:10:17 +02:00
semantic-release-bot	0e48918bcc	chore(release): 13.0.0-dev.3 [skip ci] # [13.0.0-dev.3](https://github.com/ReVanced/revanced-patcher/compare/v13.0.0-dev.2...v13.0.0-dev.3) (2023-08-14) ### Bug Fixes * decode in correct order ([`8fb2f2d`](`8fb2f2dc1d`)) * only enable logging for ReVanced ([`783ccf8`](`783ccf8529`))	2023-08-14 02:04:54 +00:00
oSumAtrIX	783ccf8529	fix: only enable logging for ReVanced	2023-08-14 04:02:39 +02:00
oSumAtrIX	8fb2f2dc1d	fix: decode in correct order	2023-08-14 04:02:24 +02:00
semantic-release-bot	2a8cc283c7	chore(release): 13.0.0-dev.2 [skip ci] # [13.0.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v13.0.0-dev.1...v13.0.0-dev.2) (2023-08-12) ### Bug Fixes * disable correct loggers ([`c2d89c6`](`c2d89c622e`)) * get framework ids to compile resources ([`f2cb7ee`](`f2cb7ee7df`)) * set package metadata correctly ([`02d6ff1`](`02d6ff15fe`))	2023-08-12 00:25:18 +00:00
oSumAtrIX	433fe3af9f	build(Needs bump): Bump dependencies	2023-08-12 02:23:03 +02:00
oSumAtrIX	c2d89c622e	fix: disable correct loggers	2023-08-12 02:22:52 +02:00
oSumAtrIX	02d6ff15fe	fix: set package metadata correctly	2023-08-12 02:19:28 +02:00
oSumAtrIX	f2cb7ee7df	fix: get framework ids to compile resources	2023-08-12 02:18:43 +02:00
oSumAtrIX	a2ac44dcc1	chore: use more generic inline docs	2023-08-12 02:15:26 +02:00
semantic-release-bot	3cf9d74efa	chore(release): 13.0.0-dev.1 [skip ci] # [13.0.0-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v12.1.1...v13.0.0-dev.1) (2023-08-11) * build(Needs bump)!: Bump dependencies ([`d5f89a9`](`d5f89a903f`)) ### BREAKING CHANGES * This bump updates smali, a crucial dependency	2023-08-11 00:53:46 +00:00
oSumAtrIX	d5f89a903f	build(Needs bump)!: Bump dependencies BREAKING CHANGE: This bump updates smali, a crucial dependency	2023-08-11 02:51:37 +02:00
semantic-release-bot	496c2242bc	chore(release): 12.1.1 [skip ci] ## [12.1.1](https://github.com/ReVanced/revanced-patcher/compare/v12.1.0...v12.1.1) (2023-08-03) ### Bug Fixes * clear method lookup maps before initializing them ([#210](https://github.com/ReVanced/revanced-patcher/issues/210)) ([`746544f`](`746544f9d5`))	2023-08-03 18:34:22 +00:00
oSumAtrIX	98fbff87df	chore: merge branch `dev` to `main` (#211 )	2023-08-03 20:32:45 +02:00
semantic-release-bot	ddb51a1c45	chore(release): 12.1.1-dev.2 [skip ci] ## [12.1.1-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v12.1.1-dev.1...v12.1.1-dev.2) (2023-08-03)	2023-08-03 18:16:10 +00:00
oSumAtrIX	8df1155215	build(Needs bump): Bump compatibility	2023-08-03 20:14:01 +02:00
semantic-release-bot	53f2a61409	chore(release): 12.1.1-dev.1 [skip ci] ## [12.1.1-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v12.1.0...v12.1.1-dev.1) (2023-08-03) ### Bug Fixes * clear method lookup maps before initializing them ([#210](https://github.com/ReVanced/revanced-patcher/issues/210)) ([`746544f`](`746544f9d5`))	2023-08-03 11:43:51 +00:00
aAbed	746544f9d5	fix: clear method lookup maps before initializing them (#210 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2023-08-03 13:42:00 +02:00
semantic-release-bot	c65c3df11c	chore(release): 12.1.0 [skip ci] # [12.1.0](https://github.com/ReVanced/revanced-patcher/compare/v12.0.0...v12.1.0) (2023-08-03) ### Features * add `MutableMethod.getInstructions` extension function ([`fae4029`](`fae4029cfc`))	2023-08-03 02:43:21 +00:00
oSumAtrIX	b29b8f12b3	chore: merge branch `dev` to `main` (#209 )	2023-08-03 04:18:23 +02:00
semantic-release-bot	d6945677c4	chore(release): 12.1.0-dev.2 [skip ci] # [12.1.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v12.1.0-dev.1...v12.1.0-dev.2) (2023-08-03)	2023-08-03 02:16:55 +00:00
oSumAtrIX	aedf4aea08	build(Needs bump): Update dependencies	2023-08-03 04:15:09 +02:00
semantic-release-bot	dc28d414dc	chore(release): 12.1.0-dev.1 [skip ci] # [12.1.0-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v12.0.0...v12.1.0-dev.1) (2023-08-01) ### Features * add `MutableMethod.getInstructions` extension function ([`fae4029`](`fae4029cfc`))	2023-08-01 22:14:09 +00:00
oSumAtrIX	9755bab298	refactor: remove unnecessary annotation	2023-08-02 00:12:24 +02:00
oSumAtrIX	fae4029cfc	feat: add `MutableMethod.getInstructions` extension function	2023-08-02 00:11:56 +02:00
oSumAtrIX	1790f0d706	ci: Change bumping commit scope	2023-07-30 02:50:41 +02:00
semantic-release-bot	0ba2c51676	chore(release): 12.0.0 [skip ci] # [12.0.0](https://github.com/ReVanced/revanced-patcher/compare/v11.0.4...v12.0.0) (2023-07-30) ### Bug Fixes * correct access flags of `PackageMetadata` ([`416d691`](`416d69142f`)) * set resource table via resource decoder ([`e0f8e1b`](`e0f8e1b71a`)) ### Features * Deprecate `Version` annotation ([`c9bbcf2`](`c9bbcf2bf2`)) * remove `Path` option ([#202](https://github.com/ReVanced/revanced-patcher/issues/202)) ([`69e4a49`](`69e4a49065`)) ### BREAKING CHANGES * This removes the previously available `Path` option	2023-07-30 00:10:57 +00:00
oSumAtrIX	03cd97b49c	chore: merge branch `dev` to `main` (#203 )	2023-07-30 02:09:12 +02:00
semantic-release-bot	16a162c1dd	chore(release): 12.0.0-dev.2 [skip ci] # [12.0.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v12.0.0-dev.1...v12.0.0-dev.2) (2023-07-28) ### Features * Deprecate `Version` annotation ([`400442f`](`400442f70e`))	2023-07-28 20:19:02 +02:00
oSumAtrIX	c9bbcf2bf2	feat: Deprecate `Version` annotation	2023-07-28 20:19:01 +02:00
semantic-release-bot	86e1bf6078	chore(release): 12.0.0-dev.1 [skip ci] # [12.0.0-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v11.0.4...v12.0.0-dev.1) (2023-07-26) ### Bug Fixes * correct access flags of `PackageMetadata` ([`416d691`](`416d69142f`)) * set resource table via resource decoder ([`e0f8e1b`](`e0f8e1b71a`)) ### Features * remove `Path` option ([#202](https://github.com/ReVanced/revanced-patcher/issues/202)) ([`69e4a49`](`69e4a49065`)) ### BREAKING CHANGES * This removes the previously available `Path` option	2023-07-26 04:30:48 +00:00
oSumAtrIX	1bca84ef0b	refactor: move code out of try block	2023-07-26 06:28:48 +02:00
oSumAtrIX	e0f8e1b71a	fix: set resource table via resource decoder	2023-07-26 06:28:48 +02:00
oSumAtrIX	416d69142f	fix: correct access flags of `PackageMetadata`	2023-07-26 06:28:48 +02:00
oSumAtrIX	426807aeaa	refactor: remove unnecessary changes to default config	2023-07-26 06:28:47 +02:00
oSumAtrIX	90cb075a97	build(needs-bump): update dependencies	2023-07-26 06:28:47 +02:00
oSumAtrIX	ac2ca8fbd3	ci: bump on scope `needs-bump`	2023-07-26 06:28:47 +02:00
Palm	69e4a49065	feat: remove `Path` option (#202 ) BREAKING CHANGE: This removes the previously available `Path` option	2023-07-26 04:11:21 +02:00
				`@@ -0,0 +1,2 @@`
				`rootProject.name = "revanced-patch-annotations-processor"`
				`@@ -0,0 +1 @@`
				`app.revanced.patcher.patch.annotations.processor.PatchProcessorProvider`