chore(release): 1.0.0-dev.12 [skip ci]

# [1.0.0-dev.12](https://github.com/revanced/revanced-patcher/compare/v1.0.0-dev.11...v1.0.0-dev.12) (2022-05-22) ### Bug Fixes * using old instance of `Androlib` when saving ([5630e49](5630e49663))
Merge remote-tracking branch 'origin/dev' into dev
2026-01-12 06:16:18 +00:00 · 2022-05-22 15:23:09 +00:00 · 2022-05-22 17:21:50 +02:00 · 2022-05-22 17:21:18 +02:00 · 2022-05-22 15:17:31 +00:00 · 2022-05-22 17:14:48 +02:00
124 changed files with 2327 additions and 17891 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,3 +0,0 @@
-[*.{kt,kts}]
-ktlint_code_style = intellij_idea
-ktlint_standard_no-wildcard-imports = disabled
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,9 +0,0 @@
-#
-# https://help.github.com/articles/dealing-with-line-endings/
-#
-# Linux start script should use lf
-/gradlew        text eol=lf
-
-# These are Windows script files and should use crlf
-*.bat           text eol=crlf
-
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,109 +0,0 @@
-name: 🐞 Bug report
-description: Report a bug or an issue.
-title: "bug: "
-labels: ["Bug report"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        <p align="center">
-          <picture>
-            <source
-              width="256px"
-              media="(prefers-color-scheme: dark)"
-              srcset="https://raw.githubusercontent.com/revanced/revanced-patcher/main/assets/revanced-headline/revanced-headline-vertical-dark.svg"
-            >
-            <img 
-              width="256px"
-              src="https://raw.githubusercontent.com/revanced/revanced-patcher/main/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="https://raw.githubusercontent.com/revanced/revanced-patcher/main/assets/revanced-logo/revanced-logo.svg" />
-                 <img height="24px" src="https://raw.githubusercontent.com/revanced/revanced-patcher/main/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 bug report
-
-        Before creating a new bug report, please keep the following in mind:
-
-        - **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:
-      label: Bug description
-      description: |
-        - Describe your bug in detail
-        - Add steps to reproduce the bug if possible (Step 1. ... Step 2. ...)
-        - Add images and videos if possible
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Error logs
-      description: Exceptions can be captured by running `logcat | grep AndroidRuntime` in a shell.
-      render: shell
-  - type: textarea
-    attributes:
-      label: Solution
-      description: If applicable, add a possible solution to the bug.
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add additional context here.
-  - type: checkboxes
-    id: acknowledgements
-    attributes:
-      label: Acknowledgements
-      description: Your bug report will be closed if you don't follow the checklist below.
-      options:
-        - 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
-        - label: All requested information has been provided properly.
-          required: true
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: 📃 Documentation
-    url: https://github.com/revanced/revanced-documentation/
-    about: Don't know how or where to start? Check out our documentation!
-  - name: 🗨 Discussions
-    url: https://github.com/revanced/revanced-suggestions/discussions
-    about: Got something you think should change or be added? Search for or start a new discussion!
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,107 +0,0 @@
-name: ⭐ Feature request
-description: Create a detailed request for a new feature.
-title: "feat: "
-labels: ["Feature request"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        <p align="center">
-          <picture>
-            <source
-              width="256px"
-              media="(prefers-color-scheme: dark)"
-              srcset="https://raw.githubusercontent.com/revanced/revanced-patcher/main/assets/revanced-headline/revanced-headline-vertical-dark.svg"
-            >
-            <img 
-              width="256px"
-              src="https://raw.githubusercontent.com/revanced/revanced-patcher/main/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="https://raw.githubusercontent.com/revanced/revanced-patcher/main/assets/revanced-logo/revanced-logo.svg" />
-                 <img height="24px" src="https://raw.githubusercontent.com/revanced/revanced-patcher/main/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 feature request
-
-        Before creating a new feature request, please keep the following in mind:
-
-        - **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
-    attributes:
-      label: Feature description
-      description: |
-        - Describe your feature in detail
-        - Add images, videos, links, examples, references, etc. if possible
-        - Add the target application name in case you request a new patch
-  - type: textarea
-    attributes:
-      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?
-        - What makes this feature important?
-    validations:
-      required: true
-  - type: checkboxes
-    id: acknowledgements
-    attributes:
-      label: Acknowledgements
-      description: Your feature request will be closed if you don't follow the checklist below.
-      options:
-        - 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
-        - label: All requested information has been provided properly.
-          required: true
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -1,2 +0,0 @@
-firstPRMergeComment: >
-  Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) to receive a role for your contribution.
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,22 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: github-actions
-    labels: []
-    directory: /
-    target-branch: dev
-    schedule:
-      interval: monthly
-
-  - package-ecosystem: npm
-    labels: []
-    directory: /
-    target-branch: dev
-    schedule:
-      interval: monthly
-
-  - package-ecosystem: gradle
-    labels: []
-    directory: /
-    target-branch: dev
-    schedule:
-      interval: monthly
--- a/.github/workflows/build_pull_request.yml
+++ b/.github/workflows/build_pull_request.yml
@@ -1,25 +0,0 @@
-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
@@ -1,26 +0,0 @@
-name: Open a PR to main
-
-on:
-  push:
-    branches:
-      - dev
-  workflow_dispatch:
-
-env:
-  MESSAGE: Merge branch `${{ github.head_ref || github.ref_name }}` to `main`
-
-jobs:
-  pull-request:
-    name: Open pull request
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Open pull request
-        uses: repo-sync/pull-request@v2
-        with:
-          destination_branch: 'main'
-          pr_title: 'chore: ${{ env.MESSAGE }}'
-          pr_body: 'This pull request will ${{ env.MESSAGE }}.'
-          pr_draft: true
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,53 +1,41 @@
 name: Release
-
 on:
-  workflow_dispatch:
  push:
    branches:
      - main
      - dev
-
+  pull_request:
+    branches:
+      - main
+      - dev
 jobs:
  release:
    name: Release
-    permissions:
-      contents: write
-      packages: write
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
        with:
-          # Make sure the release step uses its own credentials:
-          # https://github.com/cycjimmy/semantic-release-action#private-packages
-          persist-credentials: false
          fetch-depth: 0
-
-      - name: Cache Gradle
-        uses: burrunan/gradle-cache-action@v1
-
-      - name: Build
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew build clean
-
+      - name: Setup JDK
+        uses: actions/setup-java@v2
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+          cache: gradle
      - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v2
        with:
          node-version: "lts/*"
-          cache: 'npm'
-
-      - 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: Make gradlew executable
+        run: chmod +x gradlew
+      - name: Build with Gradle
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew build
+      - name: Setup semantic-release
+        run: npm install -g semantic-release @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D
      - name: Release
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: npm exec semantic-release
+        run: npx semantic-release
--- a/.github/workflows/update_documentation.yml
+++ b/.github/workflows/update_documentation.yml
@@ -1,19 +0,0 @@
-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/.gitignore
+++ b/.gitignore
@@ -74,7 +74,6 @@ cmake-build-*/

 # IntelliJ
 out/
-.idea/

 # mpeltonen/sbt-idea plugin
 .idea_modules/
@@ -116,9 +115,3 @@ gradle-app.setting

 # Avoid ignoring test resources
 !src/test/resources/*
-
-# Dependency directories
-node_modules/
-
-# Gradle props, to avoid sharing the gpr key
-gradle.properties
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,10 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
--- a/.idea/discord.xml
+++ b/.idea/discord.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DiscordProjectSettings">
+    <option name="show" value="PROJECT_FILES" />
+    <option name="description" value="" />
+  </component>
+</project>
--- a/.idea/git_toolbox_prj.xml
+++ b/.idea/git_toolbox_prj.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxProjectSettings">
+    <option name="commitMessageIssueKeyValidationOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+    <option name="commitMessageValidationEnabledOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+  </component>
+</project>
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="UnusedSymbol" enabled="false" level="WARNING" enabled_by_default="false" />
+  </profile>
+</component>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="azul-17" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CommitMessageInspectionProfile">
+    <profile version="1.0">
+      <inspection_tool class="CommitFormat" enabled="true" level="WARNING" enabled_by_default="true" />
+      <inspection_tool class="CommitNamingConvention" enabled="true" level="WARNING" enabled_by_default="true" />
+    </profile>
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
--- a/.releaserc
+++ b/.releaserc
@@ -7,13 +7,7 @@
    }
  ],
  "plugins": [
-    [
-      "@semantic-release/commit-analyzer", {
-        "releaseRules": [
-          { "type": "build", "scope": "Needs bump", "release": "patch" }
-        ]
-      }
-    ],
+    "@semantic-release/commit-analyzer",
    "@semantic-release/release-notes-generator",
    "@semantic-release/changelog",
    "gradle-semantic-release-plugin",
@@ -23,22 +17,9 @@
        "assets": [
          "CHANGELOG.md",
          "gradle.properties"
-        ],
-        "message": "chore: Release v${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
+        ]
      }
    ],
-    [
-      "@saithodev/semantic-release-backmerge",
-      {
-        backmergeBranches: [{"from": "main", "to": "dev"}],
-        clearWorkspace: true
-      }
-    ],
-    [
-        "@semantic-release/github",
-        {
-            successComment: false
-        }
-    ]
+    "@semantic-release/github"
  ]
 }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,99 +0,0 @@
-<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,125 +1 @@
-<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.
+# Patcher
--- a/api/revanced-patcher.api
+++ b/api/revanced-patcher.api
@@ -1,872 +0,0 @@
-public final class app/revanced/patcher/Fingerprint {
-}
-
-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 synthetic fun fingerprint$default (ILkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lapp/revanced/patcher/Fingerprint;
-}
-
-public abstract interface annotation class app/revanced/patcher/InternalApi : java/lang/annotation/Annotation {
-}
-
-public final class app/revanced/patcher/Match {
-	public final fun getClassDef ()Lapp/revanced/patcher/util/proxy/mutableTypes/MutableClass;
-	public final fun getMethod ()Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;
-	public final fun getOriginalClassDef ()Lcom/android/tools/smali/dexlib2/iface/ClassDef;
-	public final fun getOriginalMethod ()Lcom/android/tools/smali/dexlib2/iface/Method;
-	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 final class app/revanced/patcher/Patcher : java/io/Closeable {
-	public fun <init> (Lapp/revanced/patcher/PatcherConfig;)V
-	public fun close ()V
-	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 {
-	public fun <init> (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-}
-
-public final class app/revanced/patcher/PatcherContext : java/io/Closeable {
-	public fun close ()V
-	public final fun getPackageMetadata ()Lapp/revanced/patcher/PackageMetadata;
-}
-
-public final class app/revanced/patcher/PatcherResult {
-	public final fun getDexFiles ()Ljava/util/Set;
-	public final fun getResources ()Lapp/revanced/patcher/PatcherResult$PatchedResources;
-}
-
-public final class app/revanced/patcher/PatcherResult$PatchedDexFile {
-	public final fun getName ()Ljava/lang/String;
-	public final fun getStream ()Ljava/io/InputStream;
-}
-
-public final class app/revanced/patcher/PatcherResult$PatchedResources {
-	public final fun getDeleteResources ()Ljava/util/Set;
-	public final fun getDoNotCompress ()Ljava/util/Set;
-	public final fun getOtherResources ()Ljava/io/File;
-	public final fun getResourcesApk ()Ljava/io/File;
-}
-
-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 final class app/revanced/patcher/extensions/InstructionExtensions {
-	public static final field INSTANCE Lapp/revanced/patcher/extensions/InstructionExtensions;
-	public final fun addInstruction (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILcom/android/tools/smali/dexlib2/builder/BuilderInstruction;)V
-	public final fun addInstruction (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILjava/lang/String;)V
-	public final fun addInstruction (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Lcom/android/tools/smali/dexlib2/builder/BuilderInstruction;)V
-	public final fun addInstruction (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Ljava/lang/String;)V
-	public final fun addInstructions (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILjava/lang/String;)V
-	public final fun addInstructions (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILjava/util/List;)V
-	public final fun addInstructions (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Ljava/lang/String;)V
-	public final fun addInstructions (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Ljava/util/List;)V
-	public final fun addInstructions (Lcom/android/tools/smali/dexlib2/builder/MutableMethodImplementation;ILjava/util/List;)V
-	public final fun addInstructions (Lcom/android/tools/smali/dexlib2/builder/MutableMethodImplementation;Ljava/util/List;)V
-	public final fun addInstructionsWithLabels (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILjava/lang/String;[Lapp/revanced/patcher/util/smali/ExternalLabel;)V
-	public final fun getInstruction (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;I)Lcom/android/tools/smali/dexlib2/builder/BuilderInstruction;
-	public final fun getInstruction (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;I)Ljava/lang/Object;
-	public final fun getInstruction (Lcom/android/tools/smali/dexlib2/builder/MutableMethodImplementation;I)Lcom/android/tools/smali/dexlib2/builder/BuilderInstruction;
-	public final fun getInstruction (Lcom/android/tools/smali/dexlib2/builder/MutableMethodImplementation;I)Ljava/lang/Object;
-	public final fun 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
-	public final fun removeInstructions (Lcom/android/tools/smali/dexlib2/builder/MutableMethodImplementation;I)V
-	public final fun removeInstructions (Lcom/android/tools/smali/dexlib2/builder/MutableMethodImplementation;II)V
-	public final fun replaceInstruction (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILcom/android/tools/smali/dexlib2/builder/BuilderInstruction;)V
-	public final fun replaceInstruction (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILjava/lang/String;)V
-	public final fun replaceInstructions (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILjava/lang/String;)V
-	public final fun replaceInstructions (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILjava/util/List;)V
-	public final fun replaceInstructions (Lcom/android/tools/smali/dexlib2/builder/MutableMethodImplementation;ILjava/util/List;)V
-}
-
-public final class app/revanced/patcher/patch/BytecodePatch : app/revanced/patcher/patch/Patch {
-	public final fun getExtensionInputStream ()Ljava/util/function/Supplier;
-	public fun toString ()Ljava/lang/String;
-}
-
-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 getExtensionInputStream ()Ljava/util/function/Supplier;
-	public final fun setExtensionInputStream (Ljava/util/function/Supplier;)V
-}
-
-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 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 getMatch (Lapp/revanced/patcher/Fingerprint;)Lapp/revanced/patcher/Match;
-	public final fun getValue (Lapp/revanced/patcher/Fingerprint;Ljava/lang/Void;Lkotlin/reflect/KProperty;)Lapp/revanced/patcher/Match;
-	public final fun match (Lapp/revanced/patcher/Fingerprint;Lcom/android/tools/smali/dexlib2/iface/ClassDef;)Lapp/revanced/patcher/Match;
-	public final fun match (Lapp/revanced/patcher/Fingerprint;Lcom/android/tools/smali/dexlib2/iface/Method;)Lapp/revanced/patcher/Match;
-	public final fun navigate (Lcom/android/tools/smali/dexlib2/iface/reference/MethodReference;)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/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 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/patch/OptionException$InvalidValueTypeException : app/revanced/patcher/patch/OptionException {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
-}
-
-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/patch/OptionException$ValueRequiredException : app/revanced/patcher/patch/OptionException {
-	public fun <init> (Lapp/revanced/patcher/patch/Option;)V
-}
-
-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 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 final fun booleanOption (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 synthetic fun booleanOption$default (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 final fun booleansOption (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 synthetic fun booleansOption$default (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 final fun floatOption (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 synthetic fun floatOption$default (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 final fun intOption (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 synthetic fun intOption$default (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 final fun intsOption (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 synthetic fun intsOption$default (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 final fun longOption (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 synthetic fun longOption$default (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 final fun longsOption (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 synthetic fun longsOption$default (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 final fun stringOption (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 synthetic fun stringOption$default (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 final fun stringsOption (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 static synthetic fun stringsOption$default (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;ZLjava/util/Set;Ljava/util/Set;Ljava/util/Set;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;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;
-	public final fun getUse ()Z
-	public fun toString ()Ljava/lang/String;
-}
-
-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/Function1;)V
-	public final fun finalize (Lkotlin/jvm/functions/Function1;)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/Function1;
-	protected final fun getFinalizeBlock ()Lkotlin/jvm/functions/Function1;
-	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/Function1;)V
-	protected final fun setFinalizeBlock (Lkotlin/jvm/functions/Function1;)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 {
-	public fun <init> (Ljava/lang/String;)V
-	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
-	public fun <init> (Ljava/lang/Throwable;)V
-}
-
-public final class app/revanced/patcher/patch/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 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/RawResourcePatchBuilder : app/revanced/patcher/patch/PatchBuilder {
-	public synthetic fun build$revanced_patcher ()Lapp/revanced/patcher/patch/Patch;
-}
-
-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/ResourcePatchBuilder : app/revanced/patcher/patch/PatchBuilder {
-	public synthetic fun build$revanced_patcher ()Lapp/revanced/patcher/patch/Patch;
-}
-
-public final class app/revanced/patcher/patch/ResourcePatchContext : app/revanced/patcher/patch/PatchContext {
-	public final fun delete (Ljava/lang/String;)Z
-	public final fun document (Ljava/io/InputStream;)Lapp/revanced/patcher/util/Document;
-	public final fun document (Ljava/lang/String;)Lapp/revanced/patcher/util/Document;
-	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 class app/revanced/patcher/util/Document : java/io/Closeable, org/w3c/dom/Document {
-	public fun adoptNode (Lorg/w3c/dom/Node;)Lorg/w3c/dom/Node;
-	public fun appendChild (Lorg/w3c/dom/Node;)Lorg/w3c/dom/Node;
-	public fun cloneNode (Z)Lorg/w3c/dom/Node;
-	public fun close ()V
-	public fun compareDocumentPosition (Lorg/w3c/dom/Node;)S
-	public fun createAttribute (Ljava/lang/String;)Lorg/w3c/dom/Attr;
-	public fun createAttributeNS (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/Attr;
-	public fun createCDATASection (Ljava/lang/String;)Lorg/w3c/dom/CDATASection;
-	public fun createComment (Ljava/lang/String;)Lorg/w3c/dom/Comment;
-	public fun createDocumentFragment ()Lorg/w3c/dom/DocumentFragment;
-	public fun createElement (Ljava/lang/String;)Lorg/w3c/dom/Element;
-	public fun createElementNS (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/Element;
-	public fun createEntityReference (Ljava/lang/String;)Lorg/w3c/dom/EntityReference;
-	public fun createProcessingInstruction (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/ProcessingInstruction;
-	public fun createTextNode (Ljava/lang/String;)Lorg/w3c/dom/Text;
-	public fun getAttributes ()Lorg/w3c/dom/NamedNodeMap;
-	public fun getBaseURI ()Ljava/lang/String;
-	public fun getChildNodes ()Lorg/w3c/dom/NodeList;
-	public fun getDoctype ()Lorg/w3c/dom/DocumentType;
-	public fun getDocumentElement ()Lorg/w3c/dom/Element;
-	public fun getDocumentURI ()Ljava/lang/String;
-	public fun getDomConfig ()Lorg/w3c/dom/DOMConfiguration;
-	public fun getElementById (Ljava/lang/String;)Lorg/w3c/dom/Element;
-	public fun getElementsByTagName (Ljava/lang/String;)Lorg/w3c/dom/NodeList;
-	public fun getElementsByTagNameNS (Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/NodeList;
-	public fun getFeature (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/Object;
-	public fun getFirstChild ()Lorg/w3c/dom/Node;
-	public fun getImplementation ()Lorg/w3c/dom/DOMImplementation;
-	public fun getInputEncoding ()Ljava/lang/String;
-	public fun getLastChild ()Lorg/w3c/dom/Node;
-	public fun getLocalName ()Ljava/lang/String;
-	public fun getNamespaceURI ()Ljava/lang/String;
-	public fun getNextSibling ()Lorg/w3c/dom/Node;
-	public fun getNodeName ()Ljava/lang/String;
-	public fun getNodeType ()S
-	public fun getNodeValue ()Ljava/lang/String;
-	public fun getOwnerDocument ()Lorg/w3c/dom/Document;
-	public fun getParentNode ()Lorg/w3c/dom/Node;
-	public fun getPrefix ()Ljava/lang/String;
-	public fun getPreviousSibling ()Lorg/w3c/dom/Node;
-	public fun getStrictErrorChecking ()Z
-	public fun getTextContent ()Ljava/lang/String;
-	public fun getUserData (Ljava/lang/String;)Ljava/lang/Object;
-	public fun getXmlEncoding ()Ljava/lang/String;
-	public fun getXmlStandalone ()Z
-	public fun getXmlVersion ()Ljava/lang/String;
-	public fun hasAttributes ()Z
-	public fun hasChildNodes ()Z
-	public fun importNode (Lorg/w3c/dom/Node;Z)Lorg/w3c/dom/Node;
-	public fun insertBefore (Lorg/w3c/dom/Node;Lorg/w3c/dom/Node;)Lorg/w3c/dom/Node;
-	public fun isDefaultNamespace (Ljava/lang/String;)Z
-	public fun isEqualNode (Lorg/w3c/dom/Node;)Z
-	public fun isSameNode (Lorg/w3c/dom/Node;)Z
-	public fun isSupported (Ljava/lang/String;Ljava/lang/String;)Z
-	public fun lookupNamespaceURI (Ljava/lang/String;)Ljava/lang/String;
-	public fun lookupPrefix (Ljava/lang/String;)Ljava/lang/String;
-	public fun normalize ()V
-	public fun normalizeDocument ()V
-	public fun removeChild (Lorg/w3c/dom/Node;)Lorg/w3c/dom/Node;
-	public fun renameNode (Lorg/w3c/dom/Node;Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/Node;
-	public fun replaceChild (Lorg/w3c/dom/Node;Lorg/w3c/dom/Node;)Lorg/w3c/dom/Node;
-	public fun setDocumentURI (Ljava/lang/String;)V
-	public fun setNodeValue (Ljava/lang/String;)V
-	public fun setPrefix (Ljava/lang/String;)V
-	public fun setStrictErrorChecking (Z)V
-	public fun setTextContent (Ljava/lang/String;)V
-	public fun setUserData (Ljava/lang/String;Ljava/lang/Object;Lorg/w3c/dom/UserDataHandler;)Ljava/lang/Object;
-	public fun setXmlStandalone (Z)V
-	public fun setXmlVersion (Ljava/lang/String;)V
-}
-
-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 getValue (Ljava/lang/Void;Lkotlin/reflect/KProperty;)Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;
-	public final fun original ()Lcom/android/tools/smali/dexlib2/iface/Method;
-	public final fun stop ()Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;
-}
-
-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/proxy/ClassProxy {
-	public final fun getImmutableClass ()Lcom/android/tools/smali/dexlib2/iface/ClassDef;
-	public final fun getMutableClass ()Lapp/revanced/patcher/util/proxy/mutableTypes/MutableClass;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation : com/android/tools/smali/dexlib2/base/BaseAnnotation {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/Annotation;)V
-	public fun getElements ()Ljava/util/Set;
-	public fun getType ()Ljava/lang/String;
-	public fun getVisibility ()I
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/Annotation;)Lapp/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement : com/android/tools/smali/dexlib2/base/BaseAnnotationElement {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/AnnotationElement;)V
-	public fun getName ()Ljava/lang/String;
-	public fun getValue ()Lcom/android/tools/smali/dexlib2/iface/value/EncodedValue;
-	public final fun setName (Ljava/lang/String;)V
-	public final fun setValue (Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue;)V
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/AnnotationElement;)Lapp/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/MutableClass : com/android/tools/smali/dexlib2/base/reference/BaseTypeReference, com/android/tools/smali/dexlib2/iface/ClassDef {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/MutableClass$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/ClassDef;)V
-	public final fun charAt (I)C
-	public fun get (I)C
-	public fun getAccessFlags ()I
-	public fun getAnnotations ()Ljava/util/Set;
-	public synthetic fun getDirectMethods ()Ljava/lang/Iterable;
-	public fun getDirectMethods ()Ljava/util/Set;
-	public synthetic fun getFields ()Ljava/lang/Iterable;
-	public fun getFields ()Ljava/util/Set;
-	public synthetic fun getInstanceFields ()Ljava/lang/Iterable;
-	public fun getInstanceFields ()Ljava/util/Set;
-	public fun getInterfaces ()Ljava/util/List;
-	public fun getLength ()I
-	public synthetic fun getMethods ()Ljava/lang/Iterable;
-	public fun getMethods ()Ljava/util/Set;
-	public fun getSourceFile ()Ljava/lang/String;
-	public synthetic fun getStaticFields ()Ljava/lang/Iterable;
-	public fun getStaticFields ()Ljava/util/Set;
-	public fun getSuperclass ()Ljava/lang/String;
-	public fun getType ()Ljava/lang/String;
-	public synthetic fun getVirtualMethods ()Ljava/lang/Iterable;
-	public fun getVirtualMethods ()Ljava/util/Set;
-	public final fun length ()I
-	public final fun setAccessFlags (I)V
-	public final fun setSourceFile (Ljava/lang/String;)V
-	public final fun setSuperClass (Ljava/lang/String;)V
-	public final fun setType (Ljava/lang/String;)V
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/MutableClass$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/ClassDef;)Lapp/revanced/patcher/util/proxy/mutableTypes/MutableClass;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/MutableField : com/android/tools/smali/dexlib2/base/reference/BaseFieldReference, com/android/tools/smali/dexlib2/iface/Field {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/MutableField$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/Field;)V
-	public fun getAccessFlags ()I
-	public fun getAnnotations ()Ljava/util/Set;
-	public fun getDefiningClass ()Ljava/lang/String;
-	public fun getHiddenApiRestrictions ()Ljava/util/Set;
-	public fun getInitialValue ()Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue;
-	public synthetic fun getInitialValue ()Lcom/android/tools/smali/dexlib2/iface/value/EncodedValue;
-	public fun getName ()Ljava/lang/String;
-	public fun getType ()Ljava/lang/String;
-	public final fun setAccessFlags (I)V
-	public final fun setDefiningClass (Ljava/lang/String;)V
-	public final fun setInitialValue (Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue;)V
-	public final fun setName (Ljava/lang/String;)V
-	public final fun setType (Ljava/lang/String;)V
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/MutableField$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/Field;)Lapp/revanced/patcher/util/proxy/mutableTypes/MutableField;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/MutableMethod : com/android/tools/smali/dexlib2/base/reference/BaseMethodReference, com/android/tools/smali/dexlib2/iface/Method {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/Method;)V
-	public fun getAccessFlags ()I
-	public fun getAnnotations ()Ljava/util/Set;
-	public fun getDefiningClass ()Ljava/lang/String;
-	public fun getHiddenApiRestrictions ()Ljava/util/Set;
-	public fun getImplementation ()Lcom/android/tools/smali/dexlib2/builder/MutableMethodImplementation;
-	public synthetic fun getImplementation ()Lcom/android/tools/smali/dexlib2/iface/MethodImplementation;
-	public fun getName ()Ljava/lang/String;
-	public fun getParameterTypes ()Ljava/util/List;
-	public fun getParameters ()Ljava/util/List;
-	public fun getReturnType ()Ljava/lang/String;
-	public final fun setAccessFlags (I)V
-	public final fun setDefiningClass (Ljava/lang/String;)V
-	public final fun setName (Ljava/lang/String;)V
-	public final fun setReturnType (Ljava/lang/String;)V
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/MutableMethod$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/Method;)Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter : com/android/tools/smali/dexlib2/base/BaseMethodParameter, com/android/tools/smali/dexlib2/iface/MethodParameter {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/MethodParameter;)V
-	public final fun charAt (I)C
-	public fun get (I)C
-	public fun getAnnotations ()Ljava/util/Set;
-	public fun getLength ()I
-	public fun getName ()Ljava/lang/String;
-	public fun getSignature ()Ljava/lang/String;
-	public fun getType ()Ljava/lang/String;
-	public final fun length ()I
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/MethodParameter;)Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseAnnotationEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/AnnotationEncodedValue;)V
-	public fun getElements ()Ljava/util/Set;
-	public fun getType ()Ljava/lang/String;
-	public final fun setType (Ljava/lang/String;)V
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/AnnotationEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseArrayEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/ArrayEncodedValue;)V
-	public fun getValue ()Ljava/util/List;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/ArrayEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseBooleanEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/BooleanEncodedValue;)V
-	public fun getValue ()Z
-	public final fun setValue (Z)V
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/BooleanEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseByteEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/ByteEncodedValue;)V
-	public fun getValue ()B
-	public final fun setValue (B)V
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/ByteEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseCharEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/CharEncodedValue;)V
-	public fun getValue ()C
-	public final fun setValue (C)V
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/CharEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseDoubleEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/DoubleEncodedValue;)V
-	public fun getValue ()D
-	public final fun setValue (D)V
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/DoubleEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue;
-}
-
-public abstract interface class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue : com/android/tools/smali/dexlib2/iface/value/EncodedValue {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue$Companion;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/EncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEnumEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseEnumEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEnumEncodedValue$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/EnumEncodedValue;)V
-	public fun getValue ()Lcom/android/tools/smali/dexlib2/iface/reference/FieldReference;
-	public final fun setValue (Lcom/android/tools/smali/dexlib2/iface/reference/FieldReference;)V
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEnumEncodedValue$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/EnumEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEnumEncodedValue;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFieldEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseFieldEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFieldEncodedValue$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/FieldEncodedValue;)V
-	public fun getValue ()Lcom/android/tools/smali/dexlib2/iface/reference/FieldReference;
-	public fun getValueType ()I
-	public final fun setValue (Lcom/android/tools/smali/dexlib2/iface/reference/FieldReference;)V
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFieldEncodedValue$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/FieldEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFieldEncodedValue;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFloatEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseFloatEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFloatEncodedValue$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/FloatEncodedValue;)V
-	public fun getValue ()F
-	public final fun setValue (F)V
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFloatEncodedValue$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/FloatEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFloatEncodedValue;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableIntEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseIntEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableIntEncodedValue$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/IntEncodedValue;)V
-	public fun getValue ()I
-	public final fun setValue (I)V
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableIntEncodedValue$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/IntEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableIntEncodedValue;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableLongEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseLongEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableLongEncodedValue$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/LongEncodedValue;)V
-	public fun getValue ()J
-	public final fun setValue (J)V
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableLongEncodedValue$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/LongEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableLongEncodedValue;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseMethodEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodEncodedValue$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/MethodEncodedValue;)V
-	public fun getValue ()Lcom/android/tools/smali/dexlib2/iface/reference/MethodReference;
-	public final fun setValue (Lcom/android/tools/smali/dexlib2/iface/reference/MethodReference;)V
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodEncodedValue$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/MethodEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodEncodedValue;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodHandleEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseMethodHandleEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodHandleEncodedValue$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/MethodHandleEncodedValue;)V
-	public fun getValue ()Lcom/android/tools/smali/dexlib2/iface/reference/MethodHandleReference;
-	public final fun setValue (Lcom/android/tools/smali/dexlib2/iface/reference/MethodHandleReference;)V
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodHandleEncodedValue$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/MethodHandleEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodHandleEncodedValue;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodTypeEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseMethodTypeEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodTypeEncodedValue$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/MethodTypeEncodedValue;)V
-	public fun getValue ()Lcom/android/tools/smali/dexlib2/iface/reference/MethodProtoReference;
-	public final fun setValue (Lcom/android/tools/smali/dexlib2/iface/reference/MethodProtoReference;)V
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodTypeEncodedValue$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/MethodTypeEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodTypeEncodedValue;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableNullEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseNullEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableNullEncodedValue$Companion;
-	public fun <init> ()V
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableNullEncodedValue$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/ByteEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableShortEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseShortEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableShortEncodedValue$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/ShortEncodedValue;)V
-	public fun getValue ()S
-	public final fun setValue (S)V
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableShortEncodedValue$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/ShortEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableShortEncodedValue;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableStringEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseStringEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableStringEncodedValue$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/StringEncodedValue;)V
-	public fun getValue ()Ljava/lang/String;
-	public final fun setValue (Ljava/lang/String;)V
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableStringEncodedValue$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/ByteEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue;
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableTypeEncodedValue : com/android/tools/smali/dexlib2/base/value/BaseTypeEncodedValue, app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue {
-	public static final field Companion Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableTypeEncodedValue$Companion;
-	public fun <init> (Lcom/android/tools/smali/dexlib2/iface/value/TypeEncodedValue;)V
-	public fun getValue ()Ljava/lang/String;
-	public final fun setValue (Ljava/lang/String;)V
-}
-
-public final class app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableTypeEncodedValue$Companion {
-	public final fun toMutable (Lcom/android/tools/smali/dexlib2/iface/value/TypeEncodedValue;)Lapp/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableTypeEncodedValue;
-}
-
-public final class app/revanced/patcher/util/smali/ExternalLabel {
-	public fun <init> (Ljava/lang/String;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;)V
-	public final fun copy (Ljava/lang/String;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;)Lapp/revanced/patcher/util/smali/ExternalLabel;
-	public static synthetic fun copy$default (Lapp/revanced/patcher/util/smali/ExternalLabel;Ljava/lang/String;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;ILjava/lang/Object;)Lapp/revanced/patcher/util/smali/ExternalLabel;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class app/revanced/patcher/util/smali/InlineSmaliCompiler {
-	public static final field Companion Lapp/revanced/patcher/util/smali/InlineSmaliCompiler$Companion;
-	public fun <init> ()V
-}
-
-public final class app/revanced/patcher/util/smali/InlineSmaliCompiler$Companion {
-	public final fun compile (Ljava/lang/String;Ljava/lang/String;IZ)Ljava/util/List;
-}
-
-public final class app/revanced/patcher/util/smali/InlineSmaliCompilerKt {
-	public static final fun toInstruction (Ljava/lang/String;Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;)Lcom/android/tools/smali/dexlib2/builder/BuilderInstruction;
-	public static synthetic fun toInstruction$default (Ljava/lang/String;Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILjava/lang/Object;)Lcom/android/tools/smali/dexlib2/builder/BuilderInstruction;
-	public static final fun toInstructions (Ljava/lang/String;Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;)Ljava/util/List;
-	public static synthetic fun toInstructions$default (Ljava/lang/String;Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;ILjava/lang/Object;)Ljava/util/List;
-}
-
--- a/assets/revanced-headline/revanced-headline-vertical-dark.svg
+++ b/assets/revanced-headline/revanced-headline-vertical-dark.svg
--- a/assets/revanced-headline/revanced-headline-vertical-light.svg
+++ b/assets/revanced-headline/revanced-headline-vertical-light.svg
--- a/assets/revanced-logo/revanced-logo.svg
+++ b/assets/revanced-logo/revanced-logo.svg
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 800 800" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><g id="Logo"><g id="Ring"><circle id="Ring-Background" serif:id="Ring Background" cx="400" cy="400" r="400" style="fill:#1b1b1b;"/><path id="Ring1" serif:id="Ring" d="M400,0c220.766,0 400,179.234 400,400c-0,220.766 -179.234,400 -400,400c-220.766,-0 -400,-179.234 -400,-400c0,-220.766 179.234,-400 400,-400Zm-0,36c200.897,-0 364,163.103 364,364c0,200.897 -163.103,364 -364,364c-200.897,0 -364,-163.103 -364,-364c-0,-200.897 163.103,-364 364,-364Z" style="fill:url(#_Linear1);"/></g><g id="Shape"><path id="V-Shape" serif:id="V Shape" d="M538.74,269.872c1.481,-3.382 1.157,-7.283 -0.863,-10.373c-2.021,-3.091 -5.464,-4.954 -9.156,-4.954c-5.148,0 -10.435,0 -14.165,0c-3.1,0 -5.907,1.834 -7.153,4.672c-12.468,28.396 -78.273,178.273 -100.25,228.328c-1.246,2.838 -4.053,4.671 -7.154,4.671c-3.1,0 -5.907,-1.833 -7.153,-4.671c-21.977,-50.055 -87.782,-199.932 -100.25,-228.328c-1.246,-2.838 -4.053,-4.672 -7.153,-4.672c-3.73,0 -9.017,0 -14.164,0c-3.693,0 -7.135,1.863 -9.156,4.954c-2.02,3.09 -2.344,6.991 -0.863,10.373c23.557,53.766 101.872,232.519 117.871,269.034c1.743,3.979 5.674,6.549 10.018,6.549c6.293,-0 15.408,-0 21.701,-0c4.344,-0 8.275,-2.57 10.018,-6.549c15.999,-36.515 94.315,-215.268 117.872,-269.034Z" style="fill:#fff;"/><path id="Diamond" d="M408.119,395.312c-1.675,2.901 -4.77,4.688 -8.119,4.688c-3.349,-0 -6.444,-1.787 -8.119,-4.688c-16.997,-29.44 -56.156,-97.264 -73.153,-126.704c-1.675,-2.901 -1.675,-6.474 0,-9.375c1.675,-2.901 4.77,-4.688 8.119,-4.688c33.995,0 112.311,0 146.306,0c3.349,0 6.444,1.787 8.119,4.688c1.675,2.901 1.675,6.474 -0,9.375c-16.997,29.44 -56.156,97.264 -73.153,126.704Z" style="fill:url(#_Linear2);"/></g></g><defs><linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.89859e-14,800,-800,4.89859e-14,400.001,3.31681e-10)"><stop offset="0" style="stop-color:#f04e98;stop-opacity:1"/><stop offset="0.5" style="stop-color:#5f65d4;stop-opacity:1"/><stop offset="1" style="stop-color:#4e98f0;stop-opacity:1"/></linearGradient><linearGradient id="_Linear2" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.77155e-14,289.317,-282.535,1.73003e-14,400,254.545)"><stop offset="0" style="stop-color:#f04e98;stop-opacity:1"/><stop offset="0.5" style="stop-color:#5f65d4;stop-opacity:1"/><stop offset="1" style="stop-color:#4e98f0;stop-opacity:1"/></linearGradient></defs></svg>
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,19 +1,38 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
 plugins {
-    alias(libs.plugins.kotlin)
-    alias(libs.plugins.binary.compatibility.validator)
+    kotlin("jvm") version "1.6.20"
+    java
    `maven-publish`
-    signing
 }

 group = "app.revanced"

-tasks {
-    processResources {
-        expand("projectVersion" to project.version)
+repositories {
+    mavenCentral()
+    maven {
+        url = uri("https://maven.pkg.github.com/revanced/multidexlib2")
+        credentials {
+            // DO NOT set these variables in the project's gradle.properties.
+            // Instead, you should set them in:
+            // Windows: %homepath%\.gradle\gradle.properties
+            // Linux: ~/.gradle/gradle.properties
+            username = project.findProperty("gpr.user") as String? ?: System.getenv("GITHUB_ACTOR") // DO NOT CHANGE!
+            password = project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN") // DO NOT CHANGE!
+        }
    }
+}

+dependencies {
+    implementation(kotlin("stdlib"))
+
+    api("org.apktool:apktool-lib:2.6.1")
+    api("app.revanced:multidexlib2:2.5.2.r2")
+    api("org.smali:smali:2.5.2")
+
+    testImplementation(kotlin("test"))
+    implementation(kotlin("reflect"))
+}
+
+tasks {
    test {
        useJUnitPlatform()
        testLogging {
@@ -22,96 +41,31 @@ tasks {
    }
 }

-repositories {
-    mavenCentral()
-    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 {
-    // TODO: Convert project to KMP.
-    compileOnly(libs.android) {
-        // Exclude, otherwise the org.w3c.dom API breaks.
-        exclude(group = "xerces", module = "xmlParserAPIs")
-    }
-
-    implementation(libs.apktool.lib)
-    implementation(libs.kotlin.reflect)
-    implementation(libs.kotlinx.coroutines.core)
-    implementation(libs.multidexlib2)
-    implementation(libs.smali)
-    implementation(libs.xpp3)
-
-    testImplementation(libs.mockk)
-    testImplementation(libs.kotlin.test)
-}
-
-kotlin {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
-    }
-}
-
 java {
-    targetCompatibility = JavaVersion.VERSION_11
-
    withSourcesJar()
+    withJavadocJar()
 }

+val isGitHubCI = System.getenv("GITHUB_ACTOR") != null
+
 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")
+        if (isGitHubCI) {
+            maven {
+                name = "GitHubPackages"
+                url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
+                credentials {
+                    username = System.getenv("GITHUB_ACTOR")
+                    password = System.getenv("GITHUB_TOKEN")
+                }
            }
+        } else {
+            mavenLocal()
        }
    }
-
    publications {
-        create<MavenPublication>("revanced-patcher-publication") {
+        register<MavenPublication>("gpr") {
            from(components["java"])
-
-            version = project.version.toString()
-
-            pom {
-                name = "ReVanced Patcher"
-                description = "Patcher used by ReVanced."
-                url = "https://revanced.app"
-
-                licenses {
-                    license {
-                        name = "GNU General Public License v3.0"
-                        url = "https://www.gnu.org/licenses/gpl-3.0.en.html"
-                    }
-                }
-                developers {
-                    developer {
-                        id = "ReVanced"
-                        name = "ReVanced"
-                        email = "contact@revanced.app"
-                    }
-                }
-                scm {
-                    connection = "scm:git:git://github.com/revanced/revanced-patcher.git"
-                    developerConnection = "scm:git:git@github.com:revanced/revanced-patcher.git"
-                    url = "https://github.com/revanced/revanced-patcher"
-                }
-            }
        }
    }
-}
-
-signing {
-    useGpgCmd()
-    sign(publishing.publications["revanced-patcher-publication"])
-}
+}
--- a/docs/1_patcher_intro.md
+++ b/docs/1_patcher_intro.md
@@ -1,111 +0,0 @@
-<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
@@ -1,112 +0,0 @@
-<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.
-
-> [!NOTE]
-> To start a fresh project, 
-> you can use the [ReVanced Patches template](https://github.com/revanced/revanced-patches-template).
-
-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
@@ -1,307 +0,0 @@
-<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, a fingerprint is a partial description of a method.
-It is used to uniquely match a method by its characteristics.
-Fingerprinting is 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
-
-An example fingerprint is shown below:
-
-```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) -> classDef == "Lcom/some/app/ads/AdsLoader;" }
-}
-```
-
-## 🔎 Reconstructing the original code from the example fingerprint from above
-
-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) -> classDef == "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>;
-    }
-}
-```
-
-Using that fingerprint, this method can be matched uniquely from all other methods.
-
-> [!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
-
-A fingerprint is matched to a method,
-once the `match` property of the fingerprint is accessed in a patch's `execute` scope:
-
-```kt
-val fingerprint = fingerprint {
-    // ...
-}
-
-val patch = bytecodePatch {
-    execute {
-        val match = fingerprint.match!!
-    }
-}
-```
-
-The fingerprint won't be matched again, if it has already been matched once.
-This makes it useful, to share fingerprints between multiple patches, and let the first patch match the fingerprint:
-
-```kt
-// Either of these two patches will match the fingerprint first and the other patch can reuse the match:
-val mainActivityPatch1 = bytecodePatch {
-    execute {
-        val match = mainActivityOnCreateFingerprint.match!!
-    }
-}
-
-val mainActivityPatch2 = bytecodePatch {
-    execute {
-        val match = mainActivityOnCreateFingerprint.match!!
-    }
-}
-```
-
-A fingerprint match can also be delegated to a variable for convenience without the need to check for `null`:
-```kt
-val fingerprint = fingerprint {
-    // ...
-}
-
-val patch = bytecodePatch {
-    execute {
-        // Alternative to fingerprint.match ?: throw PatchException("No match found")
-        val match by fingerprint.match
-
-        try {
-            match.method
-        } catch (e: PatchException) {
-            // Handle the exception for example.
-        }
-    }
-}
-```
-
-> [!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.
-
-> [!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,
->    )
->}
-> ```
-> 
-The match of a fingerprint contains references to the original method and class definition of the method:
-
-```kt
-class Match(
-    val originalMethod: Method,
-    val originalClassDef: ClassDef,
-    val patternMatch: Match.PatternMatch?,
-    val stringMatches: List<Match.StringMatch>?,
-    // ...
-) {
-    val classDef by lazy { /* ... */ }
-    val method by lazy { /* ... */ }
-
-    // ...
-}
-```
-
-The `classDef` and `method` properties can be used to make changes to the class or method.
-They are lazy properties, so they are only computed 
-and will effectively replace the original method or class definition when accessed.
-
-> [!TIP]
-> If only read-only access to the class or method is needed, 
-> the `originalClassDef` and `originalMethod` properties can be used, 
-> to avoid making a mutable copy of the class or method.
-
-## 🏹 Manually matching fingerprints
-
-By default, a fingerprint is matched automatically against all classes when the `match` property is accessed.
-
-Instead, the fingerprint can be matched manually using various overloads of a fingerprint's `match` function:
-
- 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 {
-    val match = showAdsFingerprint.match(classes) ?: 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 {
-    val adsLoaderClass = classes.single { it.name == "Lcom/some/app/ads/Loader;" }
-
-    val match = showAdsFingerprint.match(context, adsLoaderClass) ?: throw PatchException("No match found")
-  }
-  ```
-  
-  Another common usecase is to use a fingerprint to reduce the search space of a method to a single class.
-
-  ```kt
-  execute {
-    // Match showAdsFingerprint in the class of the ads loader found by adsLoaderClassFingerprint.
-    val match by showAdsFingerprint.match(adsLoaderClassFingerprint.match!!.classDef)
-  }
-  ```
-
- 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 {
-    val currentPlanFingerprint = fingerprint {
-      strings("free", "trial")
-    }
-
-    currentPlanFingerprint.match(adsFingerprintMatch.method)?.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
@@ -1,262 +0,0 @@
-<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"))
-    
-    // Patches can depend on other patches, executing them first.
-    dependsOn(disableAdsResourcePatch)
-
-    // Merge precompiled DEX files into the patched app, before the patch is executed.
-    extendWith("disable-ads.rve")
-    
-    // Business logic of the patch to disable ads in the app.
-    execute {
-        // Fingerprint to find the method to patch.
-        val showAdsMatch by showAdsFingerprint {
-          // More about fingerprints on the next page of the documentation.
-        }
-      
-        // In the method that shows ads,
-        // call DisableAdsPatch.shouldDisableAds() from the extension (precompiled DEX file)
-        // to enable or disable ads.
-        showAdsMatch.method.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. Captures the full type information of the option.
-```
-
-Options can be declared outside a patch and added to a patch manually:
-
-```kt
-val option = stringOption(key = "option")
-
-bytecodePatch(name = "Patch") {
-    val value by option()
-}
-```
-
-This is useful when the same option is referenced in multiple patches.
-
-### 🧩 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")
-  
-    execute { 
-        fingerprint.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
@@ -1,126 +0,0 @@
-<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 { 
-        // More about this on the next page of the documentation.
-    }
-}
-
-@Surpress("unused")
-val rawResourcePatch = rawResourcePatch {
-    execute {
-        // More about this on the next page of the documentation.
-    }
-}
-
-@Surpress("unused")
-val resourcePatch = resourcePatch {
-    execute {
-        // More about this on the next page of the documentation.
-    }
-}
-```
-
-> [!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
@@ -1,105 +0,0 @@
-<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
@@ -1,116 +0,0 @@
-# 💪 Advanced APIs
-
-A handful of APIs are available to make patch development easier and more efficient.
-
-## 📙 Overview
-
-1. 👹 Create mutable replacements of classes with `proxy(ClassDef)`
-2. 🔍 Find and create mutable replaces with `classBy(Predicate)`
-3. 🏃‍ Navigate method calls recursively by index with `navigate(Method)`
-4. 💾 Read and write resource files with `get(String, Boolean)` and `delete(String)`
-5. 📃 Read and write DOM files using `document(String)` and  `document(InputStream)`
-
-### 🧰 APIs
-
-#### 👹 `proxy(ClassDef)`
-
-By default, the classes are immutable, meaning they cannot be modified.
-To make a class mutable, use the `proxy(ClassDef)` function.
-This function creates a lazy mutable copy of the class definition.
-Accessing the property will replace the original class definition with the mutable copy,
-thus allowing you to make changes to the class. Subsequent accesses will return the same mutable copy.
-
-```kt
-execute {
-    val mutableClass = proxy(classDef)
-    mutableClass.methods.add(Method())
-}
-```
-
-#### 🔍 `classBy(Predicate)`
-
-The `classBy(Predicate)` function is an alternative to finding and creating mutable classes by a predicate.
-It automatically proxies the class definition, making it mutable.
-
-```kt
-execute {
-    // Alternative to proxy(classes.find { it.name == "Lcom/example/MyClass;" })?.classDef
-    val classDef = classBy { it.name == "Lcom/example/MyClass;" }?.classDef
-}
-```
-
-#### 🏃‍ `navigate(Method).at(index)`
-
-The `navigate(Method)` function allows you to navigate method calls recursively by index.
-
-```kt
-execute {
-    // Sequentially navigate to the instructions at index 1 within 'someMethod'.
-    val method = navigate(someMethod).at(1).original() // original() returns the original immutable method.
-    
-    // Further navigate to the second occurrence where the instruction's opcode is 'INVOKEVIRTUAL'.
-    // stop() returns the mutable copy of the method.
-    val method = navigate(someMethod).at(2) { instruction -> instruction.opcode == Opcode.INVOKEVIRTUAL }.stop()
-    
-    // Alternatively, to stop(), you can delegate the method to a variable.
-    val method by navigate(someMethod).at(1)
-    
-    // You can chain multiple calls to at() to navigate deeper into the method.
-    val method by navigate(someMethod).at(1).at(2, 3, 4).at(5)
-}
-```
-
-#### 💾 `get(String, Boolean)` and `delete(String)`
-
-The `get(String, Boolean)` function returns a `File` object that can be used to read and write resource files.
-
-```kt
-execute {
-    val file = get("res/values/strings.xml")
-    val content = file.readText()
-    file.writeText(content)
-}
-```
-
-The `delete` function can mark files for deletion when the APK is rebuilt.
-
-```kt
-execute {
-    delete("res/values/strings.xml")
-}
-```
-
-#### 📃 `document(String)`  and  `document(InputStream)`
-
-The `document` function is used to read and write DOM files.
-
-```kt
-execute { 
-    document("res/values/strings.xml").use { document ->
-        val element = doc.createElement("string").apply {
-            textContent = "Hello, World!"
-        }
-        document.documentElement.appendChild(element)
-    }
-}
-```
-
-You can also read documents from an `InputStream`:
-
-```kt
-execute {
-    val inputStream = classLoader.getResourceAsStream("some.xml")
-    document(inputStream).use { document ->
-        // ...
-    }
-}
-```
-
-## 🎉 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
@@ -1,73 +0,0 @@
-<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,2 @@
-org.gradle.parallel = true
-org.gradle.caching = true
-version = 21.0.0-dev.2
+kotlin.code.style = official
+version = 1.0.0-dev.12
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,27 +0,0 @@
-[versions]
-android = "4.1.1.4"
-apktool-lib = "2.9.3"
-binary-compatibility-validator = "0.15.1"
-kotlin = "2.0.0"
-kotlinx-coroutines-core = "1.8.1"
-mockk = "1.13.10"
-multidexlib2 = "3.0.3.r3"
-# Tracking https://github.com/google/smali/issues/64.
-#noinspection GradleDependency
-smali = "3.0.5"
-xpp3 = "1.1.4c"
-
-[libraries]
-android = { module = "com.google.android:android", version.ref = "android" }
-apktool-lib = { module = "app.revanced:apktool-lib", version.ref = "apktool-lib" }
-kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
-kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines-core" }
-kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
-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" }
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,8 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/285
+++ b/285
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh

 #
-# Copyright © 2015-2021 the original authors.
+# Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,104 +15,69 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#

 ##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################

 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
 done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null

-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"

 warn () {
    echo "$*"
-} >&2
+}

 die () {
    echo
    echo "$*"
    echo
    exit 1
-} >&2
+}

 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MSYS* | MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -122,9 +87,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
    else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -133,120 +98,88 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
-    JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi

 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
 fi

-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi

 # For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`

-    JAVACMD=$( cygpath --unix "$JAVACMD" )
+    JAVACMD=`cygpath --unix "$JAVACMD"`

-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi

+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`

-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

 exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,10 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem

-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem  Gradle startup script for Windows
@@ -27,8 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal

 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

@@ -43,13 +40,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto execute

-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.

 goto fail

@@ -59,11 +56,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

 if exist "%JAVA_EXE%" goto execute

-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.

 goto fail

@@ -78,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

 :end
@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd

 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1

 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,9 +0,0 @@
-{
-  "devDependencies": {
-    "@saithodev/semantic-release-backmerge": "^4.0.1",
-    "@semantic-release/changelog": "^6.0.3",
-    "@semantic-release/git": "^10.0.1",
-    "gradle-semantic-release-plugin": "^1.10.1",
-    "semantic-release": "^24.1.2"
-  }
-}
--- a/src/main/kotlin/app/revanced/patcher/Fingerprint.kt
+++ b/src/main/kotlin/app/revanced/patcher/Fingerprint.kt
@@ -1,445 +0,0 @@
-@file:Suppress("unused", "MemberVisibilityCanBePrivate")
-
-package app.revanced.patcher
-
-import app.revanced.patcher.extensions.InstructionExtensions.instructionsOrNull
-import app.revanced.patcher.patch.*
-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 for a method. A fingerprint is a partial description of a method.
- * It is used to uniquely match a method by its characteristics.
- *
- * An example fingerprint for a public method that takes a single string parameter and returns void:
- * ```
- * fingerprint {
- *    accessFlags(AccessFlags.PUBLIC)
- *    returns("V")
- *    parameters("Ljava/lang/String;")
- * }
- * ```
- *
- * @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.
-     */
-    // Backing property for "match" extension in BytecodePatchContext.
-    @Suppress("ktlint:standard:backing-property-naming", "PropertyName")
-    internal var _match: Match? = null
-
-    /**
-     * 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 [BytecodePatchContext] to match against [BytecodePatchContext.classes].
-     * @return The [Match] if a match was found or if the fingerprint is already matched to a method, null otherwise.
-     */
-    internal fun match(context: BytecodePatchContext): Match? {
-        if (_match != null) return _match
-
-        val lookupMaps = context.lookupMaps
-
-        fun Fingerprint.match(methodClasses: MethodClassPairs): Match? {
-            methodClasses.forEach { (classDef, method) ->
-                val match = match(context, classDef, method)
-                if (match != null) return match
-            }
-
-            return null
-        }
-
-        // TODO: If only one string is necessary, why not use a single string for every fingerprint?
-        val match = strings?.firstNotNullOfOrNull { lookupMaps.methodsByStrings[it] }?.let(::match)
-        if (match != null) return match
-
-        context.classes.forEach { classDef ->
-            val match = match(context, classDef)
-            if (match != null) return match
-        }
-
-        return null
-    }
-
-    /**
-     * Match using a [ClassDef].
-     *
-     * @param classDef The class to match against.
-     * @param context The [BytecodePatchContext] to match against [BytecodePatchContext.classes].
-     * @return The [Match] if a match was found or if the fingerprint is already matched to a method, null otherwise.
-     */
-    internal fun match(
-        context: BytecodePatchContext,
-        classDef: ClassDef,
-    ): Match? {
-        if (_match != null) return _match
-
-        for (method in classDef.methods) {
-            val match = match(context, method, classDef)
-            if (match != null)return match
-        }
-
-        return null
-    }
-
-    /**
-     * Match using a [Method].
-     * The class is retrieved from the method.
-     *
-     * @param method The method to match against.
-     * @param context The [BytecodePatchContext] to match against [BytecodePatchContext.classes].
-     * @return The [Match] if a match was found or if the fingerprint is already matched to a method, null otherwise.
-     */
-    internal fun match(
-        context: BytecodePatchContext,
-        method: Method,
-    ) = match(context, method, context.classBy { method.definingClass == it.type }!!.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 [BytecodePatchContext] to match against [BytecodePatchContext.classes].
-     * @return The [Match] if a match was found or if the fingerprint is already matched to a method, null otherwise.
-     */
-    internal fun match(
-        context: BytecodePatchContext,
-        method: Method,
-        classDef: ClassDef,
-    ): Match? {
-        if (_match != null) return _match
-
-        if (returnType != null && !method.returnType.startsWith(returnType)) {
-            return null
-        }
-
-        if (accessFlags != null && accessFlags != method.accessFlags) {
-            return null
-        }
-
-        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 null
-        }
-
-        if (custom != null && !custom.invoke(method, classDef)) {
-            return null
-        }
-
-        val stringMatches: List<Match.StringMatch>? =
-            if (strings != null) {
-                buildList {
-                    val instructions = method.instructionsOrNull ?: return null
-
-                    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 null
-                }
-            } else {
-                null
-            }
-
-        val patternMatch = if (opcodes != null) {
-            val instructions = method.instructionsOrNull ?: return null
-
-            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 null
-        } else {
-            null
-        }
-
-        _match = Match(
-            classDef,
-            method,
-            patternMatch,
-            stringMatches,
-            context,
-        )
-
-        return _match
-    }
-}
-
-/**
- * A match for a [Fingerprint].
- *
- * @param originalClassDef The class the matching method is a member of.
- * @param originalMethod The matching method.
- * @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 internal constructor(
-    val originalClassDef: ClassDef,
-    val originalMethod: Method,
-    val patternMatch: PatternMatch?,
-    val stringMatches: List<StringMatch>?,
-    internal val context: BytecodePatchContext,
-) {
-    /**
-     * The mutable version of [originalClassDef].
-     *
-     * Accessing this property allocates a [ClassProxy].
-     * Use [originalClassDef] if mutable access is not required.
-     */
-    val classDef by lazy { context.proxy(originalClassDef).mutableClass }
-
-    /**
-     * The mutable version of [originalMethod].
-     *
-     * Accessing this property allocates a [ClassProxy].
-     * Use [originalMethod] if mutable access is not required.
-     */
-    val method by lazy { classDef.methods.first { MethodUtil.methodSignaturesMatch(it, originalMethod) } }
-
-    /**
-     * 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].
-     */
-    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()
--- a/src/main/kotlin/app/revanced/patcher/InternalApi.kt
+++ b/src/main/kotlin/app/revanced/patcher/InternalApi.kt
@@ -1,7 +0,0 @@
-package app.revanced.patcher
-
-@RequiresOptIn(
-    level = RequiresOptIn.Level.ERROR,
-    message = "This is an internal API, don't rely on it.",
-)
-annotation class InternalApi
--- a/src/main/kotlin/app/revanced/patcher/PackageMetadata.kt
+++ b/src/main/kotlin/app/revanced/patcher/PackageMetadata.kt
@@ -1,16 +0,0 @@
-package app.revanced.patcher
-
-import brut.androlib.apk.ApkInfo
-
-/**
- * Metadata about a package.
- *
- * @param apkInfo The [ApkInfo] of the apk file.
- */
-class PackageMetadata internal constructor(internal val apkInfo: ApkInfo) {
-    lateinit var packageName: String
-        internal set
-
-    lateinit var packageVersion: String
-        internal set
-}
--- a/src/main/kotlin/app/revanced/patcher/Patcher.kt
+++ b/src/main/kotlin/app/revanced/patcher/Patcher.kt
@@ -1,160 +1,223 @@
 package app.revanced.patcher

-import app.revanced.patcher.patch.*
-import kotlinx.coroutines.flow.flow
-import java.io.Closeable
-import java.util.logging.Logger
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.data.PatcherData
+import app.revanced.patcher.data.base.Data
+import app.revanced.patcher.data.implementation.findIndexed
+import app.revanced.patcher.extensions.findAnnotationRecursively
+import app.revanced.patcher.patch.base.Patch
+import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.implementation.ResourcePatch
+import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.signature.implementation.method.resolver.MethodSignatureResolver
+import app.revanced.patcher.util.ListBackedSet
+import brut.androlib.Androlib
+import brut.androlib.meta.UsesFramework
+import brut.directory.ExtFile
+import lanchon.multidexlib2.BasicDexFileNamer
+import lanchon.multidexlib2.DexIO
+import lanchon.multidexlib2.MultiDexIO
+import org.jf.dexlib2.Opcodes
+import org.jf.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.DexFile
+import org.jf.dexlib2.writer.io.MemoryDataStore
+import java.io.File
+
+val NAMER = BasicDexFileNamer()

 /**
- * A Patcher.
- *
- * @param config The configuration to use for the patcher.
+ * The ReVanced Patcher.
+ * @param inputFile The input file (usually an apk file).
+ * @param resourceCacheDirectory Directory to cache resources.
+ * @param patchResources Weather to use the resource patcher. Resources will still need to be decoded.
 */
-class Patcher(private val config: PatcherConfig) : Closeable {
-    private val logger = Logger.getLogger(this::class.java.name)
+class Patcher(
+    inputFile: File,
+    // TODO: maybe a file system in memory is better. Could cause high memory usage.
+    private val resourceCacheDirectory: String,
+    private val patchResources: Boolean = false
+) {
+    val packageVersion: String
+    val packageName: String
+
+    private val usesFramework: UsesFramework
+    private val patcherData: PatcherData
+    private val opcodes: Opcodes
+    private var signaturesResolved = false

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

    init {
-        context.resourceContext.decodeResources(ResourcePatchContext.ResourceMode.NONE)
+        val extFileInput = ExtFile(inputFile)
+        val outDir = File(resourceCacheDirectory)
+
+        if (outDir.exists()) outDir.deleteRecursively()
+        outDir.mkdir()
+
+        val androlib = Androlib()
+
+        val resourceTable = androlib.getResTable(extFileInput, true)
+        // 1. decode resources to cache directory
+        androlib.decodeManifestWithResources(extFileInput, outDir, resourceTable)
+        androlib.decodeResourcesFull(extFileInput, outDir, resourceTable)
+
+        // 2. read framework ids from the resource table
+        usesFramework = UsesFramework()
+        usesFramework.ids = resourceTable.listFramePackages().map { it.id }.sorted()
+
+        // 2. read package info
+        packageName = resourceTable.packageOriginal
+        packageVersion = resourceTable.versionInfo.versionName
+
+        // read dex files
+        val dexFile = MultiDexIO.readDexFile(true, inputFile, NAMER, null, null)
+        opcodes = dexFile.opcodes
+
+        // save to patcher data
+        patcherData = PatcherData(dexFile.classes.toMutableList(), resourceCacheDirectory)
    }

    /**
-     * Add patches.
-     *
+     * Add additional dex file container to the patcher.
+     * @param files The dex file containers to add to the patcher.
+     * @param allowedOverwrites A list of class types that are allowed to be overwritten.
+     * @param throwOnDuplicates If this is set to true, the patcher will throw an exception if a duplicate class has been found.
+     */
+    fun addFiles(
+        files: Iterable<File>,
+        allowedOverwrites: Iterable<String> = emptyList(),
+        throwOnDuplicates: Boolean = false
+    ) {
+        for (file in files) {
+            val dexFile = MultiDexIO.readDexFile(true, file, NAMER, null, null)
+            for (classDef in dexFile.classes) {
+                val e = patcherData.bytecodeData.classes.internalClasses.findIndexed { it.type == classDef.type }
+                if (e != null) {
+                    if (throwOnDuplicates) {
+                        throw Exception("Class ${classDef.type} has already been added to the patcher.")
+                    }
+                    val (_, idx) = e
+                    if (allowedOverwrites.contains(classDef.type)) {
+                        patcherData.bytecodeData.classes.internalClasses[idx] = classDef
+                    }
+                    continue
+                }
+                patcherData.bytecodeData.classes.internalClasses.add(classDef)
+            }
+        }
+    }
+
+    /**
+     * Save the patched dex file.
+     */
+    fun save(): Map<String, MemoryDataStore> {
+        val newDexFile = object : DexFile {
+            override fun getClasses(): Set<ClassDef> {
+                patcherData.bytecodeData.classes.applyProxies()
+                return ListBackedSet(patcherData.bytecodeData.classes.internalClasses)
+            }
+
+            override fun getOpcodes(): Opcodes {
+                return this@Patcher.opcodes
+            }
+        }
+
+        // build modified resources
+        if (patchResources) {
+            val extDir = ExtFile(resourceCacheDirectory)
+
+            // TODO: figure out why a new instance of Androlib is necessary here
+            Androlib().buildResources(extDir, usesFramework)
+        }
+
+        // write dex modified files
+        val output = mutableMapOf<String, MemoryDataStore>()
+        MultiDexIO.writeDexFile(
+            true, -1, // core count
+            output, NAMER, newDexFile,
+            DexIO.DEFAULT_MAX_DEX_POOL_SIZE,
+            null
+        )
+        return output
+    }
+
+    /**
+     * Add a patch to the patcher.
     * @param patches The patches to add.
     */
-    operator fun plusAssign(patches: Set<Patch<*>>) {
-        // Add all patches to the executablePatches set.
-        context.executablePatches += patches
-
-        // Add all patches and their dependencies to the allPatches set.
-        patches.forEach { patch ->
-            fun Patch<*>.addRecursively() =
-                also(context.allPatches::add).dependencies.forEach(Patch<*>::addRecursively)
-
-            patch.addRecursively()
-        }
-
-        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 {
-                ResourcePatchContext.ResourceMode.NONE
-            }
-        }
+    fun addPatches(patches: Iterable<Patch<Data>>) {
+        patcherData.patches.addAll(patches)
    }

    /**
-     * Execute added patches.
-     *
-     * @return A flow of [PatchResult]s.
+     * Resolves all signatures.
     */
-    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
-
-                return PatchResult(this, PatchException("The patch '$this' failed 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()}",
-                        ),
-                    )
-                }
-            }
-
-            // Execute the patch.
-            return try {
-                execute(context)
-
-                PatchResult(this)
-            } catch (exception: PatchException) {
-                PatchResult(this, exception)
-            } catch (exception: Exception) {
-                PatchResult(this, PatchException(exception))
-            }.also { executedPatches[this] = it }
-        }
-
-        // Prevent decoding the app manifest twice if it is not needed.
-        if (config.resourceMode != ResourcePatchContext.ResourceMode.NONE) {
-            context.resourceContext.decodeResources(config.resourceMode)
-        }
-
-        logger.info("Initializing lookup maps")
-
-        // Accessing the lazy lookup maps to initialize them.
-        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)
+    fun resolveSignatures(): List<MethodSignature> {
+        val signatures = buildList {
+            for (patch in patcherData.patches) {
+                if (patch !is BytecodePatch) continue
+                this.addAll(patch.signatures)
            }
        }
-
-        val succeededPatchesWithFinalizeBlock = executedPatches.values.filter {
-            it.exception == null && it.patch.finalizeBlock != null
+        if (signatures.isEmpty()) {
+            return emptyList()
        }

-        succeededPatchesWithFinalizeBlock.asReversed().forEach { executionResult ->
-            val patch = executionResult.patch
+        MethodSignatureResolver(patcherData.bytecodeData.classes.internalClasses, signatures).resolve(patcherData)
+        signaturesResolved = true
+        return signatures
+    }

-            val result =
-                try {
-                    patch.finalize(context)

-                    executionResult
-                } catch (exception: PatchException) {
-                    PatchResult(patch, exception)
-                } catch (exception: Exception) {
-                    PatchResult(patch, PatchException(exception))
+    /**
+     * Apply patches loaded into the patcher.
+     * @param stopOnError If true, the patches will stop on the first error.
+     * @return A map of [PatchResultSuccess]. If the [Patch] was successfully applied,
+     * [PatchResultSuccess] will always be returned to the wrapping Result object.
+     * If the [Patch] failed to apply, an Exception will always be returned to the wrapping Result object.
+     */
+    fun applyPatches(
+        stopOnError: Boolean = false,
+        callback: (String) -> Unit = {}
+    ): Map<String, Result<PatchResultSuccess>> {
+        if (!signaturesResolved) {
+            resolveSignatures()
+        }
+        return buildMap {
+            for (patch in patcherData.patches) {
+                val resourcePatch = patch is ResourcePatch
+                if (!patchResources && resourcePatch) continue
+
+                val patchNameAnnotation = patch::class.java.findAnnotationRecursively(Name::class.java)
+
+                patchNameAnnotation?.let {
+                    callback(it.name)
                }

-            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)
+                val result: Result<PatchResultSuccess> = try {
+                    val data = if (resourcePatch) {
+                        patcherData.resourceData
+                    } else {
+                        patcherData.bytecodeData
+                    }
+
+                    val pr = patch.execute(data)
+
+                    if (pr.isSuccess()) {
+                        Result.success(pr.success()!!)
+                    } else {
+                        Result.failure(Exception(pr.error()?.errorMessage() ?: "Unknown error"))
+                    }
+                } catch (e: Exception) {
+                    Result.failure(e)
+                }
+
+                patchNameAnnotation?.let {
+                    this[patchNameAnnotation.name] = result
+                }
+
+                if (result.isFailure && stopOnError) break
            }
        }
    }
-
-    override fun close() = context.close()
-
-    /**
-     * Compile and save patched APK files.
-     *
-     * @return The [PatcherResult] containing the patched APK files.
-     */
-    @OptIn(InternalApi::class)
-    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,69 +0,0 @@
-package app.revanced.patcher
-
-import app.revanced.patcher.patch.ResourcePatchContext
-import brut.androlib.Config
-import java.io.File
-import java.util.logging.Logger
-
-/**
- * The configuration for the patcher.
- *
- * @param apkFile The apk file to patch.
- * @param temporaryFilesPath A path to a folder to store temporary files in.
- * @param aaptBinaryPath A path to a custom aapt binary.
- * @param frameworkFileDirectory A path to the directory to cache the framework file in.
- */
-class PatcherConfig(
-    internal val apkFile: File,
-    private val temporaryFilesPath: File = File("revanced-temporary-files"),
-    aaptBinaryPath: String? = null,
-    frameworkFileDirectory: String? = null,
-) {
-    private val logger = Logger.getLogger(PatcherConfig::class.java.name)
-
-    /**
-     * The mode to use for resource decoding and compiling.
-     *
-     * @see ResourcePatchContext.ResourceMode
-     */
-    internal var resourceMode = ResourcePatchContext.ResourceMode.NONE
-
-    /**
-     * The configuration for decoding and compiling resources.
-     */
-    internal val resourceConfig =
-        Config.getDefaultConfig().apply {
-            useAapt2 = true
-            aaptPath = aaptBinaryPath ?: ""
-            frameworkDirectory = frameworkFileDirectory
-        }
-
-    /**
-     * The path to the temporary apk files directory.
-     */
-    internal val apkFiles = temporaryFilesPath.resolve("apk")
-
-    /**
-     * The path to the temporary patched files directory.
-     */
-    internal val patchedFiles = temporaryFilesPath.resolve("patched")
-
-    /**
-     * Initialize the temporary files' directories.
-     * This will delete the existing temporary files directory if it exists.
-     */
-    internal fun initializeTemporaryFilesDirectories() {
-        temporaryFilesPath.apply {
-            if (exists()) {
-                logger.info("Deleting existing temporary files directory")
-
-                if (!deleteRecursively()) {
-                    logger.severe("Failed to delete existing temporary files directory")
-                }
-            }
-        }
-
-        apkFiles.mkdirs()
-        patchedFiles.mkdirs()
-    }
-}
--- a/src/main/kotlin/app/revanced/patcher/PatcherContext.kt
+++ b/src/main/kotlin/app/revanced/patcher/PatcherContext.kt
@@ -1,43 +0,0 @@
-package app.revanced.patcher
-
-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.
- *
- * @param config The configuration for the patcher.
- */
-@Suppress("MemberVisibilityCanBePrivate")
-class PatcherContext internal constructor(config: PatcherConfig): Closeable {
-    /**
-     * [PackageMetadata] of the supplied [PatcherConfig.apkFile].
-     */
-    val packageMetadata = PackageMetadata(ApkInfo(ExtFile(config.apkFile)))
-
-    /**
-     * The set of [Patch]es.
-     */
-    internal val executablePatches = mutableSetOf<Patch<*>>()
-
-    /**
-     * The set of all [Patch]es and their dependencies.
-     */
-    internal val allPatches = mutableSetOf<Patch<*>>()
-
-    /**
-     * The context for patches containing the current state of the resources.
-     */
-    internal val resourceContext = ResourcePatchContext(packageMetadata, config)
-
-    /**
-     * The context for patches containing the current state of the bytecode.
-     */
-    internal val bytecodeContext = BytecodePatchContext(config)
-
-    override fun close() = bytecodeContext.close()
-}
--- a/src/main/kotlin/app/revanced/patcher/PatcherResult.kt
+++ b/src/main/kotlin/app/revanced/patcher/PatcherResult.kt
@@ -1,40 +0,0 @@
-package app.revanced.patcher
-
-import java.io.File
-import java.io.InputStream
-
-/**
- * The result of a patcher.
- *
- * @param dexFiles The patched dex files.
- * @param resources The patched resources.
- */
-@Suppress("MemberVisibilityCanBePrivate")
-class PatcherResult internal constructor(
-    val dexFiles: Set<PatchedDexFile>,
-    val resources: PatchedResources?,
-) {
-
-    /**
-     * A dex file.
-     *
-     * @param name The original name of the dex file.
-     * @param stream The dex file as [InputStream].
-     */
-    class PatchedDexFile internal constructor(val name: String, val stream: InputStream)
-
-    /**
-     * The resources of a patched apk.
-     *
-     * @param resourcesApk The compiled resources.apk file.
-     * @param otherResources The directory containing other resources files.
-     * @param doNotCompress List of files that should not be compressed.
-     * @param deleteResources List of resources that should be deleted.
-     */
-    class PatchedResources internal constructor(
-        val resourcesApk: File?,
-        val otherResources: File?,
-        val doNotCompress: Set<String>,
-        val deleteResources: Set<String>,
-    )
-}
--- a/src/main/kotlin/app/revanced/patcher/annotation/CompatibilityAnnotation.kt
+++ b/src/main/kotlin/app/revanced/patcher/annotation/CompatibilityAnnotation.kt
@@ -0,0 +1,28 @@
+package app.revanced.patcher.annotation
+
+import app.revanced.patcher.patch.base.Patch
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+
+/**
+ * Annotation to constrain a [Patch] or [MethodSignature] to compatible packages.
+ * @param compatiblePackages A list of packages a [Patch] or [MethodSignature] is compatible with.
+ */
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+@MustBeDocumented
+annotation class Compatibility(
+    val compatiblePackages: Array<Package>,
+)
+
+/**
+ * Annotation to represent packages a patch can be compatible with.
+ * @param name The package identifier name.
+ * @param versions The versions of the package the [Patch] or [MethodSignature]is compatible with.
+ */
+@Target()
+@Retention(AnnotationRetention.RUNTIME)
+@MustBeDocumented
+annotation class Package(
+    val name: String,
+    val versions: Array<String>
+)
--- a/src/main/kotlin/app/revanced/patcher/annotation/MetadataAnnotation.kt
+++ b/src/main/kotlin/app/revanced/patcher/annotation/MetadataAnnotation.kt
@@ -0,0 +1,38 @@
+package app.revanced.patcher.annotation
+
+import app.revanced.patcher.patch.base.Patch
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+
+/**
+ * Annotation to name a [Patch] or [MethodSignature].
+ * @param name A suggestive name for the [Patch] or [MethodSignature].
+ */
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+@MustBeDocumented
+annotation class Name(
+    val name: String,
+)
+
+/**
+ * Annotation to describe a [Patch] or [MethodSignature].
+ * @param description A description for the [Patch] or [MethodSignature].
+ */
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+@MustBeDocumented
+annotation class Description(
+    val description: String,
+)
+
+
+/**
+ * Annotation to version a [Patch] or [MethodSignature].
+ * @param version The version of a [Patch] or [MethodSignature].
+ */
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+@MustBeDocumented
+annotation class Version(
+    val version: String,
+)
--- a/src/main/kotlin/app/revanced/patcher/data/PatcherData.kt
+++ b/src/main/kotlin/app/revanced/patcher/data/PatcherData.kt
@@ -0,0 +1,18 @@
+package app.revanced.patcher.data
+
+import app.revanced.patcher.data.base.Data
+import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.implementation.ResourceData
+import app.revanced.patcher.patch.base.Patch
+import org.jf.dexlib2.iface.ClassDef
+import java.io.File
+
+internal data class PatcherData(
+    val internalClasses: MutableList<ClassDef>,
+    val resourceCacheDirectory: String
+) {
+    internal val patches = mutableListOf<Patch<Data>>()
+
+    internal val bytecodeData = BytecodeData(patches, internalClasses)
+    internal val resourceData = ResourceData(File(resourceCacheDirectory))
+}
--- a/src/main/kotlin/app/revanced/patcher/data/base/Data.kt
+++ b/src/main/kotlin/app/revanced/patcher/data/base/Data.kt
@@ -0,0 +1,9 @@
+package app.revanced.patcher.data.base
+
+import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.implementation.ResourceData
+
+/**
+ * Constraint interface for [BytecodeData] and [ResourceData]
+ */
+interface Data
--- a/src/main/kotlin/app/revanced/patcher/data/implementation/BytecodeData.kt
+++ b/src/main/kotlin/app/revanced/patcher/data/implementation/BytecodeData.kt
@@ -0,0 +1,86 @@
+package app.revanced.patcher.data.implementation
+
+import app.revanced.patcher.data.base.Data
+import app.revanced.patcher.patch.base.Patch
+import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.signature.implementation.method.resolver.SignatureResolverResult
+import app.revanced.patcher.util.ProxyBackedClassList
+import app.revanced.patcher.util.method.MethodWalker
+import org.jf.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.Method
+
+class BytecodeData(
+    // FIXME: ugly solution due to design.
+    //  It does not make sense for a BytecodeData instance to have access to the patches
+    private val patches: List<Patch<Data>>,
+    internalClasses: MutableList<ClassDef>
+) : Data {
+    val classes = ProxyBackedClassList(internalClasses)
+
+    /**
+     * Find a class by a given class name
+     * @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
+     * @return A proxy for the first class that matches the predicate
+     */
+    fun findClass(predicate: (ClassDef) -> Boolean): app.revanced.patcher.util.proxy.ClassProxy? {
+        // if we already proxied the class matching the predicate...
+        for (patch in patches) {
+            if (patch !is BytecodePatch) continue
+            for (signature in patch.signatures) {
+                val result = signature.result
+                result ?: continue
+
+                if (predicate(result.definingClassProxy.immutableClass)) return result.definingClassProxy  // ...then return that proxy
+            }
+        }
+        // else resolve the class to a proxy and return it, if the predicate is matching a class
+        return classes.find(predicate)?.let {
+            proxy(it)
+        }
+    }
+}
+
+
+class MethodMap : LinkedHashMap<String, SignatureResolverResult>() {
+    override fun get(key: String): SignatureResolverResult {
+        return super.get(key) ?: throw MethodNotFoundException("Method $key was not found in the method cache")
+    }
+}
+
+internal class MethodNotFoundException(s: String) : Exception(s)
+
+internal inline fun <reified T> Iterable<T>.find(predicate: (T) -> Boolean): T? {
+    for (element in this) {
+        if (predicate(element)) {
+            return element
+        }
+    }
+    return null
+}
+
+fun BytecodeData.toMethodWalker(startMethod: Method): MethodWalker {
+    return MethodWalker(this, startMethod)
+}
+
+internal inline fun <T> Iterable<T>.findIndexed(predicate: (T) -> Boolean): Pair<T, Int>? {
+    for ((index, element) in this.withIndex()) {
+        if (predicate(element)) {
+            return element to index
+        }
+    }
+    return null
+}
+
+fun BytecodeData.proxy(classDef: ClassDef): app.revanced.patcher.util.proxy.ClassProxy {
+    var proxy = this.classes.proxies.find { it.immutableClass.type == classDef.type }
+    if (proxy == null) {
+        proxy = app.revanced.patcher.util.proxy.ClassProxy(classDef)
+        this.classes.proxies.add(proxy)
+    }
+    return proxy
+}
--- a/src/main/kotlin/app/revanced/patcher/data/implementation/ResourceData.kt
+++ b/src/main/kotlin/app/revanced/patcher/data/implementation/ResourceData.kt
@@ -0,0 +1,49 @@
+package app.revanced.patcher.data.implementation
+
+import app.revanced.patcher.data.base.Data
+import org.w3c.dom.Document
+import java.io.Closeable
+import java.io.File
+import javax.xml.XMLConstants
+import javax.xml.parsers.DocumentBuilderFactory
+import javax.xml.transform.TransformerFactory
+import javax.xml.transform.dom.DOMSource
+import javax.xml.transform.stream.StreamResult
+
+class ResourceData(private val resourceCacheDirectory: File) : Data {
+    private fun resolve(path: String) = resourceCacheDirectory.resolve(path)
+
+    fun forEach(action: (File) -> Unit) = resourceCacheDirectory.walkTopDown().forEach(action)
+    fun reader(path: String) = resolve(path).reader()
+    fun writer(path: String) = resolve(path).writer()
+
+    fun replace(path: String, oldValue: String, newValue: String, oldValueIsRegex: Boolean = false) {
+        // TODO: buffer this somehow
+        val content = resolve(path).readText()
+
+        if (oldValueIsRegex) {
+            content.replace(Regex(oldValue), newValue)
+            return
+        }
+    }
+
+    fun getXmlEditor(path: String) = DomFileEditor(resolve(path))
+}
+
+class DomFileEditor internal constructor(private val domFile: File) : Closeable {
+    val file: Document
+
+    init {
+        val factory = DocumentBuilderFactory.newInstance()
+        factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true)
+
+        val builder = factory.newDocumentBuilder()
+
+        // this will expectedly throw
+        file = builder.parse(domFile)
+        file.normalize()
+    }
+
+    override fun close() = TransformerFactory.newInstance().newTransformer()
+        .transform(DOMSource(file), StreamResult(domFile.outputStream()))
+}
--- a/src/main/kotlin/app/revanced/patcher/extensions/Extensions.kt
+++ b/src/main/kotlin/app/revanced/patcher/extensions/Extensions.kt
@@ -1,11 +1,108 @@
 package app.revanced.patcher.extensions

-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.builder.BuilderInstruction
+import org.jf.dexlib2.builder.MutableMethodImplementation
+import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.iface.reference.MethodReference
+import org.jf.dexlib2.immutable.ImmutableMethod
+import org.jf.dexlib2.immutable.ImmutableMethodImplementation
+import org.jf.dexlib2.util.MethodUtil

 /**
- * Create a label for the instruction at given index.
- *
- * @param index The index to create the label for the instruction at.
- * @return The label.
+ * Recursively find a given annotation on a class
+ * @param targetAnnotation The annotation to find
+ * @return The annotation
 */
-fun MutableMethod.newLabel(index: Int) = implementation!!.newLabelForIndex(index)
+fun <T : Annotation> Class<*>.findAnnotationRecursively(targetAnnotation: Class<T>) =
+    this.findAnnotationRecursively(targetAnnotation, mutableSetOf())
+
+private fun <T : Annotation> Class<*>.findAnnotationRecursively(
+    targetAnnotation: Class<T>,
+    traversed: MutableSet<Annotation>
+): T? {
+    val found = this.annotations.firstOrNull { it.annotationClass.java.name == targetAnnotation.name }
+
+    @Suppress("UNCHECKED_CAST")
+    if (found != null) return found as T
+
+    for (annotation in this.annotations) {
+        if (traversed.contains(annotation)) continue
+        traversed.add(annotation)
+
+        return (annotation.annotationClass.java.findAnnotationRecursively(targetAnnotation, traversed)) ?: continue
+    }
+
+    return null
+}
+
+infix fun AccessFlags.or(other: AccessFlags) = this.value or other.value
+infix fun Int.or(other: AccessFlags) = this or other.value
+
+fun MutableMethodImplementation.addInstructions(index: Int, instructions: List<BuilderInstruction>) {
+    for (i in instructions.lastIndex downTo 0) {
+        this.addInstruction(index, instructions[i])
+    }
+}
+
+/**
+ * Clones the method.
+ * @param registerCount This parameter allows you to change the register count of the method.
+ * This may be a positive or negative number.
+ * @return The **immutable** cloned method. Call [toMutable] or [cloneMutable] to get a **mutable** copy.
+ */
+internal fun Method.clone(
+    registerCount: Int = 0,
+): ImmutableMethod {
+    val clonedImplementation = implementation?.let {
+        ImmutableMethodImplementation(
+            it.registerCount + registerCount,
+            it.instructions,
+            it.tryBlocks,
+            it.debugItems,
+        )
+    }
+    return ImmutableMethod(
+        returnType,
+        name,
+        parameters,
+        returnType,
+        accessFlags,
+        annotations,
+        hiddenApiRestrictions,
+        clonedImplementation
+    )
+}
+
+/**
+ * Clones the method.
+ * @param registerCount This parameter allows you to change the register count of the method.
+ * This may be a positive or negative number.
+ * @return The **mutable** cloned method. Call [clone] to get an **immutable** copy.
+ */
+internal fun Method.cloneMutable(
+    registerCount: Int = 0,
+) = clone(registerCount).toMutable()
+
+internal fun Method.softCompareTo(
+    otherMethod: MethodReference
+): Boolean {
+    if (MethodUtil.isConstructor(this) && !parametersEqual(this.parameterTypes, otherMethod.parameterTypes))
+        return false
+    return this.name == otherMethod.name
+}
+
+// FIXME: also check the order of parameters as different order equals different method overload
+internal fun parametersEqual(
+    parameters1: Iterable<CharSequence>,
+    parameters2: Iterable<CharSequence>
+): Boolean {
+    return parameters1.count() == parameters2.count() && parameters1.all { parameter ->
+        parameters2.any {
+            it.startsWith(
+                parameter
+            )
+        }
+    }
+}
--- a/src/main/kotlin/app/revanced/patcher/extensions/InstructionExtensions.kt
+++ b/src/main/kotlin/app/revanced/patcher/extensions/InstructionExtensions.kt
@@ -1,434 +0,0 @@
-package app.revanced.patcher.extensions
-
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patcher.util.smali.toInstruction
-import app.revanced.patcher.util.smali.toInstructions
-import com.android.tools.smali.dexlib2.builder.BuilderInstruction
-import com.android.tools.smali.dexlib2.builder.BuilderOffsetInstruction
-import com.android.tools.smali.dexlib2.builder.Label
-import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
-import com.android.tools.smali.dexlib2.builder.instruction.*
-import com.android.tools.smali.dexlib2.iface.Method
-import com.android.tools.smali.dexlib2.iface.MethodImplementation
-import com.android.tools.smali.dexlib2.iface.instruction.Instruction
-
-object InstructionExtensions {
-    /**
-     * Add instructions to a method at the given index.
-     *
-     * @param index The index to add the instructions at.
-     * @param instructions The instructions to add.
-     */
-    fun MutableMethodImplementation.addInstructions(
-        index: Int,
-        instructions: List<BuilderInstruction>,
-    ) = instructions.asReversed().forEach { addInstruction(index, it) }
-
-    /**
-     * Add instructions to a method.
-     * The instructions will be added at the end of the method.
-     *
-     * @param instructions The instructions to add.
-     */
-    fun MutableMethodImplementation.addInstructions(instructions: List<BuilderInstruction>) =
-        instructions.forEach { addInstruction(it) }
-
-    /**
-     * Remove instructions from a method at the given index.
-     *
-     * @param index The index to remove the instructions at.
-     * @param count The amount of instructions to remove.
-     */
-    fun MutableMethodImplementation.removeInstructions(
-        index: Int,
-        count: Int,
-    ) = repeat(count) {
-        removeInstruction(index)
-    }
-
-    /**
-     * Remove the first instructions from a method.
-     *
-     * @param count The amount of instructions to remove.
-     */
-    fun MutableMethodImplementation.removeInstructions(count: Int) = removeInstructions(0, count)
-
-    /**
-     * Replace instructions at the given index with the given instructions.
-     * The amount of instructions to replace is the amount of instructions in the given list.
-     *
-     * @param index The index to replace the instructions at.
-     * @param instructions The instructions to replace the instructions with.
-     */
-    fun MutableMethodImplementation.replaceInstructions(
-        index: Int,
-        instructions: List<BuilderInstruction>,
-    ) {
-        // Remove the instructions at the given index.
-        removeInstructions(index, instructions.size)
-
-        // Add the instructions at the given index.
-        addInstructions(index, instructions)
-    }
-
-    /**
-     * Add an instruction to a method at the given index.
-     *
-     * @param index The index to add the instruction at.
-     * @param instruction The instruction to add.
-     */
-    fun MutableMethod.addInstruction(
-        index: Int,
-        instruction: BuilderInstruction,
-    ) = implementation!!.addInstruction(index, instruction)
-
-    /**
-     * Add an instruction to a method.
-     *
-     * @param instruction The instructions to add.
-     */
-    fun MutableMethod.addInstruction(instruction: BuilderInstruction) = implementation!!.addInstruction(instruction)
-
-    /**
-     * Add an instruction to a method at the given index.
-     *
-     * @param index The index to add the instruction at.
-     * @param smaliInstructions The instruction to add.
-     */
-    fun MutableMethod.addInstruction(
-        index: Int,
-        smaliInstructions: String,
-    ) = implementation!!.addInstruction(index, smaliInstructions.toInstruction(this))
-
-    /**
-     * Add an instruction to a method.
-     *
-     * @param smaliInstructions The instruction to add.
-     */
-    fun MutableMethod.addInstruction(smaliInstructions: String) = implementation!!.addInstruction(smaliInstructions.toInstruction(this))
-
-    /**
-     * Add instructions to a method at the given index.
-     *
-     * @param index The index to add the instructions at.
-     * @param instructions The instructions to add.
-     */
-    fun MutableMethod.addInstructions(
-        index: Int,
-        instructions: List<BuilderInstruction>,
-    ) = implementation!!.addInstructions(index, instructions)
-
-    /**
-     * Add instructions to a method.
-     *
-     * @param instructions The instructions to add.
-     */
-    fun MutableMethod.addInstructions(instructions: List<BuilderInstruction>) = implementation!!.addInstructions(instructions)
-
-    /**
-     * Add instructions to a method.
-     *
-     * @param smaliInstructions The instructions to add.
-     */
-    fun MutableMethod.addInstructions(
-        index: Int,
-        smaliInstructions: String,
-    ) = implementation!!.addInstructions(index, smaliInstructions.toInstructions(this))
-
-    /**
-     * Add instructions to a method.
-     *
-     * @param smaliInstructions The instructions to add.
-     */
-    fun MutableMethod.addInstructions(smaliInstructions: String) = implementation!!.addInstructions(smaliInstructions.toInstructions(this))
-
-    /**
-     * Add instructions to a method at the given index.
-     *
-     * @param index The index to add the instructions at.
-     * @param smaliInstructions The instructions to add.
-     * @param externalLabels A list of [ExternalLabel] for instructions outside of [smaliInstructions].
-     */
-// Special function for adding instructions with external labels.
-    fun MutableMethod.addInstructionsWithLabels(
-        index: Int,
-        smaliInstructions: String,
-        vararg externalLabels: ExternalLabel,
-    ) {
-        // Create reference dummy instructions for the instructions.
-        val nopSmali =
-            StringBuilder(smaliInstructions).also { builder ->
-                externalLabels.forEach { (name, _) ->
-                    builder.append("\n:$name\nnop")
-                }
-            }.toString()
-
-        // Compile the instructions with the dummy labels
-        val compiledInstructions = nopSmali.toInstructions(this)
-
-        // Add the compiled list of instructions to the method.
-        addInstructions(
-            index,
-            compiledInstructions.subList(0, compiledInstructions.size - externalLabels.size),
-        )
-
-        implementation!!.apply {
-            this@apply.instructions.subList(index, index + compiledInstructions.size - externalLabels.size)
-                .forEachIndexed { compiledInstructionIndex, compiledInstruction ->
-                    // If the compiled instruction is not an offset instruction, skip it.
-                    if (compiledInstruction !is BuilderOffsetInstruction) return@forEachIndexed
-
-                    /**
-                     * Create a new label for the instruction
-                     * and replace it with the label of the [compiledInstruction] at [compiledInstructionIndex].
-                     */
-                    fun Instruction.makeNewLabel() {
-                        fun replaceOffset(
-                            i: BuilderOffsetInstruction,
-                            label: Label,
-                        ): BuilderOffsetInstruction {
-                            return when (i) {
-                                is BuilderInstruction10t -> BuilderInstruction10t(i.opcode, label)
-                                is BuilderInstruction20t -> BuilderInstruction20t(i.opcode, label)
-                                is BuilderInstruction21t -> BuilderInstruction21t(i.opcode, i.registerA, label)
-                                is BuilderInstruction22t ->
-                                    BuilderInstruction22t(
-                                        i.opcode,
-                                        i.registerA,
-                                        i.registerB,
-                                        label,
-                                    )
-                                is BuilderInstruction30t -> BuilderInstruction30t(i.opcode, label)
-                                is BuilderInstruction31t -> BuilderInstruction31t(i.opcode, i.registerA, label)
-                                else -> throw IllegalStateException(
-                                    "A non-offset instruction was given, this should never happen!",
-                                )
-                            }
-                        }
-
-                        // Create the final label.
-                        val label = newLabelForIndex(this@apply.instructions.indexOf(this))
-
-                        // Create the final instruction with the new label.
-                        val newInstruction =
-                            replaceOffset(
-                                compiledInstruction,
-                                label,
-                            )
-
-                        // Replace the instruction pointing to the dummy label
-                        // with the new instruction pointing to the real instruction.
-                        replaceInstruction(index + compiledInstructionIndex, newInstruction)
-                    }
-
-                    // If the compiled instruction targets its own instruction,
-                    // which means it points to some of its own, simply an offset has to be applied.
-                    val labelIndex = compiledInstruction.target.location.index
-                    if (labelIndex < compiledInstructions.size - externalLabels.size) {
-                        // Get the targets index (insertion index + the index of the dummy instruction).
-                        this.instructions[index + labelIndex].makeNewLabel()
-                        return@forEachIndexed
-                    }
-
-                    // Since the compiled instruction points to a dummy instruction,
-                    // we can find the real instruction which it was created for by calculation.
-
-                    // Get the index of the instruction in the externalLabels list
-                    // which the dummy instruction was created for.
-                    // This works because we created the dummy instructions in the same order as the externalLabels list.
-                    val (_, instruction) = externalLabels[(compiledInstructions.size - 1) - labelIndex]
-                    instruction.makeNewLabel()
-                }
-        }
-    }
-
-    /**
-     * Remove an instruction at the given index.
-     *
-     * @param index The index to remove the instruction at.
-     */
-    fun MutableMethod.removeInstruction(index: Int) = implementation!!.removeInstruction(index)
-
-    /**
-     * Remove instructions at the given index.
-     *
-     * @param index The index to remove the instructions at.
-     * @param count The amount of instructions to remove.
-     */
-    fun MutableMethod.removeInstructions(
-        index: Int,
-        count: Int,
-    ) = implementation!!.removeInstructions(index, count)
-
-    /**
-     * Remove instructions at the given index.
-     *
-     * @param count The amount of instructions to remove.
-     */
-    fun MutableMethod.removeInstructions(count: Int) = implementation!!.removeInstructions(count)
-
-    /**
-     * Replace an instruction at the given index.
-     *
-     * @param index The index to replace the instruction at.
-     * @param instruction The instruction to replace the instruction with.
-     */
-    fun MutableMethod.replaceInstruction(
-        index: Int,
-        instruction: BuilderInstruction,
-    ) = implementation!!.replaceInstruction(index, instruction)
-
-    /**
-     * Replace an instruction at the given index.
-     *
-     * @param index The index to replace the instruction at.
-     * @param smaliInstruction The smali instruction to replace the instruction with.
-     */
-    fun MutableMethod.replaceInstruction(
-        index: Int,
-        smaliInstruction: String,
-    ) = implementation!!.replaceInstruction(index, smaliInstruction.toInstruction(this))
-
-    /**
-     * Replace instructions at the given index.
-     *
-     * @param index The index to replace the instructions at.
-     * @param instructions The instructions to replace the instructions with.
-     */
-    fun MutableMethod.replaceInstructions(
-        index: Int,
-        instructions: List<BuilderInstruction>,
-    ) = implementation!!.replaceInstructions(index, instructions)
-
-    /**
-     * Replace instructions at the given index.
-     *
-     * @param index The index to replace the instructions at.
-     * @param smaliInstructions The smali instructions to replace the instructions with.
-     */
-    fun MutableMethod.replaceInstructions(
-        index: Int,
-        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.
-     *
-     * @param index The index to get the instruction at.
-     * @return The instruction.
-     */
-    fun MutableMethodImplementation.getInstruction(index: Int): BuilderInstruction = instructions[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> 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 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.
-     * @param index The index to get the instruction at.
-     * @param T The type of instruction to return.
-     * @return The instruction.
-     */
-    fun <T> Method.getInstruction(index: Int): T = getInstructionOrNull<T>(index)!!
-
-    /**
-     * 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.
-     */
-    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/patch/BytecodePatchContext.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/BytecodePatchContext.kt
@@ -1,285 +0,0 @@
-package app.revanced.patcher.patch
-
-import app.revanced.patcher.*
-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.MethodReference
-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.util.*
-import java.util.logging.Logger
-import kotlin.reflect.KProperty
-
-/**
- * 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 match for this [Fingerprint]. Null if unmatched.
-     */
-    val Fingerprint.match get() = match(this@BytecodePatchContext)
-
-    /**
-     * Match using a [ClassDef].
-     *
-     * @param classDef The class to match against.
-     * @return The [Match] if a match was found or if the fingerprint is already matched to a method, null otherwise.
-     */
-    fun Fingerprint.match(classDef: ClassDef) = match(this@BytecodePatchContext, classDef)
-
-    /**
-     * Match using a [Method].
-     * The class is retrieved from the method.
-     *
-     * @param method The method to match against.
-     * @return The [Match] if a match was found or if the fingerprint is already matched to a method, null otherwise.
-     */
-    fun Fingerprint.match(method: Method) = match(this@BytecodePatchContext, method)
-
-    /**
-     * Get the match for this [Fingerprint].
-     *
-     * @throws IllegalStateException If the [Fingerprint] has not been matched.
-     */
-    operator fun Fingerprint.getValue(nothing: Nothing?, property: KProperty<*>): Match = match
-        ?: throw PatchException("No fingerprint match to delegate to \"${property.name}\".")
-
-    /**
-     * The lookup maps for methods and the class they are a member of from the [classes].
-     */
-    internal val lookupMaps by lazy { LookupMaps(classes) }
-
-    /**
-     * Merge the extension of [bytecodePatch] into the [BytecodePatchContext].
-     * If no extension is present, the function will return early.
-     *
-     * @param bytecodePatch The [BytecodePatch] to merge the extension of.
-     */
-    internal fun mergeExtension(bytecodePatch: BytecodePatch) {
-        bytecodePatch.extensionInputStream?.get()?.use { extensionStream ->
-            RawDexIO.readRawDexFile(extensionStream, 0, null).classes.forEach { classDef ->
-                val existingClass = lookupMaps.classesByType[classDef.type] ?: run {
-                    logger.fine { "Adding class \"$classDef\"" }
-
-                    classes += classDef
-                    lookupMaps.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
-                }
-            }
-        } ?: logger.fine("No extension to merge")
-    }
-
-    /**
-     * 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: MethodReference) = 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")
-
-        // Free up memory before compiling the dex files.
-        lookupMaps.close()
-
-        val patchedDexFileResults =
-            config.patchedFiles.resolve("dex").also {
-                it.deleteRecursively() // Make sure the directory is empty.
-                it.mkdirs()
-            }.apply {
-                MultiDexIO.writeDexFile(
-                    true,
-                    -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 {
-        /**
-         * Methods associated by strings referenced in it.
-         */
-        internal val methodsByStrings = MethodClassPairsLookupMap()
-
-        // Lookup map for fast checking if a class exists by its type.
-        val classesByType = mutableMapOf<String, ClassDef>().apply {
-            classes.forEach { classDef -> put(classDef.type, classDef) }
-        }
-
-        init {
-            classes.forEach { classDef ->
-                classDef.methods.forEach { method ->
-                    val methodClassPair: MethodClassPair = method to classDef
-
-                    // 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() {
-            methodsByStrings.clear()
-            classesByType.clear()
-        }
-    }
-
-    override fun close() {
-        lookupMaps.close()
-        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
@@ -1,874 +0,0 @@
-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 their 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.
- *
- * @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 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 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.
- *
- * @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 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 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.
- *
- * @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 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 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.
- *
- * @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 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 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.
- *
- * @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 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 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.
- *
- * @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 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 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.
- *
- * @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 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 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.
- *
- * @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 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 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.
- *
- * @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 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] 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].
- *
- * @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> 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,
-)
-
-/**
- * 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 },
-) = app.revanced.patcher.patch.option(
-    key,
-    default,
-    values,
-    title,
-    description,
-    required,
-    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 the value was null")
-
-    /**
-     * 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,686 +0,0 @@
-@file:Suppress("MemberVisibilityCanBePrivate", "unused")
-
-package app.revanced.patcher.patch
-
-import app.revanced.patcher.Patcher
-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.lang.reflect.Member
-import java.lang.reflect.Method
-import java.lang.reflect.Modifier
-import java.net.URLClassLoader
-import java.util.function.Supplier
-import java.util.jar.JarFile
-
-typealias PackageName = String
-typealias VersionName = String
-typealias Package = Pair<PackageName, Set<VersionName>?>
-
-/**
- * A patch.
- *
- * @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.
- *
- * @constructor Create a new patch.
- */
-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: (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: ((C) -> Unit)?,
-) {
-    /**
-     * The options of the patch.
-     */
-    val options = Options(options)
-
-    /**
-     * Calls the execution block of the patch.
-     * This function is called by [Patcher.invoke].
-     *
-     * @param context The [PatcherContext] to get the [PatchContext] from to execute the patch with.
-     */
-    internal abstract fun execute(context: PatcherContext)
-
-    /**
-     * Calls the execution block of the patch.
-     *
-     * @param context The [PatchContext] to execute the patch with.
-     */
-    fun execute(context: C) = executeBlock(context)
-
-    /**
-     * Calls the finalizing block of the patch.
-     * This function is called by [Patcher.invoke].
-     *
-     * @param context The [PatcherContext] to get the [PatchContext] from to finalize the patch with.
-     */
-    internal abstract fun finalize(context: PatcherContext)
-
-    /**
-     * Calls the finalizing block of the patch.
-     *
-     * @param context The [PatchContext] to finalize the patch with.
-     */
-    fun finalize(context: C) {
-        finalizeBlock?.invoke(context)
-    }
-
-    override fun toString() = name ?: "Patch"
-}
-
-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.
- * @property extensionInputStream Getter for the extension input stream of the patch.
- * 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 extensionInputStream: Supplier<InputStream>?,
-    executeBlock: (BytecodePatchContext) -> Unit,
-    finalizeBlock: ((BytecodePatchContext) -> Unit)?,
-) : Patch<BytecodePatchContext>(
-    name,
-    description,
-    use,
-    dependencies,
-    compatiblePackages,
-    options,
-    executeBlock,
-    finalizeBlock,
-) {
-    override fun execute(context: PatcherContext) = with(context.bytecodeContext) {
-        mergeExtension(this@BytecodePatch)
-        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: (ResourcePatchContext) -> Unit,
-    finalizeBlock: ((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: (ResourcePatchContext) -> Unit,
-    finalizeBlock: ((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: ((C) -> Unit) = { }
-    protected var finalizeBlock: ((C) -> Unit)? = null
-
-    /**
-     * Add an option to the patch.
-     *
-     * @return The added option.
-     */
-    operator fun <T> Option<T>.invoke() = apply {
-        options += this
-    }
-
-    /**
-     * Create a package a patch is compatible with.
-     *
-     * @param versions The versions of the package.
-     */
-    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: C.() -> Unit) {
-        executionBlock = block
-    }
-
-    /**
-     * Set the finalizing block of the patch.
-     *
-     * @param block The finalizing block of the patch.
-     */
-    fun finalize(block: 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 extensionInputStream Getter for the extension input stream of the patch.
- * 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) {
-    // Must be internal for the inlined function "extendWith".
-    @PublishedApi
-    internal var extensionInputStream: Supplier<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 {
-        val classLoader = object {}.javaClass.classLoader
-
-        extensionInputStream = Supplier {
-            classLoader.getResourceAsStream(extension) ?: throw PatchException("Extension \"$extension\" not found")
-        }
-    }
-
-    override fun build() = BytecodePatch(
-        name,
-        description,
-        use,
-        compatiblePackages,
-        dependencies,
-        options,
-        extensionInputStream,
-        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()
-            }.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()
-            }.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()
-            }
-
-        private fun Member.canAccess(): Boolean {
-            if (this is Method && parameterCount != 0) return false
-
-            return Modifier.isStatic(modifiers) && Modifier.isPublic(modifiers)
-        }
-    }
-}
-
-/**
- * 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
@@ -1,9 +0,0 @@
-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/ResourcePatchContext.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/ResourcePatchContext.kt
@@ -1,235 +0,0 @@
-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 brut.androlib.AaptInvoker
-import brut.androlib.ApkDecoder
-import brut.androlib.apk.UsesFramework
-import brut.androlib.res.Framework
-import brut.androlib.res.ResourcesDecoder
-import brut.androlib.res.decoder.AndroidManifestResourceParser
-import brut.androlib.res.decoder.XmlPullStreamDecoder
-import brut.androlib.res.xml.ResXmlPatcher
-import brut.directory.ExtFile
-import java.io.InputStream
-import java.io.OutputStream
-import java.nio.file.Files
-import java.util.logging.Logger
-
-/**
- * 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 ResourcePatchContext internal constructor(
-    private val packageMetadata: PackageMetadata,
-    private val config: PatcherConfig,
-) : PatchContext<PatcherResult.PatchedResources?> {
-    private val logger = Logger.getLogger(ResourcePatchContext::class.java.name)
-
-    /**
-     * Read a document from an [InputStream].
-     */
-    fun document(inputStream: InputStream) = Document(inputStream)
-
-    /**
-     * Read and write documents in the [PatcherConfig.apkFiles].
-     */
-    fun document(path: String) = Document(get(path))
-
-    /**
-     * Set of resources from [PatcherConfig.apkFiles] to delete.
-     */
-    private val deleteResources = mutableSetOf<String>()
-
-    /**
-     * Decode resources of [PatcherConfig.apkFile].
-     *
-     * @param mode The [ResourceMode] to use.
-     */
-    internal fun decodeResources(mode: ResourceMode) =
-        with(packageMetadata.apkInfo) {
-            config.initializeTemporaryFilesDirectories()
-
-            // Needed to decode resources.
-            val resourcesDecoder = ResourcesDecoder(config.resourceConfig, this)
-
-            if (mode == ResourceMode.FULL) {
-                logger.info("Decoding resources")
-
-                resourcesDecoder.decodeResources(config.apkFiles)
-                resourcesDecoder.decodeManifest(config.apkFiles)
-
-                // Needed to record uncompressed files.
-                val apkDecoder = ApkDecoder(config.resourceConfig, this)
-                apkDecoder.recordUncompressedFiles(resourcesDecoder.resFileMapping)
-
-                usesFramework =
-                    UsesFramework().apply {
-                        ids = resourcesDecoder.resTable.listFramePackages().map { it.id }
-                    }
-            } else {
-                logger.info("Decoding app manifest")
-
-                // Decode manually instead of using resourceDecoder.decodeManifest
-                // because it does not support decoding to an OutputStream.
-                XmlPullStreamDecoder(
-                    AndroidManifestResourceParser(resourcesDecoder.resTable),
-                    resourcesDecoder.resXmlSerializer,
-                ).decodeManifest(
-                    apkFile.directory.getFileInput("AndroidManifest.xml"),
-                    // Older Android versions do not support OutputStream.nullOutputStream()
-                    object : OutputStream() {
-                        override fun write(b: Int) { // Do nothing.
-                        }
-                    },
-                )
-
-                // Get the package name and version from the manifest using the XmlPullStreamDecoder.
-                // XmlPullStreamDecoder.decodeManifest() sets metadata.apkInfo.
-                packageMetadata.let { metadata ->
-                    metadata.packageName = resourcesDecoder.resTable.packageRenamed
-                    versionInfo.let {
-                        metadata.packageVersion = it.versionName ?: it.versionCode
-                    }
-
-                    /*
-                     The ResTable if flagged as sparse if the main package is not loaded, which is the case here,
-                     because ResourcesDecoder.decodeResources loads the main package
-                     and not XmlPullStreamDecoder.decodeManifest.
-                     See ARSCDecoder.readTableType for more info.
-
-                     Set this to false again to prevent the ResTable from being flagged as sparse falsely.
-                     */
-                    metadata.apkInfo.sparseResources = false
-                }
-            }
-        }
-
-    /**
-     * Compile resources in [PatcherConfig.apkFiles].
-     *
-     * @return The [PatcherResult.PatchedResources].
-     */
-    @InternalApi
-    override fun get(): PatcherResult.PatchedResources? {
-        if (config.resourceMode == ResourceMode.NONE) return null
-
-        logger.info("Compiling modified resources")
-
-        val resources = config.patchedFiles.resolve("resources").also { it.mkdirs() }
-
-        val resourcesApkFile =
-            if (config.resourceMode == ResourceMode.FULL) {
-                resources.resolve("resources.apk").apply {
-                    // Compile the resources.apk file.
-                    AaptInvoker(
-                        config.resourceConfig,
-                        packageMetadata.apkInfo,
-                    ).invokeAapt(
-                        resources.resolve("resources.apk"),
-                        config.apkFiles.resolve("AndroidManifest.xml").also {
-                            ResXmlPatcher.fixingPublicAttrsInProviderAttributes(it)
-                        },
-                        config.apkFiles.resolve("res"),
-                        null,
-                        null,
-                        packageMetadata.apkInfo.usesFramework.let { usesFramework ->
-                            usesFramework.ids.map { id ->
-                                Framework(config.resourceConfig).getFrameworkApk(id, usesFramework.tag)
-                            }.toTypedArray()
-                        },
-                    )
-                }
-            } else {
-                null
-            }
-
-        val otherFiles =
-            config.apkFiles.listFiles()!!.filter {
-                // 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 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.
-                //  The filters wouldn't be needed anymore.
-                //  For now, we assume that the files we filter here are not needed for the patching process.
-                it.name != "AndroidManifest.xml" &&
-                    it.name != "res" &&
-                    // Generated by Androlib.
-                    it.name != "build"
-            }
-
-        val otherResourceFiles =
-            if (otherFiles.isNotEmpty()) {
-                // Move the other resources files.
-                resources.resolve("other").also { it.mkdirs() }.apply {
-                    otherFiles.forEach { file ->
-                        Files.move(file.toPath(), resolve(file.name).toPath())
-                    }
-                }
-            } else {
-                null
-            }
-
-        return PatcherResult.PatchedResources(
-            resourcesApkFile,
-            otherResourceFiles,
-            packageMetadata.apkInfo.doNotCompress?.toSet() ?: emptySet(),
-            deleteResources,
-        )
-    }
-
-    /**
-     * Get a file from [PatcherConfig.apkFiles].
-     *
-     * @param path The path of the file.
-     * @param copy Whether to copy the file from [PatcherConfig.apkFile] if it does not exist yet in [PatcherConfig.apkFiles].
-     */
-    operator fun get(
-        path: String,
-        copy: Boolean = true,
-    ) = config.apkFiles.resolve(path).apply {
-        if (copy && !exists()) {
-            with(ExtFile(config.apkFile).directory) {
-                if (containsFile(path) || containsDir(path)) {
-                    copyToDir(config.apkFiles, path)
-                }
-            }
-        }
-    }
-
-    /**
-     * Mark a file for deletion when the APK is rebuilt.
-     *
-     * @param name The name of the file to delete.
-     */
-    fun delete(name: String) = deleteResources.add(name)
-
-    /**
-     * How to handle resources decoding and compiling.
-     */
-    internal enum class ResourceMode {
-        /**
-         * Decode and compile all resources.
-         */
-        FULL,
-
-        /**
-         * Only extract resources from the APK.
-         * The AndroidManifest.xml and resources inside /res are not decoded or compiled.
-         */
-        RAW_ONLY,
-
-        /**
-         * Do not decode or compile any resources.
-         */
-        NONE,
-    }
-}
--- a/src/main/kotlin/app/revanced/patcher/patch/annotations/PatchAnnotation.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/annotations/PatchAnnotation.kt
@@ -0,0 +1,9 @@
+package app.revanced.patcher.patch.annotations
+
+/**
+ * Annotation to mark a Class as a patch.
+ */
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+@MustBeDocumented
+annotation class Patch
--- a/src/main/kotlin/app/revanced/patcher/patch/base/Patch.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/base/Patch.kt
@@ -0,0 +1,18 @@
+package app.revanced.patcher.patch.base
+
+import app.revanced.patcher.data.base.Data
+import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.implementation.ResourcePatch
+import app.revanced.patcher.patch.implementation.misc.PatchResult
+
+
+/**
+ * A ReVanced patch.
+ * Can either be a [ResourcePatch] or a [BytecodePatch].
+ */
+abstract class Patch<out T : Data> {
+    /**
+     * The main function of the [Patch] which the patcher will call.
+     */
+    abstract fun execute(data: @UnsafeVariance T): PatchResult // FIXME: remove the UnsafeVariance annotation
+}
--- a/src/main/kotlin/app/revanced/patcher/patch/implementation/BytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/implementation/BytecodePatch.kt
@@ -0,0 +1,13 @@
+package app.revanced.patcher.patch.implementation
+
+import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.patch.base.Patch
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+
+/**
+ * Bytecode patch for the Patcher.
+ * @param signatures A list of [MethodSignature] this patch relies on.
+ */
+abstract class BytecodePatch(
+    val signatures: Iterable<MethodSignature>
+) : Patch<BytecodeData>()
--- a/src/main/kotlin/app/revanced/patcher/patch/implementation/ResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/implementation/ResourcePatch.kt
@@ -0,0 +1,9 @@
+package app.revanced.patcher.patch.implementation
+
+import app.revanced.patcher.data.implementation.ResourceData
+import app.revanced.patcher.patch.base.Patch
+
+/**
+ * Resource patch for the Patcher.
+ */
+abstract class ResourcePatch : Patch<ResourceData>()
--- a/src/main/kotlin/app/revanced/patcher/patch/implementation/misc/PatchResult.kt
+++ b/src/main/kotlin/app/revanced/patcher/patch/implementation/misc/PatchResult.kt
@@ -0,0 +1,33 @@
+package app.revanced.patcher.patch.implementation.misc
+
+interface PatchResult {
+    fun error(): PatchResultError? {
+        if (this is PatchResultError) {
+            return this
+        }
+        return null
+    }
+
+    fun success(): PatchResultSuccess? {
+        if (this is PatchResultSuccess) {
+            return this
+        }
+        return null
+    }
+
+    fun isError(): Boolean {
+        return this is PatchResultError
+    }
+
+    fun isSuccess(): Boolean {
+        return this is PatchResultSuccess
+    }
+}
+
+class PatchResultError(private val errorMessage: String) : PatchResult {
+    fun errorMessage(): String {
+        return errorMessage
+    }
+}
+
+class PatchResultSuccess : PatchResult
--- a/src/main/kotlin/app/revanced/patcher/signature/base/Signature.kt
+++ b/src/main/kotlin/app/revanced/patcher/signature/base/Signature.kt
@@ -0,0 +1,9 @@
+package app.revanced.patcher.signature.base
+
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+
+/**
+ * A ReVanced signature.
+ * Can be a [MethodSignature].
+ */
+interface Signature
--- a/src/main/kotlin/app/revanced/patcher/signature/implementation/method/MethodSignature.kt
+++ b/src/main/kotlin/app/revanced/patcher/signature/implementation/method/MethodSignature.kt
@@ -0,0 +1,47 @@
+package app.revanced.patcher.signature.implementation.method
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.data.implementation.MethodNotFoundException
+import app.revanced.patcher.signature.base.Signature
+import app.revanced.patcher.signature.implementation.method.resolver.SignatureResolverResult
+import org.jf.dexlib2.Opcode
+
+/**
+ * Represents the [MethodSignature] for a method.
+ * @param returnType The return type of the method.
+ * @param accessFlags The access flags of the method.
+ * @param methodParameters The parameters of the method.
+ * @param opcodes The list of opcodes of the method.
+ * @param strings A list of strings which a method contains.
+ * A `null` opcode is equals to an unknown opcode.
+ */
+abstract class MethodSignature(
+    internal val returnType: String?,
+    internal val accessFlags: Int?,
+    internal val methodParameters: Iterable<String>?,
+    internal val opcodes: Iterable<Opcode?>?,
+    internal val strings: Iterable<String>? = null
+) : Signature {
+    /**
+     * The result of the signature
+     */
+    var result: SignatureResolverResult? = null
+        get() {
+            return field ?: throw MethodNotFoundException(
+                "Could not resolve required signature ${
+                    (this::class.annotations.find { it is Name }?.let {
+                        (it as Name).name
+                    })
+                }"
+            )
+        }
+    val resolved: Boolean
+        get() {
+            var resolved = false
+            try {
+                resolved = result != null
+            } catch (_: Exception) {
+            }
+            return resolved
+        }
+}
--- a/src/main/kotlin/app/revanced/patcher/signature/implementation/method/annotation/MethodSignatureMetadata.kt
+++ b/src/main/kotlin/app/revanced/patcher/signature/implementation/method/annotation/MethodSignatureMetadata.kt
@@ -0,0 +1,32 @@
+package app.revanced.patcher.signature.implementation.method.annotation
+
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+
+/**
+ * Annotations for a method which matches to a [MethodSignature].
+ * @param definingClass The defining class name of the method.
+ * @param name A suggestive name for the method which the [MethodSignature] was created for.
+ */
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class MatchingMethod(
+    val definingClass: String = "L<unspecified-class>",
+    val name: String = "<unspecified-method>"
+)
+
+/**
+ * Annotations to scan a pattern [MethodSignature] with fuzzy algorithm.
+ * @param threshold if [threshold] or more of the opcodes do not match, skip.
+ */
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class FuzzyPatternScanMethod(
+    val threshold: Int = 1
+)
+
+/**
+ * Annotations to scan a pattern [MethodSignature] directly.
+ */
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class DirectPatternScanMethod
--- a/src/main/kotlin/app/revanced/patcher/signature/implementation/method/resolver/MethodSignatureResolver.kt
+++ b/src/main/kotlin/app/revanced/patcher/signature/implementation/method/resolver/MethodSignatureResolver.kt
@@ -0,0 +1,167 @@
+package app.revanced.patcher.signature.implementation.method.resolver
+
+import app.revanced.patcher.data.PatcherData
+import app.revanced.patcher.data.implementation.proxy
+import app.revanced.patcher.extensions.findAnnotationRecursively
+import app.revanced.patcher.extensions.parametersEqual
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.iface.instruction.Instruction
+import org.jf.dexlib2.iface.instruction.formats.Instruction21c
+import org.jf.dexlib2.iface.reference.StringReference
+
+internal class MethodSignatureResolver(
+    private val classes: List<ClassDef>,
+    private val methodSignatures: Iterable<MethodSignature>
+) {
+    fun resolve(patcherData: PatcherData) {
+        for (signature in methodSignatures) {
+            for (classDef in classes) {
+                for (method in classDef.methods) {
+                    val patternScanData = compareSignatureToMethod(signature, method) ?: continue
+
+                    // create class proxy, in case a patch needs mutability
+                    val classProxy = patcherData.bytecodeData.proxy(classDef)
+                    signature.result = SignatureResolverResult(
+                        classProxy,
+                        patternScanData,
+                        method,
+                    )
+                }
+            }
+        }
+    }
+
+    // These functions do not require the constructor values, so they can be static.
+    companion object {
+        fun resolveFromProxy(
+            classProxy: app.revanced.patcher.util.proxy.ClassProxy,
+            signature: MethodSignature
+        ): SignatureResolverResult? {
+            for (method in classProxy.immutableClass.methods) {
+                val result = compareSignatureToMethod(signature, method) ?: continue
+                return SignatureResolverResult(
+                    classProxy,
+                    result,
+                    method,
+                )
+            }
+            return null
+        }
+
+        private fun compareSignatureToMethod(
+            signature: MethodSignature,
+            method: Method
+        ): PatternScanResult? {
+            signature.returnType?.let {
+                if (!method.returnType.startsWith(signature.returnType)) {
+                    return null
+                }
+            }
+
+            signature.accessFlags?.let {
+                if (signature.accessFlags != method.accessFlags) {
+                    return null
+                }
+            }
+
+            signature.methodParameters?.let {
+                if (!parametersEqual(signature.methodParameters, method.parameterTypes)) {
+                    return null
+                }
+            }
+
+            signature.strings?.let { strings ->
+                method.implementation ?: return null
+
+                method.implementation!!.instructions.let { instructions ->
+                    val stringsList = strings.toMutableList()
+
+                    for (instruction in instructions) {
+                        if (instruction.opcode != Opcode.CONST_STRING) continue
+
+                        val string = ((instruction as Instruction21c).reference as StringReference).string
+                        val i = stringsList.indexOfFirst { it == string }
+                        if (i != -1) stringsList.removeAt(i)
+                    }
+
+                    if (stringsList.isNotEmpty()) return null
+                }
+            }
+
+            return if (signature.opcodes == null) {
+                PatternScanResult(0, 0)
+            } else {
+                method.implementation?.instructions?.let {
+                    compareOpcodes(signature, it)
+                }
+            }
+        }
+
+        private fun compareOpcodes(
+            signature: MethodSignature,
+            instructions: Iterable<Instruction>
+        ): PatternScanResult? {
+            val count = instructions.count()
+            val pattern = signature.opcodes!!
+            val size = pattern.count()
+
+            val threshold =
+                signature::class.java.findAnnotationRecursively(FuzzyPatternScanMethod::class.java)?.threshold
+                    ?: 0
+
+            for (instructionIndex in 0 until count) {
+                var patternIndex = 0
+                var currentThreshold = threshold
+                while (instructionIndex + patternIndex < count) {
+                    val originalOpcode = instructions.elementAt(instructionIndex + patternIndex).opcode
+                    val patternOpcode = pattern.elementAt(patternIndex)
+                    if (
+                        patternOpcode != null && // unknown opcode
+                        originalOpcode != patternOpcode &&
+                        currentThreshold-- == 0
+                    ) break
+                    if (++patternIndex < size) continue
+                    patternIndex-- // fix pattern offset
+
+                    val result = PatternScanResult(instructionIndex, instructionIndex + patternIndex)
+
+                    result.warnings = generateWarnings(signature, instructions, result)
+
+                    return result
+                }
+            }
+
+            return null
+        }
+
+        private fun generateWarnings(
+            signature: MethodSignature,
+            instructions: Iterable<Instruction>,
+            scanResult: PatternScanResult,
+        ) = buildList {
+            val pattern = signature.opcodes!!
+            for ((patternIndex, instructionIndex) in (scanResult.startIndex until scanResult.endIndex).withIndex()) {
+                val correctOpcode = instructions.elementAt(instructionIndex).opcode
+                val patternOpcode = pattern.elementAt(patternIndex)
+                if (
+                    patternOpcode != null && // unknown opcode
+                    correctOpcode != patternOpcode
+                ) {
+                    this.add(
+                        PatternScanResult.Warning(
+                            correctOpcode, patternOpcode,
+                            instructionIndex, patternIndex,
+                        )
+                    )
+                }
+            }
+        }
+    }
+}
+
+private operator fun ClassDef.component1() = this
+private operator fun ClassDef.component2() = this.methods
--- a/src/main/kotlin/app/revanced/patcher/signature/implementation/method/resolver/MethodSignatureResolverResult.kt
+++ b/src/main/kotlin/app/revanced/patcher/signature/implementation/method/resolver/MethodSignatureResolverResult.kt
@@ -0,0 +1,75 @@
+package app.revanced.patcher.signature.implementation.method.resolver
+
+import app.revanced.patcher.extensions.softCompareTo
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.util.proxy.ClassProxy
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.Method
+
+/**
+ * Represents the result of a [MethodSignatureResolver].
+ * @param definingClassProxy The [ClassProxy] that the matching method was found in.
+ * @param resolvedMethod The actual matching method.
+ * @param scanResult Opcodes pattern scan result.
+ */
+data class SignatureResolverResult(
+    val definingClassProxy: ClassProxy,
+    val scanResult: PatternScanResult,
+    private val resolvedMethod: Method,
+) {
+    /**
+     * Returns the **mutable** method by the [resolvedMethod] from the [definingClassProxy].
+     *
+     * Please note, this method allocates a [ClassProxy].
+     * Use [immutableMethod] where possible.
+     */
+    val method
+        get() = definingClassProxy.resolve().methods.first {
+            it.softCompareTo(resolvedMethod)
+        }
+
+    /**
+     * Returns the **immutable** method by the [resolvedMethod] from the [definingClassProxy].
+     *
+     * If you need to modify the method, use [method] instead.
+     */
+    @Suppress("MemberVisibilityCanBePrivate")
+    val immutableMethod: Method
+        get() = definingClassProxy.immutableClass.methods.first {
+            it.softCompareTo(resolvedMethod)
+        }
+
+    fun findParentMethod(signature: MethodSignature): SignatureResolverResult? {
+        return MethodSignatureResolver.resolveFromProxy(definingClassProxy, signature)
+    }
+}
+
+data class PatternScanResult(
+    val startIndex: Int,
+    val endIndex: Int
+) {
+    /**
+     * A list of warnings the resolver found.
+     *
+     * This list will be allocated when the signature has been found.
+     * Meaning, if the signature was not found,
+     * or the signature was not yet resolved,
+     * the list will be null.
+     */
+    var warnings: List<Warning>? = null
+
+    /**
+     * Represents a resolver warning.
+     * @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.
+     */
+    data class Warning(
+        val correctOpcode: Opcode,
+        val wrongOpcode: Opcode,
+        val instructionIndex: Int,
+        val patternIndex: Int,
+    )
+}
+
--- a/src/main/kotlin/app/revanced/patcher/util/ClassMerger.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/ClassMerger.kt
@@ -1,239 +0,0 @@
-package app.revanced.patcher.util
-
-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
-import app.revanced.patcher.util.ClassMerger.Utils.isPublic
-import app.revanced.patcher.util.ClassMerger.Utils.toPublic
-import app.revanced.patcher.util.ClassMerger.Utils.traverseClassHierarchy
-import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
-import app.revanced.patcher.util.proxy.mutableTypes.MutableClass.Companion.toMutable
-import app.revanced.patcher.util.proxy.mutableTypes.MutableField
-import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMutable
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.iface.ClassDef
-import com.android.tools.smali.dexlib2.util.MethodUtil
-import java.util.logging.Logger
-import kotlin.reflect.KFunction2
-
-/**
- * Experimental class to merge a [ClassDef] with another.
- * Note: This will not consider method implementations or if the class is missing a superclass or interfaces.
- */
-internal object ClassMerger {
-    private val logger = Logger.getLogger(ClassMerger::class.java.name)
-
-    /**
-     * Merge a class with [otherClass].
-     *
-     * @param otherClass The class to merge with
-     * @param context The context to traverse the class hierarchy in.
-     * @return The merged class or the original class if no merge was needed.
-     */
-    fun ClassDef.merge(
-        otherClass: ClassDef,
-        context: BytecodePatchContext,
-    ) = this
-        // .fixFieldAccess(otherClass)
-        // .fixMethodAccess(otherClass)
-        .addMissingFields(otherClass)
-        .addMissingMethods(otherClass)
-        .publicize(otherClass, context)
-
-    /**
-     * Add methods which are missing but existing in [fromClass].
-     *
-     * @param fromClass The class to add missing methods from.
-     */
-    private fun ClassDef.addMissingMethods(fromClass: ClassDef): ClassDef {
-        val missingMethods =
-            fromClass.methods.let { fromMethods ->
-                methods.filterNot { method ->
-                    fromMethods.any { fromMethod ->
-                        MethodUtil.methodSignaturesMatch(fromMethod, method)
-                    }
-                }
-            }
-
-        if (missingMethods.isEmpty()) return this
-
-        logger.fine { "Found ${missingMethods.size} missing methods" }
-
-        return asMutableClass().apply {
-            methods.addAll(missingMethods.map { it.toMutable() })
-        }
-    }
-
-    /**
-     * Add fields which are missing but existing in [fromClass].
-     *
-     * @param fromClass The class to add missing fields from.
-     */
-    private fun ClassDef.addMissingFields(fromClass: ClassDef): ClassDef {
-        val missingFields =
-            fields.filterNotAny(fromClass.fields) { field, fromField ->
-                fromField.name == field.name
-            }
-
-        if (missingFields.isEmpty()) return this
-
-        logger.fine { "Found ${missingFields.size} missing fields" }
-
-        return asMutableClass().apply {
-            fields.addAll(missingFields.map { it.toMutable() })
-        }
-    }
-
-    /**
-     * Make a class and its super class public recursively.
-     * @param reference The class to check the [AccessFlags] of.
-     * @param context The context to traverse the class hierarchy in.
-     */
-    private fun ClassDef.publicize(
-        reference: ClassDef,
-        context: BytecodePatchContext,
-    ) = if (reference.accessFlags.isPublic() && !accessFlags.isPublic()) {
-        this.asMutableClass().apply {
-            context.traverseClassHierarchy(this) {
-                if (accessFlags.isPublic()) return@traverseClassHierarchy
-
-                logger.fine { "Publicizing ${this.type}" }
-
-                accessFlags = accessFlags.toPublic()
-            }
-        }
-    } else {
-        this
-    }
-
-    /**
-     * Publicize fields if they are public in [reference].
-     *
-     * @param reference The class to check the [AccessFlags] of the fields in.
-     */
-    private fun ClassDef.fixFieldAccess(reference: ClassDef): ClassDef {
-        val brokenFields =
-            fields.filterAny(reference.fields) { field, referenceField ->
-                if (field.name != referenceField.name) return@filterAny false
-
-                referenceField.accessFlags.isPublic() && !field.accessFlags.isPublic()
-            }
-
-        if (brokenFields.isEmpty()) return this
-
-        logger.fine { "Found ${brokenFields.size} broken fields" }
-
-        /**
-         * Make a field public.
-         */
-        fun MutableField.publicize() {
-            accessFlags = accessFlags.toPublic()
-        }
-
-        return asMutableClass().apply {
-            fields.filter { brokenFields.contains(it) }.forEach(MutableField::publicize)
-        }
-    }
-
-    /**
-     * Publicize methods if they are public in [reference].
-     *
-     * @param reference The class to check the [AccessFlags] of the methods in.
-     */
-    private fun ClassDef.fixMethodAccess(reference: ClassDef): ClassDef {
-        val brokenMethods =
-            methods.filterAny(reference.methods) { method, referenceMethod ->
-                if (!MethodUtil.methodSignaturesMatch(method, referenceMethod)) return@filterAny false
-
-                referenceMethod.accessFlags.isPublic() && !method.accessFlags.isPublic()
-            }
-
-        if (brokenMethods.isEmpty()) return this
-
-        logger.fine { "Found ${brokenMethods.size} methods" }
-
-        /**
-         * Make a method public.
-         */
-        fun MutableMethod.publicize() {
-            accessFlags = accessFlags.toPublic()
-        }
-
-        return asMutableClass().apply {
-            methods.filter { brokenMethods.contains(it) }.forEach(MutableMethod::publicize)
-        }
-    }
-
-    private object Utils {
-        /**
-         * traverse the class hierarchy starting from the given root class
-         *
-         * @param targetClass the class to start traversing the class hierarchy from
-         * @param callback function that is called for every class in the hierarchy
-         */
-        fun BytecodePatchContext.traverseClassHierarchy(
-            targetClass: MutableClass,
-            callback: MutableClass.() -> Unit,
-        ) {
-            callback(targetClass)
-
-            targetClass.superclass ?: return
-            this.classBy { targetClass.superclass == it.type }?.mutableClass?.let {
-                traverseClassHierarchy(it, callback)
-            }
-        }
-
-        fun ClassDef.asMutableClass() = if (this is MutableClass) this else this.toMutable()
-
-        /**
-         * Check if the [AccessFlags.PUBLIC] flag is set.
-         *
-         * @return True, if the flag is set.
-         */
-        fun Int.isPublic() = AccessFlags.PUBLIC.isSet(this)
-
-        /**
-         * Make [AccessFlags] public.
-         *
-         * @return The new [AccessFlags].
-         */
-        fun Int.toPublic() = or(AccessFlags.PUBLIC.value).and(AccessFlags.PRIVATE.value.inv())
-
-        /**
-         * Filter [this] on [needles] matching the given [predicate].
-         *
-         * @param needles The needles to filter [this] with.
-         * @param predicate The filter.
-         * @return The [this] filtered on [needles] matching the given [predicate].
-         */
-        fun <HayType, NeedleType> Iterable<HayType>.filterAny(
-            needles: Iterable<NeedleType>,
-            predicate: (HayType, NeedleType) -> Boolean,
-        ) = Iterable<HayType>::filter.any(this, needles, predicate)
-
-        /**
-         * Filter [this] on [needles] not matching the given [predicate].
-         *
-         * @param needles The needles to filter [this] with.
-         * @param predicate The filter.
-         * @return The [this] filtered on [needles] not matching the given [predicate].
-         */
-        fun <HayType, NeedleType> Iterable<HayType>.filterNotAny(
-            needles: Iterable<NeedleType>,
-            predicate: (HayType, NeedleType) -> Boolean,
-        ) = Iterable<HayType>::filterNot.any(this, needles, predicate)
-
-        fun <HayType, NeedleType> KFunction2<Iterable<HayType>, (HayType) -> Boolean, List<HayType>>.any(
-            haystack: Iterable<HayType>,
-            needles: Iterable<NeedleType>,
-            predicate: (HayType, NeedleType) -> Boolean,
-        ) = this(haystack) { hay ->
-            needles.any { needle ->
-                predicate(hay, needle)
-            }
-        }
-    }
-}
--- a/src/main/kotlin/app/revanced/patcher/util/Document.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/Document.kt
@@ -1,48 +0,0 @@
-package app.revanced.patcher.util
-
-import org.w3c.dom.Document
-import java.io.Closeable
-import java.io.File
-import java.io.InputStream
-import javax.xml.parsers.DocumentBuilderFactory
-import javax.xml.transform.TransformerFactory
-import javax.xml.transform.dom.DOMSource
-import javax.xml.transform.stream.StreamResult
-
-class Document internal constructor(
-    inputStream: InputStream,
-) : Document by DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(inputStream), Closeable {
-    private var file: File? = null
-
-    init {
-        normalize()
-    }
-
-    internal constructor(file: File) : this(file.inputStream()) {
-        this.file = file
-        readerCount.merge(file, 1, Int::plus)
-    }
-
-    override fun close() {
-        file?.let {
-            if (readerCount[it]!! > 1) {
-                throw IllegalStateException(
-                    "Two or more instances are currently reading $it." +
-                        "To be able to close this instance, no other instances may be reading $it at the same time.",
-                )
-            } else {
-                readerCount.remove(it)
-            }
-
-            it.outputStream().use { stream ->
-                TransformerFactory.newInstance()
-                    .newTransformer()
-                    .transform(DOMSource(this), StreamResult(stream))
-            }
-        }
-    }
-
-    private companion object {
-        private val readerCount = mutableMapOf<File, Int>()
-    }
-}
--- a/src/main/kotlin/app/revanced/patcher/util/ListBackedSet.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/ListBackedSet.kt
@@ -0,0 +1,15 @@
+package app.revanced.patcher.util
+
+internal class ListBackedSet<E>(private val list: MutableList<E>) : MutableSet<E> {
+    override val size get() = list.size
+    override fun add(element: E) = list.add(element)
+    override fun addAll(elements: Collection<E>) = list.addAll(elements)
+    override fun clear() = list.clear()
+    override fun iterator() = list.listIterator()
+    override fun remove(element: E) = list.remove(element)
+    override fun removeAll(elements: Collection<E>) = list.removeAll(elements)
+    override fun retainAll(elements: Collection<E>) = list.retainAll(elements)
+    override fun contains(element: E) = list.contains(element)
+    override fun containsAll(elements: Collection<E>) = list.containsAll(elements)
+    override fun isEmpty() = list.isEmpty()
+}
--- a/src/main/kotlin/app/revanced/patcher/util/MethodNavigator.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/MethodNavigator.kt
@@ -1,117 +0,0 @@
-@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
-import kotlin.reflect.KProperty
-
-/**
- * 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(original()) {
-        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 stop() = context.classBy(matchesCurrentMethodReferenceDefiningClass)!!.mutableClass.firstMethodBySignature
-        as MutableMethod
-
-    /**
-     * Get the last navigated method mutably.
-     *
-     * @return The last navigated method mutably.
-     */
-    operator fun getValue(nothing: Nothing?, property: KProperty<*>) = stop()
-
-    /**
-     * Get the last navigated method immutably.
-     *
-     * @return The last navigated method immutably.
-     */
-    fun original() = 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/ProxyBackedClassList.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/ProxyBackedClassList.kt
@@ -0,0 +1,45 @@
+package app.revanced.patcher.util
+
+import org.jf.dexlib2.iface.ClassDef
+
+class ProxyBackedClassList(internal val internalClasses: MutableList<ClassDef>) : List<ClassDef> {
+    internal val proxies = mutableListOf<app.revanced.patcher.util.proxy.ClassProxy>()
+
+    fun add(classDef: ClassDef) {
+        internalClasses.add(classDef)
+    }
+
+    fun add(classProxy: app.revanced.patcher.util.proxy.ClassProxy) {
+        proxies.add(classProxy)
+    }
+
+    /**
+     * Apply all resolved classes into [internalClasses] and clean the [proxies] list.
+     */
+    fun applyProxies() {
+        // FIXME: check if this could cause issues when multiple patches use the same proxy
+        proxies.removeIf { proxy ->
+            // if the proxy is unused, keep it in the list
+            if (!proxy.proxyUsed) return@removeIf false
+
+            // if it has been used, replace the internal class which it proxied
+            val index = internalClasses.indexOfFirst { it.type == proxy.immutableClass.type }
+            internalClasses[index] = proxy.mutatedClass
+
+            // return true to remove it from the proxies list
+            return@removeIf true
+        }
+    }
+
+    override val size get() = internalClasses.size
+    override fun contains(element: ClassDef) = internalClasses.contains(element)
+    override fun containsAll(elements: Collection<ClassDef>) = internalClasses.containsAll(elements)
+    override fun get(index: Int) = internalClasses[index]
+    override fun indexOf(element: ClassDef) = internalClasses.indexOf(element)
+    override fun isEmpty() = internalClasses.isEmpty()
+    override fun iterator() = internalClasses.iterator()
+    override fun lastIndexOf(element: ClassDef) = internalClasses.lastIndexOf(element)
+    override fun listIterator() = internalClasses.listIterator()
+    override fun listIterator(index: Int) = internalClasses.listIterator(index)
+    override fun subList(fromIndex: Int, toIndex: Int) = internalClasses.subList(fromIndex, toIndex)
+}
--- a/src/main/kotlin/app/revanced/patcher/util/ProxyClassList.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/ProxyClassList.kt
@@ -1,29 +0,0 @@
-package app.revanced.patcher.util
-
-import app.revanced.patcher.util.proxy.ClassProxy
-import com.android.tools.smali.dexlib2.iface.ClassDef
-
-/**
- * A list of classes and proxies.
- *
- * @param classes The classes to be backed by proxies.
- */
-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() =
-        proxyPool.removeIf { proxy ->
-            // If the proxy is unused, return false to keep it in the proxies list.
-            if (!proxy.resolved) return@removeIf false
-
-            // If it has been used, replace the original class with the mutable class.
-            remove(proxy.immutableClass)
-            add(proxy.mutableClass)
-
-            // Return true to remove the proxy from the proxies list.
-            return@removeIf true
-        }
-}
--- a/src/main/kotlin/app/revanced/patcher/util/method/MethodWalker.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/method/MethodWalker.kt
@@ -0,0 +1,55 @@
+package app.revanced.patcher.util.method
+
+import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.implementation.MethodNotFoundException
+import app.revanced.patcher.extensions.softCompareTo
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import org.jf.dexlib2.Format
+import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.iface.instruction.formats.Instruction35c
+import org.jf.dexlib2.iface.reference.MethodReference
+import org.jf.dexlib2.util.Preconditions
+
+/**
+ * Find a method from another method via instruction offsets.
+ * @param bytecodeData The bytecodeData to use when resolving the next method reference.
+ * @param currentMethod The method to start from.
+ */
+class MethodWalker internal constructor(
+    private val bytecodeData: BytecodeData,
+    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.
+     */
+    fun getMethod(): Method {
+        return currentMethod
+    }
+
+    /**
+     * Walk to a method defined at the offset in the instruction list of the current method.
+     * @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.
+     * The current method will be mutable.
+     */
+    fun walk(offset: Int, walkMutable: Boolean = false): MethodWalker {
+        currentMethod.implementation?.instructions?.let { instructions ->
+            val instruction = instructions.elementAt(offset)
+
+            Preconditions.checkFormat(instruction.opcode, Format.Format35c)
+
+            val newMethod = (instruction as Instruction35c).reference as MethodReference
+            val proxy = bytecodeData.findClass(newMethod.definingClass)!!
+
+            val methods = if (walkMutable) proxy.resolve().methods else proxy.immutableClass.methods
+            currentMethod = methods.first { it ->
+                return@first it.softCompareTo(newMethod)
+            }
+            return this
+        }
+        throw MethodNotFoundException("This method can not be walked at offset $offset inside the method ${currentMethod.name}")
+    }
+
+
+}
--- a/src/main/kotlin/app/revanced/patcher/util/patch/PatchLoader.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/patch/PatchLoader.kt
@@ -0,0 +1,34 @@
+package app.revanced.patcher.util.patch
+
+import app.revanced.patcher.patch.base.Patch
+import java.io.File
+import java.net.URLClassLoader
+import java.util.jar.JarFile
+
+object PatchLoader {
+    /**
+     * This method loads patches from a given jar file containing [Patch]es
+     * @return the loaded patches represented as a list of [Patch] classes
+     */
+    fun loadFromFile(patchesJar: File) = buildList {
+        val jarFile = JarFile(patchesJar)
+        val classLoader = URLClassLoader(arrayOf(patchesJar.toURI().toURL()))
+
+        val entries = jarFile.entries()
+        while (entries.hasMoreElements()) {
+            val entry = entries.nextElement()
+            if (!entry.name.endsWith(".class") || entry.name.contains("$")) continue
+
+            val clazz = classLoader.loadClass(entry.realName.replace('/', '.').replace(".class", ""))
+
+            if (!clazz.isAnnotationPresent(app.revanced.patcher.patch.annotations.Patch::class.java)) continue
+
+            @Suppress("UNCHECKED_CAST")
+            val patch = clazz as Class<Patch<*>>
+
+            // TODO: include declared classes from patch
+
+            this.add(patch)
+        }
+    }
+}
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/ClassProxy.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/ClassProxy.kt
@@ -1,35 +1,41 @@
 package app.revanced.patcher.util.proxy

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

 /**
 * A proxy class for a [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.
+ * @param immutableClass The class to proxy
 */
-class ClassProxy internal constructor(
+class ClassProxy(
    val immutableClass: ClassDef,
 ) {
-    /**
-     * Weather the proxy was actually used.
-     */
-    internal var resolved = false
+    internal var proxyUsed = false
+    internal lateinit var mutatedClass: MutableClass

-    /**
-     * The mutable clone of the original class.
-     *
-     * Note: This is only allocated if the proxy is actually used.
-     */
-    val mutableClass by lazy {
-        resolved = true
+    init {
+        // in the instance, that a [MutableClass] is being proxied,
+        // do not create an additional clone and reuse the [MutableClass] instance
        if (immutableClass is MutableClass) {
-            immutableClass
-        } else {
-            MutableClass(immutableClass)
+            mutatedClass = immutableClass
+            proxyUsed = true
        }
    }
-}
+
+    /**
+     * Allocates and returns a mutable clone of the original class.
+     * A patch should always use the original immutable class reference
+     * to avoid unnecessary allocations for the mutable class.
+     * @return A mutable clone of the original class.
+     */
+    fun resolve(): MutableClass {
+        if (!proxyUsed) {
+            proxyUsed = true
+            mutatedClass = MutableClass(immutableClass)
+        }
+        return mutatedClass
+    }
+}
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation.kt
@@ -1,21 +1,29 @@
 package app.revanced.patcher.util.proxy.mutableTypes

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

 class MutableAnnotation(annotation: Annotation) : BaseAnnotation() {
    private val visibility = annotation.visibility
    private val type = annotation.type
    private val _elements by lazy { annotation.elements.map { element -> element.toMutable() }.toMutableSet() }

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

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

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

    companion object {
-        fun Annotation.toMutable(): MutableAnnotation = MutableAnnotation(this)
+        fun Annotation.toMutable(): MutableAnnotation {
+            return 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
@@ -2,9 +2,9 @@ package app.revanced.patcher.util.proxy.mutableTypes

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

 class MutableAnnotationElement(annotationElement: AnnotationElement) : BaseAnnotationElement() {
    private var name = annotationElement.name
@@ -18,11 +18,17 @@ class MutableAnnotationElement(annotationElement: AnnotationElement) : BaseAnnot
        this.value = value
    }

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

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

    companion object {
-        fun AnnotationElement.toMutable(): MutableAnnotationElement = MutableAnnotationElement(this)
+        fun AnnotationElement.toMutable(): MutableAnnotationElement {
+            return 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
@@ -3,14 +3,13 @@ package app.revanced.patcher.util.proxy.mutableTypes
 import app.revanced.patcher.util.proxy.mutableTypes.MutableAnnotation.Companion.toMutable
 import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMutable
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
-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
+import org.jf.dexlib2.base.reference.BaseTypeReference
+import org.jf.dexlib2.iface.ClassDef
+import org.jf.dexlib2.util.FieldUtil
+import org.jf.dexlib2.util.MethodUtil

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

    // Methods
    private val _methods by lazy { classDef.methods.map { method -> method.toMutable() }.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() }
+    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() }

    // Fields
    private val _fields by lazy { classDef.fields.map { field -> field.toMutable() }.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() }
+    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() }

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

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

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

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

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

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

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

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

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

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

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

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

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

    companion object {
-        fun ClassDef.toMutable(): MutableClass = MutableClass(this)
+        fun ClassDef.toMutable(): MutableClass {
+            return 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
@@ -3,13 +3,11 @@ package app.revanced.patcher.util.proxy.mutableTypes
 import app.revanced.patcher.util.proxy.mutableTypes.MutableAnnotation.Companion.toMutable
 import app.revanced.patcher.util.proxy.mutableTypes.encodedValue.MutableEncodedValue
 import app.revanced.patcher.util.proxy.mutableTypes.encodedValue.MutableEncodedValue.Companion.toMutable
-import com.android.tools.smali.dexlib2.HiddenApiRestriction
-import com.android.tools.smali.dexlib2.base.reference.BaseFieldReference
-import com.android.tools.smali.dexlib2.iface.Field
+import org.jf.dexlib2.HiddenApiRestriction
+import org.jf.dexlib2.base.reference.BaseFieldReference
+import org.jf.dexlib2.iface.Field

-class MutableField(field: Field) :
-    BaseFieldReference(),
-    Field {
+class MutableField(field: Field) : Field, BaseFieldReference() {
    private var definingClass = field.definingClass
    private var name = field.name
    private var type = field.type
@@ -39,21 +37,37 @@ class MutableField(field: Field) :
        this.initialValue = initialValue
    }

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

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

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

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

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

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

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

    companion object {
-        fun Field.toMutable(): MutableField = MutableField(this)
+        fun Field.toMutable(): MutableField {
+            return 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
@@ -2,14 +2,12 @@ package app.revanced.patcher.util.proxy.mutableTypes

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

-class MutableMethod(method: Method) :
-    BaseMethodReference(),
-    Method {
+class MutableMethod(method: Method) : Method, BaseMethodReference() {
    private var definingClass = method.definingClass
    private var name = method.name
    private var accessFlags = method.accessFlags
@@ -22,41 +20,45 @@ class MutableMethod(method: Method) :
    private val _parameterTypes by lazy { method.parameterTypes.toMutableList() }
    private val _hiddenApiRestrictions by lazy { method.hiddenApiRestrictions }

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

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

-    fun setAccessFlags(accessFlags: Int) {
-        this.accessFlags = accessFlags
+    override fun getParameterTypes(): MutableList<CharSequence> {
+        return _parameterTypes
    }

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

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

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

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

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

-    override fun getAnnotations(): MutableSet<MutableAnnotation> = _annotations
-
-    override fun getAccessFlags(): Int = accessFlags
-
-    override fun getHiddenApiRestrictions(): MutableSet<HiddenApiRestriction> = _hiddenApiRestrictions
-
-    override fun getParameters(): MutableList<MutableMethodParameter> = _parameters
-
-    override fun getImplementation(): MutableMethodImplementation? = _implementation
+    override fun getImplementation(): MutableMethodImplementation? {
+        return _implementation
+    }

    companion object {
-        fun Method.toMutable(): MutableMethod = MutableMethod(this)
+        fun Method.toMutable(): MutableMethod {
+            return 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
@@ -1,13 +1,11 @@
 package app.revanced.patcher.util.proxy.mutableTypes

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

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

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

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

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

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

    companion object {
-        fun MethodParameter.toMutable(): MutableMethodParameter = MutableMethodParameter(this)
+        fun MethodParameter.toMutable(): MutableMethodParameter {
+            return 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
@@ -1,12 +1,11 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue

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

-class MutableAnnotationEncodedValue(annotationEncodedValue: AnnotationEncodedValue) :
-    BaseAnnotationEncodedValue(),
+class MutableAnnotationEncodedValue(annotationEncodedValue: AnnotationEncodedValue) : BaseAnnotationEncodedValue(),
    MutableEncodedValue {
    private var type = annotationEncodedValue.type

@@ -14,15 +13,21 @@ class MutableAnnotationEncodedValue(annotationEncodedValue: AnnotationEncodedVal
        annotationEncodedValue.elements.map { annotationElement -> annotationElement.toMutable() }.toMutableSet()
    }

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

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

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

    companion object {
-        fun AnnotationEncodedValue.toMutable(): MutableAnnotationEncodedValue = MutableAnnotationEncodedValue(this)
+        fun AnnotationEncodedValue.toMutable(): MutableAnnotationEncodedValue {
+            return 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
@@ -1,20 +1,22 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue

 import app.revanced.patcher.util.proxy.mutableTypes.encodedValue.MutableEncodedValue.Companion.toMutable
-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
+import org.jf.dexlib2.base.value.BaseArrayEncodedValue
+import org.jf.dexlib2.iface.value.ArrayEncodedValue
+import org.jf.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> = _value
+    override fun getValue(): MutableList<out EncodedValue> {
+        return _value
+    }

    companion object {
-        fun ArrayEncodedValue.toMutable(): MutableArrayEncodedValue = MutableArrayEncodedValue(this)
+        fun ArrayEncodedValue.toMutable(): MutableArrayEncodedValue {
+            return 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
@@ -1,20 +1,23 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue

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

-class MutableBooleanEncodedValue(booleanEncodedValue: BooleanEncodedValue) :
-    BaseBooleanEncodedValue(),
+class MutableBooleanEncodedValue(booleanEncodedValue: BooleanEncodedValue) : BaseBooleanEncodedValue(),
    MutableEncodedValue {
    private var value = booleanEncodedValue.value

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

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

    companion object {
-        fun BooleanEncodedValue.toMutable(): MutableBooleanEncodedValue = MutableBooleanEncodedValue(this)
+        fun BooleanEncodedValue.toMutable(): MutableBooleanEncodedValue {
+            return 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
@@ -1,20 +1,22 @@
 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
+import org.jf.dexlib2.base.value.BaseByteEncodedValue
+import org.jf.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 = this.value
+    override fun getValue(): Byte {
+        return this.value
+    }

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

    companion object {
-        fun ByteEncodedValue.toMutable(): MutableByteEncodedValue = MutableByteEncodedValue(this)
+        fun ByteEncodedValue.toMutable(): MutableByteEncodedValue {
+            return 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
@@ -1,20 +1,22 @@
 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
+import org.jf.dexlib2.base.value.BaseCharEncodedValue
+import org.jf.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 = this.value
+    override fun getValue(): Char {
+        return this.value
+    }

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

    companion object {
-        fun CharEncodedValue.toMutable(): MutableCharEncodedValue = MutableCharEncodedValue(this)
+        fun CharEncodedValue.toMutable(): MutableCharEncodedValue {
+            return 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
@@ -1,20 +1,23 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue

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

-class MutableDoubleEncodedValue(doubleEncodedValue: DoubleEncodedValue) :
-    BaseDoubleEncodedValue(),
+class MutableDoubleEncodedValue(doubleEncodedValue: DoubleEncodedValue) : BaseDoubleEncodedValue(),
    MutableEncodedValue {
    private var value = doubleEncodedValue.value

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

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

    companion object {
-        fun DoubleEncodedValue.toMutable(): MutableDoubleEncodedValue = MutableDoubleEncodedValue(this)
+        fun DoubleEncodedValue.toMutable(): MutableDoubleEncodedValue {
+            return MutableDoubleEncodedValue(this)
+        }
    }
-}
+}
--- a/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue.kt
+++ b/src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue.kt
@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue

-import com.android.tools.smali.dexlib2.ValueType
-import com.android.tools.smali.dexlib2.iface.value.*
+import org.jf.dexlib2.ValueType
+import org.jf.dexlib2.iface.value.*

 interface MutableEncodedValue : EncodedValue {
    companion object {
@@ -29,4 +29,4 @@ interface MutableEncodedValue : EncodedValue {
            }
        }
    }
-}
+}
--- 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
@@ -1,21 +1,23 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue

-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
+import org.jf.dexlib2.base.value.BaseEnumEncodedValue
+import org.jf.dexlib2.iface.reference.FieldReference
+import org.jf.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 = this.value
+    override fun getValue(): FieldReference {
+        return this.value
+    }

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

    companion object {
-        fun EnumEncodedValue.toMutable(): MutableEnumEncodedValue = MutableEnumEncodedValue(this)
+        fun EnumEncodedValue.toMutable(): MutableEnumEncodedValue {
+            return 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
@@ -1,24 +1,28 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue

-import com.android.tools.smali.dexlib2.ValueType
-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
+import org.jf.dexlib2.ValueType
+import org.jf.dexlib2.base.value.BaseFieldEncodedValue
+import org.jf.dexlib2.iface.reference.FieldReference
+import org.jf.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 = ValueType.FIELD
+    override fun getValueType(): Int {
+        return ValueType.FIELD
+    }

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

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

    companion object {
-        fun FieldEncodedValue.toMutable(): MutableFieldEncodedValue = MutableFieldEncodedValue(this)
+        fun FieldEncodedValue.toMutable(): MutableFieldEncodedValue {
+            return 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
@@ -1,20 +1,22 @@
 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
+import org.jf.dexlib2.base.value.BaseFloatEncodedValue
+import org.jf.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 = this.value
+    override fun getValue(): Float {
+        return this.value
+    }

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

    companion object {
-        fun FloatEncodedValue.toMutable(): MutableFloatEncodedValue = MutableFloatEncodedValue(this)
+        fun FloatEncodedValue.toMutable(): MutableFloatEncodedValue {
+            return MutableFloatEncodedValue(this)
+        }
    }
-}
+}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 800 800" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><g id="Logo"><g id="Ring"><circle id="Ring-Background" serif:id="Ring Background" cx="400" cy="400" r="400" style="fill:#1b1b1b;"/><path id="Ring1" serif:id="Ring" d="M400,0c220.766,0 400,179.234 400,400c-0,220.766 -179.234,400 -400,400c-220.766,-0 -400,-179.234 -400,-400c0,-220.766 179.234,-400 400,-400Zm-0,36c200.897,-0 364,163.103 364,364c0,200.897 -163.103,364 -364,364c-200.897,0 -364,-163.103 -364,-364c-0,-200.897 163.103,-364 364,-364Z" style="fill:url(#_Linear1);"/></g><g id="Shape"><path id="V-Shape" serif:id="V Shape" d="M538.74,269.872c1.481,-3.382 1.157,-7.283 -0.863,-10.373c-2.021,-3.091 -5.464,-4.954 -9.156,-4.954c-5.148,0 -10.435,0 -14.165,0c-3.1,0 -5.907,1.834 -7.153,4.672c-12.468,28.396 -78.273,178.273 -100.25,228.328c-1.246,2.838 -4.053,4.671 -7.154,4.671c-3.1,0 -5.907,-1.833 -7.153,-4.671c-21.977,-50.055 -87.782,-199.932 -100.25,-228.328c-1.246,-2.838 -4.053,-4.672 -7.153,-4.672c-3.73,0 -9.017,0 -14.164,0c-3.693,0 -7.135,1.863 -9.156,4.954c-2.02,3.09 -2.344,6.991 -0.863,10.373c23.557,53.766 101.872,232.519 117.871,269.034c1.743,3.979 5.674,6.549 10.018,6.549c6.293,-0 15.408,-0 21.701,-0c4.344,-0 8.275,-2.57 10.018,-6.549c15.999,-36.515 94.315,-215.268 117.872,-269.034Z" style="fill:#fff;"/><path id="Diamond" d="M408.119,395.312c-1.675,2.901 -4.77,4.688 -8.119,4.688c-3.349,-0 -6.444,-1.787 -8.119,-4.688c-16.997,-29.44 -56.156,-97.264 -73.153,-126.704c-1.675,-2.901 -1.675,-6.474 0,-9.375c1.675,-2.901 4.77,-4.688 8.119,-4.688c33.995,0 112.311,0 146.306,0c3.349,0 6.444,1.787 8.119,4.688c1.675,2.901 1.675,6.474 -0,9.375c-16.997,29.44 -56.156,97.264 -73.153,126.704Z" style="fill:url(#_Linear2);"/></g></g><defs><linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.89859e-14,800,-800,4.89859e-14,400.001,3.31681e-10)"><stop offset="0" style="stop-color:#f04e98;stop-opacity:1"/><stop offset="0.5" style="stop-color:#5f65d4;stop-opacity:1"/><stop offset="1" style="stop-color:#4e98f0;stop-opacity:1"/></linearGradient><linearGradient id="_Linear2" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.77155e-14,289.317,-282.535,1.73003e-14,400,254.545)"><stop offset="0" style="stop-color:#f04e98;stop-opacity:1"/><stop offset="0.5" style="stop-color:#5f65d4;stop-opacity:1"/><stop offset="1" style="stop-color:#4e98f0;stop-opacity:1"/></linearGradient></defs></svg>