chore(release): 3.0.0-dev.10 [skip ci]

# [3.0.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v3.0.0-dev.9...v3.0.0-dev.10) (2023-12-11) ### Features * **YouTube:** Add `Change start page` patch ([f03e57b](f03e57b112))
feat(YouTube): Add Change start page patch
2025-12-07 18:03:55 +01:00 · 2023-12-11 23:43:52 +00:00 · 2023-12-12 00:42:01 +01:00 · 2023-12-11 22:07:41 +00:00 · 2023-12-11 23:05:39 +01:00 · 2023-12-11 22:39:44 +01:00
858 changed files with 20894 additions and 10967 deletions
--- a/.github/ISSUE_TEMPLATE/bug-issue.yml
+++ b/.github/ISSUE_TEMPLATE/bug-issue.yml
@@ -1,73 +0,0 @@
 name: 🐞 Bug report
 description: Report a very clearly broken issue.
 title: 'bug: '
 labels: [bug]
 body:
  - type: markdown
    attributes:
      value: |
        # ReVanced bug report
        Important to note that your issue may have already been reported before. Please check for existing issues [here](https://github.com/revanced/revanced-patches/labels/bug).
  - type: dropdown
    attributes:
      label: Type
      options:
        - Error while patching
        - Error at runtime
        - Cosmetic
        - Other
    validations:
      required: true
  - type: textarea
    attributes:
      label: Bug description
      description: How did you find the bug? Any additional details that might help?
    validations:
      required: true
  - type: textarea
    attributes:
      label: Steps to reproduce
      description: Add the steps to reproduce this bug including your environment.
      placeholder: Step 1. Download some files. Step 2. ...
    validations:
      required: true
  - type: textarea
    attributes:
      label: Relevant log output
      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. Capture crash logs by running `logcat | grep AndroidRuntime`.
      render: shell
    validations:
      required: true
  - type: textarea
    attributes:
      label: Screenshots or videos
      description: Add screenshots or videos that show the bug here.
      placeholder: Drag and drop the screenshots/videos into this box.
    validations:
      required: false
  - type: textarea
    attributes:
      label: Solution
      description: If applicable, add a possible solution.
    validations:
      required: false
  - type: textarea
    attributes:
      label: Additional context
      description: Add additional context here.
    validations:
      required: false
  - type: checkboxes
    id: acknowledgements
    attributes:
      label: Acknowledgements
      description: Your issue will be closed if you haven't done these steps.
      options:
        - label: I have searched the existing issues and this is a new and no duplicate or related to another open issue.
          required: true
        - label: I have written a short but informative title.
          required: true
        - label: I filled out all of the requested information in this issue properly.
          required: true
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,110 @@
 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-patches/main/assets/revanced-headline/revanced-headline-vertical-dark.svg"
            >
            <img 
              width="256px"
              src="https://raw.githubusercontent.com/revanced/revanced-patches/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-patches/main/assets/revanced-logo/revanced-logo.svg" />
                 <img height="24px" src="https://raw.githubusercontent.com/revanced/revanced-patches/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 Patches bug report
        Before creating a new bug report, please keep the following in mind:
        - **Do not submit a duplicate bug report**: You can review existing bug reports [here](https://github.com/ReVanced/revanced-patches/labels/Bug%20report).
        - **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-patches/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
        - List used patches if applicable
    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: This issue is not a duplicate of an existing bug report.
          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 +1,5 @@
 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!
+    about: Have something unspecific to ReVanced Patches in mind? Search for or start a new discussion!
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,106 @@
 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-patches/main/assets/revanced-headline/revanced-headline-vertical-dark.svg"
            >
            <img 
              width="256px"
              src="https://raw.githubusercontent.com/revanced/revanced-patches/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-patches/main/assets/revanced-logo/revanced-logo.svg" />
                 <img height="24px" src="https://raw.githubusercontent.com/revanced/revanced-patches/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 Patches feature request
        Before creating a new feature request, please keep the following in mind:
        - **Do not submit a duplicate feature request**: You can review existing feature requests [here](https://github.com/ReVanced/revanced-patches/labels/Feature%20request).
        - **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-patches/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: This issue is not a duplicate of an existing feature request.
          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/patch-request.yml
+++ b/.github/ISSUE_TEMPLATE/patch-request.yml
@@ -1,41 +0,0 @@
 name: ⭐ Patch Request
 description: Create a detailed patch request.
 title: 'feat: '
 labels: [patch-request]
 body:
  - type: textarea
    attributes:
      label: Application
      description: Which application is this patch for?
    validations:
      required: true
  - type: textarea
    attributes:
      label: Issue
      description: What is the issue this patch should solve?
    validations:
      required: true
  - type: textarea
    attributes:
      label: Patch
      description: "Describe the patch you'd like to see in detail."
    validations:
      required: true
  - type: textarea
    attributes:
      label: Motivation
      description: Why should your patch request be considered? What makes it valuable to the community?
    validations:
      required: true
  - type: checkboxes
    id: acknowledgements
    attributes:
      label: Acknowledgements
      description: Your issue will be closed if you haven't done these steps.
      options:
        - label: I have searched the existing issues and this is a new and no duplicate or related to another open issue.
          required: true
        - label: I have written a short but informative title.
          required: true
        - label: I filled out all of the requested information in this issue properly.
          required: true
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -1,2 +1,2 @@
 firstPRMergeComment: >
-  Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) if you want to receive a contributor role.
+  Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) to receive a role for your contribution.
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -1,4 +1,4 @@
-name: PR to main
+name: Open a PR to main
 on:
  push:
@@ -7,7 +7,7 @@ on:
  workflow_dispatch:
 env:
-  MESSAGE: merge branch `${{ github.head_ref || github.ref_name }}` to `main`
+  MESSAGE: Merge branch `${{ github.head_ref || github.ref_name }}` to `main`
 jobs:
  pull-request:
@@ -15,7 +15,8 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: Open pull request
        uses: repo-sync/pull-request@v2
        with:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,27 +17,31 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        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
+
      - name: Cache Node modules
        uses: actions/cache@v3
        with:
          path: |
            ${{ runner.home }}/.gradle/caches
            ${{ runner.home }}/.gradle/wrapper
            .gradle
            node_modules
-          key: ${{ runner.os }}-gradle-npm-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'package-lock.json') }}
+          key: npm-${{ hashFiles('package-lock.json') }}
      - name: Cache Gradle
        uses: burrunan/gradle-cache-action@v1
      - name: Build with Gradle
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        run: ./gradlew generateMeta clean
      - name: Setup semantic-release
        run: npm install
      - name: Release
        env:
          GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,125 @@
 <p align="center">
  <picture>
    <source
      width="256px"
      media="(prefers-color-scheme: dark)"
      srcset="assets/revanced-headline/revanced-headline-vertical-dark.svg"
    >
    <img 
      width="256px"
      src="assets/revanced-headline/revanced-headline-vertical-light.svg"
    >
  </picture>
  <br>
  <a href="https://revanced.app/">
     <picture>
         <source height="24px" media="(prefers-color-scheme: dark)" srcset="assets/revanced-logo/revanced-logo.svg" />
         <img height="24px" src="assets/revanced-logo/revanced-logo.svg" />
     </picture>
   </a>&nbsp;&nbsp;&nbsp;
   <a href="https://github.com/ReVanced">
       <picture>
           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://i.ibb.co/dMMmCrW/Git-Hub-Mark.png" />
           <img height="24px" src="https://i.ibb.co/9wV3HGF/Git-Hub-Mark-Light.png" />
       </picture>
   </a>&nbsp;&nbsp;&nbsp;
   <a href="http://revanced.app/discord">
       <picture>
           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032563-d4e084b7-244e-4358-af50-26bde6dd4996.png" />
       </picture>
   </a>&nbsp;&nbsp;&nbsp;
   <a href="https://reddit.com/r/revancedapp">
       <picture>
           <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
           <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032351-9d9d5619-8ef7-470a-9eec-2744ece54553.png" />
       </picture>
   </a>&nbsp;&nbsp;&nbsp;
   <a href="https://t.me/app_revanced">
      <picture>
         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032213-faf25ab8-0bc3-4a94-a730-b524c96df124.png" />
      </picture>
   </a>&nbsp;&nbsp;&nbsp;
   <a href="https://x.com/revancedapp">
      <picture>
         <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/93124920/270180600-7c1b38bf-889b-4d68-bd5e-b9d86f91421a.png">
         <img height="24px" src="https://user-images.githubusercontent.com/93124920/270108715-d80743fa-b330-4809-b1e6-79fbdc60d09c.png" />
      </picture>
   </a>&nbsp;&nbsp;&nbsp;
   <a href="https://www.youtube.com/@ReVanced">
      <picture>
         <source height="24px" media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
         <img height="24px" src="https://user-images.githubusercontent.com/13122796/178032714-c51c7492-0666-44ac-99c2-f003a695ab50.png" />
     </picture>
   </a>
   <br>
   <br>
   Continuing the legacy of Vanced
 </p>
 # 👋 Contribution guidelines
 This document describes how to contribute to ReVanced Patches.
 ## 📖 Resources to help you get started
 * The [documentation](https://github.com/ReVanced/revanced-patches/tree/docs/docs) provides the fundamentals of patches 
 and everything necessary to create your own patch from scratch
 * [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-patches/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-patches/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 Patches.
 > Good motivation has to be provided for a request to be accepted.
 ## 🐞 Submitting a bug report
 If you encounter a bug while using ReVanced Patches, open an issue using the
 [Bug report issue template](https://github.com/ReVanced/revanced-patches/issues/new?assignees=&labels=Bug+report&projects=&template=bug-report.yml&title=bug%3A+).
 ## 🧑‍⚖️ Guidelines for requesting or contributing patches
 To maintain a high-quality and ethical collection of patches, the following guidelines for requesting
 or contributing patches are effective as of September 14, 2023. Any patches present prior to this date 
 are unaffected by this change.
 > **Note**
 > We generally adhere to the guidelines outlined below. However, we may make exceptions
 > in specific cases based on our discretion. Pull requests for patches that deviate from the guidelines
 > will be evaluated individually. While a patch may not align with our general guidelines,
 > we will consider its acceptance on a case-by-case basis, taking into account its impact on user experience
 > and ethical considerations. We reserve the right to make exceptions for patches that provide significant value.
 ✅ Examples for acceptable patches include:
 * Customizations: Feel free to contribute patches that allow users to personalize their experience
 * Ad-Blocking: Patches aimed at enhancing user privacy and blocking intrusive advertisements are appreciated
 * Feature additions: Patches that add new features or change behaviour to the app are welcome
 ❌ Examples for unacceptable patches include:
 * Payment circumvention: We do not accept patches that exist solely to bypass payment for the app or any of its features
 * Malicious patches: Patches that are malicious in nature are not allowed
 ## 📝 How to contribute
 1. Before contributing, it is recommended to open an issue to discuss your change 
 with the maintainers of ReVanced Patches. 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. In case you are contributing a new patch, make sure to follow the conventions for patches
 described in the [documentation](https://github.com/ReVanced/revanced-patches/tree/docs/docs)
 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 Patches
 ❤️ Thank you for considering contributing to ReVanced Patches,
 ReVanced
--- a/README.md
+++ b/README.md
@@ -1,3 +1,109 @@
-## 🧩 ReVanced Patches
+<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>
-Patches for ReVanced.
+# 🧩 ReVanced Patches
 ![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/ReVanced/revanced-patches/release.yml)
 ![GPLv3 License](https://img.shields.io/badge/License-GPL%20v3-yellow.svg)
 This repository contains a collection of ReVanced Patches.
 ## ❓ About
 Patches are small modifications to Android apps that allow you to change the behaviour of or add new features, 
 block ads, customize the appearance, and much more.
 ## 💪 Features
 Some of the features the patches provide are:
 * 🚫 **Block ads**: Say goodbye to ads
 * ⭐ **Customize your app**: Personalize the appearance of apps with various layouts and themes
 * 🪄 **Add new features**: Extend the functionality of apps with lots of new features
 * ⚙️ **Miscellaneous and general purpose**: Rename packages, enable debugging, disable screen capture restrictions, 
 export activities, etc.
 * ✨ **And much more!**
 For a full list of all available patches, visit [revanced.app/patches](https://revanced.app/patches).
 ## 🚀 How to get started
 You can use [ReVanced CLI](https://github.com/ReVanced/revanced-cli) or [ReVanced Manager](https://github.com/ReVanced/revanced-manager) to use ReVanced Patches.
 ## 📚 Everything else
 ### 📙 Contributing
 Thank you for considering contributing to ReVanced Patches. You can find the contribution guidelines [here](CONTRIBUTING.md).
 ### 📃 Documentation
 The documentation provides the fundamentals of patches and everything necessary to create your own patch from scratch.
 You can find it [here](https://github.com/ReVanced/revanced-patches/tree/docs/docs).
 ### 🛠️ Building
 In order to build ReVanced Patches, you can follow the [ReVanced documentation](https://github.com/ReVanced/revanced-documentation).
 ## 📜 Licence
 ReVanced Patches is licensed under the GPLv3 licence. 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 patches as long as you track changes/dates in source files.
 Any modifications to ReVanced Patches must also be made available under the GPL along with build & install instructions.
--- a/api/revanced-patches.api
+++ b/api/revanced-patches.api
--- 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
@@ -0,0 +1 @@
 <?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,5 +1,9 @@
 import org.gradle.kotlin.dsl.support.listFilesOrdered
 plugins {
-    kotlin("jvm") version "1.8.20"
+    kotlin("jvm") version "1.9.10"
    alias(libs.plugins.binary.compatibility.validator)
    `maven-publish`
 }
 group = "app.revanced"
@@ -8,32 +12,18 @@ repositories {
    mavenCentral()
    mavenLocal()
    google()
-    maven {
+    maven { url = uri("https://jitpack.io") }
        url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
        credentials {
            username = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR")
            password = project.findProperty("gpr.key") as? String ?: System.getenv("GITHUB_TOKEN")
        }
    }
    // Required for FlexVer-Java
    maven {
        url = uri("https://repo.sleeping.town")
        content {
            includeGroup("com.unascribed")
        }
    }
 }
 dependencies {
-    implementation("app.revanced:revanced-patcher:14.2.1")
+    implementation(libs.revanced.patcher)
-    implementation("com.android.tools.smali:smali:3.0.3")
+    implementation(libs.smali)
-    // Required because build fails without it.
+    // TODO: Required because build fails without it. Find a way to remove this dependency.
-    // TODO: Find a way to remove this dependency.
+    implementation(libs.guava)
    implementation("com.google.guava:guava:32.1.2-jre")
    // Used in JsonGenerator.
-    implementation("com.google.code.gson:gson:2.10.1")
+    implementation(libs.gson)
-    // A dependency to the Android library unfortunately fails the build,
+
-    // which is why this is required for the patch change-oauth-client-id.
+    // A dependency to the Android library unfortunately fails the build, which is why this is required.
    compileOnly(project("dummy"))
 }
@@ -41,41 +31,93 @@ kotlin {
    jvmToolchain(11)
 }
 tasks.withType(Jar::class) {
    exclude("app/revanced/meta")
    manifest {
        attributes["Name"] = "ReVanced Patches"
        attributes["Description"] = "Patches for ReVanced."
        attributes["Version"] = version
        attributes["Timestamp"] = System.currentTimeMillis().toString()
        attributes["Source"] = "git@github.com:revanced/revanced-patches.git"
        attributes["Author"] = "ReVanced"
        attributes["Contact"] = "contact@revanced.app"
        attributes["Origin"] = "https://revanced.app"
        attributes["License"] = "GNU General Public License v3.0"
    }
 }
 tasks {
    register<DefaultTask>("generateBundle") {
        description = "Generate dex files from build and bundle them in the jar file"
        dependsOn(build)
        doLast {
-            val androidHome = System.getenv("ANDROID_HOME") ?: throw GradleException("ANDROID_HOME not found")
+            val d8 = File(System.getenv("ANDROID_HOME")).resolve("build-tools")
-            val d8 = "${androidHome}/build-tools/33.0.1/d8"
+                .listFilesOrdered().last().resolve("d8").absolutePath
-            val input = configurations.archives.get().allArtifacts.files.files.first().absolutePath
+
-            val work = layout.buildDirectory.dir("libs").get().asFile
+            val artifacts = configurations.archives.get().allArtifacts.files.files.first().absolutePath
            val workingDirectory = layout.buildDirectory.dir("libs").get().asFile
            exec {
-                workingDir = work
+                workingDir = workingDirectory
-                commandLine = listOf(d8, input)
+                commandLine = listOf(d8, artifacts)
            }
            exec {
-                workingDir = work
+                workingDir = workingDirectory
-                commandLine = listOf("zip", "-u", input, "classes.dex")
+                commandLine = listOf("zip", "-u", artifacts, "classes.dex")
            }
        }
    }
    register<JavaExec>("generateMeta") {
        description = "Generate metadata for this bundle"
        dependsOn(build)
        classpath = sourceSets["main"].runtimeClasspath
        mainClass.set("app.revanced.meta.PatchesFileGenerator")
    }
-    // Dummy task to fix the Gradle semantic-release plugin.
+
-    // Remove this if you forked it to support building only.
+    // Required to run tasks because Gradle semantic-release plugin runs the publish task.
-    // Tracking issue: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435
+    // Tracking: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435
-    register<DefaultTask>("publish") {
+    named("publish") {
-        group = "publish"
+        dependsOn("generateBundle")
-        description = "Dummy task"
+        dependsOn("generateMeta")
        dependsOn(named("generateBundle"), named("generateMeta"))
    }
 }
 publishing {
    publications {
        create<MavenPublication>("revanced-patches-publication") {
            from(components["java"])
            pom {
                name = "ReVanced Patches"
                description = "Patches for 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-patches.git"
                    developerConnection = "scm:git:git@github.com:revanced/revanced-patches.git"
                    url = "https://github.com/revanced/revanced-patches"
                }
            }
        }
    }
 }
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 2.191.0-dev.2
+version = 3.0.0-dev.10
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,15 @@
 [versions]
 revanced-patcher = "19.1.0"
 smali = "3.0.3"
 guava = "32.1.2-jre"
 gson = "2.10.1"
 binary-compatibility-validator = "0.13.2"
 [libraries]
 revanced-patcher = { module = "app.revanced:revanced-patcher", version.ref = "revanced-patcher" }
 smali = { module = "com.android.tools.smali:smali", version.ref = "smali" }
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 [plugins]
 binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-compatibility-validator" }
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
-networkTimeout=10000
+distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dist
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
 {
  "devDependencies": {
-    "@saithodev/semantic-release-backmerge": "^3.1.0",
+    "@saithodev/semantic-release-backmerge": "^3.2.1",
-    "@semantic-release/changelog": "^6.0.2",
+    "@semantic-release/changelog": "^6.0.3",
    "@semantic-release/git": "^10.0.1",
-    "gradle-semantic-release-plugin": "^1.7.6",
+    "gradle-semantic-release-plugin": "^1.8.0",
-    "semantic-release": "^20.1.0"
+    "semantic-release": "^22.0.8"
  }
 }
--- a/patches.json
+++ b/patches.json
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,3 +1,9 @@
 include("dummy")
 rootProject.name = "revanced-patches"
 buildCache {
    local {
        isEnabled = "CI" !in System.getenv()
    }
 }
--- a/src/main/kotlin/app/revanced/extensions/Extensions.kt
+++ b/src/main/kotlin/app/revanced/extensions/Extensions.kt
@@ -1,108 +0,0 @@
 package app.revanced.extensions
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.Method
 import com.android.tools.smali.dexlib2.iface.instruction.WideLiteralInstruction
 import com.android.tools.smali.dexlib2.util.MethodUtil
 import org.w3c.dom.Node
 /**
 * The [PatchException] of failing to resolve a [MethodFingerprint].
 *
 * @return The [PatchException].
 */
 val MethodFingerprint.exception
    get() = PatchException("Failed to resolve $name")
 /**
 * Find the [MutableMethod] from a given [Method] in a [MutableClass].
 *
 * @param method The [Method] to find.
 * @return The [MutableMethod].
 */
 fun MutableClass.findMutableMethodOf(method: Method) = this.methods.first {
    MethodUtil.methodSignaturesMatch(it, method)
 }
 /**
 * apply a transform to all methods of the class.
 *
 * @param transform the transformation function. original method goes in, transformed method goes out.
 */
 fun MutableClass.transformMethods(transform: MutableMethod.() -> MutableMethod) {
    val transformedMethods = methods.map { it.transform() }
    methods.clear()
    methods.addAll(transformedMethods)
 }
 fun Node.doRecursively(action: (Node) -> Unit) {
    action(this)
    for (i in 0 until this.childNodes.length) this.childNodes.item(i).doRecursively(action)
 }
 fun MutableMethod.injectHideViewCall(
    insertIndex: Int,
    viewRegister: Int,
    classDescriptor: String,
    targetMethod: String
 ) = addInstruction(
    insertIndex,
    "invoke-static { v$viewRegister }, $classDescriptor->$targetMethod(Landroid/view/View;)V"
 )
 /**
 * Find the index of the first constant instruction with the id of the given resource name.
 *
 * @param resourceName the name of the resource to find the id for.
 * @return the index of the first constant instruction with the id of the given resource name, or -1 if not found.
 */
 fun Method.findIndexForIdResource(resourceName: String): Int {
    fun getIdResourceId(resourceName: String) = ResourceMappingPatch.resourceMappings.single {
        it.type == "id" && it.name == resourceName
    }.id
    return indexOfFirstConstantInstructionValue(getIdResourceId(resourceName))
 }
 /**
 * Find the index of the first constant instruction with the given value.
 *
 * @return the first constant instruction with the value, or -1 if not found.
 */
 fun Method.indexOfFirstConstantInstructionValue(constantValue: Long): Int {
    return implementation?.let {
        it.instructions.indexOfFirst { instruction ->
            instruction.opcode == Opcode.CONST && (instruction as WideLiteralInstruction).wideLiteral == constantValue
        }
    } ?: -1
 }
 /**
 * Check if the method contains a constant with the given value.
 *
 * @return if the method contains a constant with the given value.
 */
 fun Method.containsConstantInstructionValue(constantValue: Long): Boolean {
    return indexOfFirstConstantInstructionValue(constantValue) >= 0
 }
 /**
 * Traverse the class hierarchy starting from the given root class.
 *
 * @param targetClass the class to start traversing the class hierarchy from.
 * @param callback function that is called for every class in the hierarchy.
 */
 fun BytecodeContext.traverseClassHierarchy(targetClass: MutableClass, callback: MutableClass.() -> Unit) {
    callback(targetClass)
    this.findClass(targetClass.superclass ?: return)?.mutableClass?.let {
        traverseClassHierarchy(it, callback)
    }
 }
--- a/src/main/kotlin/app/revanced/meta/JsonGenerator.kt
+++ b/src/main/kotlin/app/revanced/meta/JsonGenerator.kt
@@ -1,67 +1,49 @@
 package app.revanced.meta
-import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
+import app.revanced.patcher.PatchSet
-import app.revanced.patcher.extensions.PatchExtensions.dependencies
+import app.revanced.patcher.patch.Patch
 import app.revanced.patcher.extensions.PatchExtensions.description
 import app.revanced.patcher.extensions.PatchExtensions.include
 import app.revanced.patcher.extensions.PatchExtensions.options
 import app.revanced.patcher.extensions.PatchExtensions.patchName
 import app.revanced.patcher.patch.PatchOption
 import com.google.gson.GsonBuilder
 import java.io.File
 internal class JsonGenerator : PatchesFileGenerator {
-    override fun generate(bundle: PatchBundlePatches) {
+    override fun generate(patches: PatchSet) = patches.map {
-        val patches = bundle.map {
+        JsonPatch(
-            JsonPatch(
+            it.name!!,
-                it.patchName,
+            it.description,
-                it.description ?: "This patch has no description.",
+            it.compatiblePackages,
-                !it.include,
+            it.use,
-                it.options?.map { option ->
+            it.requiresIntegrations,
-                    JsonPatch.Option(
+            it.options.values.map { option ->
-                        option.key,
+                JsonPatch.Option(
-                        option.title,
+                    option.key,
-                        option.description,
+                    option.default,
-                        option.required,
+                    option.values,
-                        option.let { listOption ->
+                    option.title,
-                            if (listOption is PatchOption.ListOption<*>) {
+                    option.description,
-                                listOption.options.toMutableList().toTypedArray()
+                    option.required
-                            } else null
+                )
-                        }
+            }
-                    )
+        )
-                }?.toTypedArray() ?: emptyArray(),
+    }.let {
-                it.dependencies?.map { dep ->
+        File("patches.json").writeText(GsonBuilder().serializeNulls().create().toJson(it))
                    dep.java.patchName
                }?.toTypedArray() ?: emptyArray(),
                it.compatiblePackages?.map { pkg ->
                    JsonPatch.CompatiblePackage(pkg.name, pkg.versions)
                }?.toTypedArray() ?: emptyArray()
            )
        }
        val json = File("patches.json")
        json.writeText(GsonBuilder().serializeNulls().create().toJson(patches))
    }
    @Suppress("unused")
    private class JsonPatch(
-        val name: String,
+        val name: String? = null,
-        val description: String,
+        val description: String? = null,
-        val excluded: Boolean,
+        val compatiblePackages: Set<Patch.CompatiblePackage>? = null,
-        val options: Array<Option>,
+        val use: Boolean = true,
-        val dependencies: Array<String>,
+        val requiresIntegrations: Boolean = false,
-        val compatiblePackages: Array<CompatiblePackage>,
+        val options: List<Option>
    ) {
        class CompatiblePackage(
            val name: String,
            val versions: Array<String>,
        )
        class Option(
            val key: String,
-            val title: String,
+            val default: Any?,
-            val description: String,
+            val values: Map<String, Any?>?,
            val title: String?,
            val description: String?,
            val required: Boolean,
            val choices: Array<*>?,
        )
    }
 }
--- a/src/main/kotlin/app/revanced/meta/PatchesFileGenerator.kt
+++ b/src/main/kotlin/app/revanced/meta/PatchesFileGenerator.kt
@@ -1,13 +1,11 @@
 package app.revanced.meta
 import app.revanced.patcher.PatchBundleLoader
-import app.revanced.patcher.patch.PatchClass
+import app.revanced.patcher.PatchSet
 import java.io.File
 internal typealias PatchBundlePatches = List<PatchClass>
 internal interface PatchesFileGenerator {
-    fun generate(bundle: PatchBundlePatches)
+    fun generate(patches: PatchSet)
    private companion object {
        @JvmStatic
--- a/src/main/kotlin/app/revanced/patches/all/activity/exportall/patch/ExportAllActivitiesPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/activity/exportall/patch/ExportAllActivitiesPatch.kt
@@ -1,15 +1,17 @@
-package app.revanced.patches.all.activity.exportall.patch
+package app.revanced.patches.all.activity.exportall
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.Patch
-@Patch(false)
+@Patch(
-@Name("Export all activities")
+    name = "Export all activities",
-@Description("Makes all app activities exportable.")
+    description = "Makes all app activities exportable.",
-class ExportAllActivitiesPatch : ResourcePatch {
+    use = false
 )
@Suppress("unused")
 object ExportAllActivitiesPatch : ResourcePatch() {
    private const val EXPORTED_FLAG = "android:exported"
    override fun execute(context: ResourceContext) {
        context.xmlEditor["AndroidManifest.xml"].use { editor ->
            val document = editor.file
@@ -32,8 +34,4 @@ class ExportAllActivitiesPatch : ResourcePatch {
            }
        }
    }
    private companion object {
        const val EXPORTED_FLAG = "android:exported"
    }
 }
--- a/src/main/kotlin/app/revanced/patches/all/connectivity/wifi/spoof/patch/SpoofWifiPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/connectivity/wifi/spoof/patch/SpoofWifiPatch.kt
@@ -1,29 +1,46 @@
-package app.revanced.patches.all.connectivity.wifi.spoof.patch
+package app.revanced.patches.all.connectivity.wifi.spoof
-import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.annotations.RequiresIntegrations
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.util.patch.*
+import app.revanced.patches.all.misc.transformation.AbstractTransformInstructionsPatch
 import app.revanced.patches.all.misc.transformation.IMethodCall
 import app.revanced.patches.all.misc.transformation.Instruction35cInfo
 import app.revanced.patches.all.misc.transformation.filterMapInstruction35c
 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 java.util.*
-@Patch(false)
+@Patch(
-@Name("Spoof wifi connection")
+    name = "Spoof Wi-Fi connection",
-@Description("Spoofs an existing Wi-Fi connection.")
+    description = "Spoofs an existing Wi-Fi connection.",
-@RequiresIntegrations
+    use = false,
-class SpoofWifiPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
+    requiresIntegrations = true
 )
@Suppress("unused")
 object SpoofWifiPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
    private const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX = "Lapp/revanced/all/connectivity/wifi/spoof/SpoofWifiPatch"
    private const val INTEGRATIONS_CLASS_DESCRIPTOR = "$INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX;"
-    private companion object {
+    override fun filterMap(
-        const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX = "Lapp/revanced/all/connectivity/wifi/spoof/SpoofWifiPatch"
+        classDef: ClassDef,
-        const val INTEGRATIONS_CLASS_DESCRIPTOR = "${INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX};"
+        method: Method,
        instruction: Instruction,
        instructionIndex: Int
    ) = filterMapInstruction35c<MethodCall>(
        INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX,
        classDef,
        instruction,
        instructionIndex
    )
    override fun transform(mutableMethod: MutableMethod, entry: Instruction35cInfo) {
        val (methodType, instruction, instructionIndex) = entry
        methodType.replaceInvokeVirtualWithIntegrations(INTEGRATIONS_CLASS_DESCRIPTOR, mutableMethod, instruction, instructionIndex)
    }
    // Information about method calls we want to replace
-    enum class MethodCall(
+    private enum class MethodCall(
        override val definedClassName: String,
        override val methodName: String,
        override val methodParams: Array<String>,
@@ -186,21 +203,4 @@ class SpoofWifiPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>()
            "V",
        );
    }
    override fun filterMap(
        classDef: ClassDef,
        method: Method,
        instruction: Instruction,
        instructionIndex: Int
    ) = filterMapInstruction35c<MethodCall>(
        INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX,
        classDef,
        instruction,
        instructionIndex
    )
    override fun transform(mutableMethod: MutableMethod, entry: Instruction35cInfo) {
        val (methodType, instruction, instructionIndex) = entry
        methodType.replaceInvokeVirtualWithIntegrations(INTEGRATIONS_CLASS_DESCRIPTOR, mutableMethod, instruction, instructionIndex)
    }
 }
--- a/src/main/kotlin/app/revanced/patches/all/interaction/gestures/patch/PredictiveBackGesturePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/interaction/gestures/patch/PredictiveBackGesturePatch.kt
@@ -1,15 +1,18 @@
-package app.revanced.patches.all.interaction.gestures.patch
+package app.revanced.patches.all.interaction.gestures
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.Patch
@Patch(
    name = "Predictive back gesture",
    description = "Enables the predictive back gesture introduced on Android 13.",
    use = false
 )
@Suppress("unused")
 object PredictiveBackGesturePatch : ResourcePatch() {
    private const val FLAG = "android:enableOnBackInvokedCallback"
@Patch(false)
@Name("Predictive back gesture")
@Description("Enables the predictive back gesture introduced on Android 13.")
 class PredictiveBackGesturePatch : ResourcePatch {
    override fun execute(context: ResourceContext) {
        context.xmlEditor["AndroidManifest.xml"].use { editor ->
            val document = editor.file
@@ -20,12 +23,7 @@ class PredictiveBackGesturePatch : ResourcePatch {
                document.createAttribute(FLAG)
                    .apply { value = "true" }
                    .let(attributes::setNamedItem)
            }
        }
    }
    private companion object {
        const val FLAG = "android:enableOnBackInvokedCallback"
    }
 }
--- a/src/main/kotlin/app/revanced/patches/all/misc/debugging/patch/EnableAndroidDebuggingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/misc/debugging/patch/EnableAndroidDebuggingPatch.kt
@@ -1,16 +1,17 @@
-package app.revanced.patches.all.misc.debugging.patch
+package app.revanced.patches.all.misc.debugging
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.Patch
 import org.w3c.dom.Element
-@Patch(false)
+@Patch(
-@Name("Enable android debugging")
+    name = "Enable Android debugging",
-@Description("Enables Android debugging capabilities. This can slow down the app.")
+    description = "Enables Android debugging capabilities. This can slow down the app.",
-class EnableAndroidDebuggingPatch : ResourcePatch {
+    use = false
 )
@Suppress("unused")
 object EnableAndroidDebuggingPatch : ResourcePatch() {
    override fun execute(context: ResourceContext) {
        context.xmlEditor["AndroidManifest.xml"].use { dom ->
            val applicationNode = dom
@@ -22,5 +23,4 @@ class EnableAndroidDebuggingPatch : ResourcePatch {
            applicationNode.setAttribute("android:debuggable", "true")
        }
    }
 }
--- a/src/main/kotlin/app/revanced/patches/all/misc/network/patch/OverrideCertificatePinningPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/misc/network/patch/OverrideCertificatePinningPatch.kt
@@ -1,20 +1,20 @@
-package app.revanced.patches.all.misc.network.patch
+package app.revanced.patches.all.misc.network
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.all.misc.debugging.EnableAndroidDebuggingPatch
 import app.revanced.patches.all.misc.debugging.patch.EnableAndroidDebuggingPatch
 import org.w3c.dom.Element
 import java.io.File
-@Patch(false)
+@Patch(
-@Name("Override certificate pinning")
+    name = "Override certificate pinning",
-@Description("Overrides certificate pinning, allowing to inspect traffic via a proxy.")
+    description = "Overrides certificate pinning, allowing to inspect traffic via a proxy.",
-@DependsOn([EnableAndroidDebuggingPatch::class])
+    dependencies = [EnableAndroidDebuggingPatch::class],
-class OverrideCertificatePinningPatch : ResourcePatch {
+    use = false
 )
@Suppress("unused")
 object OverrideCertificatePinningPatch : ResourcePatch() {
    override fun execute(context: ResourceContext) {
        val resXmlDirectory = context["res/xml"]
--- a/src/main/kotlin/app/revanced/patches/all/misc/packagename/ChangePackageNamePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/misc/packagename/ChangePackageNamePatch.kt
@@ -0,0 +1,62 @@
 package app.revanced.patches.all.misc.packagename
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption
 import app.revanced.patcher.patch.options.PatchOptionException
 import org.w3c.dom.Element
 import java.io.Closeable
@Patch(
    name = "Change package name",
    description = "Appends \".revanced\" to the package name by default.",
    use = false
 )
@Suppress("unused")
 object ChangePackageNamePatch : ResourcePatch(), Closeable {
    private val packageNameOption = stringPatchOption(
        key = "packageName",
        default = "Default",
        values = mapOf("Default" to "Default"),
        title = "Package name",
        description = "The name of the package to rename the app to.",
        required = true
    ) {
        it == "Default" || it!!.matches(Regex("^[a-z]\\w*(\\.[a-z]\\w*)+\$"))
    }
    private lateinit var context: ResourceContext
    override fun execute(context: ResourceContext) {
        this.context = context
    }
    /**
     * Set the package name to use.
     * If this is called multiple times, the first call will set the package name.
     *
     * @param fallbackPackageName The package name to use if the user has not already specified a package name.
     * @return The package name that was set.
     * @throws PatchOptionException.ValueValidationException If the package name is invalid.
     */
    fun setOrGetFallbackPackageName(fallbackPackageName: String): String {
        val packageName = this.packageNameOption.value!!
        return if (packageName == this.packageNameOption.default)
            fallbackPackageName.also { this.packageNameOption.value = it }
        else
            packageName
    }
    override fun close() = context.xmlEditor["AndroidManifest.xml"].use { editor ->
        val manifest = editor.file.getElementsByTagName("manifest").item(0) as Element
        val originalPackageName = manifest.getAttribute("package")
        var replacementPackageName = this.packageNameOption.value
        if (replacementPackageName == this.packageNameOption.default)
            replacementPackageName = "$originalPackageName.revanced"
        manifest.setAttribute("package", replacementPackageName)
    }
 }
--- a/src/main/kotlin/app/revanced/patches/all/misc/packagename/patch/ChangePackageNamePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/misc/packagename/patch/ChangePackageNamePatch.kt
@@ -1,50 +0,0 @@
 package app.revanced.patches.all.misc.packagename.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.*
 import app.revanced.patcher.patch.annotations.Patch
 import org.w3c.dom.Element
@Patch(false)
@Name("Change package name")
@Description("Changes the package name. Appends \".revanced\" to the package name by default.")
 class ChangePackageNamePatch : ResourcePatch {
    override fun execute(context: ResourceContext) {
        val packageNameToUse = packageName ?: getDefaultPackageName(context)
        val packageNameRegex = Regex("^[a-z]\\w*(\\.[a-z]\\w*)+\$")
        if (!packageNameToUse.matches(packageNameRegex))
            throw PatchException("Invalid package name")
        val originalPackageName = getOriginalPackageName(context)
        context["AndroidManifest.xml"].apply {
            readText().replace(originalPackageName, packageNameToUse).let(::writeText)
        }
    }
    private fun getDefaultPackageName(context: ResourceContext): String {
        val originalPackageName = getOriginalPackageName(context)
        return "$originalPackageName.revanced"
    }
    private fun getOriginalPackageName(context: ResourceContext): String {
        context.xmlEditor["AndroidManifest.xml"].use { editor ->
            val manifest = editor.file.getElementsByTagName("manifest").item(0) as Element
            return manifest.getAttribute("package")
        }
    }
    companion object : OptionsContainer() {
        var packageName: String? by option(
            PatchOption.StringOption(
                key = "packageName",
                default = null,
                title = "Package name",
                description = "The name of the package to rename the app to.",
            )
        )
    }
 }
--- a/src/main/kotlin/app/revanced/patches/all/misc/transformation/AbstractTransformInstructionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/misc/transformation/AbstractTransformInstructionsPatch.kt
@@ -1,13 +1,14 @@
-package app.revanced.util.patch
+package app.revanced.patches.all.misc.transformation
 import app.revanced.extensions.findMutableMethodOf
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.util.findMutableMethodOf
 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
@Suppress("MemberVisibilityCanBePrivate")
 abstract class AbstractTransformInstructionsPatch<T> : BytecodePatch() {
    abstract fun filterMap(
@@ -20,7 +21,7 @@ abstract class AbstractTransformInstructionsPatch<T> : BytecodePatch() {
    abstract fun transform(mutableMethod: MutableMethod, entry: T)
    // Returns the patch indices as a Sequence, which will execute lazily.
-    private fun findPatchIndices(classDef: ClassDef, method: Method): Sequence<T>? {
+    fun findPatchIndices(classDef: ClassDef, method: Method): Sequence<T>? {
        return method.implementation?.instructions?.asSequence()?.withIndex()?.mapNotNull { (index, instruction) ->
            filterMap(classDef, method, instruction, index)
        }
@@ -35,11 +36,7 @@ abstract class AbstractTransformInstructionsPatch<T> : BytecodePatch() {
                        // Since the Sequence executes lazily,
                        // using any() results in only calling
                        // filterMap until the first index has been found.
-                        val patchIndices = findPatchIndices(classDef, method)
+                        if (findPatchIndices(classDef, method)?.any() == true) add(method)
                        if (patchIndices?.any() == true) {
                            add(method)
                        }
                    }
                }
@@ -55,9 +52,7 @@ abstract class AbstractTransformInstructionsPatch<T> : BytecodePatch() {
                val patchIndices = findPatchIndices(mutableClass, mutableMethod)?.toCollection(ArrayDeque())
                    ?: return@methods
-                while (!patchIndices.isEmpty()) {
+                while (!patchIndices.isEmpty()) transform(mutableMethod, patchIndices.removeLast())
                    transform(mutableMethod, patchIndices.removeLast())
                }
            }
        }
    }
--- a/src/main/kotlin/app/revanced/patches/all/misc/transformation/MethodCall.kt
+++ b/src/main/kotlin/app/revanced/patches/all/misc/transformation/MethodCall.kt
@@ -1,4 +1,4 @@
-package app.revanced.util.patch
+package app.revanced.patches.all.misc.transformation
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
@@ -67,6 +67,7 @@ inline fun <reified E> fromMethodReference(methodReference: MethodReference)
    search.definedClassName == methodReference.definingClass
            && search.methodName == methodReference.name
            && methodReference.parameterTypes.toTypedArray().contentEquals(search.methodParams)
            && search.returnType == methodReference.returnType
 }
 inline fun <reified E> filterMapInstruction35c(
--- a/src/main/kotlin/app/revanced/patches/all/screencapture/removerestriction/bytecode/patch/RemoveCaptureRestrictionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/screencapture/removerestriction/bytecode/patch/RemoveCaptureRestrictionPatch.kt
@@ -1,26 +1,27 @@
-package app.revanced.patches.all.screencapture.removerestriction.bytecode.patch
+package app.revanced.patches.all.screencapture.removerestriction
-import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.annotations.RequiresIntegrations
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.all.screencapture.removerestriction.resource.patch.RemoveCaptureRestrictionResourcePatch
+import app.revanced.patches.all.misc.transformation.AbstractTransformInstructionsPatch
-import app.revanced.util.patch.AbstractTransformInstructionsPatch
+import app.revanced.patches.all.misc.transformation.IMethodCall
-import app.revanced.util.patch.IMethodCall
+import app.revanced.patches.all.misc.transformation.Instruction35cInfo
-import app.revanced.util.patch.Instruction35cInfo
+import app.revanced.patches.all.misc.transformation.filterMapInstruction35c
 import app.revanced.util.patch.filterMapInstruction35c
 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
-@Patch(false)
+@Patch(
-@Name("Remove screen capture restriction")
+    name = "Remove screen capture restriction",
-@Description("Removes the restriction of capturing audio from apps that normally wouldn't allow it.")
+    description = "Removes the restriction of capturing audio from apps that normally wouldn't allow it.",
-@DependsOn([RemoveCaptureRestrictionResourcePatch::class])
+    dependencies = [RemoveCaptureRestrictionResourcePatch::class],
-@RequiresIntegrations
+    use = false,
-class RemoveCaptureRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
+    requiresIntegrations = true
 )
@Suppress("unused")
 object RemoveCaptureRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
    private const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX =
        "Lapp/revanced/all/screencapture/removerestriction/RemoveScreencaptureRestrictionPatch"
    private const val INTEGRATIONS_CLASS_DESCRIPTOR = "$INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX;"
    // Information about method calls we want to replace
    enum class MethodCall(
        override val definedClassName: String,
@@ -58,10 +59,4 @@ class RemoveCaptureRestrictionPatch : AbstractTransformInstructionsPatch<Instruc
        val (methodType, instruction, instructionIndex) = entry
        methodType.replaceInvokeVirtualWithIntegrations(INTEGRATIONS_CLASS_DESCRIPTOR, mutableMethod, instruction, instructionIndex)
    }
    private companion object {
        const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX =
            "Lapp/revanced/all/screencapture/removerestriction/RemoveScreencaptureRestrictionPatch"
        const val INTEGRATIONS_CLASS_DESCRIPTOR = "$INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX;"
    }
 }
--- a/src/main/kotlin/app/revanced/patches/all/screencapture/removerestriction/resource/patch/RemoveCaptureRestrictionResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/screencapture/removerestriction/resource/patch/RemoveCaptureRestrictionResourcePatch.kt
@@ -1,12 +1,12 @@
-package app.revanced.patches.all.screencapture.removerestriction.resource.patch
+package app.revanced.patches.all.screencapture.removerestriction
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotation.Patch
 import org.w3c.dom.Element
-@Description("Sets allowAudioPlaybackCapture in manifest to true.")
+@Patch(description = "Sets allowAudioPlaybackCapture in manifest to true.")
-internal class RemoveCaptureRestrictionResourcePatch : ResourcePatch {
+internal object RemoveCaptureRestrictionResourcePatch : ResourcePatch() {
    override fun execute(context: ResourceContext) {
        // create an xml editor instance
        context.xmlEditor["AndroidManifest.xml"].use { dom ->
--- a/src/main/kotlin/app/revanced/patches/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch.kt
@@ -0,0 +1,106 @@
 package app.revanced.patches.all.screenshot.removerestriction
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.all.misc.transformation.AbstractTransformInstructionsPatch
 import app.revanced.patches.all.misc.transformation.IMethodCall
 import app.revanced.patches.all.misc.transformation.Instruction35cInfo
 import app.revanced.patches.all.misc.transformation.filterMapInstruction35c
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.ClassDef
 import com.android.tools.smali.dexlib2.iface.Method
 import com.android.tools.smali.dexlib2.iface.instruction.Instruction
 import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction22c
 import com.android.tools.smali.dexlib2.iface.reference.FieldReference
@Patch(
    name = "Remove screenshot restriction",
    description = "Removes the restriction of taking screenshots in apps that normally wouldn't allow it.",
    use = false,
    requiresIntegrations = true,
 )
@Suppress("unused")
 object RemoveScreenshotRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
    private const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX =
            "Lapp/revanced/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch"
    private const val INTEGRATIONS_CLASS_DESCRIPTOR = "$INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX;"
    override fun execute(context: BytecodeContext) {
        super.execute(context)
        ModifyLayoutParamsFlags().execute(context)
    }
    override fun filterMap(
        classDef: ClassDef,
        method: Method,
        instruction: Instruction,
        instructionIndex: Int
    ) = filterMapInstruction35c<MethodCall>(
        INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX,
        classDef,
        instruction,
        instructionIndex
    )
    override fun transform(mutableMethod: MutableMethod, entry: Instruction35cInfo) {
        val (methodType, instruction, instructionIndex) = entry
        methodType.replaceInvokeVirtualWithIntegrations(INTEGRATIONS_CLASS_DESCRIPTOR, mutableMethod, instruction, instructionIndex)
    }
    // Information about method calls we want to replace
    enum class MethodCall(
        override val definedClassName: String,
        override val methodName: String,
        override val methodParams: Array<String>,
        override val returnType: String
    ): IMethodCall {
        AddFlags(
            "Landroid/view/Window;",
            "addFlags",
            arrayOf("I"),
            "V",
        ),
        SetFlags(
            "Landroid/view/Window;",
            "setFlags",
            arrayOf("I", "I"),
            "V",
        );
    }
 }
 private class ModifyLayoutParamsFlags : AbstractTransformInstructionsPatch<Pair<Instruction22c, Int>>() {
    override fun filterMap(
        classDef: ClassDef,
        method: Method,
        instruction: Instruction,
        instructionIndex: Int
    ): Pair<Instruction22c, Int>? {
        if (instruction.opcode != Opcode.IPUT) {
            return null
        }
        val instruction22c = instruction as Instruction22c
        val fieldReference = instruction22c.reference as FieldReference
        if (fieldReference.definingClass != "Landroid/view/WindowManager\$LayoutParams;"
            || fieldReference.name != "flags"
            || fieldReference.type != "I") {
            return null
        }
        return Pair(instruction22c, instructionIndex)
    }
    override fun transform(mutableMethod: MutableMethod, entry: Pair<Instruction22c, Int>) {
        val (instruction, index) = entry
        val register = instruction.registerA
        mutableMethod.addInstructions(
            index,
            "and-int/lit16 v$register, v$register, -0x2001"
        )
    }
 }
--- a/src/main/kotlin/app/revanced/patches/all/screenshot/removerestriction/patch/RemoveScreenshotRestrictionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/screenshot/removerestriction/patch/RemoveScreenshotRestrictionPatch.kt
@@ -1,59 +0,0 @@
 package app.revanced.patches.all.screenshot.removerestriction.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.annotations.RequiresIntegrations
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.util.patch.AbstractTransformInstructionsPatch
 import app.revanced.util.patch.IMethodCall
 import app.revanced.util.patch.Instruction35cInfo
 import app.revanced.util.patch.filterMapInstruction35c
 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
@Patch(false)
@Name("Remove screenshot restriction")
@Description("Removes the restriction of taking screenshots in apps that normally wouldn't allow it.")
@RequiresIntegrations
 class RemoveScreenshotRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
    private companion object {
        const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX =
            "Lapp/revanced/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch"
        const val INTEGRATIONS_CLASS_DESCRIPTOR = "$INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX;"
    }
    // Information about method calls we want to replace
    enum class MethodCall(
        override val definedClassName: String,
        override val methodName: String,
        override val methodParams: Array<String>,
        override val returnType: String
    ): IMethodCall {
        SetFlags(
            "Landroid/view/Window;",
            "setFlags",
            arrayOf("I", "I"),
            "V",
        );
    }
    override fun filterMap(
        classDef: ClassDef,
        method: Method,
        instruction: Instruction,
        instructionIndex: Int
    ) = filterMapInstruction35c<MethodCall>(
        INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX,
        classDef,
        instruction,
        instructionIndex
    )
    override fun transform(mutableMethod: MutableMethod, entry: Instruction35cInfo) {
        val (methodType, instruction, instructionIndex) = entry
        methodType.replaceInvokeVirtualWithIntegrations(INTEGRATIONS_CLASS_DESCRIPTOR, mutableMethod, instruction, instructionIndex)
    }
 }
--- a/src/main/kotlin/app/revanced/patches/all/telephony/sim/spoof/SpoofSimCountryPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/telephony/sim/spoof/SpoofSimCountryPatch.kt
@@ -0,0 +1,111 @@
 package app.revanced.patches.all.telephony.sim.spoof
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.patch.options.PatchOption
 import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.all.misc.transformation.AbstractTransformInstructionsPatch
 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.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 import com.android.tools.smali.dexlib2.immutable.reference.ImmutableMethodReference
 import com.android.tools.smali.dexlib2.util.MethodUtil
 import java.util.*
@Patch(
    name = "Spoof SIM country",
    description = "Spoofs country information returned by the SIM card provider.",
    use = false,
 )
@Suppress("unused")
 object SpoofSimCountryPatch : AbstractTransformInstructionsPatch<Pair<Int, String>>() {
    private val isoValidator: PatchOption<String>.(String?) -> Boolean =
        { it: String? -> it?.uppercase() in Locale.getISOCountries() || it == null }
    private val networkCountryIso by stringPatchOption(
        "networkCountryIso",
        null,
        null,
        "Network ISO Country Code",
        "ISO-3166-1 alpha-2 country code equivalent of the MCC (Mobile Country Code) " +
                "of the current registered operator or the cell nearby.",
        validator = isoValidator
    )
    private val simCountryIso by stringPatchOption(
        "simCountryIso",
        null,
        null,
        "Sim ISO Country Code",
        "ISO-3166-1 alpha-2 country code equivalent for the SIM provider's country code.",
        validator = isoValidator
    )
    override fun filterMap(
        classDef: ClassDef,
        method: Method,
        instruction: Instruction,
        instructionIndex: Int
    ): Pair<Int, String>? {
        if (instruction !is ReferenceInstruction) return null
        val reference = instruction.reference as? MethodReference ?: return null
        val match = MethodCall.entries.firstOrNull { search ->
            MethodUtil.methodSignaturesMatch(reference, search.reference)
        } ?: return null
        val iso = when (match) {
            MethodCall.NetworkCountryIso -> networkCountryIso
            MethodCall.SimCountryIso -> simCountryIso
        }?.lowercase()
        return iso?.let { instructionIndex to it }
    }
    override fun transform(
        mutableMethod: MutableMethod,
        entry: Pair<Int, String>
    ) = transformMethodCall(entry, mutableMethod)
    private fun transformMethodCall(
        entry: Pair<Int, String>,
        mutableMethod: MutableMethod
    ) {
        val (instructionIndex, methodCallValue) = entry
        val register = mutableMethod.getInstruction<OneRegisterInstruction>(instructionIndex + 1).registerA
        mutableMethod.replaceInstruction(
            instructionIndex + 1,
            "const-string v$register, \"$methodCallValue\""
        )
    }
    private enum class MethodCall(
        val reference: MethodReference
    ) {
        NetworkCountryIso(
            ImmutableMethodReference(
            "Landroid/telephony/TelephonyManager;",
            "getNetworkCountryIso",
            emptyList(),
            "Ljava/lang/String;"
            )
        ),
        SimCountryIso(
            ImmutableMethodReference(
            "Landroid/telephony/TelephonyManager;",
            "getSimCountryIso",
            emptyList(),
            "Ljava/lang/String;"
            )
        )
    }
 }
--- a/src/main/kotlin/app/revanced/patches/backdrops/misc/pro/patch/ProUnlockPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/backdrops/misc/pro/patch/ProUnlockPatch.kt
@@ -1,23 +1,22 @@
-package app.revanced.patches.backdrops.misc.pro.patch
+package app.revanced.patches.backdrops.misc.pro
-import app.revanced.extensions.exception
+import app.revanced.util.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patches.backdrops.misc.pro.annotations.ProUnlockCompatibility
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.backdrops.misc.pro.fingerprints.ProUnlockFingerprint
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
-@Patch
+@Patch(
-@Name("Pro unlock")
+    name = "Pro unlock",
-@Description("Unlocks pro-only functions.")
+    compatiblePackages = [CompatiblePackage("com.backdrops.wallpapers", ["4.52"])]
-@ProUnlockCompatibility
+)
-class ProUnlockPatch : BytecodePatch(
+@Suppress("unused")
-    listOf(ProUnlockFingerprint)
+object ProUnlockPatch : BytecodePatch(
    setOf(ProUnlockFingerprint)
 ) {
    override fun execute(context: BytecodeContext) {
        ProUnlockFingerprint.result?.let { result ->
--- a/src/main/kotlin/app/revanced/patches/backdrops/misc/pro/annotations/ProUnlockCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/backdrops/misc/pro/annotations/ProUnlockCompatibility.kt
@@ -1,7 +0,0 @@
 package app.revanced.patches.backdrops.misc.pro.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
@Compatibility([Package("com.backdrops.wallpapers", arrayOf("4.52"))])
 internal annotation class ProUnlockCompatibility
--- a/src/main/kotlin/app/revanced/patches/backdrops/misc/pro/fingerprints/ProUnlockFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/backdrops/misc/pro/fingerprints/ProUnlockFingerprint.kt
@@ -1,9 +1,9 @@
 package app.revanced.patches.backdrops.misc.pro.fingerprints
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode
-object ProUnlockFingerprint : MethodFingerprint(
+internal object ProUnlockFingerprint : MethodFingerprint(
    opcodes = listOf(
        Opcode.INVOKE_VIRTUAL,
        Opcode.MOVE_RESULT_OBJECT,
--- a/src/main/kotlin/app/revanced/patches/candylinkvpn/patch/UnlockProPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/candylinkvpn/patch/UnlockProPatch.kt
@@ -1,21 +1,20 @@
-package app.revanced.patches.candylinkvpn.patch
+package app.revanced.patches.candylinkvpn
-import app.revanced.extensions.exception
+import app.revanced.util.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patches.candylinkvpn.annotations.UnlockProCompatibility
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.candylinkvpn.fingerprints.IsPremiumPurchasedFingerprint
-@Patch
+@Patch(
-@Name("Unlock pro")
+    name = "Unlock pro",
-@Description("Unlocks premium features.")
+    compatiblePackages = [CompatiblePackage("com.candylink.openvpn")]
-@UnlockProCompatibility
+)
-class UnlockProPatch : BytecodePatch(
+@Suppress("unused")
-    listOf(IsPremiumPurchasedFingerprint)
+object UnlockProPatch : BytecodePatch(
    setOf(IsPremiumPurchasedFingerprint)
 ) {
    override fun execute(context: BytecodeContext) {
        IsPremiumPurchasedFingerprint.result?.mutableMethod?.addInstructions(
--- a/src/main/kotlin/app/revanced/patches/candylinkvpn/annotations/UnlockProCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/candylinkvpn/annotations/UnlockProCompatibility.kt
@@ -1,8 +0,0 @@
 package app.revanced.patches.candylinkvpn.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
@Compatibility([Package("com.candylink.openvpn")])
@Target(AnnotationTarget.CLASS)
 internal annotation class UnlockProCompatibility
--- a/src/main/kotlin/app/revanced/patches/candylinkvpn/fingerprints/IsPremiumPurchasedFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/candylinkvpn/fingerprints/IsPremiumPurchasedFingerprint.kt
@@ -1,8 +1,8 @@
 package app.revanced.patches.candylinkvpn.fingerprints
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
-object IsPremiumPurchasedFingerprint : MethodFingerprint(
+internal object IsPremiumPurchasedFingerprint : MethodFingerprint(
    customFingerprint = { methodDef, _ ->
        methodDef.definingClass.endsWith("PreferenceProvider;") &&
                methodDef.name == "isPremiumPurchased"
--- a/src/main/kotlin/app/revanced/patches/cieid/restrictions/root/BypassRootChecksPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/cieid/restrictions/root/BypassRootChecksPatch.kt
@@ -0,0 +1,24 @@
 package app.revanced.patches.cieid.restrictions.root
 import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.cieid.restrictions.root.fingerprints.CheckRootFingerprint
@Patch(
    name = "Bypass root checks",
    description = "Removes the restriction to use the app with root permissions or on a custom ROM.",
    compatiblePackages = [CompatiblePackage("it.ipzs.cieid")]
 )
@Suppress("unused")
 object BypassRootChecksPatch : BytecodePatch(
    setOf(CheckRootFingerprint)
 ) {
    override fun execute(context: BytecodeContext) {
        CheckRootFingerprint.result?.mutableMethod?.addInstruction(1, "return-void")
            ?: throw CheckRootFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/cieid/restrictions/root/fingerprints/CheckRootFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/cieid/restrictions/root/fingerprints/CheckRootFingerprint.kt
@@ -0,0 +1,9 @@
 package app.revanced.patches.cieid.restrictions.root.fingerprints
 import app.revanced.patcher.fingerprint.MethodFingerprint
 internal object CheckRootFingerprint : MethodFingerprint(
    customFingerprint = { methodDef, _ ->
        methodDef.definingClass == "Lit/ipzs/cieid/BaseActivity;" && methodDef.name == "onResume"
    }
 )
--- a/src/main/kotlin/app/revanced/patches/duolingo/unlocksuper/fingerprints/IsUserSuperMethodFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/duolingo/unlocksuper/fingerprints/IsUserSuperMethodFingerprint.kt
@@ -1,14 +0,0 @@
 package app.revanced.patches.duolingo.unlocksuper.fingerprints
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 object IsUserSuperMethodFingerprint : MethodFingerprint(
    returnType = "Ljava/lang/Object",
    parameters = listOf("Ljava/lang/Object"),
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
    strings = listOf("user"),
    opcodes = listOf(Opcode.IGET_BOOLEAN),
 )
--- a/src/main/kotlin/app/revanced/patches/duolingo/unlocksuper/fingerprints/UserSerializationMethodFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/duolingo/unlocksuper/fingerprints/UserSerializationMethodFingerprint.kt
@@ -1,20 +0,0 @@
 package app.revanced.patches.duolingo.unlocksuper.fingerprints
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 object UserSerializationMethodFingerprint : MethodFingerprint(
    returnType = "V",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
    strings = listOf(
        "betaStatus",
        "coachOutfit",
        "globalAmbassadorStatus",
    ),
    opcodes = listOf(
        Opcode.MOVE_FROM16,
        Opcode.IPUT_BOOLEAN,
    ),
 )
--- a/src/main/kotlin/app/revanced/patches/duolingo/unlocksuper/patch/UnlockDuolingoSuperPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/duolingo/unlocksuper/patch/UnlockDuolingoSuperPatch.kt
@@ -1,64 +0,0 @@
 package app.revanced.patches.duolingo.unlocksuper.patch
 import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Package
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.getInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.duolingo.unlocksuper.fingerprints.IsUserSuperMethodFingerprint
 import app.revanced.patches.duolingo.unlocksuper.fingerprints.UserSerializationMethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction22c
 import com.android.tools.smali.dexlib2.iface.reference.Reference
@Patch
@Name("Unlock Duolingo Super")
@Description("Unlocks Duolingo Super features.")
@Compatibility([Package("com.duolingo")])
 class UnlockDuolingoSuperPatch : BytecodePatch(
    listOf(UserSerializationMethodFingerprint, IsUserSuperMethodFingerprint)
 ) {
    /* First find the reference to the isUserSuper field, then patch the instruction that assigns it to false.
    * This strategy is used because the method that sets the isUserSuper field is difficult to fingerprint reliably.
    */
    override fun execute(context: BytecodeContext) {
        // Find the reference to the isUserSuper field.
        val isUserSuperReference = IsUserSuperMethodFingerprint
            .result
            ?.mutableMethod
            ?.getInstructions()
            ?.filterIsInstance<BuilderInstruction22c>()
            ?.firstOrNull { it.opcode == Opcode.IGET_BOOLEAN }
            ?.reference
            ?: throw IsUserSuperMethodFingerprint.exception
        // Patch the instruction that assigns isUserSuper to true.
        UserSerializationMethodFingerprint
            .result
            ?.mutableMethod
            ?.apply {
                replaceInstructions(
                    indexOfReference(isUserSuperReference) - 1,
                    "const/4 v2, 0x1"
                )
            }
            ?: throw UserSerializationMethodFingerprint.exception
    }
    private companion object {
        private fun MutableMethod.indexOfReference(reference: Reference) = getInstructions()
            .filterIsInstance<BuilderInstruction22c>()
            .filter { it.opcode == Opcode.IPUT_BOOLEAN }.indexOfFirst { it.reference == reference }.let {
                if (it == -1) throw PatchException("Could not find index of instruction with supplied reference.")
                else it
            }
    }
 }
--- a/src/main/kotlin/app/revanced/patches/facebook/ads/story/HideStoryAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/facebook/ads/story/HideStoryAdsPatch.kt
@@ -0,0 +1,26 @@
 package app.revanced.patches.facebook.ads.story
 import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.facebook.ads.story.fingerprints.AdsInsertionFingerprint
 import app.revanced.patches.facebook.ads.story.fingerprints.FetchMoreAdsFingerprint
@Patch(
    name = "Hide story ads",
    description = "Hides the ads in the Facebook app stories.",
    compatiblePackages = [CompatiblePackage("com.facebook.katana")]
 )
@Suppress("unused")
 object HideStoryAdsPatch : BytecodePatch(
    setOf(FetchMoreAdsFingerprint, AdsInsertionFingerprint)
 ) {
    override fun execute(context: BytecodeContext) =
        setOf(FetchMoreAdsFingerprint, AdsInsertionFingerprint).forEach { fingerprint ->
            fingerprint.result?.mutableMethod?.replaceInstruction(0, "return-void")
                ?: throw fingerprint.exception
        }
 }
--- a/src/main/kotlin/app/revanced/patches/facebook/ads/story/fingerprints/AdsInsertionFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/facebook/ads/story/fingerprints/AdsInsertionFingerprint.kt
@@ -0,0 +1,3 @@
 package app.revanced.patches.facebook.ads.story.fingerprints
 internal object AdsInsertionFingerprint : FieldMethodFingerprint(fieldValue = "AdBucketDataSourceUtil\$attemptAdsInsertion\$1")
--- a/src/main/kotlin/app/revanced/patches/facebook/ads/story/fingerprints/FetchMoreAdsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/facebook/ads/story/fingerprints/FetchMoreAdsFingerprint.kt
@@ -0,0 +1,3 @@
 package app.revanced.patches.facebook.ads.story.fingerprints
 internal object FetchMoreAdsFingerprint : FieldMethodFingerprint(fieldValue = "AdBucketDataSourceUtil\$attemptFetchMoreAds\$1")
--- a/src/main/kotlin/app/revanced/patches/facebook/ads/story/fingerprints/FieldMethodFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/facebook/ads/story/fingerprints/FieldMethodFingerprint.kt
@@ -0,0 +1,15 @@
 package app.revanced.patches.facebook.ads.story.fingerprints
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.iface.value.StringEncodedValue
 internal abstract class FieldMethodFingerprint(fieldValue: String) : MethodFingerprint(
    returnType = "V",
    parameters = listOf(),
    customFingerprint = { methodDef, classDef ->
        methodDef.name == "run" && classDef.fields.any any@{ field ->
            if (field.name != "__redex_internal_original_name") return@any false
            (field.initialValue as? StringEncodedValue)?.value == fieldValue
        }
    }
 )
--- a/src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/patch/BootloaderDetectionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/patch/BootloaderDetectionPatch.kt
@@ -1,23 +1,23 @@
-package app.revanced.patches.finanzonline.detection.bootloader.patch
+package app.revanced.patches.finanzonline.detection.bootloader
-import app.revanced.extensions.exception
+import app.revanced.util.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.finanzonline.detection.bootloader.fingerprints.BootStateFingerprint
 import app.revanced.patches.finanzonline.detection.bootloader.fingerprints.CreateKeyFingerprint
 import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionCompatibility
-@Patch
+@Patch(
-@Name("Remove bootloader detection")
+    name = "Remove bootloader detection",
-@Description("Removes the check for an unlocked bootloader.")
+    description = "Removes the check for an unlocked bootloader.",
-@DetectionCompatibility
+    compatiblePackages = [CompatiblePackage("at.gv.bmf.bmf2go")]
-class BootloaderDetectionPatch : BytecodePatch(
+)
-    listOf(CreateKeyFingerprint, BootStateFingerprint)
+@Suppress("unused")
 object BootloaderDetectionPatch : BytecodePatch(
    setOf(CreateKeyFingerprint, BootStateFingerprint)
 ) {
    override fun execute(context: BytecodeContext) {
        arrayOf(CreateKeyFingerprint, BootStateFingerprint).forEach { fingerprint ->
--- a/src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/fingerprints/BootStateFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/fingerprints/BootStateFingerprint.kt
@@ -1,11 +1,11 @@
 package app.revanced.patches.finanzonline.detection.bootloader.fingerprints
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 // Located @ at.gv.bmf.bmf2go.taxequalization.tools.utils.AttestationHelper#isBootStateOk (3.0.1)
-object BootStateFingerprint : MethodFingerprint(
+internal object BootStateFingerprint : MethodFingerprint(
    "Z",
    accessFlags = AccessFlags.PUBLIC.value,
    opcodes = listOf(
--- a/src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/fingerprints/CreateKeyFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/fingerprints/CreateKeyFingerprint.kt
@@ -1,10 +1,10 @@
 package app.revanced.patches.finanzonline.detection.bootloader.fingerprints
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 // Located @ at.gv.bmf.bmf2go.taxequalization.tools.utils.AttestationHelper#createKey (3.0.1)
-object CreateKeyFingerprint : MethodFingerprint(
+internal object CreateKeyFingerprint : MethodFingerprint(
    "Z",
    accessFlags = AccessFlags.PUBLIC.value,
    strings = listOf("attestation", "SHA-256", "random", "EC", "AndroidKeyStore")
--- a/src/main/kotlin/app/revanced/patches/finanzonline/detection/root/patch/RootDetectionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/finanzonline/detection/root/patch/RootDetectionPatch.kt
@@ -1,21 +1,21 @@
-package app.revanced.patches.finanzonline.detection.root.patch
+package app.revanced.patches.finanzonline.detection.root
-import app.revanced.extensions.exception
+import app.revanced.util.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.finanzonline.detection.root.fingerprints.RootDetectionFingerprint
 import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionCompatibility
-@Patch
+@Patch(
-@Name("Remove root detection")
+    name = "Remove root detection",
-@Description("Removes the check for root permissions.")
+    description = "Removes the check for root permissions.",
-@DetectionCompatibility
+    compatiblePackages = [CompatiblePackage("at.gv.bmf.bmf2go")]
-class RootDetectionPatch : BytecodePatch(
+)
-    listOf(RootDetectionFingerprint)
+@Suppress("unused")
 object RootDetectionPatch : BytecodePatch(
    setOf(RootDetectionFingerprint)
 ) {
    override fun execute(context: BytecodeContext) {
        RootDetectionFingerprint.result?.mutableMethod?.addInstructions(
--- a/src/main/kotlin/app/revanced/patches/finanzonline/detection/root/fingerprints/RootDetectionFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/finanzonline/detection/root/fingerprints/RootDetectionFingerprint.kt
@@ -1,12 +1,12 @@
 package app.revanced.patches.finanzonline.detection.root.fingerprints
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 // Located @ at.gv.bmf.bmf2go.taxequalization.tools.utils.RootDetection#isRooted (3.0.1)
-object RootDetectionFingerprint : MethodFingerprint(
+internal object RootDetectionFingerprint : MethodFingerprint(
    "L",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
    parameters = listOf("L"),
--- a/src/main/kotlin/app/revanced/patches/finanzonline/detection/shared/annotations/DetectionCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/finanzonline/detection/shared/annotations/DetectionCompatibility.kt
@@ -1,8 +0,0 @@
 package app.revanced.patches.finanzonline.detection.shared.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
@Compatibility([Package("at.gv.bmf.bmf2go")])
@Target(AnnotationTarget.CLASS)
 internal annotation class DetectionCompatibility
--- a/src/main/kotlin/app/revanced/patches/googlerecorder/restrictions/patch/RemoveDeviceRestrictions.kt
+++ b/src/main/kotlin/app/revanced/patches/googlerecorder/restrictions/patch/RemoveDeviceRestrictions.kt
@@ -1,25 +1,24 @@
-package app.revanced.patches.googlerecorder.restrictions.patch
+package app.revanced.patches.googlerecorder.restrictions
-import app.revanced.extensions.exception
+import app.revanced.util.exception
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Package
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.googlerecorder.restrictions.fingerprints.OnApplicationCreateFingerprint
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
-@Patch
+@Patch(
-@Name("Remove device restrictions")
+    name = "Remove device restrictions",
-@Description("Removes restrictions from using the app on any device.")
+    description = "Removes restrictions from using the app on any device. Requires mounting patched app over original.",
-@Compatibility([Package("com.google.android.apps.recorder")])
+    compatiblePackages = [CompatiblePackage("com.google.android.apps.recorder")]
-class RemoveDeviceRestrictions : BytecodePatch(
+)
-    listOf(OnApplicationCreateFingerprint)
+@Suppress("unused")
 object RemoveDeviceRestrictions : BytecodePatch(
    setOf(OnApplicationCreateFingerprint)
 ) {
    override fun execute(context: BytecodeContext) {
        OnApplicationCreateFingerprint.result?.let {
--- a/src/main/kotlin/app/revanced/patches/googlerecorder/restrictions/fingerprints/OnApplicationCreateFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/googlerecorder/restrictions/fingerprints/OnApplicationCreateFingerprint.kt
@@ -1,8 +1,8 @@
 package app.revanced.patches.googlerecorder.restrictions.fingerprints
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
-object OnApplicationCreateFingerprint : MethodFingerprint(
+internal object OnApplicationCreateFingerprint : MethodFingerprint(
    strings = listOf("com.google.android.feature.PIXEL_2017_EXPERIENCE"),
    customFingerprint = custom@{ methodDef, classDef ->
        if (methodDef.name != "onCreate") return@custom false
--- a/src/main/kotlin/app/revanced/patches/hexeditor/ad/DisableAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/hexeditor/ad/DisableAdsPatch.kt
@@ -0,0 +1,26 @@
 package app.revanced.patches.hexeditor.ad
 import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.hexeditor.ad.fingerprints.PrimaryAdsFingerprint
@Patch(
    name = "Disable ads",
    compatiblePackages = [CompatiblePackage("com.myprog.hexedit")]
 )
@Suppress("unused")
 object DisableAdsPatch : BytecodePatch(
    setOf(PrimaryAdsFingerprint)
 ) {
    override fun execute(context: BytecodeContext) = PrimaryAdsFingerprint.result?.mutableMethod?.replaceInstructions(
        0,
        """
            const/4 v0, 0x1
            return v0
        """
    ) ?: throw PrimaryAdsFingerprint.exception
 }
--- a/src/main/kotlin/app/revanced/patches/hexeditor/ad/annotations/HexEditorAdsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/hexeditor/ad/annotations/HexEditorAdsCompatibility.kt
@@ -1,12 +0,0 @@
 package app.revanced.patches.hexeditor.ad.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
@Compatibility(
    [
        Package("com.myprog.hexedit")
    ]
 )
@Target(AnnotationTarget.CLASS)
 internal annotation class HexEditorAdsCompatibility
--- a/src/main/kotlin/app/revanced/patches/hexeditor/ad/fingerprints/PrimaryAdsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/hexeditor/ad/fingerprints/PrimaryAdsFingerprint.kt
@@ -1,8 +1,8 @@
 package app.revanced.patches.hexeditor.ad.fingerprints
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
-object PrimaryAdsFingerprint : MethodFingerprint(
+internal object PrimaryAdsFingerprint : MethodFingerprint(
    customFingerprint = { methodDef, _ ->
        methodDef.definingClass.endsWith("PreferencesHelper;") && methodDef.name == "isAdsDisabled"
    }
--- a/src/main/kotlin/app/revanced/patches/hexeditor/ad/patch/HexEditorAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/hexeditor/ad/patch/HexEditorAdsPatch.kt
@@ -1,32 +0,0 @@
 package app.revanced.patches.hexeditor.ad.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.hexeditor.ad.annotations.HexEditorAdsCompatibility
 import app.revanced.patches.hexeditor.ad.fingerprints.PrimaryAdsFingerprint
@Patch
@Name("Disable ads")
@Description("Disables ads in HexEditor.")
@HexEditorAdsCompatibility
 class HexEditorAdsPatch : BytecodePatch(
    listOf(
        PrimaryAdsFingerprint
    )
 ) {
    override fun execute(context: BytecodeContext) {
        val method = PrimaryAdsFingerprint.result!!.mutableMethod
        method.replaceInstructions(
            0,
            """
                const/4 v0, 0x1
                return v0
            """
        )
    }
 }
--- a/src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/patch/UnlockProPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/patch/UnlockProPatch.kt
@@ -1,22 +1,19 @@
-package app.revanced.patches.iconpackstudio.misc.pro.patch
+package app.revanced.patches.iconpackstudio.misc.pro
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patches.iconpackstudio.misc.pro.annotations.UnlockProCompatibility
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.iconpackstudio.misc.pro.fingerprints.CheckProFingerprint
-@Patch
+@Patch(
-@Name("Unlock pro")
+    name = "Unlock pro",
-@Description("Unlocks all pro features.")
+    compatiblePackages = [CompatiblePackage("ginlemon.iconpackstudio")]
-@UnlockProCompatibility
+)
-class UnlockProPatch : BytecodePatch(
+@Suppress("unused")
-    listOf(
+object UnlockProPatch : BytecodePatch(
-        CheckProFingerprint
+    setOf(CheckProFingerprint)
    )
 ) {
    override fun execute(context: BytecodeContext) {
        val method = CheckProFingerprint.result!!.mutableMethod
--- a/src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/annotations/UnlockProCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/annotations/UnlockProCompatibility.kt
@@ -1,8 +0,0 @@
 package app.revanced.patches.iconpackstudio.misc.pro.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
@Compatibility([Package("ginlemon.iconpackstudio")])
@Target(AnnotationTarget.CLASS)
 internal annotation class UnlockProCompatibility
--- a/src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/fingerprints/CheckProFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/fingerprints/CheckProFingerprint.kt
@@ -1,8 +1,8 @@
 package app.revanced.patches.iconpackstudio.misc.pro.fingerprints
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
-object CheckProFingerprint : MethodFingerprint(
+internal object CheckProFingerprint : MethodFingerprint(
    "Z",
    customFingerprint = { methodDef, _ -> methodDef.definingClass.endsWith("IPSPurchaseRepository;")}
 )
--- a/src/main/kotlin/app/revanced/patches/idaustria/detection/root/RootDetectionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/idaustria/detection/root/RootDetectionPatch.kt
@@ -0,0 +1,26 @@
 package app.revanced.patches.idaustria.detection.root
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.idaustria.detection.root.fingerprints.AttestationSupportedCheckFingerprint
 import app.revanced.patches.idaustria.detection.root.fingerprints.BootloaderCheckFingerprint
 import app.revanced.patches.idaustria.detection.root.fingerprints.RootCheckFingerprint
 import app.revanced.util.returnEarly
@Patch(
    name = "Remove root detection",
    description = "Removes the check for root permissions and unlocked bootloader.",
    compatiblePackages = [CompatiblePackage("at.gv.oe.app", ["3.0.2"])]
 )
@Suppress("unused")
 object RootDetectionPatch : BytecodePatch(
    setOf(AttestationSupportedCheckFingerprint, BootloaderCheckFingerprint, RootCheckFingerprint)
 ) {
    override fun execute(context: BytecodeContext) = listOf(
        AttestationSupportedCheckFingerprint,
        BootloaderCheckFingerprint,
        RootCheckFingerprint
    ).returnEarly(true)
 }
--- a/src/main/kotlin/app/revanced/patches/idaustria/detection/root/fingerprints/AttestationSupportedCheckFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/idaustria/detection/root/fingerprints/AttestationSupportedCheckFingerprint.kt
@@ -0,0 +1,13 @@
 package app.revanced.patches.idaustria.detection.root.fingerprints
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 internal object AttestationSupportedCheckFingerprint : MethodFingerprint(
    "V",
    accessFlags = AccessFlags.PUBLIC.value,
    customFingerprint = { methodDef, _ ->
        methodDef.name == "attestationSupportCheck" &&
        methodDef.definingClass.endsWith("/DeviceIntegrityCheck;")
    }
 )
--- a/src/main/kotlin/app/revanced/patches/idaustria/detection/root/fingerprints/BootloaderCheckFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/idaustria/detection/root/fingerprints/BootloaderCheckFingerprint.kt
@@ -0,0 +1,13 @@
 package app.revanced.patches.idaustria.detection.root.fingerprints
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 internal object BootloaderCheckFingerprint : MethodFingerprint(
    "Z",
    accessFlags = AccessFlags.PUBLIC.value,
    customFingerprint = { methodDef, _ ->
        methodDef.name == "bootloaderCheck" &&
        methodDef.definingClass.endsWith("/DeviceIntegrityCheck;")
    }
 )
--- a/src/main/kotlin/app/revanced/patches/idaustria/detection/root/fingerprints/RootDetectionFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/idaustria/detection/root/fingerprints/RootDetectionFingerprint.kt
@@ -1,12 +1,13 @@
 package app.revanced.patches.idaustria.detection.root.fingerprints
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
-object RootDetectionFingerprint : MethodFingerprint(
+internal object RootCheckFingerprint : MethodFingerprint(
    "V",
    accessFlags = AccessFlags.PUBLIC.value,
    customFingerprint = { methodDef, _ ->
        methodDef.name == "rootCheck" &&
        methodDef.definingClass.endsWith("/DeviceIntegrityCheck;")
    }
 )
--- a/src/main/kotlin/app/revanced/patches/idaustria/detection/root/patch/RootDetectionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/idaustria/detection/root/patch/RootDetectionPatch.kt
@@ -1,21 +0,0 @@
 package app.revanced.patches.idaustria.detection.root.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.idaustria.detection.root.fingerprints.RootDetectionFingerprint
 import app.revanced.patches.idaustria.detection.shared.annotations.DetectionCompatibility
@Patch
@Name("Remove root detection")
@Description("Removes the check for root permissions and unlocked bootloader.")
@DetectionCompatibility
 class RootDetectionPatch : BytecodePatch(
    listOf(RootDetectionFingerprint)
 ) {
    override fun execute(context: BytecodeContext) =
        RootDetectionFingerprint.result!!.mutableMethod.addInstruction(0, "return-void")
 }
--- a/src/main/kotlin/app/revanced/patches/idaustria/detection/shared/annotations/DetectionCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/idaustria/detection/shared/annotations/DetectionCompatibility.kt
@@ -1,8 +0,0 @@
 package app.revanced.patches.idaustria.detection.shared.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
@Compatibility([Package("at.gv.oe.app")])
@Target(AnnotationTarget.CLASS)
 internal annotation class DetectionCompatibility
--- a/src/main/kotlin/app/revanced/patches/idaustria/detection/signature/patch/SpoofSignaturePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/idaustria/detection/signature/patch/SpoofSignaturePatch.kt
@@ -1,23 +1,23 @@
-package app.revanced.patches.idaustria.detection.signature.patch
+package app.revanced.patches.idaustria.detection.signature
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patches.idaustria.detection.shared.annotations.DetectionCompatibility
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.idaustria.detection.signature.fingerprints.SpoofSignatureFingerprint
-@Patch
+@Patch(
-@Name("Spoof signature")
+    name = "Spoof signature",
-@Description("Spoofs the signature of the app.")
+    description = "Spoofs the signature of the app.",
-@DetectionCompatibility
+    compatiblePackages = [CompatiblePackage("at.gv.oe.app", ["3.0.2"])]
-class SpoofSignaturePatch : BytecodePatch(
+)
-    listOf(SpoofSignatureFingerprint)
+@Suppress("unused")
 object SpoofSignaturePatch : BytecodePatch(
    setOf(SpoofSignatureFingerprint)
 ) {
-    companion object {
+    private const val EXPECTED_SIGNATURE =
-        const val EXPECTED_SIGNATURE = "OpenSSLRSAPublicKey{modulus=ac3e6fd6050aa7e0d6010ae58190404cd89a56935b44f6fee" +
+        "OpenSSLRSAPublicKey{modulus=ac3e6fd6050aa7e0d6010ae58190404cd89a56935b44f6fee" +
                "067c149768320026e10b24799a1339e414605e448e3f264444a327b9ae292be2b62ad567dd1800dbed4a88f718a33dc6db6b" +
                "f5178aa41aa0efff8a3409f5ca95dbfccd92c7b4298966df806ea7a0204a00f0e745f6d9f13bdf24f3df715d7b62c1600906" +
                "15de1c8a956b9286764985a3b3c060963c435fb9481a5543aaf0671fc2dba6c5c2b17d1ef1d85137f14dc9bbdf3490288087" +
@@ -28,7 +28,6 @@ class SpoofSignaturePatch : BytecodePatch(
                "0def55be2c1f6f9c72c92fb45d7e0a9ac571cb38f0a9a37bb33ea06f223fde8c7a92e8c47769e386f9799776e8f110c21df2" +
                "77ef1be61b2c01ebdabddcbf53cc4b6fd9a3c445606ee77b3758162c80ad8f8137b3c6864e92db904807dcb2be9d7717dd21" +
                "bf42c121d620ddfb7914f7a95c713d9e1c1b7bdb4a03d618e40cf7e9e235c0b5687e03b7ab3,publicExponent=10001}"
    }
    override fun execute(context: BytecodeContext) {
        SpoofSignatureFingerprint.result!!.mutableMethod.addInstructions(
--- a/src/main/kotlin/app/revanced/patches/idaustria/detection/signature/fingerprints/SpoofSignatureFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/idaustria/detection/signature/fingerprints/SpoofSignatureFingerprint.kt
@@ -1,9 +1,9 @@
 package app.revanced.patches.idaustria.detection.signature.fingerprints
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
-object SpoofSignatureFingerprint : MethodFingerprint(
+internal object SpoofSignatureFingerprint : MethodFingerprint(
    "L",
    parameters = listOf("L"),
    accessFlags = AccessFlags.PRIVATE.value,
--- a/src/main/kotlin/app/revanced/patches/inshorts/ad/patch/InshortsAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/inshorts/ad/patch/InshortsAdsPatch.kt
@@ -1,21 +1,20 @@
-package app.revanced.patches.inshorts.ad.patch
+package app.revanced.patches.inshorts.ad
-import app.revanced.extensions.exception
+import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patches.inshorts.ad.annotations.HideAdsCompatibility
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.inshorts.ad.fingerprints.InshortsAdsFingerprint
-@Patch
+@Patch(
-@Name("Hide ads")
+    name = "Hide ads",
-@Description("Removes ads from Inshorts.")
+    compatiblePackages = [CompatiblePackage("com.nis.app")]
-@HideAdsCompatibility
+)
-class HideAdsPatch : BytecodePatch(
+@Suppress("unused")
-    listOf(InshortsAdsFingerprint)
+object HideAdsPatch : BytecodePatch(
    setOf(InshortsAdsFingerprint)
 ) {
    override fun execute(context: BytecodeContext) {
        InshortsAdsFingerprint.result?.let { result ->
--- a/src/main/kotlin/app/revanced/patches/inshorts/ad/annotations/HideAdsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/inshorts/ad/annotations/HideAdsCompatibility.kt
@@ -1,9 +0,0 @@
 package app.revanced.patches.inshorts.ad.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
@Compatibility([Package("com.nis.app")])
@Target(AnnotationTarget.CLASS)
 internal annotation class HideAdsCompatibility
--- a/src/main/kotlin/app/revanced/patches/inshorts/ad/fingerprints/InshortsAdsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/inshorts/ad/fingerprints/InshortsAdsFingerprint.kt
@@ -1,8 +1,8 @@
 package app.revanced.patches.inshorts.ad.fingerprints
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
-object InshortsAdsFingerprint : MethodFingerprint(
+internal object InshortsAdsFingerprint : MethodFingerprint(
    "V",
    strings = listOf("GoogleAdLoader","exception in requestAd"),
 )
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/patch/HideTimelineAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/patch/HideTimelineAdsPatch.kt
@@ -1,14 +1,13 @@
-package app.revanced.patches.instagram.patches.ads.timeline.patch
+package app.revanced.patches.instagram.patches.ads.timeline
-import app.revanced.extensions.exception
+import app.revanced.util.exception
 import app.revanced.patcher.annotation.*
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.MediaFingerprint
 import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ShowAdFingerprint
@@ -19,12 +18,14 @@ import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.Shop
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
-@Patch
+@Patch(
-@Name("Hide timeline ads")
+    name = "Hide timeline ads",
-@Description("Removes ads from the timeline.")
+    description = "Removes ads from the timeline.",
-@Compatibility([Package("com.instagram.android", arrayOf("275.0.0.27.98"))])
+    compatiblePackages = [CompatiblePackage("com.instagram.android", ["275.0.0.27.98"])]
-class HideTimelineAdsPatch : BytecodePatch(
+)
-    listOf(
+@Suppress("unused")
 object HideTimelineAdsPatch : BytecodePatch(
    setOf(
        ShowAdFingerprint,
        MediaFingerprint,
        PaidPartnershipAdFingerprint // Unlike the other ads this one is resolved from all classes.
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/MediaFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/MediaFingerprint.kt
@@ -1,7 +1,7 @@
 package app.revanced.patches.instagram.patches.ads.timeline.fingerprints
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
-object MediaFingerprint : MethodFingerprint(
+internal object MediaFingerprint : MethodFingerprint(
    strings = listOf("force_overlay", "Media#updateFields", "live_reels_metadata")
 )
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ShowAdFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ShowAdFingerprint.kt
@@ -1,11 +1,11 @@
 package app.revanced.patches.instagram.patches.ads.timeline.fingerprints
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
-object ShowAdFingerprint : MethodFingerprint(
+internal object ShowAdFingerprint : MethodFingerprint(
    "Z",
    AccessFlags.PUBLIC or AccessFlags.STATIC or AccessFlags.FINAL,
    listOf("L", "L", "Z", "Z"),
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/GenericMediaAdFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/GenericMediaAdFingerprint.kt
@@ -2,7 +2,7 @@ package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
 import com.android.tools.smali.dexlib2.Opcode
-object GenericMediaAdFingerprint : MediaAdFingerprint(
+internal object GenericMediaAdFingerprint : MediaAdFingerprint(
    opcodes = listOf(
        Opcode.INVOKE_INTERFACE,
        Opcode.MOVE_RESULT_OBJECT,
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/MediaAdFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/MediaAdFingerprint.kt
@@ -1,13 +1,13 @@
 package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 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
-abstract class MediaAdFingerprint(
+internal abstract class MediaAdFingerprint(
    returnType: String? = "Z",
    accessFlags: Int? = AccessFlags.PUBLIC or AccessFlags.FINAL,
    parameters: Iterable<String>? = listOf(),
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/PaidPartnershipAdFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/PaidPartnershipAdFingerprint.kt
@@ -4,7 +4,7 @@ import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
-object PaidPartnershipAdFingerprint : MediaAdFingerprint(
+internal object PaidPartnershipAdFingerprint : MediaAdFingerprint(
    "V",
    null,
    listOf("L", "L"),
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/ShoppingAdFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/ShoppingAdFingerprint.kt
@@ -2,7 +2,7 @@ package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
 import com.android.tools.smali.dexlib2.Opcode
-object ShoppingAdFingerprint : MediaAdFingerprint(
+internal object ShoppingAdFingerprint : MediaAdFingerprint(
    opcodes = listOf(
        Opcode.IF_EQZ,
        Opcode.IGET_OBJECT,
--- a/src/main/kotlin/app/revanced/patches/irplus/ad/patch/IrplusAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/irplus/ad/patch/IrplusAdsPatch.kt
@@ -1,21 +1,20 @@
-package app.revanced.patches.irplus.ad.patch
+package app.revanced.patches.irplus.ad
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patches.irplus.ad.annotations.IrplusAdsCompatibility
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.irplus.ad.fingerprints.IrplusAdsFingerprint
-@Patch
+@Patch(
-@Name("Remove ads")
+    name = "Remove ads",
-@Description("Removes all ads from the app.")
+    compatiblePackages = [CompatiblePackage("net.binarymode.android.irplus")]
-@IrplusAdsCompatibility
+)
-class IrplusAdsPatch : BytecodePatch(
+@Suppress("unused")
-    listOf(IrplusAdsFingerprint)
+object RemoveAdsPatch : BytecodePatch(
    setOf(IrplusAdsFingerprint)
 ) {
    override fun execute(context: BytecodeContext) {
        val method = IrplusAdsFingerprint.result!!.mutableMethod
--- a/src/main/kotlin/app/revanced/patches/irplus/ad/annotations/IrplusAdsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/irplus/ad/annotations/IrplusAdsCompatibility.kt
@@ -1,8 +0,0 @@
 package app.revanced.patches.irplus.ad.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
@Compatibility([Package("net.binarymode.android.irplus")])
@Target(AnnotationTarget.CLASS)
 internal annotation class IrplusAdsCompatibility
--- a/src/main/kotlin/app/revanced/patches/irplus/ad/fingerprints/IrplusAdsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/irplus/ad/fingerprints/IrplusAdsFingerprint.kt
@@ -1,10 +1,10 @@
 package app.revanced.patches.irplus.ad.fingerprints
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
-object IrplusAdsFingerprint : MethodFingerprint(
+internal object IrplusAdsFingerprint : MethodFingerprint(
    "V",
    AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
    listOf("L", "Z"),
--- a/src/main/kotlin/app/revanced/patches/lightroom/misc/login/DisableMandatoryLoginPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/lightroom/misc/login/DisableMandatoryLoginPatch.kt
@@ -0,0 +1,26 @@
 package app.revanced.patches.lightroom.misc.login
 import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.lightroom.misc.login.fingerprints.IsLoggedInFingerprint
@Patch(
    name = "Disable mandatory login",
    compatiblePackages = [CompatiblePackage("com.adobe.lrmobile")]
 )
@Suppress("unused")
 object DisableMandatoryLoginPatch : BytecodePatch(
    setOf(IsLoggedInFingerprint)
 ) {
    override fun execute(context: BytecodeContext) {
        IsLoggedInFingerprint.result?.mutableMethod?.apply {
            val index = implementation!!.instructions.lastIndex - 1
            // Set isLoggedIn = true.
            replaceInstruction(index, "const/4 v0, 0x1")
        } ?: throw IsLoggedInFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/lightroom/misc/login/annotations/DisableMandatoryLoginCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/lightroom/misc/login/annotations/DisableMandatoryLoginCompatibility.kt
@@ -1,8 +0,0 @@
 package app.revanced.patches.lightroom.misc.login.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
@Compatibility([Package("com.adobe.lrmobile",)])
@Target(AnnotationTarget.CLASS)
 internal annotation class DisableMandatoryLoginCompatibility
--- a/src/main/kotlin/app/revanced/patches/lightroom/misc/login/fingerprints/IsLoggedInFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/lightroom/misc/login/fingerprints/IsLoggedInFingerprint.kt
@@ -1,11 +1,11 @@
-package app.revanced.patches.lightroom.misc.login.fingerprint
+package app.revanced.patches.lightroom.misc.login.fingerprints
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
-object IsLoggedInFingerprint : MethodFingerprint(
+internal object IsLoggedInFingerprint : MethodFingerprint(
    returnType = "Z",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC or AccessFlags.FINAL,
    opcodes = listOf(
--- a/src/main/kotlin/app/revanced/patches/lightroom/misc/login/patch/DisableMandatoryLoginPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/lightroom/misc/login/patch/DisableMandatoryLoginPatch.kt
@@ -1,23 +0,0 @@
 package app.revanced.patches.lightroom.misc.login.patch
 import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.lightroom.misc.login.annotations.DisableMandatoryLoginCompatibility
 import app.revanced.patches.lightroom.misc.login.fingerprint.IsLoggedInFingerprint
@Patch
@Name("Disable mandatory login")
@DisableMandatoryLoginCompatibility
 class DisableMandatoryLoginPatch : BytecodePatch(listOf(IsLoggedInFingerprint)) {
    override fun execute(context: BytecodeContext) {
        IsLoggedInFingerprint.result?.mutableMethod?.apply {
            val index = implementation!!.instructions.lastIndex - 1
            // Set isLoggedIn = true.
            replaceInstruction(index, "const/4 v0, 0x1")
        } ?: throw IsLoggedInFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/lightroom/misc/premium/UnlockPremiumPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/lightroom/misc/premium/UnlockPremiumPatch.kt
@@ -0,0 +1,24 @@
 package app.revanced.patches.lightroom.misc.premium
 import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.lightroom.misc.premium.fingerprints.HasPurchasedFingerprint
@Patch(
    name = "Unlock premium",
    compatiblePackages = [CompatiblePackage("com.adobe.lrmobile")]
 )
@Suppress("unused")
 object UnlockPremiumPatch : BytecodePatch(
    setOf(HasPurchasedFingerprint)
 ){
    override fun execute(context: BytecodeContext) {
         // Set hasPremium = true.
        HasPurchasedFingerprint.result?.mutableMethod?.replaceInstruction(2, "const/4 v2, 0x1")
            ?: throw HasPurchasedFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/lightroom/misc/premium/annotations/UnlockPremiumCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/lightroom/misc/premium/annotations/UnlockPremiumCompatibility.kt
@@ -1,8 +0,0 @@
 package app.revanced.patches.lightroom.misc.premium.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
@Compatibility([Package("com.adobe.lrmobile")])
@Target(AnnotationTarget.CLASS)
 internal annotation class UnlockPremiumCompatibility
--- a/src/main/kotlin/app/revanced/patches/lightroom/misc/premium/fingerprints/HasPurchasedFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/lightroom/misc/premium/fingerprints/HasPurchasedFingerprint.kt
@@ -1,11 +1,11 @@
-package app.revanced.patches.lightroom.misc.premium.fingerprint
+package app.revanced.patches.lightroom.misc.premium.fingerprints
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
-object HasPurchasedFingerprint : MethodFingerprint(
+internal object HasPurchasedFingerprint : MethodFingerprint(
    returnType = "Z",
    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
    strings = listOf("isPurchaseDoneRecently = true, access platform profile present? = "),
--- a/src/main/kotlin/app/revanced/patches/lightroom/misc/premium/patch/UnlockPremiumPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/lightroom/misc/premium/patch/UnlockPremiumPatch.kt
@@ -1,23 +0,0 @@
 package app.revanced.patches.lightroom.misc.premium.patch
 import app.revanced.extensions.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.lightroom.misc.premium.annotations.UnlockPremiumCompatibility
 import app.revanced.patches.lightroom.misc.premium.fingerprint.HasPurchasedFingerprint
@Patch
@Name("Unlock premium")
@Description("Unlocks premium features.")
@UnlockPremiumCompatibility
 class UnlockPremiumPatch : BytecodePatch(listOf(HasPurchasedFingerprint)) {
    override fun execute(context: BytecodeContext) {
         // Set hasPremium = true.
        HasPurchasedFingerprint.result?.mutableMethod?.replaceInstruction(2, "const/4 v2, 0x1")
            ?: throw HasPurchasedFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/memegenerator/detection/license/patch/LicenseValidationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/memegenerator/detection/license/patch/LicenseValidationPatch.kt
@@ -1,15 +1,15 @@
-package app.revanced.patches.memegenerator.detection.license.patch
+package app.revanced.patches.memegenerator.detection.license
-import app.revanced.extensions.exception
+import app.revanced.util.exception
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patches.memegenerator.detection.license.fingerprint.LicenseValidationFingerprint
+import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.memegenerator.detection.license.fingerprints.LicenseValidationFingerprint
-@Description("Disables Firebase license validation.")
+@Patch(description = "Disables Firebase license validation.")
-class LicenseValidationPatch : BytecodePatch(
+object LicenseValidationPatch : BytecodePatch(
-    listOf(LicenseValidationFingerprint)
+    setOf(LicenseValidationFingerprint)
 ) {
    override fun execute(context: BytecodeContext) {
        LicenseValidationFingerprint.result?.apply {
--- a/Show More
+++ b/Show More
`@@ -1,2 +1,2 @@`
	`firstPRMergeComment: >`	`firstPRMergeComment: >`
	`Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) if you want to receive a contributor role.`	`Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) to receive a role for your contribution.`
		`@@ -0,0 +1 @@`
							<?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>
		`@@ -0,0 +1,3 @@`
							`package app.revanced.patches.facebook.ads.story.fingerprints`

							`internal object AdsInsertionFingerprint : FieldMethodFingerprint(fieldValue = "AdBucketDataSourceUtil\$attemptAdsInsertion\$1")`
		`@@ -0,0 +1,3 @@`
							`package app.revanced.patches.facebook.ads.story.fingerprints`

							`internal object FetchMoreAdsFingerprint : FieldMethodFingerprint(fieldValue = "AdBucketDataSourceUtil\$attemptFetchMoreAds\$1")`