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

# [20.0.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v20.0.0-dev.1...v20.0.0-dev.2) (2024-07-31) ### Bug Fixes * Downgrade smali to fix dex compilation issue ([714447d](714447de70)) * Merge all extensions before initializing lookup maps ([328aa87](328aa876d8)) * Use null for compatible package version when adding packages only ([a8e8fa4](a8e8fa4093))
fix: Downgrade smali to fix dex compilation issue
2026-01-12 06:16:18 +00:00 · 2024-07-31 00:27:24 +00:00 · 2024-07-31 02:25:32 +02:00 · 2024-07-26 04:45:31 +02:00 · 2024-07-26 03:41:32 +02:00 · 2024-07-26 03:10:08 +02:00
102 changed files with 5012 additions and 3527 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,7 +1,7 @@
 name: 🐞 Bug report
 description: Report a bug or an issue.
-title: 'bug: '
-labels: ['Bug report']
+title: "bug: "
+labels: ["Bug report"]
 body:
  - type: markdown
    attributes:
@@ -69,8 +69,9 @@ body:
        # ReVanced Patcher bug report

        Before creating a new bug report, please keep the following in mind:
-        
-        - **Do not submit a duplicate bug report**: You can review existing bug reports [here](https://github.com/ReVanced/revanced-patcher/labels/Bug%20report).
+
+        - **Do not submit a duplicate bug report**: Search for existing bug reports [here](https://github.com/ReVanced/revanced-patcher/issues?q=label%3A%22Bug+report%22).
+        - **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-patcher/blob/main/CONTRIBUTING.md).
        - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
  - type: textarea
    attributes:
@@ -100,7 +101,7 @@ body:
      label: Acknowledgements
      description: Your bug report will be closed if you don't follow the checklist below.
      options:
-        - label: This issue is not a duplicate of an existing bug report.
+        - label: I have checked all open and closed bug reports and this is not a duplicate.
          required: true
        - label: I have chosen an appropriate title.
          required: true
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,7 +1,7 @@
 name: ⭐ Feature request
 description: Create a detailed request for a new feature.
-title: 'feat: '
-labels: ['Feature request']
+title: "feat: "
+labels: ["Feature request"]
 body:
  - type: markdown
    attributes:
@@ -70,7 +70,8 @@ body:

        Before creating a new feature request, please keep the following in mind:

-        - **Do not submit a duplicate feature request**: You can review existing feature requests [here](https://github.com/ReVanced/revanced-patcher/labels/Feature%20request).
+        - **Do not submit a duplicate feature request**: Search for existing feature requests [here](https://github.com/ReVanced/revanced-patcher/issues?q=label%3A%22Feature+request%22).
+        - **Review the contribution guidelines**: Make sure your feature request adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-patcher/blob/main/CONTRIBUTING.md).
        - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).

  - type: textarea
@@ -85,7 +86,7 @@ body:
      label: Motivation
      description: |
        A strong motivation is necessary for a feature request to be considered.
-        
+
        - Why should this feature be implemented? 
        - What is the explicit use case?
        - What are the benefits?
@@ -98,7 +99,7 @@ body:
      label: Acknowledgements
      description: Your feature request will be closed if you don't follow the checklist below.
      options:
-        - label: This issue is not a duplicate of an existing feature request.
+        - label: I have checked all open and closed feature requests and this is not a duplicate.
          required: true
        - label: I have chosen an appropriate title.
          required: true
--- a/.github/workflows/build_pull_request.yml
+++ b/.github/workflows/build_pull_request.yml
@@ -0,0 +1,25 @@
+name: Build pull request
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - dev
+
+jobs:
+  release:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Cache Gradle
+        uses: burrunan/gradle-cache-action@v1
+
+      - name: Build
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew build --no-daemon
--- a/.github/workflows/open_pull_request.yml
+++ b/.github/workflows/open_pull_request.yml
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,10 +6,6 @@ on:
    branches:
      - main
      - dev
-  pull_request:
-    branches:
-      - main
-      - dev

 jobs:
  release:
@@ -24,13 +20,6 @@ jobs:
          persist-credentials: false
          fetch-depth: 0

-      - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v6
-        with:
-          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
-          passphrase: ${{ secrets.PASSPHRASE }}
-          fingerprint: ${{ env.GPG_FINGERPRINT }}
-
      - name: Cache Gradle
        uses: burrunan/gradle-cache-action@v1

@@ -48,6 +37,13 @@ jobs:
      - name: Install dependencies
        run: npm install

+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          fingerprint: ${{ vars.GPG_FINGERPRINT }}
+
      - name: Release
        env:
          GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
--- a/.github/workflows/update_documentation.yml
+++ b/.github/workflows/update_documentation.yml
@@ -0,0 +1,19 @@
+name: Update documentation
+
+on:
+  push:
+    paths:
+      - docs/**
+
+jobs:
+  trigger:
+    runs-on: ubuntu-latest
+    name: Dispatch event to documentation repository
+    if: github.ref == 'refs/heads/main'
+    steps:
+      - uses: peter-evans/repository-dispatch@v3
+        with:
+          token: ${{ secrets.DOCUMENTATION_REPO_ACCESS_TOKEN  }}
+          repository: revanced/revanced-documentation
+          event-type: update-documentation
+          client-payload: '{"repo": "${{ github.event.repository.name }}", "ref": "${{ github.ref }}"}'
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,40 @@
+# [20.0.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v20.0.0-dev.1...v20.0.0-dev.2) (2024-07-31)
+
+
+### Bug Fixes
+
+* Downgrade smali to fix dex compilation issue ([714447d](https://github.com/ReVanced/revanced-patcher/commit/714447de70096bf736e8e1d31c14bb5f24195070))
+* Merge all extensions before initializing lookup maps ([328aa87](https://github.com/ReVanced/revanced-patcher/commit/328aa876d8ed7826be3713754b6404195e9fe84b))
+* Use null for compatible package version when adding packages only ([a8e8fa4](https://github.com/ReVanced/revanced-patcher/commit/a8e8fa4093deb8cffbd7a582409f41867f6b568b))
+
+# [20.0.0-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v19.3.1...v20.0.0-dev.1) (2024-07-22)
+
+
+### Features
+
+* Convert APIs to Kotlin DSL ([#298](https://github.com/ReVanced/revanced-patcher/issues/298)) ([3f9cbd2](https://github.com/ReVanced/revanced-patcher/commit/3f9cbd2408fa085690a062b357e11e42c51e7f8b))
+
+
+### BREAKING CHANGES
+
+* Various old APIs are removed, and DSL APIs are added instead.
+
+## [19.3.1](https://github.com/ReVanced/revanced-patcher/compare/v19.3.0...v19.3.1) (2024-02-14)
+
+## [19.3.1-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v19.3.0...v19.3.1-dev.1) (2024-02-14)
+
+# [19.3.0](https://github.com/ReVanced/revanced-patcher/compare/v19.2.0...v19.3.0) (2024-02-14)
+
+
+### Bug Fixes
+
+* Use `Patch#toString` to get patch class name, when no name available ([c9a8260](https://github.com/ReVanced/revanced-patcher/commit/c9a82608f7f2d6b3e64c0c949ea5d9f76fa46165))
+
+
+### Features
+
+* Read and write arbitrary files in APK files ([f1d7217](https://github.com/ReVanced/revanced-patcher/commit/f1d72174956c42234664dce152a27e6854e347e2))
+
 # [19.3.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v19.3.0-dev.1...v19.3.0-dev.2) (2024-02-13)

 # [19.3.0-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v19.2.1-dev.1...v19.3.0-dev.1) (2024-02-13)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,99 @@
+<p align="center">
+  <picture>
+    <source
+      width="256px"
+      media="(prefers-color-scheme: dark)"
+      srcset="assets/revanced-headline/revanced-headline-vertical-dark.svg"
+    >
+    <img 
+      width="256px"
+      src="assets/revanced-headline/revanced-headline-vertical-light.svg"
+    >
+  </picture>
+  <br>
+  <a href="https://revanced.app/">
+     <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo.svg" />
+         <img height="24px" src="assets/revanced-logo/revanced-logo.svg" />
+     </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://github.com/ReVanced">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
+           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="http://revanced.app/discord">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://reddit.com/r/revancedapp">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://t.me/app_revanced">
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://x.com/revancedapp">
+      <picture>
+         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
+         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://www.youtube.com/@ReVanced">
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+     </picture>
+   </a>
+   <br>
+   <br>
+   Continuing the legacy of Vanced
+</p>
+
+# 👋 Contribution guidelines
+
+This document describes how to contribute to ReVanced Patcher.
+
+## 📖 Resources to help you get started
+
+- The [documentation](https://github.com/ReVanced/revanced-patcher/tree/docs/docs) contains the fundamentals
+  of ReVanced Patcher and how to use ReVanced Patcher to create patches
+- [Our backlog](https://github.com/orgs/ReVanced/projects/12) is where we keep track of what we're working on
+- [Issues](https://github.com/ReVanced/revanced-patcher/issues) are where we keep track of bugs and feature requests
+
+## 🙏 Submitting a feature request
+
+Features can be requested by opening an issue using the
+[Feature request issue template](https://github.com/ReVanced/revanced-patcher/issues/new?assignees=&labels=Feature+request&projects=&template=feature_request.yml&title=feat%3A+).
+
+> **Note**
+> Requests can be accepted or rejected at the discretion of maintainers of ReVanced Patcher.
+> Good motivation has to be provided for a request to be accepted.
+
+## 🐞 Submitting a bug report
+
+If you encounter a bug while using ReVanced Patcher, open an issue using the
+[Bug report issue template](https://github.com/ReVanced/revanced-patcher/issues/new?assignees=&labels=Bug+report&projects=&template=bug_report.yml&title=bug%3A+).
+
+## 📝 How to contribute
+
+1. Before contributing, it is recommended to open an issue to discuss your change
+   with the maintainers of ReVanced Patcher. This will help you determine whether your change is acceptable
+   and whether it is worth your time to implement it
+2. Development happens on the `dev` branch. Fork the repository and create your branch from `dev`
+3. Commit your changes
+4. Submit a pull request to the `dev` branch of the repository and reference issues
+   that your pull request closes in the description of your pull request
+5. Our team will review your pull request and provide feedback. Once your pull request is approved,
+   it will be merged into the `dev` branch and will be included in the next release of ReVanced Patcher
+
+❤️ Thank you for considering contributing to ReVanced Patcher,  
+ReVanced
--- a/README.md
+++ b/README.md
@@ -1,3 +1,125 @@
+<p align="center">
+  <picture>
+    <source
+      width="256px"
+      media="(prefers-color-scheme: dark)"
+      srcset="assets/revanced-headline/revanced-headline-vertical-dark.svg"
+    >
+    <img 
+      width="256px"
+      src="assets/revanced-headline/revanced-headline-vertical-light.svg"
+    >
+  </picture>
+  <br>
+  <a href="https://revanced.app/">
+     <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo.svg" />
+         <img height="24px" src="assets/revanced-logo/revanced-logo.svg" />
+     </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://github.com/ReVanced">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
+           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="http://revanced.app/discord">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://reddit.com/r/revancedapp">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://t.me/app_revanced">
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://x.com/revancedapp">
+      <picture>
+         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
+         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://www.youtube.com/@ReVanced">
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+     </picture>
+   </a>
+   <br>
+   <br>
+   Continuing the legacy of Vanced
+</p>
+
 # 💉 ReVanced Patcher

+![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/ReVanced/revanced-patcher/release.yml)
+![GPLv3 License](https://img.shields.io/badge/License-GPL%20v3-yellow.svg)
+
 ReVanced Patcher used to patch Android applications.
+
+## ❓ About
+
+ReVanced Patcher is a library that is used to patch Android applications.  
+It powers [ReVanced Manager](https://github.com/ReVanced/revanced-manager),
+[ReVanced CLI](https://github.com/ReVanced/revanced-cli)
+and [ReVanced Library](https://github.com/ReVanced/revanced-library) and a rich set of patches have been developed
+using ReVanced Patcher in the [ReVanced Patches](https://github.com/ReVanced/revanced-patches) repository.
+
+## 💪 Features
+
+Some of the features the ReVanced Patcher provides are:
+
+- 🔧 **Patch Dalvik VM bytecode**: Disassemble and assemble Dalvik bytecode
+- 📦 **Patch APK resources**: Decode and build Android APK resources
+- 📂 **Patch arbitrary APK files**: Read and write arbitrary files directly from and to APK files
+- 🧩 **Write modular patches**: Extensive API to write modular patches that can patch Dalvik VM bytecode,
+APK resources and arbitrary APK files
+
+## 🚀 How to get started
+
+To use ReVanced Patcher in your project, follow these steps:
+
+1. [Add the repository](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-gradle-registry#using-a-published-package)
+to your project
+2. Add the dependency to your project:
+
+   ```kt
+    dependencies {
+        implementation("app.revanced:revanced-patcher:{$version}")
+    }
+   ```
+
+For a minimal project configuration, 
+see [ReVanced Patches template](https://github.com/ReVanced/revanced-patches-template).
+
+## 📚 Everything else
+
+### 📙 Contributing
+
+Thank you for considering contributing to ReVanced Patcher.
+You can find the contribution guidelines [here](CONTRIBUTING.md).
+
+### 🛠️ Building
+
+To build ReVanced Patcher,
+you can follow the [ReVanced documentation](https://github.com/ReVanced/revanced-documentation).
+
+### 📃 Documentation
+
+The documentation contains the fundamentals of ReVanced Patcher and how to use ReVanced Patcher to create patches.
+You can find it [here](https://github.com/ReVanced/revanced-patcher/tree/main/docs).
+
+## 📜 Licence
+
+ReVanced Patcher is licensed under the GPLv3 license. Please see the [licence file](LICENSE) for more information.
+[tl;dr](https://www.tldrlegal.com/license/gnu-general-public-license-v3-gpl-3) you may copy, distribute and modify ReVanced Patcher as long as you track changes/dates in source files.
+Any modifications to ReVanced Patcher must also be made available under the GPL,
+along with build & install instructions.
--- a/api/revanced-patcher.api
+++ b/api/revanced-patcher.api
@@ -1,62 +1,65 @@
-public abstract interface class app/revanced/patcher/IntegrationsConsumer {
-	public abstract fun acceptIntegrations (Ljava/util/List;)V
-	public abstract fun acceptIntegrations (Ljava/util/Set;)V
+public final class app/revanced/patcher/Fingerprint {
+	public final fun getMatch ()Lapp/revanced/patcher/Match;
+	public final fun match (Lapp/revanced/patcher/patch/BytecodePatchContext;Lcom/android/tools/smali/dexlib2/iface/ClassDef;)Z
+	public final fun match (Lapp/revanced/patcher/patch/BytecodePatchContext;Lcom/android/tools/smali/dexlib2/iface/Method;)Z
+}
+
+public final class app/revanced/patcher/FingerprintBuilder {
+	public fun <init> ()V
+	public final fun accessFlags (I)V
+	public final fun accessFlags ([Lcom/android/tools/smali/dexlib2/AccessFlags;)V
+	public final fun custom (Lkotlin/jvm/functions/Function2;)V
+	public final fun opcodes (Ljava/lang/String;)V
+	public final fun opcodes ([Lcom/android/tools/smali/dexlib2/Opcode;)V
+	public final fun parameters ([Ljava/lang/String;)V
+	public final fun returns (Ljava/lang/String;)V
+	public final fun strings ([Ljava/lang/String;)V
+}
+
+public final class app/revanced/patcher/FingerprintKt {
+	public static final fun fingerprint (ILkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/Fingerprint;
+	public static final fun fingerprint (Lapp/revanced/patcher/patch/BytecodePatchBuilder;ILkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/patch/BytecodePatchBuilder$InvokedFingerprint;
+	public static synthetic fun fingerprint$default (ILkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/Fingerprint;
+	public static synthetic fun fingerprint$default (Lapp/revanced/patcher/patch/BytecodePatchBuilder;ILkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/BytecodePatchBuilder$InvokedFingerprint;
 }

 public abstract interface annotation class app/revanced/patcher/InternalApi : java/lang/annotation/Annotation {
 }

+public final class app/revanced/patcher/Match {
+	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lapp/revanced/patcher/Match$PatternMatch;Ljava/util/List;Lapp/revanced/patcher/patch/BytecodePatchContext;)V
+	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 getPatternMatch ()Lapp/revanced/patcher/Match$PatternMatch;
+	public final fun getStringMatches ()Ljava/util/List;
+}
+
+public final class app/revanced/patcher/Match$PatternMatch {
+	public fun <init> (II)V
+	public final fun getEndIndex ()I
+	public final fun getStartIndex ()I
+}
+
+public final class app/revanced/patcher/Match$StringMatch {
+	public fun <init> (Ljava/lang/String;I)V
+	public final fun getIndex ()I
+	public final fun getString ()Ljava/lang/String;
+}
+
 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/Set, kotlin/jvm/internal/markers/KMappedMarker {
-	public synthetic fun <init> (Ljava/lang/ClassLoader;[Ljava/io/File;Lkotlin/jvm/functions/Function1;Ljava/util/Set;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun add (Lapp/revanced/patcher/patch/Patch;)Z
-	public synthetic fun add (Ljava/lang/Object;)Z
-	public fun addAll (Ljava/util/Collection;)Z
-	public fun clear ()V
-	public fun contains (Lapp/revanced/patcher/patch/Patch;)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 (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/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 final class app/revanced/patcher/Patcher : java/io/Closeable {
 	public fun <init> (Lapp/revanced/patcher/PatcherConfig;)V
-	public fun <init> (Lapp/revanced/patcher/PatcherOptions;)V
-	public fun acceptIntegrations (Ljava/util/List;)V
-	public fun acceptIntegrations (Ljava/util/Set;)V
-	public fun acceptPatches (Ljava/util/List;)V
-	public fun acceptPatches (Ljava/util/Set;)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 get ()Lapp/revanced/patcher/PatcherResult;
 	public final fun getContext ()Lapp/revanced/patcher/PatcherContext;
+	public final fun invoke ()Lkotlinx/coroutines/flow/Flow;
+	public final fun plusAssign (Ljava/util/Set;)V
 }

 public final class app/revanced/patcher/PatcherConfig {
@@ -64,49 +67,17 @@ public final class app/revanced/patcher/PatcherConfig {
 	public synthetic fun <init> (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 }

-public final class app/revanced/patcher/PatcherContext {
+public final class app/revanced/patcher/PatcherContext : java/io/Closeable {
+	public fun close ()V
 	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;Z)V
-	public synthetic fun <init> (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun copy (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;Z)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;ZILjava/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 getDexFiles ()Ljava/util/Set;
-	public final fun getDoNotCompress ()Ljava/util/List;
-	public final fun getResourceFile ()Ljava/io/File;
 	public final fun getResources ()Lapp/revanced/patcher/PatcherResult$PatchedResources;
-	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;
 }
@@ -118,57 +89,8 @@ public final class app/revanced/patcher/PatcherResult$PatchedResources {
 	public final fun getResourcesApk ()Ljava/io/File;
 }

-public abstract interface class app/revanced/patcher/PatchesConsumer {
-	public abstract fun acceptPatches (Ljava/util/List;)V
-	public abstract fun acceptPatches (Ljava/util/Set;)V
-}
-
-public final class app/revanced/patcher/PatchesConsumer$DefaultImpls {
-	public static fun acceptPatches (Lapp/revanced/patcher/PatchesConsumer;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/Set;
-	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 ()Lapp/revanced/patcher/PatcherResult$PatchedResources;
-	public synthetic fun get ()Ljava/lang/Object;
-	public final fun get (Ljava/lang/String;)Ljava/io/File;
-	public final fun get (Ljava/lang/String;Z)Ljava/io/File;
-	public static synthetic fun get$default (Lapp/revanced/patcher/data/ResourceContext;Ljava/lang/String;ZILjava/lang/Object;)Ljava/io/File;
-	public final fun getDocument ()Lapp/revanced/patcher/data/ResourceContext$DocumentOperatable;
-	public final fun getXmlEditor ()Lapp/revanced/patcher/data/ResourceContext$XmlFileHolder;
-	public fun iterator ()Ljava/util/Iterator;
-	public final fun stageDelete (Lkotlin/jvm/functions/Function1;)Z
-}
-
-public final class app/revanced/patcher/data/ResourceContext$DocumentOperatable {
-	public fun <init> (Lapp/revanced/patcher/data/ResourceContext;)V
-	public final fun get (Ljava/io/InputStream;)Lapp/revanced/patcher/util/Document;
-	public final fun get (Ljava/lang/String;)Lapp/revanced/patcher/util/Document;
-}
-
-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 {
@@ -188,7 +110,18 @@ public final class app/revanced/patcher/extensions/InstructionExtensions {
 	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 getInstruction (Lcom/android/tools/smali/dexlib2/iface/Method;I)Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;
+	public final fun getInstruction (Lcom/android/tools/smali/dexlib2/iface/Method;I)Ljava/lang/Object;
+	public final fun getInstruction (Lcom/android/tools/smali/dexlib2/iface/MethodImplementation;I)Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;
+	public final fun getInstruction (Lcom/android/tools/smali/dexlib2/iface/MethodImplementation;I)Ljava/lang/Object;
+	public final fun getInstructionOrNull (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;I)Lcom/android/tools/smali/dexlib2/builder/BuilderInstruction;
+	public final fun getInstructionOrNull (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;I)Ljava/lang/Object;
+	public final fun getInstructionOrNull (Lcom/android/tools/smali/dexlib2/iface/Method;I)Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;
+	public final fun getInstructionOrNull (Lcom/android/tools/smali/dexlib2/iface/Method;I)Ljava/lang/Object;
 	public final fun getInstructions (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;)Ljava/util/List;
+	public final fun getInstructions (Lcom/android/tools/smali/dexlib2/iface/Method;)Ljava/lang/Iterable;
+	public final fun getInstructionsOrNull (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;)Ljava/util/List;
+	public final fun getInstructionsOrNull (Lcom/android/tools/smali/dexlib2/iface/Method;)Ljava/lang/Iterable;
 	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
@@ -201,101 +134,177 @@ public final class app/revanced/patcher/extensions/InstructionExtensions {
 	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/MethodFingerprint;)Lapp/revanced/patcher/fingerprint/annotation/FuzzyPatternScanMethod;
+public final class app/revanced/patcher/patch/BytecodePatch : app/revanced/patcher/patch/Patch {
+	public final fun getExtension ()Ljava/io/InputStream;
+	public final fun getFingerprints ()Ljava/util/Set;
+	public fun toString ()Ljava/lang/String;
 }

-public abstract class app/revanced/patcher/fingerprint/MethodFingerprint {
-	public static final field Companion Lapp/revanced/patcher/fingerprint/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 getFuzzyPatternScanMethod ()Lapp/revanced/patcher/fingerprint/annotation/FuzzyPatternScanMethod;
-	public final fun getResult ()Lapp/revanced/patcher/fingerprint/MethodFingerprintResult;
-	public final fun resolve (Lapp/revanced/patcher/data/BytecodeContext;Lcom/android/tools/smali/dexlib2/iface/ClassDef;)Z
-	public final fun resolve (Lapp/revanced/patcher/data/BytecodeContext;Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/ClassDef;)Z
+public final class app/revanced/patcher/patch/BytecodePatchBuilder : app/revanced/patcher/patch/PatchBuilder {
+	public synthetic fun build$revanced_patcher ()Lapp/revanced/patcher/patch/Patch;
+	public final fun extendWith (Ljava/lang/String;)Lapp/revanced/patcher/patch/BytecodePatchBuilder;
+	public final fun getExtension ()Ljava/io/InputStream;
+	public final fun invoke (Lapp/revanced/patcher/Fingerprint;)Lapp/revanced/patcher/patch/BytecodePatchBuilder$InvokedFingerprint;
+	public final fun setExtension (Ljava/io/InputStream;)V
 }

-public final class app/revanced/patcher/fingerprint/MethodFingerprint$Companion {
-	public final fun resolve (Ljava/lang/Iterable;Lapp/revanced/patcher/data/BytecodeContext;Ljava/lang/Iterable;)V
+public final class app/revanced/patcher/patch/BytecodePatchBuilder$InvokedFingerprint {
+	public fun <init> (Lapp/revanced/patcher/Fingerprint;)V
+	public final fun getValue (Ljava/lang/Void;Lkotlin/reflect/KProperty;)Lapp/revanced/patcher/Match;
 }

-public final class app/revanced/patcher/fingerprint/MethodFingerprintResult {
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lapp/revanced/patcher/fingerprint/MethodFingerprintResult$MethodFingerprintScanResult;Lapp/revanced/patcher/data/BytecodeContext;)V
-	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/MethodFingerprintResult$MethodFingerprintScanResult;
+public final class app/revanced/patcher/patch/BytecodePatchContext : app/revanced/patcher/patch/PatchContext, java/io/Closeable {
+	public final fun classBy (Lkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/util/proxy/ClassProxy;
+	public final fun classByType (Ljava/lang/String;)Lapp/revanced/patcher/util/proxy/ClassProxy;
+	public fun close ()V
+	public synthetic fun get ()Ljava/lang/Object;
+	public fun get ()Ljava/util/Set;
+	public final fun getClasses ()Lapp/revanced/patcher/util/ProxyClassList;
+	public final fun navigate (Lcom/android/tools/smali/dexlib2/iface/Method;)Lapp/revanced/patcher/util/MethodNavigator;
+	public final fun proxy (Lcom/android/tools/smali/dexlib2/iface/ClassDef;)Lapp/revanced/patcher/util/proxy/ClassProxy;
 }

-public final class app/revanced/patcher/fingerprint/MethodFingerprintResult$MethodFingerprintScanResult {
-	public fun <init> (Lapp/revanced/patcher/fingerprint/MethodFingerprintResult$MethodFingerprintScanResult$PatternScanResult;Lapp/revanced/patcher/fingerprint/MethodFingerprintResult$MethodFingerprintScanResult$StringsScanResult;)V
-	public final fun getPatternScanResult ()Lapp/revanced/patcher/fingerprint/MethodFingerprintResult$MethodFingerprintScanResult$PatternScanResult;
-	public final fun getStringsScanResult ()Lapp/revanced/patcher/fingerprint/MethodFingerprintResult$MethodFingerprintScanResult$StringsScanResult;
+public final class app/revanced/patcher/patch/Option {
+	public fun <init> (Ljava/lang/String;Ljava/lang/Object;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/reflect/KType;Lkotlin/jvm/functions/Function2;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Object;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/reflect/KType;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getDefault ()Ljava/lang/Object;
+	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 getType ()Lkotlin/reflect/KType;
+	public final fun getValidator ()Lkotlin/jvm/functions/Function2;
+	public final fun getValue ()Ljava/lang/Object;
+	public final fun getValue (Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+	public final fun getValues ()Ljava/util/Map;
+	public final fun reset ()V
+	public final fun setValue (Ljava/lang/Object;)V
+	public final fun setValue (Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
+	public fun toString ()Ljava/lang/String;
 }

-public final class app/revanced/patcher/fingerprint/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 getEndIndex ()I
-	public final fun getStartIndex ()I
-	public final fun getWarnings ()Ljava/util/List;
-	public final fun setWarnings (Ljava/util/List;)V
+public abstract class app/revanced/patcher/patch/OptionException : java/lang/Exception {
+	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
 }

-public final class app/revanced/patcher/fingerprint/MethodFingerprintResult$MethodFingerprintScanResult$PatternScanResult$Warning {
-	public fun <init> (Lcom/android/tools/smali/dexlib2/Opcode;Lcom/android/tools/smali/dexlib2/Opcode;II)V
-	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 final class app/revanced/patcher/patch/OptionException$InvalidValueTypeException : app/revanced/patcher/patch/OptionException {
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
 }

-public final class app/revanced/patcher/fingerprint/MethodFingerprintResult$MethodFingerprintScanResult$StringsScanResult {
-	public fun <init> (Ljava/util/List;)V
-	public final fun getMatches ()Ljava/util/List;
+public final class app/revanced/patcher/patch/OptionException$OptionNotFoundException : app/revanced/patcher/patch/OptionException {
+	public fun <init> (Ljava/lang/String;)V
 }

-public final class app/revanced/patcher/fingerprint/MethodFingerprintResult$MethodFingerprintScanResult$StringsScanResult$StringMatch {
-	public fun <init> (Ljava/lang/String;I)V
-	public final fun getIndex ()I
-	public final fun getString ()Ljava/lang/String;
+public final class app/revanced/patcher/patch/OptionException$ValueRequiredException : app/revanced/patcher/patch/OptionException {
+	public fun <init> (Lapp/revanced/patcher/patch/Option;)V
 }

-public abstract interface annotation class app/revanced/patcher/fingerprint/annotation/FuzzyPatternScanMethod : java/lang/annotation/Annotation {
-	public abstract fun threshold ()I
+public final class app/revanced/patcher/patch/OptionException$ValueValidationException : app/revanced/patcher/patch/OptionException {
+	public fun <init> (Ljava/lang/Object;Lapp/revanced/patcher/patch/Option;)V
 }

-public abstract class app/revanced/patcher/patch/BytecodePatch : app/revanced/patcher/patch/Patch {
-	public fun <init> ()V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;ZZLjava/util/Set;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;Ljava/util/Set;ZZLjava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Ljava/util/Set;)V
-	public synthetic fun <init> (Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+public final class app/revanced/patcher/patch/OptionKt {
+	public static final fun booleanOption (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/lang/Boolean;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
+	public static synthetic fun booleanOption$default (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/lang/Boolean;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
+	public static final fun booleansOption (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
+	public static synthetic fun booleansOption$default (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
+	public static final fun floatOption (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/lang/Float;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
+	public static synthetic fun floatOption$default (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/lang/Float;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
+	public static final fun floatsOption (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
+	public static synthetic fun floatsOption$default (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
+	public static final fun intOption (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
+	public static synthetic fun intOption$default (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
+	public static final fun intsOption (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
+	public static synthetic fun intsOption$default (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
+	public static final fun longOption (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/lang/Long;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
+	public static synthetic fun longOption$default (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/lang/Long;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
+	public static final fun longsOption (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
+	public static synthetic fun longsOption$default (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
+	public static final fun stringOption (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
+	public static synthetic fun stringOption$default (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
+	public static final fun stringsOption (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/Option;
+	public static synthetic fun stringsOption$default (Lapp/revanced/patcher/patch/PatchBuilder;Ljava/lang/String;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/Option;
+}
+
+public final class app/revanced/patcher/patch/Options : java/util/Map, kotlin/jvm/internal/markers/KMappedMarker {
+	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/Option;
+	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/Option;
+	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/Option;
+	public final fun containsKey (Ljava/lang/Object;)Z
+	public fun containsKey (Ljava/lang/String;)Z
+	public fun containsValue (Lapp/revanced/patcher/patch/Option;)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/Option;
+	public final synthetic fun get (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun get (Ljava/lang/String;)Lapp/revanced/patcher/patch/Option;
+	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/Option;Ljava/util/function/BiFunction;)Lapp/revanced/patcher/patch/Option;
+	public synthetic fun put (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public fun put (Ljava/lang/String;Lapp/revanced/patcher/patch/Option;)Lapp/revanced/patcher/patch/Option;
+	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/Option;)Lapp/revanced/patcher/patch/Option;
+	public fun remove (Ljava/lang/Object;)Lapp/revanced/patcher/patch/Option;
+	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/Option;)Lapp/revanced/patcher/patch/Option;
+	public fun replace (Ljava/lang/String;Lapp/revanced/patcher/patch/Option;Lapp/revanced/patcher/patch/Option;)Z
+	public fun replaceAll (Ljava/util/function/BiFunction;)V
+	public final fun set (Ljava/lang/String;Ljava/lang/Object;)V
+	public final fun size ()I
+	public final fun values ()Ljava/util/Collection;
 }

 public abstract class app/revanced/patcher/patch/Patch {
-	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 synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;ZLjava/util/Set;Ljava/util/Set;Ljava/util/Set;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun execute (Lapp/revanced/patcher/patch/PatchContext;)V
+	public final fun finalize (Lapp/revanced/patcher/patch/PatchContext;)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 getOptions ()Lapp/revanced/patcher/patch/Options;
 	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 fun getVersions ()Ljava/util/Set;
+public abstract class app/revanced/patcher/patch/PatchBuilder {
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun compatibleWith ([Ljava/lang/String;)V
+	public final fun compatibleWith ([Lkotlin/Pair;)V
+	public final fun dependsOn ([Lapp/revanced/patcher/patch/Patch;)V
+	public final fun execute (Lkotlin/jvm/functions/Function2;)V
+	public final fun finalize (Lkotlin/jvm/functions/Function2;)V
+	protected final fun getCompatiblePackages ()Ljava/util/Set;
+	protected final fun getDependencies ()Ljava/util/Set;
+	protected final fun getDescription ()Ljava/lang/String;
+	protected final fun getExecutionBlock ()Lkotlin/jvm/functions/Function2;
+	protected final fun getFinalizeBlock ()Lkotlin/jvm/functions/Function2;
+	protected final fun getName ()Ljava/lang/String;
+	protected final fun getOptions ()Ljava/util/Set;
+	protected final fun getUse ()Z
+	public final fun invoke (Lapp/revanced/patcher/patch/Option;)Lapp/revanced/patcher/patch/Option;
+	public final fun invoke (Ljava/lang/String;[Ljava/lang/String;)Lkotlin/Pair;
+	protected final fun setCompatiblePackages (Ljava/util/Set;)V
+	protected final fun setDependencies (Ljava/util/Set;)V
+	protected final fun setExecutionBlock (Lkotlin/jvm/functions/Function2;)V
+	protected final fun setFinalizeBlock (Lkotlin/jvm/functions/Function2;)V
+}
+
+public abstract interface class app/revanced/patcher/patch/PatchContext : java/util/function/Supplier {
 }

 public final class app/revanced/patcher/patch/PatchException : java/lang/Exception {
@@ -304,128 +313,83 @@ public final class app/revanced/patcher/patch/PatchException : java/lang/Excepti
 	public fun <init> (Ljava/lang/Throwable;)V
 }

+public final class app/revanced/patcher/patch/PatchKt {
+	public static final fun bytecodePatch (Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/patch/BytecodePatch;
+	public static synthetic fun bytecodePatch$default (Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/BytecodePatch;
+	public static final fun loadPatchesFromDex (Ljava/util/Set;Ljava/io/File;)Lapp/revanced/patcher/patch/PatchLoader$Dex;
+	public static synthetic fun loadPatchesFromDex$default (Ljava/util/Set;Ljava/io/File;ILjava/lang/Object;)Lapp/revanced/patcher/patch/PatchLoader$Dex;
+	public static final fun loadPatchesFromJar (Ljava/util/Set;)Lapp/revanced/patcher/patch/PatchLoader$Jar;
+	public static final fun rawResourcePatch (Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/patch/RawResourcePatch;
+	public static synthetic fun rawResourcePatch$default (Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/RawResourcePatch;
+	public static final fun resourcePatch (Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/patch/ResourcePatch;
+	public static synthetic fun resourcePatch$default (Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/patch/ResourcePatch;
+}
+
+public abstract class app/revanced/patcher/patch/PatchLoader : java/util/Set, kotlin/jvm/internal/markers/KMappedMarker {
+	public synthetic fun <init> (Ljava/util/Map;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (Ljava/util/Set;Lkotlin/jvm/functions/Function1;Ljava/lang/ClassLoader;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun add (Lapp/revanced/patcher/patch/Patch;)Z
+	public synthetic fun add (Ljava/lang/Object;)Z
+	public fun addAll (Ljava/util/Collection;)Z
+	public fun clear ()V
+	public fun contains (Lapp/revanced/patcher/patch/Patch;)Z
+	public final fun contains (Ljava/lang/Object;)Z
+	public fun containsAll (Ljava/util/Collection;)Z
+	public final fun getByPatchesFile ()Ljava/util/Map;
+	public fun getSize ()I
+	public fun isEmpty ()Z
+	public fun iterator ()Ljava/util/Iterator;
+	public 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/patch/PatchLoader$Dex : app/revanced/patcher/patch/PatchLoader {
+	public fun <init> (Ljava/util/Set;Ljava/io/File;)V
+	public synthetic fun <init> (Ljava/util/Set;Ljava/io/File;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+}
+
+public final class app/revanced/patcher/patch/PatchLoader$Jar : app/revanced/patcher/patch/PatchLoader {
+	public fun <init> (Ljava/util/Set;)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/RawResourcePatch : 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/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 interface annotation class app/revanced/patcher/patch/annotation/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/annotation/Patch : java/lang/annotation/Annotation {
-	public abstract fun compatiblePackages ()[Lapp/revanced/patcher/patch/annotation/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 class app/revanced/patcher/patch/options/PatchOption {
-	public static final field PatchExtensions Lapp/revanced/patcher/patch/options/PatchOption$PatchExtensions;
-	public fun <init> (Ljava/lang/String;Ljava/lang/Object;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;Lkotlin/jvm/functions/Function2;)V
-	public final fun getDefault ()Ljava/lang/Object;
-	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 getValidator ()Lkotlin/jvm/functions/Function2;
-	public final fun getValue ()Ljava/lang/Object;
-	public final fun getValue (Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
-	public final fun getValueType ()Ljava/lang/String;
-	public final fun getValues ()Ljava/util/Map;
-	public fun reset ()V
-	public final fun setValue (Ljava/lang/Object;)V
-	public final fun setValue (Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
+public final class app/revanced/patcher/patch/RawResourcePatch : app/revanced/patcher/patch/Patch {
 	public fun toString ()Ljava/lang/String;
 }

-public final class app/revanced/patcher/patch/options/PatchOption$PatchExtensions {
-	public final fun booleanArrayPatchOption (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;[Ljava/lang/Boolean;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/options/PatchOption;
-	public static synthetic fun booleanArrayPatchOption$default (Lapp/revanced/patcher/patch/options/PatchOption$PatchExtensions;Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;[Ljava/lang/Boolean;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/options/PatchOption;
-	public final fun booleanPatchOption (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;Ljava/lang/Boolean;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/options/PatchOption;
-	public static synthetic fun booleanPatchOption$default (Lapp/revanced/patcher/patch/options/PatchOption$PatchExtensions;Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;Ljava/lang/Boolean;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/options/PatchOption;
-	public final fun floatArrayPatchOption (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;[Ljava/lang/Float;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/options/PatchOption;
-	public static synthetic fun floatArrayPatchOption$default (Lapp/revanced/patcher/patch/options/PatchOption$PatchExtensions;Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;[Ljava/lang/Float;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/options/PatchOption;
-	public final fun floatPatchOption (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;Ljava/lang/Float;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/options/PatchOption;
-	public static synthetic fun floatPatchOption$default (Lapp/revanced/patcher/patch/options/PatchOption$PatchExtensions;Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;Ljava/lang/Float;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/options/PatchOption;
-	public final fun intArrayPatchOption (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;[Ljava/lang/Integer;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/options/PatchOption;
-	public static synthetic fun intArrayPatchOption$default (Lapp/revanced/patcher/patch/options/PatchOption$PatchExtensions;Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;[Ljava/lang/Integer;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/options/PatchOption;
-	public final fun intPatchOption (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/options/PatchOption;
-	public static synthetic fun intPatchOption$default (Lapp/revanced/patcher/patch/options/PatchOption$PatchExtensions;Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;Ljava/lang/Integer;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/options/PatchOption;
-	public final fun longArrayPatchOption (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;[Ljava/lang/Long;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/options/PatchOption;
-	public static synthetic fun longArrayPatchOption$default (Lapp/revanced/patcher/patch/options/PatchOption$PatchExtensions;Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;[Ljava/lang/Long;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/options/PatchOption;
-	public final fun longPatchOption (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;Ljava/lang/Long;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/options/PatchOption;
-	public static synthetic fun longPatchOption$default (Lapp/revanced/patcher/patch/options/PatchOption$PatchExtensions;Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;Ljava/lang/Long;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/options/PatchOption;
-	public final fun registerNewPatchOption (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;Ljava/lang/Object;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;Lkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/options/PatchOption;
-	public static synthetic fun registerNewPatchOption$default (Lapp/revanced/patcher/patch/options/PatchOption$PatchExtensions;Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;Ljava/lang/Object;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/options/PatchOption;
-	public final fun stringArrayPatchOption (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;[Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/options/PatchOption;
-	public static synthetic fun stringArrayPatchOption$default (Lapp/revanced/patcher/patch/options/PatchOption$PatchExtensions;Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;[Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/options/PatchOption;
-	public final fun stringPatchOption (Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;)Lapp/revanced/patcher/patch/options/PatchOption;
-	public static synthetic fun stringPatchOption$default (Lapp/revanced/patcher/patch/options/PatchOption$PatchExtensions;Lapp/revanced/patcher/patch/Patch;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lapp/revanced/patcher/patch/options/PatchOption;
+public final class app/revanced/patcher/patch/RawResourcePatchBuilder : app/revanced/patcher/patch/PatchBuilder {
+	public synthetic fun build$revanced_patcher ()Lapp/revanced/patcher/patch/Patch;
 }

-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/ResourcePatch : app/revanced/patcher/patch/Patch {
+	public fun toString ()Ljava/lang/String;
 }

-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/ResourcePatchBuilder : app/revanced/patcher/patch/PatchBuilder {
+	public synthetic fun build$revanced_patcher ()Lapp/revanced/patcher/patch/Patch;
 }

-public final class app/revanced/patcher/patch/options/PatchOptionException$PatchOptionNotFoundException : app/revanced/patcher/patch/options/PatchOptionException {
-	public fun <init> (Ljava/lang/String;)V
+public final class app/revanced/patcher/patch/ResourcePatchContext : app/revanced/patcher/patch/PatchContext {
+	public fun get ()Lapp/revanced/patcher/PatcherResult$PatchedResources;
+	public synthetic fun get ()Ljava/lang/Object;
+	public final fun get (Ljava/lang/String;Z)Ljava/io/File;
+	public static synthetic fun get$default (Lapp/revanced/patcher/patch/ResourcePatchContext;Ljava/lang/String;ZILjava/lang/Object;)Ljava/io/File;
+	public final fun getDocument ()Lapp/revanced/patcher/patch/ResourcePatchContext$DocumentOperatable;
+	public final fun stageDelete (Lkotlin/jvm/functions/Function1;)Z
 }

-public final class app/revanced/patcher/patch/options/PatchOptionException$ValueRequiredException : app/revanced/patcher/patch/options/PatchOptionException {
-	public fun <init> (Lapp/revanced/patcher/patch/options/PatchOption;)V
-}
-
-public final class app/revanced/patcher/patch/options/PatchOptionException$ValueValidationException : app/revanced/patcher/patch/options/PatchOptionException {
-	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 set (Ljava/lang/String;Ljava/lang/Object;)V
-	public final fun size ()I
-	public final fun values ()Ljava/util/Collection;
+public final class app/revanced/patcher/patch/ResourcePatchContext$DocumentOperatable {
+	public fun <init> (Lapp/revanced/patcher/patch/ResourcePatchContext;)V
+	public final fun get (Ljava/io/InputStream;)Lapp/revanced/patcher/util/Document;
+	public final fun get (Ljava/lang/String;)Lapp/revanced/patcher/util/Document;
 }

 public final class app/revanced/patcher/util/Document : java/io/Closeable, org/w3c/dom/Document {
@@ -500,39 +464,51 @@ public final class app/revanced/patcher/util/Document : java/io/Closeable, org/w
 	public fun setXmlVersion (Ljava/lang/String;)V
 }

-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/MethodNavigator {
+	public final fun at (ILkotlin/jvm/functions/Function1;)Lapp/revanced/patcher/util/MethodNavigator;
+	public final fun at ([I)Lapp/revanced/patcher/util/MethodNavigator;
+	public static synthetic fun at$default (Lapp/revanced/patcher/util/MethodNavigator;ILkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/util/MethodNavigator;
+	public final fun immutable ()Lcom/android/tools/smali/dexlib2/iface/Method;
+	public final fun mutable ()Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;
 }

-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 final class app/revanced/patcher/util/ProxyClassList : java/util/List, kotlin/jvm/internal/markers/KMutableList {
+	public fun add (ILcom/android/tools/smali/dexlib2/iface/ClassDef;)V
+	public synthetic fun add (ILjava/lang/Object;)V
 	public fun add (Lcom/android/tools/smali/dexlib2/iface/ClassDef;)Z
 	public synthetic fun add (Ljava/lang/Object;)Z
+	public fun addAll (ILjava/util/Collection;)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 get (I)Lcom/android/tools/smali/dexlib2/iface/ClassDef;
+	public synthetic fun get (I)Ljava/lang/Object;
 	public fun getSize ()I
+	public fun indexOf (Lcom/android/tools/smali/dexlib2/iface/ClassDef;)I
+	public final fun indexOf (Ljava/lang/Object;)I
 	public fun isEmpty ()Z
 	public fun iterator ()Ljava/util/Iterator;
+	public fun lastIndexOf (Lcom/android/tools/smali/dexlib2/iface/ClassDef;)I
+	public final fun lastIndexOf (Ljava/lang/Object;)I
+	public fun listIterator ()Ljava/util/ListIterator;
+	public fun listIterator (I)Ljava/util/ListIterator;
+	public final fun remove (I)Lcom/android/tools/smali/dexlib2/iface/ClassDef;
+	public synthetic fun remove (I)Ljava/lang/Object;
 	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 removeAt (I)Lcom/android/tools/smali/dexlib2/iface/ClassDef;
 	public fun retainAll (Ljava/util/Collection;)Z
+	public fun set (ILcom/android/tools/smali/dexlib2/iface/ClassDef;)Lcom/android/tools/smali/dexlib2/iface/ClassDef;
+	public synthetic fun set (ILjava/lang/Object;)Ljava/lang/Object;
 	public final fun size ()I
+	public fun subList (II)Ljava/util/List;
 	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;
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,9 +1,10 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
    alias(libs.plugins.kotlin)
    alias(libs.plugins.binary.compatibility.validator)
    `maven-publish`
    signing
-    java
 }

 group = "app.revanced"
@@ -23,9 +24,15 @@ tasks {

 repositories {
    mavenCentral()
-    mavenLocal()
-    maven { url = uri("https://jitpack.io") }
    google()
+    maven {
+        // A repository must be specified for some reason. "registry" is a dummy.
+        url = uri("https://maven.pkg.github.com/revanced/registry")
+        credentials {
+            username = project.findProperty("gpr.user") as String? ?: System.getenv("GITHUB_ACTOR")
+            password = project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN")
+        }
+    }
 }

 dependencies {
@@ -41,20 +48,34 @@ dependencies {
        // Exclude, otherwise the org.w3c.dom API breaks.
        exclude(group = "xerces", module = "xmlParserAPIs")
    }
-
    testImplementation(libs.kotlin.test)
-}
-
-java {
-    withJavadocJar()
-    withSourcesJar()
+    testImplementation(libs.mockk)
 }

 kotlin {
-    jvmToolchain(11)
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_11)
+    }
+}
+
+java {
+    targetCompatibility = JavaVersion.VERSION_11
+
+    withSourcesJar()
 }

 publishing {
+    repositories {
+        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>("revanced-patcher-publication") {
            from(components["java"])
--- a/docs/1_patcher_intro.md
+++ b/docs/1_patcher_intro.md
@@ -0,0 +1,111 @@
+<p align="center">
+  <picture>
+    <source
+      width="256px"
+      media="(prefers-color-scheme: dark)"
+      srcset="../assets/revanced-headline/revanced-headline-vertical-dark.svg"
+    >
+    <img 
+      width="256px"
+      src="../assets/revanced-headline/revanced-headline-vertical-light.svg"
+    >
+  </picture>
+  <br>
+  <a href="https://revanced.app/">
+     <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="../assets/revanced-logo/revanced-logo.svg" />
+         <img height="24px" src="../assets/revanced-logo/revanced-logo.svg" />
+     </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://github.com/ReVanced">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
+           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="http://revanced.app/discord">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://reddit.com/r/revancedapp">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://t.me/app_revanced">
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://x.com/revancedapp">
+      <picture>
+         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
+         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://www.youtube.com/@ReVanced">
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+     </picture>
+   </a>
+   <br>
+   <br>
+   Continuing the legacy of Vanced
+</p>
+
+# 💉 Introduction to ReVanced Patcher
+
+To create patches for Android apps, it is recommended to know the basic concept of ReVanced Patcher.
+
+## 📙 How it works
+
+ReVanced Patcher is a library that allows modifying Android apps by applying patches.
+It is built on top of [Smali](https://github.com/google/smali) for bytecode manipulation and [Androlib (Apktool)](https://github.com/iBotPeaches/Apktool)
+for resource decoding and encoding.
+
+ReVanced Patcher receives a list of patches and applies them to a given APK file.
+It then returns the modified components of the APK file, such as modified dex files and resources,
+that can be repackaged into a new APK file.
+
+ReVanced Patcher has a simple API that allows you to load patches from RVP (JAR or DEX container) files
+and apply them to an APK file. Later on, you will learn how to create patches.
+
+```kt
+val patches = loadPatchesFromJar(setOf(File("revanced-patches.rvp")))
+
+val patcherResult = Patcher(PatcherConfig(apkFile = File("some.apk"))).use { patcher ->
+    // Here you can access metadata about the APK file through patcher.context.packageMetadata
+    // such as package name, version code, version name, etc.
+
+    // Add patches.
+    patcher += patches
+
+    // Execute the patches.
+    runBlocking {
+        patcher().collect { patchResult ->
+            if (patchResult.exception != null)
+                logger.info("\"${patchResult.patch}\" failed:\n${patchResult.exception}")
+            else
+                logger.info("\"${patchResult.patch}\" succeeded")
+        }
+    }
+
+    // Compile and save the patched APK file components.
+    patcher.get()
+}
+
+// The result of the patcher contains the modified components of the APK file that can be repackaged into a new APK file.
+val dexFiles = patcherResult.dexFiles
+val resources = patcherResult.resources
+```
+
+## ⏭️ What's next
+
+The next page teaches the fundamentals of ReVanced Patches.
+
+Continue: [🧩 Introduction to ReVanced Patches](2_patches_intro.md)
--- a/docs/2_1_setup.md
+++ b/docs/2_1_setup.md
@@ -0,0 +1,108 @@
+<p align="center">
+  <picture>
+    <source
+      width="256px"
+      media="(prefers-color-scheme: dark)"
+      srcset="../assets/revanced-headline/revanced-headline-vertical-dark.svg"
+    >
+    <img 
+      width="256px"
+      src="../assets/revanced-headline/revanced-headline-vertical-light.svg"
+    >
+  </picture>
+  <br>
+  <a href="https://revanced.app/">
+     <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="../assets/revanced-logo/revanced-logo.svg" />
+         <img height="24px" src="../assets/revanced-logo/revanced-logo.svg" />
+     </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://github.com/ReVanced">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
+           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="http://revanced.app/discord">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://reddit.com/r/revancedapp">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://t.me/app_revanced">
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://x.com/revancedapp">
+      <picture>
+         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
+         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://www.youtube.com/@ReVanced">
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+     </picture>
+   </a>
+   <br>
+   <br>
+   Continuing the legacy of Vanced
+</p>
+
+# 👶 Setting up a development environment
+
+To start developing patches with ReVanced Patcher, you must prepare a development environment.
+
+## 📝 Prerequisites
+
+- A Java IDE with Kotlin support, such as [IntelliJ IDEA](https://www.jetbrains.com/idea/)
+- Knowledge of Java, [Kotlin](https://kotlinlang.org), and [Dalvik bytecode](https://source.android.com/docs/core/runtime/dalvik-bytecode)
+- Android reverse engineering skills and tools such as [jadx](https://github.com/skylot/jadx)
+
+## 🏃 Prepare the environment
+
+Throughout the documentation, [ReVanced Patches](https://github.com/revanced/revanced-patches) will be used as an example project.
+
+1. Clone the repository
+
+   ```bash
+   git clone https://github.com/revanced/revanced-patches && cd revanced-patches
+   ```
+
+2. Build the project
+
+   ```bash
+   ./gradlew build
+   ```
+
+> [!NOTE]
+> If the build fails due to authentication, you may need to authenticate to GitHub Packages.
+> Create a PAT with the scope `read:packages` [here](https://github.com/settings/tokens/new?scopes=read:packages&description=ReVanced) and add your token to ~/.gradle/gradle.properties.
+>
+> Example `gradle.properties` file:
+>
+> ```properties
+> gpr.user = user
+> gpr.key = key
+> ```
+
+3. Open the project in your IDE
+
+> [!TIP]
+> It is a good idea to set up a complete development environment for ReVanced, so that you can also test your patches
+> by following the [ReVanced documentation](https://github.com/ReVanced/revanced-documentation).
+
+## ⏭️ What's next
+
+The next page will go into details about a ReVanced patch.
+
+Continue: [🧩 Anatomy of a patch](2_2_patch_anatomy.md)
--- a/docs/2_2_1_fingerprinting.md
+++ b/docs/2_2_1_fingerprinting.md
@@ -0,0 +1,279 @@
+<p align="center">
+  <picture>
+    <source
+      width="256px"
+      media="(prefers-color-scheme: dark)"
+      srcset="../assets/revanced-headline/revanced-headline-vertical-dark.svg"
+    >
+    <img 
+      width="256px"
+      src="../assets/revanced-headline/revanced-headline-vertical-light.svg"
+    >
+  </picture>
+  <br>
+  <a href="https://revanced.app/">
+     <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="../assets/revanced-logo/revanced-logo.svg" />
+         <img height="24px" src="../assets/revanced-logo/revanced-logo.svg" />
+     </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://github.com/ReVanced">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
+           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="http://revanced.app/discord">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://reddit.com/r/revancedapp">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://t.me/app_revanced">
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://x.com/revancedapp">
+      <picture>
+         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
+         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://www.youtube.com/@ReVanced">
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+     </picture>
+   </a>
+   <br>
+   <br>
+   Continuing the legacy of Vanced
+</p>
+
+# 🔎 Fingerprinting
+
+In the context of ReVanced, fingerprinting is primarily used to match methods with a limited amount of known information.
+Methods with obfuscated names that change with each update are primary candidates for fingerprinting.
+The goal of fingerprinting is to uniquely identify a method by capturing various attributes, such as the return type,
+access flags, an opcode pattern, strings, and more.
+
+## ⛳️ Example fingerprint
+
+Throughout the documentation, the following example will be used to demonstrate the concepts of fingerprints:
+
+```kt
+
+package app.revanced.patches.ads.fingerprints
+
+fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("Z")
+    parameters("Z")
+    opcodes(Opcode.RETURN)
+    strings("pro")
+    custom { (method, classDef) -> method.definingClass == "Lcom/some/app/ads/AdsLoader;" }
+}
+```
+
+## 🔎 Reconstructing the original code from a fingerprint
+
+The following code is reconstructed from the fingerprint to understand how a fingerprint is created.
+
+The fingerprint contains the following information:
+
+- Method signature:
+
+  ```kt
+  accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+  returns("Z")
+  parameters("Z")
+  ```
+
+- Method implementation:
+
+  ```kt
+  opcodes(Opcode.RETURN)
+  strings("pro")
+  ```
+
+- Package and class name:
+
+  ```kt
+  custom = { (method, classDef) -> method.definingClass == "Lcom/some/app/ads/AdsLoader;"}
+  ```
+
+With this information, the original code can be reconstructed:
+
+```java
+    package com.some.app.ads;
+
+    <accessFlags> class AdsLoader {
+        public final boolean <methodName>(boolean <parameter>) {
+            // ...
+
+            var userStatus = "pro";
+
+            // ...
+
+            return <returnValue>;
+        }
+    }
+```
+
+> [!TIP]
+> A fingerprint should contain information about a method likely to remain the same across updates.
+> A method's name is not included in the fingerprint because it will likely change with each update in an obfuscated app.
+> In contrast, the return type, access flags, parameters, patterns of opcodes, and strings are likely to remain the same.
+
+## 🔨 How to use fingerprints
+
+Fingerprints can be added to a patch by directly creating and adding them or by invoking them manually.
+Fingerprints added to a patch are matched by ReVanced Patcher before the patch is executed.
+
+```kt
+val fingerprint = fingerprint {
+    // ...
+}
+
+val patch = bytecodePatch {
+    // Directly create and add a fingerprint.
+    fingerprint {
+        // ...
+    }
+
+    // Add a fingerprint manually by invoking it.
+    fingerprint()
+}
+```
+
+> [!TIP]
+> Multiple patches can share fingerprints. If a fingerprint is matched once, it will not be matched again.
+
+> [!TIP]
+> If a fingerprint has an opcode pattern, you can use the `fuzzyPatternScanThreshhold` parameter of the `opcode`
+> function to fuzzy match the pattern.  
+> `null` can be used as a wildcard to match any opcode:
+>
+> ```kt
+> fingerprint(fuzzyPatternScanThreshhold = 2) {
+>    opcodes(
+>        Opcode.ICONST_0,
+>        null,
+>        Opcode.ICONST_1,
+>        Opcode.IRETURN,
+>    )
+>}
+> ```
+
+Once the fingerprint is matched, the match can be used in the patch:
+
+```kt
+val patch = bytecodePatch {
+    // Add a fingerprint and delegate its match to a variable.
+    val match by showAdsFingerprint()
+    val match2 by fingerprint {
+        // ...
+    }
+  
+    execute {
+        val method = match.method
+        val method2 = match2.method
+    }
+}
+```
+
+> [!WARNING]
+> If the fingerprint can not be matched to any method, the match of a fingerprint is `null`. If such a match is delegated
+> to a variable, accessing it will raise an exception.
+
+The match of a fingerprint contains mutable and immutable references to the method and the class it matches to.
+
+```kt
+class Match(
+    val method: Method,
+    val classDef: ClassDef,
+    val patternMatch: Match.PatternMatch?,
+    val stringMatches: List<Match.StringMatch>?,
+    // ...
+) {
+    val mutableClass by lazy { /* ... */ }
+    val mutableMethod by lazy { /* ... */ }
+
+    // ...
+}
+```
+
+## 🏹 Manual matching of fingerprints
+
+Unless a fingerprint is added to a patch, the fingerprint will not be matched automatically by ReVanced Patcher
+before the patch is executed.
+Instead, the fingerprint can be matched manually using various overloads of a fingerprint's `match` function.
+
+You can match a fingerprint the following ways:
+
+- In a **list of classes**, if the fingerprint can match in a known subset of classes
+
+  If you have a known list of classes you know the fingerprint can match in,
+you can match the fingerprint on the list of classes:
+
+  ```kt
+    execute { context ->
+        val match = showAdsFingerprint.apply { 
+            match(context, context.classes) 
+        }.match ?: throw PatchException("No match found")
+    }
+  ```
+
+- In a **single class**, if the fingerprint can match in a single known class
+
+  If you know the fingerprint can match a method in a specific class, you can match the fingerprint in the class:
+
+  ```kt
+  execute { context ->
+      val adsLoaderClass = context.classes.single { it.name == "Lcom/some/app/ads/Loader;" }
+
+      val match = showAdsFingerprint.apply { 
+        match(context, adsLoaderClass)
+      }.match ?: throw PatchException("No match found")
+  }
+  ```
+
+- Match a **single method**, to extract certain information about it
+
+  The match of a fingerprint contains useful information about the method, such as the start and end index of an opcode pattern
+or the indices of the instructions with certain string references.
+  A fingerprint can be leveraged to extract such information from a method instead of manually figuring it out:
+
+  ```kt
+  execute { context ->
+      val proStringsFingerprint = fingerprint {
+          strings("free", "trial")
+      }
+
+      proStringsFingerprint.apply {
+          match(context, adsFingerprintMatch.method)
+      }.match?.let { match ->
+          match.stringMatches.forEach { match ->
+              println("The index of the string '${match.string}' is ${match.index}")
+          }
+      } ?: throw PatchException("No match found")
+  }
+  ```
+
+> [!TIP]
+> To see real-world examples of fingerprints,
+> check out the repository for [ReVanced Patches](https://github.com/revanced/revanced-patches).
+
+## ⏭️ What's next
+
+The next page discusses the structure and conventions of patches.
+
+Continue: [📜 Project structure and conventions](3_structure_and_conventions.md)
--- a/docs/2_2_patch_anatomy.md
+++ b/docs/2_2_patch_anatomy.md
@@ -0,0 +1,252 @@
+<p align="center">
+  <picture>
+    <source
+      width="256px"
+      media="(prefers-color-scheme: dark)"
+      srcset="../assets/revanced-headline/revanced-headline-vertical-dark.svg"
+    >
+    <img 
+      width="256px"
+      src="../assets/revanced-headline/revanced-headline-vertical-light.svg"
+    >
+  </picture>
+  <br>
+  <a href="https://revanced.app/">
+     <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="../assets/revanced-logo/revanced-logo.svg" />
+         <img height="24px" src="../assets/revanced-logo/revanced-logo.svg" />
+     </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://github.com/ReVanced">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
+           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="http://revanced.app/discord">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://reddit.com/r/revancedapp">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://t.me/app_revanced">
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://x.com/revancedapp">
+      <picture>
+         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
+         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://www.youtube.com/@ReVanced">
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+     </picture>
+   </a>
+   <br>
+   <br>
+   Continuing the legacy of Vanced
+</p>
+
+# 🧩 Anatomy of a ReVanced patch
+
+Learn the API to create patches using ReVanced Patcher.
+
+## ⛳️ Example patch
+
+The following example patch disables ads in an app.  
+In the following sections, each part of the patch will be explained in detail.
+
+```kt
+package app.revanced.patches.ads
+
+val disableAdsPatch = bytecodePatch(
+    name = "Disable ads",
+    description = "Disable ads in the app.",
+) { 
+    compatibleWith("com.some.app"("1.0.0"))
+    
+    // Resource patch disables ads by patching resource files.
+    dependsOn(disableAdsResourcePatch)
+
+    // Precompiled DEX file to be merged into the patched app.
+    extendWith("disable-ads.rve")
+
+    // Fingerprint to find the method to patch.
+    val showAdsMatch by showAdsFingerprint {
+        // More about fingerprints on the next page of the documentation.
+    }
+    
+    // Business logic of the patch to disable ads in the app.
+    execute {
+        // In the method that shows ads,
+        // call DisableAdsPatch.shouldDisableAds() from the extension (precompiled DEX file)
+        // to enable or disable ads.
+        showAdsMatch.mutableMethod.addInstructions(
+            0,
+            """
+                invoke-static {}, LDisableAdsPatch;->shouldDisableAds()Z
+                move-result v0
+                return v0
+            """
+        )
+    }
+}
+```
+
+> [!TIP]
+> To see real-world examples of patches,
+> check out the repository for [ReVanced Patches](https://github.com/revanced/revanced-patches).
+
+## 🧩 Patch API
+
+### ⚙️ Patch options
+
+Patches can have options to get and set before a patch is executed.
+Options are useful for making patches configurable.
+After loading the patches using `PatchLoader`, options can be set for a patch.
+Multiple types are already built into ReVanced Patcher and are supported by any application that uses ReVanced Patcher.
+
+To define an option, use the available `option` functions:
+
+```kt
+val patch = bytecodePatch(name = "Patch") {
+    // Add an inbuilt option and delegate it to a property.
+    val value by stringOption(key = "option")
+
+    // Add an option with a custom type and delegate it to a property.
+    val string by option<String>(key = "string")
+    
+    execute {
+        println(value)
+        println(string)
+    }
+}
+```
+
+Options of a patch can be set after loading the patches with `PatchLoader` by obtaining the instance for the patch:
+
+```kt
+loadPatchesJar(patches).apply {
+    // Type is checked at runtime.
+    first { it.name == "Patch" }.options["option"] = "Value"
+}
+```
+
+The type of an option can be obtained from the `type` property of the option:
+
+```kt
+option.type // The KType of the option.
+```
+
+### 🧩 Extensions
+
+An extension is a precompiled DEX file merged into the patched app before a patch is executed.
+While patches are compile-time constructs, extensions are runtime constructs
+that extend the patched app with additional classes.
+
+Assume you want to add a complex feature to an app that would need multiple classes and methods:
+
+```java
+public class ComplexPatch {
+    public static void doSomething() {
+        // ...
+    }
+}
+```
+
+After compiling the above code as a DEX file, you can add the DEX file as a resource in the patches file
+and use it in a patch:
+
+```kt
+val patch = bytecodePatch(name = "Complex patch") {
+    extendWith("complex-patch.rve")
+    
+    val match by methodFingerprint()
+    
+    execute { 
+        match.mutableMethod.addInstructions(0, "invoke-static { }, LComplexPatch;->doSomething()V")
+    }
+}
+```
+
+ReVanced Patcher merges the classes from the extension into `context.classes` before executing the patch. 
+When the patch is executed, it can reference the classes and methods from the extension.
+
+> [!NOTE]
+> 
+> The [ReVanced Patches template](https://github.com/ReVanced/revanced-patches-template) repository
+> is a template project to create patches and extensions.
+
+> [!TIP]
+> To see real-world examples of extensions,
+> check out the repository for [ReVanced Patches](https://github.com/revanced/revanced-patches).
+
+### ♻️ Finalization
+
+Patches can have a finalization block called after all patches have been executed, in reverse order of patch execution.
+The finalization block is called after all patches that depend on the patch have been executed.
+This is useful for doing post-processing tasks.
+A simple real-world example would be a patch that opens a resource file of the app for writing.
+Other patches that depend on this patch can write to the file, and the finalization block can close the file.
+
+```kt
+val patch = bytecodePatch(name = "Patch") { 
+    dependsOn(
+        bytecodePatch(name = "Dependency") { 
+            execute {
+                print("1")
+            }
+
+            finalize {
+                print("4")
+            }
+        }
+    )
+
+    execute {
+        print("2")
+    }
+
+    finalize {
+        print("3")
+    }
+}
+```
+
+Because `Patch` depends on `Dependency`, first `Dependency` is executed, then `Patch`.
+Finalization blocks are called in reverse order of patch execution, which means,
+first, the finalization block of `Patch`, then the finalization block of `Dependency` is called.
+The output after executing the patch above would be `1234`.
+The same order is followed for multiple patches depending on the patch.
+
+## 💡 Additional tips
+
+- When using `PatchLoader` to load patches, only patches with a name are loaded.
+  Refer to the inline documentation of `PatchLoader` for detailed information.
+- Patches can depend on others. Dependencies are executed first.
+  The dependent patch will not be executed if a dependency raises an exception while executing.
+- A patch can declare compatibility with specific packages and versions,
+  but patches can still be executed on any package or version.
+  It is recommended that compatibility is specified to present known compatible packages and versions.
+   - If `compatibleWith` is not used, the patch is treated as compatible with any package
+- If a package is specified with no versions, the patch is compatible with any version of the package
+- If an empty array of versions is specified, the patch is not compatible with any version of the package.
+    This is useful for declaring incompatibility with a specific package.
+- A patch can raise a `PatchException` at any time of execution to indicate that the patch failed to execute.
+
+## ⏭️ What's next
+
+The next page explains the concept of fingerprinting in ReVanced Patcher.
+
+Continue: [🔎 Fingerprinting](2_2_1_fingerprinting.md)
--- a/docs/2_patches_intro.md
+++ b/docs/2_patches_intro.md
@@ -0,0 +1,126 @@
+<p align="center">
+  <picture>
+    <source
+      width="256px"
+      media="(prefers-color-scheme: dark)"
+      srcset="../assets/revanced-headline/revanced-headline-vertical-dark.svg"
+    >
+    <img 
+      width="256px"
+      src="../assets/revanced-headline/revanced-headline-vertical-light.svg"
+    >
+  </picture>
+  <br>
+  <a href="https://revanced.app/">
+     <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="../assets/revanced-logo/revanced-logo.svg" />
+         <img height="24px" src="../assets/revanced-logo/revanced-logo.svg" />
+     </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://github.com/ReVanced">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
+           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="http://revanced.app/discord">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://reddit.com/r/revancedapp">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://t.me/app_revanced">
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://x.com/revancedapp">
+      <picture>
+         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
+         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://www.youtube.com/@ReVanced">
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+     </picture>
+   </a>
+   <br>
+   <br>
+   Continuing the legacy of Vanced
+</p>
+
+# 🧩 Introduction to ReVanced Patches
+
+Learn the basic concepts of ReVanced Patcher and how to create patches.
+
+## 📙 Fundamentals
+
+A patch is a piece of code that modifies an Android application.  
+There are multiple types of patches. Each type can modify a different part of the APK, such as the Dalvik VM bytecode, 
+the APK resources, or arbitrary files in the APK:
+
+- A `BytecodePatch` modifies the Dalvik VM bytecode
+- A `ResourcePatch` modifies (decoded) resources
+- A `RawResourcePatch` modifies arbitrary files
+
+Each patch can declare a set of dependencies on other patches. ReVanced Patcher will first execute dependencies
+before executing the patch itself. This way, multiple patches can work together for abstract purposes in a modular way.
+
+The `execute` function is the entry point for a patch. It is called by ReVanced Patcher when the patch is executed.
+The `execute` function receives an instance of a context object that provides access to the APK.
+The patch can use this context to modify the APK.
+
+Each type of context provides different APIs to modify the APK. For example, the `BytecodePatchContext` provides APIs
+to modify the Dalvik VM bytecode, while the `ResourcePatchContext` provides APIs to modify resources.
+
+The difference between `ResourcePatch` and `RawResourcePatch` is that ReVanced Patcher will decode the resources
+if it is supplied a `ResourcePatch` for execution or if any patch depends on a `ResourcePatch`
+and will not decode the resources before executing `RawResourcePatch`.
+Both, `ResourcePatch` and `RawResourcePatch` can modify arbitrary files in the APK,
+whereas only `ResourcePatch` can modify decoded resources. The choice of which type to use depends on the use case.
+Decoding and building resources is a time- and resource-consuming,
+so if the patch does not need to modify decoded resources, it is better to use `RawResourcePatch` or `BytecodePatch`.
+
+Example of patches:
+
+```kt
+@Surpress("unused")
+val bytecodePatch = bytecodePatch {
+    execute { 
+        // TODO
+    }
+}
+
+@Surpress("unused")
+val rawResourcePatch = rawResourcePatch {
+    execute { 
+        // TODO
+    }
+}
+
+@Surpress("unused")
+val resourcePatch = rawResourcePatch {
+    execute { 
+        // TODO
+    }
+}
+```
+
+> [!TIP]
+> To see real-world examples of patches,
+> check out the repository for [ReVanced Patches](https://github.com/revanced/revanced-patches).
+
+## ⏭️ Whats next
+
+The next page will guide you through creating a development environment for creating patches.
+
+Continue: [👶 Setting up a development environment](2_1_setup.md)
--- a/docs/3_structure_and_conventions.md
+++ b/docs/3_structure_and_conventions.md
@@ -0,0 +1,105 @@
+<p align="center">
+  <picture>
+    <source
+      width="256px"
+      media="(prefers-color-scheme: dark)"
+      srcset="../assets/revanced-headline/revanced-headline-vertical-dark.svg"
+    >
+    <img 
+      width="256px"
+      src="../assets/revanced-headline/revanced-headline-vertical-light.svg"
+    >
+  </picture>
+  <br>
+  <a href="https://revanced.app/">
+     <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="../assets/revanced-logo/revanced-logo.svg" />
+         <img height="24px" src="../assets/revanced-logo/revanced-logo.svg" />
+     </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://github.com/ReVanced">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
+           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="http://revanced.app/discord">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://reddit.com/r/revancedapp">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://t.me/app_revanced">
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://x.com/revancedapp">
+      <picture>
+         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
+         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://www.youtube.com/@ReVanced">
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+     </picture>
+   </a>
+   <br>
+   <br>
+   Continuing the legacy of Vanced
+</p>
+
+# 📜 Project structure and conventions
+
+Over time, a specific project structure and conventions have been established.
+
+## 📁 File structure
+
+Patches are organized in a specific way. The file structure looks as follows:
+
+```text
+📦your.patches.app.category
+ ├ 🔍Fingerprints.kt
+ └ 🧩SomePatch.kt
+```
+
+> [!NOTE]
+> Moving fingerprints to a separate file isn't strictly necessary, but it helps the organization when a patch uses multiple fingerprints.
+
+## 📙 Conventions
+
+- 🔥 Name a patch after what it does. For example, if a patch removes ads, name it `Remove ads`.
+  If a patch changes the color of a button, name it `Change button color`
+- 🔥 Write the patch description in the third person, present tense, and end it with a period.
+  If a patch removes ads, the description can be omitted because of redundancy,
+  but if a patch changes the color of a button, the description can be _Changes the color of the resume button to red._
+- 🔥 Write patches with modularity and reusability in mind. Patches can depend on each other,
+  so it is important to write patches in a way that can be used in different contexts.
+- 🔥🔥 Keep patches as minimal as possible. This reduces the risk of failing patches.
+  Instead of involving many abstract changes in one patch or writing entire methods or classes in a patch,
+  you can write code in extensions. An extension is a precompiled DEX file that is merged into the patched app 
+  before this patch is executed.
+  Patches can then reference methods and classes from extensions.
+  A real-world example of extensions can be found in the [ReVanced Patches](https://github.com/ReVanced/revanced-patches) repository
+- 🔥🔥🔥 Do not overload a fingerprint with information about a method that's likely to change.
+  In the example of an obfuscated method, it's better to fingerprint the method by its return type
+  and parameters rather than its name because the name is likely to change. An intelligent selection
+  of an opcode pattern or strings in a method can result in a strong fingerprint dynamic to app updates.
+- 🔥🔥🔥 Document your patches. Patches are abstract, so it is important to document parts of the code
+  that are not self-explanatory. For example, explain why and how a certain method is patched or large blocks
+  of instructions that are modified or added to a method
+
+## ⏭️ What's next
+
+The next page discusses useful APIs for patch development.
+
+Continue: [💪 Advanced APIs](4_apis.md)
--- a/docs/4_apis.md
+++ b/docs/4_apis.md
@@ -0,0 +1,27 @@
+# 💪 Advanced APIs
+
+A handful of APIs are available to make patch development easier and more efficient.
+
+## 📙 Overview
+
+1. 👹 Mutate classes with `context.proxy(ClassDef)`
+2. 🔍 Find and proxy existing classes with `classBy(Predicate)` and `classByType(String)`
+3. 🏃‍ Easily access referenced methods recursively by index with `MethodNavigator`
+4. 🔨 Make use of extension functions from `BytecodeUtils` and `ResourceUtils` with certain applications
+(Available in ReVanced Patches)
+5. 💾 Read and write (decoded) resources with `ResourcePatchContext.get(Path, Boolean)`
+6. 📃 Read and write DOM files using `ResourcePatchContext.document`
+
+### 🧰 APIs
+
+> [!WARNING]
+> This section is still under construction and may be incomplete.
+
+## 🎉 Afterword
+
+ReVanced Patcher is a powerful library to patch Android applications, offering a rich set of APIs to develop patches
+that outlive app updates. Patches make up ReVanced; without you, the community of patch developers,
+ReVanced would not be what it is today. We hope that this documentation has been helpful to you
+and are excited to see what you will create with ReVanced Patcher. If you have any questions or need help,
+talk to us on one of our platforms linked on [revanced.app](https://revanced.app) or open an issue in case of a bug or feature request,  
+ReVanced
--- a/docs/README.md
+++ b/docs/README.md
@@ -0,0 +1,73 @@
+<p align="center">
+  <picture>
+    <source
+      width="256px"
+      media="(prefers-color-scheme: dark)"
+      srcset="../assets/revanced-headline/revanced-headline-vertical-dark.svg"
+    >
+    <img 
+      width="256px"
+      src="../assets/revanced-headline/revanced-headline-vertical-light.svg"
+    >
+  </picture>
+  <br>
+  <a href="https://revanced.app/">
+     <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="../assets/revanced-logo/revanced-logo.svg" />
+         <img height="24px" src="../assets/revanced-logo/revanced-logo.svg" />
+     </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://github.com/ReVanced">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
+           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="http://revanced.app/discord">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://reddit.com/r/revancedapp">
+       <picture>
+           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
+       </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://t.me/app_revanced">
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://x.com/revancedapp">
+      <picture>
+         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
+         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
+      </picture>
+   </a>&nbsp;&nbsp;&nbsp;
+   <a href="https://www.youtube.com/@ReVanced">
+      <picture>
+         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
+     </picture>
+   </a>
+   <br>
+   <br>
+   Continuing the legacy of Vanced
+</p>
+
+# 💉 Documentation of ReVanced Patcher
+
+This documentation contains the fundamentals of ReVanced Patcher and how to use ReVanced Patcher to create patches
+
+## 📖 Table of content
+
+1. [💉 Introduction to ReVanced Patcher](1_patcher_intro.md)
+2. [🧩 Introduction to ReVanced Patches](2_patches_intro.md)
+   1. [👶 Setting up a development environment](2_1_setup.md)
+   2. [🧩 Anatomy of a ReVanced patch](2_2_patch_anatomy.md)
+      1. [🔎 Fingerprinting](2_2_1_fingerprinting.md)
+   3. [📜 Project structure and conventions](3_structure_and_conventions.md)
+   4. [💪 Advanced APIs](4_apis.md)
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.parallel = true
 org.gradle.caching = true
-version = 19.3.0-dev.2
+version = 20.0.0-dev.2
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,23 +1,27 @@
 [versions]
 android = "4.1.1.4"
-apktool-lib = "2.9.1"
-kotlin = "1.9.22"
-kotlinx-coroutines-core = "1.7.3"
+apktool-lib = "2.9.3"
+kotlin = "2.0.0"
+kotlinx-coroutines-core = "1.8.1"
+mockk = "1.13.10"
 multidexlib2 = "3.0.3.r3"
-smali = "3.0.4"
-binary-compatibility-validator = "0.13.2"
+# Tracking https://github.com/google/smali/issues/64.
+#noinspection GradleDependency
+smali = "3.0.5"
+binary-compatibility-validator = "0.15.1"
 xpp3 = "1.1.4c"

 [libraries]
 android = { module = "com.google.android:android", version.ref = "android" }
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
-apktool-lib = { module = "app.revanced:apktool", version.ref = "apktool-lib" }
+apktool-lib = { module = "app.revanced:apktool-lib", version.ref = "apktool-lib" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines-core" }
+mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
 multidexlib2 = { module = "app.revanced:multidexlib2", version.ref = "multidexlib2" }
 smali = { module = "com.android.tools.smali:smali", version.ref = "smali" }
 xpp3 = { module = "xpp3:xpp3", version.ref = "xpp3" }

 [plugins]
 binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-compatibility-validator" }
-kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
-distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dist
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "revanced-patches",
+  "name": "revanced-patcher",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
@@ -9,7 +9,7 @@
        "@semantic-release/changelog": "^6.0.3",
        "@semantic-release/git": "^10.0.1",
        "gradle-semantic-release-plugin": "^1.9.1",
-        "semantic-release": "^23.0.0"
+        "semantic-release": "^23.0.2"
      }
    },
    "node_modules/@babel/code-frame": {
@@ -272,18 +272,18 @@
      }
    },
    "node_modules/@octokit/openapi-types": {
-      "version": "19.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-19.1.0.tgz",
-      "integrity": "sha512-6G+ywGClliGQwRsjvqVYpklIfa7oRPA0vyhPQG/1Feh+B+wU0vGH1JiJ5T25d3g1JZYBHzR2qefLi9x8Gt+cpw==",
+      "version": "20.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
+      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==",
      "dev": true
    },
    "node_modules/@octokit/plugin-paginate-rest": {
-      "version": "9.1.5",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.1.5.tgz",
-      "integrity": "sha512-WKTQXxK+bu49qzwv4qKbMMRXej1DU2gq017euWyKVudA6MldaSSQuxtz+vGbhxV4CjxpUxjZu6rM2wfc1FiWVg==",
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.2.0.tgz",
+      "integrity": "sha512-NKi0bJEZqOSbBLMv9kdAcuocpe05Q2xAXNLTGi0HN2GSMFJHNZuSoPNa0tcQFTOFCKe+ZaYBZ3lpXh1yxgUDCA==",
      "dev": true,
      "dependencies": {
-        "@octokit/types": "^12.4.0"
+        "@octokit/types": "^12.6.0"
      },
      "engines": {
        "node": ">= 18"
@@ -310,9 +310,9 @@
      }
    },
    "node_modules/@octokit/plugin-throttling": {
-      "version": "8.1.3",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-8.1.3.tgz",
-      "integrity": "sha512-pfyqaqpc0EXh5Cn4HX9lWYsZ4gGbjnSmUILeu4u2gnuM50K/wIk9s1Pxt3lVeVwekmITgN/nJdoh43Ka+vye8A==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-8.2.0.tgz",
+      "integrity": "sha512-nOpWtLayKFpgqmgD0y3GqXafMFuKcA4tRPZIfu7BArd2lEZeb1988nhWhwx4aZWmjDmUfdgVf7W+Tt4AmvRmMQ==",
      "dev": true,
      "dependencies": {
        "@octokit/types": "^12.2.0",
@@ -326,9 +326,9 @@
      }
    },
    "node_modules/@octokit/request": {
-      "version": "8.1.6",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.1.6.tgz",
-      "integrity": "sha512-YhPaGml3ncZC1NfXpP3WZ7iliL1ap6tLkAp6MvbK2fTTPytzVUyUesBBogcdMm86uRYO5rHaM1xIWxigWZ17MQ==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.2.0.tgz",
+      "integrity": "sha512-exPif6x5uwLqv1N1irkLG1zZNJkOtj8bZxuVHd71U5Ftuxf2wGNvAJyNBcPbPC+EBzwYEbBDdSFb8EPcjpYxPQ==",
      "dev": true,
      "dependencies": {
        "@octokit/endpoint": "^9.0.0",
@@ -355,12 +355,12 @@
      }
    },
    "node_modules/@octokit/types": {
-      "version": "12.4.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.4.0.tgz",
-      "integrity": "sha512-FLWs/AvZllw/AGVs+nJ+ELCDZZJk+kY0zMen118xhL2zD0s1etIUHm1odgjP7epxYU1ln7SZxEUWYop5bhsdgQ==",
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
+      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
      "dev": true,
      "dependencies": {
-        "@octokit/openapi-types": "^19.1.0"
+        "@octokit/openapi-types": "^20.0.0"
      }
    },
    "node_modules/@pnpm/config.env-replace": {
@@ -564,6 +564,26 @@
        "node": ">= 16"
      }
    },
+    "node_modules/@saithodev/semantic-release-backmerge/node_modules/marked-terminal": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/marked-terminal/-/marked-terminal-6.2.0.tgz",
+      "integrity": "sha512-ubWhwcBFHnXsjYNsu+Wndpg0zhY4CahSpPlA70PlO0rR9r2sZpkyU+rkCsOWH+KMEkx847UpALON+HWgxowFtw==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^6.2.0",
+        "cardinal": "^2.1.1",
+        "chalk": "^5.3.0",
+        "cli-table3": "^0.6.3",
+        "node-emoji": "^2.1.3",
+        "supports-hyperlinks": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      },
+      "peerDependencies": {
+        "marked": ">=1 <12"
+      }
+    },
    "node_modules/@saithodev/semantic-release-backmerge/node_modules/mimic-fn": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
@@ -577,9 +597,9 @@
      }
    },
    "node_modules/@saithodev/semantic-release-backmerge/node_modules/npm-run-path": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz",
-      "integrity": "sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
+      "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
      "dev": true,
      "dependencies": {
        "path-key": "^4.0.0"
@@ -1081,9 +1101,9 @@
      }
    },
    "node_modules/@semantic-release/npm/node_modules/npm-run-path": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz",
-      "integrity": "sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
+      "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
      "dev": true,
      "dependencies": {
        "path-key": "^4.0.0"
@@ -1195,9 +1215,9 @@
      }
    },
    "node_modules/@sindresorhus/merge-streams": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-1.0.0.tgz",
-      "integrity": "sha512-rUV5WyJrJLoloD4NDN1V1+LDMDWOa4OTsT4yYJwQNpTU6FWxkxHpL7eu4w+DmiH8x/EAM1otkPE1+LaspIbplw==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz",
+      "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==",
      "dev": true,
      "engines": {
        "node": ">=18"
@@ -1282,6 +1302,12 @@
      "integrity": "sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==",
      "dev": true
    },
+    "node_modules/any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
+      "dev": true
+    },
    "node_modules/argparse": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -1376,6 +1402,81 @@
        "node": ">=6"
      }
    },
+    "node_modules/cli-highlight": {
+      "version": "2.1.11",
+      "resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz",
+      "integrity": "sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "highlight.js": "^10.7.1",
+        "mz": "^2.4.0",
+        "parse5": "^5.1.1",
+        "parse5-htmlparser2-tree-adapter": "^6.0.0",
+        "yargs": "^16.0.0"
+      },
+      "bin": {
+        "highlight": "bin/highlight"
+      },
+      "engines": {
+        "node": ">=8.0.0",
+        "npm": ">=5.0.0"
+      }
+    },
+    "node_modules/cli-highlight/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/cli-highlight/node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/cli-highlight/node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cli-highlight/node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
    "node_modules/cli-table3": {
      "version": "0.6.3",
      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz",
@@ -1734,9 +1835,9 @@
      }
    },
    "node_modules/env-ci/node_modules/npm-run-path": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz",
-      "integrity": "sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
+      "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
      "dev": true,
      "dependencies": {
        "path-key": "^4.0.0"
@@ -1818,9 +1919,9 @@
      }
    },
    "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
      "dev": true,
      "engines": {
        "node": ">=6"
@@ -1888,9 +1989,9 @@
      }
    },
    "node_modules/fastq": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz",
-      "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==",
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
      "dev": true,
      "dependencies": {
        "reusify": "^1.0.4"
@@ -2052,12 +2153,12 @@
      }
    },
    "node_modules/globby": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.0.tgz",
-      "integrity": "sha512-/1WM/LNHRAOH9lZta77uGbq0dAEQM+XjNesWwhlERDVenqothRbnzTrL3/LrIoEPPjeUHC3vrS6TwoyxeHs7MQ==",
+      "version": "14.0.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.1.tgz",
+      "integrity": "sha512-jOMLD2Z7MAhyG8aJpNOpmziMOP4rPLcc95oQPKXBazW82z+CEgPFBQvEpRUa1KeIMUJo4Wsm+q6uzO/Q/4BksQ==",
      "dev": true,
      "dependencies": {
-        "@sindresorhus/merge-streams": "^1.0.0",
+        "@sindresorhus/merge-streams": "^2.1.0",
        "fast-glob": "^3.3.2",
        "ignore": "^5.2.4",
        "path-type": "^5.0.0",
@@ -2142,9 +2243,9 @@
      }
    },
    "node_modules/hasown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz",
+      "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==",
      "dev": true,
      "dependencies": {
        "function-bind": "^1.1.2"
@@ -2153,6 +2254,15 @@
        "node": ">= 0.4"
      }
    },
+    "node_modules/highlight.js": {
+      "version": "10.7.3",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz",
+      "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
    "node_modules/hook-std": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/hook-std/-/hook-std-3.0.0.tgz",
@@ -2178,9 +2288,9 @@
      }
    },
    "node_modules/http-proxy-agent": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz",
-      "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
      "dev": true,
      "dependencies": {
        "agent-base": "^7.1.0",
@@ -2191,9 +2301,9 @@
      }
    },
    "node_modules/https-proxy-agent": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz",
-      "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
+      "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
      "dev": true,
      "dependencies": {
        "agent-base": "^7.0.2",
@@ -2213,9 +2323,9 @@
      }
    },
    "node_modules/ignore": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
-      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
+      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
      "dev": true,
      "engines": {
        "node": ">= 4"
@@ -2629,9 +2739,9 @@
      }
    },
    "node_modules/marked": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-11.1.1.tgz",
-      "integrity": "sha512-EgxRjgK9axsQuUa/oKMx5DEY8oXpKJfk61rT5iY3aRlgU6QJtUcxU5OAymdhCvWvhYcd9FKmO5eQoX8m9VGJXg==",
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-12.0.0.tgz",
+      "integrity": "sha512-Vkwtq9rLqXryZnWaQc86+FHLC6tr/fycMfYAhiOIXkrNmeGAyhSxjqu0Rs1i0bBqw5u0S7+lV9fdH2ZSVaoa0w==",
      "dev": true,
      "bin": {
        "marked": "bin/marked.js"
@@ -2641,14 +2751,14 @@
      }
    },
    "node_modules/marked-terminal": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/marked-terminal/-/marked-terminal-6.2.0.tgz",
-      "integrity": "sha512-ubWhwcBFHnXsjYNsu+Wndpg0zhY4CahSpPlA70PlO0rR9r2sZpkyU+rkCsOWH+KMEkx847UpALON+HWgxowFtw==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/marked-terminal/-/marked-terminal-7.0.0.tgz",
+      "integrity": "sha512-sNEx8nn9Ktcm6pL0TnRz8tnXq/mSS0Q1FRSwJOAqw4lAB4l49UeDf85Gm1n9RPFm5qurCPjwi1StAQT2XExhZw==",
      "dev": true,
      "dependencies": {
        "ansi-escapes": "^6.2.0",
-        "cardinal": "^2.1.1",
        "chalk": "^5.3.0",
+        "cli-highlight": "^2.1.11",
        "cli-table3": "^0.6.3",
        "node-emoji": "^2.1.3",
        "supports-hyperlinks": "^3.0.0"
@@ -2657,7 +2767,7 @@
        "node": ">=16.0.0"
      },
      "peerDependencies": {
-        "marked": ">=1 <12"
+        "marked": ">=1 <13"
      }
    },
    "node_modules/meow": {
@@ -2739,6 +2849,17 @@
      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
      "dev": true
    },
+    "node_modules/mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dev": true,
+      "dependencies": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
    "node_modules/neo-async": {
      "version": "2.6.2",
      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
@@ -5551,6 +5672,15 @@
      "inBundle": true,
      "license": "ISC"
    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
    "node_modules/once": {
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -5695,6 +5825,27 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
+    "node_modules/parse5": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
+      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
+      "dev": true
+    },
+    "node_modules/parse5-htmlparser2-tree-adapter": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
+      "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
+      "dev": true,
+      "dependencies": {
+        "parse5": "^6.0.1"
+      }
+    },
+    "node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
+    },
    "node_modules/parsimmon": {
      "version": "1.18.1",
      "resolved": "https://registry.npmjs.org/parsimmon/-/parsimmon-1.18.1.tgz",
@@ -5860,9 +6011,9 @@
      }
    },
    "node_modules/read-pkg-up/node_modules/type-fest": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.10.1.tgz",
-      "integrity": "sha512-7ZnJYTp6uc04uYRISWtiX3DSKB/fxNQT0B5o1OUeCqiQiwF+JC9+rJiZIDrPrNCLLuTqyQmh4VdQqh/ZOkv9MQ==",
+      "version": "4.10.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.10.3.tgz",
+      "integrity": "sha512-JLXyjizi072smKGGcZiAJDCNweT8J+AuRxmPZ1aG7TERg4ijx9REl8CNhbr36RV4qXqL1gO1FF9HL8OkVmmrsA==",
      "dev": true,
      "engines": {
        "node": ">=16"
@@ -5889,9 +6040,9 @@
      }
    },
    "node_modules/read-pkg/node_modules/type-fest": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.10.1.tgz",
-      "integrity": "sha512-7ZnJYTp6uc04uYRISWtiX3DSKB/fxNQT0B5o1OUeCqiQiwF+JC9+rJiZIDrPrNCLLuTqyQmh4VdQqh/ZOkv9MQ==",
+      "version": "4.10.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.10.3.tgz",
+      "integrity": "sha512-JLXyjizi072smKGGcZiAJDCNweT8J+AuRxmPZ1aG7TERg4ijx9REl8CNhbr36RV4qXqL1gO1FF9HL8OkVmmrsA==",
      "dev": true,
      "engines": {
        "node": ">=16"
@@ -5994,9 +6145,9 @@
      "dev": true
    },
    "node_modules/semantic-release": {
-      "version": "23.0.0",
-      "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-23.0.0.tgz",
-      "integrity": "sha512-Jz7jEWO2igTtske112gC4PPE2whCMVrsgxUPG3/SZI7VE357suIUZFlJd1Yu0g2I6RPc2HxNEfUg7KhmDTjwqg==",
+      "version": "23.0.2",
+      "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-23.0.2.tgz",
+      "integrity": "sha512-OnVYJ6Xgzwe1x8MKswba7RU9+5djS1MWRTrTn5qsq3xZYpslroZkV9Pt0dA2YcIuieeuSZWJhn+yUWoBUHO5Fw==",
      "dev": true,
      "dependencies": {
        "@semantic-release/commit-analyzer": "^11.0.0",
@@ -6017,8 +6168,8 @@
        "hosted-git-info": "^7.0.0",
        "import-from-esm": "^1.3.1",
        "lodash-es": "^4.17.21",
-        "marked": "^11.0.0",
-        "marked-terminal": "^6.0.0",
+        "marked": "^12.0.0",
+        "marked-terminal": "^7.0.0",
        "micromatch": "^4.0.2",
        "p-each-series": "^3.0.0",
        "p-reduce": "^3.0.0",
@@ -6169,9 +6320,9 @@
      }
    },
    "node_modules/semantic-release/node_modules/npm-run-path": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz",
-      "integrity": "sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
+      "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
      "dev": true,
      "dependencies": {
        "path-key": "^4.0.0"
@@ -6247,9 +6398,9 @@
      }
    },
    "node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
      "dev": true,
      "dependencies": {
        "lru-cache": "^6.0.0"
@@ -6465,9 +6616,9 @@
      }
    },
    "node_modules/spdx-exceptions": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.4.0.tgz",
-      "integrity": "sha512-hcjppoJ68fhxA/cjbN4T8N6uCUejN8yFw69ttpqtBeCbF3u13n7mb31NB9jKwGTTWWnt9IbRA/mf1FprYS8wfw==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+      "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
      "dev": true
    },
    "node_modules/spdx-expression-parse": {
@@ -6481,9 +6632,9 @@
      }
    },
    "node_modules/spdx-license-ids": {
-      "version": "3.0.16",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz",
-      "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==",
+      "version": "3.0.17",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz",
+      "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==",
      "dev": true
    },
    "node_modules/split2": {
@@ -6655,6 +6806,27 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
+    "node_modules/thenify": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
+      "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "dev": true,
+      "dependencies": {
+        "any-promise": "^1.0.0"
+      }
+    },
+    "node_modules/thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+      "dev": true,
+      "dependencies": {
+        "thenify": ">= 3.1.0 < 4"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
    "node_modules/through": {
      "version": "2.3.8",
      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
--- a/package.json
+++ b/package.json
@@ -4,6 +4,6 @@
    "@semantic-release/changelog": "^6.0.3",
    "@semantic-release/git": "^10.0.1",
    "gradle-semantic-release-plugin": "^1.9.1",
-    "semantic-release": "^23.0.0"
+    "semantic-release": "^23.0.2"
  }
 }
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,7 +1 @@
 rootProject.name = "revanced-patcher"
-
-buildCache {
-    local {
-        isEnabled = "CI" !in System.getenv()
-    }
-}
--- a/src/main/kotlin/app/revanced/patcher/Fingerprint.kt
+++ b/src/main/kotlin/app/revanced/patcher/Fingerprint.kt
@@ -0,0 +1,467 @@
+@file:Suppress("unused", "MemberVisibilityCanBePrivate")
+
+package app.revanced.patcher
+
+import app.revanced.patcher.extensions.InstructionExtensions.instructionsOrNull
+import app.revanced.patcher.patch.BytecodePatchBuilder
+import app.revanced.patcher.patch.BytecodePatchContext
+import app.revanced.patcher.patch.BytecodePatchContext.LookupMaps.Companion.appendParameters
+import app.revanced.patcher.patch.MethodClassPairs
+import app.revanced.patcher.util.proxy.ClassProxy
+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.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.reference.StringReference
+import com.android.tools.smali.dexlib2.util.MethodUtil
+
+/**
+ * A fingerprint.
+ *
+ * @param accessFlags The exact access flags using values of [AccessFlags].
+ * @param returnType The return type. Compared using [String.startsWith].
+ * @param parameters The parameters. Partial matches allowed and follow the same rules as [returnType].
+ * @param opcodes A pattern of instruction opcodes. `null` can be used as a wildcard.
+ * @param strings A list of the strings. Compared using [String.contains].
+ * @param custom A custom condition for this fingerprint.
+ * @param fuzzyPatternScanThreshold The threshold for fuzzy scanning the [opcodes] pattern.
+ */
+class Fingerprint internal constructor(
+    internal val accessFlags: Int?,
+    internal val returnType: String?,
+    internal val parameters: List<String>?,
+    internal val opcodes: List<Opcode?>?,
+    internal val strings: List<String>?,
+    internal val custom: ((method: Method, classDef: ClassDef) -> Boolean)?,
+    private val fuzzyPatternScanThreshold: Int,
+) {
+    /**
+     * The match for this [Fingerprint]. Null if unmatched.
+     */
+    var match: Match? = null
+        private set
+
+    /**
+     * Match using [BytecodePatchContext.LookupMaps].
+     *
+     * Generally faster than the other [match] overloads when there are many methods to check for a match.
+     *
+     * Fingerprints can be optimized for performance:
+     * - Slowest: Specify [custom] or [opcodes] and nothing else.
+     * - Fast: Specify [accessFlags], [returnType].
+     * - Faster: Specify [accessFlags], [returnType] and [parameters].
+     * - Fastest: Specify [strings], with at least one string being an exact (non-partial) match.
+     *
+     * @param context The context to create mutable proxies for the matched method and its class.
+     * @return True if a match was found or if the fingerprint is already matched to a method, false otherwise.
+     */
+    internal fun match(context: BytecodePatchContext): Boolean {
+        val lookupMaps = context.lookupMaps
+
+        fun Fingerprint.match(methodClasses: MethodClassPairs): Boolean {
+            methodClasses.forEach { (classDef, method) ->
+                if (match(context, classDef, method)) return true
+            }
+            return false
+        }
+
+        // TODO: If only one string is necessary, why not use a single string for every fingerprint?
+        fun Fingerprint.lookupByStrings() = strings?.firstNotNullOfOrNull { lookupMaps.methodsByStrings[it] }
+        if (lookupByStrings()?.let(::match) == true) {
+            return true
+        }
+
+        // No strings declared or none matched (partial matches are allowed).
+        // Use signature matching.
+        fun Fingerprint.lookupBySignature(): MethodClassPairs {
+            if (accessFlags == null) return lookupMaps.allMethods
+
+            var returnTypeValue = returnType
+            if (returnTypeValue == null) {
+                if (AccessFlags.CONSTRUCTOR.isSet(accessFlags)) {
+                    // Constructors always have void return type.
+                    returnTypeValue = "V"
+                } else {
+                    return lookupMaps.allMethods
+                }
+            }
+
+            val signature =
+                buildString {
+                    append(accessFlags)
+                    append(returnTypeValue.first())
+                    appendParameters(parameters ?: return@buildString)
+                }
+
+            return lookupMaps.methodsBySignature[signature] ?: return MethodClassPairs()
+        }
+        return match(lookupBySignature())
+    }
+
+    /**
+     * Match using a [ClassDef].
+     *
+     * @param classDef The class to match against.
+     * @param context The context to create mutable proxies for the matched method and its class.
+     * @return True if a match was found or if the fingerprint is already matched to a method, false otherwise.
+     */
+    fun match(
+        context: BytecodePatchContext,
+        classDef: ClassDef,
+    ): Boolean {
+        for (method in classDef.methods) {
+            if (match(context, method, classDef)) {
+                return true
+            }
+        }
+        return false
+    }
+
+    /**
+     * Match using a [Method].
+     * The class is retrieved from the method.
+     *
+     * @param method The method to match against.
+     * @param context The context to create mutable proxies for the matched method and its class.
+     * @return True if a match was found or if the fingerprint is already matched to a method, false otherwise.
+     */
+    fun match(
+        context: BytecodePatchContext,
+        method: Method,
+    ) = match(context, method, context.classByType(method.definingClass)!!.immutableClass)
+
+    /**
+     * Match using a [Method].
+     *
+     * @param method The method to match against.
+     * @param classDef The class the method is a member of.
+     * @param context The context to create mutable proxies for the matched method and its class.
+     * @return True if a match was found or if the fingerprint is already matched to a method, false otherwise.
+     */
+    internal fun match(
+        context: BytecodePatchContext,
+        method: Method,
+        classDef: ClassDef,
+    ): Boolean {
+        if (match != null) return true
+
+        if (returnType != null && !method.returnType.startsWith(returnType)) {
+            return false
+        }
+
+        if (accessFlags != null && accessFlags != method.accessFlags) {
+            return false
+        }
+
+        fun parametersEqual(
+            parameters1: Iterable<CharSequence>,
+            parameters2: Iterable<CharSequence>,
+        ): Boolean {
+            if (parameters1.count() != parameters2.count()) return false
+            val iterator1 = parameters1.iterator()
+            parameters2.forEach {
+                if (!it.startsWith(iterator1.next())) return false
+            }
+            return true
+        }
+
+        // TODO: parseParameters()
+        if (parameters != null && !parametersEqual(parameters, method.parameterTypes)) {
+            return false
+        }
+
+        if (custom != null && !custom.invoke(method, classDef)) {
+            return false
+        }
+
+        val stringMatches: List<Match.StringMatch>? =
+            if (strings != null) {
+                buildList {
+                    val instructions = method.instructionsOrNull ?: return false
+
+                    val stringsList = strings.toMutableList()
+
+                    instructions.forEachIndexed { instructionIndex, instruction ->
+                        if (
+                            instruction.opcode != Opcode.CONST_STRING &&
+                            instruction.opcode != Opcode.CONST_STRING_JUMBO
+                        ) {
+                            return@forEachIndexed
+                        }
+
+                        val string = ((instruction as ReferenceInstruction).reference as StringReference).string
+                        val index = stringsList.indexOfFirst(string::contains)
+                        if (index == -1) return@forEachIndexed
+
+                        add(Match.StringMatch(string, instructionIndex))
+                        stringsList.removeAt(index)
+                    }
+
+                    if (stringsList.isNotEmpty()) return false
+                }
+            } else {
+                null
+            }
+
+        val patternMatch = if (opcodes != null) {
+            val instructions = method.instructionsOrNull ?: return false
+
+            fun patternScan(): Match.PatternMatch? {
+                val fingerprintFuzzyPatternScanThreshold = fuzzyPatternScanThreshold
+
+                val instructionLength = instructions.count()
+                val patternLength = opcodes.size
+
+                for (index in 0 until instructionLength) {
+                    var patternIndex = 0
+                    var threshold = fingerprintFuzzyPatternScanThreshold
+
+                    while (index + patternIndex < instructionLength) {
+                        val originalOpcode = instructions.elementAt(index + patternIndex).opcode
+                        val patternOpcode = opcodes.elementAt(patternIndex)
+
+                        if (patternOpcode != null && patternOpcode.ordinal != originalOpcode.ordinal) {
+                            // 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.
+                            patternIndex++
+                            continue
+                        }
+
+                        // The entire pattern has been scanned.
+                        return Match.PatternMatch(
+                            index,
+                            index + patternIndex,
+                        )
+                    }
+                }
+
+                return null
+            }
+
+            patternScan() ?: return false
+        } else {
+            null
+        }
+
+        match = Match(
+            method,
+            classDef,
+            patternMatch,
+            stringMatches,
+            context,
+        )
+
+        return true
+    }
+}
+
+/**
+ * A match for a [Fingerprint].
+ *
+ * @param method The matching method.
+ * @param classDef The class the matching method is a member of.
+ * @param patternMatch The match for the opcode pattern.
+ * @param stringMatches The matches for the strings.
+ * @param context The context to create mutable proxies in.
+ */
+class Match(
+    val method: Method,
+    val classDef: ClassDef,
+    val patternMatch: PatternMatch?,
+    val stringMatches: List<StringMatch>?,
+    internal val context: BytecodePatchContext,
+) {
+    /**
+     * The mutable version of [classDef].
+     *
+     * Accessing this property allocates a [ClassProxy].
+     * Use [classDef] if mutable access is not required.
+     */
+    val mutableClass by lazy { context.proxy(classDef).mutableClass }
+
+    /**
+     * The mutable version of [method].
+     *
+     * Accessing this property allocates a [ClassProxy].
+     * Use [method] if mutable access is not required.
+     */
+    val mutableMethod by lazy { mutableClass.methods.first { MethodUtil.methodSignaturesMatch(it, method) } }
+
+    /**
+     * A match for an opcode pattern.
+     * @param startIndex The index of the first opcode of the pattern in the method.
+     * @param endIndex The index of the last opcode of the pattern in the method.
+     */
+    class PatternMatch(
+        val startIndex: Int,
+        val endIndex: Int,
+    )
+
+    /**
+     * A match for a string.
+     *
+     * @param string The string that matched.
+     * @param index The index of the instruction in the method.
+     */
+    class StringMatch(val string: String, val index: Int)
+}
+
+/**
+ * A builder for [Fingerprint].
+ *
+ * @property accessFlags The exact access flags using values of [AccessFlags].
+ * @property returnType The return type compared using [String.startsWith].
+ * @property parameters The parameters of the method. Partial matches allowed and follow the same rules as [returnType].
+ * @property opcodes An opcode pattern of the instructions. Wildcard or unknown opcodes can be specified by `null`.
+ * @property strings A list of the strings compared each using [String.contains].
+ * @property customBlock A custom condition for this fingerprint.
+ * @property fuzzyPatternScanThreshold The threshold for fuzzy pattern scanning.
+ *
+ * @constructor Create a new [FingerprintBuilder].
+ */
+class FingerprintBuilder internal constructor(
+    private val fuzzyPatternScanThreshold: Int = 0,
+) {
+    private var accessFlags: Int? = null
+    private var returnType: String? = null
+    private var parameters: List<String>? = null
+    private var opcodes: List<Opcode?>? = null
+    private var strings: List<String>? = null
+    private var customBlock: ((method: Method, classDef: ClassDef) -> Boolean)? = null
+
+    /**
+     * Set the access flags.
+     *
+     * @param accessFlags The exact access flags using values of [AccessFlags].
+     */
+    fun accessFlags(accessFlags: Int) {
+        this.accessFlags = accessFlags
+    }
+
+    /**
+     * Set the access flags.
+     *
+     * @param accessFlags The exact access flags using values of [AccessFlags].
+     */
+    fun accessFlags(vararg accessFlags: AccessFlags) {
+        this.accessFlags = accessFlags.fold(0) { acc, it -> acc or it.value }
+    }
+
+    /**
+     * Set the return type.
+     *
+     * @param returnType The return type compared using [String.startsWith].
+     */
+    infix fun returns(returnType: String) {
+        this.returnType = returnType
+    }
+
+    /**
+     * Set the parameters.
+     *
+     * @param parameters The parameters of the method. Partial matches allowed and follow the same rules as [returnType].
+     */
+    fun parameters(vararg parameters: String) {
+        this.parameters = parameters.toList()
+    }
+
+    /**
+     * Set the opcodes.
+     *
+     * @param opcodes An opcode pattern of instructions.
+     * Wildcard or unknown opcodes can be specified by `null`.
+     */
+    fun opcodes(vararg opcodes: Opcode?) {
+        this.opcodes = opcodes.toList()
+    }
+
+    /**
+     * Set the opcodes.
+     *
+     * @param instructions A list of instructions or opcode names in SMALI format.
+     * - Wildcard or unknown opcodes can be specified by `null`.
+     * - Empty lines are ignored.
+     * - Each instruction must be on a new line.
+     * - The opcode name is enough, no need to specify the operands.
+     *
+     * @throws Exception If an unknown opcode is used.
+     */
+    fun opcodes(instructions: String) {
+        this.opcodes = instructions.trimIndent().split("\n").filter {
+            it.isNotBlank()
+        }.map {
+            // Remove any operands.
+            val name = it.split(" ", limit = 1).first().trim()
+            if (name == "null") return@map null
+
+            opcodesByName[name] ?: throw Exception("Unknown opcode: $name")
+        }
+    }
+
+    /**
+     * Set the strings.
+     *
+     * @param strings A list of strings compared each using [String.contains].
+     */
+    fun strings(vararg strings: String) {
+        this.strings = strings.toList()
+    }
+
+    /**
+     * Set a custom condition for this fingerprint.
+     *
+     * @param customBlock A custom condition for this fingerprint.
+     */
+    fun custom(customBlock: (method: Method, classDef: ClassDef) -> Boolean) {
+        this.customBlock = customBlock
+    }
+
+    internal fun build() = Fingerprint(
+        accessFlags,
+        returnType,
+        parameters,
+        opcodes,
+        strings,
+        customBlock,
+        fuzzyPatternScanThreshold,
+    )
+
+    private companion object {
+        val opcodesByName = Opcode.entries.associateBy { it.name }
+    }
+}
+
+/**
+ * Create a [Fingerprint].
+ *
+ * @param fuzzyPatternScanThreshold The threshold for fuzzy pattern scanning. Default is 0.
+ * @param block The block to build the [Fingerprint].
+ *
+ * @return The created [Fingerprint].
+ */
+fun fingerprint(
+    fuzzyPatternScanThreshold: Int = 0,
+    block: FingerprintBuilder.() -> Unit,
+) = FingerprintBuilder(fuzzyPatternScanThreshold).apply(block).build()
+
+/**
+ * Create a [Fingerprint] and add it to the set of fingerprints.
+ *
+ * @param fuzzyPatternScanThreshold The threshold for fuzzy pattern scanning. Default is 0.
+ * @param block The block to build the [Fingerprint].
+ *
+ * @return The created [Fingerprint].
+ */
+fun BytecodePatchBuilder.fingerprint(
+    fuzzyPatternScanThreshold: Int = 0,
+    block: FingerprintBuilder.() -> Unit,
+) = app.revanced.patcher.fingerprint(
+    fuzzyPatternScanThreshold,
+    block,
+)() // Invoke to add it.
--- a/src/main/kotlin/app/revanced/patcher/IntegrationsConsumer.kt
+++ b/src/main/kotlin/app/revanced/patcher/IntegrationsConsumer.kt
@@ -1,11 +0,0 @@
-package app.revanced.patcher
-
-import java.io.File
-
-@FunctionalInterface
-interface IntegrationsConsumer {
-    fun acceptIntegrations(integrations: Set<File>)
-
-    @Deprecated("Use acceptIntegrations(Set<File>) instead.")
-    fun acceptIntegrations(integrations: List<File>)
-}
--- a/src/main/kotlin/app/revanced/patcher/PatchBundleLoader.kt
+++ b/src/main/kotlin/app/revanced/patcher/PatchBundleLoader.kt
@@ -1,136 +0,0 @@
-@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
-
-
-/**
- * A set of [Patch]es.
- */
-typealias PatchSet = Set<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.
- * @param patchBundles A set of patches to initialize this instance with.
- */
-sealed class PatchBundleLoader private constructor(
-    classLoader: ClassLoader,
-    patchBundles: Array<out File>,
-    getBinaryClassNames: (patchBundle: File) -> List<String>,
-    // This constructor parameter is unfortunately necessary,
-    // so that a reference to the mutable set is present in the constructor to be able to add patches to it.
-    // because the instance itself is a PatchSet, which is immutable, that is delegated by the parameter.
-    private val patchSet: MutableSet<Patch<*>> = mutableSetOf(),
-) : PatchSet by patchSet {
-    private val logger = Logger.getLogger(PatchBundleLoader::class.java.name)
-
-    init {
-        patchBundles.flatMap(getBinaryClassNames).asSequence().map {
-            classLoader.loadClass(it)
-        }.filter {
-            Patch::class.java.isAssignableFrom(it)
-        }.mapNotNull { patchClass ->
-            patchClass.getInstance(logger, silent = true)
-        }.filter {
-            it.name != null
-        }.let { patches ->
-            patchSet.addAll(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.
-         * @param silent Whether to suppress logging.
-         * @return The instantiated [Patch] or `null` if the [Patch] could not be instantiated.
-         */
-        internal fun Class<*>.getInstance(
-            logger: Logger,
-            silent: Boolean = false,
-        ): Patch<*>? {
-            return try {
-                getField("INSTANCE").get(null)
-            } catch (exception: NoSuchFieldException) {
-                if (!silent) {
-                    logger.fine(
-                        "Patch class '$name' has no INSTANCE field, therefor not a singleton. " +
-                                "Attempting to instantiate it.",
-                    )
-                }
-
-                try {
-                    getDeclaredConstructor().newInstance()
-                } catch (exception: Exception) {
-                    if (!silent) {
-                        logger.severe(
-                            "Patch class '$name' is not singleton and has no suitable constructor, " +
-                                    "therefor cannot be instantiated and is 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/src/main/kotlin/app/revanced/patcher/PatchExecutorFunction.kt
+++ b/src/main/kotlin/app/revanced/patcher/PatchExecutorFunction.kt
@@ -1,8 +0,0 @@
-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/src/main/kotlin/app/revanced/patcher/Patcher.kt
+++ b/src/main/kotlin/app/revanced/patcher/Patcher.kt
@@ -1,14 +1,8 @@
 package app.revanced.patcher

-import app.revanced.patcher.PatchBundleLoader.Utils.getInstance
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.fingerprint.LookupMap
-import app.revanced.patcher.fingerprint.MethodFingerprint.Companion.resolveUsingLookupMap
 import app.revanced.patcher.patch.*
 import kotlinx.coroutines.flow.flow
 import java.io.Closeable
-import java.io.File
-import java.util.function.Supplier
 import java.util.logging.Logger

 /**
@@ -16,255 +10,157 @@ import java.util.logging.Logger
 *
 * @param config The configuration to use for the patcher.
 */
-class Patcher(
-    private val config: PatcherConfig,
-) : PatchExecutorFunction, PatchesConsumer, IntegrationsConsumer, Supplier<PatcherResult>, Closeable {
-    private val logger = Logger.getLogger(Patcher::class.java.name)
+class Patcher(private val config: PatcherConfig) : Closeable {
+    private val logger = Logger.getLogger(this::class.java.name)

    /**
-     * A context for the patcher containing the current state of the patcher.
+     * The context containing the current state of the patcher.
     */
    val context = PatcherContext(config)

-    @Suppress("DEPRECATION")
-    @Deprecated("Use Patcher(PatcherConfig) instead.")
-    constructor(
-        patcherOptions: PatcherOptions,
-    ) : this(
-        PatcherConfig(
-            patcherOptions.inputFile,
-            patcherOptions.resourceCachePath,
-            patcherOptions.aaptBinaryPath,
-            patcherOptions.frameworkFileDirectory,
-            patcherOptions.multithreadingDexFileWriter,
-        ),
-    )
-
    init {
-        context.resourceContext.decodeResources(ResourceContext.ResourceMode.NONE)
+        context.resourceContext.decodeResources(ResourcePatchContext.ResourceMode.NONE)
    }

    /**
-     * Add [Patch]es to ReVanced [Patcher].
+     * Add patches.
     *
-     * @param patches The [Patch]es to add.
+     * @param patches The patches to add.
     */
-    @Suppress("NAME_SHADOWING")
-    override fun acceptPatches(patches: PatchSet) {
-        /**
-         * 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
+    operator fun plusAssign(patches: Set<Patch<*>>) {
+        // Add all patches to the executablePatches set.
+        context.executablePatches += patches

-            val dependency = this.java.getInstance(logger)!!
-            context.allPatches[this] = dependency
-
-            dependency.dependencies?.forEach { it.putDependenciesRecursively() }
-        }
-
-        // Add all patches and their dependencies to the context.
+        // Add all patches and their dependencies to the allPatches set.
        patches.forEach { patch ->
-            context.executablePatches.putIfAbsent(patch::class, patch) ?: run {
-                context.allPatches[patch::class] = patch
+            fun Patch<*>.addRecursively() =
+                also(context.allPatches::add).dependencies.forEach(Patch<*>::addRecursively)

-                patch.dependencies?.forEach { it.putDependenciesRecursively() }
-            }
+            patch.addRecursively()
        }

-        // TODO: Detect circular dependencies.
-
-        /**
-         * 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 the resource mode.
-
-            config.resourceMode = if (patches.any { patch -> patch.anyRecursively { it is ResourcePatch } }) {
-                ResourceContext.ResourceMode.FULL
-            } else if (patches.any { patch -> patch.anyRecursively { it is RawResourcePatch } }) {
-                ResourceContext.ResourceMode.RAW_ONLY
+        context.allPatches.let { allPatches ->
+            // Check, if what kind of resource mode is required.
+            config.resourceMode = if (allPatches.any { patch -> patch.anyRecursively { it is ResourcePatch } }) {
+                ResourcePatchContext.ResourceMode.FULL
+            } else if (allPatches.any { patch -> patch.anyRecursively { it is RawResourcePatch } }) {
+                ResourcePatchContext.ResourceMode.RAW_ONLY
            } else {
-                ResourceContext.ResourceMode.NONE
+                ResourcePatchContext.ResourceMode.NONE
            }
-
-            // Determine, if merging integrations is required.
-            for (patch in patches)
-                if (patch.anyRecursively { it.requiresIntegrations }) {
-                    context.bytecodeContext.integrations.merge = true
-                    break
-                }
        }
    }

    /**
-     * Add integrations to the [Patcher].
+     * Execute added patches.
     *
-     * @param integrations The integrations to add. Must be a DEX file or container of DEX files.
+     * @return A flow of [PatchResult]s.
     */
-    override fun acceptIntegrations(integrations: Set<File>) {
-        context.bytecodeContext.integrations.addAll(integrations)
-    }
+    operator fun invoke() = flow {
+        fun Patch<*>.execute(
+            executedPatches: LinkedHashMap<Patch<*>, PatchResult>,
+        ): PatchResult {
+            // If the patch was executed before or failed, return it's the result.
+            executedPatches[this]?.let { patchResult ->
+                patchResult.exception ?: return patchResult

-    @Deprecated(
-        "Use acceptIntegrations(Set<File>) instead.",
-        ReplaceWith("acceptIntegrations(integrations.toSet())"),
-    )
-    override fun acceptIntegrations(integrations: List<File>) = acceptIntegrations(integrations.toSet())
+                return PatchResult(this, PatchException("The patch '$this' failed previously"))
+            }

-    /**
-     * 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 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].
-             */
-            fun executePatch(
-                patch: Patch<*>,
-                executedPatches: LinkedHashMap<Patch<*>, PatchResult>,
-            ): PatchResult {
-                val patchName = patch.toString()
-
-                executedPatches[patch]?.let { patchResult ->
-                    patchResult.exception ?: return patchResult
-
-                    // 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.
+            dependencies.forEach { dependency ->
+                dependency.execute(executedPatches).exception?.let {
+                    return PatchResult(
+                        this,
+                        PatchException(
+                            "The patch \"$this\" depends on \"$dependency\", which raised an exception:\n${it.stackTraceToString()}",
+                        ),
+                    )
                }
+            }

-                // Recursively execute all dependency patches.
-                patch.dependencies?.forEach { dependencyClass ->
-                    val dependency = context.allPatches[dependencyClass]!!
-                    val result = executePatch(dependency, executedPatches)
+            // Execute the patch.
+            return try {
+                execute(context)

-                    result.exception?.let {
-                        return PatchResult(
-                            patch,
-                            PatchException(
-                                "'$patchName' depends on '${dependency.name ?: dependency}' " +
-                                    "that raised an exception:\n${it.stackTraceToString()}",
-                            ),
-                        )
-                    }
-                }
+                PatchResult(this)
+            } catch (exception: PatchException) {
+                PatchResult(this, exception)
+            } catch (exception: Exception) {
+                PatchResult(this, PatchException(exception))
+            }.also { executedPatches[this] = it }
+        }

-                return try {
-                    // TODO: Implement this in a more polymorphic way.
-                    when (patch) {
-                        is BytecodePatch -> {
-                            patch.fingerprints.resolveUsingLookupMap(context.bytecodeContext)
-                            patch.execute(context.bytecodeContext)
-                        }
-                        is RawResourcePatch -> {
-                            patch.execute(context.resourceContext)
-                        }
-                        is ResourcePatch -> {
-                            patch.execute(context.resourceContext)
-                        }
-                    }
+        // Prevent from decoding the app manifest twice if it is not needed.
+        if (config.resourceMode != ResourcePatchContext.ResourceMode.NONE) {
+            context.resourceContext.decodeResources(config.resourceMode)
+        }

-                    PatchResult(patch)
+        logger.info("Merging extensions")
+
+        context.executablePatches.forEachRecursively { patch ->
+            if (patch is BytecodePatch && patch.extension != null) {
+                context.bytecodeContext.merge(patch.extension)
+            }
+        }
+
+        // Initialize lookup maps.
+        context.bytecodeContext.lookupMaps
+
+        logger.info("Executing patches")
+
+        val executedPatches = LinkedHashMap<Patch<*>, PatchResult>()
+
+        context.executablePatches.sortedBy { it.name }.forEach { patch ->
+            val patchResult = patch.execute(executedPatches)
+
+            // If an exception occurred or the patch has no finalize block, emit the result.
+            if (patchResult.exception != null || patch.finalizeBlock == null) {
+                emit(patchResult)
+            }
+        }
+
+        val succeededPatchesWithFinalizeBlock = executedPatches.values.filter {
+            it.exception == null && it.patch.finalizeBlock != null
+        }
+
+        succeededPatchesWithFinalizeBlock.asReversed().forEach { executionResult ->
+            val patch = executionResult.patch
+
+            val result =
+                try {
+                    patch.finalize(context)
+
+                    executionResult
                } catch (exception: PatchException) {
                    PatchResult(patch, exception)
                } catch (exception: Exception) {
                    PatchResult(patch, PatchException(exception))
-                }.also { executedPatches[patch] = it }
-            }
-
-            if (context.bytecodeContext.integrations.merge) context.bytecodeContext.integrations.flush()
-
-            LookupMap.initializeLookupMaps(context.bytecodeContext)
-
-            // Prevent from decoding the app manifest twice if it is not needed.
-            if (config.resourceMode != ResourceContext.ResourceMode.NONE) {
-                context.resourceContext.decodeResources(config.resourceMode)
-            }
-
-            logger.info("Executing patches")
-
-            val executedPatches = LinkedHashMap<Patch<*>, PatchResult>() // Key is name.
-
-            context.executablePatches.values.sortedBy { it.name }.forEach { patch ->
-                val patchResult = executePatch(patch, executedPatches)
-
-                // 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 (returnOnError) return@flow
-                } ?: run {
-                    if (patch is Closeable) return@run
-
-                    emit(patchResult)
                }
+
+            if (result.exception != null) {
+                emit(
+                    PatchResult(
+                        patch,
+                        PatchException(
+                            "The patch \"$patch\" raised an exception: ${result.exception.stackTraceToString()}",
+                            result.exception,
+                        ),
+                    ),
+                )
+            } else if (patch in context.executablePatches) {
+                emit(result)
            }
-
-            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' raised an exception while being closed: ${it.stackTraceToString()}",
-                                    result.exception,
-                                ),
-                            ),
-                        )
-
-                        if (returnOnError) return@flow
-                    } ?: run {
-                        patch.name ?: return@run
-
-                        emit(result)
-                    }
-                }
        }
+    }

-    override fun close() = LookupMap.clearLookupMaps()
+    override fun close() = context.close()

    /**
-     * Compile and save the patched APK file.
+     * Compile and save patched APK files.
     *
-     * @return The [PatcherResult] containing the patched input files.
+     * @return The [PatcherResult] containing the patched APK files.
     */
    @OptIn(InternalApi::class)
-    override fun get() =
-        PatcherResult(
-            context.bytecodeContext.get(),
-            context.resourceContext.get(),
-        )
+    fun get() = PatcherResult(context.bytecodeContext.get(), context.resourceContext.get())
 }
--- a/src/main/kotlin/app/revanced/patcher/PatcherConfig.kt
+++ b/src/main/kotlin/app/revanced/patcher/PatcherConfig.kt
@@ -1,6 +1,6 @@
 package app.revanced.patcher

-import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.ResourcePatchContext
 import brut.androlib.Config
 import java.io.File
 import java.util.logging.Logger
@@ -27,9 +27,9 @@ class PatcherConfig(
    /**
     * The mode to use for resource decoding and compiling.
     *
-     * @see ResourceContext.ResourceMode
+     * @see ResourcePatchContext.ResourceMode
     */
-    internal var resourceMode = ResourceContext.ResourceMode.NONE
+    internal var resourceMode = ResourcePatchContext.ResourceMode.NONE

    /**
     * The configuration for decoding and compiling resources.
--- a/src/main/kotlin/app/revanced/patcher/PatcherContext.kt
+++ b/src/main/kotlin/app/revanced/patcher/PatcherContext.kt
@@ -1,10 +1,11 @@
 package app.revanced.patcher

-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.BytecodePatchContext
 import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.patch.ResourcePatchContext
 import brut.androlib.apk.ApkInfo
 import brut.directory.ExtFile
+import java.io.Closeable

 /**
 * A context for the patcher containing the current state of the patcher.
@@ -12,29 +13,31 @@ import brut.directory.ExtFile
 * @param config The configuration for the patcher.
 */
@Suppress("MemberVisibilityCanBePrivate")
-class PatcherContext internal constructor(config: PatcherConfig) {
+class PatcherContext internal constructor(config: PatcherConfig): Closeable {
    /**
     * [PackageMetadata] of the supplied [PatcherConfig.apkFile].
     */
    val packageMetadata = PackageMetadata(ApkInfo(ExtFile(config.apkFile)))

    /**
-     * The map of [Patch]es associated by their [PatchClass].
+     * The set of [Patch]es.
     */
-    internal val executablePatches = mutableMapOf<PatchClass, Patch<*>>()
+    internal val executablePatches = mutableSetOf<Patch<*>>()

    /**
-     * The map of all [Patch]es and their dependencies associated by their [PatchClass].
+     * The set of all [Patch]es and their dependencies.
     */
-    internal val allPatches = mutableMapOf<PatchClass, Patch<*>>()
+    internal val allPatches = mutableSetOf<Patch<*>>()

    /**
-     * A context for the patcher containing the current state of the resources.
+     * The context for patches containing the current state of the resources.
     */
-    internal val resourceContext = ResourceContext(packageMetadata, config)
+    internal val resourceContext = ResourcePatchContext(packageMetadata, config)

    /**
-     * A context for the patcher containing the current state of the bytecode.
+     * The context for patches containing the current state of the bytecode.
     */
-    internal val bytecodeContext = BytecodeContext(config)
+    internal val bytecodeContext = BytecodePatchContext(config)
+
+    override fun close() = bytecodeContext.close()
 }
--- a/src/main/kotlin/app/revanced/patcher/PatcherException.kt
+++ b/src/main/kotlin/app/revanced/patcher/PatcherException.kt
@@ -1,15 +0,0 @@
-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/src/main/kotlin/app/revanced/patcher/PatcherOptions.kt
+++ b/src/main/kotlin/app/revanced/patcher/PatcherOptions.kt
@@ -1,25 +0,0 @@
-package app.revanced.patcher
-
-import java.io.File
-
-@Deprecated("Use PatcherConfig instead.")
-data class PatcherOptions(
-    internal val inputFile: File,
-    internal val resourceCachePath: File = File("revanced-resource-cache"),
-    internal val aaptBinaryPath: String? = null,
-    internal val frameworkFileDirectory: String? = null,
-    internal val multithreadingDexFileWriter: Boolean = false,
-) {
-    @Deprecated("This method will be removed in the future.")
-    fun recreateResourceCacheDirectory(): File {
-        PatcherConfig(
-            inputFile,
-            resourceCachePath,
-            aaptBinaryPath,
-            frameworkFileDirectory,
-            multithreadingDexFileWriter,
-        ).initializeTemporaryFilesDirectories()
-
-        return resourceCachePath
-    }
-}
--- a/src/main/kotlin/app/revanced/patcher/PatcherResult.kt
+++ b/src/main/kotlin/app/revanced/patcher/PatcherResult.kt
@@ -2,7 +2,6 @@ package app.revanced.patcher

 import java.io.File
 import java.io.InputStream
-import kotlin.jvm.internal.Intrinsics

 /**
 * The result of a patcher.
@@ -15,84 +14,6 @@ class PatcherResult internal constructor(
    val dexFiles: Set<PatchedDexFile>,
    val resources: PatchedResources?,
 ) {
-    @Deprecated("This method is not used anymore")
-    constructor(
-        dexFiles: List<PatchedDexFile>,
-        resourceFile: File?,
-        doNotCompress: List<String>? = null,
-    ) : this(dexFiles.toSet(), PatchedResources(resourceFile, null, doNotCompress?.toSet() ?: emptySet(), emptySet()))
-
-    @Deprecated("This method is not used anymore")
-    fun component1(): List<PatchedDexFile> {
-        return dexFiles.toList()
-    }
-
-    @Deprecated("This method is not used anymore")
-    fun component2(): File? {
-        return resources?.resourcesApk
-    }
-
-    @Deprecated("This method is not used anymore")
-    fun component3(): List<String>? {
-        return resources?.doNotCompress?.toList()
-    }
-
-    @Deprecated("This method is not used anymore")
-    fun copy(
-        dexFiles: List<PatchedDexFile>,
-        resourceFile: File?,
-        doNotCompress: List<String>? = null,
-    ): PatcherResult {
-        return PatcherResult(
-            dexFiles.toSet(),
-            PatchedResources(
-                resourceFile,
-                null,
-                doNotCompress?.toSet() ?: emptySet(),
-                emptySet(),
-            ),
-        )
-    }
-
-    @Deprecated("This method is not used anymore")
-    override fun toString(): String {
-        return (("PatcherResult(dexFiles=" + this.dexFiles + ", resourceFile=" + this.resources?.resourcesApk) + ", doNotCompress=" + this.resources?.doNotCompress) + ")"
-    }
-
-    @Deprecated("This method is not used anymore")
-    override fun hashCode(): Int {
-        val result = dexFiles.hashCode()
-        return (
-            (
-                (result * 31) +
-                    (if (this.resources?.resourcesApk == null) 0 else this.resources?.resourcesApk.hashCode())
-                ) * 31
-            ) +
-            (if (this.resources?.doNotCompress == null) 0 else this.resources?.doNotCompress.hashCode())
-    }
-
-    @Deprecated("This method is not used anymore")
-    override fun equals(other: Any?): Boolean {
-        if (this === other) {
-            return true
-        }
-        if (other is PatcherResult) {
-            return Intrinsics.areEqual(this.dexFiles, other.dexFiles) && Intrinsics.areEqual(
-                this.resources?.resourcesApk,
-                other.resources?.resourcesApk,
-            ) && Intrinsics.areEqual(this.resources?.doNotCompress, other.resources?.doNotCompress)
-        }
-        return false
-    }
-
-    @Deprecated("This method is not used anymore")
-    fun getDexFiles() = component1()
-
-    @Deprecated("This method is not used anymore")
-    fun getResourceFile() = component2()
-
-    @Deprecated("This method is not used anymore")
-    fun getDoNotCompress() = component3()

    /**
     * A dex file.
@@ -100,10 +21,7 @@ class PatcherResult internal constructor(
     * @param name The original name of the dex file.
     * @param stream The dex file as [InputStream].
     */
-    class PatchedDexFile
-    // TODO: Add internal modifier.
-    @Deprecated("This constructor will be removed in the future.")
-    constructor(val name: String, val stream: InputStream)
+    class PatchedDexFile internal constructor(val name: String, val stream: InputStream)

    /**
     * The resources of a patched apk.
--- a/src/main/kotlin/app/revanced/patcher/PatchesConsumer.kt
+++ b/src/main/kotlin/app/revanced/patcher/PatchesConsumer.kt
@@ -1,10 +0,0 @@
-package app.revanced.patcher
-
-import app.revanced.patcher.patch.Patch
-
-@FunctionalInterface
-interface PatchesConsumer {
-    @Deprecated("Use acceptPatches(PatchSet) instead.", ReplaceWith("acceptPatches(patches.toSet())"))
-    fun acceptPatches(patches: List<Patch<*>>) = acceptPatches(patches.toSet())
-    fun acceptPatches(patches: PatchSet)
-}
--- a/src/main/kotlin/app/revanced/patcher/data/BytecodeContext.kt
+++ b/src/main/kotlin/app/revanced/patcher/data/BytecodeContext.kt
@@ -1,184 +0,0 @@
-package app.revanced.patcher.data
-
-import app.revanced.patcher.InternalApi
-import app.revanced.patcher.PatcherConfig
-import app.revanced.patcher.PatcherContext
-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 lanchon.multidexlib2.BasicDexFileNamer
-import lanchon.multidexlib2.DexIO
-import lanchon.multidexlib2.MultiDexIO
-import java.io.File
-import java.io.FileFilter
-import java.io.Flushable
-import java.util.logging.Logger
-
-/**
- * A context for the patcher containing the current state of the bytecode.
- *
- * @param config The [PatcherConfig] used to create this context.
- */
-@Suppress("MemberVisibilityCanBePrivate")
-class BytecodeContext internal constructor(private val config: PatcherConfig) :
-    Context<Set<PatcherResult.PatchedDexFile>> {
-    private val logger = Logger.getLogger(BytecodeContext::class.java.name)
-
-    /**
-     * [Opcodes] of the supplied [PatcherConfig.apkFile].
-     */
-    internal lateinit var opcodes: Opcodes
-
-    /**
-     * The list of classes.
-     */
-    val classes by lazy {
-        ProxyClassList(
-            MultiDexIO.readDexFile(
-                true,
-                config.apkFile,
-                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)
-
-    /**
-     * Compile bytecode from the [BytecodeContext].
-     *
-     * @return The compiled bytecode.
-     */
-    @InternalApi
-    override fun get(): Set<PatcherResult.PatchedDexFile> {
-        logger.info("Compiling patched dex files")
-
-        val patchedDexFileResults =
-            config.patchedFiles.resolve("dex").also {
-                it.deleteRecursively() // Make sure the directory is empty.
-                it.mkdirs()
-            }.apply {
-                MultiDexIO.writeDexFile(
-                    true,
-                    if (config.multithreadingDexFileWriter) -1 else 1,
-                    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,
-                ) { _, entryName, _ -> logger.info("Compiled $entryName") }
-            }.listFiles(FileFilter { it.isFile })!!.map {
-                PatcherResult.PatchedDexFile(it.name, it.inputStream())
-            }.toSet()
-
-        System.gc()
-
-        return patchedDexFileResults
-    }
-
-    /**
-     * The integrations of a [PatcherContext].
-     */
-    internal inner class Integrations : MutableList<File> by mutableListOf(), Flushable {
-        /**
-         * Whether to merge integrations.
-         * Set to true, if the field requiresIntegrations of any supplied [Patch] is true.
-         */
-        var merge = false
-
-        /**
-         * Merge integrations into the [BytecodeContext] and flush all [Integrations].
-         */
-        override fun flush() {
-            if (!merge) return
-
-            logger.info("Merging integrations")
-
-            val classMap = classes.associateBy { it.type }
-
-            this@Integrations.forEach { integrations ->
-                MultiDexIO.readDexFile(
-                    true,
-                    integrations,
-                    BasicDexFileNamer(),
-                    null,
-                    null,
-                ).classes.forEach classDef@{ classDef ->
-                    val existingClass =
-                        classMap[classDef.type] ?: run {
-                            logger.fine("Adding $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()
-        }
-    }
-}
--- a/src/main/kotlin/app/revanced/patcher/data/Context.kt
+++ b/src/main/kotlin/app/revanced/patcher/data/Context.kt
@@ -1,9 +0,0 @@
-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/src/main/kotlin/app/revanced/patcher/extensions/AnnotationExtensions.kt
+++ b/src/main/kotlin/app/revanced/patcher/extensions/AnnotationExtensions.kt
@@ -1,61 +0,0 @@
-@file:Suppress("UNCHECKED_CAST")
-
-package app.revanced.patcher.extensions
-
-import kotlin.reflect.KClass
-
-internal object AnnotationExtensions {
-    /**
-     * Search for an annotation recursively.
-     *
-     * @param targetAnnotationClass The annotation class to search for.
-     * @param searchedClasses A set of annotations that have already been searched.
-     * @return The annotation if found, otherwise null.
-     */
-    fun <T : Annotation> Class<*>.findAnnotationRecursively(
-        targetAnnotationClass: Class<T>,
-        searchedClasses: HashSet<Annotation> = hashSetOf(),
-    ): T? {
-        annotations.forEach { annotation ->
-            // Terminate if the annotation is already searched.
-            if (annotation in searchedClasses) return@forEach
-            searchedClasses.add(annotation)
-
-            // Terminate if the annotation is found.
-            if (targetAnnotationClass == annotation.annotationClass.java) return annotation as T
-
-            return annotation.annotationClass.java.findAnnotationRecursively(
-                targetAnnotationClass,
-                searchedClasses,
-            ) ?: return@forEach
-        }
-
-        // Search the super class.
-        superclass?.findAnnotationRecursively(
-            targetAnnotationClass,
-            searchedClasses,
-        )?.let { return it }
-
-        // Search the interfaces.
-        interfaces.forEach { superClass ->
-            return superClass.findAnnotationRecursively(
-                targetAnnotationClass,
-                searchedClasses,
-            ) ?: return@forEach
-        }
-
-        return null
-    }
-
-    /**
-     * Search for an annotation recursively.
-     *
-     * First the annotations, then the annotated classes super class and then it's interfaces
-     * are searched for the annotation recursively.
-     *
-     * @param targetAnnotation The annotation to search for.
-     * @return The annotation if found, otherwise null.
-     */
-    fun <T : Annotation> KClass<*>.findAnnotationRecursively(targetAnnotation: KClass<T>) =
-        java.findAnnotationRecursively(targetAnnotation.java)
-}
--- a/src/main/kotlin/app/revanced/patcher/extensions/Extensions.kt
+++ b/src/main/kotlin/app/revanced/patcher/extensions/Extensions.kt
@@ -1,7 +1,6 @@
 package app.revanced.patcher.extensions

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

 /**
 * Create a label for the instruction at given index.
@@ -10,24 +9,3 @@ import com.android.tools.smali.dexlib2.AccessFlags
 * @return The label.
 */
 fun MutableMethod.newLabel(index: Int) = implementation!!.newLabelForIndex(index)
-
-/**
- * Perform a bitwise OR operation between an [AccessFlags] and an [Int].
- *
- * @param other The [Int] to perform the operation with.
- */
-infix fun Int.or(other: AccessFlags) = this or other.value
-
-/**
- * Perform a bitwise OR operation between two [AccessFlags].
- *
- * @param other The other [AccessFlags] to perform the operation with.
- */
-infix fun AccessFlags.or(other: AccessFlags) = value or other.value
-
-/**
- * Perform a bitwise OR operation between an [Int] and an [AccessFlags].
- *
- * @param other The [AccessFlags] to perform the operation with.
- */
-infix fun AccessFlags.or(other: Int) = value or other
--- a/src/main/kotlin/app/revanced/patcher/extensions/InstructionExtensions.kt
+++ b/src/main/kotlin/app/revanced/patcher/extensions/InstructionExtensions.kt
@@ -9,6 +9,8 @@ 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.Method
+import com.android.tools.smali.dexlib2.iface.MethodImplementation
 import com.android.tools.smali.dexlib2.iface.instruction.Instruction

 object InstructionExtensions {
@@ -30,7 +32,7 @@ object InstructionExtensions {
     * @param instructions The instructions to add.
     */
    fun MutableMethodImplementation.addInstructions(instructions: List<BuilderInstruction>) =
-        instructions.forEach { this.addInstruction(it) }
+        instructions.forEach { addInstruction(it) }

    /**
     * Remove instructions from a method at the given index.
@@ -178,8 +180,8 @@ object InstructionExtensions {
                    if (compiledInstruction !is BuilderOffsetInstruction) return@forEachIndexed

                    /**
-                     * Creates a new label for the instruction
-                     * and replaces it with the label of the [compiledInstruction] at [compiledInstructionIndex].
+                     * Create a new label for the instruction
+                     * and replace it with the label of the [compiledInstruction] at [compiledInstructionIndex].
                     */
                    fun Instruction.makeNewLabel() {
                        fun replaceOffset(
@@ -310,6 +312,24 @@ object InstructionExtensions {
        smaliInstructions: String,
    ) = implementation!!.replaceInstructions(index, smaliInstructions.toInstructions(this))

+    /**
+     * Get an instruction at the given index.
+     *
+     * @param index The index to get the instruction at.
+     * @return The instruction.
+     */
+    fun MethodImplementation.getInstruction(index: Int) = instructions.elementAt(index)
+
+    /**
+     * Get an instruction at the given index.
+     *
+     * @param index The index to get the instruction at.
+     * @param T The type of instruction to return.
+     * @return The instruction.
+     */
+    @Suppress("UNCHECKED_CAST")
+    fun <T> MethodImplementation.getInstruction(index: Int): T = getInstruction(index) as T
+
    /**
     * Get an instruction at the given index.
     *
@@ -328,12 +348,27 @@ object InstructionExtensions {
    @Suppress("UNCHECKED_CAST")
    fun <T> MutableMethodImplementation.getInstruction(index: Int): T = getInstruction(index) as T

+    /**
+     * Get an instruction at the given index.
+     * @param index The index to get the instruction at.
+     * @return The instruction or null if the method has no implementation.
+     */
+    fun Method.getInstructionOrNull(index: Int): Instruction? = implementation?.getInstruction(index)
+
    /**
     * Get an instruction at the given index.
     * @param index The index to get the instruction at.
     * @return The instruction.
     */
-    fun MutableMethod.getInstruction(index: Int): BuilderInstruction = implementation!!.getInstruction(index)
+    fun Method.getInstruction(index: Int): Instruction = getInstructionOrNull(index)!!
+
+    /**
+     * Get an instruction at the given index.
+     * @param index The index to get the instruction at.
+     * @param T The type of instruction to return.
+     * @return The instruction or null if the method has no implementation.
+     */
+    fun <T> Method.getInstructionOrNull(index: Int): T? = implementation?.getInstruction<T>(index)

    /**
     * Get an instruction at the given index.
@@ -341,11 +376,59 @@ object InstructionExtensions {
     * @param T The type of instruction to return.
     * @return The instruction.
     */
-    fun <T> MutableMethod.getInstruction(index: Int): T = implementation!!.getInstruction<T>(index)
+    fun <T> Method.getInstruction(index: Int): T = getInstructionOrNull<T>(index)!!

    /**
-     * Get the instructions of a method.
+     * Get an instruction at the given index.
+     * @param index The index to get the instruction at.
+     * @return The instruction or null if the method has no implementation.
+     */
+    fun MutableMethod.getInstructionOrNull(index: Int): BuilderInstruction? = implementation?.getInstruction(index)
+
+    /**
+     * Get an instruction at the given index.
+     * @param index The index to get the instruction at.
+     * @return The instruction.
+     */
+    fun MutableMethod.getInstruction(index: Int): BuilderInstruction = getInstructionOrNull(index)!!
+
+    /**
+     * Get an instruction at the given index.
+     * @param index The index to get the instruction at.
+     * @param T The type of instruction to return.
+     * @return The instruction or null if the method has no implementation.
+     */
+    fun <T> MutableMethod.getInstructionOrNull(index: Int): T? = implementation?.getInstruction<T>(index)
+
+    /**
+     * Get an instruction at the given index.
+     * @param index The index to get the instruction at.
+     * @param T The type of instruction to return.
+     * @return The instruction.
+     */
+    fun <T> MutableMethod.getInstruction(index: Int): T = getInstructionOrNull<T>(index)!!
+
+    /**
+     * The instructions of a method.
+     * @return The instructions or null if the method has no implementation.
+     */
+    val Method.instructionsOrNull: Iterable<Instruction>? get() = implementation?.instructions
+
+    /**
+     * The instructions of a method.
     * @return The instructions.
     */
-    fun MutableMethod.getInstructions(): MutableList<BuilderInstruction> = implementation!!.instructions
+    val Method.instructions: Iterable<Instruction> get() = instructionsOrNull!!
+
+    /**
+     * The instructions of a method.
+     * @return The instructions or null if the method has no implementation.
+     */
+    val MutableMethod.instructionsOrNull: MutableList<BuilderInstruction>? get() = implementation?.instructions
+
+    /**
+     * The instructions of a method.
+     * @return The instructions.
+     */
+    val MutableMethod.instructions: MutableList<BuilderInstruction> get() = instructionsOrNull!!
 }
--- a/src/main/kotlin/app/revanced/patcher/extensions/MethodFingerprintExtensions.kt
+++ b/src/main/kotlin/app/revanced/patcher/extensions/MethodFingerprintExtensions.kt
@@ -1,16 +0,0 @@
-package app.revanced.patcher.extensions
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import app.revanced.patcher.fingerprint.annotation.FuzzyPatternScanMethod
-
-object MethodFingerprintExtensions {
-    /**
-     * The [FuzzyPatternScanMethod] annotation of a [MethodFingerprint].
-     */
-    @Deprecated(
-        message = "Use the property instead.",
-        replaceWith = ReplaceWith("this.fuzzyPatternScanMethod"),
-    )
-    val MethodFingerprint.fuzzyPatternScanMethod
-        get() = this.fuzzyPatternScanMethod
-}
--- a/src/main/kotlin/app/revanced/patcher/fingerprint/LookupMap.kt
+++ b/src/main/kotlin/app/revanced/patcher/fingerprint/LookupMap.kt
@@ -1,125 +0,0 @@
-package app.revanced.patcher.fingerprint
-
-import app.revanced.patcher.data.BytecodeContext
-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.ReferenceInstruction
-import com.android.tools.smali.dexlib2.iface.reference.StringReference
-import java.util.*
-
-internal typealias MethodClassPair = Pair<Method, ClassDef>
-
-/**
- * Lookup map for methods.
- */
-internal class LookupMap : MutableMap<String, LookupMap.MethodClassList> by mutableMapOf() {
-    /**
-     * Adds a [MethodClassPair] to the list associated with the given key.
-     * If the key does not exist, a new list is created and the [MethodClassPair] is added to it.
-     */
-    fun add(
-        key: String,
-        methodClassPair: MethodClassPair,
-    ) {
-        getOrPut(key) { MethodClassList() }.add(methodClassPair)
-    }
-
-    /**
-     * List of methods and the class they are a member of.
-     */
-    internal class MethodClassList : LinkedList<MethodClassPair>()
-
-    companion object Maps {
-        /**
-         * A list of methods and the class they are a member of.
-         */
-        internal val methods = MethodClassList()
-
-        /**
-         * Lookup map for methods keyed to the methods access flags, return type and parameter.
-         */
-        internal val methodSignatureLookupMap = LookupMap()
-
-        /**
-         * Lookup map for methods associated by strings referenced in the method.
-         */
-        internal val methodStringsLookupMap = LookupMap()
-
-        /**
-         * Initializes lookup maps for [MethodFingerprint] resolution
-         * using attributes of methods such as the method signature or strings.
-         *
-         * @param context The [BytecodeContext] containing the classes to initialize the lookup maps with.
-         */
-        internal fun initializeLookupMaps(context: BytecodeContext) {
-            if (methods.isNotEmpty()) clearLookupMaps()
-
-            context.classes.forEach { classDef ->
-                classDef.methods.forEach { method ->
-                    val methodClassPair = method to classDef
-
-                    // For fingerprints with no access or return type specified.
-                    methods += methodClassPair
-
-                    val accessFlagsReturnKey = method.accessFlags.toString() + method.returnType.first()
-
-                    // Add <access><returnType> as the key.
-                    methodSignatureLookupMap.add(accessFlagsReturnKey, methodClassPair)
-
-                    // Add <access><returnType>[parameters] as the key.
-                    methodSignatureLookupMap.add(
-                        buildString {
-                            append(accessFlagsReturnKey)
-                            appendParameters(method.parameterTypes)
-                        },
-                        methodClassPair,
-                    )
-
-                    // Add strings contained in the method as the key.
-                    method.implementation?.instructions?.forEach instructions@{ instruction ->
-                        if (instruction.opcode != Opcode.CONST_STRING && instruction.opcode != Opcode.CONST_STRING_JUMBO) {
-                            return@instructions
-                        }
-
-                        val string = ((instruction as ReferenceInstruction).reference as StringReference).string
-
-                        methodStringsLookupMap.add(string, methodClassPair)
-                    }
-
-                    // In the future, the class type could be added to the lookup map.
-                    // This would require MethodFingerprint to be changed to include the class type.
-                }
-            }
-        }
-
-        /**
-         * Clears the internal lookup maps created in [initializeLookupMaps].
-         */
-        internal fun clearLookupMaps() {
-            methods.clear()
-            methodSignatureLookupMap.clear()
-            methodStringsLookupMap.clear()
-        }
-
-        /**
-         * Appends a string based on the parameter reference types of this method.
-         */
-        internal fun StringBuilder.appendParameters(parameters: Iterable<CharSequence>) {
-            // Maximum parameters to use in the signature key.
-            // Some apps have methods with an incredible number of parameters (over 100 parameters have been seen).
-            // To keep the signature map from becoming needlessly bloated,
-            // group together in the same map entry all methods with the same access/return and 5 or more parameters.
-            // The value of 5 was chosen based on local performance testing and is not set in stone.
-            val maxSignatureParameters = 5
-            // Must append a unique value before the parameters to distinguish this key includes the parameters.
-            // If this is not appended, then methods with no parameters
-            // will collide with different keys that specify access/return but omit the parameters.
-            append("p:")
-            parameters.forEachIndexed { index, parameter ->
-                if (index >= maxSignatureParameters) return
-                append(parameter.first())
-            }
-        }
-    }
-}
--- a/src/main/kotlin/app/revanced/patcher/fingerprint/MethodFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patcher/fingerprint/MethodFingerprint.kt
@@ -1,357 +0,0 @@
-package app.revanced.patcher.fingerprint
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.AnnotationExtensions.findAnnotationRecursively
-import app.revanced.patcher.fingerprint.LookupMap.Maps.appendParameters
-import app.revanced.patcher.fingerprint.LookupMap.Maps.initializeLookupMaps
-import app.revanced.patcher.fingerprint.LookupMap.Maps.methodSignatureLookupMap
-import app.revanced.patcher.fingerprint.LookupMap.Maps.methodStringsLookupMap
-import app.revanced.patcher.fingerprint.LookupMap.Maps.methods
-import app.revanced.patcher.fingerprint.MethodFingerprintResult.MethodFingerprintScanResult.StringsScanResult
-import app.revanced.patcher.fingerprint.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.patch.PatchException
-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
-
-/**
- * A fingerprint to resolve methods.
- *
- * @param returnType The method's return type compared using [String.startsWith].
- * @param accessFlags The method's exact access flags using values of [AccessFlags].
- * @param parameters The parameters of the method. Partial matches allowed and follow the same rules as [returnType].
- * @param opcodes An opcode pattern of the method's instructions. Wildcard or unknown opcodes can be specified by `null`.
- * @param strings A list of the method's strings compared each using [String.contains].
- * @param customFingerprint A custom condition for this fingerprint.
- */
-@Suppress("MemberVisibilityCanBePrivate")
-abstract class MethodFingerprint(
-    internal val returnType: String? = null,
-    internal val accessFlags: Int? = null,
-    internal val parameters: Iterable<String>? = null,
-    internal val opcodes: Iterable<Opcode?>? = null,
-    internal val strings: Iterable<String>? = null,
-    internal val customFingerprint: ((methodDef: Method, classDef: ClassDef) -> Boolean)? = null,
-) {
-    /**
-     * The result of the [MethodFingerprint].
-     */
-    var result: MethodFingerprintResult? = null
-        private set
-
-    /**
-     *  The [FuzzyPatternScanMethod] annotation of the [MethodFingerprint].
-     *
-     *  If the annotation is not present, this property is null.
-     */
-    val fuzzyPatternScanMethod = this::class.findAnnotationRecursively(FuzzyPatternScanMethod::class)
-
-    /**
-     * Resolve a [MethodFingerprint] using the lookup map built by [initializeLookupMaps].
-     *
-     * [MethodFingerprint] resolution is fast, but if many are present they can consume a noticeable
-     * amount of time because they are resolved in sequence.
-     *
-     * For apps with many fingerprints, resolving performance can be improved by:
-     * - Slowest: Specify [opcodes] and nothing else.
-     * - Fast: Specify [accessFlags], [returnType].
-     * - Faster: Specify [accessFlags], [returnType] and [parameters].
-     * - Fastest: Specify [strings], with at least one string being an exact (non-partial) match.
-     */
-    internal fun resolveUsingLookupMap(context: BytecodeContext): Boolean {
-        /**
-         * Lookup [MethodClassPair]s that match the methods strings present in a [MethodFingerprint].
-         *
-         * @return A list of [MethodClassPair]s that match the methods strings present in a [MethodFingerprint].
-         */
-        fun MethodFingerprint.methodStringsLookup(): LookupMap.MethodClassList? {
-            strings?.forEach {
-                val methods = methodStringsLookupMap[it]
-                if (methods != null) return methods
-            }
-            return null
-        }
-
-        /**
-         * Lookup [MethodClassPair]s that match the method signature present in a [MethodFingerprint].
-         *
-         * @return A list of [MethodClassPair]s that match the method signature present in a [MethodFingerprint].
-         */
-        fun MethodFingerprint.methodSignatureLookup(): LookupMap.MethodClassList {
-            if (accessFlags == null) return methods
-
-            var returnTypeValue = returnType
-            if (returnTypeValue == null) {
-                if (AccessFlags.CONSTRUCTOR.isSet(accessFlags)) {
-                    // Constructors always have void return type
-                    returnTypeValue = "V"
-                } else {
-                    return methods
-                }
-            }
-
-            val key =
-                buildString {
-                    append(accessFlags)
-                    append(returnTypeValue.first())
-                    if (parameters != null) appendParameters(parameters)
-                }
-            return methodSignatureLookupMap[key] ?: return LookupMap.MethodClassList()
-        }
-
-        /**
-         * Resolve a [MethodFingerprint] using a list of [MethodClassPair].
-         *
-         * @return True if the resolution was successful, false otherwise.
-         */
-        fun MethodFingerprint.resolveUsingMethodClassPair(methodClasses: LookupMap.MethodClassList): Boolean {
-            methodClasses.forEach { classAndMethod ->
-                if (resolve(context, classAndMethod.first, classAndMethod.second)) return true
-            }
-            return false
-        }
-
-        val methodsWithSameStrings = methodStringsLookup()
-        if (methodsWithSameStrings != null) {
-            if (resolveUsingMethodClassPair(methodsWithSameStrings)) {
-                return true
-            }
-        }
-
-        // No strings declared or none matched (partial matches are allowed).
-        // Use signature matching.
-        return resolveUsingMethodClassPair(methodSignatureLookup())
-    }
-
-    /**
-     * Resolve a [MethodFingerprint] against a [ClassDef].
-     *
-     * @param forClass The class on which to resolve the [MethodFingerprint] in.
-     * @param context The [BytecodeContext] to host proxies.
-     * @return True if the resolution was successful, false otherwise.
-     */
-    fun resolve(
-        context: BytecodeContext,
-        forClass: ClassDef,
-    ): Boolean {
-        for (method in forClass.methods)
-            if (resolve(context, method, forClass)) {
-                return true
-            }
-        return false
-    }
-
-    /**
-     * Resolve a [MethodFingerprint] against a [Method].
-     *
-     * @param method The class on which to resolve the [MethodFingerprint] in.
-     * @param forClass The class on which to resolve the [MethodFingerprint].
-     * @param context The [BytecodeContext] to host proxies.
-     * @return True if the resolution was successful or if the fingerprint is already resolved, false otherwise.
-     */
-    fun resolve(
-        context: BytecodeContext,
-        method: Method,
-        forClass: ClassDef,
-    ): Boolean {
-        val methodFingerprint = this
-
-        if (methodFingerprint.result != null) return true
-
-        if (methodFingerprint.returnType != null && !method.returnType.startsWith(methodFingerprint.returnType)) {
-            return false
-        }
-
-        if (methodFingerprint.accessFlags != null && methodFingerprint.accessFlags != method.accessFlags) {
-            return false
-        }
-
-        fun parametersEqual(
-            parameters1: Iterable<CharSequence>,
-            parameters2: Iterable<CharSequence>,
-        ): Boolean {
-            if (parameters1.count() != parameters2.count()) return false
-            val iterator1 = parameters1.iterator()
-            parameters2.forEach {
-                if (!it.startsWith(iterator1.next())) return false
-            }
-            return true
-        }
-
-        if (methodFingerprint.parameters != null &&
-            !parametersEqual(
-                methodFingerprint.parameters, // TODO: parseParameters()
-                method.parameterTypes,
-            )
-        ) {
-            return false
-        }
-
-        @Suppress("UNNECESSARY_NOT_NULL_ASSERTION")
-        if (methodFingerprint.customFingerprint != null && !methodFingerprint.customFingerprint!!(method, forClass)) {
-            return false
-        }
-
-        val stringsScanResult: StringsScanResult? =
-            if (methodFingerprint.strings != null) {
-                StringsScanResult(
-                    buildList {
-                        val implementation = method.implementation ?: return false
-
-                        val stringsList = methodFingerprint.strings.toMutableList()
-
-                        implementation.instructions.forEachIndexed { instructionIndex, instruction ->
-                            if (
-                                instruction.opcode != Opcode.CONST_STRING &&
-                                instruction.opcode != Opcode.CONST_STRING_JUMBO
-                            ) {
-                                return@forEachIndexed
-                            }
-
-                            val string = ((instruction as ReferenceInstruction).reference as StringReference).string
-                            val index = stringsList.indexOfFirst(string::contains)
-                            if (index == -1) return@forEachIndexed
-
-                            add(StringsScanResult.StringMatch(string, instructionIndex))
-                            stringsList.removeAt(index)
-                        }
-
-                        if (stringsList.isNotEmpty()) return false
-                    },
-                )
-            } else {
-                null
-            }
-
-        val patternScanResult =
-            if (methodFingerprint.opcodes != null) {
-                method.implementation?.instructions ?: return false
-
-                fun MethodFingerprintResult.MethodFingerprintScanResult.PatternScanResult.newWarnings(
-                    pattern: Iterable<Opcode?>,
-                    instructions: Iterable<Instruction>,
-                ) = buildList {
-                    for ((patternIndex, instructionIndex) in (this@newWarnings.startIndex until this@newWarnings.endIndex).withIndex()) {
-                        val originalOpcode = instructions.elementAt(instructionIndex).opcode
-                        val patternOpcode = pattern.elementAt(patternIndex)
-
-                        if (patternOpcode == null || patternOpcode.ordinal == originalOpcode.ordinal) continue
-
-                        this.add(
-                            MethodFingerprintResult.MethodFingerprintScanResult.PatternScanResult.Warning(
-                                originalOpcode,
-                                patternOpcode,
-                                instructionIndex,
-                                patternIndex,
-                            ),
-                        )
-                    }
-                }
-
-                fun Method.patternScan(
-                    fingerprint: MethodFingerprint,
-                ): MethodFingerprintResult.MethodFingerprintScanResult.PatternScanResult? {
-                    val instructions = this.implementation!!.instructions
-                    val fingerprintFuzzyPatternScanThreshold = fingerprint.fuzzyPatternScanMethod?.threshold ?: 0
-
-                    val pattern = fingerprint.opcodes!!
-                    val instructionLength = instructions.count()
-                    val patternLength = pattern.count()
-
-                    for (index in 0 until instructionLength) {
-                        var patternIndex = 0
-                        var threshold = fingerprintFuzzyPatternScanThreshold
-
-                        while (index + patternIndex < instructionLength) {
-                            val originalOpcode = instructions.elementAt(index + patternIndex).opcode
-                            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
-                                if (threshold-- == 0) break
-                            }
-
-                            if (patternIndex < patternLength - 1) {
-                                // if the entire pattern has not been scanned yet
-                                // continue the scan
-                                patternIndex++
-                                continue
-                            }
-                            // the pattern is valid, generate warnings if fuzzyPatternScanMethod is FuzzyPatternScanMethod
-                            val result =
-                                MethodFingerprintResult.MethodFingerprintScanResult.PatternScanResult(
-                                    index,
-                                    index + patternIndex,
-                                )
-                            if (fingerprint.fuzzyPatternScanMethod !is FuzzyPatternScanMethod) return result
-                            result.warnings = result.newWarnings(pattern, instructions)
-
-                            return result
-                        }
-                    }
-
-                    return null
-                }
-
-                method.patternScan(methodFingerprint) ?: return false
-            } else {
-                null
-            }
-
-        methodFingerprint.result =
-            MethodFingerprintResult(
-                method,
-                forClass,
-                MethodFingerprintResult.MethodFingerprintScanResult(
-                    patternScanResult,
-                    stringsScanResult,
-                ),
-                context,
-            )
-
-        return true
-    }
-
-    companion object {
-        /**
-         * Resolve a list of [MethodFingerprint] using the lookup map built by [initializeLookupMaps].
-         *
-         * [MethodFingerprint] resolution is fast, but if many are present they can consume a noticeable
-         * amount of time because they are resolved in sequence.
-         *
-         * For apps with many fingerprints, resolving performance can be improved by:
-         * - Slowest: Specify [opcodes] and nothing else.
-         * - Fast: Specify [accessFlags], [returnType].
-         * - Faster: Specify [accessFlags], [returnType] and [parameters].
-         * - Fastest: Specify [strings], with at least one string being an exact (non-partial) match.
-         */
-        internal fun Set<MethodFingerprint>.resolveUsingLookupMap(context: BytecodeContext) {
-            if (methods.isEmpty()) throw PatchException("lookup map not initialized")
-
-            forEach { fingerprint ->
-                fingerprint.resolveUsingLookupMap(context)
-            }
-        }
-
-        /**
-         * Resolve a list of [MethodFingerprint] against a list of [ClassDef].
-         *
-         * @param classes The classes on which to resolve the [MethodFingerprint] in.
-         * @param context The [BytecodeContext] to host proxies.
-         * @return True if the resolution was successful, false otherwise.
-         */
-        fun Iterable<MethodFingerprint>.resolve(
-            context: BytecodeContext,
-            classes: Iterable<ClassDef>,
-        ) = forEach { fingerprint ->
-            for (classDef in classes) {
-                if (fingerprint.resolve(context, classDef)) break
-            }
-        }
-    }
-}
--- a/src/main/kotlin/app/revanced/patcher/fingerprint/MethodFingerprintResult.kt
+++ b/src/main/kotlin/app/revanced/patcher/fingerprint/MethodFingerprintResult.kt
@@ -1,94 +0,0 @@
-package app.revanced.patcher.fingerprint
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.util.proxy.ClassProxy
-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.util.MethodUtil
-
-/**
- * Represents the result of a [MethodFingerprintResult].
- *
- * @param method The matching method.
- * @param classDef The [ClassDef] that contains the matching [method].
- * @param scanResult The result of scanning for the [MethodFingerprint].
- * @param context The [BytecodeContext] this [MethodFingerprintResult] is attached to, to create proxies.
- */
-@Suppress("MemberVisibilityCanBePrivate")
-class MethodFingerprintResult(
-    val method: Method,
-    val classDef: ClassDef,
-    val scanResult: MethodFingerprintScanResult,
-    internal val context: BytecodeContext,
-) {
-    /**
-     * Returns a mutable clone of [classDef]
-     *
-     * Please note, this method allocates a [ClassProxy].
-     * Use [classDef] where possible.
-     */
-    @Suppress("MemberVisibilityCanBePrivate")
-    val mutableClass by lazy { context.proxy(classDef).mutableClass }
-
-    /**
-     * Returns a mutable clone of [method]
-     *
-     * Please note, this method allocates a [ClassProxy].
-     * Use [method] where possible.
-     */
-    val mutableMethod by lazy {
-        mutableClass.methods.first {
-            MethodUtil.methodSignaturesMatch(it, this.method)
-        }
-    }
-
-    /**
-     * The result of scanning on the [MethodFingerprint].
-     * @param patternScanResult The result of the pattern scan.
-     * @param stringsScanResult The result of the string scan.
-     */
-    class MethodFingerprintScanResult(
-        val patternScanResult: PatternScanResult?,
-        val stringsScanResult: StringsScanResult?,
-    ) {
-        /**
-         * The result of scanning strings on the [MethodFingerprint].
-         * @param matches The list of strings that were matched.
-         */
-        class StringsScanResult(val matches: List<StringMatch>) {
-            /**
-             * Represents a match for a string at an index.
-             * @param string The string that was matched.
-             * @param index The index of the string.
-             */
-            class StringMatch(val string: String, val index: Int)
-        }
-
-        /**
-         * The result of a pattern scan.
-         * @param startIndex The start index of the instructions where to which this pattern matches.
-         * @param endIndex The end index of the instructions where to which this pattern matches.
-         * @param warnings A list of warnings considering this [PatternScanResult].
-         */
-        class PatternScanResult(
-            val startIndex: Int,
-            val endIndex: Int,
-            var warnings: List<Warning>? = null,
-        ) {
-            /**
-             * Represents warnings of the pattern scan.
-             * @param correctOpcode The opcode the instruction list has.
-             * @param wrongOpcode The opcode the pattern list of the signature currently has.
-             * @param instructionIndex The index of the opcode relative to the instruction list.
-             * @param patternIndex The index of the opcode relative to the pattern list from the signature.
-             */
-            class Warning(
-                val correctOpcode: Opcode,
-                val wrongOpcode: Opcode,
-                val instructionIndex: Int,
-                val patternIndex: Int,
-            )
-        }
-    }
-}
--- a/src/main/kotlin/app/revanced/patcher/fingerprint/annotation/MethodFingerprintAnnotations.kt
+++ b/src/main/kotlin/app/revanced/patcher/fingerprint/annotation/MethodFingerprintAnnotations.kt
@@ -1,12 +0,0 @@
-package app.revanced.patcher.fingerprint.annotation
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-
-/**
- * Annotations to scan a pattern [MethodFingerprint] with fuzzy algorithm.
- * @param threshold if [threshold] or more of the opcodes do not match, skip.
- */
-@Target(AnnotationTarget.CLASS)
-annotation class FuzzyPatternScanMethod(
-    val threshold: Int = 1,
-)
--- a/src/main/kotlin/app/revanced/patcher/patch/BytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/BytecodePatch.kt
@@ -1,61 +0,0 @@
-package app.revanced.patcher.patch
-
-import app.revanced.patcher.PatchClass
-import app.revanced.patcher.Patcher
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import java.io.Closeable
-
-/**
- * A [Patch] that accesses a [BytecodeContext].
- *
- * If an implementation of [Patch] also implements [Closeable]
- * it will be closed in reverse execution order of patches executed by [Patcher].
- */
-@Suppress("unused")
-abstract class BytecodePatch : Patch<BytecodeContext> {
-    /**
-     * The fingerprints to resolve before executing the patch.
-     */
-    internal val fingerprints: Set<MethodFingerprint>
-
-    /**
-     * Create a new [BytecodePatch].
-     *
-     * @param fingerprints The fingerprints to resolve before executing the patch.
-     */
-    constructor(fingerprints: Set<MethodFingerprint> = emptySet()) {
-        this.fingerprints = fingerprints
-    }
-
-    /**
-     * Create a new [BytecodePatch].
-     *
-     * @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 Other patches this patch depends on.
-     * @param use Weather or not the patch should be used.
-     * @param requiresIntegrations Weather or not the patch requires integrations.
-     */
-    constructor(
-        name: String? = null,
-        description: String? = null,
-        compatiblePackages: Set<CompatiblePackage>? = null,
-        dependencies: Set<PatchClass>? = null,
-        use: Boolean = true,
-        requiresIntegrations: Boolean = false,
-        fingerprints: Set<MethodFingerprint> = emptySet(),
-    ) : super(name, description, compatiblePackages, dependencies, use, requiresIntegrations) {
-        this.fingerprints = fingerprints
-    }
-
-    /**
-     * Create a new [BytecodePatch].
-     */
-    @Deprecated(
-        "Use the constructor with fingerprints instead.",
-        ReplaceWith("BytecodePatch(emptySet())"),
-    )
-    constructor() : this(emptySet())
-}
--- a/src/main/kotlin/app/revanced/patcher/patch/BytecodePatchContext.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/BytecodePatchContext.kt
@@ -0,0 +1,295 @@
+package app.revanced.patcher.patch
+
+import app.revanced.patcher.InternalApi
+import app.revanced.patcher.PatcherConfig
+import app.revanced.patcher.PatcherResult
+import app.revanced.patcher.extensions.InstructionExtensions.instructionsOrNull
+import app.revanced.patcher.util.ClassMerger.merge
+import app.revanced.patcher.util.MethodNavigator
+import app.revanced.patcher.util.ProxyClassList
+import app.revanced.patcher.util.proxy.ClassProxy
+import com.android.tools.smali.dexlib2.Opcode
+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.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.reference.StringReference
+import lanchon.multidexlib2.BasicDexFileNamer
+import lanchon.multidexlib2.DexIO
+import lanchon.multidexlib2.MultiDexIO
+import lanchon.multidexlib2.RawDexIO
+import java.io.Closeable
+import java.io.FileFilter
+import java.io.InputStream
+import java.util.*
+import java.util.logging.Logger
+
+/**
+ * A context for patches containing the current state of the bytecode.
+ *
+ * @param config The [PatcherConfig] used to create this context.
+ */
+@Suppress("MemberVisibilityCanBePrivate")
+class BytecodePatchContext internal constructor(private val config: PatcherConfig) :
+    PatchContext<Set<PatcherResult.PatchedDexFile>>,
+    Closeable {
+    private val logger = Logger.getLogger(BytecodePatchContext::class.java.name)
+
+    /**
+     * [Opcodes] of the supplied [PatcherConfig.apkFile].
+     */
+    internal val opcodes: Opcodes
+
+    /**
+     * The list of classes.
+     */
+    val classes = ProxyClassList(
+        MultiDexIO.readDexFile(
+            true,
+            config.apkFile,
+            BasicDexFileNamer(),
+            null,
+            null,
+        ).also { opcodes = it.opcodes }.classes.toMutableList(),
+    )
+
+    /**
+     * The lookup maps for methods and the class they are a member of from the [classes].
+     */
+    internal val lookupMaps by lazy { LookupMaps(classes) }
+
+    /**
+     * A map for lookup by [merge].
+     */
+    internal val classesByType = mutableMapOf<String, ClassDef>().apply {
+        classes.forEach { classDef -> put(classDef.type, classDef) }
+    }
+
+    /**
+     * Merge an extension to [classes].
+     *
+     * @param extensionInputStream The input stream of the extension to merge.
+     */
+    internal fun merge(extensionInputStream: InputStream) {
+        val extension = extensionInputStream.readAllBytes()
+
+        RawDexIO.readRawDexFile(extension, 0, null).classes.forEach { classDef ->
+            val existingClass = classesByType[classDef.type] ?: run {
+                logger.fine("Adding class \"$classDef\"")
+
+                classes += classDef
+                classesByType[classDef.type] = classDef
+
+                return@forEach
+            }
+
+            logger.fine("Class \"$classDef\" exists already. Adding missing methods and fields.")
+
+            existingClass.merge(classDef, this@BytecodePatchContext).let { mergedClass ->
+                // If the class was merged, replace the original class with the merged class.
+                if (mergedClass === existingClass) {
+                    return@let
+                }
+
+                classes -= existingClass
+                classes += mergedClass
+            }
+        }
+    }
+
+    /**
+     * Find a class by its type using a contains check.
+     *
+     * @param type The type of the class.
+     * @return A proxy for the first class that matches the type.
+     */
+    fun classByType(type: String) = classBy { type in it.type }
+
+    /**
+     * Find a class with a predicate.
+     *
+     * @param predicate A predicate to match the class.
+     * @return A proxy for the first class that matches the predicate.
+     */
+    fun classBy(predicate: (ClassDef) -> Boolean) =
+        classes.proxyPool.find { predicate(it.immutableClass) } ?: classes.find(predicate)?.let { proxy(it) }
+
+    /**
+     * Proxy the class to allow mutation.
+     *
+     * @param classDef The class to proxy.
+     *
+     * @return A proxy for the class.
+     */
+    fun proxy(classDef: ClassDef) = this@BytecodePatchContext.classes.proxyPool.find {
+        it.immutableClass.type == classDef.type
+    } ?: ClassProxy(classDef).also { this@BytecodePatchContext.classes.proxyPool.add(it) }
+
+    /**
+     * Navigate a method.
+     *
+     * @param method The method to navigate.
+     *
+     * @return A [MethodNavigator] for the method.
+     */
+    fun navigate(method: Method) = MethodNavigator(this@BytecodePatchContext, method)
+
+    /**
+     * Compile bytecode from the [BytecodePatchContext].
+     *
+     * @return The compiled bytecode.
+     */
+    @InternalApi
+    override fun get(): Set<PatcherResult.PatchedDexFile> {
+        logger.info("Compiling patched dex files")
+
+        val patchedDexFileResults =
+            config.patchedFiles.resolve("dex").also {
+                it.deleteRecursively() // Make sure the directory is empty.
+                it.mkdirs()
+            }.apply {
+                MultiDexIO.writeDexFile(
+                    true,
+                    if (config.multithreadingDexFileWriter) -1 else 1,
+                    this,
+                    BasicDexFileNamer(),
+                    object : DexFile {
+                        override fun getClasses() =
+                            this@BytecodePatchContext.classes.also(ProxyClassList::replaceClasses).toSet()
+
+                        override fun getOpcodes() = this@BytecodePatchContext.opcodes
+                    },
+                    DexIO.DEFAULT_MAX_DEX_POOL_SIZE,
+                ) { _, entryName, _ -> logger.info("Compiled $entryName") }
+            }.listFiles(FileFilter { it.isFile })!!.map {
+                PatcherResult.PatchedDexFile(it.name, it.inputStream())
+            }.toSet()
+
+        System.gc()
+
+        return patchedDexFileResults
+    }
+
+    /**
+     * A lookup map for methods and the class they are a member of and classes.
+     *
+     * @param classes The list of classes to create the lookup maps from.
+     */
+    internal class LookupMaps internal constructor(classes: List<ClassDef>) : Closeable {
+        /**
+         * Classes associated by their type.
+         */
+        internal val classesByType = classes.associateBy { it.type }.toMutableMap()
+
+        /**
+         * All methods and the class they are a member of.
+         */
+        internal val allMethods = MethodClassPairs()
+
+        /**
+         * Methods associated by its access flags, return type and parameter.
+         */
+        internal val methodsBySignature = MethodClassPairsLookupMap()
+
+        /**
+         * Methods associated by strings referenced in it.
+         */
+        internal val methodsByStrings = MethodClassPairsLookupMap()
+
+        init {
+            classes.forEach { classDef ->
+                classDef.methods.forEach { method ->
+                    val methodClassPair: MethodClassPair = method to classDef
+
+                    // For fingerprints with no access or return type specified.
+                    allMethods += methodClassPair
+
+                    val accessFlagsReturnKey = method.accessFlags.toString() + method.returnType.first()
+
+                    // Add <access><returnType> as the key.
+                    methodsBySignature[accessFlagsReturnKey] = methodClassPair
+
+                    // Add <access><returnType>[parameters] as the key.
+                    methodsBySignature[
+                        buildString {
+                            append(accessFlagsReturnKey)
+                            appendParameters(method.parameterTypes)
+                        },
+                    ] = methodClassPair
+
+                    // Add strings contained in the method as the key.
+                    method.instructionsOrNull?.forEach instructions@{ instruction ->
+                        if (instruction.opcode != Opcode.CONST_STRING && instruction.opcode != Opcode.CONST_STRING_JUMBO) {
+                            return@instructions
+                        }
+
+                        val string = ((instruction as ReferenceInstruction).reference as StringReference).string
+
+                        methodsByStrings[string] = methodClassPair
+                    }
+
+                    // In the future, the class type could be added to the lookup map.
+                    // This would require MethodFingerprint to be changed to include the class type.
+                }
+            }
+        }
+
+        internal companion object {
+            /**
+             * Appends a string based on the parameter reference types of this method.
+             */
+            internal fun StringBuilder.appendParameters(parameters: Iterable<CharSequence>) {
+                // Maximum parameters to use in the signature key.
+                // Some apps have methods with an incredible number of parameters (over 100 parameters have been seen).
+                // To keep the signature map from becoming needlessly bloated,
+                // group together in the same map entry all methods with the same access/return and 5 or more parameters.
+                // The value of 5 was chosen based on local performance testing and is not set in stone.
+                val maxSignatureParameters = 5
+                // Must append a unique value before the parameters to distinguish this key includes the parameters.
+                // If this is not appended, then methods with no parameters
+                // will collide with different keys that specify access/return but omit the parameters.
+                append("p:")
+                parameters.forEachIndexed { index, parameter ->
+                    if (index >= maxSignatureParameters) return
+                    append(parameter.first())
+                }
+            }
+        }
+
+        override fun close() {
+            allMethods.clear()
+            methodsBySignature.clear()
+            methodsByStrings.clear()
+        }
+    }
+
+    override fun close() {
+        lookupMaps.close()
+        classesByType.clear()
+        classes.clear()
+    }
+}
+
+/**
+ * A pair of a [Method] and the [ClassDef] it is a member of.
+ */
+internal typealias MethodClassPair = Pair<Method, ClassDef>
+
+/**
+ * A list of [MethodClassPair]s.
+ */
+internal typealias MethodClassPairs = LinkedList<MethodClassPair>
+
+/**
+ * A lookup map for [MethodClassPairs]s.
+ * The key is a string and the value is a list of [MethodClassPair]s.
+ */
+internal class MethodClassPairsLookupMap : MutableMap<String, MethodClassPairs> by mutableMapOf() {
+    /**
+     * Add a [MethodClassPair] associated by any key.
+     * If the key does not exist, a new list is created and the [MethodClassPair] is added to it.
+     */
+    internal operator fun set(key: String, methodClassPair: MethodClassPair) =
+        apply { getOrPut(key) { MethodClassPairs() }.add(methodClassPair) }
+}
--- a/src/main/kotlin/app/revanced/patcher/patch/Option.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/Option.kt
@@ -0,0 +1,548 @@
+package app.revanced.patcher.patch
+
+import kotlin.reflect.KProperty
+import kotlin.reflect.KType
+import kotlin.reflect.typeOf
+
+/**
+ * An option.
+ *
+ * @param T The value type of the option.
+ * @param key The key.
+ * @param default The default value.
+ * @param values Eligible option values mapped to a human-readable name.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ * @param type The type of the option value (to handle type erasure).
+ * @param validator The function to validate the option value.
+ *
+ * @constructor Create a new [Option].
+ */
+@Suppress("MemberVisibilityCanBePrivate", "unused")
+class Option<T> @PublishedApi internal constructor(
+    val key: String,
+    val default: T? = null,
+    val values: Map<String, T?>? = null,
+    val title: String? = null,
+    val description: String? = null,
+    val required: Boolean = false,
+    val type: KType,
+    val validator: Option<T>.(T?) -> Boolean = { true },
+) {
+    /**
+     * The value of the [Option].
+     */
+    var value: T?
+        /**
+         * Set the value of the [Option].
+         *
+         * @param value The value to set.
+         *
+         * @throws OptionException.ValueRequiredException If the value is required but null.
+         * @throws OptionException.ValueValidationException If the value is invalid.
+         */
+        set(value) {
+            assertRequiredButNotNull(value)
+            assertValid(value)
+
+            uncheckedValue = value
+        }
+
+        /**
+         * Get the value of the [Option].
+         *
+         * @return The value.
+         *
+         * @throws OptionException.ValueRequiredException If the value is required but null.
+         * @throws OptionException.ValueValidationException If the value is invalid.
+         */
+        get() {
+            assertRequiredButNotNull(uncheckedValue)
+            assertValid(uncheckedValue)
+
+            return uncheckedValue
+        }
+
+    // The unchecked value is used to allow setting the value without validation.
+    private var uncheckedValue = default
+
+    /**
+     * Reset the [Option] to its default value.
+     * Override this method if you need to mutate the value instead of replacing it.
+     */
+    fun reset() {
+        uncheckedValue = default
+    }
+
+    private fun assertRequiredButNotNull(value: T?) {
+        if (required && value == null) throw OptionException.ValueRequiredException(this)
+    }
+
+    private fun assertValid(value: T?) {
+        if (!validator(value)) throw OptionException.ValueValidationException(value, this)
+    }
+
+    override fun toString() = value.toString()
+
+    operator fun getValue(
+        thisRef: Any?,
+        property: KProperty<*>,
+    ) = value
+
+    operator fun setValue(
+        thisRef: Any?,
+        property: KProperty<*>,
+        value: T?,
+    ) {
+        this.value = value
+    }
+}
+
+/**
+ * A collection of [Option]s where options can be set and retrieved by key.
+ *
+ * @param options The options.
+ *
+ * @constructor Create a new [Options].
+ */
+class Options internal constructor(
+    private val options: Map<String, Option<*>>,
+) : Map<String, Option<*>> by options {
+    internal constructor(options: Set<Option<*>>) : this(options.associateBy { it.key })
+
+    /**
+     * Set an option's value.
+     *
+     * @param key The key.
+     * @param value The value.
+     *
+     * @throws OptionException.OptionNotFoundException If the option does not exist.
+     */
+    operator fun <T : Any> set(key: String, value: T?) {
+        val option = this[key]
+
+        try {
+            @Suppress("UNCHECKED_CAST")
+            (option as Option<T>).value = value
+        } catch (e: ClassCastException) {
+            throw OptionException.InvalidValueTypeException(
+                value?.let { it::class.java.name } ?: "null",
+                option.value?.let { it::class.java.name } ?: "null",
+            )
+        }
+    }
+
+    /**
+     * Get an option.
+     *
+     * @param key The key.
+     *
+     * @return The option.
+     */
+    override fun get(key: String) = options[key] ?: throw OptionException.OptionNotFoundException(key)
+}
+
+/**
+ * Create a new [Option] with a string value and add it to the current [PatchBuilder].
+ *
+ * @param key The key.
+ * @param default The default value.
+ * @param values Eligible option values mapped to a human-readable name.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ * @param validator The function to validate the option value.
+ *
+ * @return The created [Option].
+ *
+ * @see Option
+ */
+fun PatchBuilder<*>.stringOption(
+    key: String,
+    default: String? = null,
+    values: Map<String, String?>? = null,
+    title: String? = null,
+    description: String? = null,
+    required: Boolean = false,
+    validator: Option<String>.(String?) -> Boolean = { true },
+) = option(
+    key,
+    default,
+    values,
+    title,
+    description,
+    required,
+    validator,
+)
+
+/**
+ * Create a new [Option] with an integer value and add it to the current [PatchBuilder].
+ *
+ * @param key The key.
+ * @param default The default value.
+ * @param values Eligible option values mapped to a human-readable name.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ * @param validator The function to validate the option value.
+ *
+ * @return The created [Option].
+ *
+ * @see Option
+ */
+fun PatchBuilder<*>.intOption(
+    key: String,
+    default: Int? = null,
+    values: Map<String, Int?>? = null,
+    title: String? = null,
+    description: String? = null,
+    required: Boolean = false,
+    validator: Option<Int?>.(Int?) -> Boolean = { true },
+) = option(
+    key,
+    default,
+    values,
+    title,
+    description,
+    required,
+    validator,
+)
+
+/**
+ * Create a new [Option] with a boolean value and add it to the current [PatchBuilder].
+ *
+ * @param key The key.
+ * @param default The default value.
+ * @param values Eligible option values mapped to a human-readable name.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ * @param validator The function to validate the option value.
+ *
+ * @return The created [Option].
+ *
+ * @see Option
+ */
+fun PatchBuilder<*>.booleanOption(
+    key: String,
+    default: Boolean? = null,
+    values: Map<String, Boolean?>? = null,
+    title: String? = null,
+    description: String? = null,
+    required: Boolean = false,
+    validator: Option<Boolean?>.(Boolean?) -> Boolean = { true },
+) = option(
+    key,
+    default,
+    values,
+    title,
+    description,
+    required,
+    validator,
+)
+
+/**
+ * Create a new [Option] with a float value and add it to the current [PatchBuilder].
+ *
+ * @param key The key.
+ * @param default The default value.
+ * @param values Eligible option values mapped to a human-readable name.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ * @param validator The function to validate the option value.
+ *
+ * @return The created [Option].
+ *
+ * @see Option
+ */
+fun PatchBuilder<*>.floatOption(
+    key: String,
+    default: Float? = null,
+    values: Map<String, Float?>? = null,
+    title: String? = null,
+    description: String? = null,
+    required: Boolean = false,
+    validator: Option<Float?>.(Float?) -> Boolean = { true },
+) = option(
+    key,
+    default,
+    values,
+    title,
+    description,
+    required,
+    validator,
+)
+
+/**
+ * Create a new [Option] with a long value and add it to the current [PatchBuilder].
+ *
+ * @param key The key.
+ * @param default The default value.
+ * @param values Eligible option values mapped to a human-readable name.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ * @param validator The function to validate the option value.
+ *
+ * @return The created [Option].
+ *
+ * @see Option
+ */
+fun PatchBuilder<*>.longOption(
+    key: String,
+    default: Long? = null,
+    values: Map<String, Long?>? = null,
+    title: String? = null,
+    description: String? = null,
+    required: Boolean = false,
+    validator: Option<Long?>.(Long?) -> Boolean = { true },
+) = option(
+    key,
+    default,
+    values,
+    title,
+    description,
+    required,
+    validator,
+)
+
+/**
+ * Create a new [Option] with a string list value and add it to the current [PatchBuilder].
+ *
+ * @param key The key.
+ * @param default The default value.
+ * @param values Eligible option values mapped to a human-readable name.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ * @param validator The function to validate the option value.
+ *
+ * @return The created [Option].
+ *
+ * @see Option
+ */
+fun PatchBuilder<*>.stringsOption(
+    key: String,
+    default: List<String>? = null,
+    values: Map<String, List<String>?>? = null,
+    title: String? = null,
+    description: String? = null,
+    required: Boolean = false,
+    validator: Option<List<String>>.(List<String>?) -> Boolean = { true },
+) = option(
+    key,
+    default,
+    values,
+    title,
+    description,
+    required,
+    validator,
+)
+
+/**
+ * Create a new [Option] with an integer list value and add it to the current [PatchBuilder].
+ *
+ * @param key The key.
+ * @param default The default value.
+ * @param values Eligible option values mapped to a human-readable name.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ * @param validator The function to validate the option value.
+ *
+ * @return The created [Option].
+ *
+ * @see Option
+ */
+fun PatchBuilder<*>.intsOption(
+    key: String,
+    default: List<Int>? = null,
+    values: Map<String, List<Int>?>? = null,
+    title: String? = null,
+    description: String? = null,
+    required: Boolean = false,
+    validator: Option<List<Int>>.(List<Int>?) -> Boolean = { true },
+) = option(
+    key,
+    default,
+    values,
+    title,
+    description,
+    required,
+    validator,
+)
+
+/**
+ * Create a new [Option] with a boolean list value and add it to the current [PatchBuilder].
+ *
+ * @param key The key.
+ * @param default The default value.
+ * @param values Eligible option values mapped to a human-readable name.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ * @param validator The function to validate the option value.
+ *
+ * @return The created [Option].
+ *
+ * @see Option
+ */
+fun PatchBuilder<*>.booleansOption(
+    key: String,
+    default: List<Boolean>? = null,
+    values: Map<String, List<Boolean>?>? = null,
+    title: String? = null,
+    description: String? = null,
+    required: Boolean = false,
+    validator: Option<List<Boolean>>.(List<Boolean>?) -> Boolean = { true },
+) = option(
+    key,
+    default,
+    values,
+    title,
+    description,
+    required,
+    validator,
+)
+
+/**
+ * Create a new [Option] with a float list value and add it to the current [PatchBuilder].
+ *
+ * @param key The key.
+ * @param default The default value.
+ * @param values Eligible option values mapped to a human-readable name.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ * @param validator The function to validate the option value.
+ *
+ * @return The created [Option].
+ *
+ * @see Option
+ */
+fun PatchBuilder<*>.floatsOption(
+    key: String,
+    default: List<Float>? = null,
+    values: Map<String, List<Float>?>? = null,
+    title: String? = null,
+    description: String? = null,
+    required: Boolean = false,
+    validator: Option<List<Float>>.(List<Float>?) -> Boolean = { true },
+) = option(
+    key,
+    default,
+    values,
+    title,
+    description,
+    required,
+    validator,
+)
+
+/**
+ * Create a new [Option] with a long list value and add it to the current [PatchBuilder].
+ *
+ * @param key The key.
+ * @param default The default value.
+ * @param values Eligible option values mapped to a human-readable name.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ * @param validator The function to validate the option value.
+ *
+ * @return The created [Option].
+ *
+ * @see Option
+ */
+fun PatchBuilder<*>.longsOption(
+    key: String,
+    default: List<Long>? = null,
+    values: Map<String, List<Long>?>? = null,
+    title: String? = null,
+    description: String? = null,
+    required: Boolean = false,
+    validator: Option<List<Long>>.(List<Long>?) -> Boolean = { true },
+) = option(
+    key,
+    default,
+    values,
+    title,
+    description,
+    required,
+    validator,
+)
+
+/**
+ * Create a new [Option] and add it to the current [PatchBuilder].
+ *
+ * @param key The key.
+ * @param default The default value.
+ * @param values Eligible option values mapped to a human-readable name.
+ * @param title The title.
+ * @param description A description.
+ * @param required Whether the option is required.
+ * @param validator The function to validate the option value.
+ *
+ * @return The created [Option].
+ *
+ * @see Option
+ */
+inline fun <reified T> PatchBuilder<*>.option(
+    key: String,
+    default: T? = null,
+    values: Map<String, T?>? = null,
+    title: String? = null,
+    description: String? = null,
+    required: Boolean = false,
+    noinline validator: Option<T>.(T?) -> Boolean = { true },
+) = Option(
+    key,
+    default,
+    values,
+    title,
+    description,
+    required,
+    typeOf<T>(),
+    validator,
+).also { it() }
+
+/**
+ * An exception thrown when using [Option]s.
+ *
+ * @param errorMessage The exception message.
+ */
+sealed class OptionException(errorMessage: String) : Exception(errorMessage, null) {
+    /**
+     * An exception thrown when a [Option] 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) :
+        OptionException("Type $expectedType was expected but received type $invalidType")
+
+    /**
+     * An exception thrown when a value did not satisfy the value conditions specified by the [Option].
+     *
+     * @param value The value that failed validation.
+     */
+    class ValueValidationException(value: Any?, option: Option<*>) :
+        OptionException("The option value \"$value\" failed validation for ${option.key}")
+
+    /**
+     * An exception thrown when a value is required but null was passed.
+     *
+     * @param option The [Option] that requires a value.
+     */
+    class ValueRequiredException(option: Option<*>) :
+        OptionException("The option ${option.key} requires a value, but null was passed")
+
+    /**
+     * An exception thrown when a [Option] is not found.
+     *
+     * @param key The key of the [Option].
+     */
+    class OptionNotFoundException(key: String) :
+        OptionException("No option with key $key")
+}
--- a/src/main/kotlin/app/revanced/patcher/patch/Patch.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/Patch.kt
@@ -1,124 +1,695 @@
-@file:Suppress("MemberVisibilityCanBePrivate")
+@file:Suppress("MemberVisibilityCanBePrivate", "unused")

 package app.revanced.patcher.patch

-import app.revanced.patcher.PatchClass
+import app.revanced.patcher.Fingerprint
 import app.revanced.patcher.Patcher
-import app.revanced.patcher.data.Context
-import app.revanced.patcher.extensions.AnnotationExtensions.findAnnotationRecursively
-import app.revanced.patcher.patch.options.PatchOptions
-import java.io.Closeable
+import app.revanced.patcher.PatcherContext
+import dalvik.system.DexClassLoader
+import lanchon.multidexlib2.BasicDexFileNamer
+import lanchon.multidexlib2.MultiDexIO
+import java.io.File
+import java.io.InputStream
+import java.net.URLClassLoader
+import java.util.jar.JarFile
+import kotlin.reflect.KProperty
+
+typealias PackageName = String
+typealias VersionName = String
+typealias Package = Pair<PackageName, Set<VersionName>?>

 /**
 * A patch.
 *
- * If an implementation of [Patch] also implements [Closeable]
- * it will be closed in reverse execution order of patches executed by [Patcher].
+ * @param C The [PatchContext] to execute and finalize the patch with.
+ * @param name The name of the patch.
+ * If null, the patch is named "Patch" and will not be loaded by [PatchLoader].
+ * @param description The description of the patch.
+ * @param use Weather or not the patch should be used.
+ * @param dependencies Other patches this patch depends on.
+ * @param compatiblePackages The packages the patch is compatible with.
+ * If null, the patch is compatible with all packages.
+ * @param options The options of the patch.
+ * @param executeBlock The execution block of the patch.
+ * @param finalizeBlock The finalizing block of the patch. Called after all patches have been executed,
+ * in reverse order of execution.
 *
- * @param T The [Context] type this patch will work on.
+ * @constructor Create a new patch.
 */
-sealed class Patch<out T : Context<*>> {
-    /**
-     * The name of the patch.
-     */
-    var name: String? = null
-        private set
+sealed class Patch<C : PatchContext<*>>(
+    val name: String?,
+    val description: String?,
+    val use: Boolean,
+    val dependencies: Set<Patch<*>>,
+    val compatiblePackages: Set<Package>?,
+    options: Set<Option<*>>,
+    private val executeBlock: Patch<C>.(C) -> Unit,
+    // Must be internal and nullable, so that Patcher.invoke can check,
+    // if a patch has a finalizing block in order to not emit it twice.
+    internal var finalizeBlock: (Patch<C>.(C) -> Unit)?,
+) {
+    val options = Options(options)

    /**
-     * The description of the patch.
-     */
-    var description: String? = null
-        private set
-
-    /**
-     * The packages the patch is compatible with.
-     */
-    var compatiblePackages: Set<CompatiblePackage>? = null
-        private set
-
-    /**
-     * Other patches this patch depends on.
-     */
-    var dependencies: Set<PatchClass>? = null
-        private set
-
-    /**
-     * Weather or not the patch should be used.
-     */
-    var use = true
-        private set
-
-    // TODO: Remove this property, once integrations are coupled with patches.
-    /**
-     * Weather or not the patch requires integrations.
-     */
-    var requiresIntegrations = false
-        private set
-
-    constructor(
-        name: String?,
-        description: String?,
-        compatiblePackages: Set<CompatiblePackage>?,
-        dependencies: Set<PatchClass>?,
-        use: Boolean,
-        requiresIntegrations: Boolean,
-    ) {
-        this.name = name
-        this.description = description
-        this.compatiblePackages = compatiblePackages
-        this.dependencies = dependencies
-        this.use = use
-        this.requiresIntegrations = requiresIntegrations
-    }
-
-    constructor() {
-        this::class.findAnnotationRecursively(app.revanced.patcher.patch.annotation.Patch::class)?.let { annotation ->
-            this.name = annotation.name.ifEmpty { null }
-            this.description = annotation.description.ifEmpty { null }
-            this.compatiblePackages =
-                annotation.compatiblePackages
-                    .map { CompatiblePackage(it.name, it.versions.toSet().ifEmpty { null }) }
-                    .toSet().ifEmpty { null }
-            this.dependencies = annotation.dependencies.toSet().ifEmpty { null }
-            this.use = annotation.use
-            this.requiresIntegrations = annotation.requiresIntegrations
-        }
-    }
-
-    /**
-     * The options of the patch associated by the options key.
-     */
-    val options = PatchOptions()
-
-    /**
-     * The execution function of the patch.
+     * Runs the execution block of the patch.
+     * Called by [Patcher].
     *
-     * @param context The [Context] the patch will work on.
-     * @return The result of executing the patch.
+     * @param context The [PatcherContext] to get the [PatchContext] from to execute the patch with.
     */
-    abstract fun execute(context: @UnsafeVariance T)
+    internal abstract fun execute(context: PatcherContext)

-    override fun hashCode() = name.hashCode()
+    /**
+     * Runs the execution block of the patch.
+     *
+     * @param context The [PatchContext] to execute the patch with.
+     */
+    fun execute(context: C) = executeBlock(context)

-    override fun toString() = name ?: this::class.simpleName ?: "Unnamed patch"
+    /**
+     * Runs the finalizing block of the patch.
+     * Called by [Patcher].
+     *
+     * @param context The [PatcherContext] to get the [PatchContext] from to finalize the patch with.
+     */
+    internal abstract fun finalize(context: PatcherContext)

-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
+    /**
+     * Runs the finalizing block of the patch.
+     *
+     * @param context The [PatchContext] to finalize the patch with.
+     */
+    fun finalize(context: C) {
+        finalizeBlock?.invoke(this, context)
+    }

-        other as Patch<*>
+    override fun toString() = name ?: "Patch"
+}

-        return name == other.name
+internal fun Patch<*>.anyRecursively(
+    visited: MutableSet<Patch<*>> = mutableSetOf(),
+    predicate: (Patch<*>) -> Boolean,
+): Boolean {
+    if (this in visited) return false
+
+    if (predicate(this)) return true
+
+    visited += this
+
+    return dependencies.any { it.anyRecursively(visited, predicate) }
+}
+
+internal fun Iterable<Patch<*>>.forEachRecursively(
+    visited: MutableSet<Patch<*>> = mutableSetOf(),
+    action: (Patch<*>) -> Unit,
+): Unit = forEach {
+    if (it in visited) return@forEach
+
+    visited += it
+    action(it)
+
+    it.dependencies.forEachRecursively(visited, action)
+}
+
+/**
+ * A bytecode patch.
+ *
+ * @param name The name of the patch.
+ * If null, the patch is named "Patch" and will not be loaded by [PatchLoader].
+ * @param description The description of the patch.
+ * @param use Weather or not the patch should be used.
+ * @param compatiblePackages The packages the patch is compatible with.
+ * If null, the patch is compatible with all packages.
+ * @param dependencies Other patches this patch depends on.
+ * @param options The options of the patch.
+ * @param fingerprints The fingerprints that are resolved before the patch is executed.
+ * @property extension An input stream of the extension resource this patch uses.
+ * An extension is a precompiled DEX file that is merged into the patched app before this patch is executed.
+ * @param executeBlock The execution block of the patch.
+ * @param finalizeBlock The finalizing block of the patch. Called after all patches have been executed,
+ * in reverse order of execution.
+ *
+ * @constructor Create a new bytecode patch.
+ */
+class BytecodePatch internal constructor(
+    name: String?,
+    description: String?,
+    use: Boolean,
+    compatiblePackages: Set<Package>?,
+    dependencies: Set<Patch<*>>,
+    options: Set<Option<*>>,
+    val fingerprints: Set<Fingerprint>,
+    val extension: InputStream?,
+    executeBlock: Patch<BytecodePatchContext>.(BytecodePatchContext) -> Unit,
+    finalizeBlock: (Patch<BytecodePatchContext>.(BytecodePatchContext) -> Unit)?,
+) : Patch<BytecodePatchContext>(
+    name,
+    description,
+    use,
+    dependencies,
+    compatiblePackages,
+    options,
+    executeBlock,
+    finalizeBlock,
+) {
+    override fun execute(context: PatcherContext) = with(context.bytecodeContext) {
+        fingerprints.forEach { it.match(this) }
+
+        execute(this)
+    }
+
+    override fun finalize(context: PatcherContext) = finalize(context.bytecodeContext)
+
+    override fun toString() = name ?: "BytecodePatch"
+}
+
+/**
+ * A raw resource patch.
+ *
+ * @param name The name of the patch.
+ * If null, the patch is named "Patch" and will not be loaded by [PatchLoader].
+ * @param description The description of the patch.
+ * @param use Weather or not the patch should be used.
+ * @param compatiblePackages The packages the patch is compatible with.
+ * If null, the patch is compatible with all packages.
+ * @param dependencies Other patches this patch depends on.
+ * @param options The options of the patch.
+ * @param executeBlock The execution block of the patch.
+ * @param finalizeBlock The finalizing block of the patch. Called after all patches have been executed,
+ * in reverse order of execution.
+ *
+ * @constructor Create a new raw resource patch.
+ */
+class RawResourcePatch internal constructor(
+    name: String?,
+    description: String?,
+    use: Boolean,
+    compatiblePackages: Set<Package>?,
+    dependencies: Set<Patch<*>>,
+    options: Set<Option<*>>,
+    executeBlock: Patch<ResourcePatchContext>.(ResourcePatchContext) -> Unit,
+    finalizeBlock: (Patch<ResourcePatchContext>.(ResourcePatchContext) -> Unit)?,
+) : Patch<ResourcePatchContext>(
+    name,
+    description,
+    use,
+    dependencies,
+    compatiblePackages,
+    options,
+    executeBlock,
+    finalizeBlock,
+) {
+    override fun execute(context: PatcherContext) = execute(context.resourceContext)
+
+    override fun finalize(context: PatcherContext) = finalize(context.resourceContext)
+
+    override fun toString() = name ?: "RawResourcePatch"
+}
+
+/**
+ * A resource patch.
+ *
+ * @param name The name of the patch.
+ * If null, the patch is named "Patch" and will not be loaded by [PatchLoader].
+ * @param description The description of the patch.
+ * @param use Weather or not the patch should be used.
+ * @param compatiblePackages The packages the patch is compatible with.
+ * If null, the patch is compatible with all packages.
+ * @param dependencies Other patches this patch depends on.
+ * @param options The options of the patch.
+ * @param executeBlock The execution block of the patch.
+ * @param finalizeBlock The finalizing block of the patch. Called after all patches have been executed,
+ * in reverse order of execution.
+ *
+ * @constructor Create a new resource patch.
+ */
+class ResourcePatch internal constructor(
+    name: String?,
+    description: String?,
+    use: Boolean,
+    compatiblePackages: Set<Package>?,
+    dependencies: Set<Patch<*>>,
+    options: Set<Option<*>>,
+    executeBlock: Patch<ResourcePatchContext>.(ResourcePatchContext) -> Unit,
+    finalizeBlock: (Patch<ResourcePatchContext>.(ResourcePatchContext) -> Unit)?,
+) : Patch<ResourcePatchContext>(
+    name,
+    description,
+    use,
+    dependencies,
+    compatiblePackages,
+    options,
+    executeBlock,
+    finalizeBlock,
+) {
+    override fun execute(context: PatcherContext) = execute(context.resourceContext)
+
+    override fun finalize(context: PatcherContext) = finalize(context.resourceContext)
+
+    override fun toString() = name ?: "ResourcePatch"
+}
+
+/**
+ * A [Patch] builder.
+ *
+ * @param C The [PatchContext] to execute and finalize the patch with.
+ * @param name The name of the patch.
+ * If null, the patch is named "Patch" and will not be loaded by [PatchLoader].
+ * @param description The description of the patch.
+ * @param use Weather or not the patch should be used.
+ * @property compatiblePackages The packages the patch is compatible with.
+ * If null, the patch is compatible with all packages.
+ * @property dependencies Other patches this patch depends on.
+ * @property options The options of the patch.
+ * @property executionBlock The execution block of the patch.
+ * @property finalizeBlock The finalizing block of the patch. Called after all patches have been executed,
+ * in reverse order of execution.
+ *
+ * @constructor Create a new [Patch] builder.
+ */
+sealed class PatchBuilder<C : PatchContext<*>>(
+    protected val name: String?,
+    protected val description: String?,
+    protected val use: Boolean,
+) {
+    protected var compatiblePackages: MutableSet<Package>? = null
+    protected var dependencies = mutableSetOf<Patch<*>>()
+    protected val options = mutableSetOf<Option<*>>()
+
+    protected var executionBlock: (Patch<C>.(C) -> Unit) = { }
+    protected var finalizeBlock: (Patch<C>.(C) -> Unit)? = null
+
+    /**
+     * Add an option to the patch.
+     *
+     * @return The added option.
+     */
+    operator fun <T> Option<T>.invoke() = apply {
+        options += this
    }

    /**
-     * A package a [Patch] is compatible with.
+     * Create 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,
-        val versions: Set<String>? = null,
+    operator fun String.invoke(vararg versions: String) = invoke(versions.toSet())
+
+    /**
+     * Create a package a patch is compatible with.
+     *
+     * @param versions The versions of the package.
+     */
+    private operator fun String.invoke(versions: Set<String>? = null) = this to versions
+
+    /**
+     * Add packages the patch is compatible with.
+     *
+     * @param packages The packages the patch is compatible with.
+     */
+    fun compatibleWith(vararg packages: Package) {
+        if (compatiblePackages == null) {
+            compatiblePackages = mutableSetOf()
+        }
+
+        compatiblePackages!! += packages
+    }
+
+    /**
+     * Set the compatible packages of the patch.
+     *
+     * @param packages The packages the patch is compatible with.
+     */
+    fun compatibleWith(vararg packages: String) = compatibleWith(*packages.map { it() }.toTypedArray())
+
+    /**
+     * Add dependencies to the patch.
+     *
+     * @param patches The patches the patch depends on.
+     */
+    fun dependsOn(vararg patches: Patch<*>) {
+        dependencies += patches
+    }
+
+    /**
+     * Set the execution block of the patch.
+     *
+     * @param block The execution block of the patch.
+     */
+    fun execute(block: Patch<C>.(C) -> Unit) {
+        executionBlock = block
+    }
+
+    /**
+     * Set the finalizing block of the patch.
+     *
+     * @param block The finalizing block of the patch.
+     */
+    fun finalize(block: Patch<C>.(C) -> Unit) {
+        finalizeBlock = block
+    }
+
+    /**
+     * Build the patch.
+     *
+     * @return The built patch.
+     */
+    internal abstract fun build(): Patch<C>
+}
+
+/**
+ * Builds a [Patch].
+ *
+ * @param B The [PatchBuilder] to build the patch with.
+ * @param block The block to build the patch.
+ *
+ * @return The built [Patch].
+ */
+private fun <B : PatchBuilder<*>> B.buildPatch(block: B.() -> Unit = {}) = apply(block).build()
+
+/**
+ * A [BytecodePatchBuilder] builder.
+ *
+ * @param name The name of the patch.
+ * If null, the patch is named "Patch" and will not be loaded by [PatchLoader].
+ * @param description The description of the patch.
+ * @param use Weather or not the patch should be used.
+ * @property fingerprints The fingerprints that are resolved before the patch is executed.
+ * @property extension An input stream of the extension resource this patch uses.
+ * An extension is a precompiled DEX file that is merged into the patched app before this patch is executed.
+ *
+ * @constructor Create a new [BytecodePatchBuilder] builder.
+ */
+class BytecodePatchBuilder internal constructor(
+    name: String?,
+    description: String?,
+    use: Boolean,
+) : PatchBuilder<BytecodePatchContext>(name, description, use) {
+    private val fingerprints = mutableSetOf<Fingerprint>()
+
+    /**
+     * Add the fingerprint to the patch.
+     *
+     * @return A wrapper for the fingerprint with the ability to delegate the match to the fingerprint.
+     */
+    operator fun Fingerprint.invoke() = InvokedFingerprint(also { fingerprints.add(it) })
+
+    class InvokedFingerprint(private val fingerprint: Fingerprint) {
+        // The reason getValue isn't extending the Fingerprint class is
+        // because delegating makes only sense if the fingerprint was previously added to the patch by invoking it.
+        // It may be likely to forget invoking it. By wrapping the fingerprint into this class,
+        // the compiler will throw an error if the fingerprint was not invoked if attempting to delegate the match.
+        operator fun getValue(nothing: Nothing?, property: KProperty<*>) = fingerprint.match
+            ?: throw PatchException("No fingerprint match to delegate to \"${property.name}\".")
+    }
+
+    // Must be internal for the inlined function "extendWith".
+    @PublishedApi
+    internal var extension: InputStream? = null
+
+    // Inlining is necessary to get the class loader that loaded the patch
+    // to load the extension from the resources.
+    /**
+     * Set the extension of the patch.
+     *
+     * @param extension The name of the extension resource.
+     */
+    @Suppress("NOTHING_TO_INLINE")
+    inline fun extendWith(extension: String) = apply {
+        this.extension = object {}.javaClass.classLoader.getResourceAsStream(extension)
+            ?: throw PatchException("Extension \"$extension\" not found")
+    }
+
+    override fun build() = BytecodePatch(
+        name,
+        description,
+        use,
+        compatiblePackages,
+        dependencies,
+        options,
+        fingerprints,
+        extension,
+        executionBlock,
+        finalizeBlock,
    )
 }
+
+/**
+ * Create a new [BytecodePatch].
+ *
+ * @param name The name of the patch.
+ * If null, the patch is named "Patch" and will not be loaded by [PatchLoader].
+ * @param description The description of the patch.
+ * @param use Weather or not the patch should be used.
+ * @param block The block to build the patch.
+ *
+ * @return The created [BytecodePatch].
+ */
+fun bytecodePatch(
+    name: String? = null,
+    description: String? = null,
+    use: Boolean = true,
+    block: BytecodePatchBuilder.() -> Unit = {},
+) = BytecodePatchBuilder(name, description, use).buildPatch(block) as BytecodePatch
+
+/**
+ * A [RawResourcePatch] builder.
+ *
+ * @param name The name of the patch.
+ * If null, the patch is named "Patch" and will not be loaded by [PatchLoader].
+ * @param description The description of the patch.
+ * @param use Weather or not the patch should be used.
+ *
+ * @constructor Create a new [RawResourcePatch] builder.
+ */
+class RawResourcePatchBuilder internal constructor(
+    name: String?,
+    description: String?,
+    use: Boolean,
+) : PatchBuilder<ResourcePatchContext>(name, description, use) {
+    override fun build() = RawResourcePatch(
+        name,
+        description,
+        use,
+        compatiblePackages,
+        dependencies,
+        options,
+        executionBlock,
+        finalizeBlock,
+    )
+}
+
+/**
+ * Create a new [RawResourcePatch].
+ *
+ * @param name The name of the patch.
+ * If null, the patch is named "Patch" and will not be loaded by [PatchLoader].
+ * @param description The description of the patch.
+ * @param use Weather or not the patch should be used.
+ * @param block The block to build the patch.
+ * @return The created [RawResourcePatch].
+ */
+fun rawResourcePatch(
+    name: String? = null,
+    description: String? = null,
+    use: Boolean = true,
+    block: RawResourcePatchBuilder.() -> Unit = {},
+) = RawResourcePatchBuilder(name, description, use).buildPatch(block) as RawResourcePatch
+
+/**
+ * A [ResourcePatch] builder.
+ *
+ * @param name The name of the patch.
+ * If null, the patch is named "Patch" and will not be loaded by [PatchLoader].
+ * @param description The description of the patch.
+ * @param use Weather or not the patch should be used.
+ *
+ * @constructor Create a new [ResourcePatch] builder.
+ */
+class ResourcePatchBuilder internal constructor(
+    name: String?,
+    description: String?,
+    use: Boolean,
+) : PatchBuilder<ResourcePatchContext>(name, description, use) {
+    override fun build() = ResourcePatch(
+        name,
+        description,
+        use,
+        compatiblePackages,
+        dependencies,
+        options,
+        executionBlock,
+        finalizeBlock,
+    )
+}
+
+/**
+ * Create a new [ResourcePatch].
+ *
+ * @param name The name of the patch.
+ * If null, the patch is named "Patch" and will not be loaded by [PatchLoader].
+ * @param description The description of the patch.
+ * @param use Weather or not the patch should be used.
+ * @param block The block to build the patch.
+ *
+ * @return The created [ResourcePatch].
+ */
+fun resourcePatch(
+    name: String? = null,
+    description: String? = null,
+    use: Boolean = true,
+    block: ResourcePatchBuilder.() -> Unit = {},
+) = ResourcePatchBuilder(name, description, use).buildPatch(block) as ResourcePatch
+
+/**
+ * An exception thrown when patching.
+ *
+ * @param errorMessage The exception message.
+ * @param cause The corresponding [Throwable].
+ */
+class PatchException(errorMessage: String?, cause: Throwable?) : Exception(errorMessage, cause) {
+    constructor(errorMessage: String) : this(errorMessage, null)
+    constructor(cause: Throwable) : this(cause.message, cause)
+}
+
+/**
+ * A result of executing a [Patch].
+ *
+ * @param patch The [Patch] that was executed.
+ * @param exception The [PatchException] thrown, if any.
+ */
+class PatchResult internal constructor(val patch: Patch<*>, val exception: PatchException? = null)
+
+/**
+ * A loader for patches.
+ *
+ * Loads unnamed patches from JAR or DEX files declared as public static fields
+ * or returned by public static and non-parametrized methods.
+ *
+ * @param byPatchesFile The patches associated by the patches file they were loaded from.
+ */
+sealed class PatchLoader private constructor(
+    val byPatchesFile: Map<File, Set<Patch<*>>>,
+) : Set<Patch<*>> by byPatchesFile.values.flatten().toSet() {
+    /**
+     * @param patchesFiles A set of JAR or DEX files to load the patches from.
+     * @param getBinaryClassNames A function that returns the binary names of all classes accessible by the class loader.
+     * @param classLoader The [ClassLoader] to use for loading the classes.
+     */
+    private constructor(
+        patchesFiles: Set<File>,
+        getBinaryClassNames: (patchesFile: File) -> List<String>,
+        classLoader: ClassLoader,
+    ) : this(classLoader.loadPatches(patchesFiles.associateWith { getBinaryClassNames(it).toSet() }))
+
+    /**
+     * A [PatchLoader] for JAR files.
+     *
+     * @param patchesFiles The JAR files to load the patches from.
+     *
+     * @constructor Create a new [PatchLoader] for JAR files.
+     */
+    class Jar(patchesFiles: Set<File>) :
+        PatchLoader(
+            patchesFiles,
+            { file ->
+                JarFile(file).entries().toList().filter { it.name.endsWith(".class") }
+                    .map { it.name.substringBeforeLast('.').replace('/', '.') }
+            },
+            URLClassLoader(patchesFiles.map { it.toURI().toURL() }.toTypedArray()),
+        )
+
+    /**
+     * A [PatchLoader] for [Dex] files.
+     *
+     * @param patchesFiles The DEX files to load the patches from.
+     * @param optimizedDexDirectory The directory to store optimized DEX files in.
+     * This parameter is deprecated and has no effect since API level 26.
+     *
+     * @constructor Create a new [PatchLoader] for [Dex] files.
+     */
+    class Dex(patchesFiles: Set<File>, optimizedDexDirectory: File? = null) :
+        PatchLoader(
+            patchesFiles,
+            { patchBundle ->
+                MultiDexIO.readDexFile(true, patchBundle, BasicDexFileNamer(), null, null).classes
+                    .map { classDef ->
+                        classDef.type.substring(1, classDef.length - 1)
+                    }
+            },
+            DexClassLoader(
+                patchesFiles.joinToString(File.pathSeparator) { it.absolutePath },
+                optimizedDexDirectory?.absolutePath,
+                null,
+                this::class.java.classLoader,
+            ),
+        )
+
+    // Companion object required for unit tests.
+    private companion object {
+        val Class<*>.isPatch get() = Patch::class.java.isAssignableFrom(this)
+
+        /**
+         * Public static fields that are patches.
+         */
+        private val Class<*>.patchFields
+            get() = fields.filter { field ->
+                field.type.isPatch && field.canAccess(null)
+            }.map { field ->
+                field.get(null) as Patch<*>
+            }
+
+        /**
+         * Public static and non-parametrized methods that return patches.
+         */
+        private val Class<*>.patchMethods
+            get() = methods.filter { method ->
+                method.returnType.isPatch && method.parameterCount == 0 && method.canAccess(null)
+            }.map { method ->
+                method.invoke(null) as Patch<*>
+            }
+
+        /**
+         * Loads unnamed patches declared as public static fields
+         * or returned by public static and non-parametrized methods.
+         *
+         * @param binaryClassNamesByPatchesFile The binary class name of the classes to load the patches from
+         * associated by the patches file.
+         *
+         * @return The loaded patches associated by the patches file.
+         */
+        private fun ClassLoader.loadPatches(binaryClassNamesByPatchesFile: Map<File, Set<String>>) =
+            binaryClassNamesByPatchesFile.mapValues { (_, binaryClassNames) ->
+                binaryClassNames.asSequence().map {
+                    loadClass(it)
+                }.flatMap {
+                    it.patchFields + it.patchMethods
+                }.filter {
+                    it.name != null
+                }.toSet()
+            }
+    }
+}
+
+/**
+ * Loads patches from JAR files declared as public static fields
+ * or returned by public static and non-parametrized methods.
+ * Patches with no name are not loaded.
+ *
+ * @param patchesFiles The JAR files to load the patches from.
+ *
+ * @return The loaded patches.
+ */
+fun loadPatchesFromJar(patchesFiles: Set<File>) =
+    PatchLoader.Jar(patchesFiles)
+
+/**
+ * Loads patches from DEX files declared as public static fields
+ * or returned by public static and non-parametrized methods.
+ * Patches with no name are not loaded.
+ *
+ * @param patchesFiles The DEX files to load the patches from.
+ *
+ * @return The loaded patches.
+ */
+fun loadPatchesFromDex(patchesFiles: Set<File>, optimizedDexDirectory: File? = null) =
+    PatchLoader.Dex(patchesFiles, optimizedDexDirectory)
--- a/src/main/kotlin/app/revanced/patcher/patch/PatchContext.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/PatchContext.kt
@@ -0,0 +1,9 @@
+package app.revanced.patcher.patch
+
+import java.util.function.Supplier
+
+/**
+ * A common interface for contexts such as [ResourcePatchContext] and [BytecodePatchContext].
+ */
+
+sealed interface PatchContext<T> : Supplier<T>
--- a/src/main/kotlin/app/revanced/patcher/patch/PatchException.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/PatchException.kt
@@ -1,12 +0,0 @@
-package app.revanced.patcher.patch
-
-/**
- * An exception thrown when patching.
- *
- * @param errorMessage The exception message.
- * @param cause The corresponding [Throwable].
- */
-class PatchException(errorMessage: String?, cause: Throwable?) : Exception(errorMessage, cause) {
-    constructor(errorMessage: String) : this(errorMessage, null)
-    constructor(cause: Throwable) : this(cause.message, cause)
-}
--- a/src/main/kotlin/app/revanced/patcher/patch/PatchResult.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/PatchResult.kt
@@ -1,9 +0,0 @@
-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.
- */
-class PatchResult internal constructor(val patch: Patch<*>, val exception: PatchException? = null)
--- a/src/main/kotlin/app/revanced/patcher/patch/RawResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/RawResourcePatch.kt
@@ -1,43 +0,0 @@
-package app.revanced.patcher.patch
-
-import app.revanced.patcher.PatchClass
-import app.revanced.patcher.Patcher
-import app.revanced.patcher.data.ResourceContext
-import java.io.Closeable
-
-/**
- * A [Patch] that accesses a [ResourceContext].
- *
- * If an implementation of [Patch] also implements [Closeable]
- * it will be closed in reverse execution order of patches executed by [Patcher].
- *
- * This type of patch that does not have access to decoded resources.
- * Instead, you can read and write arbitrary files in an APK file.
- *
- * If you want to access decoded resources, use [ResourcePatch] instead.
- */
-abstract class RawResourcePatch : Patch<ResourceContext> {
-    /**
-     * Create a new [RawResourcePatch].
-     */
-    constructor()
-
-    /**
-     * Create a new [RawResourcePatch].
-     *
-     * @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 Other patches this patch depends on.
-     * @param use Weather or not the patch should be used.
-     * @param requiresIntegrations Weather or not the patch requires integrations.
-     */
-    constructor(
-        name: String? = null,
-        description: String? = null,
-        compatiblePackages: Set<CompatiblePackage>? = null,
-        dependencies: Set<PatchClass>? = null,
-        use: Boolean = true,
-        requiresIntegrations: Boolean = false,
-    ) : super(name, description, compatiblePackages, dependencies, use, requiresIntegrations)
-}
--- a/src/main/kotlin/app/revanced/patcher/patch/ResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/ResourcePatch.kt
@@ -1,43 +0,0 @@
-package app.revanced.patcher.patch
-
-import app.revanced.patcher.PatchClass
-import app.revanced.patcher.Patcher
-import app.revanced.patcher.data.ResourceContext
-import java.io.Closeable
-
-/**
- * A [Patch] that accesses a [ResourceContext].
- *
- * If an implementation of [Patch] also implements [Closeable]
- * it will be closed in reverse execution order of patches executed by [Patcher].
- *
- * This type of patch has access to decoded resources.
- * Additionally, you can read and write arbitrary files in an APK file.
- *
- * If you do not need access to decoded resources, use [RawResourcePatch] instead.
- */
-abstract class ResourcePatch : Patch<ResourceContext> {
-    /**
-     * Create a new [ResourcePatch].
-     */
-    constructor()
-
-    /**
-     * Create a new [ResourcePatch].
-     *
-     * @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 Other patches this patch depends on.
-     * @param use Weather or not the patch should be used.
-     * @param requiresIntegrations Weather or not the patch requires integrations.
-     */
-    constructor(
-        name: String? = null,
-        description: String? = null,
-        compatiblePackages: Set<CompatiblePackage>? = null,
-        dependencies: Set<PatchClass>? = null,
-        use: Boolean = true,
-        requiresIntegrations: Boolean = false,
-    ) : super(name, description, compatiblePackages, dependencies, use, requiresIntegrations)
-}
--- a/src/main/kotlin/app/revanced/patcher/patch/ResourcePatchContext.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/ResourcePatchContext.kt
@@ -1,11 +1,10 @@
-package app.revanced.patcher.data
+package app.revanced.patcher.patch

 import app.revanced.patcher.InternalApi
 import app.revanced.patcher.PackageMetadata
 import app.revanced.patcher.PatcherConfig
 import app.revanced.patcher.PatcherResult
 import app.revanced.patcher.util.Document
-import app.revanced.patcher.util.DomFileEditor
 import brut.androlib.AaptInvoker
 import brut.androlib.ApkDecoder
 import brut.androlib.apk.UsesFramework
@@ -15,32 +14,28 @@ 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 the patcher containing the current state of the resources.
+ * A context for patches containing the current state of resources.
 *
 * @param packageMetadata The [PackageMetadata] of the apk file.
 * @param config The [PatcherConfig] used to create this context.
 */
-class ResourceContext internal constructor(
+class ResourcePatchContext internal constructor(
    private val packageMetadata: PackageMetadata,
    private val config: PatcherConfig,
-) : Context<PatcherResult.PatchedResources?>, Iterable<File> {
-    private val logger = Logger.getLogger(ResourceContext::class.java.name)
+) : PatchContext<PatcherResult.PatchedResources?> {
+    private val logger = Logger.getLogger(ResourcePatchContext::class.java.name)

    /**
     * Read and write documents in the [PatcherConfig.apkFiles].
     */
    val document = DocumentOperatable()

-    @Deprecated("Use document instead.")
-    val xmlEditor = XmlFileHolder()
-
    /**
     * Predicate to delete resources from [PatcherConfig.apkFiles].
     */
@@ -154,7 +149,7 @@ class ResourceContext internal constructor(
                // Excluded because present in resources.other.
                // TODO: We are reusing config.apkFiles as a temporarily directory for extracting resources.
                //  This is not ideal as it could conflict with files such as the ones that we filter here.
-                //  The problem is that ResourceContext#get returns a File relative to config.apkFiles,
+                //  The problem is that ResourcePatchContext#get returns a File relative to config.apkFiles,
                //  and we need to extract files to that directory.
                //  A solution would be to use config.apkFiles as the working directory for the patching process.
                //  Once all patches have been executed, we can move the decoded resources to a new directory.
@@ -212,12 +207,6 @@ class ResourceContext internal constructor(
     */
    fun stageDelete(shouldDelete: (String) -> Boolean) = deleteResources.add(shouldDelete)

-    @Deprecated("Use get(String, Boolean) instead.", ReplaceWith("get(path, false)"))
-    operator fun get(path: String) = get(path, false)
-
-    @Deprecated("Use get(String, Boolean) instead.")
-    override fun iterator(): Iterator<File> = config.apkFiles.listFiles()!!.iterator()
-
    /**
     * How to handle resources decoding and compiling.
     */
@@ -242,15 +231,6 @@ class ResourceContext internal constructor(
    inner class DocumentOperatable {
        operator fun get(inputStream: InputStream) = Document(inputStream)

-        operator fun get(path: String) = Document(this@ResourceContext[path])
-    }
-
-    @Deprecated("Use DocumentOperatable instead.")
-    inner class XmlFileHolder {
-        operator fun get(inputStream: InputStream) = DomFileEditor(inputStream)
-
-        operator fun get(path: String): DomFileEditor {
-            return DomFileEditor(this@ResourceContext[path])
-        }
+        operator fun get(path: String) = Document(this@ResourcePatchContext[path])
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/patch/annotation/PatchAnnotations.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/annotation/PatchAnnotations.kt
@@ -1,37 +0,0 @@
-package app.revanced.patcher.patch.annotation
-
-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.
- */
-@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/src/main/kotlin/app/revanced/patcher/patch/options/PatchOption.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/options/PatchOption.kt
@@ -1,477 +0,0 @@
-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 values The set of guaranteed valid values identified by their string representation.
- * @param title The title.
- * @param description A description.
- * @param required Whether the option is required.
- * @param valueType The type of the option value (to handle type erasure).
- * @param validator The function to validate the option value.
- * @param T The value type of the option.
- */
-@Suppress("MemberVisibilityCanBePrivate", "unused")
-open class PatchOption<T>(
-    val key: String,
-    val default: T?,
-    val values: Map<String, T?>?,
-    val title: String?,
-    val description: String?,
-    val required: Boolean,
-    val valueType: String,
-    val validator: PatchOption<T>.(T?) -> Boolean,
-) {
-    /**
-     * The value of the [PatchOption].
-     */
-    var value: T?
-        /**
-         * Set the value of the [PatchOption].
-         *
-         * @param value The value to set.
-         *
-         * @throws PatchOptionException.ValueRequiredException If the value is required but null.
-         * @throws PatchOptionException.ValueValidationException If the value is invalid.
-         */
-        set(value) {
-            assertRequiredButNotNull(value)
-            assertValid(value)
-
-            uncheckedValue = value
-        }
-
-        /**
-         * Get the value of the [PatchOption].
-         *
-         * @return The value.
-         *
-         * @throws PatchOptionException.ValueRequiredException If the value is required but null.
-         * @throws PatchOptionException.ValueValidationException If the value is invalid.
-         */
-        get() {
-            assertRequiredButNotNull(uncheckedValue)
-            assertValid(uncheckedValue)
-
-            return uncheckedValue
-        }
-
-    // The unchecked value is used to allow setting the value without validation.
-    private var uncheckedValue = default
-
-    /**
-     * Reset the [PatchOption] to its default value.
-     * Override this method if you need to mutate the value instead of replacing it.
-     */
-    open fun reset() {
-        uncheckedValue = default
-    }
-
-    private fun assertRequiredButNotNull(value: T?) {
-        if (required && value == null) throw PatchOptionException.ValueRequiredException(this)
-    }
-
-    private fun assertValid(value: T?) {
-        if (!validator(value)) throw PatchOptionException.ValueValidationException(value, this)
-    }
-
-
-    override fun toString() = value.toString()
-
-    operator fun getValue(
-        thisRef: Any?,
-        property: KProperty<*>,
-    ) = value
-
-    operator fun setValue(
-        thisRef: Any?,
-        property: KProperty<*>,
-        value: T?,
-    ) {
-        this.value = value
-    }
-
-    @Suppress("unused")
-    companion object PatchExtensions {
-        /**
-         * Create a new [PatchOption] with a string value and add it to the current [Patch].
-         *
-         * @param key The identifier.
-         * @param default The default value.
-         * @param values The set of guaranteed valid values.
-         * @param title The title.
-         * @param description A description.
-         * @param required Whether the option is required.
-         * @param validator The function to validate the option value.
-         *
-         * @return The created [PatchOption].
-         *
-         * @see PatchOption
-         */
-        fun <P : Patch<*>> P.stringPatchOption(
-            key: String,
-            default: String? = null,
-            values: Map<String, String?>? = null,
-            title: String? = null,
-            description: String? = null,
-            required: Boolean = false,
-            validator: PatchOption<String>.(String?) -> Boolean = { true },
-        ) = registerNewPatchOption(
-            key,
-            default,
-            values,
-            title,
-            description,
-            required,
-            "String",
-            validator,
-        )
-
-        /**
-         * Create a new [PatchOption] with an integer value and add it to the current [Patch].
-         *
-         * @param key The identifier.
-         * @param default The default value.
-         * @param values The set of guaranteed valid values.
-         * @param title The title.
-         * @param description A description.
-         * @param required Whether the option is required.
-         * @param validator The function to validate the option value.
-         *
-         * @return The created [PatchOption].
-         *
-         * @see PatchOption
-         */
-        fun <P : Patch<*>> P.intPatchOption(
-            key: String,
-            default: Int? = null,
-            values: Map<String, Int?>? = null,
-            title: String? = null,
-            description: String? = null,
-            required: Boolean = false,
-            validator: PatchOption<Int?>.(Int?) -> Boolean = { true },
-        ) = registerNewPatchOption(
-            key,
-            default,
-            values,
-            title,
-            description,
-            required,
-            "Int",
-            validator,
-        )
-
-        /**
-         * Create a new [PatchOption] with a boolean value and add it to the current [Patch].
-         *
-         * @param key The identifier.
-         * @param default The default value.
-         * @param values The set of guaranteed valid values.
-         * @param title The title.
-         * @param description A description.
-         * @param required Whether the option is required.
-         * @param validator The function to validate the option value.
-         *
-         * @return The created [PatchOption].
-         *
-         * @see PatchOption
-         */
-        fun <P : Patch<*>> P.booleanPatchOption(
-            key: String,
-            default: Boolean? = null,
-            values: Map<String, Boolean?>? = null,
-            title: String? = null,
-            description: String? = null,
-            required: Boolean = false,
-            validator: PatchOption<Boolean?>.(Boolean?) -> Boolean = { true },
-        ) = registerNewPatchOption(
-            key,
-            default,
-            values,
-            title,
-            description,
-            required,
-            "Boolean",
-            validator,
-        )
-
-        /**
-         * Create a new [PatchOption] with a float value and add it to the current [Patch].
-         *
-         * @param key The identifier.
-         * @param default The default value.
-         * @param values The set of guaranteed valid values.
-         * @param title The title.
-         * @param description A description.
-         * @param required Whether the option is required.
-         * @param validator The function to validate the option value.
-         *
-         * @return The created [PatchOption].
-         *
-         * @see PatchOption
-         */
-        fun <P : Patch<*>> P.floatPatchOption(
-            key: String,
-            default: Float? = null,
-            values: Map<String, Float?>? = null,
-            title: String? = null,
-            description: String? = null,
-            required: Boolean = false,
-            validator: PatchOption<Float?>.(Float?) -> Boolean = { true },
-        ) = registerNewPatchOption(
-            key,
-            default,
-            values,
-            title,
-            description,
-            required,
-            "Float",
-            validator,
-        )
-
-        /**
-         * Create a new [PatchOption] with a long value and add it to the current [Patch].
-         *
-         * @param key The identifier.
-         * @param default The default value.
-         * @param values The set of guaranteed valid values.
-         * @param title The title.
-         * @param description A description.
-         * @param required Whether the option is required.
-         * @param validator The function to validate the option value.
-         *
-         * @return The created [PatchOption].
-         *
-         * @see PatchOption
-         */
-        fun <P : Patch<*>> P.longPatchOption(
-            key: String,
-            default: Long? = null,
-            values: Map<String, Long?>? = null,
-            title: String? = null,
-            description: String? = null,
-            required: Boolean = false,
-            validator: PatchOption<Long?>.(Long?) -> Boolean = { true },
-        ) = registerNewPatchOption(
-            key,
-            default,
-            values,
-            title,
-            description,
-            required,
-            "Long",
-            validator,
-        )
-
-        /**
-         * Create a new [PatchOption] with a string array value and add it to the current [Patch].
-         *
-         * @param key The identifier.
-         * @param default The default value.
-         * @param values The set of guaranteed valid values.
-         * @param title The title.
-         * @param description A description.
-         * @param required Whether the option is required.
-         * @param validator The function to validate the option value.
-         *
-         * @return The created [PatchOption].
-         *
-         * @see PatchOption
-         */
-        fun <P : Patch<*>> P.stringArrayPatchOption(
-            key: String,
-            default: Array<String>? = null,
-            values: Map<String, Array<String>?>? = null,
-            title: String? = null,
-            description: String? = null,
-            required: Boolean = false,
-            validator: PatchOption<Array<String>?>.(Array<String>?) -> Boolean = { true },
-        ) = registerNewPatchOption(
-            key,
-            default,
-            values,
-            title,
-            description,
-            required,
-            "StringArray",
-            validator,
-        )
-
-        /**
-         * Create a new [PatchOption] with an integer array value and add it to the current [Patch].
-         *
-         * @param key The identifier.
-         * @param default The default value.
-         * @param values The set of guaranteed valid values.
-         * @param title The title.
-         * @param description A description.
-         * @param required Whether the option is required.
-         * @param validator The function to validate the option value.
-         *
-         * @return The created [PatchOption].
-         *
-         * @see PatchOption
-         */
-        fun <P : Patch<*>> P.intArrayPatchOption(
-            key: String,
-            default: Array<Int>? = null,
-            values: Map<String, Array<Int>?>? = null,
-            title: String? = null,
-            description: String? = null,
-            required: Boolean = false,
-            validator: PatchOption<Array<Int>?>.(Array<Int>?) -> Boolean = { true },
-        ) = registerNewPatchOption(
-            key,
-            default,
-            values,
-            title,
-            description,
-            required,
-            "IntArray",
-            validator,
-        )
-
-        /**
-         * Create a new [PatchOption] with a boolean array value and add it to the current [Patch].
-         *
-         * @param key The identifier.
-         * @param default The default value.
-         * @param values The set of guaranteed valid values.
-         * @param title The title.
-         * @param description A description.
-         * @param required Whether the option is required.
-         * @param validator The function to validate the option value.
-         *
-         * @return The created [PatchOption].
-         *
-         * @see PatchOption
-         */
-        fun <P : Patch<*>> P.booleanArrayPatchOption(
-            key: String,
-            default: Array<Boolean>? = null,
-            values: Map<String, Array<Boolean>?>? = null,
-            title: String? = null,
-            description: String? = null,
-            required: Boolean = false,
-            validator: PatchOption<Array<Boolean>?>.(Array<Boolean>?) -> Boolean = { true },
-        ) = registerNewPatchOption(
-            key,
-            default,
-            values,
-            title,
-            description,
-            required,
-            "BooleanArray",
-            validator,
-        )
-
-        /**
-         * Create a new [PatchOption] with a float array value and add it to the current [Patch].
-         *
-         * @param key The identifier.
-         * @param default The default value.
-         * @param values The set of guaranteed valid values.
-         * @param title The title.
-         * @param description A description.
-         * @param required Whether the option is required.
-         * @param validator The function to validate the option value.
-         *
-         * @return The created [PatchOption].
-         *
-         * @see PatchOption
-         */
-        fun <P : Patch<*>> P.floatArrayPatchOption(
-            key: String,
-            default: Array<Float>? = null,
-            values: Map<String, Array<Float>?>? = null,
-            title: String? = null,
-            description: String? = null,
-            required: Boolean = false,
-            validator: PatchOption<Array<Float>?>.(Array<Float>?) -> Boolean = { true },
-        ) = registerNewPatchOption(
-            key,
-            default,
-            values,
-            title,
-            description,
-            required,
-            "FloatArray",
-            validator,
-        )
-
-        /**
-         * Create a new [PatchOption] with a long array value and add it to the current [Patch].
-         *
-         * @param key The identifier.
-         * @param default The default value.
-         * @param values The set of guaranteed valid values.
-         * @param title The title.
-         * @param description A description.
-         * @param required Whether the option is required.
-         * @param validator The function to validate the option value.
-         *
-         * @return The created [PatchOption].
-         *
-         * @see PatchOption
-         */
-        fun <P : Patch<*>> P.longArrayPatchOption(
-            key: String,
-            default: Array<Long>? = null,
-            values: Map<String, Array<Long>?>? = null,
-            title: String? = null,
-            description: String? = null,
-            required: Boolean = false,
-            validator: PatchOption<Array<Long>?>.(Array<Long>?) -> Boolean = { true },
-        ) = registerNewPatchOption(
-            key,
-            default,
-            values,
-            title,
-            description,
-            required,
-            "LongArray",
-            validator,
-        )
-
-        /**
-         * Create a new [PatchOption] with a string set value and add it to the current [Patch].
-         *
-         * @param key The identifier.
-         * @param default The default value.
-         * @param values The set of guaranteed valid values identified by their string representation.
-         * @param title The title.
-         * @param description A description.
-         * @param required Whether the option is required.
-         * @param valueType The type of the option value (to handle type erasure).
-         * @param validator The function to validate the option value.
-         *
-         * @return The created [PatchOption].
-         *
-         * @see PatchOption
-         */
-        fun <P : Patch<*>, T> P.registerNewPatchOption(
-            key: String,
-            default: T? = null,
-            values: Map<String, T?>? = null,
-            title: String? = null,
-            description: String? = null,
-            required: Boolean = false,
-            valueType: String,
-            validator: PatchOption<T>.(T?) -> Boolean = { true },
-        ) = PatchOption(
-            key,
-            default,
-            values,
-            title,
-            description,
-            required,
-            valueType,
-            validator,
-        ).also(options::register)
-    }
-}
--- a/src/main/kotlin/app/revanced/patcher/patch/options/PatchOptionException.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/options/PatchOptionException.kt
@@ -1,41 +0,0 @@
-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<*>) :
-        PatchOptionException("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<*>) :
-        PatchOptionException("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) :
-        PatchOptionException("No option with key $key")
-}
--- a/src/main/kotlin/app/revanced/patcher/patch/options/PatchOptions.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/options/PatchOptions.kt
@@ -1,46 +0,0 @@
-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.
-     */
-    operator fun <T : Any> set(
-        key: String,
-        value: T?,
-    ) {
-        val option = this[key]
-
-        try {
-            @Suppress("UNCHECKED_CAST")
-            (option as PatchOption<T>).value = value
-        } catch (e: ClassCastException) {
-            throw PatchOptionException.InvalidValueTypeException(
-                value?.let { it::class.java.name } ?: "null",
-                option.value?.let { it::class.java.name } ?: "null",
-            )
-        }
-    }
-
-    /**
-     * Get an option.
-     */
-    override operator fun get(key: String) = options[key] ?: throw PatchOptionException.PatchOptionNotFoundException(key)
-}
--- a/src/main/kotlin/app/revanced/patcher/util/ClassMerger.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/ClassMerger.kt
@@ -1,7 +1,6 @@
 package app.revanced.patcher.util

-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.or
+import app.revanced.patcher.patch.BytecodePatchContext
 import app.revanced.patcher.util.ClassMerger.Utils.asMutableClass
 import app.revanced.patcher.util.ClassMerger.Utils.filterAny
 import app.revanced.patcher.util.ClassMerger.Utils.filterNotAny
@@ -36,7 +35,7 @@ internal object ClassMerger {
     */
    fun ClassDef.merge(
        otherClass: ClassDef,
-        context: BytecodeContext,
+        context: BytecodePatchContext,
    ) = this
        // .fixFieldAccess(otherClass)
        // .fixMethodAccess(otherClass)
@@ -95,7 +94,7 @@ internal object ClassMerger {
     */
    private fun ClassDef.publicize(
        reference: ClassDef,
-        context: BytecodeContext,
+        context: BytecodePatchContext,
    ) = if (reference.accessFlags.isPublic() && !accessFlags.isPublic()) {
        this.asMutableClass().apply {
            context.traverseClassHierarchy(this) {
@@ -175,12 +174,12 @@ internal object ClassMerger {
         * @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(
+        fun BytecodePatchContext.traverseClassHierarchy(
            targetClass: MutableClass,
            callback: MutableClass.() -> Unit,
        ) {
            callback(targetClass)
-            this.findClass(targetClass.superclass ?: return)?.mutableClass?.let {
+            this.classByType(targetClass.superclass ?: return)?.mutableClass?.let {
                traverseClassHierarchy(it, callback)
            }
        }
@@ -199,7 +198,7 @@ internal object ClassMerger {
         *
         * @return The new [AccessFlags].
         */
-        fun Int.toPublic() = this.or(AccessFlags.PUBLIC).and(AccessFlags.PRIVATE.value.inv())
+        fun Int.toPublic() = or(AccessFlags.PUBLIC.value).and(AccessFlags.PRIVATE.value.inv())

        /**
         * Filter [this] on [needles] matching the given [predicate].
--- a/src/main/kotlin/app/revanced/patcher/util/DomFileEditor.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/DomFileEditor.kt
@@ -1,25 +0,0 @@
-package app.revanced.patcher.util
-
-import org.w3c.dom.Document
-import java.io.Closeable
-import java.io.File
-import java.io.InputStream
-
-@Deprecated("Use Document instead.")
-class DomFileEditor : Closeable {
-    val file: Document
-    internal constructor(
-        inputStream: InputStream,
-    ) {
-        file = Document(inputStream)
-    }
-
-    constructor(file: File) {
-        this.file = Document(file)
-    }
-
-    override fun close() {
-        file as app.revanced.patcher.util.Document
-        file.close()
-    }
-}
--- a/src/main/kotlin/app/revanced/patcher/util/MethodNavigator.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/MethodNavigator.kt
@@ -0,0 +1,109 @@
+@file:Suppress("unused")
+
+package app.revanced.patcher.util
+
+import app.revanced.patcher.extensions.InstructionExtensions.instructionsOrNull
+import app.revanced.patcher.patch.BytecodePatchContext
+import app.revanced.patcher.util.MethodNavigator.NavigateException
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+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.MethodReference
+import com.android.tools.smali.dexlib2.util.MethodUtil
+
+/**
+ * A navigator for methods.
+ *
+ * @param context The [BytecodePatchContext] to use.
+ * @param startMethod The [Method] to start navigating from.
+ *
+ * @constructor Creates a new [MethodNavigator].
+ *
+ * @throws NavigateException If the method does not have an implementation.
+ * @throws NavigateException If the instruction at the specified index is not a method reference.
+ */
+class MethodNavigator internal constructor(private val context: BytecodePatchContext, private var startMethod: MethodReference) {
+    private var lastNavigatedMethodReference = startMethod
+
+    private val lastNavigatedMethodInstructions get() = with(immutable()) {
+        instructionsOrNull ?: throw NavigateException("Method $definingClass.$name does not have an implementation.")
+    }
+
+    /**
+     * Navigate to the method at the specified index.
+     *
+     * @param index The index of the method to navigate to.
+     *
+     * @return This [MethodNavigator].
+     */
+    fun at(vararg index: Int): MethodNavigator {
+        index.forEach {
+            lastNavigatedMethodReference = lastNavigatedMethodInstructions.getMethodReferenceAt(it)
+        }
+
+        return this
+    }
+
+    /**
+     * Navigate to the method at the specified index that matches the specified predicate.
+     *
+     * @param index The index of the method to navigate to.
+     * @param predicate The predicate to match.
+     */
+    fun at(index: Int = 0, predicate: (Instruction) -> Boolean): MethodNavigator {
+        lastNavigatedMethodReference = lastNavigatedMethodInstructions.asSequence()
+            .filter(predicate).asIterable().getMethodReferenceAt(index)
+
+        return this
+    }
+
+    /**
+     * Get the method reference at the specified index.
+     *
+     * @param index The index of the method reference to get.
+     */
+    private fun Iterable<Instruction>.getMethodReferenceAt(index: Int): MethodReference {
+        val instruction = elementAt(index) as? ReferenceInstruction
+            ?: throw NavigateException("Instruction at index $index is not a method reference.")
+
+        return instruction.reference as MethodReference
+    }
+
+    /**
+     * Get the last navigated method mutably.
+     *
+     * @return The last navigated method mutably.
+     */
+    fun mutable() = context.classBy(matchesCurrentMethodReferenceDefiningClass)!!.mutableClass.firstMethodBySignature
+        as MutableMethod
+
+    /**
+     * Get the last navigated method immutably.
+     *
+     * @return The last navigated method immutably.
+     */
+    fun immutable() = context.classes.first(matchesCurrentMethodReferenceDefiningClass).firstMethodBySignature
+
+    /**
+     * Predicate to match the class defining the current method reference.
+     */
+    private val matchesCurrentMethodReferenceDefiningClass = { classDef: ClassDef ->
+        classDef.type == lastNavigatedMethodReference.definingClass
+    }
+
+    /**
+     * Find the first [lastNavigatedMethodReference] in the class.
+     */
+    private val ClassDef.firstMethodBySignature get() = methods.first {
+        MethodUtil.methodSignaturesMatch(it, lastNavigatedMethodReference)
+    }
+
+    /**
+     * An exception thrown when navigating fails.
+     *
+     * @param message The message of the exception.
+     */
+    internal class NavigateException internal constructor(message: String) : Exception(message)
+}
--- a/src/main/kotlin/app/revanced/patcher/util/ProxyClassList.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/ProxyClassList.kt
@@ -4,23 +4,18 @@ 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.
+ * A list 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)
+class ProxyClassList internal constructor(classes: MutableList<ClassDef>) : MutableList<ClassDef> by classes {
+    internal val proxyPool = mutableListOf<ClassProxy>()

    /**
     * Replace all classes with their mutated versions.
     */
    internal fun replaceClasses() =
-        proxies.removeIf { proxy ->
+        proxyPool.removeIf { proxy ->
            // If the proxy is unused, return false to keep it in the proxies list.
            if (!proxy.resolved) return@removeIf false

--- a/src/main/kotlin/app/revanced/patcher/util/method/MethodWalker.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/method/MethodWalker.kt
@@ -1,60 +0,0 @@
-package app.revanced.patcher.util.method
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-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.
- * @param bytecodeContext The context to use when resolving the next method reference.
- * @param currentMethod The method to start from.
- */
-class MethodWalker internal constructor(
-    private val bytecodeContext: BytecodeContext,
-    private var currentMethod: Method,
-) {
-    /**
-     * Get the method which was walked last.
-     *
-     * It is possible to cast this method to a [MutableMethod], if the method has been walked mutably.
-     *
-     * @return The method which was walked last.
-     */
-    fun getMethod(): Method {
-        return currentMethod
-    }
-
-    /**
-     * Walk to a method defined at the offset in the instruction list of the current method.
-     *
-     * The current method will be mutable.
-     *
-     * @param offset The offset of the instruction. This instruction must be of format 35c.
-     * @param walkMutable If this is true, the class of the method will be resolved mutably.
-     * @return The same [MethodWalker] instance with the method at [offset].
-     */
-    fun nextMethod(
-        offset: Int,
-        walkMutable: Boolean = false,
-    ): MethodWalker {
-        currentMethod.implementation?.instructions?.let { instructions ->
-            val instruction = instructions.elementAt(offset)
-
-            val newMethod = (instruction as ReferenceInstruction).reference as MethodReference
-            val proxy = bytecodeContext.findClass(newMethod.definingClass)!!
-
-            val methods = if (walkMutable) proxy.mutableClass.methods else proxy.immutableClass.methods
-            currentMethod =
-                methods.first {
-                    return@first MethodUtil.methodSignaturesMatch(it, newMethod)
-                }
-            return this
-        }
-        throw MethodNotFoundException("This method can not be walked at offset $offset inside the method ${currentMethod.name}")
-    }
-
-    internal class MethodNotFoundException(exception: String) : Exception(exception)
-}
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/ClassProxy.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/ClassProxy.kt
@@ -8,6 +8,7 @@ import com.android.tools.smali.dexlib2.iface.ClassDef
 *
 * A class proxy simply holds a reference to the original class
 * and allocates a mutable clone for the original class if needed.
+ *
 * @param immutableClass The class to proxy.
 */
 class ClassProxy internal constructor(
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation.kt
@@ -9,21 +9,13 @@ class MutableAnnotation(annotation: Annotation) : BaseAnnotation() {
    private val type = annotation.type
    private val _elements by lazy { annotation.elements.map { element -> element.toMutable() }.toMutableSet() }

-    override fun getType(): String {
-        return type
-    }
+    override fun getType(): String = type

-    override fun getElements(): MutableSet<MutableAnnotationElement> {
-        return _elements
-    }
+    override fun getElements(): MutableSet<MutableAnnotationElement> = _elements

-    override fun getVisibility(): Int {
-        return visibility
-    }
+    override fun getVisibility(): Int = visibility

    companion object {
-        fun Annotation.toMutable(): MutableAnnotation {
-            return MutableAnnotation(this)
-        }
+        fun Annotation.toMutable(): MutableAnnotation = MutableAnnotation(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement.kt
@@ -18,17 +18,11 @@ class MutableAnnotationElement(annotationElement: AnnotationElement) : BaseAnnot
        this.value = value
    }

-    override fun getName(): String {
-        return name
-    }
+    override fun getName(): String = name

-    override fun getValue(): EncodedValue {
-        return value
-    }
+    override fun getValue(): EncodedValue = value

    companion object {
-        fun AnnotationElement.toMutable(): MutableAnnotationElement {
-            return MutableAnnotationElement(this)
-        }
+        fun AnnotationElement.toMutable(): MutableAnnotationElement = MutableAnnotationElement(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableClass.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableClass.kt
@@ -7,9 +7,10 @@ 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
-import com.google.common.collect.Iterables

-class MutableClass(classDef: ClassDef) : ClassDef, BaseTypeReference() {
+class MutableClass(classDef: ClassDef) :
+    BaseTypeReference(),
+    ClassDef {
    // Class
    private var type = classDef.type
    private var sourceFile = classDef.sourceFile
@@ -23,13 +24,13 @@ class MutableClass(classDef: ClassDef) : ClassDef, BaseTypeReference() {

    // Methods
    private val _methods by lazy { classDef.methods.map { method -> method.toMutable() }.toMutableSet() }
-    private val _directMethods by lazy { Iterables.filter(_methods, MethodUtil.METHOD_IS_DIRECT).toMutableSet() }
-    private val _virtualMethods by lazy { Iterables.filter(_methods, MethodUtil.METHOD_IS_VIRTUAL).toMutableSet() }
+    private val _directMethods by lazy { _methods.filter { method -> MethodUtil.isDirect(method) }.toMutableSet() }
+    private val _virtualMethods by lazy { _methods.filter { method -> !MethodUtil.isDirect(method) }.toMutableSet() }

    // Fields
    private val _fields by lazy { classDef.fields.map { field -> field.toMutable() }.toMutableSet() }
-    private val _staticFields by lazy { Iterables.filter(_fields, FieldUtil.FIELD_IS_STATIC).toMutableSet() }
-    private val _instanceFields by lazy { Iterables.filter(_fields, FieldUtil.FIELD_IS_INSTANCE).toMutableSet() }
+    private val _staticFields by lazy { _fields.filter { field -> FieldUtil.isStatic(field) }.toMutableSet() }
+    private val _instanceFields by lazy { _fields.filter { field -> !FieldUtil.isStatic(field) }.toMutableSet() }

    fun setType(type: String) {
        this.type = type
@@ -47,57 +48,31 @@ class MutableClass(classDef: ClassDef) : ClassDef, BaseTypeReference() {
        this.superclass = superclass
    }

-    override fun getType(): String {
-        return type
-    }
+    override fun getType(): String = type

-    override fun getAccessFlags(): Int {
-        return accessFlags
-    }
+    override fun getAccessFlags(): Int = accessFlags

-    override fun getSourceFile(): String? {
-        return sourceFile
-    }
+    override fun getSourceFile(): String? = sourceFile

-    override fun getSuperclass(): String? {
-        return superclass
-    }
+    override fun getSuperclass(): String? = superclass

-    override fun getInterfaces(): MutableList<String> {
-        return _interfaces
-    }
+    override fun getInterfaces(): MutableList<String> = _interfaces

-    override fun getAnnotations(): MutableSet<MutableAnnotation> {
-        return _annotations
-    }
+    override fun getAnnotations(): MutableSet<MutableAnnotation> = _annotations

-    override fun getStaticFields(): MutableSet<MutableField> {
-        return _staticFields
-    }
+    override fun getStaticFields(): MutableSet<MutableField> = _staticFields

-    override fun getInstanceFields(): MutableSet<MutableField> {
-        return _instanceFields
-    }
+    override fun getInstanceFields(): MutableSet<MutableField> = _instanceFields

-    override fun getFields(): MutableSet<MutableField> {
-        return _fields
-    }
+    override fun getFields(): MutableSet<MutableField> = _fields

-    override fun getDirectMethods(): MutableSet<MutableMethod> {
-        return _directMethods
-    }
+    override fun getDirectMethods(): MutableSet<MutableMethod> = _directMethods

-    override fun getVirtualMethods(): MutableSet<MutableMethod> {
-        return _virtualMethods
-    }
+    override fun getVirtualMethods(): MutableSet<MutableMethod> = _virtualMethods

-    override fun getMethods(): MutableSet<MutableMethod> {
-        return _methods
-    }
+    override fun getMethods(): MutableSet<MutableMethod> = _methods

    companion object {
-        fun ClassDef.toMutable(): MutableClass {
-            return MutableClass(this)
-        }
+        fun ClassDef.toMutable(): MutableClass = MutableClass(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableField.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableField.kt
@@ -7,7 +7,9 @@ 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() {
+class MutableField(field: Field) :
+    BaseFieldReference(),
+    Field {
    private var definingClass = field.definingClass
    private var name = field.name
    private var type = field.type
@@ -37,37 +39,21 @@ class MutableField(field: Field) : Field, BaseFieldReference() {
        this.initialValue = initialValue
    }

-    override fun getDefiningClass(): String {
-        return this.definingClass
-    }
+    override fun getDefiningClass(): String = this.definingClass

-    override fun getName(): String {
-        return this.name
-    }
+    override fun getName(): String = this.name

-    override fun getType(): String {
-        return this.type
-    }
+    override fun getType(): String = this.type

-    override fun getAnnotations(): MutableSet<MutableAnnotation> {
-        return this._annotations
-    }
+    override fun getAnnotations(): MutableSet<MutableAnnotation> = this._annotations

-    override fun getAccessFlags(): Int {
-        return this.accessFlags
-    }
+    override fun getAccessFlags(): Int = this.accessFlags

-    override fun getHiddenApiRestrictions(): MutableSet<HiddenApiRestriction> {
-        return this._hiddenApiRestrictions
-    }
+    override fun getHiddenApiRestrictions(): MutableSet<HiddenApiRestriction> = this._hiddenApiRestrictions

-    override fun getInitialValue(): MutableEncodedValue? {
-        return this.initialValue
-    }
+    override fun getInitialValue(): MutableEncodedValue? = this.initialValue

    companion object {
-        fun Field.toMutable(): MutableField {
-            return MutableField(this)
-        }
+        fun Field.toMutable(): MutableField = MutableField(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethod.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethod.kt
@@ -7,7 +7,9 @@ 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() {
+class MutableMethod(method: Method) :
+    BaseMethodReference(),
+    Method {
    private var definingClass = method.definingClass
    private var name = method.name
    private var accessFlags = method.accessFlags
@@ -36,45 +38,25 @@ class MutableMethod(method: Method) : Method, BaseMethodReference() {
        this.returnType = returnType
    }

-    override fun getDefiningClass(): String {
-        return definingClass
-    }
+    override fun getDefiningClass(): String = definingClass

-    override fun getName(): String {
-        return name
-    }
+    override fun getName(): String = name

-    override fun getParameterTypes(): MutableList<CharSequence> {
-        return _parameterTypes
-    }
+    override fun getParameterTypes(): MutableList<CharSequence> = _parameterTypes

-    override fun getReturnType(): String {
-        return returnType
-    }
+    override fun getReturnType(): String = returnType

-    override fun getAnnotations(): MutableSet<MutableAnnotation> {
-        return _annotations
-    }
+    override fun getAnnotations(): MutableSet<MutableAnnotation> = _annotations

-    override fun getAccessFlags(): Int {
-        return accessFlags
-    }
+    override fun getAccessFlags(): Int = accessFlags

-    override fun getHiddenApiRestrictions(): MutableSet<HiddenApiRestriction> {
-        return _hiddenApiRestrictions
-    }
+    override fun getHiddenApiRestrictions(): MutableSet<HiddenApiRestriction> = _hiddenApiRestrictions

-    override fun getParameters(): MutableList<MutableMethodParameter> {
-        return _parameters
-    }
+    override fun getParameters(): MutableList<MutableMethodParameter> = _parameters

-    override fun getImplementation(): MutableMethodImplementation? {
-        return _implementation
-    }
+    override fun getImplementation(): MutableMethodImplementation? = _implementation

    companion object {
-        fun Method.toMutable(): MutableMethod {
-            return MutableMethod(this)
-        }
+        fun Method.toMutable(): MutableMethod = MutableMethod(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter.kt
@@ -5,7 +5,9 @@ import com.android.tools.smali.dexlib2.base.BaseMethodParameter
 import com.android.tools.smali.dexlib2.iface.MethodParameter

 // TODO: finish overriding all members if necessary
-class MutableMethodParameter(parameter: MethodParameter) : MethodParameter, BaseMethodParameter() {
+class MutableMethodParameter(parameter: MethodParameter) :
+    BaseMethodParameter(),
+    MethodParameter {
    private var type = parameter.type
    private var name = parameter.name
    private var signature = parameter.signature
@@ -13,25 +15,15 @@ class MutableMethodParameter(parameter: MethodParameter) : MethodParameter, Base
        parameter.annotations.map { annotation -> annotation.toMutable() }.toMutableSet()
    }

-    override fun getType(): String {
-        return type
-    }
+    override fun getType(): String = type

-    override fun getName(): String? {
-        return name
-    }
+    override fun getName(): String? = name

-    override fun getSignature(): String? {
-        return signature
-    }
+    override fun getSignature(): String? = signature

-    override fun getAnnotations(): MutableSet<MutableAnnotation> {
-        return _annotations
-    }
+    override fun getAnnotations(): MutableSet<MutableAnnotation> = _annotations

    companion object {
-        fun MethodParameter.toMutable(): MutableMethodParameter {
-            return MutableMethodParameter(this)
-        }
+        fun MethodParameter.toMutable(): MutableMethodParameter = MutableMethodParameter(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue.kt
@@ -14,21 +14,15 @@ class MutableAnnotationEncodedValue(annotationEncodedValue: AnnotationEncodedVal
        annotationEncodedValue.elements.map { annotationElement -> annotationElement.toMutable() }.toMutableSet()
    }

-    override fun getType(): String {
-        return this.type
-    }
+    override fun getType(): String = this.type

    fun setType(type: String) {
        this.type = type
    }

-    override fun getElements(): MutableSet<out AnnotationElement> {
-        return _elements
-    }
+    override fun getElements(): MutableSet<out AnnotationElement> = _elements

    companion object {
-        fun AnnotationEncodedValue.toMutable(): MutableAnnotationEncodedValue {
-            return MutableAnnotationEncodedValue(this)
-        }
+        fun AnnotationEncodedValue.toMutable(): MutableAnnotationEncodedValue = MutableAnnotationEncodedValue(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue.kt
@@ -5,18 +5,16 @@ 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 {
+class MutableArrayEncodedValue(arrayEncodedValue: ArrayEncodedValue) :
+    BaseArrayEncodedValue(),
+    MutableEncodedValue {
    private val _value by lazy {
        arrayEncodedValue.value.map { encodedValue -> encodedValue.toMutable() }.toMutableList()
    }

-    override fun getValue(): MutableList<out EncodedValue> {
-        return _value
-    }
+    override fun getValue(): MutableList<out EncodedValue> = _value

    companion object {
-        fun ArrayEncodedValue.toMutable(): MutableArrayEncodedValue {
-            return MutableArrayEncodedValue(this)
-        }
+        fun ArrayEncodedValue.toMutable(): MutableArrayEncodedValue = MutableArrayEncodedValue(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue.kt
@@ -8,17 +8,13 @@ class MutableBooleanEncodedValue(booleanEncodedValue: BooleanEncodedValue) :
    MutableEncodedValue {
    private var value = booleanEncodedValue.value

-    override fun getValue(): Boolean {
-        return this.value
-    }
+    override fun getValue(): Boolean = this.value

    fun setValue(value: Boolean) {
        this.value = value
    }

    companion object {
-        fun BooleanEncodedValue.toMutable(): MutableBooleanEncodedValue {
-            return MutableBooleanEncodedValue(this)
-        }
+        fun BooleanEncodedValue.toMutable(): MutableBooleanEncodedValue = MutableBooleanEncodedValue(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue.kt
@@ -3,20 +3,18 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 import com.android.tools.smali.dexlib2.base.value.BaseByteEncodedValue
 import com.android.tools.smali.dexlib2.iface.value.ByteEncodedValue

-class MutableByteEncodedValue(byteEncodedValue: ByteEncodedValue) : BaseByteEncodedValue(), MutableEncodedValue {
+class MutableByteEncodedValue(byteEncodedValue: ByteEncodedValue) :
+    BaseByteEncodedValue(),
+    MutableEncodedValue {
    private var value = byteEncodedValue.value

-    override fun getValue(): Byte {
-        return this.value
-    }
+    override fun getValue(): Byte = this.value

    fun setValue(value: Byte) {
        this.value = value
    }

    companion object {
-        fun ByteEncodedValue.toMutable(): MutableByteEncodedValue {
-            return MutableByteEncodedValue(this)
-        }
+        fun ByteEncodedValue.toMutable(): MutableByteEncodedValue = MutableByteEncodedValue(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue.kt
@@ -3,20 +3,18 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 import com.android.tools.smali.dexlib2.base.value.BaseCharEncodedValue
 import com.android.tools.smali.dexlib2.iface.value.CharEncodedValue

-class MutableCharEncodedValue(charEncodedValue: CharEncodedValue) : BaseCharEncodedValue(), MutableEncodedValue {
+class MutableCharEncodedValue(charEncodedValue: CharEncodedValue) :
+    BaseCharEncodedValue(),
+    MutableEncodedValue {
    private var value = charEncodedValue.value

-    override fun getValue(): Char {
-        return this.value
-    }
+    override fun getValue(): Char = this.value

    fun setValue(value: Char) {
        this.value = value
    }

    companion object {
-        fun CharEncodedValue.toMutable(): MutableCharEncodedValue {
-            return MutableCharEncodedValue(this)
-        }
+        fun CharEncodedValue.toMutable(): MutableCharEncodedValue = MutableCharEncodedValue(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue.kt
@@ -8,17 +8,13 @@ class MutableDoubleEncodedValue(doubleEncodedValue: DoubleEncodedValue) :
    MutableEncodedValue {
    private var value = doubleEncodedValue.value

-    override fun getValue(): Double {
-        return this.value
-    }
+    override fun getValue(): Double = this.value

    fun setValue(value: Double) {
        this.value = value
    }

    companion object {
-        fun DoubleEncodedValue.toMutable(): MutableDoubleEncodedValue {
-            return MutableDoubleEncodedValue(this)
-        }
+        fun DoubleEncodedValue.toMutable(): MutableDoubleEncodedValue = MutableDoubleEncodedValue(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEnumEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEnumEncodedValue.kt
@@ -4,20 +4,18 @@ import com.android.tools.smali.dexlib2.base.value.BaseEnumEncodedValue
 import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 import com.android.tools.smali.dexlib2.iface.value.EnumEncodedValue

-class MutableEnumEncodedValue(enumEncodedValue: EnumEncodedValue) : BaseEnumEncodedValue(), MutableEncodedValue {
+class MutableEnumEncodedValue(enumEncodedValue: EnumEncodedValue) :
+    BaseEnumEncodedValue(),
+    MutableEncodedValue {
    private var value = enumEncodedValue.value

-    override fun getValue(): FieldReference {
-        return this.value
-    }
+    override fun getValue(): FieldReference = this.value

    fun setValue(value: FieldReference) {
        this.value = value
    }

    companion object {
-        fun EnumEncodedValue.toMutable(): MutableEnumEncodedValue {
-            return MutableEnumEncodedValue(this)
-        }
+        fun EnumEncodedValue.toMutable(): MutableEnumEncodedValue = MutableEnumEncodedValue(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFieldEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFieldEncodedValue.kt
@@ -5,24 +5,20 @@ import com.android.tools.smali.dexlib2.base.value.BaseFieldEncodedValue
 import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 import com.android.tools.smali.dexlib2.iface.value.FieldEncodedValue

-class MutableFieldEncodedValue(fieldEncodedValue: FieldEncodedValue) : BaseFieldEncodedValue(), MutableEncodedValue {
+class MutableFieldEncodedValue(fieldEncodedValue: FieldEncodedValue) :
+    BaseFieldEncodedValue(),
+    MutableEncodedValue {
    private var value = fieldEncodedValue.value

-    override fun getValueType(): Int {
-        return ValueType.FIELD
-    }
+    override fun getValueType(): Int = ValueType.FIELD

-    override fun getValue(): FieldReference {
-        return this.value
-    }
+    override fun getValue(): FieldReference = this.value

    fun setValue(value: FieldReference) {
        this.value = value
    }

    companion object {
-        fun FieldEncodedValue.toMutable(): MutableFieldEncodedValue {
-            return MutableFieldEncodedValue(this)
-        }
+        fun FieldEncodedValue.toMutable(): MutableFieldEncodedValue = MutableFieldEncodedValue(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFloatEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFloatEncodedValue.kt
@@ -3,20 +3,18 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 import com.android.tools.smali.dexlib2.base.value.BaseFloatEncodedValue
 import com.android.tools.smali.dexlib2.iface.value.FloatEncodedValue

-class MutableFloatEncodedValue(floatEncodedValue: FloatEncodedValue) : BaseFloatEncodedValue(), MutableEncodedValue {
+class MutableFloatEncodedValue(floatEncodedValue: FloatEncodedValue) :
+    BaseFloatEncodedValue(),
+    MutableEncodedValue {
    private var value = floatEncodedValue.value

-    override fun getValue(): Float {
-        return this.value
-    }
+    override fun getValue(): Float = this.value

    fun setValue(value: Float) {
        this.value = value
    }

    companion object {
-        fun FloatEncodedValue.toMutable(): MutableFloatEncodedValue {
-            return MutableFloatEncodedValue(this)
-        }
+        fun FloatEncodedValue.toMutable(): MutableFloatEncodedValue = MutableFloatEncodedValue(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableIntEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableIntEncodedValue.kt
@@ -3,20 +3,18 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 import com.android.tools.smali.dexlib2.base.value.BaseIntEncodedValue
 import com.android.tools.smali.dexlib2.iface.value.IntEncodedValue

-class MutableIntEncodedValue(intEncodedValue: IntEncodedValue) : BaseIntEncodedValue(), MutableEncodedValue {
+class MutableIntEncodedValue(intEncodedValue: IntEncodedValue) :
+    BaseIntEncodedValue(),
+    MutableEncodedValue {
    private var value = intEncodedValue.value

-    override fun getValue(): Int {
-        return this.value
-    }
+    override fun getValue(): Int = this.value

    fun setValue(value: Int) {
        this.value = value
    }

    companion object {
-        fun IntEncodedValue.toMutable(): MutableIntEncodedValue {
-            return MutableIntEncodedValue(this)
-        }
+        fun IntEncodedValue.toMutable(): MutableIntEncodedValue = MutableIntEncodedValue(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableLongEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableLongEncodedValue.kt
@@ -3,20 +3,18 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 import com.android.tools.smali.dexlib2.base.value.BaseLongEncodedValue
 import com.android.tools.smali.dexlib2.iface.value.LongEncodedValue

-class MutableLongEncodedValue(longEncodedValue: LongEncodedValue) : BaseLongEncodedValue(), MutableEncodedValue {
+class MutableLongEncodedValue(longEncodedValue: LongEncodedValue) :
+    BaseLongEncodedValue(),
+    MutableEncodedValue {
    private var value = longEncodedValue.value

-    override fun getValue(): Long {
-        return this.value
-    }
+    override fun getValue(): Long = this.value

    fun setValue(value: Long) {
        this.value = value
    }

    companion object {
-        fun LongEncodedValue.toMutable(): MutableLongEncodedValue {
-            return MutableLongEncodedValue(this)
-        }
+        fun LongEncodedValue.toMutable(): MutableLongEncodedValue = MutableLongEncodedValue(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodEncodedValue.kt
@@ -9,17 +9,13 @@ class MutableMethodEncodedValue(methodEncodedValue: MethodEncodedValue) :
    MutableEncodedValue {
    private var value = methodEncodedValue.value

-    override fun getValue(): MethodReference {
-        return this.value
-    }
+    override fun getValue(): MethodReference = this.value

    fun setValue(value: MethodReference) {
        this.value = value
    }

    companion object {
-        fun MethodEncodedValue.toMutable(): MutableMethodEncodedValue {
-            return MutableMethodEncodedValue(this)
-        }
+        fun MethodEncodedValue.toMutable(): MutableMethodEncodedValue = MutableMethodEncodedValue(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodHandleEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodHandleEncodedValue.kt
@@ -9,17 +9,13 @@ class MutableMethodHandleEncodedValue(methodHandleEncodedValue: MethodHandleEnco
    MutableEncodedValue {
    private var value = methodHandleEncodedValue.value

-    override fun getValue(): MethodHandleReference {
-        return this.value
-    }
+    override fun getValue(): MethodHandleReference = this.value

    fun setValue(value: MethodHandleReference) {
        this.value = value
    }

    companion object {
-        fun MethodHandleEncodedValue.toMutable(): MutableMethodHandleEncodedValue {
-            return MutableMethodHandleEncodedValue(this)
-        }
+        fun MethodHandleEncodedValue.toMutable(): MutableMethodHandleEncodedValue = MutableMethodHandleEncodedValue(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodTypeEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodTypeEncodedValue.kt
@@ -9,17 +9,13 @@ class MutableMethodTypeEncodedValue(methodTypeEncodedValue: MethodTypeEncodedVal
    MutableEncodedValue {
    private var value = methodTypeEncodedValue.value

-    override fun getValue(): MethodProtoReference {
-        return this.value
-    }
+    override fun getValue(): MethodProtoReference = this.value

    fun setValue(value: MethodProtoReference) {
        this.value = value
    }

    companion object {
-        fun MethodTypeEncodedValue.toMutable(): MutableMethodTypeEncodedValue {
-            return MutableMethodTypeEncodedValue(this)
-        }
+        fun MethodTypeEncodedValue.toMutable(): MutableMethodTypeEncodedValue = MutableMethodTypeEncodedValue(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableNullEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableNullEncodedValue.kt
@@ -3,10 +3,10 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 import com.android.tools.smali.dexlib2.base.value.BaseNullEncodedValue
 import com.android.tools.smali.dexlib2.iface.value.ByteEncodedValue

-class MutableNullEncodedValue : BaseNullEncodedValue(), MutableEncodedValue {
+class MutableNullEncodedValue :
+    BaseNullEncodedValue(),
+    MutableEncodedValue {
    companion object {
-        fun ByteEncodedValue.toMutable(): MutableByteEncodedValue {
-            return MutableByteEncodedValue(this)
-        }
+        fun ByteEncodedValue.toMutable(): MutableByteEncodedValue = MutableByteEncodedValue(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableShortEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableShortEncodedValue.kt
@@ -3,20 +3,18 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 import com.android.tools.smali.dexlib2.base.value.BaseShortEncodedValue
 import com.android.tools.smali.dexlib2.iface.value.ShortEncodedValue

-class MutableShortEncodedValue(shortEncodedValue: ShortEncodedValue) : BaseShortEncodedValue(), MutableEncodedValue {
+class MutableShortEncodedValue(shortEncodedValue: ShortEncodedValue) :
+    BaseShortEncodedValue(),
+    MutableEncodedValue {
    private var value = shortEncodedValue.value

-    override fun getValue(): Short {
-        return this.value
-    }
+    override fun getValue(): Short = this.value

    fun setValue(value: Short) {
        this.value = value
    }

    companion object {
-        fun ShortEncodedValue.toMutable(): MutableShortEncodedValue {
-            return MutableShortEncodedValue(this)
-        }
+        fun ShortEncodedValue.toMutable(): MutableShortEncodedValue = MutableShortEncodedValue(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableStringEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableStringEncodedValue.kt
@@ -9,17 +9,13 @@ class MutableStringEncodedValue(stringEncodedValue: StringEncodedValue) :
    MutableEncodedValue {
    private var value = stringEncodedValue.value

-    override fun getValue(): String {
-        return this.value
-    }
+    override fun getValue(): String = this.value

    fun setValue(value: String) {
        this.value = value
    }

    companion object {
-        fun ByteEncodedValue.toMutable(): MutableByteEncodedValue {
-            return MutableByteEncodedValue(this)
-        }
+        fun ByteEncodedValue.toMutable(): MutableByteEncodedValue = MutableByteEncodedValue(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableTypeEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableTypeEncodedValue.kt
@@ -3,20 +3,18 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 import com.android.tools.smali.dexlib2.base.value.BaseTypeEncodedValue
 import com.android.tools.smali.dexlib2.iface.value.TypeEncodedValue

-class MutableTypeEncodedValue(typeEncodedValue: TypeEncodedValue) : BaseTypeEncodedValue(), MutableEncodedValue {
+class MutableTypeEncodedValue(typeEncodedValue: TypeEncodedValue) :
+    BaseTypeEncodedValue(),
+    MutableEncodedValue {
    private var value = typeEncodedValue.value

-    override fun getValue(): String {
-        return this.value
-    }
+    override fun getValue(): String = this.value

    fun setValue(value: String) {
        this.value = value
    }

    companion object {
-        fun TypeEncodedValue.toMutable(): MutableTypeEncodedValue {
-            return MutableTypeEncodedValue(this)
-        }
+        fun TypeEncodedValue.toMutable(): MutableTypeEncodedValue = MutableTypeEncodedValue(this)
    }
 }
--- a/src/main/kotlin/app/revanced/patcher/util/smali/InlineSmaliCompiler.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/smali/InlineSmaliCompiler.kt
@@ -1,5 +1,6 @@
 package app.revanced.patcher.util.smali

+import app.revanced.patcher.extensions.InstructionExtensions.instructions
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcodes
@@ -13,7 +14,7 @@ import org.antlr.runtime.CommonTokenStream
 import org.antlr.runtime.TokenSource
 import org.antlr.runtime.tree.CommonTreeNodeStream
 import java.io.InputStreamReader
-import java.util.Locale
+import java.util.*

 private const val METHOD_TEMPLATE = """
    .class LInlineCompiler;
@@ -64,7 +65,7 @@ class InlineSmaliCompiler {
            val dexGen = smaliTreeWalker(treeStream)
            dexGen.setDexBuilder(DexBuilder(Opcodes.getDefault()))
            val classDef = dexGen.smali_file()
-            return classDef.methods.first().implementation!!.instructions.map { it as BuilderInstruction }
+            return classDef.methods.first().instructions.map { it as BuilderInstruction }
        }
    }
 }
--- a/src/test/kotlin/app/revanced/patcher/PatcherTest.kt
+++ b/src/test/kotlin/app/revanced/patcher/PatcherTest.kt
@@ -0,0 +1,237 @@
+package app.revanced.patcher
+
+import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.BytecodePatchContext.LookupMaps
+import app.revanced.patcher.util.ProxyClassList
+import com.android.tools.smali.dexlib2.immutable.ImmutableClassDef
+import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.flow.toList
+import kotlinx.coroutines.runBlocking
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.assertDoesNotThrow
+import java.util.logging.Logger
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+internal object PatcherTest {
+    private lateinit var patcher: Patcher
+
+    @BeforeEach
+    fun setUp() {
+        patcher = mockk<Patcher> {
+            // Can't mock private fields, until https://github.com/mockk/mockk/issues/1244 is resolved.
+            setPrivateField(
+                "config",
+                mockk<PatcherConfig> {
+                    every { resourceMode } returns ResourcePatchContext.ResourceMode.NONE
+                },
+            )
+            setPrivateField(
+                "logger",
+                Logger.getAnonymousLogger(),
+            )
+
+            every { context.bytecodeContext.classes } returns mockk(relaxed = true)
+            every { this@mockk() } answers { callOriginal() }
+        }
+    }
+
+    @Test
+    fun `executes patches in correct order`() {
+        val executed = mutableListOf<String>()
+
+        val patches = setOf(
+            bytecodePatch { execute { executed += "1" } },
+            bytecodePatch {
+                dependsOn(
+                    bytecodePatch {
+                        execute { executed += "2" }
+                        finalize { executed += "-2" }
+                    },
+                    bytecodePatch { execute { executed += "3" } },
+                )
+
+                execute { executed += "4" }
+                finalize { executed += "-1" }
+            },
+        )
+
+        assert(executed.isEmpty())
+
+        patches()
+
+        assertEquals(
+            listOf("1", "2", "3", "4", "-1", "-2"),
+            executed,
+            "Expected patches to be executed in correct order.",
+        )
+    }
+
+    @Test
+    fun `handles execution of patches correctly when exceptions occur`() {
+        val executed = mutableListOf<String>()
+
+        infix fun Patch<*>.produces(equals: List<String>) {
+            val patches = setOf(this)
+
+            patches()
+
+            assertEquals(equals, executed, "Expected patches to be executed in correct order.")
+
+            executed.clear()
+        }
+
+        // No patches execute successfully,
+        // because the dependency patch throws an exception inside the execute block.
+        bytecodePatch {
+            dependsOn(
+                bytecodePatch {
+                    execute { throw PatchException("1") }
+                    finalize { executed += "-2" }
+                },
+            )
+
+            execute { executed += "2" }
+            finalize { executed += "-1" }
+        } produces emptyList()
+
+        // The dependency patch is executed successfully,
+        // because only the dependant patch throws an exception inside the finalize block.
+        // Patches that depend on a failed patch should not be executed,
+        // but patches that are depended on by a failed patch should be executed.
+        bytecodePatch {
+            dependsOn(
+                bytecodePatch {
+                    execute { executed += "1" }
+                    finalize { executed += "-2" }
+                },
+            )
+
+            execute { throw PatchException("2") }
+            finalize { executed += "-1" }
+        } produces listOf("1", "-2")
+
+        // Because the finalize block of the dependency patch is executed after the finalize block of the dependant patch,
+        // the dependant patch executes successfully, but the dependency patch raises an exception in the finalize block.
+        bytecodePatch {
+            dependsOn(
+                bytecodePatch {
+                    execute { executed += "1" }
+                    finalize { throw PatchException("-2") }
+                },
+            )
+
+            execute { executed += "2" }
+            finalize { executed += "-1" }
+        } produces listOf("1", "2", "-1")
+
+        // The dependency patch is executed successfully,
+        // because the dependant patch raises an exception in the finalize block.
+        // Patches that depend on a failed patch should not be executed,
+        // but patches that are depended on by a failed patch should be executed.
+        bytecodePatch {
+            dependsOn(
+                bytecodePatch {
+                    execute { executed += "1" }
+                    finalize { executed += "-2" }
+                },
+            )
+
+            execute { executed += "2" }
+            finalize { throw PatchException("-1") }
+        } produces listOf("1", "2", "-2")
+    }
+
+    @Test
+    fun `throws if unmatched fingerprint match is delegated`() {
+        val patch = bytecodePatch {
+            // Fingerprint can never match.
+            val match by fingerprint { }
+            // Manually add the fingerprint.
+            app.revanced.patcher.fingerprint { }()
+
+            execute {
+                // Throws, because the fingerprint can't be matched.
+                match.patternMatch
+            }
+        }
+
+        assertEquals(2, patch.fingerprints.size)
+
+        assertTrue(
+            patch().exception != null,
+            "Expected an exception because the fingerprint can't match.",
+        )
+    }
+
+    @Test
+    fun `matches fingerprint`() {
+        mockClassWithMethod()
+
+        val patches = setOf(bytecodePatch { fingerprint { this returns "V" } })
+
+        assertNull(
+            patches.first().fingerprints.first().match,
+            "Expected fingerprint to be matched before execution.",
+        )
+
+        patches()
+
+        assertDoesNotThrow("Expected fingerprint to be matched.") {
+            assertEquals(
+                "V",
+                patches.first().fingerprints.first().match!!.method.returnType,
+                "Expected fingerprint to be matched.",
+            )
+        }
+    }
+
+    private operator fun Set<Patch<*>>.invoke(): List<PatchResult> {
+        every { patcher.context.executablePatches } returns toMutableSet()
+        every { patcher.context.bytecodeContext.lookupMaps } returns LookupMaps(patcher.context.bytecodeContext.classes)
+
+        return runBlocking { patcher().toList() }
+    }
+
+    private operator fun Patch<*>.invoke() = setOf(this)().first()
+
+    private fun Any.setPrivateField(field: String, value: Any) {
+        this::class.java.getDeclaredField(field).apply {
+            this.isAccessible = true
+            set(this@setPrivateField, value)
+        }
+    }
+
+    private fun mockClassWithMethod() {
+        every { patcher.context.bytecodeContext.classes } returns ProxyClassList(
+            mutableListOf(
+                ImmutableClassDef(
+                    "class",
+                    0,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    listOf(
+                        ImmutableMethod(
+                            "class",
+                            "method",
+                            emptyList(),
+                            "V",
+                            0,
+                            null,
+                            null,
+                            null,
+                        ),
+                    ),
+                ),
+            ),
+        )
+        every { patcher.context.bytecodeContext.lookupMaps } returns LookupMaps(patcher.context.bytecodeContext.classes)
+    }
+}
--- a/src/test/kotlin/app/revanced/patcher/extensions/AnnotationExtensionsTest.kt
+++ b/src/test/kotlin/app/revanced/patcher/extensions/AnnotationExtensionsTest.kt
@@ -1,50 +0,0 @@
-package app.revanced.patcher.extensions
-
-import app.revanced.patcher.extensions.AnnotationExtensions.findAnnotationRecursively
-import kotlin.test.Test
-import kotlin.test.assertNotNull
-import kotlin.test.assertNull
-
-private object AnnotationExtensionsTest {
-    @Test
-    fun `find annotation in annotated class`() {
-        assertNotNull(TestClasses.Annotation2::class.findAnnotationRecursively(TestClasses.Annotation::class))
-    }
-
-    @Test
-    fun `find annotation`() {
-        assertNotNull(TestClasses.AnnotatedClass::class.findAnnotationRecursively(TestClasses.Annotation::class))
-    }
-
-    @Test
-    fun `find annotation recursively in super class`() {
-        assertNotNull(TestClasses.AnnotatedClass2::class.findAnnotationRecursively(TestClasses.Annotation::class))
-    }
-
-    @Test
-    fun `find annotation recursively in super class with annotation`() {
-        assertNotNull(TestClasses.AnnotatedTestClass3::class.findAnnotationRecursively(TestClasses.Annotation::class))
-    }
-
-    @Test
-    fun `don't find unknown annotation in annotated class`() {
-        assertNull(TestClasses.AnnotatedClass::class.findAnnotationRecursively(TestClasses.UnknownAnnotation::class))
-    }
-
-    object TestClasses {
-        annotation class Annotation
-
-        @Annotation
-        annotation class Annotation2
-
-        annotation class UnknownAnnotation
-
-        @Annotation
-        abstract class AnnotatedClass
-
-        @Annotation2
-        class AnnotatedTestClass3
-
-        abstract class AnnotatedClass2 : AnnotatedClass()
-    }
-}
--- a/src/test/kotlin/app/revanced/patcher/patch/PatchInitializationTest.kt
+++ b/src/test/kotlin/app/revanced/patcher/patch/PatchInitializationTest.kt
@@ -1,28 +0,0 @@
-package app.revanced.patcher.patch
-
-import app.revanced.patcher.data.ResourceContext
-import kotlin.test.Test
-import app.revanced.patcher.patch.annotation.Patch as PatchAnnotation
-
-object PatchInitializationTest {
-    @Test
-    fun `initialize using constructor`() {
-        val patch =
-            object : RawResourcePatch(name = "Resource patch test") {
-                override fun execute(context: ResourceContext) {}
-            }
-
-        assert(patch.name == "Resource patch test")
-    }
-
-    @Test
-    fun `initialize using annotation`() {
-        val patch =
-            @PatchAnnotation("Resource patch test")
-            object : RawResourcePatch() {
-                override fun execute(context: ResourceContext) {}
-            }
-
-        assert(patch.name == "Resource patch test")
-    }
-}
--- a/src/test/kotlin/app/revanced/patcher/patch/PatchLoaderTest.kt
+++ b/src/test/kotlin/app/revanced/patcher/patch/PatchLoaderTest.kt
@@ -0,0 +1,90 @@
+@file:Suppress("unused")
+
+package app.revanced.patcher.patch
+
+import org.junit.jupiter.api.Test
+import java.io.File
+import kotlin.reflect.KFunction
+import kotlin.reflect.full.companionObject
+import kotlin.reflect.full.declaredFunctions
+import kotlin.reflect.jvm.isAccessible
+import kotlin.reflect.jvm.javaField
+import kotlin.test.assertEquals
+
+// region Test patches.
+
+// Not loaded, because it's unnamed.
+val publicUnnamedPatch = bytecodePatch {
+}
+
+// Loaded, because it's named.
+val publicPatch = bytecodePatch("Public") {
+}
+
+// Not loaded, because it's private.
+private val privateUnnamedPatch = bytecodePatch {
+}
+
+// Not loaded, because it's private.
+private val privatePatch = bytecodePatch("Private") {
+}
+
+// Not loaded, because it's unnamed.
+fun publicUnnamedPatchFunction() = publicUnnamedPatch
+
+// Loaded, because it's named.
+fun publicNamedPatchFunction() = bytecodePatch("Public") { }
+
+// Not loaded, because it's parameterized.
+fun parameterizedFunction(@Suppress("UNUSED_PARAMETER") param: Any) = publicNamedPatchFunction()
+
+// Not loaded, because it's private.
+private fun privateUnnamedPatchFunction() = privateUnnamedPatch
+
+// Not loaded, because it's private.
+private fun privateNamedPatchFunction() = privatePatch
+
+// endregion
+
+internal object PatchLoaderTest {
+    private const val LOAD_PATCHES_FUNCTION_NAME = "loadPatches"
+    private val TEST_PATCHES_CLASS = ::publicPatch.javaField!!.declaringClass.name
+    private val TEST_PATCHES_CLASS_LOADER = ::publicPatch.javaClass.classLoader
+
+    @Test
+    fun `loads patches correctly`() {
+        // Get instance of private PatchLoader.Companion class.
+        val patchLoaderCompanionObject = getPrivateFieldByType(
+            PatchLoader::class.java,
+            PatchLoader::class.companionObject!!.javaObjectType,
+        )
+
+        // Get private PatchLoader.Companion.loadPatches function from PatchLoader.Companion.
+        @Suppress("UNCHECKED_CAST")
+        val loadPatchesFunction = getPrivateFunctionByName(
+            patchLoaderCompanionObject,
+            LOAD_PATCHES_FUNCTION_NAME,
+        ) as KFunction<Map<File, Set<Patch<*>>>>
+
+        // Call private PatchLoader.Companion.loadPatches function.
+        val patches = loadPatchesFunction.call(
+            patchLoaderCompanionObject,
+            TEST_PATCHES_CLASS_LOADER,
+            mapOf(File("patchesFile") to setOf(TEST_PATCHES_CLASS)),
+        ).values.first()
+
+        assertEquals(
+            2,
+            patches.size,
+            "Expected 2 patches to be loaded, " +
+                "because there's only two named patches declared as public static fields " +
+                "or returned by public static and non-parametrized methods.",
+        )
+    }
+
+    private fun getPrivateFieldByType(cls: Class<*>, fieldType: Class<*>) =
+        cls.declaredFields.first { it.type == fieldType }.apply { isAccessible = true }.get(null)
+
+    private fun getPrivateFunctionByName(obj: Any, @Suppress("SameParameterValue") methodName: String) =
+        obj::class.declaredFunctions.first { it.name == methodName }.apply { isAccessible = true }
+}
--- a/src/test/kotlin/app/revanced/patcher/patch/PatchTest.kt
+++ b/src/test/kotlin/app/revanced/patcher/patch/PatchTest.kt
@@ -0,0 +1,67 @@
+package app.revanced.patcher.patch
+
+import app.revanced.patcher.fingerprint
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+internal object PatchTest {
+    @Test
+    fun `can create patch with name`() {
+        val patch = bytecodePatch(name = "Test") {}
+
+        assertEquals("Test", patch.name)
+    }
+
+    @Test
+    fun `can create patch with compatible packages`() {
+        val patch = bytecodePatch(name = "Test") {
+            compatibleWith(
+                "compatible.package"("1.0.0"),
+            )
+        }
+
+        assertEquals(1, patch.compatiblePackages!!.size)
+        assertEquals("compatible.package", patch.compatiblePackages!!.first().first)
+    }
+
+    @Test
+    fun `can create patch with fingerprints`() {
+        val externalFingerprint = fingerprint {}
+
+        val patch = bytecodePatch(name = "Test") {
+            val externalFingerprintMatch by externalFingerprint()
+            val internalFingerprintMatch by fingerprint {}
+
+            execute {
+                externalFingerprintMatch.method
+                internalFingerprintMatch.method
+            }
+        }
+
+        assertEquals(2, patch.fingerprints.size)
+    }
+
+    @Test
+    fun `can create patch with dependencies`() {
+        val patch = bytecodePatch(name = "Test") {
+            dependsOn(resourcePatch {})
+        }
+
+        assertEquals(1, patch.dependencies.size)
+    }
+
+    @Test
+    fun `can create patch with options`() {
+        val patch = bytecodePatch(name = "Test") {
+            val print by stringOption("print")
+            val custom = option<String>("custom")()
+
+            execute {
+                println(print)
+                println(custom.value)
+            }
+        }
+
+        assertEquals(2, patch.options.size)
+    }
+}
--- a/src/test/kotlin/app/revanced/patcher/patch/options/OptionsTest.kt
+++ b/src/test/kotlin/app/revanced/patcher/patch/options/OptionsTest.kt
@@ -0,0 +1,128 @@
+package app.revanced.patcher.patch.options
+
+import app.revanced.patcher.patch.*
+import org.junit.jupiter.api.assertDoesNotThrow
+import org.junit.jupiter.api.assertThrows
+import kotlin.reflect.typeOf
+import kotlin.test.*
+
+internal object OptionsTest {
+    private val optionsTestPatch = bytecodePatch {
+        booleanOption("bool", true)
+
+        stringOption("required", "default", required = true)
+
+        stringsOption("list", listOf("1", "2"))
+
+        stringOption("choices", "value", values = mapOf("Valid option value" to "valid"))
+
+        stringOption("validated", "default") { it == "valid" }
+
+        stringOption("resettable", null, required = true)
+    }
+
+    @Test
+    fun `should not fail because default value is unvalidated`() = options {
+        assertDoesNotThrow { get("required") }
+    }
+
+    @Test
+    fun `should not allow setting custom value with validation`() = options {
+        // Getter validation on incorrect value.
+        assertThrows<OptionException.ValueValidationException> {
+            set("validated", get("validated"))
+        }
+
+        // Setter validation on incorrect value.
+        assertThrows<OptionException.ValueValidationException> {
+            set("validated", "invalid")
+        }
+
+        // Setter validation on correct value.
+        assertDoesNotThrow {
+            set("validated", "valid")
+        }
+    }
+
+    @Test
+    fun `should throw due to incorrect type`() = options {
+        assertThrows<OptionException.InvalidValueTypeException> {
+            set("bool", "not a boolean")
+        }
+    }
+
+    @Test
+    fun `should be nullable`() = options {
+        assertDoesNotThrow {
+            set("bool", null)
+        }
+    }
+
+    @Test
+    fun `option should not be found`() = options {
+        assertThrows<OptionException.OptionNotFoundException> {
+            set("this option does not exist", 1)
+        }
+    }
+
+    @Test
+    fun `should be able to add options manually`() = options {
+        assertDoesNotThrow {
+            bytecodePatch {
+                get("list")()
+            }.options["list"]
+        }
+    }
+
+    @Test
+    fun `should allow setting value from values`() = options {
+        @Suppress("UNCHECKED_CAST")
+        val option = get("choices") as Option<String>
+
+        option.value = option.values!!.values.last()
+
+        assertTrue(option.value == "valid")
+    }
+
+    @Test
+    fun `should allow setting custom value`() = options {
+        assertDoesNotThrow {
+            set("choices", "unknown")
+        }
+    }
+
+    @Test
+    fun `should allow resetting value`() = options {
+        assertDoesNotThrow {
+            set("choices", null)
+        }
+
+        assert(get("choices").value == null)
+    }
+
+    @Test
+    fun `reset should not fail`() = options {
+        assertDoesNotThrow {
+            set("resettable", "test")
+            get("resettable").reset()
+        }
+
+        assertThrows<OptionException.ValueRequiredException> {
+            get("resettable").value
+        }
+    }
+
+    @Test
+    fun `option types should be known`() = options {
+        assertEquals(typeOf<List<String>>(), get("list").type)
+    }
+
+    @Test
+    fun `getting default value should work`() = options {
+        assertDoesNotThrow {
+            assertNull(get("resettable").default)
+        }
+    }
+
+    private fun options(block: Options.() -> Unit) = optionsTestPatch.options.let(block)
+}
--- a/src/test/kotlin/app/revanced/patcher/patch/options/PatchOptionsTest.kt
+++ b/src/test/kotlin/app/revanced/patcher/patch/options/PatchOptionsTest.kt
@@ -1,127 +0,0 @@
-package app.revanced.patcher.patch.options
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.booleanPatchOption
-import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringArrayPatchOption
-import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption
-import org.junit.jupiter.api.assertDoesNotThrow
-import org.junit.jupiter.api.assertThrows
-import kotlin.test.Test
-import kotlin.test.assertNull
-import kotlin.test.assertTrue
-
-internal class PatchOptionsTest {
-    @Test
-    fun `should not fail because default value is unvalidated`() {
-        assertDoesNotThrow { OptionsTestPatch.requiredStringOption }
-    }
-
-    @Test
-    fun `should not allow setting custom value with validation`() {
-        // Getter validation on incorrect value.
-        assertThrows<PatchOptionException.ValueValidationException> { OptionsTestPatch.validatedOption }
-
-        // Setter validation on incorrect value.
-        assertThrows<PatchOptionException.ValueValidationException> { OptionsTestPatch.validatedOption = "invalid" }
-
-        // Setter validation on correct value.
-        assertDoesNotThrow { OptionsTestPatch.validatedOption = "valid" }
-    }
-
-    @Test
-    fun `should throw due to incorrect type`() {
-        assertThrows<PatchOptionException.InvalidValueTypeException> {
-            OptionsTestPatch.options["bool"] = "not a boolean"
-        }
-    }
-
-    @Test
-    fun `should be nullable`() {
-        OptionsTestPatch.booleanOption = null
-    }
-
-    @Test
-    fun `option should not be found`() {
-        assertThrows<PatchOptionException.PatchOptionNotFoundException> {
-            OptionsTestPatch.options["this option does not exist"] = 1
-        }
-    }
-
-    @Test
-    fun `should be able to add options manually`() {
-        assertThrows<PatchOptionException.InvalidValueTypeException> {
-            OptionsTestPatch.options["array"] = OptionsTestPatch.stringArrayOption
-        }
-        assertDoesNotThrow {
-            OptionsTestPatch.options.register(OptionsTestPatch.stringArrayOption)
-        }
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    @Test
-    fun `should allow setting value from values`() =
-        with(OptionsTestPatch.options["choices"] as PatchOption<String>) {
-            value = values!!.values.last()
-            assertTrue(value == "valid")
-        }
-
-    @Test
-    fun `should allow setting custom value`() = assertDoesNotThrow { OptionsTestPatch.stringOptionWithChoices = "unknown" }
-
-    @Test
-    fun `should allow resetting value`() = assertDoesNotThrow { OptionsTestPatch.stringOptionWithChoices = null }
-
-    @Test
-    fun `reset should not fail`() {
-        assertDoesNotThrow {
-            OptionsTestPatch.resettableOption.value = "test"
-            OptionsTestPatch.resettableOption.reset()
-        }
-
-        assertThrows<PatchOptionException.ValueRequiredException> {
-            OptionsTestPatch.resettableOption.value
-        }
-    }
-
-    @Test
-    fun `option types should be known`() = assertTrue(OptionsTestPatch.options["array"].valueType == "StringArray")
-
-    @Test
-    fun `getting default value should work`() = assertDoesNotThrow { assertNull(OptionsTestPatch.resettableOption.default) }
-
-    @Suppress("DEPRECATION")
-    private object OptionsTestPatch : BytecodePatch() {
-        var booleanOption by booleanPatchOption(
-            "bool",
-            true,
-        )
-        var requiredStringOption by stringPatchOption(
-            "required",
-            "default",
-            required = true,
-        )
-        var stringArrayOption =
-            stringArrayPatchOption(
-                "array",
-                arrayOf("1", "2"),
-            )
-        var stringOptionWithChoices by stringPatchOption(
-            "choices",
-            "value",
-            values = mapOf("Valid option value" to "valid"),
-        )
-        var validatedOption by stringPatchOption(
-            "validated",
-            "default",
-        ) { it == "valid" }
-        var resettableOption =
-            stringPatchOption(
-                "resettable",
-                null,
-                required = true,
-            )
-
-        override fun execute(context: BytecodeContext) {}
-    }
-}
--- a/src/test/kotlin/app/revanced/patcher/patch/usage/ExampleBytecodePatch.kt
+++ b/src/test/kotlin/app/revanced/patcher/patch/usage/ExampleBytecodePatch.kt
@@ -1,148 +0,0 @@
-package app.revanced.patcher.patch.usage
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchException
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
-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 com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Format
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction11x
-import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction21c
-import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction21c
-import com.android.tools.smali.dexlib2.immutable.ImmutableField
-import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
-import com.android.tools.smali.dexlib2.immutable.ImmutableMethodImplementation
-import com.android.tools.smali.dexlib2.immutable.reference.ImmutableFieldReference
-import com.android.tools.smali.dexlib2.immutable.reference.ImmutableStringReference
-import com.android.tools.smali.dexlib2.immutable.value.ImmutableFieldEncodedValue
-import com.android.tools.smali.dexlib2.util.Preconditions
-import com.google.common.collect.ImmutableList
-
-@Suppress("unused")
-@Patch(
-    name = "Example bytecode patch",
-    description = "Example demonstration of a bytecode patch.",
-    dependencies = [ExampleResourcePatch::class],
-    compatiblePackages = [CompatiblePackage("com.example.examplePackage", arrayOf("0.0.1", "0.0.2"))],
-)
-object ExampleBytecodePatch : BytecodePatch(setOf(ExampleFingerprint)) {
-    // Entry point of a patch. Supplied fingerprints are resolved at this point.
-    override fun execute(context: BytecodeContext) {
-        ExampleFingerprint.result?.let { result ->
-            // Let's modify it, so it prints "Hello, ReVanced! Editing bytecode."
-            // Get the start index of our opcode pattern.
-            // This will be the index of the instruction with the opcode CONST_STRING.
-            val startIndex = result.scanResult.patternScanResult!!.startIndex
-
-            result.mutableMethod.apply {
-                replaceStringAt(startIndex, "Hello, ReVanced! Editing bytecode.")
-
-                // Store the fields initial value into the first virtual register.
-                replaceInstruction(0, "sget-object v0, LTestClass;->dummyField:Ljava/io/PrintStream;")
-
-                // Now let's create a new call to our method and print the return value!
-                // You can also use the smali compiler to create instructions.
-                // For this sake of example I reuse the TestClass field dummyField inside the virtual register 0.
-                //
-                // Control flow instructions are not supported as of now.
-                addInstructionsWithLabels(
-                    startIndex + 2,
-                    """
-                        invoke-static { }, LTestClass;->returnHello()Ljava/lang/String;
-                        move-result-object v1
-                        invoke-virtual { v0, v1 }, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
-                    """,
-                )
-            }
-
-            // Find the class in which the method matching our fingerprint is defined in.
-            context.findClass(result.classDef.type)!!.mutableClass.apply {
-                // Add a new method that returns a string.
-                methods.add(
-                    ImmutableMethod(
-                        result.classDef.type,
-                        "returnHello",
-                        null,
-                        "Ljava/lang/String;",
-                        AccessFlags.PRIVATE or AccessFlags.STATIC,
-                        null,
-                        null,
-                        ImmutableMethodImplementation(
-                            1,
-                            ImmutableList.of(
-                                BuilderInstruction21c(
-                                    Opcode.CONST_STRING,
-                                    0,
-                                    ImmutableStringReference("Hello, ReVanced! Adding bytecode."),
-                                ),
-                                BuilderInstruction11x(Opcode.RETURN_OBJECT, 0),
-                            ),
-                            null,
-                            null,
-                        ),
-                    ).toMutable(),
-                )
-
-                // Add a field in the main class.
-                // We will use this field in our method below to call println on.
-                // The field holds the Ljava/io/PrintStream->out; field.
-                fields.add(
-                    ImmutableField(
-                        type,
-                        "dummyField",
-                        "Ljava/io/PrintStream;",
-                        AccessFlags.PRIVATE or AccessFlags.STATIC,
-                        ImmutableFieldEncodedValue(
-                            ImmutableFieldReference(
-                                "Ljava/lang/System;",
-                                "out",
-                                "Ljava/io/PrintStream;",
-                            ),
-                        ),
-                        null,
-                        null,
-                    ).toMutable(),
-                )
-            }
-        } ?: throw PatchException("Fingerprint failed to resolve.")
-    }
-
-    /**
-     * Replace an existing instruction with a new one containing a reference to a new string.
-     * @param index The index of the instruction to replace.
-     * @param string The replacement string.
-     */
-    private fun MutableMethod.replaceStringAt(
-        index: Int,
-        string: String,
-    ) {
-        val instruction = getInstruction(index)
-
-        // Utility method of dexlib2.
-        Preconditions.checkFormat(instruction.opcode, Format.Format21c)
-
-        // Cast this to an instruction of the format 21c.
-        // The instruction format can be found in the docs at
-        // https://source.android.com/devices/tech/dalvik/dalvik-bytecode
-        val strInstruction = instruction as Instruction21c
-
-        // In our case we want an instruction with the opcode CONST_STRING
-        // The format is 21c, so we create a new BuilderInstruction21c
-        // This instruction will hold the string reference constant in the virtual register of the original instruction
-        // For that a reference to the string is needed. It can be created with an ImmutableStringReference.
-        // At last, use the method replaceInstruction to replace it at the given index startIndex.
-        replaceInstruction(
-            index,
-            "const-string ${strInstruction.registerA}, ${ImmutableStringReference(string)}",
-        )
-    }
-}
--- a/src/test/kotlin/app/revanced/patcher/patch/usage/ExampleFingerprint.kt
+++ b/src/test/kotlin/app/revanced/patcher/patch/usage/ExampleFingerprint.kt
@@ -1,20 +0,0 @@
-package app.revanced.patcher.patch.usage
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import app.revanced.patcher.fingerprint.annotation.FuzzyPatternScanMethod
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-@FuzzyPatternScanMethod(2)
-object ExampleFingerprint : MethodFingerprint(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.STATIC,
-    listOf("[L"),
-    listOf(
-        Opcode.SGET_OBJECT,
-        null, // Matching unknown opcodes.
-        Opcode.INVOKE_STATIC, // This is intentionally wrong to test fuzzy matching.
-        Opcode.RETURN_VOID,
-    ),
-    null,
-)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
semantic-release-bot	76c262ff12	chore(release): 20.0.0-dev.2 [skip ci] # [20.0.0-dev.2](https://github.com/ReVanced/revanced-patcher/compare/v20.0.0-dev.1...v20.0.0-dev.2) (2024-07-31) ### Bug Fixes * Downgrade smali to fix dex compilation issue ([`714447d`](`714447de70`)) * Merge all extensions before initializing lookup maps ([`328aa87`](`328aa876d8`)) * Use null for compatible package version when adding packages only ([`a8e8fa4`](`a8e8fa4093`))	2024-07-31 00:27:24 +00:00
oSumAtrIX	714447de70	fix: Downgrade smali to fix dex compilation issue	2024-07-31 02:25:32 +02:00
oSumAtrIX	328aa876d8	fix: Merge all extensions before initializing lookup maps	2024-07-26 04:45:31 +02:00
oSumAtrIX	a8e8fa4093	fix: Use null for compatible package version when adding packages only	2024-07-26 03:41:32 +02:00
oSumAtrIX	c482dff17c	refactor: Convert method bodies to single expression functions	2024-07-26 03:10:08 +02:00
oSumAtrIX	e6de1f6b4c	build(Needs bump): Bump dependencies	2024-07-26 03:09:32 +02:00
oSumAtrIX	82a2b3c371	docs: Fix syntax issues and improve wording	2024-07-23 19:55:30 +02:00
semantic-release-bot	9ce772a597	chore(release): 20.0.0-dev.1 [skip ci] # [20.0.0-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v19.3.1...v20.0.0-dev.1) (2024-07-22) ### Features * Convert APIs to Kotlin DSL ([#298](https://github.com/ReVanced/revanced-patcher/issues/298)) ([`3f9cbd2`](`3f9cbd2408`)) ### BREAKING CHANGES * Various old APIs are removed, and DSL APIs are added instead.	2024-07-22 01:11:38 +00:00
oSumAtrIX	3f9cbd2408	feat: Convert APIs to Kotlin DSL (#298 ) This commit converts various APIs to Kotlin DSL. BREAKING CHANGE: Various old APIs are removed, and DSL APIs are added instead.	2024-07-21 22:45:45 +02:00
oSumAtrIX	1ff0830249	ci: Correct usage of repository variable	2024-07-13 00:44:51 +02:00
oSumAtrIX	7be131d348	docs: Improve issue templates	2024-05-26 00:43:39 +02:00
oSumAtrIX	1d78d690bb	chore: Fix spelling mistake	2024-04-07 18:22:00 +02:00
Vologhat	042f554d75	refactor: Simplify mapping classes to their names (#290 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2024-04-07 17:54:37 +02:00
oSumAtrIX	f63302feab	build: Publish sources	2024-03-14 12:21:48 +01:00
oSumAtrIX	1614d7f9f4	build: Set target bytecode level to JVM 11	2024-03-04 19:15:07 +01:00
oSumAtrIX	d64776c933	ci: Update action	2024-03-04 15:36:36 +01:00
oSumAtrIX	03cd9f7f54	chore: Lint code	2024-03-03 00:25:28 +01:00
oSumAtrIX	b69226dd26	build: Bump dependencies	2024-03-02 08:29:38 +01:00
oSumAtrIX	8e1117ed3f	refactor: Properly abstract `Patch#execute` function	2024-02-26 16:45:03 +01:00
oSumAtrIX	29adcd5aad	docs: Fix broken links	2024-02-26 04:37:45 +01:00
oSumAtrIX	6b2bc5ef4d	docs: Fix docs link [skip ci]	2024-02-25 19:49:40 +01:00
oSumAtrIX	d862d61386	docs: Un-indent markdown to fix rendering	2024-02-25 04:50:44 +01:00
oSumAtrIX	a4e18334bc	chore: Revert using a relative image path For some reason GitHub does not render them correctly	2024-02-25 03:40:20 +01:00
oSumAtrIX	5bef74adb5	build: Bump dependencies	2024-02-25 03:40:20 +01:00
oSumAtrIX	fe616beb22	docs: Add documentation (#278 )	2024-02-25 03:30:08 +01:00
oSumAtrIX	41257ee87e	chore: Rename issue templates and use relative image paths	2024-02-25 03:26:15 +01:00
oSumAtrIX	33ed5f0aa3	ci: Fix indentation in workflow	2024-02-24 01:15:09 +01:00
oSumAtrIX	d0a57ac00d	docs: Add readme and contribution guidelines	2024-02-23 04:00:59 +01:00
oSumAtrIX	b0b2c10665	ci: Split release into a separate PR build workflow Because the release workflow already runs on dev and main, it is not necessary to also trigger it for PRs.	2024-02-23 02:26:30 +01:00
oSumAtrIX	cc183062ab	chore: Fix inline comment	2024-02-15 02:46:14 +01:00
oSumAtrIX	fe8ea9130d	build: Remove unnecessary `java` plugin	2024-02-14 04:32:33 +01:00
oSumAtrIX	f1c60093cf	ci: Update GPG passphrase secret name	2024-02-14 02:49:52 +01:00
oSumAtrIX	687b884dc4	ci: Import GPG key as late as possible It is not necessary to import it earlier.	2024-02-14 01:59:41 +01:00
semantic-release-bot	ceb6fd51c1	chore(release): 19.3.1 [skip ci] ## [19.3.1](https://github.com/ReVanced/revanced-patcher/compare/v19.3.0...v19.3.1) (2024-02-14)	2024-02-14 00:57:51 +00:00
oSumAtrIX	0b223bfe65	chore: Merge branch `dev` to `main` (#275 )	2024-02-14 01:55:11 +01:00
semantic-release-bot	308e95cf62	chore(release): 19.3.1-dev.1 [skip ci] ## [19.3.1-dev.1](https://github.com/ReVanced/revanced-patcher/compare/v19.3.0...v19.3.1-dev.1) (2024-02-14)	2024-02-14 00:51:49 +00:00
oSumAtrIX	db8866212a	build: Bump Gradle	2024-02-14 01:50:02 +01:00
oSumAtrIX	608a05d9aa	build: Bump dependencies	2024-02-14 01:50:01 +01:00
oSumAtrIX	55746ed705	build(Needs bump): Add missing repository to publish packages to	2024-02-14 01:47:52 +01:00
semantic-release-bot	e33026c538	chore(release): 19.3.0 [skip ci] # [19.3.0](https://github.com/ReVanced/revanced-patcher/compare/v19.2.0...v19.3.0) (2024-02-14) ### Bug Fixes * Use `Patch#toString` to get patch class name, when no name available ([`c9a8260`](`c9a82608f7`)) ### Features * Read and write arbitrary files in APK files ([`f1d7217`](`f1d7217495`))	2024-02-14 00:35:38 +00:00
oSumAtrIX	ff215620bb	chore: Merge branch `dev` to `main` (#266 )	2024-02-14 01:33:41 +01:00
oSumAtrIX	fec31f45da	chore: Add note	2024-02-14 01:14:28 +01:00
oSumAtrIX	7684b70324	build: Publish to GitHub Packages Because Jitpack can not sign artifacts.	2024-02-14 01:12:54 +01:00
oSumAtrIX	55a5d3bd4e	chore: Fix warnings	2024-02-13 05:27:50 +01:00