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

# [2.157.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.157.0-dev.1...v2.157.0-dev.2) (2023-01-24)

### Features

* **music:** update patches compatibility to v5.40.51 ([#1541](https://github.com/revanced/revanced-patches/issues/1541)) ([225726f](225726feeb))

.github/ISSUE_TEMPLATE/bug-issue.yml

@@ -36,7 +36,7 @@ body:
   - 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.
+      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
@@ -59,3 +59,15 @@ body:
       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

.github/ISSUE_TEMPLATE/feature-issue.yml

@@ -1,46 +0,0 @@
-name: ⭐ Feature request
-description: Create a detailed feature request.
-title: 'feat: <title>'
-labels: [feature-request]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        # ReVanced feature request
-        
-        Do not submit requests for patches here. Please submit them [here](https://github.com/orgs/revanced/discussions/categories/patches) instead.
-        Important to note that your feature request may have already been made before. Please check for existing feature requests [here](https://github.com/revanced/revanced-patches/labels/feature-request).
-
-  - type: dropdown
-    attributes:
-      label: Type
-      options:
-        - Functionality
-        - Cosmetic
-        - Other
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Issue
-      description: What is the current problem. Why does it require a feature request?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Feature
-      description: Describe your feature in detail. How does it solve the issue?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Motivation
-      description: Why should your feature should be considered?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add additional context here.
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/patch-request.yml

@@ -0,0 +1,41 @@
+name: ⭐ Patch Request
+description: Create a detailed patch request.
+title: 'feat(patch): '
+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 should 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

.github/workflows/pull_request.yml

@@ -0,0 +1,25 @@
+name: PR to main
+
+on:
+  push:
+    branches:
+      - dev
+  workflow_dispatch:
+
+env:
+  MESSAGE: merge branch `${{ github.head_ref || github.ref_name }}` to `main`
+
+jobs:
+  pull-request:
+    name: Open pull request
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Open pull request
+        uses: repo-sync/pull-request@v2
+        with:
+          destination_branch: 'main'
+          pr_title: 'chore: ${{ env.MESSAGE }}'
+          pr_body: 'This pull request will ${{ env.MESSAGE }}.'
+          pr_draft: true

.github/workflows/release.yml

@@ -1,4 +1,5 @@
 name: Release
+
 on:
   workflow_dispatch:
   push:
@@ -9,32 +10,43 @@ on:
     branches:
       - main
       - dev
+
 jobs:
   release:
     name: Release
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         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: Setup JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: '17'
-          distribution: 'adopt'
+          distribution: 'zulu'
           cache: gradle
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 'latest'
+          cache: 'npm'
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
+        uses: amyu/setup-android@v2
+        with:
+          cache-disabled: false
+          sdk-version: '33'
+          build-tools-version: '33.0.1'
       - name: Build with Gradle
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew build clean generateMeta
-      - name: Install Android build-tools
-        run: sdkmanager "build-tools;32.0.0"
+        run: ./gradlew generateMeta clean --no-daemon
       - name: Setup semantic-release
-        run: npm install -g semantic-release @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D
+        run: npm install semantic-release@19.0.5 @saithodev/semantic-release-backmerge @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin@1.7.4 -D
       - name: Release
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
         run: npx semantic-release

.gitignore

@@ -118,3 +118,6 @@ gradle-app.setting
 
 # Ignore vscode config
 .vscode/
+
+# Dependency directories
+node_modules/

.releaserc

@@ -7,11 +7,7 @@
     }
   ],
   "plugins": [
-    ["@semantic-release/commit-analyzer", {
-      "releaseRules": [
-        {"type": "build", "release": "patch"}
-      ]
-    }],
+    "@semantic-release/commit-analyzer",
     "@semantic-release/release-notes-generator",
     "@semantic-release/changelog",
     "gradle-semantic-release-plugin",
@@ -36,7 +32,15 @@
           {
             "path": "patches.json"
           }
-        ]
+        ],
+        successComment: false
+      }
+    ],
+    [
+      "@saithodev/semantic-release-backmerge",
+      {
+        branches: [{from: "main", to: "dev"}],
+        clearWorkspace: true
       }
     ]
   ]

README-template.md

@@ -18,7 +18,6 @@ The file contains an array of objects, each object representing a patch. The obj
 | `description`                 | The description of the patch.                                                                                                                                                         |
 | `version`                     | The version of the patch.                                                                                                                                                             |
 | `excluded`                    | Whether the patch is excluded by default. If `true`, the patch must never be included by default.                                                                                     |
-| `deprecated`                  | Whether the patch is deprecated.                                                                                                                                                      |
 | `options`                     | An array of options for this patch.                                                                                                                                                   |
 | `options.key`                 | The key of the option.                                                                                                                                                                |
 | `options.title`               | The title of the option.                                                                                                                                                              |
@@ -39,7 +38,6 @@ Example:
     "description": "Adds the ability to remember the video quality you chose in the video quality flyout.",
     "version": "0.0.1",
     "excluded": false,
