chore(release): 2.45.2 [skip ci]

## [2.45.2](https://github.com/revanced/revanced-patches/compare/v2.45.1...v2.45.2) (2022-08-28)

### Bug Fixes

* add `patches.json` as a release asset ([a0b2c89](589a7c01d1))

.github/ISSUE_TEMPLATE/bug-issue.yml

@@ -59,15 +59,3 @@ 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

@@ -0,0 +1,46 @@
+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

@@ -1,41 +0,0 @@
-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/release.yml

@@ -12,35 +12,28 @@ on:
 jobs:
   release:
     name: Release
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v2
         with:
           java-version: '17'
-          distribution: 'temurin'
+          distribution: 'adopt'
           cache: gradle
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 'latest'
-          cache: 'npm'
       - name: Setup Android SDK
-        uses: amyu/setup-android@v2
+        uses: android-actions/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 generateMeta
+        run: ./gradlew build clean generateMeta
+      - name: Install Android build-tools
+        run: sdkmanager "build-tools;32.0.0"
       - name: Setup semantic-release
-        run: npm install semantic-release @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D
+        run: npm install -g semantic-release @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -115,9 +115,3 @@ gradle-app.setting
 
 # Potentially copyrighted test APK
 *.apk
-
-# Ignore vscode config
-.vscode/
-
-# Dependency directories
-node_modules/

.idea/.gitignore

@@ -6,4 +6,3 @@
 /dataSources.local.xml
 # Editor-based HTTP Client requests
 /httpRequests/
-/kotlinc.xml

.releaserc

@@ -32,9 +32,6 @@
         "assets": [
           {
             "path": "build/libs/*.jar"
-          },
-          {
-            "path": "patches.json"
           }
         ]
       }

README-template.md

@@ -12,22 +12,16 @@ This section explains the JSON format for the [patches.json](patches.json) file.
 
 The file contains an array of objects, each object representing a patch. The object contains the following properties:
 
-| key                           | description                                                                                                                                                                           |
+| key                           | description                                                                                                      |
-|-------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|-------------------------------|------------------------------------------------------------------------------------------------------------------|
-| `name`                        | The name of the patch.                                                                                                                                                                |
+| `name`                        | The name of the patch.                                                                                           |
-| `description`                 | The description of the patch.                                                                                                                                                         |
+| `description`                 | The description of the patch.                                                                                    |
-| `version`                     | The version 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.                                                                                     |
+| `excluded`                    | Whether a patch is excluded by default. If `true`, the patch must never be included by default.                  |
-| `options`                     | An array of options for this patch.                                                                                                                                                   |
+| `dependencies`                | An array of dependencies, which are patch names.                                                                 |
-| `options.key`                 | The key of the option.                                                                                                                                                                |
+| `compatiblePackages`          | An array of packages compatible with this patch.                                                                 |
-| `options.title`               | The title of the option.                                                                                                                                                              |
+| `compatiblePackages.name`     | The name of the package.                                                                                         |
-| `options.description`         | The description of the option.                                                                                                                                                        |
+| `compatiblePackages.versions` | An array of versions of the package compatible with this patch. If empty, all versions are seemingly compatible. |
-| `options.required`            | Whether the option is required.                                                                                                                                                       |
-| `options.choices?`            | An array of choices of the option. This may be `null` if this option has no choices. The element type of this array may be any type. It can be a `String`, `Int` or something else.   |
-| `dependencies`                | An array of dependencies, which are patch names.                                                                                                                                      |
-| `compatiblePackages`          | An array of packages compatible with this patch.                                                                                                                                      |
-| `compatiblePackages.name`     | The name of the package.                                                                                                                                                              |
-| `compatiblePackages.versions` | An array of versions of the package compatible with this patch. If empty, all versions are seemingly compatible.                                                                      |
 
 Example:
 
@@ -38,7 +32,6 @@ Example:
     "description": "Adds the ability to remember the video quality you chose in the video quality flyout.",
     "version": "0.0.1",
     "excluded": false,