-    "deprecated": false,
     "options": [],
     "dependencies": [
       "integrations",

README.md

@@ -4,49 +4,216 @@ The official Patch bundle provided by ReVanced and the community.
 
 > Looking for the JSON variant of this? [Click here](patches.json).
 
-### 📦 `com.twitter.android`
+### [📦 `com.google.android.youtube`](https://play.google.com/store/apps/details?id=com.google.android.youtube)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `timeline-ads` | Removes ads from the Twitter timeline. | all |
+| `always-autorepeat` | Always repeats the playing video again. | 17.49.37 |
+| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
+| `comments` | Hides components related to comments. | 17.49.37 |
+| `copy-video-url` | Adds buttons in player to copy video links. | 17.49.37 |
+| `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
+| `custom-video-buffer` | Lets you change the buffers of videos. | 17.49.37 |
+| `custom-video-speed` | Adds more video speed options. | 17.49.37 |
+| `debugging` | Adds debugging options. | all |
+| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 17.49.37 |
+| `disable-auto-player-popup-panels` | Disable automatic popup panels (playlist or live chat) on video player. | 17.49.37 |
+| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 17.49.37 |
+| `disable-startup-shorts-player` | Disables playing YouTube Shorts when launching YouTube. | 17.49.37 |
+| `disable-zoom-haptics` | Disables haptics when zooming. | all |
+| `downloads` | Enables downloading music and videos from YouTube. | 17.49.37 |
+| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.49.37 |
+| `general-ads` | Removes general ads. | 17.49.37 |
+| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.49.37 |
+| `hide-album-cards` | Hides the album cards below the artist description. | 17.49.37 |
+| `hide-artist-card` | Hides the artist card below the searchbar. | 17.49.37 |
+| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.49.37 |
+| `hide-breaking-news-shelf` | Hides the breaking news shelf on the homepage tab. | 17.49.37 |
+| `hide-captions-button` | Hides the captions button on video player. | 17.49.37 |
+| `hide-cast-button` | Hides the cast button in the video player. | all |
+| `hide-create-button` | Hides the create button in the navigation bar. | 17.49.37 |
+| `hide-crowdfunding-box` | Hides the crowdfunding box between the player and video description. | 17.49.37 |
+| `hide-email-address` | Hides the email address in the account switcher. | 17.49.37 |
+| `hide-endscreen-cards` | Hides the suggested video cards at the end of a video in fullscreen. | 17.49.37 |
+| `hide-info-cards` | Hides info-cards in videos. | 17.49.37 |
+| `hide-my-mix` | Hides mix playlists. | 17.49.37 |
+| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.49.37 |
+| `hide-time-and-seekbar` | Hides progress bar and time counter on videos. | 17.49.37 |
+| `hide-video-buttons` | Adds options to hide action buttons under a video. | 17.49.37 |
+| `hide-watch-in-vr` | Hides the Watch in VR option in the player settings flyout panel. | 17.49.37 |
+| `hide-watermark` | Hides creator's watermarks on videos. | 17.49.37 |
+| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.49.37 |
+| `minimized-playback` | Enables minimized and background playback. | 17.49.37 |
+| `old-quality-layout` | Enables the original video quality flyout in the video player settings | 17.49.37 |
+| `open-links-directly` | Bypasses https://youtube.com/redirect URLs. | 17.49.37 |
+| `open-links-externally` | Open links outside of the app directly in your browser. | 17.49.37 |
+| `premium-heading` | Shows premium branding on the home screen. | all |
+| `remember-playback-rate` | Adds the ability to remember the playback rate you chose in the video playback rate flyout. | 17.49.37 |
+| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.49.37 |
+| `remove-player-button-background` | Removes the background from the video player buttons. | 17.49.37 |
+| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.49.37 |
+| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.49.37 |
+| `settings` | Adds settings for ReVanced to YouTube. | all |
+| `sponsorblock` | Integrate SponsorBlock. | 17.49.37 |
+| `spoof-app-version` | Tricks YouTube into thinking, you are running an older version of the app. One of the side effects also includes restoring the old UI. | 17.49.37 |
+| `swipe-controls` | Adds volume and brightness swipe controls. | 17.49.37 |
+| `tablet-mini-player` | Enables the tablet mini player layout. | 17.49.37 |
+| `theme` | Applies a custom theme. | all |
+| `video-ads` | Removes ads in the video player. | 17.49.37 |
 </details>
 
-### 📦 `com.reddit.frontpage`
+### [📦 `com.google.android.apps.youtube.music`](https://play.google.com/store/apps/details?id=com.google.android.apps.youtube.music)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `premium-icon-reddit` | Unlocking Premium Icons in reddit app. | all |
-| `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | all |
+| `background-play` | Enables playing music in the background. | 5.39.52 |
+| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.39.52 |
+| `compact-header` | Hides the music category bar at the top of the homepage. | 5.39.52 |
+| `exclusive-audio-playback` | Enables the option to play music without video. | 5.39.52 |
+| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.39.52 |
+| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.39.52 |
+| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.39.52 |
+| `music-video-ads` | Removes ads in the music player. | 5.39.52 |
+| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.39.52 |
+| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.39.52 |
 </details>
 
-### 📦 `com.garzotto.pflotsh.ecmwf_a`
+### [📦 `com.ss.android.ugc.trill`](https://play.google.com/store/apps/details?id=com.ss.android.ugc.trill)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `pflotsh-ecmwf-subscription-unlock` | Unlocks all subscription features. | 3.5.4 |
+| `disable-login-requirement` | Do not force login. | all |
+| `downloads` | Removes download restrictions and changes the default path to download to. | 27.8.3 |
+| `feed-filter` | Filters tiktok videos: removing ads, removing livestreams. | 27.8.3 |
+| `fix-google-login` | Allows logging in with a Google account. | all |
+| `hide-ads` | Removes ads from TikTok. | all |
+| `playback-speed` | Enables the playback speed option for all videos. | all |
+| `settings` | Adds ReVanced settings to TikTok. | 27.8.3 |
+| `show-seekbar` | Shows progress bar for all video. | all |
+| `sim-spoof` | Spoofs the information which is retrieved from the sim-card. | 27.8.3 |
 </details>
 
-### 📦 `com.google.android.apps.youtube.music`
+### [📦 `com.zhiliaoapp.musically`](https://play.google.com/store/apps/details?id=com.zhiliaoapp.musically)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.22.54 |
-| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.22.54 |
-| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.22.54 |
-| `compact-header` | Hides the music category bar at the top of the homepage. | 5.22.54 |
-| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.22.54 |
-| `background-play` | Enables playing music in the background. | 5.22.54 |
-| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.22.54 |
-| `music-video-ads` | Removes ads in the music player. | 5.22.54 |
-| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.22.54 |
-| `exclusive-audio-playback` | Enables the option to play music without video. | 5.22.54 |
+| `disable-login-requirement` | Do not force login. | all |
+| `downloads` | Removes download restrictions and changes the default path to download to. | 27.8.3 |
+| `feed-filter` | Filters tiktok videos: removing ads, removing livestreams. | 27.8.3 |
+| `fix-google-login` | Allows logging in with a Google account. | all |
+| `hide-ads` | Removes ads from TikTok. | all |
+| `playback-speed` | Enables the playback speed option for all videos. | all |
+| `settings` | Adds ReVanced settings to TikTok. | 27.8.3 |
+| `show-seekbar` | Shows progress bar for all video. | all |
+| `sim-spoof` | Spoofs the information which is retrieved from the sim-card. | 27.8.3 |
 </details>
 
-### 📦 `de.dwd.warnapp`
+### [📦 `tv.twitch.android.app`](https://play.google.com/store/apps/details?id=tv.twitch.android.app)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `block-audio-ads` | Blocks audio ads in streams and VODs. | all |
+| `block-embedded-ads` | Blocks embedded steam ads using services like TTV.lol or PurpleAdBlocker. | all |
+| `block-video-ads` | Blocks video ads in streams and VODs. | all |
+| `debug-mode` | Enables Twitch's internal debugging mode. | all |
+| `settings` | Adds settings menu to Twitch. | all |
+| `show-deleted-messages` | Shows deleted chat messages behind a clickable spoiler. | all |
+</details>
+
+### [📦 `com.twitter.android`](https://play.google.com/store/apps/details?id=com.twitter.android)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `dynamic-color` | Replaces the default Twitter Blue with the users Material You palette. | all |
+| `hide-views-stats` | Hides the view stats under tweets. | 9.69.1-release.0 |
+| `monochrome-icon` | Adds a monochrome icon. | all |
+| `timeline-ads` | Removes ads from the Twitter timeline. Might require clearing app data to remove already cached ads. | all |
+</details>
+
+### [📦 `com.spotify.music`](https://play.google.com/store/apps/details?id=com.spotify.music)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `disable-capture-restriction` | Allows capturing Spotify's audio output while screen sharing or screen recording. | all |
+| `hide-premium-navbar` | Removes the premium tab from the navbar. | all |
+| `spotify-theme` | Applies a custom theme. | all |
+</details>
+
+### [📦 `com.reddit.frontpage`](https://play.google.com/store/apps/details?id=com.reddit.frontpage)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | 2022.43.0 |
+| `premium-icon-reddit` | Unlocks premium Reddit app icons. | all |
+</details>
+
+### [📦 `at.gv.bmf.bmf2go`](https://play.google.com/store/apps/details?id=at.gv.bmf.bmf2go)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `remove-bootloader-detection` | Removes the check for an unlocked bootloader. | 2.2.0 |
+| `remove-root-detection` | Removes the check for root permissions | 2.2.0 |
+</details>
+
+### [📦 `at.gv.oe.app`](https://play.google.com/store/apps/details?id=at.gv.oe.app)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `remove-root-detection` | Removes the check for root permissions and unlocked bootloader. | 2.5.2 |
+| `spoof-signature` | Spoofs the signature of the app. | 2.5.2 |
+</details>
+
+### [📦 `com.vanced.android.youtube`](https://play.google.com/store/apps/details?id=com.vanced.android.youtube)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
+</details>
+
+### [📦 `com.myprog.hexedit`](https://play.google.com/store/apps/details?id=com.myprog.hexedit)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `disable-ads` | Disables ads in HexEditor. | all |
+</details>
+
+### [📦 `org.citra.citra_emu`](https://play.google.com/store/apps/details?id=org.citra.citra_emu)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `premium-unlock` | Unlocks premium functions. | all |
+</details>
+
+### [📦 `org.citra.citra_emu.canary`](https://play.google.com/store/apps/details?id=org.citra.citra_emu.canary)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `premium-unlock` | Unlocks premium functions. | all |
+</details>
+
+### [📦 `com.backdrops.wallpapers`](https://play.google.com/store/apps/details?id=com.backdrops.wallpapers)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `pro-unlock` | Unlocks pro-only functions. | all |
+</details>
+
+### [📦 `de.dwd.warnapp`](https://play.google.com/store/apps/details?id=de.dwd.warnapp)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
@@ -54,52 +221,68 @@ The official Patch bundle provided by ReVanced and the community.
 | `promo-code-unlock` | Disables the validation of promo code. Any code will work to unlock all features. | all |
 </details>
 
-### 📦 `com.ss.android.ugc.trill`
+### [📦 `com.teslacoilsw.launcher`](https://play.google.com/store/apps/details?id=com.teslacoilsw.launcher)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `tiktok-download` | Remove restrictions on downloads video. | all |
-| `tiktok-seekbar` | Show progress bar for all video. | all |
-| `tiktok-ads` | Removes ads from TikTok. | all |
+| `unlock-prime` | Unlocks Nova Prime and all functions of the app. | all |
 </details>
 
-### 📦 `com.google.android.youtube`
+### [📦 `co.windyapp.android`](https://play.google.com/store/apps/details?id=co.windyapp.android)
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `swipe-controls` | Adds volume and brightness swipe controls. | 17.33.42 |
-| `downloads` | Enables downloading music and videos from YouTube. | 17.33.42 |
-| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.33.42 |
-| `amoled` | Enables pure black theme. | all |
-| `disable-create-button` | Hides the create button in the navigation bar. | 17.33.42 |
-| `hide-cast-button` | Hides the cast button in the video player. | all |
-| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.33.42 |
-| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.33.42 |
-| `premium-heading` | Shows premium branding on the home screen. | all |
-| `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
-| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 17.33.42 |
-| `old-quality-layout` | Enables the original quality flyout menu. | 17.33.42 |
-| `theme` | Enables a custom theme. | all |
-| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.33.42 |
-| `hide-watermark` | Hides creator's watermarks on videos. | 17.33.42 |
-| `sponsorblock` | Integrate SponsorBlock. | 17.33.42 |
-| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.33.42 |
-| `tablet-mini-player` | Enables the tablet mini player layout. | 17.33.42 |
-| `minimized-playback` | Enables minimized and background playback. | 17.33.42 |
-| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
-| `custom-video-buffer` | Lets you change the buffers of videos. | 17.33.42 |
-| `always-autorepeat` | Always repeats the playing video again. | 17.33.42 |
-| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.33.42 |
-| `settings` | Adds settings for ReVanced to YouTube. | all |
-| `enable-debugging` | Enables app debugging by patching the manifest file. | all |
-| `custom-playback-speed` | Adds more video playback speed options. | 17.33.42 |
-| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.33.42 |
-| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.33.42 |
-| `video-ads` | Removes ads in the video player. | 17.33.42 |
-| `general-ads` | Removes general ads. | 17.33.42 |
-| `hide-infocard-suggestions` | Hides infocards in videos. | 17.33.42 |
+| `unlock-pro` | Unlocks all pro features. | all |
+</details>
+
+### [📦 `com.awedea.nyx`](https://play.google.com/store/apps/details?id=com.awedea.nyx)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks all pro features. | all |
+</details>
+
+### [📦 `ginlemon.iconpackstudio`](https://play.google.com/store/apps/details?id=ginlemon.iconpackstudio)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks all pro features. | all |
+</details>
+
+### [📦 `org.totschnig.myexpenses`](https://play.google.com/store/apps/details?id=org.totschnig.myexpenses)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks all professional features. | all |
+</details>
+
+### [📦 `com.ithebk.expensemanager`](https://play.google.com/store/apps/details?id=com.ithebk.expensemanager)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks pro features. | all |
+</details>
+
+### [📦 `com.ticktick.task`](https://play.google.com/store/apps/details?id=com.ticktick.task)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-themes` | Unlocks all themes. | all |
+</details>
+
+### [📦 `net.dinglisch.android.taskerm`](https://play.google.com/store/apps/details?id=net.dinglisch.android.taskerm)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-trial` | Unlocks the trial version. | all |
 </details>
 
 
@@ -116,7 +299,6 @@ The file contains an array of objects, each object representing a patch. The obj
 | `description`                 | The description of the patch.                                                                                                                                                         |
 | `version`                     | The version of the patch.                                                                                                                                                             |
 | `excluded`                    | Whether the patch is excluded by default. If `true`, the patch must never be included by default.                                                                                     |
-| `deprecated`                  | Whether the patch is deprecated.                                                                                                                                                      |
 | `options`                     | An array of options for this patch.                                                                                                                                                   |
 | `options.key`                 | The key of the option.                                                                                                                                                                |
 | `options.title`               | The title of the option.                                                                                                                                                              |
@@ -137,7 +319,6 @@ Example:
     "description": "Adds the ability to remember the video quality you chose in the video quality flyout.",
     "version": "0.0.1",
     "excluded": false,
-    "deprecated": false,
     "options": [],
     "dependencies": [
       "integrations",

build.gradle.kts

@@ -20,11 +20,10 @@ repositories {
 }
 
 dependencies {
-    implementation("app.revanced:revanced-patcher:4.2.3")
-    implementation("app.revanced:multidexlib2:2.5.2.r2")
-
+    implementation("app.revanced:revanced-patcher:6.4.2")
+    implementation("app.revanced:multidexlib2:2.5.3-a3836654")
     // Required for meta
-    implementation("com.google.code.gson:gson:2.9.1")
+    implementation("com.google.code.gson:gson:2.10.1")
 }
 
 tasks {
@@ -34,7 +33,7 @@ tasks {
 
         doLast {
             val androidHome = System.getenv("ANDROID_HOME") ?: throw GradleException("ANDROID_HOME not found")
-            val d8 = "${androidHome}/build-tools/32.0.0/d8"
+            val d8 = "${androidHome}/build-tools/33.0.1/d8"
             val input = configurations.archives.get().allArtifacts.files.files.first().absolutePath
             val work = File("${buildDir}/libs")
 
@@ -54,7 +53,7 @@ tasks {
         dependsOn(build)
 
         classpath = sourceSets["main"].runtimeClasspath
-        mainClass.set("app.revanced.meta.Meta")
+        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.

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.52.0
+version = 2.157.0-dev.2

package.json

@@ -0,0 +1,8 @@
+{
+  "devDependencies": {
+    "@semantic-release/changelog": "^6.0.2",
+    "@semantic-release/git": "^10.0.1",
+    "gradle-semantic-release-plugin": "^1.7.4",
+    "semantic-release": "^19.0.5"
+  }
+}

src/main/kotlin/app/revanced/extensions/Extensions.kt

@@ -1,45 +1,30 @@
 package app.revanced.extensions
 
-import app.revanced.patcher.data.impl.BytecodeData
-import app.revanced.patcher.data.impl.ResourceData
-import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patcher.util.smali.toInstruction
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.builder.MutableMethodImplementation
-import org.jf.dexlib2.builder.instruction.BuilderInstruction11n
-import org.jf.dexlib2.builder.instruction.BuilderInstruction11x
-import org.jf.dexlib2.builder.instruction.BuilderInstruction21t
-import org.jf.dexlib2.builder.instruction.BuilderInstruction35c
-import org.jf.dexlib2.immutable.reference.ImmutableMethodReference
+import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.util.MethodUtil
 import org.w3c.dom.Node
-import java.nio.file.Files
 
-// TODO: this method does not make sense here
-internal fun MutableMethodImplementation.injectHideCall(
-    index: Int,
-    register: Int
-) {
-    this.addInstruction(
-        index,
-        "invoke-static { v$register }, Lapp/revanced/integrations/patches/HideHomeAdsPatch;->HideHomeAds(Landroid/view/View;)V".toInstruction()
-    )
-}
+// TODO: populate this to all patches
+/**
+ * Convert a [MethodFingerprint] to a [PatchResultError].
+ *
+ * @return A [PatchResultError] for the [MethodFingerprint].
+ */
+fun MethodFingerprint.toErrorResult() = PatchResultError("Failed to resolve $name")
 
 /**
- * traverse the class hierarchy starting from the given root class
+ * Find the [MutableMethod] from a given [Method] in a [MutableClass].
  *
- * @param targetClass the class to start traversing the class hierarchy from
- * @param callback function that is called for every class in the hierarchy
+ * @param method The [Method] to find.
+ * @return The [MutableMethod].
  */
-fun BytecodeData.traverseClassHierarchy(targetClass: MutableClass, callback: MutableClass.() -> Unit) {
-    callback(targetClass)
-    this.findClass(targetClass.superclass ?: return)?.resolve()?.let {
-        traverseClassHierarchy(it, callback)
-    }
+fun MutableClass.findMutableMethodOf(method: Method) = this.methods.first {
+    MethodUtil.methodSignaturesMatch(it, method)
 }
 
 /**
@@ -53,160 +38,7 @@ fun MutableClass.transformMethods(transform: MutableMethod.() -> MutableMethod)
     methods.addAll(transformedMethods)
 }
 
-/**
- * Insert an event hook at the top of the method. If the hook returns true, the event is consumed and the method will return with true
- *
- * the hook method MUST return a boolean and MUST take two parameters, like so:
- *  fun hook(thisRef: Object, eventData: Object): Boolean {}
- *
- * The final injected code will resemble the following logic:
- *  if( YouHook(this, event) ) { return true; }
- *  ...
- *
- * @param hookRef reference to the hook method
- */
-internal fun MutableMethod.injectConsumableEventHook(hookRef: ImmutableMethodReference) {
-    val isStaticMethod = AccessFlags.STATIC.isSet(this.accessFlags)
-    this.implementation?.let { impl ->
-        // create label to index 0 to continue to the normal program flow
-        val lblContinueNormalFlow = impl.newLabelForIndex(0)
-
-        // define registers
-        /** V0 */
-        val regV0 = 0
-
-        /** this  */
-        val regP0 = impl.registerCount - this.parameters.size - (if (isStaticMethod) 0 else 1)
-
-        /** motionEvent */
-        val regP1 = regP0 + 1
-
-        // insert instructions at the start of the method:
-        // if( Hook(this, event) ) { return true; }
-        impl.addInstructions(
-            0, listOf(
-                // invoke-static { p0, p1 } <hook>
-                BuilderInstruction35c(
-                    Opcode.INVOKE_STATIC,
-                    2,
-                    regP0,
-                    regP1,
-                    0, 0, 0,
-                    hookRef
-                ),
-
-                // move-result v0
-                BuilderInstruction11x(
-                    Opcode.MOVE_RESULT,
-                    regV0
-                ),
-
-                // if-eqz v0, :continue_normal_flow
-                BuilderInstruction21t(
-                    Opcode.IF_EQZ,
-                    regV0,
-                    lblContinueNormalFlow
-                ),
-
-                // const/4 v0, 0x1
-                BuilderInstruction11n(
-                    Opcode.CONST_4,
-                    regV0,
-                    0x1
-                ),
-
-                // return v0
-                BuilderInstruction11x(
-                    Opcode.RETURN,
-                    regV0
-                )
-
-                // :continue_normal_flow
-            )
-        )
-    }
-}
-
-/**
- * inject resources into the patched app
- *
- * @param classLoader classloader to use for loading the resources
- * @param patchDirectoryPath path to the files. this will be the directory you created under the 'resources' source folder
- * @param resourceType the resource type, for example 'drawable'. this has to match both the source and the target
- * @param resourceFileNames names of all resources of this type to inject
- */
-fun ResourceData.injectResources(
-    classLoader: ClassLoader,
-    patchDirectoryPath: String,
-    resourceType: String,
-    resourceFileNames: List<String>
-) {
-    resourceFileNames.forEach { name ->
-        val relativePath = "$resourceType/$name"
-        val sourceRes = classLoader.getResourceAsStream("$patchDirectoryPath/$relativePath")
-            ?: throw PatchResultError("could not open resource '$patchDirectoryPath/$relativePath'")
-
-        Files.copy(
-            sourceRes,
-            this["res"].resolve(relativePath).toPath()
-        )
-    }
-}
-
-/**
- * inject strings into the patched app
- *
- * @param classLoader classloader to use for loading the resources
- * @param patchDirectoryPath path to the files. this will be the directory you created under the 'resources' source folder
- * @param languageIdentifier ISO 639-2 two- letter language code identifier (aka the one android uses for values directory)
- */
-fun ResourceData.injectStrings(
-    classLoader: ClassLoader,
-    patchDirectoryPath: String,
-    languageIdentifier: String? = null,
-) {
-    val relativePath =
-        if (languageIdentifier.isNullOrBlank()) "values/strings.xml" else "values/strings-$languageIdentifier.xml"
-
-    // open source strings.xml
-    val sourceInputStream = classLoader.getResourceAsStream("$patchDirectoryPath/$relativePath")
-        ?: throw PatchResultError("failed to open '$patchDirectoryPath/$relativePath'")
-    xmlEditor[sourceInputStream].use { sourceStringsXml ->
-        val strings = sourceStringsXml.file.getElementsByTagName("resources").item(0).childNodes
-
-        // open target strings.xml
-        xmlEditor["res/$relativePath"].use { targetStringsXml ->
-            val targetFile = targetStringsXml.file
-            val targetRootNode = targetFile.getElementsByTagName("resources").item(0)
-
-            // process all children strings in the source
-            for (i in 0 until strings.length) {
-                // clone the node from source to target
-                val node = strings.item(i).cloneNode(true)
-                targetFile.adoptNode(node)
-                targetRootNode.appendChild(node)
-            }
-        }
-    }
-}
-
 internal fun Node.doRecursively(action: (Node) -> Unit) {
     action(this)
     for (i in 0 until this.childNodes.length) this.childNodes.item(i).doRecursively(action)
-}
-
-internal fun String.startsWithAny(vararg prefixes: String): Boolean {
-    for (prefix in prefixes)
-        if (this.startsWith(prefix))
-            return true
-
-    return false
-}
-
-internal fun String.equalsAny(vararg other: String): Boolean {
-    for (_other in other)
-        if (this == _other)
-            return true
-
-    return false
-}
+}

src/main/kotlin/app/revanced/meta/JsonGenerator.kt

@@ -0,0 +1,70 @@
+package app.revanced.meta
+
+import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
+import app.revanced.patcher.extensions.PatchExtensions.dependencies
+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.extensions.PatchExtensions.version
+import app.revanced.patcher.patch.PatchOption
+import com.google.gson.GsonBuilder
+import java.io.File
+
+internal class JsonGenerator : PatchesFileGenerator {
+    override fun generate(bundle: PatchBundlePatches) {
+        val patches = bundle.map {
+            JsonPatch(
+                it.patchName,
+                it.description ?: "This patch has no description.",
+                it.version ?: "0.0.0",
+                !it.include,
+                it.options?.map { option ->
+                    JsonPatch.Option(
+                        option.key,
+                        option.title,
+                        option.description,
+                        option.required,
+                        option.let { listOption ->
+                            if (listOption is PatchOption.ListOption<*>) {
+                                listOption.options.toMutableList().toTypedArray()
+                            } else null
+                        }
+                    )
+                }?.toTypedArray() ?: emptyArray(),
+                it.dependencies?.map { dep ->
+                    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))
+    }
+
+    private class JsonPatch(
+        val name: String,
+        val description: String,
+        val version: String,
+        val excluded: Boolean,
+        val options: Array<Option>,
+        val dependencies: Array<String>,
+        val compatiblePackages: Array<CompatiblePackage>,
+    ) {
+        class CompatiblePackage(
+            val name: String,
+            val versions: Array<String>,
+        )
+
+        class Option(
+            val key: String,
+            val title: String,
+            val description: String,
+            val required: Boolean,
+            val choices: Array<*>?,
+        )
+    }
+}

src/main/kotlin/app/revanced/meta/Meta.kt

@@ -1,27 +0,0 @@
-package app.revanced.meta
-
-import app.revanced.meta.json.generateJson
-import app.revanced.meta.readme.generateText
-import app.revanced.patcher.data.Data
-import app.revanced.patcher.patch.Patch
-import app.revanced.patcher.util.patch.impl.JarPatchBundle
-import java.io.File
-
-typealias Bundle = List<Class<out Patch<Data>>>
-
-object Meta {
-    @JvmStatic
-    fun main(args: Array<String>) {
-        val patches = accumulatePatches()
-        if (patches.isEmpty()) throw IllegalStateException("No patches found")
-
-        generateText(patches)
-        generateJson(patches)
-    }
-}
-
-fun accumulatePatches() = JarPatchBundle(
-    File("build/libs/").listFiles()!!.first {
-        it.name.startsWith("revanced-patches-") && it.name.endsWith(".jar")
-    }.absolutePath
-).loadPatches()

src/main/kotlin/app/revanced/meta/PatchesFileGenerator.kt

@@ -0,0 +1,25 @@
+package app.revanced.meta
+
+import app.revanced.patcher.data.Context
+import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.util.patch.PatchBundle
+import java.io.File
+
+typealias PatchBundlePatches = List<Class<out Patch<Context>>>
+
+internal interface PatchesFileGenerator {
+    fun generate(bundle: PatchBundlePatches)
+
+    private companion object {
+        @JvmStatic
+        fun main(args: Array<String>) = PatchBundle.Jar(
+            File("build/libs/").listFiles()!!.first {
+                it.name.startsWith("revanced-patches-") && it.name.endsWith(".jar")
+            }.absolutePath
+        ).loadPatches().also {
+            if (it.isEmpty()) throw IllegalStateException("No patches found")
+        }.let { bundle ->
+            arrayOf(JsonGenerator(), ReadmeGenerator()).forEach { it.generate(bundle) }
+        }
+    }
+}

src/main/kotlin/app/revanced/meta/ReadmeGenerator.kt

@@ -0,0 +1,69 @@
+package app.revanced.meta
+
+import app.revanced.patcher.data.Context
+import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
+import app.revanced.patcher.extensions.PatchExtensions.description
+import app.revanced.patcher.extensions.PatchExtensions.patchName
+import app.revanced.patcher.patch.Patch
+import java.io.File
+
+internal class ReadmeGenerator : PatchesFileGenerator {
+    private companion object {
+        private const val TABLE_HEADER =
+            "| \uD83D\uDC8A Patch | \uD83D\uDCDC Description | \uD83C\uDFF9 Target Version |\n" +
+                    "|:--------:|:--------------:|:-----------------:|"
+    }
+
+    override fun generate(bundle: PatchBundlePatches) {
+        val output = StringBuilder()
+
+        mutableMapOf<String, MutableList<Class<out Patch<Context>>>>()
+            .apply {
+                for (patch in bundle) {
+                    patch.compatiblePackages?.forEach { pkg ->
+                        if (!contains(pkg.name)) put(pkg.name, mutableListOf())
+                        this[pkg.name]!!.add(patch)
+                    }
+                }
+            }
+            .entries
+            .sortedByDescending { it.value.size }
+            .forEach { (`package`, patches) ->
+                val mostCommonVersion = buildMap {
+                    patches.forEach { patch ->
+                        patch.compatiblePackages?.single { compatiblePackage -> compatiblePackage.name == `package` }?.versions?.let {
+                            it.forEach { version -> merge(version, 1, Integer::sum) }
+                        }
+                    }
+                }.let { commonMap ->
+                    commonMap.maxByOrNull { it.value }?.value?.let {
+                        // This is not foolproof, because for example v1.0.0-dev.0 will be returned instead of v1.0.0-release.
+                        // Unfortunately this can not be solved easily because versioning can be complex.
+                        commonMap.entries.filter { mostCommon -> mostCommon.value == it }.maxBy { it.key }.key
+                    } ?: "all"
+                }
+
+                output.apply {
+                    appendLine("### [\uD83D\uDCE6 `${`package`}`](https://play.google.com/store/apps/details?id=${`package`})")
+                    appendLine("<details>\n")
+                    appendLine(TABLE_HEADER)
+                    patches.forEach { patch ->
+                        val recommendedPatchVersion = if (
+                            patch.compatiblePackages?.single { it.name == `package` }?.versions?.isNotEmpty() == true
+                        ) mostCommonVersion else "all"
+
+                        appendLine(
+                            "| `${patch.patchName}` " +
+                                    "| ${patch.description} " +
+                                    "| $recommendedPatchVersion |"
+                        )
+                    }
+                    appendLine("</details>\n")
+                }
+            }
+
+        StringBuilder(File("README-template.md").readText())
+            .replace(Regex("\\{\\{\\s?table\\s?}}"), output.toString())
+            .let(File("README.md")::writeText)
+    }
+}

src/main/kotlin/app/revanced/meta/json/Generator.kt

@@ -1,50 +0,0 @@
-package app.revanced.meta.json
-
-import app.revanced.meta.Bundle
-import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
-import app.revanced.patcher.extensions.PatchExtensions.dependencies
-import app.revanced.patcher.extensions.PatchExtensions.deprecated
-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.extensions.PatchExtensions.version
-import app.revanced.patcher.patch.PatchOption
-import com.google.gson.GsonBuilder
-import java.io.File
-
-private val gson = GsonBuilder().serializeNulls().create()
-
-fun generateJson(bundle: Bundle) {
-    val patches = bundle.map {
-        JsonPatch(
-            it.patchName,
-            it.description ?: "This patch has no description.",
-            it.version ?: "0.0.0",
-            !it.include,
-            it.deprecated != null,
-            it.options?.map { option ->
-                Option(
-                    option.key,
-                    option.title,
-                    option.description,
-                    option.required,
-                    option.let { lo ->
-                        if (lo is PatchOption.ListOption<*>) {
-                            lo.options.toMutableList().toTypedArray()
-                        } else null
-                    }
-                )
-            }?.toTypedArray() ?: emptyArray(),
-            it.dependencies?.map { dep ->
-                dep.java.patchName
-            }?.toTypedArray() ?: emptyArray(),
-            it.compatiblePackages?.map { pkg ->
-                CompatiblePackage(pkg.name, pkg.versions)
-            }?.toTypedArray() ?: emptyArray()
-        )
-    }
-
-    val json = File("patches.json")
-    json.writeText(gson.toJson(patches))
-}

src/main/kotlin/app/revanced/meta/json/JsonPatch.kt

@@ -1,27 +0,0 @@
-@file:Suppress("ArrayInDataClass") // We don't need it here.
-
-package app.revanced.meta.json
-
-data class JsonPatch(
-    val name: String,
-    val description: String,
-    val version: String,
-    val excluded: Boolean,
-    val deprecated: Boolean,
-    val options: Array<Option>,
-    val dependencies: Array<String>,
-    val compatiblePackages: Array<CompatiblePackage>,
-)
-
-data class CompatiblePackage(
-    val name: String,
-    val versions: Array<String>,
-)
-
-data class Option(
-    val key: String,
-    val title: String,
-    val description: String,
-    val required: Boolean,
-    val choices: Array<*>?,
-)

src/main/kotlin/app/revanced/meta/readme/Extensions.kt

@@ -1,10 +0,0 @@
-package app.revanced.meta.readme
-
-import app.revanced.patcher.data.Data
-import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
-import app.revanced.patcher.patch.Patch
-
-internal fun Class<out Patch<Data>>.getLatestVersion() =
-    this.compatiblePackages?.first()?.versions?.map {
-        SemanticVersion.fromString(it)
-    }?.maxWithOrNull(SemanticVersionComparator)

src/main/kotlin/app/revanced/meta/readme/Generator.kt

@@ -1,44 +0,0 @@
-package app.revanced.meta.readme
-
-import app.revanced.meta.Bundle
-import app.revanced.patcher.data.Data
-import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
-import app.revanced.patcher.extensions.PatchExtensions.description
-import app.revanced.patcher.extensions.PatchExtensions.patchName
-import app.revanced.patcher.patch.Patch
-import java.io.File
-
-private const val TABLE_HEADER =
-    "| \uD83D\uDC8A Patch | \uD83D\uDCDC Description | \uD83C\uDFF9 Target Version |\n" + "|:--------:|:--------------:|:-----------------:|"
-
-private val TABLE_REGEX = Regex("\\{\\{\\s?table\\s?}}")
-
-fun generateText(bundle: Bundle) {
-    val output = StringBuilder()
-    val packages = mutableMapOf<String, MutableList<Class<out Patch<Data>>>>()
-
-    bundle.map {
-        val packageName = it.compatiblePackages?.first()?.name!!
-        if (!packages.contains(packageName)) {
-            packages[packageName] = mutableListOf()
-        }
-
-        packages[packageName]?.add(it)
-    }
-
-    for (pkg in packages) {
-        output.appendLine("### \uD83D\uDCE6 `${pkg.key}`")
-        output.appendLine("<details>\n")
-
-        output.appendLine(TABLE_HEADER)
-        pkg.value.forEach { output.appendLine("| `${it.patchName}` | ${it.description} | ${it.getLatestVersion() ?: "all"} |") }
-
-        output.appendLine("</details>\n")
-    }
-
-    val readmeTemplate = Template(File("README-template.md").readText())
-    readmeTemplate.replaceVariable(TABLE_REGEX, output.toString())
-
-    val readme = File("README.md")
-    readme.writeText(readmeTemplate.toString())
-}

src/main/kotlin/app/revanced/meta/readme/SemanticVersion.kt

@@ -1,22 +0,0 @@
-package app.revanced.meta.readme
-
-data class SemanticVersion(val major: Int, val minor: Int, val patch: Int) {
-    companion object {
-        fun fromString(version: String): SemanticVersion {
-            val parts = version.split(".")
-            if (parts.count() != 3) throw IllegalArgumentException("Invalid semantic version")
-            val versionNumbers = parts.map { it.toInt() }
-            return SemanticVersion(versionNumbers[0], versionNumbers[1], versionNumbers[2])
-        }
-    }
-
-    override fun toString(): String = "$major.$minor.$patch"
-}
-
-object SemanticVersionComparator : Comparator<SemanticVersion> {
-    override fun compare(a: SemanticVersion, b: SemanticVersion): Int = when {
-        a.major != b.major -> a.major - b.major
-        a.minor != b.minor -> a.minor - b.minor
-        else -> a.patch - b.patch
-    }
-}

src/main/kotlin/app/revanced/meta/readme/Template.kt

@@ -1,12 +0,0 @@
-package app.revanced.meta.readme
-
-class Template(template: String) {
-    val result = StringBuilder(template)
-
-    fun replaceVariable(regex: Regex, value: String) {
-        val range = regex.find(result)!!.range
-        result.replace(range.first, range.last + 1, value)
-    }
-
-    override fun toString(): String = result.toString()
-}

src/main/kotlin/app/revanced/patches/all/interaction/gestures/patch/PredictiveBackGesturePatch.kt

@@ -0,0 +1,37 @@
+package app.revanced.patches.all.interaction.gestures.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotations.Patch
+
+@Patch(false)
+@Name("predictive-back-gesture")
+@Description("Enables the predictive back gesture introduced on Android 13.")
+@Version("0.0.1")
+class PredictiveBackGesturePatch : ResourcePatch {
+    override fun execute(context: ResourceContext): PatchResult {
+        context.xmlEditor["AndroidManifest.xml"].use { editor ->
+            val document = editor.file
+
+            with(document.getElementsByTagName("application").item(0)) {
+                if (attributes.getNamedItem(FLAG) != null) return@with
+
+                document.createAttribute(FLAG)
+                    .apply { value = "true" }
+                    .let(attributes::setNamedItem)
+
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+
+    private companion object {
+        const val FLAG = "android:enableOnBackInvokedCallback"
+    }
+}

src/main/kotlin/app/revanced/patches/all/screenshot/removerestriction/patch/RemoveScreenshotRestrictionPatch.kt

@@ -0,0 +1,106 @@
+package app.revanced.patches.all.screenshot.removerestriction.patch
+
+import app.revanced.extensions.findMutableMethodOf
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.formats.Instruction35c
+import org.jf.dexlib2.iface.reference.MethodReference
+
+@Patch(false)
+@Name("remove-screenshot-restriction")
+@Description("Removes the restriction of making screenshots.")
+@Version("0.0.1")
+class RemoveScreenshotRestrictionPatch : BytecodePatch() {
+
+    private companion object {
+        const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/all/screenshot/removerestriction/RemoveScreenshotRestrictionPatch;"
+    }
+
+    // Information about method calls we want to replace
+    private enum class MethodCall(
+        val definedClassName: String,
+        val methodName: String,
+        val replacementMethodDefinition: String
+    ) {
+        SetFlags(
+            "Landroid/view/Window;",
+            "setFlags",
+            "setFlags(Landroid/view/Window;II)V",
+        );
+
+        fun replaceInstruction(method: MutableMethod, instruction: Instruction35c, instructionIndex: Int) {
+            when (this) {
+                SetFlags -> {
+                    method.replaceInstruction(
+                        instructionIndex,
+                        "invoke-static { v${instruction.registerC}, v${instruction.registerD}, v${instruction.registerE} }, ${INTEGRATIONS_CLASS_DESCRIPTOR}->${replacementMethodDefinition}"
+                    )
+                }
+            }
+        }
+
+        companion object {
+            fun fromMethodReference(methodReference: MethodReference) = values().firstOrNull { search ->
+                search.definedClassName == methodReference.definingClass && search.methodName == methodReference.name
+            }
+        }
+    }
+
+    override fun execute(context: BytecodeContext): PatchResult {
+        // Find all instructions where one of the methods is called
+        buildMap {
+            context.classes.forEach { classDef ->
+                if (classDef.type == INTEGRATIONS_CLASS_DESCRIPTOR) {
+                    // avoid infinite recursion
+                    return@forEach
+                }
+
+                classDef.methods.let { methods ->
+                    buildMap methodList@{
+                        methods.forEach methods@{ method ->
+                            with(method.implementation?.instructions ?: return@methods) {
+                                ArrayDeque<Triple<MethodCall, Instruction35c, Int>>().also { patchIndices ->
+                                    this.forEachIndexed { index, instruction ->
+                                        if (instruction.opcode != Opcode.INVOKE_VIRTUAL) return@forEachIndexed
+
+                                        val invokeInstruction = instruction as Instruction35c
+                                        val methodRef = invokeInstruction.reference as MethodReference
+                                        val methodCall = MethodCall.fromMethodReference(methodRef) ?: return@forEachIndexed
+
+                                        patchIndices.add(Triple(methodCall, invokeInstruction, index))
+                                    }
+                                }.also { if (it.isEmpty()) return@methods }.let { patches ->
+                                    put(method, patches)
+                                }
+                            }
+                        }
+                    }
+                }.also { if (it.isEmpty()) return@forEach }.let { methodPatches ->
+                    put(classDef, methodPatches)
+                }
+            }
+        }.forEach { (classDef, methods) ->
+            // And finally replace the instructions...
+            with(context.proxy(classDef).mutableClass) {
+                methods.forEach { (method, patches) ->
+                    val mutableMethod = findMutableMethodOf(method)
+                    while (!patches.isEmpty()) {
+                        val (methodType, instruction, instructionIndex) = patches.removeLast()
+                        methodType.replaceInstruction(mutableMethod, instruction, instructionIndex)
+                    }
+                }
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/backdrops/misc/pro/annotations/ProUnlockCompatibility.kt

@@ -0,0 +1,7 @@
+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")])
+internal annotation class ProUnlockCompatibility

src/main/kotlin/app/revanced/patches/backdrops/misc/pro/fingerprints/ProUnlockFingerprint.kt

@@ -0,0 +1,15 @@
+package app.revanced.patches.backdrops.misc.pro.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.Opcode
+
+object ProUnlockFingerprint : MethodFingerprint(
+    opcodes = listOf(
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_EQZ
+    ),
+    customFingerprint = { it.definingClass == "Lcom/backdrops/wallpapers/data/local/DatabaseHandlerIAB;" && it.name == "lambda\$existPurchase\$0" }
+)

src/main/kotlin/app/revanced/patches/backdrops/misc/pro/patch/ProUnlockPatch.kt

@@ -0,0 +1,42 @@
+package app.revanced.patches.backdrops.misc.pro.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.backdrops.misc.pro.annotations.ProUnlockCompatibility
+import app.revanced.patches.backdrops.misc.pro.fingerprints.ProUnlockFingerprint
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Patch
+@Name("pro-unlock")
+@Description("Unlocks pro-only functions.")
+@ProUnlockCompatibility
+@Version("0.0.1")
+class ProUnlockPatch : BytecodePatch(
+    listOf(ProUnlockFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        val result = ProUnlockFingerprint.result ?: return PatchResultError("${ProUnlockFingerprint.name} not found")
+
+        val moveRegisterInstruction = result.mutableMethod.instruction(result.scanResult.patternScanResult!!.endIndex - 1)
+        val register = (moveRegisterInstruction as OneRegisterInstruction).registerA
+
+        result.mutableMethod.addInstructions(
+            result.scanResult.patternScanResult!!.endIndex,
+            """
+                const/4 v$register, 0x1
+            """
+        )
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/citra/misc/premium/annotations/PremiumUnlockCompatbility.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.citra.misc.premium.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("org.citra.citra_emu"), Package("org.citra.citra_emu.canary")])
+internal annotation class PremiumUnlockCompatbility

src/main/kotlin/app/revanced/patches/citra/misc/premium/fingerprints/PremiumUnlockFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.citra.misc.premium.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object PremiumUnlockFingerprint : MethodFingerprint(
+    customFingerprint = { it.definingClass == "Lorg/citra/citra_emu/ui/main/MainActivity;" && it.name == "isPremiumActive" }
+)

src/main/kotlin/app/revanced/patches/citra/misc/premium/patch/PremiumUnlockPatch.kt

@@ -0,0 +1,37 @@
+package app.revanced.patches.citra.misc.premium.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patches.citra.misc.premium.annotations.PremiumUnlockCompatbility
+import app.revanced.patches.citra.misc.premium.fingerprints.PremiumUnlockFingerprint
+
+@Patch
+@Name("premium-unlock")
+@Description("Unlocks premium functions.")
+@PremiumUnlockCompatbility
+@Version("0.0.1")
+class PremiumUnlockPatch : BytecodePatch(
+    listOf(PremiumUnlockFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        val result = PremiumUnlockFingerprint.result ?: return PatchResultError("${PremiumUnlockFingerprint.name} not found")
+
+        result.mutableMethod.addInstructions(
+            0,
+            """
+                const v0, 0x1
+                return v0
+            """
+        )
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/fingerprints/BootStateFingerprint.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.finanzonline.detection.bootloader.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+
+object BootStateFingerprint : MethodFingerprint(
+    "Z",
+    access = AccessFlags.PUBLIC.value,
+    strings = listOf("Boot state of device: %s"),
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/AttestationHelper;")
+    }
+)

src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/fingerprints/BootloaderDetectionFingerprint.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.finanzonline.detection.bootloader.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+
+object BootloaderDetectionFingerprint : MethodFingerprint(
+    "Z",
+    access = AccessFlags.PUBLIC.value,
+    strings = listOf("Creation of attestation key succeeded", "Creation of attestation key failed"),
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/AttestationHelper;")
+    }
+)

src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/patch/BootloaderDetectionPatch.kt

@@ -0,0 +1,38 @@
+package app.revanced.patches.finanzonline.detection.bootloader.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.finanzonline.detection.bootloader.fingerprints.BootStateFingerprint
+import app.revanced.patches.finanzonline.detection.bootloader.fingerprints.BootloaderDetectionFingerprint
+import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionCompatibility
+
+
+@Patch
+@Name("remove-bootloader-detection")
+@Description("Removes the check for an unlocked bootloader.")
+@DetectionCompatibility
+@Version("0.0.1")
+class BootloaderDetectionPatch : BytecodePatch(
+    listOf(BootloaderDetectionFingerprint, BootStateFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        arrayOf(BootloaderDetectionFingerprint, BootStateFingerprint).forEach { fingerprint ->
+            fingerprint.result?.mutableMethod?.addInstruction(
+                0,
+                """
+                        const/4 v0, 0x1
+                        return v0
+                """
+            ) ?: return fingerprint.toErrorResult()
+        }
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/finanzonline/detection/root/fingerprints/RootDetectionFingerprint.kt

@@ -0,0 +1,10 @@
+package app.revanced.patches.finanzonline.detection.root.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object RootDetectionFingerprint : MethodFingerprint(
+    "L",
+    customFingerprint = { methodDef ->
+        methodDef.definingClass == "Lat/gv/bmf/bmf2go/tools/utils/z;"
+    }
+)

src/main/kotlin/app/revanced/patches/finanzonline/detection/root/patch/RootDetectionPatch.kt

@@ -0,0 +1,34 @@
+package app.revanced.patches.finanzonline.detection.root.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.finanzonline.detection.root.fingerprints.RootDetectionFingerprint
+import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionCompatibility
+
+@Patch
+@Name("remove-root-detection")
+@Description("Removes the check for root permissions")
+@DetectionCompatibility
+@Version("0.0.1")
+class RootDetectionPatch : BytecodePatch(
+    listOf(RootDetectionFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        RootDetectionFingerprint.result?.mutableMethod?.addInstructions(
+            0,
+            """
+                sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+                return-object v0
+            """
+        ) ?: return RootDetectionFingerprint.toErrorResult()
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/finanzonline/detection/shared/annotations/DetectionCompatibility.kt

@@ -0,0 +1,9 @@
+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", arrayOf("2.2.0"))])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class DetectionCompatibility

src/main/kotlin/app/revanced/patches/hexeditor/ad/annotations/HexEditorAdsCompatibility.kt

@@ -0,0 +1,13 @@
+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)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class HexEditorAdsCompatibility

src/main/kotlin/app/revanced/patches/hexeditor/ad/fingerprints/PrimaryAdsFingerprint.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.hexeditor.ad.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object PrimaryAdsFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("PreferencesHelper;") && methodDef.name == "isAdsDisabled"
+    }
+)

src/main/kotlin/app/revanced/patches/hexeditor/ad/patch/HexEditorAdsPatch.kt

@@ -0,0 +1,39 @@
+package app.revanced.patches.hexeditor.ad.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.removeInstruction
+import app.revanced.patcher.extensions.replaceInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+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
+@Version("0.0.1")
+class HexEditorAdsPatch : BytecodePatch(
+    listOf(
+        PrimaryAdsFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        val method = PrimaryAdsFingerprint.result!!.mutableMethod
+        
+        method.replaceInstructions(
+            0,
+            """
+                const/4 v0, 0x1
+                return v0
+            """
+        )
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/annotations/UnlockProCompatibility.kt

@@ -0,0 +1,9 @@
+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)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class UnlockProCompatibility

src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/fingerprints/CheckProFingerprint.kt

@@ -0,0 +1,8 @@
+package app.revanced.patches.iconpackstudio.misc.pro.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object CheckProFingerprint : MethodFingerprint(
+    "Z",
+    customFingerprint = { it.definingClass.endsWith("IPSPurchaseRepository;")}
+)

src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/patch/UnlockProPatch.kt

@@ -0,0 +1,38 @@
+package app.revanced.patches.iconpackstudio.misc.pro.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.removeInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.iconpackstudio.misc.pro.annotations.UnlockProCompatibility
+import app.revanced.patches.iconpackstudio.misc.pro.fingerprints.CheckProFingerprint
+
+@Patch
+@Name("unlock-pro")
+@Description("Unlocks all pro features.")
+@UnlockProCompatibility
+@Version("0.0.1")
+class UnlockProPatch : BytecodePatch(
+    listOf(
+        CheckProFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        val method = CheckProFingerprint.result!!.mutableMethod
+        method.addInstructions(
+            0,
+            """
+                const/4 v0, 0x1
+                return v0
+            """
+        )
+        
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/idaustria/detection/root/fingerprints/RootDetectionFingerprint.kt

@@ -0,0 +1,12 @@
+package app.revanced.patches.idaustria.detection.root.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+
+object RootDetectionFingerprint : MethodFingerprint(
+    "V",
+    access = AccessFlags.PUBLIC.value,
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/DeviceIntegrityCheck;")
+    }
+)

src/main/kotlin/app/revanced/patches/idaustria/detection/root/patch/RootDetectionPatch.kt

@@ -0,0 +1,25 @@
+package app.revanced.patches.idaustria.detection.root.patch
+
+import app.revanced.patcher.annotation.*
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+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
+@Version("0.0.1")
+class RootDetectionPatch : BytecodePatch(
+    listOf(RootDetectionFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        RootDetectionFingerprint.result!!.mutableMethod.addInstructions(0, "return-void")
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/idaustria/detection/shared/annotations/DetectionCompatibility.kt

@@ -0,0 +1,9 @@
+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", arrayOf("2.5.2"))])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class DetectionCompatibility

src/main/kotlin/app/revanced/patches/idaustria/detection/signature/fingerprints/SpoofSignatureFingerprint.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.idaustria.detection.signature.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+
+object SpoofSignatureFingerprint : MethodFingerprint(
+    "L",
+    parameters = listOf("L"),
+    access = AccessFlags.PRIVATE.value,
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/SL2Step1Task;") && methodDef.name == "getPubKey"
+    }
+)

src/main/kotlin/app/revanced/patches/idaustria/detection/signature/patch/SpoofSignaturePatch.kt

@@ -0,0 +1,45 @@
+package app.revanced.patches.idaustria.detection.signature.patch
+
+import app.revanced.patcher.annotation.*
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.idaustria.detection.shared.annotations.DetectionCompatibility
+import app.revanced.patches.idaustria.detection.signature.fingerprints.SpoofSignatureFingerprint
+
+@Patch
+@Name("spoof-signature")
+@Description("Spoofs the signature of the app.")
+@DetectionCompatibility
+@Version("0.0.1")
+class SpoofSignaturePatch : BytecodePatch(
+    listOf(SpoofSignatureFingerprint)
+) {
+    companion object {
+        const val EXPECTED_SIGNATURE = "OpenSSLRSAPublicKey{modulus=ac3e6fd6050aa7e0d6010ae58190404cd89a56935b44f6fee" +
+                "067c149768320026e10b24799a1339e414605e448e3f264444a327b9ae292be2b62ad567dd1800dbed4a88f718a33dc6db6b" +
+                "f5178aa41aa0efff8a3409f5ca95dbfccd92c7b4298966df806ea7a0204a00f0e745f6d9f13bdf24f3df715d7b62c1600906" +
+                "15de1c8a956b9286764985a3b3c060963c435fb9481a5543aaf0671fc2dba6c5c2b17d1ef1d85137f14dc9bbdf3490288087" +
+                "324cd48341cce64fabf6a9b55d1a7bf23b2fcdff451fd85bf0c7feb0a5e884d7c5c078e413149566a12a686e6efa70ae5161" +
+                "a0201307692834cda336c55157fef125e67c01c1359886f94742105596b42a790404bbcda5dad6a65f115aaff5e45ef3c28b" +
+                "2316ff6cef07aa49a45aa58c07bf258051b13ef449ccb37a3679afd5cfb9132f70bb9d931a937897544f90c3bcc80ed012e9" +
+                "f6ba020b8cdc23f8c29ac092b88f0e370ff9434e4f0f359e614ae0868dc526fa41e4b7596533e8d10279b66e923ecd9f0b20" +
+                "0def55be2c1f6f9c72c92fb45d7e0a9ac571cb38f0a9a37bb33ea06f223fde8c7a92e8c47769e386f9799776e8f110c21df2" +
+                "77ef1be61b2c01ebdabddcbf53cc4b6fd9a3c445606ee77b3758162c80ad8f8137b3c6864e92db904807dcb2be9d7717dd21" +
+                "bf42c121d620ddfb7914f7a95c713d9e1c1b7bdb4a03d618e40cf7e9e235c0b5687e03b7ab3,publicExponent=10001}"
+    }
+
+    override fun execute(context: BytecodeContext): PatchResult {
+        SpoofSignatureFingerprint.result!!.mutableMethod.addInstructions(
+            0,
+            """
+                const-string v0, "$EXPECTED_SIGNATURE"
+                return-object v0 
+            """
+        )
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/moneymanager/annotations/UnlockProCompatibility.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.moneymanager.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.ithebk.expensemanager")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class UnlockProCompatibility

src/main/kotlin/app/revanced/patches/moneymanager/fingerprints/UnlockProFingerprint.kt

@@ -0,0 +1,19 @@
+package app.revanced.patches.moneymanager.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+object UnlockProFingerprint : MethodFingerprint(
+    "Z",
+    AccessFlags.STATIC or AccessFlags.SYNTHETIC,
+    parameters = listOf("L"),
+    opcodes = listOf(
+        Opcode.IGET_BOOLEAN,
+        Opcode.RETURN
+    ),
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("MainActivity;")
+    }
+)

src/main/kotlin/app/revanced/patches/moneymanager/patch/UnlockProPatch.kt

@@ -0,0 +1,34 @@
+package app.revanced.patches.moneymanager.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.moneymanager.annotations.UnlockProCompatibility
+import app.revanced.patches.moneymanager.fingerprints.UnlockProFingerprint
+
+@Patch
+@Name("unlock-pro")
+@Description("Unlocks pro features.")
+@UnlockProCompatibility
+@Version("0.0.1")
+class UnlockProPatch : BytecodePatch(
+    listOf(UnlockProFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+       UnlockProFingerprint.result!!.mutableMethod.addInstructions(
+            0,
+            """
+                   const/4 v0, 0x1
+                   
+                   return v0 
+                """
+        )
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/music/ad/video/annotations/MusicVideoAdsCompatibility.kt

@@ -5,7 +5,27 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54")
+        "com.google.android.apps.youtube.music",
+        arrayOf(
+            "5.14.53",
+            "5.16.51",
+            "5.17.51",
+            "5.21.52",
+            "5.22.54",
+            "5.23.50",
+            "5.25.51",
+            "5.25.52",
+            "5.26.52",
+            "5.27.51",
+            "5.28.52",
+            "5.29.52",
+            "5.31.50",
+            "5.34.51",
+            "5.36.51",
+            "5.38.53",
+            "5.39.52",
+            "5.40.51"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsConstructorFingerprint.kt

@@ -1,23 +1,11 @@
 package app.revanced.patches.music.ad.video.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patches.music.ad.video.annotations.MusicVideoAdsCompatibility
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("show-video-ads-constructor-fingerprint")
-@MatchingMethod(
-    "Laghd;",
-    "<init>",
-)
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@MusicVideoAdsCompatibility
-@Version("0.0.1")
 object ShowMusicVideoAdsConstructorFingerprint : MethodFingerprint(
     "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L"), listOf(
         Opcode.INVOKE_DIRECT,

src/main/kotlin/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsFingerprint.kt

@@ -1,22 +1,10 @@
 package app.revanced.patches.music.ad.video.fingerprints
 
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.music.ad.video.annotations.MusicVideoAdsCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("show-video-ads-method-fingerprint")
-@MatchingMethod(
-    "Laghd;", "d"
-)
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@MusicVideoAdsCompatibility
-@Version("0.0.1")
 object ShowMusicVideoAdsFingerprint : MethodFingerprint(
     "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z"), listOf(
         Opcode.IPUT_BOOLEAN,

src/main/kotlin/app/revanced/patches/music/ad/video/patch/MusicVideoAdsPatch.kt

@@ -3,13 +3,13 @@ package app.revanced.patches.music.ad.video.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.music.ad.video.annotations.MusicVideoAdsCompatibility
 import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsConstructorFingerprint
 import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsFingerprint
@@ -24,13 +24,13 @@ class MusicVideoAdsPatch : BytecodePatch(
         ShowMusicVideoAdsConstructorFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
-        ShowMusicVideoAdsFingerprint.resolve(data, ShowMusicVideoAdsConstructorFingerprint.result!!.classDef)
+    override fun execute(context: BytecodeContext): PatchResult {
+        ShowMusicVideoAdsFingerprint.resolve(context, ShowMusicVideoAdsConstructorFingerprint.result!!.classDef)
 
         val result = ShowMusicVideoAdsFingerprint.result!!
 
         result.mutableMethod.addInstructions(
-            result.patternScanResult!!.startIndex, """
+            result.scanResult.patternScanResult!!.startIndex, """
                 const/4 p1, 0x0
             """
         )

src/main/kotlin/app/revanced/patches/music/audio/codecs/annotations/CodecsUnlockCompatibility.kt

@@ -5,7 +5,27 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54")
+        "com.google.android.apps.youtube.music",
+        arrayOf(
+            "5.14.53",
+            "5.16.51",
+            "5.17.51",
+            "5.21.52",
+            "5.22.54",
+            "5.23.50",
+            "5.25.51",
+            "5.25.52",
+            "5.26.52",
+            "5.27.51",
+            "5.28.52",
+            "5.29.52",
+            "5.31.50",
+            "5.34.51",
+            "5.36.51",
+            "5.38.53",
+            "5.39.52",
+            "5.40.51"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/AllCodecsReferenceFingerprint.kt

@@ -1,23 +1,13 @@
 package app.revanced.patches.music.audio.codecs.fingerprints
 
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher. fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patches.music.audio.codecs.annotations.CodecsUnlockCompatibility
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("all-codecs-reference-fingerprint")
-@MatchingMethod(
-    "Laari;",
-    "b",
-)
+
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@CodecsUnlockCompatibility
-@Version("0.0.1")
 object AllCodecsReferenceFingerprint : MethodFingerprint(
     "J", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"), listOf(
         Opcode.INVOKE_STATIC,

src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/CodecsLockFingerprint.kt

@@ -1,23 +1,13 @@
 package app.revanced.patches.music.audio.codecs.fingerprints
 
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.music.audio.codecs.annotations.CodecsUnlockCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("codec-lock-fingerprint")
-@MatchingMethod(
-    "Lacfr;",
-    "a",
-)
+
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@CodecsUnlockCompatibility
-@Version("0.0.1")
 object CodecsLockFingerprint : MethodFingerprint(
     "L", AccessFlags.PUBLIC or AccessFlags.STATIC, opcodes = listOf(
         Opcode.INVOKE_DIRECT,
@@ -32,7 +22,7 @@ object CodecsLockFingerprint : MethodFingerprint(
         Opcode.INVOKE_STATIC,
         Opcode.MOVE_RESULT_OBJECT,
         Opcode.INVOKE_INTERFACE,
-        Opcode.INVOKE_DIRECT,
+        Opcode.INVOKE_VIRTUAL,
         Opcode.RETURN_OBJECT
     ),
     strings = listOf("eac3_supported")

src/main/kotlin/app/revanced/patches/music/audio/codecs/patch/CodecsUnlockPatch.kt

@@ -3,12 +3,12 @@ package app.revanced.patches.music.audio.codecs.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
-import app.revanced.patcher.data.impl.toMethodWalker
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.data.toMethodWalker
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patches.music.audio.codecs.annotations.CodecsUnlockCompatibility
 import app.revanced.patches.music.audio.codecs.fingerprints.AllCodecsReferenceFingerprint
@@ -25,12 +25,12 @@ class CodecsUnlockPatch : BytecodePatch(
         CodecsLockFingerprint, AllCodecsReferenceFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val codecsLockResult = CodecsLockFingerprint.result!!
 
         val implementation = codecsLockResult.mutableMethod.implementation!!
 
-        val scanResultStartIndex = codecsLockResult.patternScanResult!!.startIndex
+        val scanResultStartIndex = codecsLockResult.scanResult.patternScanResult!!.startIndex
         val instructionIndex = scanResultStartIndex +
                 if (implementation.instructions[scanResultStartIndex - 1].opcode == Opcode.CHECK_CAST) {
                     // for 5.16.xx and lower
@@ -42,8 +42,8 @@ class CodecsUnlockPatch : BytecodePatch(
 
         val allCodecsResult = AllCodecsReferenceFingerprint.result!!
         val allCodecsMethod =
-            data.toMethodWalker(allCodecsResult.method)
-                .nextMethod(allCodecsResult.patternScanResult!!.startIndex)
+            context.toMethodWalker(allCodecsResult.method)
+                .nextMethod(allCodecsResult.scanResult.patternScanResult!!.startIndex)
                 .getMethod()
 
         implementation.replaceInstruction(

src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/annotations/ExclusiveAudioCompatibility.kt

@@ -5,7 +5,27 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54")
+        "com.google.android.apps.youtube.music",
+        arrayOf(
+            "5.14.53",
+            "5.16.51",
+            "5.17.51",
+            "5.21.52",
+            "5.22.54",
+            "5.23.50",
+            "5.25.51",
+            "5.25.52",
+            "5.26.52",
+            "5.27.51",
+            "5.28.52",
+            "5.29.52",
+            "5.31.50",
+            "5.34.51",
+            "5.36.51",
+            "5.38.53",
+            "5.39.52",
+            "5.40.51"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/AudioOnlyEnablerFingerprint.kt

@@ -1,25 +1,10 @@
 package app.revanced.patches.music.audio.exclusiveaudio.fingerprints
 
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.music.audio.exclusiveaudio.annotations.ExclusiveAudioCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("audio-only-enabler-fingerprint")
-@MatchingMethod(
-    "Lgmd;",
-    "d"
-)
-@DirectPatternScanMethod
-@ExclusiveAudioCompatibility
-@Version(
-    "0.0.1"
-)
 object  AudioOnlyEnablerFingerprint: MethodFingerprint(
     "Z", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
         Opcode.IGET_OBJECT,

src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/ExclusiveAudioFingerprint.kt

@@ -1,22 +1,13 @@
 package app.revanced.patches.music.audio.exclusiveaudio.fingerprints
 
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patches.music.audio.exclusiveaudio.annotations.ExclusiveAudioCompatibility
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("exclusive-audio-fingerprints")
-@MatchingMethod(
-    "Lgmd;", "c"
-)
+
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@ExclusiveAudioCompatibility
-@Version("0.0.1")
 object ExclusiveAudioFingerprint : MethodFingerprint(
     "V",
     AccessFlags.PUBLIC or AccessFlags.FINAL,

src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/patch/ExclusiveAudioPatch.kt

@@ -3,17 +3,15 @@ package app.revanced.patches.music.audio.exclusiveaudio.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.extensions.replaceInstruction
-import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.music.audio.exclusiveaudio.annotations.ExclusiveAudioCompatibility
 import app.revanced.patches.music.audio.exclusiveaudio.fingerprints.AudioOnlyEnablerFingerprint
-import app.revanced.patches.music.audio.exclusiveaudio.fingerprints.ExclusiveAudioFingerprint
 
 @Patch
 @Name("exclusive-audio-playback")
@@ -25,7 +23,7 @@ class ExclusiveAudioPatch : BytecodePatch(
         AudioOnlyEnablerFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val method = AudioOnlyEnablerFingerprint.result!!.mutableMethod
         method.replaceInstruction(method.implementation!!.instructions.count() - 1, "const/4 v0, 0x1")
         method.addInstruction("return v0")

src/main/kotlin/app/revanced/patches/music/layout/compactheader/annotations/CompactHeaderCompatibility.kt

@@ -5,7 +5,26 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.21.52", "5.22.54")
+        "com.google.android.apps.youtube.music",
+        arrayOf(
+            "5.14.53",
+            "5.16.51",
+            "5.21.52",
+            "5.22.54",
+            "5.23.50",
+            "5.25.51",
+            "5.25.52",
+            "5.26.52",
+            "5.27.51",
+            "5.28.52",
+            "5.29.52",
+            "5.31.50",
+            "5.34.51",
+            "5.36.51",
+            "5.38.53",
+            "5.39.52",
+            "5.40.51"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/layout/compactheader/fingerprints/CompactHeaderConstructorFingerprint.kt

@@ -1,20 +1,10 @@
 package app.revanced.patches.music.layout.compactheader.fingerprints
 
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patches.music.layout.compactheader.annotations.CompactHeaderCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("compact-header-constructor-fingerprint")
-@MatchingMethod(
-    "Llcz;", "<init>"
-)
-@CompactHeaderCompatibility
-@Version("0.0.1")
 object CompactHeaderConstructorFingerprint : MethodFingerprint(
     "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L", "L", "L"), listOf(
         Opcode.INVOKE_DIRECT,

src/main/kotlin/app/revanced/patches/music/layout/compactheader/patch/CompactHeaderPatch.kt

@@ -3,12 +3,12 @@ package app.revanced.patches.music.layout.compactheader.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.layout.compactheader.annotations.CompactHeaderCompatibility
 import app.revanced.patches.music.layout.compactheader.fingerprints.CompactHeaderConstructorFingerprint
 import org.jf.dexlib2.builder.instruction.BuilderInstruction11x
@@ -23,11 +23,11 @@ class CompactHeaderPatch : BytecodePatch(
         CompactHeaderConstructorFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val result = CompactHeaderConstructorFingerprint.result!!
         val method = result.mutableMethod
 
-        val insertIndex = result.patternScanResult!!.endIndex
+        val insertIndex = result.scanResult.patternScanResult!!.endIndex
         val register = (method.implementation!!.instructions[insertIndex - 1] as BuilderInstruction11x).registerA
         method.addInstructions(
             insertIndex, """

src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/annotations/MinimizedPlaybackCompatibility.kt

@@ -5,7 +5,27 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54")
+        "com.google.android.apps.youtube.music",
+        arrayOf(
+            "5.14.53",
+            "5.16.51",
+            "5.17.51",
+            "5.21.52",
+            "5.22.54",
+            "5.23.50",
+            "5.25.51",
+            "5.25.52",
+            "5.26.52",
+            "5.27.51",
+            "5.28.52",
+            "5.29.52",
+            "5.31.50",
+            "5.34.51",
+            "5.36.51",
+            "5.38.53",
+            "5.39.52",
+            "5.40.51"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/fingerprints/MinimizedPlaybackManagerFingerprint.kt

@@ -1,20 +1,10 @@
 package app.revanced.patches.music.layout.minimizedplayback.fingerprints
 
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patches.music.layout.minimizedplayback.annotations.MinimizedPlaybackCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("minimized-playback-manager-fingerprint")
-@MatchingMethod(
-    "Llxw;", "c"
-)
-@MinimizedPlaybackCompatibility
-@Version("0.0.1")
 object MinimizedPlaybackManagerFingerprint : MethodFingerprint(
     "V",
     AccessFlags.PUBLIC or AccessFlags.FINAL,

src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/patch/MinimizedPlaybackPatch.kt

@@ -3,18 +3,14 @@ package app.revanced.patches.music.layout.minimizedplayback.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
-import app.revanced.patcher.data.impl.toMethodWalker
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.music.layout.minimizedplayback.annotations.MinimizedPlaybackCompatibility
 import app.revanced.patches.music.layout.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.MethodReference
 
 @Patch
 @Name("minimized-playback-music")
@@ -26,7 +22,7 @@ class MinimizedPlaybackPatch : BytecodePatch(
         MinimizedPlaybackManagerFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         MinimizedPlaybackManagerFingerprint.result!!.mutableMethod.addInstructions(
             0, """
                 return-void

src/main/kotlin/app/revanced/patches/music/layout/premium/annotations/HideGetPremiumCompatibility.kt

@@ -5,7 +5,26 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54")
+        "com.google.android.apps.youtube.music",
+        arrayOf(
+            "5.14.53",
+            "5.16.51",
+            "5.17.51",
+            "5.21.52",
+            "5.22.54",
+            "5.23.50",
+            "5.25.51",
+            "5.25.52",
+            "5.26.52",
+            "5.27.51",
+            "5.28.52",
+            "5.29.52",
+            "5.31.50",
+            "5.34.51",
+            "5.36.51",
+            "5.38.53",
+            "5.39.52"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/layout/premium/fingerprints/HideGetPremiumFingerprint.kt

@@ -1,20 +1,10 @@
 package app.revanced.patches.music.layout.premium.fingerprints
 
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patches.music.layout.premium.annotations.HideGetPremiumCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("hide-get-premium-fingerprint")
-@MatchingMethod(
-    "Lktn;", "k"
-)
-@HideGetPremiumCompatibility
-@Version("0.0.1")
 object HideGetPremiumFingerprint : MethodFingerprint(
     "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
         Opcode.IF_NEZ,

src/main/kotlin/app/revanced/patches/music/layout/premium/fingerprints/HideGetPremiumParentFingerprint.kt

@@ -1,20 +1,10 @@
 package app.revanced.patches.music.layout.premium.fingerprints
 
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patches.music.layout.premium.annotations.HideGetPremiumCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("hide-get-premium-parent-fingerprint")
-@MatchingMethod(
-    "Lktn;", "k"
-)
-@HideGetPremiumCompatibility
-@Version("0.0.1")
 object HideGetPremiumParentFingerprint : MethodFingerprint(
     "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
         Opcode.IGET_BOOLEAN,

src/main/kotlin/app/revanced/patches/music/layout/premium/patch/HideGetPremiumPatch.kt

@@ -3,14 +3,14 @@ package app.revanced.patches.music.layout.premium.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.replaceInstruction
-import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.layout.premium.annotations.HideGetPremiumCompatibility
 import app.revanced.patches.music.layout.premium.fingerprints.HideGetPremiumFingerprint
 import app.revanced.patches.music.layout.premium.fingerprints.HideGetPremiumParentFingerprint
@@ -25,13 +25,15 @@ class HideGetPremiumPatch : BytecodePatch(
         HideGetPremiumParentFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val parentResult = HideGetPremiumParentFingerprint.result!!
-        HideGetPremiumFingerprint.resolve(data, parentResult.classDef)
+        HideGetPremiumFingerprint.resolve(context, parentResult.classDef)
+
+        val startIndex = parentResult.scanResult.patternScanResult!!.startIndex
 
         val parentMethod = parentResult.mutableMethod
         parentMethod.replaceInstruction(
-            parentResult.patternScanResult!!.startIndex, """
+            startIndex, """
             const/4 v1, 0x0
         """
         )
@@ -39,7 +41,7 @@ class HideGetPremiumPatch : BytecodePatch(
         val result = HideGetPremiumFingerprint.result!!
         val method = result.mutableMethod
         method.addInstructions(
-            result.patternScanResult!!.startIndex, """
+            startIndex, """
             const/16 v0, 0x8
         """
         )

src/main/kotlin/app/revanced/patches/music/layout/tastebuilder/annotations/RemoveTasteBuilderCompatibility.kt

@@ -10,7 +10,24 @@ import app.revanced.patcher.annotation.Package
  */
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.21.52", "5.22.54")
+        "com.google.android.apps.youtube.music",
+        arrayOf(
+            "5.21.52",
+            "5.22.54",
+            "5.23.50",
+            "5.25.51",
+            "5.25.52",
+            "5.26.52",
+            "5.27.51",
+            "5.28.52",
+            "5.29.52",
+            "5.31.50",
+            "5.34.51",
+            "5.36.51",
+            "5.38.53",
+            "5.39.52",
+            "5.40.51"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/layout/tastebuilder/fingerprints/TasteBuilderConstructorFingerprint.kt

@@ -1,22 +1,13 @@
 package app.revanced.patches.music.layout.tastebuilder.fingerprints
 
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patches.music.layout.tastebuilder.annotations.RemoveTasteBuilderCompatibility
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("taste-builder-constructor-fingerprint")
-@MatchingMethod(
-    "Lkyu;", "<init>"
-)
+
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@RemoveTasteBuilderCompatibility
-@Version("0.0.1")
 object TasteBuilderConstructorFingerprint : MethodFingerprint(
     "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L"), listOf(
         Opcode.INVOKE_DIRECT,

src/main/kotlin/app/revanced/patches/music/layout/tastebuilder/patch/RemoveTasteBuilderPatch.kt

@@ -3,12 +3,12 @@ package app.revanced.patches.music.layout.tastebuilder.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.layout.tastebuilder.annotations.RemoveTasteBuilderCompatibility
 import app.revanced.patches.music.layout.tastebuilder.fingerprints.TasteBuilderConstructorFingerprint
 import org.jf.dexlib2.iface.instruction.formats.Instruction22c
@@ -23,11 +23,11 @@ class RemoveTasteBuilderPatch : BytecodePatch(
         TasteBuilderConstructorFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val result = TasteBuilderConstructorFingerprint.result!!
         val method = result.mutableMethod
 
-        val insertIndex = result.patternScanResult!!.endIndex - 8
+        val insertIndex = result.scanResult.patternScanResult!!.endIndex - 8
         val register = (method.implementation!!.instructions[insertIndex] as Instruction22c).registerA
         method.addInstructions(
             insertIndex, """

src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/annotations/RemoveUpgradeButtonCompatibility.kt

@@ -5,7 +5,27 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54")
+        "com.google.android.apps.youtube.music",
+        arrayOf(
+            "5.14.53",
+            "5.16.51",
+            "5.17.51",
+            "5.21.52",
+            "5.22.54",
+            "5.23.50",
+            "5.25.51",
+            "5.25.52",
+            "5.26.52",
+            "5.27.51",
+            "5.28.52",
+            "5.29.52",
+            "5.31.50",
+            "5.34.51",
+            "5.36.51",
+            "5.38.53",
+            "5.39.52",
+            "5.40.51"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/fingerprints/PivotBarConstructorFingerprint.kt

@@ -1,22 +1,13 @@
 package app.revanced.patches.music.layout.upgradebutton.fingerprints
 
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patches.music.layout.upgradebutton.annotations.RemoveUpgradeButtonCompatibility
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("pivot-bar-constructor-fingerprint")
-@MatchingMethod(
-    "Lhfu;", "<init2>"
-)
+
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@RemoveUpgradeButtonCompatibility
-@Version("0.0.1")
 object PivotBarConstructorFingerprint : MethodFingerprint(
     "V",
     AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,

src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/patch/RemoveUpgradeButtonPatch.kt

@@ -3,12 +3,12 @@ package app.revanced.patches.music.layout.upgradebutton.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.music.layout.upgradebutton.annotations.RemoveUpgradeButtonCompatibility
 import app.revanced.patches.music.layout.upgradebutton.fingerprints.PivotBarConstructorFingerprint
@@ -28,12 +28,12 @@ class RemoveUpgradeButtonPatch : BytecodePatch(
         PivotBarConstructorFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val result = PivotBarConstructorFingerprint.result!!
         val implementation = result.mutableMethod.implementation!!
 
         val pivotBarElementFieldRef =
-            (implementation.instructions[result.patternScanResult!!.endIndex - 1] as Instruction22c).reference
+            (implementation.instructions[result.scanResult.patternScanResult!!.endIndex - 1] as Instruction22c).reference
 
         val register = (implementation.instructions.first() as Instruction35c).registerC
         // first compile all the needed instructions
@@ -46,16 +46,18 @@ class RemoveUpgradeButtonPatch : BytecodePatch(
             """.toInstructions().toMutableList()
 
 
+        val endIndex = result.scanResult.patternScanResult!!.endIndex
+
         // replace the instruction to retain the label at given index
         implementation.replaceInstruction(
-            result.patternScanResult!!.endIndex - 1, instructionList[0] // invoke-interface
+            endIndex - 1, instructionList[0] // invoke-interface
         )
         // do not forget to remove this instruction since we added it already
         instructionList.removeFirst()
 
         val exitInstruction = instructionList.last() // iput-object
         implementation.addInstruction(
-            result.patternScanResult!!.endIndex, exitInstruction
+            endIndex, exitInstruction
         )
         // do not forget to remove this instruction since we added it already
         instructionList.removeLast()
@@ -64,12 +66,12 @@ class RemoveUpgradeButtonPatch : BytecodePatch(
         instructionList.add(
             2, // if-le
             BuilderInstruction22t(
-                Opcode.IF_LE, 1, 2, implementation.newLabelForIndex(result.patternScanResult!!.endIndex)
+                Opcode.IF_LE, 1, 2, implementation.newLabelForIndex(endIndex)
             )
         )
 
         implementation.addInstructions(
-            result.patternScanResult!!.endIndex, instructionList
+            endIndex, instructionList
         )
         return PatchResultSuccess()
     }

src/main/kotlin/app/revanced/patches/music/misc/microg/annotations/MusicMicroGPatchCompatibility.kt

@@ -5,7 +5,27 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54")
+        "com.google.android.apps.youtube.music",
+        arrayOf(
+            "5.14.53",
+            "5.16.51",
+            "5.17.51",
+            "5.21.52",
+            "5.22.54",
+            "5.23.50",
+            "5.25.51",
+            "5.25.52",
+            "5.26.52",
+            "5.27.51",
+            "5.28.52",
+            "5.29.52",
+            "5.31.50",
+            "5.34.51",
+            "5.36.51",
+            "5.38.53",
+            "5.39.52",
+            "5.40.51"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastContextFetchFingerprint.kt

@@ -1,19 +1,8 @@
 package app.revanced.patches.music.misc.microg.fingerprints
 
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
 
-@Name("cast-context-fetch-fingerprint")
-@MatchingMethod(
-    "Lvvz;", "a"
-)
-@DirectPatternScanMethod
-@MicroGPatchCompatibility
-@Version("0.0.1")
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
 object CastContextFetchFingerprint : MethodFingerprint(
     strings = listOf("Error fetching CastContext.")
 )

src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt

@@ -1,19 +1,8 @@
 package app.revanced.patches.music.misc.microg.fingerprints
 
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
 
-@Name("cast-module-fingerprint")
-@MatchingMethod(
-    "Llqh;", "c"
-)
-@DirectPatternScanMethod
-@MicroGPatchCompatibility
-@Version("0.0.1")
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
 object CastDynamiteModuleFingerprint : MethodFingerprint(
     strings = listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
 )

src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt

@@ -1,19 +1,8 @@
 package app.revanced.patches.music.misc.microg.fingerprints
 
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
 
-@Name("cast-context-fetch-fingerprint")
-@MatchingMethod(
-    "Lmcf;", "c"
-)
-@DirectPatternScanMethod
-@MicroGPatchCompatibility
-@Version("0.0.1")
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
 object CastDynamiteModuleV2Fingerprint : MethodFingerprint(
     strings = listOf("Failed to load module via V2: ")
 )

src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt

@@ -1,21 +1,9 @@
 package app.revanced.patches.music.misc.microg.fingerprints
 
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
 import org.jf.dexlib2.AccessFlags
 
-@Name("google-play-utility-fingerprint")
-@MatchingMethod(
-    "Lnuv;", "b"
-)
-@DirectPatternScanMethod
-@MusicMicroGPatchCompatibility
-@Version("0.0.1")
 object GooglePlayUtilityFingerprint : MethodFingerprint(
     "I",
     AccessFlags.PUBLIC or AccessFlags.STATIC,

src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/PrimeFingerprint.kt

@@ -1,19 +1,8 @@
 package app.revanced.patches.music.misc.microg.fingerprints
 
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
 
-@Name("google-play-prime-fingerprint")
-@MatchingMethod(
-    "Lrwi;", "a"
-)
-@DirectPatternScanMethod
-@MusicMicroGPatchCompatibility
-@Version("0.0.1")
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
 object PrimeFingerprint : MethodFingerprint(
     strings = listOf("com.google.android.GoogleCamera", "com.android.vending")
 )

src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/ServiceCheckFingerprint.kt

@@ -1,21 +1,12 @@
 package app.revanced.patches.music.misc.microg.fingerprints
 
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
 import org.jf.dexlib2.AccessFlags
 
-@Name("google-play-service-checker-fingerprint")
-@MatchingMethod(
-    "Lnuv;", "d"
-)
+
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@MusicMicroGPatchCompatibility
-@Version("0.0.1")
 object ServiceCheckFingerprint : MethodFingerprint(
     "V",
     AccessFlags.PUBLIC or AccessFlags.STATIC,

src/main/kotlin/app/revanced/patches/music/misc/microg/patch/bytecode/MusicMicroGBytecodePatch.kt

@@ -1,37 +1,27 @@
 package app.revanced.patches.music.misc.microg.patch.bytecode
 
-import app.revanced.extensions.equalsAny
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
-import app.revanced.patches.music.misc.microg.patch.resource.MusicMicroGResourcePatch
-import app.revanced.patches.youtube.misc.microg.patch.resource.enum.StringReplaceMode
-import app.revanced.patches.music.misc.microg.shared.Constants.BASE_MICROG_PACKAGE_NAME
-import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_PACKAGE_NAME
 import app.revanced.patches.music.misc.microg.fingerprints.*
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.builder.MutableMethodImplementation
-import org.jf.dexlib2.builder.instruction.BuilderInstruction21c
-import org.jf.dexlib2.iface.instruction.formats.Instruction21c
-import org.jf.dexlib2.iface.reference.StringReference
-import org.jf.dexlib2.immutable.reference.ImmutableStringReference
+import app.revanced.patches.music.misc.microg.patch.resource.MusicMicroGResourcePatch
+import app.revanced.patches.music.misc.microg.shared.Constants.MUSIC_PACKAGE_NAME
+import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_PACKAGE_NAME
+import app.revanced.patches.youtube.misc.microg.shared.Constants
+import app.revanced.util.microg.MicroGBytecodeHelper
 
 @Patch
 @DependsOn([MusicMicroGResourcePatch::class])
 @Name("music-microg-support")
 @Description("Allows YouTube Music ReVanced to run without root and under a different package name.")
 @MusicMicroGPatchCompatibility
-@Version("0.0.1")
+@Version("0.0.2")
 class MusicMicroGBytecodePatch : BytecodePatch(
     listOf(
         ServiceCheckFingerprint,
@@ -42,130 +32,34 @@ class MusicMicroGBytecodePatch : BytecodePatch(
         PrimeFingerprint,
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
-        disablePlayServiceChecks()
-        data.classes.forEach { classDef ->
-            var proxiedClass: MutableClass? = null
-
-            classDef.methods.forEach methodLoop@{ method ->
-                val implementation = method.implementation ?: return@methodLoop
-
-                var proxiedImplementation: MutableMethodImplementation? = null
-
-                implementation.instructions.forEachIndexed { i, instruction ->
-                    if (instruction.opcode != Opcode.CONST_STRING) return@forEachIndexed
-
-                    val stringValue = ((instruction as Instruction21c).reference as StringReference).string
-
-                    val replaceMode = if (stringValue.equalsAny(
-                            "com.google.android.gms",
-                            "com.google.android.gms.chimera",
-                            "com.google.android.c2dm.intent.REGISTER",
-                            "com.google.android.c2dm.permission.SEND",
-                            "com.google.iid.TOKEN_REQUEST",
-                            "com.google",
-                            "com.google.android.gms.chimera.GmsIntentOperationService",
-                            "com.google.android.gms.phenotype.internal.IPhenotypeCallbacks",
-                            "com.google.android.gms.phenotype.internal.IPhenotypeService",
-                            "com.google.android.gms.phenotype.service.START",
-                            "com.google.android.gms.phenotype.PACKAGE_NAME",
-                            "com.google.android.gms.phenotype.UPDATE",
-                            "com.google.android.gms.phenotype",
-                            "com.google.android.gms.auth.accounts",
-                            "com.google.android.c2dm.intent.REGISTRATION",
-                            "com.google.android.gsf.action.GET_GLS",
-                            "com.google.android.gsf.login",
-                            "content://com.google.settings/partner",
-                            "content://com.google.android.gms.phenotype/",
-                            "content://com.google.android.gsf.gservices",
-                            "content://com.google.android.gsf.gservices/prefix",
-                            "com.google.android.c2dm.intent.RECEIVE"
-                        )
-                    ) {
-                        StringReplaceMode.REPLACE_WITH_MICROG
-                    } else if (stringValue.equalsAny(
-                            "com.google.android.apps.youtube.music.SuggestionsProvider", "com.google.android.apps.youtube.music.fileprovider"
-                        )
-                    ) {
-                        StringReplaceMode.REPLACE_WITH_REVANCED
-                    } else {
-                        StringReplaceMode.DO_NOT_REPLACE
-                    }
-
-                    if (replaceMode != StringReplaceMode.DO_NOT_REPLACE) {
-                        if (proxiedClass == null) {
-                            proxiedClass = data.proxy(classDef).resolve()
-                        }
-
-                        if (proxiedImplementation == null) {
-                            proxiedImplementation = proxiedClass!!.methods.first {
-                                it.name == method.name && it.parameterTypes.containsAll(method.parameterTypes)
-                            }.implementation!!
-                        }
-
-                        val newString = if (replaceMode == StringReplaceMode.REPLACE_WITH_REVANCED) stringValue.replace(
-                            "com.google.android.apps.youtube.music", REVANCED_MUSIC_PACKAGE_NAME
-                        )
-                        else stringValue.replace("com.google", BASE_MICROG_PACKAGE_NAME)
-
-                        proxiedImplementation!!.replaceInstruction(
-                            i, BuilderInstruction21c(
-                                Opcode.CONST_STRING, instruction.registerA, ImmutableStringReference(newString)
-                            )
-                        )
-                    }
-                }
-            }
-        }
-
-        return PatchResultSuccess()
-    }
-
-    private fun disablePlayServiceChecks() {
-        listOf(
-            ServiceCheckFingerprint,
-            GooglePlayUtilityFingerprint,
-            CastDynamiteModuleFingerprint,
-            CastDynamiteModuleV2Fingerprint,
-            CastContextFetchFingerprint,
-        ).forEach { fingerprint ->
-            val result = fingerprint.result!!
-            val stringInstructions = when (result.method.returnType.first()) {
-                'L' -> """
-                        const/4 v0, 0x0
-                        return-object v0
-                        """
-
-                'V' -> "return-void"
-                'I' -> """
-                        const/4 v0, 0x0
-                        return v0
-                        """
-
-                else -> throw Exception("This case should never happen.")
-            }
-            result.mutableMethod.addInstructions(
-                0, stringInstructions
+    // NOTE: the previous patch also replaced the following strings, but it seems like they are not needed:
+    // - "com.google.android.gms.chimera.GmsIntentOperationService",
+    // - "com.google.android.gms.phenotype.internal.IPhenotypeCallbacks",
+    // - "com.google.android.gms.phenotype.internal.IPhenotypeService",
+    // - "com.google.android.gms.phenotype.PACKAGE_NAME",
+    // - "com.google.android.gms.phenotype.UPDATE",
+    // - "com.google.android.gms.phenotype",
+    override fun execute(context: BytecodeContext) =
+        // apply common microG patch
+        MicroGBytecodeHelper.patchBytecode(
+            context,
+            arrayOf(
+                MicroGBytecodeHelper.packageNameTransform(
+                    Constants.PACKAGE_NAME,
+                    Constants.REVANCED_PACKAGE_NAME
+                )
+            ),
+            MicroGBytecodeHelper.PrimeMethodTransformationData(
+                PrimeFingerprint,
+                MUSIC_PACKAGE_NAME,
+                REVANCED_MUSIC_PACKAGE_NAME
+            ),
+            listOf(
+                ServiceCheckFingerprint,
+                GooglePlayUtilityFingerprint,
+                CastDynamiteModuleFingerprint,
+                CastDynamiteModuleV2Fingerprint,
+                CastContextFetchFingerprint
             )
-        }
-
-        val primeMethod = PrimeFingerprint.result!!.mutableMethod
-        val implementation = primeMethod.implementation!!
-
-        var register = 2
-        val index = implementation.instructions.indexOfFirst {
-            if (it.opcode != Opcode.CONST_STRING) return@indexOfFirst false
-
-            val instructionString = ((it as Instruction21c).reference as StringReference).string
-            if (instructionString != "com.google.android.apps.youtube.music") return@indexOfFirst false
-
-            register = it.registerA
-            return@indexOfFirst true
-        }
-
-        primeMethod.replaceInstruction(
-            index, "const-string v$register, \"$REVANCED_MUSIC_PACKAGE_NAME\""
-        )
-
-    }
+        ).let { PatchResultSuccess() }
 }

src/main/kotlin/app/revanced/patches/music/misc/microg/patch/resource/MusicMicroGResourcePatch.kt

@@ -1,44 +1,41 @@
-package app.revanced.patches.music.misc.microg.patch.resource
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.ResourceData
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.impl.ResourcePatch
-import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
-import app.revanced.patches.music.misc.microg.shared.Constants.BASE_MICROG_PACKAGE_NAME
-import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_APP_NAME
-import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_PACKAGE_NAME
-
-@Name("music-microg-resource-patch")
-@Description("Resource patch to allow YouTube Music ReVanced to run without root and under a different package name.")
-@MusicMicroGPatchCompatibility
-@Version("0.0.1")
-class MusicMicroGResourcePatch : ResourcePatch() {
-    override fun execute(data: ResourceData): PatchResult {
-
-        val manifest = data["AndroidManifest.xml"].readText()
-
-        data["AndroidManifest.xml"].writeText(
-            manifest.replace(
-                "package=\"com.google.android.apps.youtube.music", "package=\"$REVANCED_MUSIC_PACKAGE_NAME"
-            ).replace(
-                "android:label=\"@string/app_name", "android:label=\"$REVANCED_MUSIC_APP_NAME"
-            ).replace(
-                "android:label=\"@string/app_launcher_name", "android:label=\"$REVANCED_MUSIC_APP_NAME"
-            ).replace(
-                "android:authorities=\"com.google.android.apps.youtube.music", "android:authorities=\"$REVANCED_MUSIC_PACKAGE_NAME"
-            ).replace(
-                "com.google.android.apps.youtube.music.permission.C2D_MESSAGE", "$REVANCED_MUSIC_PACKAGE_NAME.permission.C2D_MESSAGE"
-            ).replace(
-                "com.google.android.c2dm", "$BASE_MICROG_PACKAGE_NAME.android.c2dm"
-            ).replace(
-                "</queries>", "<package android:name=\"$BASE_MICROG_PACKAGE_NAME.android.gms\"/></queries>"
-            )
-        )
-
-        return PatchResultSuccess()
-    }
+package app.revanced.patches.music.misc.microg.patch.resource
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
+import app.revanced.patches.music.misc.microg.shared.Constants.MUSIC_PACKAGE_NAME
+import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_APP_NAME
+import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_PACKAGE_NAME
+import app.revanced.patches.music.misc.microg.shared.Constants.SPOOFED_PACKAGE_NAME
+import app.revanced.patches.music.misc.microg.shared.Constants.SPOOFED_PACKAGE_SIGNATURE
+import app.revanced.util.microg.MicroGManifestHelper
+import app.revanced.util.microg.MicroGResourceHelper
+
+@Name("music-microg-resource-patch")
+@Description("Resource patch to allow YouTube Music ReVanced to run without root and under a different package name.")
+@MusicMicroGPatchCompatibility
+@Version("0.0.2")
+class MusicMicroGResourcePatch : ResourcePatch {
+    override fun execute(context: ResourceContext): PatchResult {
+        // update manifest
+        MicroGResourceHelper.patchManifest(
+            context,
+            MUSIC_PACKAGE_NAME,
+            REVANCED_MUSIC_PACKAGE_NAME,
+            REVANCED_MUSIC_APP_NAME
+        )
+
+        // add metadata to the manifest
+        MicroGManifestHelper.addSpoofingMetadata(
+            context,
+            SPOOFED_PACKAGE_NAME,
+            SPOOFED_PACKAGE_SIGNATURE
+        )
+        return PatchResultSuccess()
+    }
 }

src/main/kotlin/app/revanced/patches/music/misc/microg/shared/Constants.kt

@@ -1,7 +1,9 @@
 package app.revanced.patches.music.misc.microg.shared
 
 object Constants {
-    internal const val BASE_MICROG_PACKAGE_NAME = "com.mgoogle"
-    internal const val REVANCED_MUSIC_APP_NAME = "YouTube Music ReVanced"
+    internal const val REVANCED_MUSIC_APP_NAME = "YT Music ReVanced"
     internal const val REVANCED_MUSIC_PACKAGE_NAME = "app.revanced.android.apps.youtube.music"
-}
+    internal const val MUSIC_PACKAGE_NAME = "com.google.android.apps.youtube.music"
+    internal const val SPOOFED_PACKAGE_NAME = MUSIC_PACKAGE_NAME
+    internal const val SPOOFED_PACKAGE_SIGNATURE = "afb0fed5eeaebdd86f56a97742f4b6b33ef59875"
+}

src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/annotations/BackgroundPlayCompatibility.kt

@@ -5,7 +5,27 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51", "5.21.52", "5.22.54")
+        "com.google.android.apps.youtube.music",
+        arrayOf(
+            "5.14.53",
+            "5.16.51",
+            "5.17.51",
+            "5.21.52",
+            "5.22.54",
+            "5.23.50",
+            "5.25.51",
+            "5.25.52",
+            "5.26.52",
+            "5.27.51",
+            "5.28.52",
+            "5.29.52",
+            "5.31.50",
+            "5.34.51",
+            "5.36.51",
+            "5.38.53",
+            "5.39.52",
+            "5.40.51"
+        )
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/fingerprints/BackgroundPlaybackDisableFingerprint.kt

@@ -1,22 +1,13 @@
 package app.revanced.patches.music.premium.backgroundplay.fingerprints
 
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patches.music.premium.backgroundplay.annotations.BackgroundPlayCompatibility
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("background-playback-disabler-fingerprint")
-@MatchingMethod(
-    "Lafgf;", "e"
-)
+
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@BackgroundPlayCompatibility
-@Version("0.0.1")
 object BackgroundPlaybackDisableFingerprint : MethodFingerprint(
     "Z", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L"), listOf(
         Opcode.CONST_4,

src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/patch/BackgroundPlayPatch.kt

@@ -3,12 +3,12 @@ package app.revanced.patches.music.premium.backgroundplay.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.premium.backgroundplay.annotations.BackgroundPlayCompatibility
 import app.revanced.patches.music.premium.backgroundplay.fingerprints.BackgroundPlaybackDisableFingerprint
 
@@ -22,7 +22,7 @@ class BackgroundPlayPatch : BytecodePatch(
         BackgroundPlaybackDisableFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         BackgroundPlaybackDisableFingerprint.result!!.mutableMethod.addInstructions(
             0,
             """

src/main/kotlin/app/revanced/patches/myexpenses/misc/pro/annotations/UnlockProCompatibility.kt

@@ -0,0 +1,9 @@
+package app.revanced.patches.myexpenses.misc.pro.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("org.totschnig.myexpenses")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class UnlockProCompatibility

src/main/kotlin/app/revanced/patches/myexpenses/misc/pro/fingerprints/IsEnabledFingerprint.kt

@@ -0,0 +1,8 @@
+package app.revanced.patches.myexpenses.misc.pro.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object IsEnabledFingerprint : MethodFingerprint(
+    "Z",
+    strings = listOf("feature", "feature.licenceStatus")
+)

src/main/kotlin/app/revanced/patches/myexpenses/misc/pro/patch/UnlockProPatch.kt

@@ -0,0 +1,38 @@
+package app.revanced.patches.myexpenses.misc.pro.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.removeInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.myexpenses.misc.pro.annotations.UnlockProCompatibility
+import app.revanced.patches.myexpenses.misc.pro.fingerprints.IsEnabledFingerprint
+
+@Patch
+@Name("unlock-pro")
+@Description("Unlocks all professional features.")
+@UnlockProCompatibility
+@Version("0.0.1")
+class UnlockProPatch : BytecodePatch(
+    listOf(
+        IsEnabledFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        val method = IsEnabledFingerprint.result!!.mutableMethod
+        method.addInstructions(
+            0,
+            """
+                const/4 v0, 0x1
+                return v0
+            """
+        )
+        
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/nova/prime/annotations/UnlockPrimeCompatibility.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.nova.prime.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [
+        Package("com.teslacoilsw.launcher")
+    ]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class UnlockPrimeCompatibility

src/main/kotlin/app/revanced/patches/nova/prime/fingerprints/UnlockPrimeFingerprint.kt

@@ -0,0 +1,16 @@
+package app.revanced.patches.nova.prime.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.Opcode
+
+object UnlockPrimeFingerprint : MethodFingerprint(
+    "V",
+    opcodes = listOf(
+        Opcode.IPUT_OBJECT,
+        Opcode.CONST_STRING,
+        Opcode.CONST_4,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT
+    ),
+    strings = listOf("1")
+)