-    "options": [],
     "dependencies": [
       "integrations",
       "video-id-hook"
@@ -53,67 +46,24 @@ Example:
           "17.27.39",
           "17.28.34",
           "17.29.34",
-          "17.32.35",
+          "17.32.35"
-          "17.33.42"
         ]
       }
     ]
   },
   {
-    "name": "theme",
+    "name": "client-spoof",
-    "description": "Enables a custom theme.",
+    "description": "Spoofs the YouTube or Vanced client to prevent playback issues.",
     "version": "0.0.1",
     "excluded": false,
-    "deprecated": false,
+    "dependencies": [],
-    "options": [
-      {
-        "key": "theme",
-        "title": "Theme",
-        "description": "Select a theme.",
-        "required": true,
-        "choices": [
-          "Amoled"
-        ]
-      }
-    ],
-    "dependencies": [
-      "locale-config-fix"
-    ],
     "compatiblePackages": [
       {
         "name": "com.google.android.youtube",
         "versions": []
-      }
-    ]
-  },
-  {
-    "name": "custom-branding",
-    "description": "Changes the YouTube launcher icon and name to your choice (defaults to ReVanced).",
-    "version": "0.0.1",
-    "excluded": false,
-    "deprecated": false,
-    "options": [
-      {
-        "key": "appName",
-        "title": "Application Name",
-        "description": "The name of the application it will show on your home screen.",
-        "required": true,
-        "choices": null
       },
       {
-        "key": "appIconPath",
+        "name": "com.vanced.android.youtube",
-        "title": "Application Icon Path",
-        "description": "A path to the icon of the application.",
-        "required": false,
-        "choices": null
-      }
-    ],
-    "dependencies": [
-      "locale-config-fix"
-    ],
-    "compatiblePackages": [
-      {
-        "name": "com.google.android.youtube",
         "versions": []
       }
     ]

README.md

@@ -4,139 +4,11 @@ The official Patch bundle provided by ReVanced and the community.
 
 > Looking for the JSON variant of this? [Click here](patches.json).
 
-### 📦 `com.google.android.youtube`
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `always-autorepeat` | Always repeats the playing video again. | 17.45.36 |
-| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
-| `comments` | Hides components related to comments. | 17.45.36 |
-| `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.45.36 |
-| `custom-video-speed` | Adds more video speed options. | 17.45.36 |
-| `debugging` | Adds debugging options. | all |
-| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 17.45.36 |
-| `disable-auto-player-popup-panels` | Disable automatic popup panels (playlist or live chat) on video player. | 17.45.36 |
-| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 17.45.36 |
-| `disable-startup-shorts-player` | Disables playing YouTube Shorts when launching YouTube. | 17.45.36 |
-| `disable-zoom-haptics` | Disables haptics when zooming. | all |
-| `downloads` | Enables downloading music and videos from YouTube. | 17.45.36 |
-| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.45.36 |
-| `general-ads` | Removes general ads. | 17.45.36 |
-| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.45.36 |
-| `hide-album-cards` | Hides the album cards below the artist description. | 17.45.36 |
-| `hide-artist-card` | Hides the artist card below the searchbar. | 17.45.36 |
-| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.45.36 |
-| `hide-captions-button` | Hides the captions button on video player. | 17.45.36 |
-| `hide-cast-button` | Hides the cast button in the video player. | all |
-| `hide-create-button` | Hides the create button in the navigation bar. | 17.45.36 |
-| `hide-crowdfunding-box` | Hides the crowdfunding box between the player and video description. | 17.45.36 |
-| `hide-email-address` | Hides the email address in the account switcher. | 17.45.36 |
-| `hide-endscreen-cards` | Hides the suggested video cards at the end of a video in fullscreen. | 17.45.36 |
-| `hide-info-cards` | Hides info-cards in videos. | 17.45.36 |
-| `hide-my-mix` | Hides mix playlists. | 17.45.36 |
-| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.45.36 |
-| `hide-time-and-seekbar` | Hides progress bar and time counter on videos. | 17.45.36 |
-| `hide-video-buttons` | Adds options to hide action buttons under a video. | 17.45.36 |
-| `hide-watch-in-vr` | Hides the Watch in VR option from the player settings flyout panel. | 17.45.36 |
-| `hide-watermark` | Hides creator's watermarks on videos. | 17.45.36 |
-| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.45.36 |
-| `minimized-playback` | Enables minimized and background playback. | 17.45.36 |
-| `old-quality-layout` | Enables the original quality flyout menu. | 17.45.36 |
-| `open-links-directly` | Bypasses redirect links and allows opening links directly. | 17.45.36 |
-| `premium-heading` | Shows premium branding on the home screen. | all |
-| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.45.36 |
-| `remove-player-button-background` | Removes the background from the video player buttons. | 17.45.36 |
-| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.45.36 |
-| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.45.36 |
-| `settings` | Adds settings for ReVanced to YouTube. | all |
-| `sponsorblock` | Integrate SponsorBlock. | 17.45.36 |
-| `swipe-controls` | Adds volume and brightness swipe controls. | 17.45.36 |
-| `tablet-mini-player` | Enables the tablet mini player layout. | 17.45.36 |
-| `theme` | Applies a custom theme. | all |
-| `video-ads` | Removes ads in the video player. | 17.45.36 |
-</details>
-
-### 📦 `com.google.android.apps.youtube.music`
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `background-play` | Enables playing music in the background. | 5.34.51 |
-| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.34.51 |
-| `compact-header` | Hides the music category bar at the top of the homepage. | 5.34.51 |
-| `exclusive-audio-playback` | Enables the option to play music without video. | 5.34.51 |
-| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.34.51 |
-| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.34.51 |
-| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.34.51 |
-| `music-video-ads` | Removes ads in the music player. | 5.34.51 |
-| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.34.51 |
-| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.34.51 |
-</details>
-
-### 📦 `com.ss.android.ugc.trill`
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `disable-login-requirement` | Do not force login. | all |
-| `downloads` | Removes download restrictions and changes the default path to download to. | all |
-| `feed-filter` | Filters tiktok videos: removing ads, removing livestreams. | all |
-| `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 settings for ReVanced to TikTok. | all |
-| `show-seekbar` | Shows progress bar for all video. | all |
-| `sim-spoof` | Spoofs the information which is retrieved from the sim-card. | all |
-</details>
-
-### 📦 `com.zhiliaoapp.musically`
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `disable-login-requirement` | Do not force login. | all |
-| `downloads` | Removes download restrictions and changes the default path to download to. | all |
-| `feed-filter` | Filters tiktok videos: removing ads, removing livestreams. | all |
-| `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 settings for ReVanced to TikTok. | all |
-| `show-seekbar` | Shows progress bar for all video. | all |
-| `sim-spoof` | Spoofs the information which is retrieved from the sim-card. | all |
-</details>
-
-### 📦 `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.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.twitter.android`
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `dynamic-color` | Replaces the default Twitter Blue with the users Material You palette. | all |
-| `monochrome-icon` | Adds a monochrome icon. | all |
 | `timeline-ads` | Removes ads from the Twitter timeline. | all |
 </details>
 
@@ -146,31 +18,6 @@ The official Patch bundle provided by ReVanced and the community.
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
 | `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | all |
-| `premium-icon-reddit` | Unlocks premium Reddit app icons. | all |
-</details>
-
-### 📦 `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`
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `disable-ads` | Disables ads in HexEditor. | all |
-</details>
-
-### 📦 `com.crunchyroll.crunchyroid`
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `enable-downloads` | Enables downloads for Crunchyroll. | all |
 </details>
 
 ### 📦 `com.garzotto.pflotsh.ecmwf_a`
@@ -181,20 +28,21 @@ The official Patch bundle provided by ReVanced and the community.
 | `pflotsh-ecmwf-subscription-unlock` | Unlocks all subscription features. | 3.5.4 |
 </details>
 
-### 📦 `org.citra.citra_emu`
+### 📦 `com.google.android.apps.youtube.music`
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `premium-unlock` | Unlocks premium functions. | all |
+| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.17.51 |
-</details>
+| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.16.51 |
-
+| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.17.51 |
-### 📦 `com.backdrops.wallpapers`
+| `compact-header` | Hides the music category bar at the top of the homepage. | 5.16.51 |
-<details>
+| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.17.51 |
-
+| `background-play` | Enables playing music in the background. | 5.17.51 |
-| 💊 Patch | 📜 Description | 🏹 Target Version |
+| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.17.51 |
-|:--------:|:--------------:|:-----------------:|
+| `music-video-ads` | Removes ads in the music player. | 5.17.51 |
-| `pro-unlock` | Unlocks pro-only functions. | all |
+| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.17.51 |
+| `exclusive-audio-playback` | Enables the option to play music without video. | 5.17.51 |
 </details>
 
 ### 📦 `de.dwd.warnapp`
@@ -205,68 +53,49 @@ 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.shervinkoushan.anyTracker`
+### 📦 `com.ss.android.ugc.trill`
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `unlock-premium` | Unlocks all premium features. | all |
+| `tiktok-ads` | Removes ads from TikTok. | all |
 </details>
 
-### 📦 `com.urbandroid.sleep`
+### 📦 `com.google.android.youtube`
 <details>
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `unlock-premium` | Unlocks all premium features. | all |
+| `swipe-controls` | Adds volume and brightness swipe controls. | 17.32.35 |
-</details>
+| `downloads` | Enables downloading music and videos from YouTube. | 17.32.35 |
-
+| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.32.35 |
-### 📦 `com.awedea.nyx`
+| `amoled` | Enables pure black theme. | 17.32.35 |
-<details>
+| `disable-create-button` | Hides the create button in the navigation bar. | 17.32.35 |
-
+| `hide-cast-button` | Hides the cast button in the video player. | all |
-| 💊 Patch | 📜 Description | 🏹 Target Version |
+| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.32.35 |
-|:--------:|:--------------:|:-----------------:|
+| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.32.35 |
-| `unlock-pro` | Unlocks all pro features. | all |
+| `premium-heading` | Shows premium branding on the home screen. | all |
-</details>
+| `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.32.35 |
-### 📦 `co.windyapp.android`
+| `old-quality-layout` | Enables the original quality flyout menu. | 17.32.35 |
-<details>
+| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.32.35 |
-
+| `hide-watermark` | Hides creator's watermarks on videos. | 17.32.35 |
-| 💊 Patch | 📜 Description | 🏹 Target Version |
+| `sponsorblock` | Integrate SponsorBlock. | 17.32.35 |
-|:--------:|:--------------:|:-----------------:|
+| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.32.35 |
-| `unlock-pro` | Unlocks all pro features. | all |
+| `tablet-mini-player` | Enables the tablet mini player layout. | 17.32.35 |
-</details>
+| `minimized-playback` | Enables minimized and background playback. | 17.32.35 |
-
+| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
-### 📦 `org.totschnig.myexpenses`
+| `custom-video-buffer` | Lets you change the buffers of videos. | 17.32.35 |
-<details>
+| `always-autorepeat` | Always repeats the playing video again. | 17.32.35 |
-
+| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.32.35 |
-| 💊 Patch | 📜 Description | 🏹 Target Version |
+| `settings` | Adds settings for ReVanced to YouTube. | all |
-|:--------:|:--------------:|:-----------------:|
+| `enable-debugging` | Enables app debugging by patching the manifest file. | all |
-| `unlock-pro` | Unlocks all professional features. | all |
+| `custom-playback-speed` | Adds more video playback speed options. | 17.32.35 |
-</details>
+| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.32.35 |
-
+| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.32.35 |
-### 📦 `com.ithebk.expensemanager`
+| `video-ads` | Removes ads in the video player. | 17.32.35 |
-<details>
+| `general-ads` | Removes general ads. | 17.32.35 |
-
+| `hide-infocard-suggestions` | Hides infocards in videos. | 17.32.35 |
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks pro features. | all |
-</details>
-
-### 📦 `ginlemon.iconpackstudio`
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks all pro features. | all |
-</details>
-
-### 📦 `com.ticktick.task`
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-themes` | Unlocks all themes. | all |
 </details>
 
 
@@ -277,22 +106,16 @@ This section explains the JSON format for the [patches.json](patches.json) file.
 
 The file contains an array of objects, each object representing a patch. The object contains the following properties:
 
-| key                           | description                                                                                                                                                                           |
+| key                           | description                                                                                                      |
-|-------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|-------------------------------|------------------------------------------------------------------------------------------------------------------|
-| `name`                        | The name of the patch.                                                                                                                                                                |
+| `name`                        | The name of the patch.                                                                                           |
-| `description`                 | The description of the patch.                                                                                                                                                         |
+| `description`                 | The description of the patch.                                                                                    |
-| `version`                     | The version 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.                                                                                     |
+| `excluded`                    | Whether a patch is excluded by default. If `true`, the patch must never be included by default.                  |
-| `options`                     | An array of options for this patch.                                                                                                                                                   |
+| `dependencies`                | An array of dependencies, which are patch names.                                                                 |
-| `options.key`                 | The key of the option.                                                                                                                                                                |
+| `compatiblePackages`          | An array of packages compatible with this patch.                                                                 |
-| `options.title`               | The title of the option.                                                                                                                                                              |
+| `compatiblePackages.name`     | The name of the package.                                                                                         |
-| `options.description`         | The description of the option.                                                                                                                                                        |
+| `compatiblePackages.versions` | An array of versions of the package compatible with this patch. If empty, all versions are seemingly compatible. |
-| `options.required`            | Whether the option is required.                                                                                                                                                       |
-| `options.choices?`            | An array of choices of the option. This may be `null` if this option has no choices. The element type of this array may be any type. It can be a `String`, `Int` or something else.   |
-| `dependencies`                | An array of dependencies, which are patch names.                                                                                                                                      |
-| `compatiblePackages`          | An array of packages compatible with this patch.                                                                                                                                      |
-| `compatiblePackages.name`     | The name of the package.                                                                                                                                                              |
-| `compatiblePackages.versions` | An array of versions of the package compatible with this patch. If empty, all versions are seemingly compatible.                                                                      |
 
 Example:
 
@@ -303,7 +126,6 @@ Example:
     "description": "Adds the ability to remember the video quality you chose in the video quality flyout.",
     "version": "0.0.1",
     "excluded": false,
-    "options": [],
     "dependencies": [
       "integrations",
       "video-id-hook"
@@ -318,67 +140,24 @@ Example:
           "17.27.39",
           "17.28.34",
           "17.29.34",
-          "17.32.35",
+          "17.32.35"
-          "17.33.42"
         ]
       }
     ]
   },
   {
-    "name": "theme",
+    "name": "client-spoof",
-    "description": "Enables a custom theme.",
+    "description": "Spoofs the YouTube or Vanced client to prevent playback issues.",
     "version": "0.0.1",
     "excluded": false,
-    "deprecated": false,
+    "dependencies": [],
-    "options": [
-      {
-        "key": "theme",
-        "title": "Theme",
-        "description": "Select a theme.",
-        "required": true,
-        "choices": [
-          "Amoled"
-        ]
-      }
-    ],
-    "dependencies": [
-      "locale-config-fix"
-    ],
     "compatiblePackages": [
       {
         "name": "com.google.android.youtube",
         "versions": []
-      }
-    ]
-  },
-  {
-    "name": "custom-branding",
-    "description": "Changes the YouTube launcher icon and name to your choice (defaults to ReVanced).",
-    "version": "0.0.1",
-    "excluded": false,
-    "deprecated": false,
-    "options": [
-      {
-        "key": "appName",
-        "title": "Application Name",
-        "description": "The name of the application it will show on your home screen.",
-        "required": true,
-        "choices": null
       },
       {
-        "key": "appIconPath",
+        "name": "com.vanced.android.youtube",
-        "title": "Application Icon Path",
-        "description": "A path to the icon of the application.",
-        "required": false,
-        "choices": null
-      }
-    ],
-    "dependencies": [
-      "locale-config-fix"
-    ],
-    "compatiblePackages": [
-      {
-        "name": "com.google.android.youtube",
         "versions": []
       }
     ]

build.gradle.kts

@@ -20,10 +20,13 @@ repositories {
 }
 
 dependencies {
-    implementation("app.revanced:revanced-patcher:6.3.0")
+    implementation(kotlin("stdlib"))
+
+    implementation("app.revanced:revanced-patcher:3.3.3")
     implementation("app.revanced:multidexlib2:2.5.2.r2")
+
     // Required for meta
-    implementation("com.google.code.gson:gson:2.10")
+    implementation("com.google.code.gson:gson:2.9.1")
 }
 
 tasks {
@@ -33,7 +36,7 @@ tasks {
 
         doLast {
             val androidHome = System.getenv("ANDROID_HOME") ?: throw GradleException("ANDROID_HOME not found")
-            val d8 = "${androidHome}/build-tools/33.0.1/d8"
+            val d8 = "${androidHome}/build-tools/32.0.0/d8"
             val input = configurations.archives.get().allArtifacts.files.files.first().absolutePath
             val work = File("${buildDir}/libs")
 

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.141.0-dev.2
+version = 2.45.2

package.json

@@ -1,8 +0,0 @@
-{
-  "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,31 +1,32 @@
 package app.revanced.extensions
 
-import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.data.impl.BytecodeData
-import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
+import app.revanced.patcher.data.impl.ResourceData
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import org.jf.dexlib2.iface.Method
+import app.revanced.patcher.util.smali.toInstruction
-import org.jf.dexlib2.util.MethodUtil
+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.w3c.dom.Node
+import java.nio.file.Files
 
-// TODO: populate this to all patches
+// TODO: this method does not make sense here
-/**
+internal fun MutableMethodImplementation.injectHideCall(
- * Convert a [MethodFingerprint] to a [PatchResultError].
+    index: Int,
- *
+    register: Int
- * @return A [PatchResultError] for the [MethodFingerprint].
+) {
- */
+    this.addInstruction(
-fun MethodFingerprint.toErrorResult() = PatchResultError("Failed to resolve $name")
+        index,
-
+        "invoke-static { v$register }, Lapp/revanced/integrations/patches/HideHomeAdsPatch;->HideHomeAds(Landroid/view/View;)V".toInstruction()
-/**
+    )
- * Find the [MutableMethod] from a given [Method] in a [MutableClass].
- *
- * @param method The [Method] to find.
- * @return The [MutableMethod].
- */
-fun MutableClass.findMutableMethodOf(method: Method) = this.methods.first {
-    MethodUtil.methodSignaturesMatch(it, method)
 }
 
 /**
@@ -34,9 +35,9 @@ fun MutableClass.findMutableMethodOf(method: Method) = this.methods.first {
  * @param targetClass the class to start traversing the class hierarchy from
  * @param callback function that is called for every class in the hierarchy
  */
-fun BytecodeContext.traverseClassHierarchy(targetClass: MutableClass, callback: MutableClass.() -> Unit) {
+fun BytecodeData.traverseClassHierarchy(targetClass: MutableClass, callback: MutableClass.() -> Unit) {
     callback(targetClass)
-    this.findClass(targetClass.superclass ?: return)?.mutableClass?.let {
+    this.findClass(targetClass.superclass ?: return)?.resolve()?.let {
         traverseClassHierarchy(it, callback)
     }
 }
@@ -52,7 +53,160 @@ 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/Meta.kt

@@ -2,12 +2,12 @@ package app.revanced.meta
 
 import app.revanced.meta.json.generateJson
 import app.revanced.meta.readme.generateText
-import app.revanced.patcher.data.Context
+import app.revanced.patcher.data.Data
 import app.revanced.patcher.patch.Patch
-import app.revanced.patcher.util.patch.PatchBundle
+import app.revanced.patcher.util.patch.impl.JarPatchBundle
 import java.io.File
 
-typealias Bundle = List<Class<out Patch<Context>>>
+typealias Bundle = List<Class<out Patch<Data>>>
 
 object Meta {
     @JvmStatic
@@ -20,7 +20,7 @@ object Meta {
     }
 }
 
-fun accumulatePatches() = PatchBundle.Jar(
+fun accumulatePatches() = JarPatchBundle(
     File("build/libs/").listFiles()!!.first {
         it.name.startsWith("revanced-patches-") && it.name.endsWith(".jar")
     }.absolutePath

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

@@ -5,14 +5,12 @@ 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.Gson
-import com.google.gson.GsonBuilder
 import java.io.File
 
-private val gson = GsonBuilder().serializeNulls().create()
+private val gson = Gson()
 
 fun generateJson(bundle: Bundle) {
     val patches = bundle.map {
@@ -21,19 +19,6 @@ fun generateJson(bundle: Bundle) {
             it.description ?: "This patch has no description.",
             it.version ?: "0.0.0",
             !it.include,
-            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(),

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

@@ -7,7 +7,6 @@ data class JsonPatch(
     val description: String,
     val version: String,
     val excluded: Boolean,
-    val options: Array<Option>,
     val dependencies: Array<String>,
     val compatiblePackages: Array<CompatiblePackage>,
 )
@@ -16,11 +15,3 @@ 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 +1,10 @@
 package app.revanced.meta.readme
 
-import app.revanced.patcher.data.Context
+import app.revanced.patcher.data.Data
 import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
 import app.revanced.patcher.patch.Patch
 
-internal fun Class<out Patch<Context>>.getLatestVersion() =
+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,7 +1,7 @@
 package app.revanced.meta.readme
 
 import app.revanced.meta.Bundle
-import app.revanced.patcher.data.Context
+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
@@ -15,16 +15,18 @@ private val TABLE_REGEX = Regex("\\{\\{\\s?table\\s?}}")
 
 fun generateText(bundle: Bundle) {
     val output = StringBuilder()
-    val packages = mutableMapOf<String, MutableList<Class<out Patch<Context>>>>()
+    val packages = mutableMapOf<String, MutableList<Class<out Patch<Data>>>>()
 
-    for (patch in bundle) {
+    bundle.map {
-        patch.compatiblePackages?.forEach { pkg ->
+        val packageName = it.compatiblePackages?.first()?.name!!
-            if (!packages.contains(pkg.name)) packages[pkg.name] = mutableListOf()
+        if (!packages.contains(packageName)) {
-            packages[pkg.name]!!.add(patch)
+            packages[packageName] = mutableListOf()
         }
+
+        packages[packageName]?.add(it)
     }
 
-    for (pkg in packages.entries.sortedByDescending { it.value.size }) {
+    for (pkg in packages) {
         output.appendLine("### \uD83D\uDCE6 `${pkg.key}`")
         output.appendLine("<details>\n")
 

src/main/kotlin/app/revanced/patches/anytracker/misc/premium/annotations/UnlockPremiumCompatibility.kt

@@ -1,9 +0,0 @@
-package app.revanced.patches.anytracker.misc.premium.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.shervinkoushan.anyTracker")])
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-internal annotation class UnlockPremiumCompatibility

src/main/kotlin/app/revanced/patches/anytracker/misc/premium/fingerprints/IsPurchasedFlowFingerprint.kt

@@ -1,8 +0,0 @@
-package app.revanced.patches.anytracker.misc.premium.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object IsPurchasedFlowFingerprint : MethodFingerprint(
-    "Landroidx/lifecycle/LiveData",
-    strings = listOf("premium_user", "sku"),
-)

src/main/kotlin/app/revanced/patches/anytracker/misc/premium/patch/UnlockPremiumPatch.kt

@@ -1,48 +0,0 @@
-package app.revanced.patches.anytracker.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.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.anytracker.misc.premium.annotations.UnlockPremiumCompatibility
-import app.revanced.patches.anytracker.misc.premium.fingerprints.IsPurchasedFlowFingerprint
-
-@Patch
-@Name("unlock-premium")
-@Description("Unlocks all premium features.")
-@UnlockPremiumCompatibility
-@Version("0.0.1")
-class UnlockPremiumPatch : BytecodePatch(
-    listOf(
-        IsPurchasedFlowFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val method = IsPurchasedFlowFingerprint.result!!.mutableMethod
-        method.addInstructions(
-            0,
-            """
-            	const/4 v0, 0x1
-            	invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-            	move-result-object v0
-            	invoke-static {v0}, Lkotlinx/coroutines/flow/FlowKt;->flowOf(Ljava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
-            	move-result-object v1
-            	const/4 v2, 0x0
-            	const-wide/16 v3, 0x0
-            	const/4 v5, 0x3
-            	const/4 v6, 0x0
-            	invoke-static/range {v1 .. v6}, Landroidx/lifecycle/FlowLiveDataConversions;->asLiveData${'$'}default(Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/CoroutineContext;JILjava/lang/Object;)Landroidx/lifecycle/LiveData;
-            	move-result-object v0
-            	return-object v0
-            """
-        )
-
-        return PatchResultSuccess()
-    }
-}

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

@@ -1,7 +0,0 @@
-package app.revanced.patches.backdrops.misc.pro.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.backdrops.wallpapers")])
-internal annotation class ProUnlockCompatibility

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

@@ -1,15 +0,0 @@
-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

@@ -1,42 +0,0 @@
-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

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

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

@@ -1,7 +0,0 @@
-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

@@ -1,37 +0,0 @@
-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/crunchyroll/downloads/annotations/DownloadsCompatibility.kt

@@ -1,13 +0,0 @@
-package app.revanced.patches.crunchyroll.downloads.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [
-        Package("com.crunchyroll.crunchyroid")
-    ]
-)
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-internal annotation class DownloadsCompatibility

src/main/kotlin/app/revanced/patches/crunchyroll/downloads/fingerprints/DownloadsFingerprint.kt

@@ -1,23 +0,0 @@
-package app.revanced.patches.crunchyroll.downloads.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.patches.crunchyroll.downloads.annotations.DownloadsCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@Name("downloads-fingerprint")
-@DownloadsCompatibility
-@Version("0.0.1")
-object DownloadsFingerprint : MethodFingerprint(
-    "Z", AccessFlags.PUBLIC or AccessFlags.FINAL, null,
-    opcodes = listOf(
-        Opcode.CONST_STRING,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.RETURN
-    ),
-    strings = listOf("offline_viewing"),
-)

src/main/kotlin/app/revanced/patches/crunchyroll/downloads/patch/DownloadsPatch.kt

@@ -1,37 +0,0 @@
-package app.revanced.patches.crunchyroll.downloads.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.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.patches.crunchyroll.downloads.annotations.DownloadsCompatibility
-import app.revanced.patches.crunchyroll.downloads.fingerprints.DownloadsFingerprint
-
-@Patch
-@Name("enable-downloads")
-@Description("Enables downloads for Crunchyroll.")
-@DownloadsCompatibility
-@Version("0.0.1")
-class DownloadsPatch : BytecodePatch(
-    listOf(
-        DownloadsFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        with(DownloadsFingerprint.result!!.mutableMethod) {
-            val index = implementation!!.instructions.lastIndex
-            replaceInstruction(
-                index - 1,
-                """
-                   const/4 v0, 0x1 
-                """
-            )
-        }
-        return PatchResultSuccess()
-    }
-}

src/main/kotlin/app/revanced/patches/ecmwf/misc/subscription/annotations/SubscriptionUnlockCompatibility.kt

@@ -1,13 +0,0 @@
-package app.revanced.patches.ecmwf.misc.subscription.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [Package(
-        "com.garzotto.pflotsh.ecmwf_a", arrayOf("3.5.4")
-    )]
-)
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-internal annotation class SubscriptionUnlockCompatibility

src/main/kotlin/app/revanced/patches/ecmwf/misc/subscription/fingerprints/SubscriptionUnlockFingerprint.kt

@@ -1,9 +0,0 @@
-package app.revanced.patches.ecmwf.misc.subscription.fingerprints
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object SubscriptionUnlockFingerprint : MethodFingerprint(
-    "Z",
-    customFingerprint = { methodDef ->
-        methodDef.definingClass.endsWith("MapsActivity;") && methodDef.name == "t0"
-    }
-)

src/main/kotlin/app/revanced/patches/ecmwf/misc/subscription/patch/SubscriptionUnlockPatch.kt

@@ -1,47 +0,0 @@
-package app.revanced.patches.ecmwf.misc.subscription.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.ecmwf.misc.subscription.annotations.SubscriptionUnlockCompatibility
-import app.revanced.patches.ecmwf.misc.subscription.fingerprints.SubscriptionUnlockFingerprint
-
-@Patch
-@Name("pflotsh-ecmwf-subscription-unlock")
-@Description("Unlocks all subscription features.")
-@SubscriptionUnlockCompatibility
-@Version("0.0.1")
-class SubscriptionUnlockPatch : BytecodePatch(
-    listOf(
-        SubscriptionUnlockFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val result = SubscriptionUnlockFingerprint.result!!
-        val method = result.mutableMethod
-
-        val index = method.implementation!!.instructions.size
-
-        // remove R() at 10212
-        method.removeInstruction(index - 3)
-        // remove R() at 10206
-        method.removeInstruction(index - 5)
-
-        val insertIndex = index
-
-        method.addInstructions(
-            insertIndex - 1 - 2, 
-            """
-                const/4 p1, 0x1
-            """
-        )
-        return PatchResultSuccess()
-    }
-}

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

@@ -1,13 +0,0 @@
-package app.revanced.patches.hexeditor.ad.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [
-        Package("com.myprog.hexedit")
-    ]
-)
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-internal annotation class HexEditorAdsCompatibility

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

@@ -1,9 +0,0 @@
-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

@@ -1,39 +0,0 @@
-package app.revanced.patches.hexeditor.ad.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.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

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

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

@@ -1,8 +0,0 @@
-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

@@ -1,38 +0,0 @@
-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/moneymanager/annotations/UnlockProCompatibility.kt

@@ -1,9 +0,0 @@
-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

@@ -1,19 +0,0 @@
-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

@@ -1,34 +0,0 @@
-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,23 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music",
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51")
-        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"
-        )
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -1,11 +1,23 @@
 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.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 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,10 +1,22 @@
 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.BytecodeContext
+import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+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.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(context: BytecodeContext): PatchResult {
+    override fun execute(data: BytecodeData): PatchResult {
-        ShowMusicVideoAdsFingerprint.resolve(context, ShowMusicVideoAdsConstructorFingerprint.result!!.classDef)
+        ShowMusicVideoAdsFingerprint.resolve(data, ShowMusicVideoAdsConstructorFingerprint.result!!.classDef)
 
         val result = ShowMusicVideoAdsFingerprint.result!!
 
         result.mutableMethod.addInstructions(
-            result.scanResult.patternScanResult!!.startIndex, """
+            result.patternScanResult!!.startIndex, """
                 const/4 p1, 0x0
             """
         )

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

@@ -5,23 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music",
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51")
-        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"
-        )
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -1,13 +1,23 @@
 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.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.music.audio.codecs.annotations.CodecsUnlockCompatibility
 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,15 +1,25 @@
 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.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 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(
+    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, null, listOf(
         Opcode.INVOKE_DIRECT,
         Opcode.INVOKE_VIRTUAL,
         Opcode.MOVE_RESULT,
@@ -25,5 +35,5 @@ object CodecsLockFingerprint : MethodFingerprint(
         Opcode.INVOKE_DIRECT,
         Opcode.RETURN_OBJECT
     ),
-    strings = listOf("eac3_supported")
+    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.BytecodeContext
+import app.revanced.patcher.data.impl.BytecodeData
-import app.revanced.patcher.data.toMethodWalker
+import app.revanced.patcher.data.impl.toMethodWalker
-import app.revanced.patcher.patch.BytecodePatch
+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.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(context: BytecodeContext): PatchResult {
+    override fun execute(data: BytecodeData): PatchResult {
         val codecsLockResult = CodecsLockFingerprint.result!!
 
         val implementation = codecsLockResult.mutableMethod.implementation!!
 
-        val scanResultStartIndex = codecsLockResult.scanResult.patternScanResult!!.startIndex
+        val scanResultStartIndex = codecsLockResult.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 =
-            context.toMethodWalker(allCodecsResult.method)
+            data.toMethodWalker(allCodecsResult.method)
-                .nextMethod(allCodecsResult.scanResult.patternScanResult!!.startIndex)
+                .nextMethod(allCodecsResult.patternScanResult!!.startIndex)
                 .getMethod()
 
         implementation.replaceInstruction(

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

@@ -5,23 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music",
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51")
-        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"
-        )
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -1,10 +1,25 @@
 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,13 +1,22 @@
 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.FuzzyPatternScanMethod
 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 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,15 +3,17 @@ 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.BytecodeContext
+import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.extensions.replaceInstruction
-import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
 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")
@@ -23,7 +25,7 @@ class ExclusiveAudioPatch : BytecodePatch(
         AudioOnlyEnablerFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(data: BytecodeData): 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,22 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music",
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51")
-        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"
-        )
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -1,10 +1,20 @@
 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.BytecodeContext
+import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
+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.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,16 +23,16 @@ class CompactHeaderPatch : BytecodePatch(
         CompactHeaderConstructorFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(data: BytecodeData): PatchResult {
         val result = CompactHeaderConstructorFingerprint.result!!
         val method = result.mutableMethod
 
-        val insertIndex = result.scanResult.patternScanResult!!.endIndex
+        val insertIndex = result.patternScanResult!!.endIndex
         val register = (method.implementation!!.instructions[insertIndex - 1] as BuilderInstruction11x).registerA
         method.addInstructions(
             insertIndex, """
-                const/16 v2, 0x8
+                const/16 v0, 0x8
-                invoke-virtual {v${register}, v2}, Landroid/view/View;->setVisibility(I)V
+                invoke-virtual {v${register}, v0}, Landroid/view/View;->setVisibility(I)V
             """
         )
 

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

@@ -5,23 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music",
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51")
-        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"
-        )
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -1,10 +1,20 @@
 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,14 +3,18 @@ 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.BytecodeContext
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.impl.toMethodWalker
 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")
@@ -22,7 +26,7 @@ class MinimizedPlaybackPatch : BytecodePatch(
         MinimizedPlaybackManagerFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(data: BytecodeData): PatchResult {
         MinimizedPlaybackManagerFingerprint.result!!.mutableMethod.addInstructions(
             0, """
                 return-void

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

@@ -5,23 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music",
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51")
-        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"
-        )
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -1,10 +1,20 @@
 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,10 +1,20 @@
 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.BytecodeContext
+import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.replaceInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
-import app.revanced.patcher.patch.BytecodePatch
+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.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,15 +25,13 @@ class HideGetPremiumPatch : BytecodePatch(
         HideGetPremiumParentFingerprint
     )
 ) {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(data: BytecodeData): PatchResult {
         val parentResult = HideGetPremiumParentFingerprint.result!!
-        HideGetPremiumFingerprint.resolve(context, parentResult.classDef)
+        HideGetPremiumFingerprint.resolve(data, parentResult.classDef)
-
-        val startIndex = parentResult.scanResult.patternScanResult!!.startIndex
 
         val parentMethod = parentResult.mutableMethod
         parentMethod.replaceInstruction(
-            startIndex, """
+            parentResult.patternScanResult!!.startIndex, """
             const/4 v1, 0x0
         """
         )
@@ -41,7 +39,7 @@ class HideGetPremiumPatch : BytecodePatch(
         val result = HideGetPremiumFingerprint.result!!
         val method = result.mutableMethod
         method.addInstructions(
-            startIndex, """
+            result.patternScanResult!!.startIndex, """
             const/16 v0, 0x8
         """
         )

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

@@ -10,20 +10,7 @@ import app.revanced.patcher.annotation.Package
  */
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music",
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51")
-        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"
-        )
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -1,15 +1,24 @@
 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.annotation.FuzzyPatternScanMethod
 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 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(
+    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L", "L"), listOf(
         Opcode.INVOKE_DIRECT,
         Opcode.INVOKE_VIRTUAL,
         Opcode.NEW_INSTANCE,
@@ -26,9 +35,9 @@ object TasteBuilderConstructorFingerprint : MethodFingerprint(
         Opcode.INVOKE_VIRTUAL,
         Opcode.MOVE_RESULT_OBJECT,
         Opcode.CHECK_CAST,
+        Opcode.IPUT_OBJECT,
         Opcode.NEW_INSTANCE,
         Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT
-        Opcode.CONST
     )
 )

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.BytecodeContext
+import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
+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.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(context: BytecodeContext): PatchResult {
+    override fun execute(data: BytecodeData): PatchResult {
         val result = TasteBuilderConstructorFingerprint.result!!
         val method = result.mutableMethod
 
-        val insertIndex = result.scanResult.patternScanResult!!.endIndex - 8
+        val insertIndex = result.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,23 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music",
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51")
-        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"
-        )
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -1,13 +1,22 @@
 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.annotation.FuzzyPatternScanMethod
 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 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.BytecodeContext
+import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
+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.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(context: BytecodeContext): PatchResult {
+    override fun execute(data: BytecodeData): PatchResult {
         val result = PivotBarConstructorFingerprint.result!!
         val implementation = result.mutableMethod.implementation!!
 
         val pivotBarElementFieldRef =
-            (implementation.instructions[result.scanResult.patternScanResult!!.endIndex - 1] as Instruction22c).reference
+            (implementation.instructions[result.patternScanResult!!.endIndex - 1] as Instruction22c).reference
 
         val register = (implementation.instructions.first() as Instruction35c).registerC
         // first compile all the needed instructions
@@ -46,18 +46,16 @@ class RemoveUpgradeButtonPatch : BytecodePatch(
             """.toInstructions().toMutableList()
 
 
-        val endIndex = result.scanResult.patternScanResult!!.endIndex
-
         // replace the instruction to retain the label at given index
         implementation.replaceInstruction(
-            endIndex - 1, instructionList[0] // invoke-interface
+            result.patternScanResult!!.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(
-            endIndex, exitInstruction
+            result.patternScanResult!!.endIndex, exitInstruction
         )
         // do not forget to remove this instruction since we added it already
         instructionList.removeLast()
@@ -66,12 +64,12 @@ class RemoveUpgradeButtonPatch : BytecodePatch(
         instructionList.add(
             2, // if-le
             BuilderInstruction22t(
-                Opcode.IF_LE, 1, 2, implementation.newLabelForIndex(endIndex)
+                Opcode.IF_LE, 1, 2, implementation.newLabelForIndex(result.patternScanResult!!.endIndex)
             )
         )
 
         implementation.addInstructions(
-            endIndex, instructionList
+            result.patternScanResult!!.endIndex, instructionList
         )
         return PatchResultSuccess()
     }

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

@@ -5,23 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music",
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51")
-        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"
-        )
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -1,8 +1,20 @@
 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.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
 
-object CastContextFetchFingerprint : MethodFingerprint(
+@Name("cast-context-fetch-fingerprint")
-    strings = listOf("Error fetching CastContext.")
+@MatchingMethod(
+    "Lvvz;", "a"
+)
+@DirectPatternScanMethod
+@MicroGPatchCompatibility
+@Version("0.0.1")
+object CastContextFetchFingerprint : MethodFingerprint(
+    null, null, null, null,
+    listOf("Error fetching CastContext.")
 )

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

@@ -1,8 +1,20 @@
 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.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
 
-object CastDynamiteModuleFingerprint : MethodFingerprint(
+@Name("cast-module-fingerprint")
-    strings = listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
+@MatchingMethod(
+    "Llqh;", "c"
+)
+@DirectPatternScanMethod
+@MicroGPatchCompatibility
+@Version("0.0.1")
+object CastDynamiteModuleFingerprint : MethodFingerprint(
+    null, null, null, null,
+    listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
 )

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

@@ -1,8 +1,20 @@
 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.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
 
-object CastDynamiteModuleV2Fingerprint : MethodFingerprint(
+@Name("cast-context-fetch-fingerprint")
-    strings = listOf("Failed to load module via V2: ")
+@MatchingMethod(
+    "Lmcf;", "c"
+)
+@DirectPatternScanMethod
+@MicroGPatchCompatibility
+@Version("0.0.1")
+object CastDynamiteModuleV2Fingerprint : MethodFingerprint(
+    null, null, null, null,
+    listOf("Failed to load module via V2: ")
 )

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

@@ -1,18 +1,21 @@
 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.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
 import org.jf.dexlib2.AccessFlags
 
-object GooglePlayUtilityFingerprint : MethodFingerprint(
+@Name("google-play-utility-fingerprint")
-    "I",
+@MatchingMethod(
-    AccessFlags.PUBLIC or AccessFlags.STATIC,
+    "Lnuv;", "b"
-    listOf("L", "I"),
+)
-    strings = listOf(
+@DirectPatternScanMethod
-        "This should never happen.",
+@MusicMicroGPatchCompatibility
-        "MetadataValueReader",
+@Version("0.0.1")
-        "GooglePlayServicesUtil",
+object GooglePlayUtilityFingerprint : MethodFingerprint(
-        "com.android.vending",
+    "I", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "I"), null, listOf("This should never happen.", "MetadataValueReader", "GooglePlayServicesUtil", "com.android.vending", "android.hardware.type.embedded")
-        "android.hardware.type.embedded"
-    )
 )

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

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

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

@@ -1,15 +1,21 @@
 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.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
 import org.jf.dexlib2.AccessFlags
 
-
+@Name("google-play-service-checker-fingerprint")
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
+@MatchingMethod(
-object ServiceCheckFingerprint : MethodFingerprint(
+    "Lnuv;", "d"
-    "V",
+)
-    AccessFlags.PUBLIC or AccessFlags.STATIC,
+@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-    listOf("L", "I"),
+@MusicMicroGPatchCompatibility
-    strings = listOf("Google Play Services not available")
+@Version("0.0.1")
+object ServiceCheckFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "I"), null, listOf("Google Play Services not available")
 )

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

@@ -1,27 +1,37 @@
 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.BytecodeContext
+import app.revanced.patcher.data.impl.BytecodeData
-import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.extensions.replaceInstruction
 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.fingerprints.*
 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.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.youtube.misc.microg.shared.Constants
+import app.revanced.patches.music.misc.microg.fingerprints.*
-import app.revanced.util.microg.MicroGBytecodeHelper
+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
 
 @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.2")
+@Version("0.0.1")
 class MusicMicroGBytecodePatch : BytecodePatch(
     listOf(
         ServiceCheckFingerprint,
@@ -32,34 +42,130 @@ class MusicMicroGBytecodePatch : BytecodePatch(
         PrimeFingerprint,
     )
 ) {
-    // NOTE: the previous patch also replaced the following strings, but it seems like they are not needed:
+    override fun execute(data: BytecodeData): PatchResult {
-    // - "com.google.android.gms.chimera.GmsIntentOperationService",
+        disablePlayServiceChecks()
-    // - "com.google.android.gms.phenotype.internal.IPhenotypeCallbacks",
+        data.classes.forEach { classDef ->
-    // - "com.google.android.gms.phenotype.internal.IPhenotypeService",
+            var proxiedClass: MutableClass? = null
-    // - "com.google.android.gms.phenotype.PACKAGE_NAME",
+
-    // - "com.google.android.gms.phenotype.UPDATE",
+            classDef.methods.forEach methodLoop@{ method ->
-    // - "com.google.android.gms.phenotype",
+                val implementation = method.implementation ?: return@methodLoop
-    override fun execute(context: BytecodeContext) =
+
-        // apply common microG patch
+                var proxiedImplementation: MutableMethodImplementation? = null
-        MicroGBytecodeHelper.patchBytecode(
+
-            context,
+                implementation.instructions.forEachIndexed { i, instruction ->
-            arrayOf(
+                    if (instruction.opcode != Opcode.CONST_STRING) return@forEachIndexed
-                MicroGBytecodeHelper.packageNameTransform(
+
-                    Constants.PACKAGE_NAME,
+                    val stringValue = ((instruction as Instruction21c).reference as StringReference).string
-                    Constants.REVANCED_PACKAGE_NAME
+
-                )
+                    val replaceMode = if (stringValue.equalsAny(
-            ),
+                            "com.google.android.gms",
-            MicroGBytecodeHelper.PrimeMethodTransformationData(
+                            "com.google.android.gms.chimera",
-                PrimeFingerprint,
+                            "com.google.android.c2dm.intent.REGISTER",
-                MUSIC_PACKAGE_NAME,
+                            "com.google.android.c2dm.permission.SEND",
-                REVANCED_MUSIC_PACKAGE_NAME
+                            "com.google.iid.TOKEN_REQUEST",
-            ),
+                            "com.google",
-            listOf(
+                            "com.google.android.gms.chimera.GmsIntentOperationService",
-                ServiceCheckFingerprint,
+                            "com.google.android.gms.phenotype.internal.IPhenotypeCallbacks",
-                GooglePlayUtilityFingerprint,
+                            "com.google.android.gms.phenotype.internal.IPhenotypeService",
-                CastDynamiteModuleFingerprint,
+                            "com.google.android.gms.phenotype.service.START",
-                CastDynamiteModuleV2Fingerprint,
+                            "com.google.android.gms.phenotype.PACKAGE_NAME",
-                CastContextFetchFingerprint
+                            "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
             )
-        ).let { PatchResultSuccess() }
+        }
+
+        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\""
+        )
+
+    }
 }

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

@@ -3,39 +3,42 @@ 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.data.impl.ResourceData
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.ResourcePatch
+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.MUSIC_PACKAGE_NAME
+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
-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")
+@Version("0.0.1")
-class MusicMicroGResourcePatch : ResourcePatch {
+class MusicMicroGResourcePatch : ResourcePatch() {
-    override fun execute(context: ResourceContext): PatchResult {
+    override fun execute(data: ResourceData): PatchResult {
-        // update manifest
+
-        MicroGResourceHelper.patchManifest(
+        val manifest = data["AndroidManifest.xml"].readText()
-            context,
+
-            MUSIC_PACKAGE_NAME,
+        data["AndroidManifest.xml"].writeText(
-            REVANCED_MUSIC_PACKAGE_NAME,
+            manifest.replace(
-            REVANCED_MUSIC_APP_NAME
+                "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>"
+            )
         )
 
-        // 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,9 +1,7 @@
 package app.revanced.patches.music.misc.microg.shared
 
 object Constants {
-    internal const val REVANCED_MUSIC_APP_NAME = "YT Music ReVanced"
+    internal const val BASE_MICROG_PACKAGE_NAME = "com.mgoogle"
+    internal const val REVANCED_MUSIC_APP_NAME = "YouTube 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,23 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.apps.youtube.music",
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53", "5.16.51", "5.17.51")
-        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"
-        )
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -1,13 +1,22 @@
 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.annotation.FuzzyPatternScanMethod
 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 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.BytecodeContext
+import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
+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.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(context: BytecodeContext): PatchResult {
+    override fun execute(data: BytecodeData): PatchResult {
         BackgroundPlaybackDisableFingerprint.result!!.mutableMethod.addInstructions(
             0,
             """

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

@@ -1,9 +0,0 @@
-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

@@ -1,8 +0,0 @@
-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

@@ -1,38 +0,0 @@
-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/nyx/misc/pro/annotations/UnlockProCompatibility.kt

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

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

@@ -1,9 +0,0 @@
-package app.revanced.patches.nyx.misc.pro.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object CheckProFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef ->
-        methodDef.definingClass.endsWith("BillingManager;") && methodDef.name == "isProVersion"
-    }
-)

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

@@ -1,38 +0,0 @@
-package app.revanced.patches.nyx.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.nyx.misc.pro.annotations.UnlockProCompatibility
-import app.revanced.patches.nyx.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/reddit/ad/general/annotations/GeneralAdsCompatibility.kt

@@ -3,7 +3,11 @@ package app.revanced.patches.reddit.ad.general.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility([Package("com.reddit.frontpage")])
+@Compatibility(
+    [Package(
+        "com.reddit.frontpage", arrayOf()
+    )]
+)
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 internal annotation class GeneralAdsCompatibility

src/main/kotlin/app/revanced/patches/reddit/ad/general/patch/GeneralAdsPatch.kt

@@ -3,11 +3,12 @@ package app.revanced.patches.reddit.ad.general.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.data.impl.BytecodeData
-import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.extensions.replaceInstruction
+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.patch.annotations.Patch
 import app.revanced.patches.reddit.ad.general.annotations.GeneralAdsCompatibility
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.builder.instruction.BuilderInstruction21c
@@ -21,8 +22,8 @@ import org.jf.dexlib2.immutable.reference.ImmutableStringReference
 @GeneralAdsCompatibility
 @Version("0.0.1")
 class GeneralAdsPatch : BytecodePatch() {
-    override fun execute(context: BytecodeContext): PatchResult {
+    override fun execute(data: BytecodeData): PatchResult {
-        context.classes.forEach { classDef ->
+        data.classes.forEach { classDef ->
             classDef.methods.forEach methodLoop@{ method ->
                 val implementation = method.implementation ?: return@methodLoop
 
@@ -30,7 +31,7 @@ class GeneralAdsPatch : BytecodePatch() {
                     if (instruction.opcode != Opcode.CONST_STRING) return@forEachIndexed
                     if (((instruction as ReferenceInstruction).reference as StringReference).string != "AdPost") return@forEachIndexed
 
-                    val proxiedClass = context.proxy(classDef).mutableClass
+                    val proxiedClass = data.proxy(classDef).resolve()
 
                     val proxiedImplementation = proxiedClass.methods.first {
                         it.name == method.name && it.parameterTypes.containsAll(method.parameterTypes)

src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/annotations/PremiumIconCompatibility.kt

@@ -1,9 +0,0 @@
-package app.revanced.patches.reddit.layout.premiumicon.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.reddit.frontpage")])
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-internal annotation class PremiumIconCompatibility

src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/fingerprints/PremiumIconFingerprint.kt

@@ -1,10 +0,0 @@
-package app.revanced.patches.reddit.layout.premiumicon.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object PremiumIconFingerprint : MethodFingerprint(
-    "Z",
-    customFingerprint = { methodDef ->
-        methodDef.definingClass.endsWith("MyAccount;") && methodDef.name == "isPremiumSubscriber"
-    }
-)

src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/patch/PremiumIconPatch.kt

@@ -1,36 +0,0 @@
-package app.revanced.patches.reddit.layout.premiumicon.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.reddit.layout.premiumicon.annotations.PremiumIconCompatibility
-import app.revanced.patches.reddit.layout.premiumicon.fingerprints.PremiumIconFingerprint
-
-@Patch
-@Name("premium-icon-reddit")
-@Description("Unlocks premium Reddit app icons.")
-@PremiumIconCompatibility
-@Version("0.0.1")
-class PremiumIconPatch : BytecodePatch(
-    listOf(
-        PremiumIconFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val method = PremiumIconFingerprint.result!!.mutableMethod
-        method.addInstructions(
-            0,
-            """
-                const/4 v0, 0x1
-                return v0
-            """
-        )
-        return PatchResultSuccess()
-    }
-}

src/main/kotlin/app/revanced/patches/shared/fingerprints/WatchWhileActivityFingerprint.kt

@@ -1,10 +0,0 @@
-package app.revanced.patches.shared.fingerprints
-
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object WatchWhileActivityFingerprint : MethodFingerprint(
-    customFingerprint = { methodDef ->
-        methodDef.definingClass.endsWith("WatchWhileActivity;") && methodDef.name == "<init>"
-    }
-)

src/main/kotlin/app/revanced/patches/shared/integrations/patch/AbstractIntegrationsPatch.kt

@@ -1,66 +0,0 @@
-package app.revanced.patches.shared.integrations.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.addInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-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 org.jf.dexlib2.iface.Method
-
-@Description("Applies mandatory patches to implement the ReVanced integrations into the application.")
-@Version("0.0.1")
-abstract class AbstractIntegrationsPatch(
-    private val integrationsDescriptor: String,
-    private val hooks: Iterable<IntegrationsFingerprint>
-) : BytecodePatch(hooks) {
-    /**
-     * [MethodFingerprint] for integrations.
-     *
-     * @param contextRegisterResolver A [RegisterResolver] to get the register.
-     * @see MethodFingerprint
-     */
-    abstract class IntegrationsFingerprint(
-        strings: Iterable<String>? = null,
-        customFingerprint: ((methodDef: Method) -> Boolean)? = null,
-        private val contextRegisterResolver: (Method) -> Int = object : RegisterResolver {}
-    ) : MethodFingerprint(strings = strings, customFingerprint = customFingerprint) {
-        fun invoke(integrationsDescriptor: String): PatchResult {
-            result?.mutableMethod?.let { method ->
-                val contextRegister = contextRegisterResolver(method)
-
-                method.addInstruction(
-                    0,
-                    "sput-object v$contextRegister, " +
-                            "$integrationsDescriptor->context:Landroid/content/Context;"
-                )
-            } ?: return PatchResultError("Could not find hook target fingerprint.")
-
-            return PatchResultSuccess()
-        }
-
-        interface RegisterResolver : (Method) -> Int {
-            override operator fun invoke(method: Method) = method.implementation!!.registerCount - 1
-        }
-    }
-
-    override fun execute(context: BytecodeContext): PatchResult {
-        if (context.findClass(integrationsDescriptor) == null) return MISSING_INTEGRATIONS
-
-        for (hook in hooks) hook.invoke(integrationsDescriptor).let {
-            if (it is PatchResultError) return it
-        }
-
-        return PatchResultSuccess()
-    }
-
-    private companion object {
-        val MISSING_INTEGRATIONS = PatchResultError(
-            "Integrations have not been merged yet. " +
-                    "This patch can not succeed without merging the integrations."
-        )
-    }
-}

src/main/kotlin/app/revanced/patches/shared/mapping/misc/patch/ResourceMappingPatch.kt

@@ -1,73 +0,0 @@
-package app.revanced.patches.shared.mapping.misc.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 org.w3c.dom.Element
-import java.util.*
-import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit
-
-
-@Name("resource-mapping")
-@Description("Creates a map of public resources.")
-@Version("0.0.1")
-class ResourceMappingPatch : ResourcePatch {
-    companion object {
-        internal lateinit var resourceMappings: List<ResourceElement>
-            private set
-
-        private val THREAD_COUNT = Runtime.getRuntime().availableProcessors()
-        private val threadPoolExecutor = Executors.newFixedThreadPool(THREAD_COUNT)
-    }
-
-    override fun execute(context: ResourceContext): PatchResult {
-        // save the file in memory to concurrently read from
-        val resourceXmlFile = context["res/values/public.xml"].readBytes()
-
-        // create a synchronized list to store the resource mappings
-        val mappings = Collections.synchronizedList(mutableListOf<ResourceElement>())
-
-        for (threadIndex in 0 until THREAD_COUNT) {
-            threadPoolExecutor.execute thread@{
-                context.xmlEditor[resourceXmlFile.inputStream()].use { editor ->
-                    val resources = editor.file.documentElement.childNodes
-                    val resourcesLength = resources.length
-                    val jobSize = resourcesLength / THREAD_COUNT
-
-                    val batchStart = jobSize * threadIndex
-                    val batchEnd = jobSize * (threadIndex + 1)
-                    element@ for (i in batchStart until batchEnd) {
-                        // make sure to not to go out of bounds when rounding errors occur at calculating the jobSize
-                        if (i >= resourcesLength) return@thread
-
-                        val node = resources.item(i)
-                        if (node !is Element) continue
-
-                        val nameAttribute = node.getAttribute("name")
-                        val typeAttribute = node.getAttribute("type")
-
-                        if (node.nodeName != "public" || nameAttribute.startsWith("APKTOOL")) continue
-
-                        val id = node.getAttribute("id").substring(2).toLong(16)
-                        mappings.add(ResourceElement(typeAttribute, nameAttribute, id))
-                    }
-                }
-            }
-        }
-
-        threadPoolExecutor
-            .also { it.shutdown() }
-            .awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS)
-
-        resourceMappings = mappings
-
-        return PatchResultSuccess()
-    }
-}
-
-data class ResourceElement(val type: String, val name: String, val id: Long)