chore(release): 2.183.1-dev.1 [skip ci]

## [2.183.1-dev.1](https://github.com/revanced/revanced-patches/compare/v2.183.0...v2.183.1-dev.1) (2023-07-10)

### Bug Fixes

* find resource by correct name ([3113bb6](3113bb6599))
* use correct patch naming convention ([668d1fd](668d1fda49))

.gitattributes

@@ -0,0 +1,9 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# Linux start script should use lf
+/gradlew        text eol=lf
+
+# These are Windows script files and should use crlf
+*.bat           text eol=crlf
+

.github/ISSUE_TEMPLATE/bug-issue.yml

@@ -1,6 +1,6 @@
 name: 🐞 Bug report
 description: Report a very clearly broken issue.
-title: 'bug: <title>'
+title: 'bug: '
 labels: [bug]
 body:
   - type: markdown

.github/ISSUE_TEMPLATE/patch-request.yml

@@ -1,6 +1,6 @@
 name: ⭐ Patch Request
 description: Create a detailed patch request.
-title: 'feat(patch): '
+title: 'feat: '
 labels: [patch-request]
 body:
   - type: textarea
@@ -24,7 +24,7 @@ body:
   - type: textarea
     attributes:
       label: Motivation
-      description: Why should your patch request should be considered? What makes it valuable to the community?
+      description: Why should your patch request be considered? What makes it valuable to the community?
     validations:
       required: true
   - type: checkboxes
@@ -38,4 +38,4 @@ body:
         - 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
+          required: true

.github/workflows/release.yml

@@ -23,23 +23,16 @@ jobs:
           # https://github.com/cycjimmy/semantic-release-action#private-packages
           persist-credentials: false
           fetch-depth: 0
-      - name: Setup JDK
-        uses: actions/setup-java@v3
+      - name: Cache
+        uses: actions/cache@v3
         with:
-          java-version: '17'
-          distribution: 'zulu'
-          cache: gradle
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: '18'
-          cache: 'npm'
-      - name: Setup Android SDK
-        uses: amyu/setup-android@v2
-        with:
-          cache-disabled: false
-          sdk-version: '33'
-          build-tools-version: '33.0.1'
+          path: |
+            ${{ runner.home }}/.gradle/caches
+            ${{ runner.home }}/.gradle/wrapper
+            .gradle
+            build
+            node_modules
+          key: ${{ runner.os }}-gradle-npm-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'package-lock.json') }}
       - name: Build with Gradle
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.idea/misc.xml

@@ -4,5 +4,5 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="azul-17" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="azul-17" project-jdk-type="JavaSDK" />
 </project>

.releaserc

@@ -7,7 +7,13 @@
     }
   ],
   "plugins": [
-    "@semantic-release/commit-analyzer",
+    [
+      "@semantic-release/commit-analyzer", {
+        "releaseRules": [
+          { "type": "build", "scope": "revanced-patcher", "release": "patch" }
+        ]
+      }
+    ],
     "@semantic-release/release-notes-generator",
     "@semantic-release/changelog",
     "gradle-semantic-release-plugin",

README-template.md

@@ -1,122 +0,0 @@
-## 🧩 Patches
-
-The official Patch bundle provided by ReVanced and the community.
-
-> Looking for the JSON variant of this? [Click here](patches.json).
-
-{{ table }}
-
-## 📝 JSON Format
-
-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                                                                                                                                                                           |
-|-------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `name`                        | The name of the patch.                                                                                                                                                                |
-| `description`                 | The description of the patch.                                                                                                                                                         |
-| `version`                     | The version of the patch.                                                                                                                                                             |
-| `excluded`                    | Whether the patch is excluded by default. If `true`, the patch must never be included by default.                                                                                     |
-| `options`                     | An array of options for this patch.                                                                                                                                                   |
-| `options.key`                 | The key of the option.                                                                                                                                                                |
-| `options.title`               | The title of the option.                                                                                                                                                              |
-| `options.description`         | The description of the option.                                                                                                                                                        |
-| `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:
-
-```json
-[
-  {
-    "name": "remember-video-quality",
-    "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"
-    ],
-    "compatiblePackages": [
-      {
-        "name": "com.google.android.youtube",
-        "versions": [
-          "17.22.36",
-          "17.24.35",
-          "17.26.35",
-          "17.27.39",
-          "17.28.34",
-          "17.29.34",
-          "17.32.35",
-          "17.33.42"
-        ]
-      }
-    ]
-  },
-  {
-    "name": "theme",
-    "description": "Enables a custom theme.",
-    "version": "0.0.1",
-    "excluded": false,
-    "deprecated": false,
-    "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",
-        "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

@@ -1,487 +1,3 @@
-## 🧩 Patches
+## 🧩 ReVanced Patches
 
-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`](https://play.google.com/store/apps/details?id=com.google.android.youtube)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `always-autorepeat` | Always repeats the playing video again. | 18.16.37 |
-| `client-spoof` | Spoofs a patched client to allow playback. | 18.16.37 |
-| `comments` | Hides components related to comments. | 18.16.37 |
-| `copy-video-url` | Adds buttons in player to copy video links. | 18.16.37 |
-| `create-button` | Hide the create button in the navigation bar or switch it with notifications. | 18.16.37 |
-| `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
-| `custom-video-buffer` | Lets you change the buffers of videos. | 18.16.37 |
-| `custom-video-speed` | Adds more video speed options. | 18.16.37 |
-| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 18.16.37 |
-| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 18.16.37 |
-| `disable-player-popup-panels` | Disables panels from appearing automatically when going into fullscreen (playlist or live chat). | 18.16.37 |
-| `disable-shorts-on-startup` | Disables playing YouTube Shorts when launching YouTube. | 18.16.37 |
-| `disable-zoom-haptics` | Disables haptics when zooming. | all |
-| `downloads` | Enables downloading music and videos from YouTube. | 18.16.37 |
-| `enable-debugging` | Adds debugging options. | all |
-| `general-ads` | Removes general ads. | 18.16.37 |
-| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 18.16.37 |
-| `hide-album-cards` | Hides the album cards below the artist description. | 18.16.37 |
-| `hide-artist-card` | Hides the artist card below the searchbar. | 18.16.37 |
-| `hide-autoplay-button` | Hides the autoplay button in the video player. | 18.16.37 |
-| `hide-breaking-news-shelf` | Hides the breaking news shelf on the homepage tab. | 18.16.37 |
-| `hide-captions-button` | Hides the captions button on video player. | 18.16.37 |
-| `hide-cast-button` | Hides the cast button in the video player. | all |
-| `hide-crowdfunding-box` | Hides the crowdfunding box between the player and video description. | 18.16.37 |
-| `hide-email-address` | Hides the email address in the account switcher. | 18.16.37 |
-| `hide-endscreen-cards` | Hides the suggested video cards at the end of a video in fullscreen. | 18.16.37 |
-| `hide-floating-microphone-button` | Hides the floating microphone button which appears in search. | 18.16.37 |
-| `hide-get-premium` | Hides advertisement for YouTube Premium under the video player. | 18.16.37 |
-| `hide-info-cards` | Hides info cards in videos. | 18.16.37 |
-| `hide-player-buttons` | Adds the option to hide video player previous and next buttons. | all |
-| `hide-player-overlay` | Hides the dark player overlay when player controls are visible. | all |
-| `hide-seekbar` | Hides the seekbar. | 18.16.37 |
-| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 18.16.37 |
-| `hide-timestamp` | Hides timestamp in video player. | 18.16.37 |
-| `hide-video-action-buttons` | Adds the options to hide action buttons under a video. | 18.16.37 |
-| `hide-watch-in-vr` | Hides the option to watch in VR from the player settings flyout panel. | 18.16.37 |
-| `hide-watermark` | Hides creator's watermarks on videos. | 18.16.37 |
-| `minimized-playback` | Enables minimized and background playback. | 18.16.37 |
-| `old-quality-layout` | Enables the original video quality flyout in the video player settings | 18.16.37 |
-| `open-links-externally` | Open links outside of the app directly in your browser. | 18.16.37 |
-| `premium-heading` | Shows premium branding on the home screen. | all |
-| `remember-playback-speed` | Adds the ability to remember the playback speed you chose in the video playback speed flyout. | 18.16.37 |
-| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 18.16.37 |
-| `remove-player-button-background` | Removes the background from the video player buttons. | 18.16.37 |
-| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 18.16.37 |
-| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 18.16.37 |
-| `sponsorblock` | Integrates SponsorBlock which allows skipping video segments such as sponsored content. | 18.16.37 |
-| `spoof-app-version` | Tricks YouTube into thinking, you are running an older version of the app. One of the side effects also includes restoring the old UI. | 18.16.37 |
-| `swipe-controls` | Adds volume and brightness swipe controls. | 18.16.37 |
-| `tablet-mini-player` | Enables the tablet mini player layout. | 18.16.37 |
-| `theme` | Applies a custom theme. | all |
-| `vanced-microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 18.16.37 |
-| `video-ads` | Removes ads in the video player. | 18.16.37 |
-| `wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 18.16.37 |
-</details>
-
-### [📦 `com.google.android.apps.youtube.music`](https://play.google.com/store/apps/details?id=com.google.android.apps.youtube.music)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `background-play` | Enables playing music in the background. | all |
-| `bypass-certificate-checks` | Bypasses certificate checks which prevent YouTube Music from working on Android Auto. | 5.39.52 |
-| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | all |
-| `compact-header` | Hides the music category bar at the top of the homepage. | all |
-| `exclusive-audio-playback` | Enables the option to play music without video. | all |
-| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.39.52 |
-| `minimized-playback-music` | Enables minimized playback on Kids music. | all |
-| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | all |
-| `music-video-ads` | Removes ads in the music player. | all |
-| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | all |
-| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | all |
-</details>
-
-### [📦 `com.ss.android.ugc.trill`](https://play.google.com/store/apps/details?id=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. | 27.8.3 |
-| `feed-filter` | Filters tiktok videos: removing ads, removing livestreams. | 27.8.3 |
-| `fix-google-login` | Allows logging in with a Google account. | all |
-| `hide-ads` | Removes ads from TikTok. | all |
-| `playback-speed` | Enables the playback speed option for all videos. | all |
-| `settings` | Adds ReVanced settings to TikTok. | 27.8.3 |
-| `show-seekbar` | Shows progress bar for all video. | all |
-| `sim-spoof` | Spoofs the information which is retrieved from the sim-card. | 27.8.3 |
-</details>
-
-### [📦 `com.zhiliaoapp.musically`](https://play.google.com/store/apps/details?id=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. | 27.8.3 |
-| `feed-filter` | Filters tiktok videos: removing ads, removing livestreams. | 27.8.3 |
-| `fix-google-login` | Allows logging in with a Google account. | all |
-| `hide-ads` | Removes ads from TikTok. | all |
-| `playback-speed` | Enables the playback speed option for all videos. | all |
-| `settings` | Adds ReVanced settings to TikTok. | 27.8.3 |
-| `show-seekbar` | Shows progress bar for all video. | all |
-| `sim-spoof` | Spoofs the information which is retrieved from the sim-card. | 27.8.3 |
-</details>
-
-### [📦 `tv.twitch.android.app`](https://play.google.com/store/apps/details?id=tv.twitch.android.app)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `block-audio-ads` | Blocks audio ads in streams and VODs. | 14.6.1 |
-| `block-embedded-ads` | Blocks embedded stream ads using services like TTV.lol or PurpleAdBlocker. | 14.6.1 |
-| `block-video-ads` | Blocks video ads in streams and VODs. | 14.6.1 |
-| `debug-mode` | Enables Twitch's internal debugging mode. | all |
-| `settings` | Adds settings menu to Twitch. | all |
-| `show-deleted-messages` | Shows deleted chat messages behind a clickable spoiler. | all |
-</details>
-
-### [📦 `com.twitter.android`](https://play.google.com/store/apps/details?id=com.twitter.android)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `dynamic-color` | Replaces the default Twitter Blue with the users Material You palette. | all |
-| `hide-ads` | Hides ads. | all |
-| `hide-recommended-users` | Hides recommended users. | all |
-| `hide-views-stats` | Hides the view stats under tweets. | 9.71.0-release.0 |
-</details>
-
-### [📦 `com.spotify.music`](https://play.google.com/store/apps/details?id=com.spotify.music)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `disable-capture-restriction` | Allows capturing Spotify's audio output while screen sharing or screen recording. | all |
-| `hide-premium-navbar` | Removes the premium tab from the navbar. | all |
-| `spotify-theme` | Applies a custom theme. | all |
-</details>
-
-### [📦 `com.reddit.frontpage`](https://play.google.com/store/apps/details?id=com.reddit.frontpage)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | 2023.12.0 |
-| `hide-subreddit-banner` | Hides banner ads from comments on subreddits. | 2023.12.0 |
-| `premium-icon-reddit` | Unlocks premium Reddit app icons. | all |
-</details>
-
-### [📦 `at.gv.bmf.bmf2go`](https://play.google.com/store/apps/details?id=at.gv.bmf.bmf2go)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `remove-bootloader-detection` | Removes the check for an unlocked bootloader. | 2.2.0 |
-| `remove-root-detection` | Removes the check for root permissions. | 2.2.0 |
-</details>
-
-### [📦 `at.gv.oe.app`](https://play.google.com/store/apps/details?id=at.gv.oe.app)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `remove-root-detection` | Removes the check for root permissions and unlocked bootloader. | all |
-| `spoof-signature` | Spoofs the signature of the app. | all |
-</details>
-
-### [📦 `com.myprog.hexedit`](https://play.google.com/store/apps/details?id=com.myprog.hexedit)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `disable-ads` | Disables ads in HexEditor. | all |
-</details>
-
-### [📦 `com.spotify.lite`](https://play.google.com/store/apps/details?id=com.spotify.lite)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `enable-on-demand` | Enables listening to songs on-demand, allowing to play any song from playlists, albums or artists without limitations. This does not remove ads. | all |
-</details>
-
-### [📦 `com.nis.app`](https://play.google.com/store/apps/details?id=com.nis.app)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `hide-ads` | Removes ads from Inshorts. | all |
-</details>
-
-### [📦 `com.vanced.android.youtube`](https://play.google.com/store/apps/details?id=com.vanced.android.youtube)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `hide-ads` | Removes general ads. | all |
-</details>
-
-### [📦 `com.facebook.orca`](https://play.google.com/store/apps/details?id=com.facebook.orca)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `hide-inbox-ads` | Hides ads in inbox. | all |
-</details>
-
-### [📦 `com.instagram.android`](https://play.google.com/store/apps/details?id=com.instagram.android)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `hide-timeline-ads` | Removes ads from the timeline. | all |
-</details>
-
-### [📦 `org.citra.citra_emu`](https://play.google.com/store/apps/details?id=org.citra.citra_emu)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `premium-unlock` | Unlocks premium functions. | all |
-</details>
-
-### [📦 `org.citra.citra_emu.canary`](https://play.google.com/store/apps/details?id=org.citra.citra_emu.canary)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `premium-unlock` | Unlocks premium functions. | all |
-</details>
-
-### [📦 `com.backdrops.wallpapers`](https://play.google.com/store/apps/details?id=com.backdrops.wallpapers)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `pro-unlock` | Unlocks pro-only functions. | 4.52 |
-</details>
-
-### [📦 `de.dwd.warnapp`](https://play.google.com/store/apps/details?id=de.dwd.warnapp)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `promo-code-unlock` | Disables the validation of promo code. Any code will work to unlock all features. | all |
-</details>
-
-### [📦 `net.binarymode.android.irplus`](https://play.google.com/store/apps/details?id=net.binarymode.android.irplus)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `remove-ads` | Removes all ads from the app. | all |
-</details>
-
-### [📦 `eu.faircode.netguard`](https://play.google.com/store/apps/details?id=eu.faircode.netguard)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `remove-broadcasts-restriction` | Enables starting/stopping NetGuard via broadcasts. | all |
-</details>
-
-### [📦 `com.dci.dev.androidtwelvewidgets`](https://play.google.com/store/apps/details?id=com.dci.dev.androidtwelvewidgets)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-paid-widgets` | Unlocks paid widgets of the app | all |
-</details>
-
-### [📦 `com.microblink.photomath`](https://play.google.com/store/apps/details?id=com.microblink.photomath)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-plus` | Unlocks plus features. | 8.9.0 |
-</details>
-
-### [📦 `io.yuka.android`](https://play.google.com/store/apps/details?id=io.yuka.android)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-premium` | Unlocks premium features. | all |
-</details>
-
-### [📦 `com.teslacoilsw.launcher`](https://play.google.com/store/apps/details?id=com.teslacoilsw.launcher)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-prime` | Unlocks Nova Prime and all functions of the app. | all |
-</details>
-
-### [📦 `co.windyapp.android`](https://play.google.com/store/apps/details?id=co.windyapp.android)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks all pro features. | all |
-</details>
-
-### [📦 `org.totschnig.myexpenses`](https://play.google.com/store/apps/details?id=org.totschnig.myexpenses)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks all professional features. | 3.4.9 |
-</details>
-
-### [📦 `com.zombodroid.MemeGenerator`](https://play.google.com/store/apps/details?id=com.zombodroid.MemeGenerator)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks pro features. | 4.6364 |
-</details>
-
-### [📦 `com.ithebk.expensemanager`](https://play.google.com/store/apps/details?id=com.ithebk.expensemanager)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks pro features. | all |
-</details>
-
-### [📦 `ginlemon.iconpackstudio`](https://play.google.com/store/apps/details?id=ginlemon.iconpackstudio)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks all pro features. | all |
-</details>
-
-### [📦 `com.awedea.nyx`](https://play.google.com/store/apps/details?id=com.awedea.nyx)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-pro` | Unlocks all pro features. | all |
-</details>
-
-### [📦 `com.ticktick.task`](https://play.google.com/store/apps/details?id=com.ticktick.task)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-themes` | Unlocks all themes that are inaccessible until a certain level is reached. | all |
-</details>
-
-### [📦 `net.dinglisch.android.taskerm`](https://play.google.com/store/apps/details?id=net.dinglisch.android.taskerm)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-trial` | Unlocks the trial version. | all |
-</details>
-
-
-
-## 📝 JSON Format
-
-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                                                                                                                                                                           |
-|-------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `name`                        | The name of the patch.                                                                                                                                                                |
-| `description`                 | The description of the patch.                                                                                                                                                         |
-| `version`                     | The version of the patch.                                                                                                                                                             |
-| `excluded`                    | Whether the patch is excluded by default. If `true`, the patch must never be included by default.                                                                                     |
-| `options`                     | An array of options for this patch.                                                                                                                                                   |
-| `options.key`                 | The key of the option.                                                                                                                                                                |
-| `options.title`               | The title of the option.                                                                                                                                                              |
-| `options.description`         | The description of the option.                                                                                                                                                        |
-| `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:
-
-```json
-[
-  {
-    "name": "remember-video-quality",
-    "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"
-    ],
-    "compatiblePackages": [
-      {
-        "name": "com.google.android.youtube",
-        "versions": [
-          "17.22.36",
-          "17.24.35",
-          "17.26.35",
-          "17.27.39",
-          "17.28.34",
-          "17.29.34",
-          "17.32.35",
-          "17.33.42"
-        ]
-      }
-    ]
-  },
-  {
-    "name": "theme",
-    "description": "Enables a custom theme.",
-    "version": "0.0.1",
-    "excluded": false,
-    "deprecated": false,
-    "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",
-        "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": []
-      }
-    ]
-  }
-]
-```
+Patches for ReVanced.

build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "1.8.10"
+    kotlin("jvm") version "1.8.20"
 }
 
 group = "app.revanced"
@@ -17,13 +17,30 @@ repositories {
             password = githubPassword
         }
     }
+    // Required for FlexVer-Java
+    maven {
+        url = uri("https://repo.sleeping.town")
+        content {
+            includeGroup("com.unascribed")
+        }
+    }
 }
 
 dependencies {
-    implementation("app.revanced:revanced-patcher:7.0.0")
+    implementation("app.revanced:revanced-patcher:11.0.3")
     implementation("app.revanced:multidexlib2:2.5.3-a3836654")
     // Required for meta
     implementation("com.google.code.gson:gson:2.10.1")
+    // Required for FlexVer-Java
+    implementation("com.unascribed:flexver-java:1.0.2")
+
+    // A dependency to the Android library unfortunately fails the build,
+    // which is why this is required for the patch change-oauth-client-id
+    compileOnly(project("dummy"))
+}
+
+kotlin {
+    jvmToolchain(11)
 }
 
 tasks {

dummy/build.gradle.kts

@@ -0,0 +1,9 @@
+plugins {
+    id("java")
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
+}

dummy/src/main/java/android/os/Environment.java

@@ -0,0 +1,9 @@
+package android.os;
+
+import java.io.File;
+
+public final class Environment {
+    public static File getExternalStorageDirectory() {
+        throw new UnsupportedOperationException("Stub");
+    }
+}

gradle.properties

@@ -1,2 +1,4 @@
+org.gradle.parallel = true
+org.gradle.caching = true
 kotlin.code.style = official
-version = 2.173.0-dev.4
+version = 2.183.1-dev.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.

settings.gradle.kts

@@ -1 +1,3 @@
+include("dummy")
+
 rootProject.name = "revanced-patches"

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

@@ -1,11 +1,15 @@
 package app.revanced.extensions
 
 import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
+import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
 import org.jf.dexlib2.util.MethodUtil
 import org.w3c.dom.Node
 
@@ -15,7 +19,7 @@ import org.w3c.dom.Node
  *
  * @return A [PatchResultError] for the [MethodFingerprint].
  */
-fun MethodFingerprint.toErrorResult() = PatchResultError("Failed to resolve $name")
+internal fun MethodFingerprint.toErrorResult() = PatchResultError("Failed to resolve $name")
 
 /**
  * Find the [MutableMethod] from a given [Method] in a [MutableClass].
@@ -23,7 +27,7 @@ fun MethodFingerprint.toErrorResult() = PatchResultError("Failed to resolve $nam
  * @param method The [Method] to find.
  * @return The [MutableMethod].
  */
-fun MutableClass.findMutableMethodOf(method: Method) = this.methods.first {
+internal fun MutableClass.findMutableMethodOf(method: Method) = this.methods.first {
     MethodUtil.methodSignaturesMatch(it, method)
 }
 
@@ -32,7 +36,7 @@ fun MutableClass.findMutableMethodOf(method: Method) = this.methods.first {
  *
  * @param transform the transformation function. original method goes in, transformed method goes out
  */
-fun MutableClass.transformMethods(transform: MutableMethod.() -> MutableMethod) {
+internal fun MutableClass.transformMethods(transform: MutableMethod.() -> MutableMethod) {
     val transformedMethods = methods.map { it.transform() }
     methods.clear()
     methods.addAll(transformedMethods)
@@ -41,4 +45,40 @@ fun MutableClass.transformMethods(transform: MutableMethod.() -> MutableMethod)
 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 MutableMethod.injectHideViewCall(
+    insertIndex: Int,
+    viewRegister: Int,
+    classDescriptor: String,
+    targetMethod: String
+) = addInstruction(
+    insertIndex,
+    "invoke-static { v$viewRegister }, $classDescriptor->$targetMethod(Landroid/view/View;)V"
+)
+
+internal fun Method.findIndexForIdResource(resourceName: String): Int {
+    fun getIdResourceId(resourceName: String) = ResourceMappingPatch.resourceMappings.single {
+        it.type == "id" && it.name == resourceName
+    }.id
+
+    return indexOfFirstConstantInstructionValue(getIdResourceId(resourceName))
+}
+
+/**
+ * @return the first constant instruction with the value, or -1 if not found.
+ */
+fun Method.indexOfFirstConstantInstructionValue(constantValue: Long): Int {
+    return implementation?.let {
+        it.instructions.indexOfFirst { instruction ->
+            instruction.opcode == Opcode.CONST && (instruction as WideLiteralInstruction).wideLiteral == constantValue
+        }
+    } ?: -1
+}
+
+/**
+ * @return if the method contains a constant with the given value.
+ */
+fun Method.containsConstantInstructionValue(constantValue: Long): Boolean {
+    return indexOfFirstConstantInstructionValue(constantValue) >= 0
+}

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

@@ -19,7 +19,7 @@ internal interface PatchesFileGenerator {
         ).loadPatches().also {
             if (it.isEmpty()) throw IllegalStateException("No patches found")
         }.let { bundle ->
-            arrayOf(JsonGenerator(), ReadmeGenerator()).forEach { it.generate(bundle) }
+            arrayOf(JsonGenerator()).forEach { it.generate(bundle) }
         }
     }
 }

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

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

src/main/kotlin/app/revanced/patches/all/activity/exportAll/patch/ExportAllActivitiesPatch.kt

@@ -10,7 +10,7 @@ import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.Patch
 
 @Patch(false)
-@Name("export-all-activities")
+@Name("Export all activities")
 @Description("Makes all app activities exportable.")
 @Version("0.0.1")
 class ExportAllActivitiesPatch : ResourcePatch {

src/main/kotlin/app/revanced/patches/all/connectivity/wifi/spoof/patch/SpoofWifiPatch.kt

@@ -13,7 +13,7 @@ import org.jf.dexlib2.iface.instruction.Instruction
 import java.util.*
 
 @Patch(false)
-@Name("spoof-wifi-connection")
+@Name("Spoof wifi connection")
 @Description("Spoofs an existing Wi-Fi connection.")
 @Version("0.0.1")
 @RequiresIntegrations

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

@@ -10,7 +10,7 @@ import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.Patch
 
 @Patch(false)
-@Name("predictive-back-gesture")
+@Name("Predictive back gesture")
 @Description("Enables the predictive back gesture introduced on Android 13.")
 @Version("0.0.1")
 class PredictiveBackGesturePatch : ResourcePatch {

src/main/kotlin/app/revanced/patches/all/misc/debugging/patch/EnableAndroidDebuggingPatch.kt

@@ -9,34 +9,22 @@ import app.revanced.patcher.patch.annotations.Patch
 import org.w3c.dom.Element
 
 @Patch(false)
-@Name("enable-android-debugging")
+@Name("Enable android debugging")
 @Description("Enables Android debugging capabilities.")
 @Version("0.0.1")
 class EnableAndroidDebuggingPatch : ResourcePatch {
     override fun execute(context: ResourceContext): PatchResult {
-        if (debuggable == true) {
-            context.xmlEditor["AndroidManifest.xml"].use { dom ->
-                val applicationNode = dom
-                    .file
-                    .getElementsByTagName("application")
-                    .item(0) as Element
+        context.xmlEditor["AndroidManifest.xml"].use { dom ->
+            val applicationNode = dom
+                .file
+                .getElementsByTagName("application")
+                .item(0) as Element
 
-                // set application as debuggable
-                applicationNode.setAttribute("android:debuggable", "true")
-            }
+            // set application as debuggable
+            applicationNode.setAttribute("android:debuggable", "true")
         }
 
         return PatchResultSuccess()
     }
 
-    companion object : OptionsContainer() {
-        var debuggable: Boolean? by option(
-            PatchOption.BooleanOption(
-                key = "debuggable",
-                default = false,
-                title = "App debugging",
-                description = "Whether to make the app debuggable on Android.",
-            )
-        )
-    }
 }

src/main/kotlin/app/revanced/patches/all/misc/packagename/patch/ChangePackageNamePatch.kt

@@ -9,7 +9,7 @@ import app.revanced.patcher.patch.annotations.Patch
 import org.w3c.dom.Element
 
 @Patch(false)
-@Name("change-package-name")
+@Name("Change package name")
 @Description("Changes the package name.")
 @Version("0.0.1")
 class ChangePackageNamePatch : ResourcePatch {
@@ -19,7 +19,7 @@ class ChangePackageNamePatch : ResourcePatch {
             if (!packageName.matches(packageNameRegex))
                 return PatchResultError("Invalid package name")
 
-            var originalPackageName = ""
+            var originalPackageName: String
             context.xmlEditor["AndroidManifest.xml"].use { editor ->
                 val manifest = editor.file.getElementsByTagName("manifest").item(0) as Element
                 originalPackageName = manifest.getAttribute("package")

src/main/kotlin/app/revanced/patches/all/screencapture/removerestriction/bytecode/patch/RemoveCaptureRestrictionPatch.kt

@@ -0,0 +1,66 @@
+package app.revanced.patches.all.screencapture.removerestriction.bytecode.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.annotations.RequiresIntegrations
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.all.screencapture.removerestriction.resource.patch.RemoveCaptureRestrictionResourcePatch
+import app.revanced.util.patch.*
+import org.jf.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.iface.instruction.Instruction
+
+@Patch(false)
+@Name("Remove screen capture restriction")
+@Description("Removes the restriction of capturing audio from apps that normally wouldn't allow it.")
+@Version("0.0.1")
+@DependsOn([RemoveCaptureRestrictionResourcePatch::class])
+@RequiresIntegrations
+internal class RemoveCaptureRestrictionPatch : AbstractTransformInstructionsPatch<Instruction35cInfo>() {
+    // Information about method calls we want to replace
+    enum class MethodCall(
+        override val definedClassName: String,
+        override val methodName: String,
+        override val methodParams: Array<String>,
+        override val returnType: String
+    ): IMethodCall {
+        SetAllowedCapturePolicySingle(
+            "Landroid/media/AudioAttributes\$Builder;",
+            "setAllowedCapturePolicy",
+            arrayOf("I"),
+            "Landroid/media/AudioAttributes\$Builder;",
+        ),
+        SetAllowedCapturePolicyGlobal(
+            "Landroid/media/AudioManager;",
+            "setAllowedCapturePolicy",
+            arrayOf("I"),
+            "V",
+        );
+    }
+
+    override fun filterMap(
+        classDef: ClassDef,
+        method: Method,
+        instruction: Instruction,
+        instructionIndex: Int
+    ) = filterMapInstruction35c<MethodCall>(
+        INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX,
+        classDef,
+        instruction,
+        instructionIndex
+    )
+
+    override fun transform(mutableMethod: MutableMethod, entry: Instruction35cInfo) {
+        val (methodType, instruction, instructionIndex) = entry
+        methodType.replaceInvokeVirtualWithIntegrations(INTEGRATIONS_CLASS_DESCRIPTOR, mutableMethod, instruction, instructionIndex)
+    }
+
+    private companion object {
+        const val INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX =
+            "Lapp/revanced/all/screencapture/removerestriction/RemoveScreencaptureRestrictionPatch"
+        const val INTEGRATIONS_CLASS_DESCRIPTOR = "$INTEGRATIONS_CLASS_DESCRIPTOR_PREFIX;"
+    }
+}

src/main/kotlin/app/revanced/patches/all/screencapture/removerestriction/resource/patch/RemoveCaptureRestrictionResourcePatch.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.spotify.audio.resource.patch
+package app.revanced.patches.all.screencapture.removerestriction.resource.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
@@ -7,14 +7,12 @@ import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patches.spotify.audio.annotation.DisableCaptureRestrictionCompatibility
 import org.w3c.dom.Element
 
-@Name("disable-capture-restriction-resource-patch")
+@Name("Remove screen capture restriction resource patch")
 @Description("Sets allowAudioPlaybackCapture in manifest to true.")
-@DisableCaptureRestrictionCompatibility
-@Version("0.0.2")
-class DisableCaptureRestrictionResourcePatch : ResourcePatch {
+@Version("0.0.1")
+internal class RemoveCaptureRestrictionResourcePatch : ResourcePatch {
     override fun execute(context: ResourceContext): PatchResult {
         // create an xml editor instance
         context.xmlEditor["AndroidManifest.xml"].use { dom ->

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

@@ -13,7 +13,7 @@ import org.jf.dexlib2.iface.instruction.Instruction
 import java.util.*
 
 @Patch(false)
-@Name("remove-screenshot-restriction")
+@Name("Remove screenshot restriction")
 @Description("Removes the restriction of taking screenshots in apps that normally wouldn't allow it.")
 @Version("0.0.1")
 @RequiresIntegrations

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

@@ -11,5 +11,8 @@ object ProUnlockFingerprint : MethodFingerprint(
         Opcode.MOVE_RESULT,
         Opcode.IF_EQZ
     ),
-    customFingerprint = { it.definingClass == "Lcom/backdrops/wallpapers/data/local/DatabaseHandlerIAB;" && it.name == "lambda\$existPurchase\$0" }
+    customFingerprint = { methodDef, _ ->
+        methodDef.definingClass == "Lcom/backdrops/wallpapers/data/local/DatabaseHandlerIAB;"
+                && methodDef.name == "lambda\$existPurchase\$0"
+    }
 )

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

@@ -1,15 +1,14 @@
 package app.revanced.patches.backdrops.misc.pro.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.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
@@ -17,7 +16,7 @@ import app.revanced.patches.backdrops.misc.pro.fingerprints.ProUnlockFingerprint
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch
-@Name("pro-unlock")
+@Name("Pro unlock")
 @Description("Unlocks pro-only functions.")
 @ProUnlockCompatibility
 @Version("0.0.1")
@@ -25,17 +24,20 @@ class ProUnlockPatch : BytecodePatch(
     listOf(ProUnlockFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
-        val result = ProUnlockFingerprint.result ?: return PatchResultError("${ProUnlockFingerprint.name} not found")
+        ProUnlockFingerprint.result?.let { result ->
+            val registerIndex = result.scanResult.patternScanResult!!.endIndex - 1
 
-        val moveRegisterInstruction = result.mutableMethod.instruction(result.scanResult.patternScanResult!!.endIndex - 1)
-        val register = (moveRegisterInstruction as OneRegisterInstruction).registerA
+            result.mutableMethod.apply {
+                val register = getInstruction<OneRegisterInstruction>(registerIndex).registerA
+                addInstruction(
+                    result.scanResult.patternScanResult!!.endIndex,
+                    """
+                        const/4 v$register, 0x1
+                    """
+                )
+            }
 
-        result.mutableMethod.addInstructions(
-            result.scanResult.patternScanResult!!.endIndex,
-            """
-                const/4 v$register, 0x1
-            """
-        )
+        } ?: return ProUnlockFingerprint.toErrorResult()
 
         return PatchResultSuccess()
     }

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

@@ -0,0 +1,8 @@
+package app.revanced.patches.candylinkvpn.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.candylink.openvpn")])
+@Target(AnnotationTarget.CLASS)
+internal annotation class UnlockProCompatibility

src/main/kotlin/app/revanced/patches/candylinkvpn/fingereprints/IsPremiumPurchasedFingerprint.kt

@@ -0,0 +1,11 @@
+package app.revanced.patches.candylinkvpn.fingereprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object IsPremiumPurchasedFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef, _ ->
+        methodDef.definingClass.endsWith("PreferenceProvider;") &&
+                methodDef.name == "isPremiumPurchased"
+    }
+) {
+}

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

@@ -0,0 +1,35 @@
+package app.revanced.patches.candylinkvpn.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.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.candylinkvpn.annotations.UnlockProCompatibility
+import app.revanced.patches.candylinkvpn.fingereprints.IsPremiumPurchasedFingerprint
+
+@Patch
+@Name("Unlock pro")
+@Description("Unlocks premium features.")
+@UnlockProCompatibility
+@Version("0.0.1")
+class UnlockProPatch : BytecodePatch(
+    listOf(IsPremiumPurchasedFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        IsPremiumPurchasedFingerprint.result?.mutableMethod?.addInstructions(
+            0,
+            """
+               const/4 v0, 0x1
+               return v0
+            """
+        ) ?: return IsPremiumPurchasedFingerprint.toErrorResult()
+
+        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"), Package("org.citra.citra_emu.canary")])
-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/finanzonline/detection/bootloader/fingerprints/BootStateFingerprint.kt

@@ -2,12 +2,29 @@ package app.revanced.patches.finanzonline.detection.bootloader.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
 
+// Located @ at.gv.bmf.bmf2go.taxequalization.tools.utils.AttestationHelper#isBootStateOk (3.0.1)
 object BootStateFingerprint : MethodFingerprint(
     "Z",
-    access = AccessFlags.PUBLIC.value,
-    strings = listOf("Boot state of device: %s"),
-    customFingerprint = { methodDef ->
-        methodDef.definingClass.endsWith("/AttestationHelper;")
-    }
+    accessFlags = AccessFlags.PUBLIC.value,
+    opcodes = listOf(
+        Opcode.INVOKE_DIRECT,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CONST_4,
+        Opcode.NEW_ARRAY,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CONST_4,
+        Opcode.APUT_OBJECT,
+        Opcode.CONST_STRING,
+        Opcode.INVOKE_STATIC,
+        Opcode.SGET_OBJECT,
+        Opcode.IF_EQ,
+        Opcode.SGET_OBJECT,
+        Opcode.IF_NE,
+        Opcode.GOTO,
+        Opcode.MOVE,
+        Opcode.RETURN
+    )
 )

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

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

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

@@ -0,0 +1,11 @@
+package app.revanced.patches.finanzonline.detection.bootloader.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+
+// Located @ at.gv.bmf.bmf2go.taxequalization.tools.utils.AttestationHelper#createKey (3.0.1)
+object CreateKeyFingerprint : MethodFingerprint(
+    "Z",
+    accessFlags = AccessFlags.PUBLIC.value,
+    strings = listOf("attestation", "SHA-256", "random", "EC", "AndroidKeyStore")
+)

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

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

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

@@ -1,10 +1,22 @@
 package app.revanced.patches.finanzonline.detection.root.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
 
+// Located @ at.gv.bmf.bmf2go.taxequalization.tools.utils.RootDetection#isRooted (3.0.1)
 object RootDetectionFingerprint : MethodFingerprint(
     "L",
-    customFingerprint = { methodDef ->
-        methodDef.definingClass == "Lat/gv/bmf/bmf2go/tools/utils/z;"
-    }
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
+    parameters = listOf("L"),
+    opcodes = listOf(
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.RETURN_OBJECT
+    )
 )

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

@@ -5,7 +5,7 @@ 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.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
@@ -14,7 +14,7 @@ import app.revanced.patches.finanzonline.detection.root.fingerprints.RootDetecti
 import app.revanced.patches.finanzonline.detection.shared.annotations.DetectionCompatibility
 
 @Patch
-@Name("remove-root-detection")
+@Name("Remove root detection")
 @Description("Removes the check for root permissions.")
 @DetectionCompatibility
 @Version("0.0.1")
@@ -29,6 +29,7 @@ class RootDetectionPatch : BytecodePatch(
                 return-object v0
             """
         ) ?: return RootDetectionFingerprint.toErrorResult()
+
         return PatchResultSuccess()
     }
 }

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

@@ -3,6 +3,6 @@ package app.revanced.patches.finanzonline.detection.shared.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility([Package("at.gv.bmf.bmf2go", arrayOf("2.2.0"))])
+@Compatibility([Package("at.gv.bmf.bmf2go")])
 @Target(AnnotationTarget.CLASS)
 internal annotation class DetectionCompatibility

src/main/kotlin/app/revanced/patches/googlerecorder/restrictions/fingereprints/OnApplicationCreateFingerprint.kt

@@ -0,0 +1,12 @@
+package app.revanced.patches.googlerecorder.restrictions.fingereprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object OnApplicationCreateFingerprint : MethodFingerprint(
+    strings = listOf("com.google.android.feature.PIXEL_2017_EXPERIENCE"),
+    customFingerprint = custom@{ methodDef, classDef ->
+        if (methodDef.name != "onCreate") return@custom false
+
+        classDef.type.endsWith("RecorderApplication;")
+    }
+)

src/main/kotlin/app/revanced/patches/googlerecorder/restrictions/patch/RemoveDeviceRestrictions.kt

@@ -0,0 +1,45 @@
+package app.revanced.patches.googlerecorder.restrictions.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Package
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.googlerecorder.restrictions.fingereprints.OnApplicationCreateFingerprint
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Patch
+@Name("Remove device restrictions")
+@Description("Removes restrictions from using the app on any device.")
+@Compatibility([Package("com.google.android.apps.recorder")])
+@Version("0.0.1")
+class RemoveDeviceRestrictions : BytecodePatch(
+    listOf(OnApplicationCreateFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        OnApplicationCreateFingerprint.result?.let {
+            val featureStringIndex = it.scanResult.stringsScanResult!!.matches.first().index
+
+            it.mutableMethod.apply {
+                // Remove check for device restrictions.
+                removeInstructions(featureStringIndex - 2, 5)
+
+                val featureAvailableRegister = getInstruction<OneRegisterInstruction>(featureStringIndex).registerA
+
+                // Override "isPixelDevice()" to return true.
+                addInstruction(featureStringIndex, "const/4 v$featureAvailableRegister, 0x1")
+            }
+        } ?: return OnApplicationCreateFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
+    }
+}

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

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

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

@@ -4,8 +4,8 @@ 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.extensions.InstructionExtensions.removeInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
@@ -14,7 +14,7 @@ import app.revanced.patches.hexeditor.ad.annotations.HexEditorAdsCompatibility
 import app.revanced.patches.hexeditor.ad.fingerprints.PrimaryAdsFingerprint
 
 @Patch
-@Name("disable-ads")
+@Name("Disable ads")
 @Description("Disables ads in HexEditor.")
 @HexEditorAdsCompatibility
 @Version("0.0.1")

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

@@ -4,5 +4,5 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 
 object CheckProFingerprint : MethodFingerprint(
     "Z",
-    customFingerprint = { it.definingClass.endsWith("IPSPurchaseRepository;")}
+    customFingerprint = { methodDef, _ -> methodDef.definingClass.endsWith("IPSPurchaseRepository;")}
 )

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

@@ -4,8 +4,7 @@ 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.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
@@ -14,7 +13,7 @@ import app.revanced.patches.iconpackstudio.misc.pro.annotations.UnlockProCompati
 import app.revanced.patches.iconpackstudio.misc.pro.fingerprints.CheckProFingerprint
 
 @Patch
-@Name("unlock-pro")
+@Name("Unlock pro")
 @Description("Unlocks all pro features.")
 @UnlockProCompatibility
 @Version("0.0.1")

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

@@ -5,8 +5,8 @@ import org.jf.dexlib2.AccessFlags
 
 object RootDetectionFingerprint : MethodFingerprint(
     "V",
-    access = AccessFlags.PUBLIC.value,
-    customFingerprint = { methodDef ->
+    accessFlags = AccessFlags.PUBLIC.value,
+    customFingerprint = { methodDef, _ ->
         methodDef.definingClass.endsWith("/DeviceIntegrityCheck;")
     }
 )

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

@@ -1,8 +1,10 @@
 package app.revanced.patches.idaustria.detection.root.patch
 
-import app.revanced.patcher.annotation.*
+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.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
@@ -11,7 +13,7 @@ import app.revanced.patches.idaustria.detection.root.fingerprints.RootDetectionF
 import app.revanced.patches.idaustria.detection.shared.annotations.DetectionCompatibility
 
 @Patch
-@Name("remove-root-detection")
+@Name("Remove root detection")
 @Description("Removes the check for root permissions and unlocked bootloader.")
 @DetectionCompatibility
 @Version("0.0.1")
@@ -19,7 +21,7 @@ class RootDetectionPatch : BytecodePatch(
     listOf(RootDetectionFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
-        RootDetectionFingerprint.result!!.mutableMethod.addInstructions(0, "return-void")
+        RootDetectionFingerprint.result!!.mutableMethod.addInstruction(0, "return-void")
         return PatchResultSuccess()
     }
 }

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

@@ -6,8 +6,8 @@ import org.jf.dexlib2.AccessFlags
 object SpoofSignatureFingerprint : MethodFingerprint(
     "L",
     parameters = listOf("L"),
-    access = AccessFlags.PRIVATE.value,
-    customFingerprint = { methodDef ->
+    accessFlags = AccessFlags.PRIVATE.value,
+    customFingerprint = { methodDef, _ ->
         methodDef.definingClass.endsWith("/SL2Step1Task;") && methodDef.name == "getPubKey"
     }
 )

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

@@ -1,8 +1,10 @@
 package app.revanced.patches.idaustria.detection.signature.patch
 
-import app.revanced.patcher.annotation.*
+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.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
@@ -11,7 +13,7 @@ import app.revanced.patches.idaustria.detection.shared.annotations.DetectionComp
 import app.revanced.patches.idaustria.detection.signature.fingerprints.SpoofSignatureFingerprint
 
 @Patch
-@Name("spoof-signature")
+@Name("Spoof signature")
 @Description("Spoofs the signature of the app.")
 @DetectionCompatibility
 @Version("0.0.1")

src/main/kotlin/app/revanced/patches/inshorts/ad/fingerprints/InshortsAdsFingerprint.kt

@@ -1,9 +1,8 @@
 package app.revanced.patches.inshorts.ad.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
 
 object InshortsAdsFingerprint : MethodFingerprint(
     "V",
-    strings = listOf("GoogleAdLoader","exception in requestAd")
+    strings = listOf("GoogleAdLoader","exception in requestAd"),
 )

src/main/kotlin/app/revanced/patches/inshorts/ad/patch/InshortsAdsPatch.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
@@ -14,7 +14,7 @@ import app.revanced.patches.inshorts.ad.annotations.HideAdsCompatibility
 import app.revanced.patches.inshorts.ad.fingerprints.InshortsAdsFingerprint
 
 @Patch
-@Name("hide-ads")
+@Name("Hide ads")
 @Description("Removes ads from Inshorts.")
 @HideAdsCompatibility
 @Version("0.0.1")

src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/MediaAdFingerprint.kt

@@ -4,17 +4,18 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.ClassDef
 import org.jf.dexlib2.iface.Method
 
 abstract class MediaAdFingerprint(
     returnType: String? = "Z",
-    access: Int? = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    accessFlags: Int? = AccessFlags.PUBLIC or AccessFlags.FINAL,
     parameters: Iterable<String>? = listOf(),
     opcodes: Iterable<Opcode>?,
-    customFingerprint: ((methodDef: Method) -> Boolean)? = null
+    customFingerprint: ((methodDef: Method, classDef: ClassDef) -> Boolean)? = null
 ) : MethodFingerprint(
     returnType,
-    access,
+    accessFlags,
     parameters,
     opcodes,
     customFingerprint = customFingerprint

src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/PaidPartnershipAdFingerprint.kt

@@ -14,7 +14,7 @@ object PaidPartnershipAdFingerprint : MediaAdFingerprint(
         Opcode.IPUT_BOOLEAN,
         Opcode.IPUT_BOOLEAN
     ),
-    customFingerprint = { methodDef ->
+    customFingerprint = { methodDef, _ ->
         methodDef.definingClass.endsWith("ClipsEditMetadataController;")
     }
 ) {

src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/patch/HideTimelineAdsPatch.kt

@@ -3,9 +3,9 @@ package app.revanced.patches.instagram.patches.ads.timeline.patch
 import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.*
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.instruction
-import app.revanced.patcher.extensions.removeInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
@@ -22,9 +22,9 @@ import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch
-@Name("hide-timeline-ads")
+@Name("Hide timeline ads")
 @Description("Removes ads from the timeline.")
-@Compatibility([Package("com.instagram.android")])
+@Compatibility([Package("com.instagram.android", arrayOf("275.0.0.27.98"))])
 @Version("0.0.1")
 class HideTimelineAdsPatch : BytecodePatch(
     listOf(
@@ -55,8 +55,8 @@ class HideTimelineAdsPatch : BytecodePatch(
             val scanStart = scanResult.patternScanResult!!.startIndex
             val jumpIndex = scanStart - 1
 
-            val mediaInstanceRegister = (mutableMethod.instruction(scanStart) as FiveRegisterInstruction).registerC
-            val freeRegister = (mutableMethod.instruction(jumpIndex) as OneRegisterInstruction).registerA
+            val mediaInstanceRegister = mutableMethod.getInstruction<FiveRegisterInstruction>(scanStart).registerC
+            val freeRegister = mutableMethod.getInstruction<OneRegisterInstruction>(jumpIndex).registerA
 
             val returnFalseLabel = "an_ad"
 
@@ -77,14 +77,12 @@ class HideTimelineAdsPatch : BytecodePatch(
 
             val insertIndex = scanStart + 3
 
-            mutableMethod.addInstructions(
+            mutableMethod.addInstructionsWithLabels(
                 insertIndex,
                 checkForAdInstructions,
-                listOf(
-                    ExternalLabel(
-                        returnFalseLabel,
-                        mutableMethod.instruction(mutableMethod.implementation!!.instructions.size - 2 /* return false = ad */)
-                    )
+                ExternalLabel(
+                    returnFalseLabel,
+                    mutableMethod.getInstruction(mutableMethod.implementation!!.instructions.size - 2 /* return false = ad */)
                 )
             )
 
@@ -93,10 +91,10 @@ class HideTimelineAdsPatch : BytecodePatch(
             // region Jump to checks for ads from previous patch.
 
             mutableMethod.apply {
-                addInstructions(
+                addInstructionsWithLabels(
                     jumpIndex + 1,
                     "if-nez v$freeRegister, :start_check",
-                    listOf(ExternalLabel("start_check", instruction(insertIndex)))
+                    ExternalLabel("start_check", getInstruction(insertIndex))
                 )
             }.removeInstruction(jumpIndex)
 

src/main/kotlin/app/revanced/patches/irplus/ad/patch/IrplusAdsPatch.kt

@@ -4,7 +4,7 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
@@ -14,7 +14,7 @@ import app.revanced.patches.irplus.ad.fingerprints.IrplusAdsFingerprint
 
 
 @Patch
-@Name("remove-ads")
+@Name("Remove ads")
 @Description("Removes all ads from the app.")
 @IrplusAdsCompatibility
 @Version("0.0.1")

src/main/kotlin/app/revanced/patches/memegenerator/detection/license/fingerprint/LicenseValidationFingerprint.kt

@@ -7,7 +7,7 @@ import org.jf.dexlib2.Opcode
 
 object LicenseValidationFingerprint : MethodFingerprint(
     returnType = "Z",
-    access = AccessFlags.PUBLIC or AccessFlags.STATIC,
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
     parameters = listOf("Landroid/content/Context;"),
     opcodes = listOf(
         Opcode.INVOKE_STATIC,

src/main/kotlin/app/revanced/patches/memegenerator/detection/license/patch/LicenseValidationPatch.kt

@@ -4,7 +4,7 @@ import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.replaceInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess

src/main/kotlin/app/revanced/patches/memegenerator/detection/signature/fingerprint/VerifySignatureFingerprint.kt

@@ -9,7 +9,7 @@ import org.jf.dexlib2.Opcode
 @FuzzyPatternScanMethod(2)
 object VerifySignatureFingerprint : MethodFingerprint(
     returnType = "Z",
-    access = AccessFlags.PUBLIC or AccessFlags.STATIC,
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
     parameters = listOf("Landroid/app/Activity;"),
     opcodes = listOf(
         Opcode.SGET_OBJECT,

src/main/kotlin/app/revanced/patches/memegenerator/detection/signature/patch/SignatureVerificationPatch.kt

@@ -4,7 +4,7 @@ import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.replaceInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess

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

@@ -3,6 +3,15 @@ package app.revanced.patches.memegenerator.misc.pro.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility([Package("com.zombodroid.MemeGenerator", arrayOf("4.6364"))])
+@Compatibility(
+    [Package(
+        "com.zombodroid.MemeGenerator", arrayOf(
+            "4.6364",
+            "4.6370",
+            "4.6375",
+            "4.6377",
+        )
+    )]
+)
 @Target(AnnotationTarget.CLASS)
 internal annotation class UnlockProCompatibility

src/main/kotlin/app/revanced/patches/memegenerator/misc/pro/fingerprint/IsFreeVersionFingerprint.kt

@@ -7,7 +7,7 @@ import org.jf.dexlib2.Opcode
 
 object IsFreeVersionFingerprint : MethodFingerprint(
     returnType = "Ljava/lang/Boolean;",
-    access = AccessFlags.PUBLIC or AccessFlags.STATIC,
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
     strings = listOf("free"),
     parameters = listOf("Landroid/content/Context;"),
     opcodes = listOf(

src/main/kotlin/app/revanced/patches/memegenerator/misc/pro/patch/UnlockProVersionPatch.kt

@@ -5,7 +5,7 @@ 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.replaceInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
@@ -17,7 +17,7 @@ import app.revanced.patches.memegenerator.misc.pro.annotations.UnlockProCompatib
 import app.revanced.patches.memegenerator.misc.pro.fingerprint.IsFreeVersionFingerprint
 
 @Patch
-@Name("unlock-pro")
+@Name("Unlock pro")
 @Description("Unlocks pro features.")
 @DependsOn([
     SignatureVerificationPatch::class,

src/main/kotlin/app/revanced/patches/messenger/ads/inbox/fingerprints/LoadInboxAdsFingerprint.kt

@@ -10,9 +10,9 @@ object LoadInboxAdsFingerprint : MethodFingerprint(
         "ads_load_begin",
         "inbox_ads_fetch_start"
     ),
-    access = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    customFingerprint = {
-        it.definingClass == "Lcom/facebook/messaging/business/inboxads/plugins/inboxads/itemsupplier/InboxAdsItemSupplierImplementation;"
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
+    customFingerprint = { methodDef, _ ->
+        methodDef.definingClass == "Lcom/facebook/messaging/business/inboxads/plugins/inboxads/itemsupplier/InboxAdsItemSupplierImplementation;"
     }
 )
 

src/main/kotlin/app/revanced/patches/messenger/ads/inbox/patch/HideInboxAdsPatch.kt

@@ -3,7 +3,7 @@ package app.revanced.patches.messenger.ads.inbox.patch
 import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.*
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
@@ -11,7 +11,7 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.messenger.ads.inbox.fingerprints.LoadInboxAdsFingerprint
 
 @Patch
-@Name("hide-inbox-ads")
+@Name("Hide inbox ads")
 @Description("Hides ads in inbox.")
 @Compatibility([Package("com.facebook.orca")])
 @Version("0.0.1")

src/main/kotlin/app/revanced/patches/messenger/inputfield/fingerprints/SendTypingIndicatorFingerprint.kt

@@ -0,0 +1,15 @@
+package app.revanced.patches.messenger.inputfield.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.dexbacked.value.DexBackedStringEncodedValue
+
+object SendTypingIndicatorFingerprint : MethodFingerprint(
+    returnType = "V",
+    parameters = listOf(),
+    customFingerprint = { methodDef, classDef ->
+        methodDef.name == "run" && classDef.fields.any {
+            it.name == "__redex_internal_original_name"
+                    && (it.initialValue as? DexBackedStringEncodedValue)?.value == "ConversationTypingContext\$sendActiveStateRunnable\$1"
+        }
+    }
+)

src/main/kotlin/app/revanced/patches/messenger/inputfield/fingerprints/SwitchMessangeInputEmojiButtonFingerprint.kt

@@ -0,0 +1,18 @@
+package app.revanced.patches.messenger.inputfield.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.Opcode
+
+object SwitchMessangeInputEmojiButtonFingerprint : MethodFingerprint(
+    returnType = "V",
+    parameters = listOf("L", "Z"),
+    strings = listOf("afterTextChanged", "expression_search"),
+    opcodes = listOf(
+        Opcode.IGET_OBJECT,
+        Opcode.IF_EQZ,
+        Opcode.CONST_STRING,
+        Opcode.GOTO,
+        Opcode.CONST_STRING,
+        Opcode.GOTO
+    )
+)

src/main/kotlin/app/revanced/patches/messenger/inputfield/patch/DisableSwitchingEmojiToStickerInMessageInputField.kt

@@ -0,0 +1,37 @@
+package app.revanced.patches.messenger.inputfield.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.*
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.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.messenger.inputfield.fingerprints.SwitchMessangeInputEmojiButtonFingerprint
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Patch
+@Name("Disable switching emoji to sticker in message input field")
+@Description("Disables switching from emoji to sticker search mode in message input field")
+@Compatibility([Package("com.facebook.orca")])
+@Version("0.0.1")
+class DisableSwitchingEmojiToStickerInMessageInputField : BytecodePatch(listOf(SwitchMessangeInputEmojiButtonFingerprint)) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        SwitchMessangeInputEmojiButtonFingerprint.result?.let {
+            val setStringIndex = it.scanResult.patternScanResult!!.startIndex + 2
+
+            it.mutableMethod.apply {
+                val targetRegister = getInstruction<OneRegisterInstruction>(setStringIndex).registerA
+
+                replaceInstruction(
+                    setStringIndex,
+                    "const-string v$targetRegister, \"expression\""
+                )
+            }
+        } ?: throw SwitchMessangeInputEmojiButtonFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/messenger/inputfield/patch/DisableTypingIndicator.kt

@@ -0,0 +1,29 @@
+package app.revanced.patches.messenger.inputfield.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Package
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.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.messenger.inputfield.fingerprints.SendTypingIndicatorFingerprint
+
+@Patch
+@Name("Disable typing indicator")
+@Description("Disables the indicator while typing a message")
+@Compatibility([Package("com.facebook.orca")])
+@Version("0.0.1")
+class DisableTypingIndicator : BytecodePatch(listOf(SendTypingIndicatorFingerprint)) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        SendTypingIndicatorFingerprint.result?.mutableMethod?.replaceInstruction(0, "return-void")
+            ?: throw SendTypingIndicatorFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
+    }
+}

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

@@ -13,7 +13,7 @@ object UnlockProFingerprint : MethodFingerprint(
         Opcode.IGET_BOOLEAN,
         Opcode.RETURN
     ),
-    customFingerprint = { methodDef ->
+    customFingerprint = { methodDef, _ ->
         methodDef.definingClass.endsWith("MainActivity;")
     }
 )

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

@@ -4,7 +4,7 @@ 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.InstructionExtensions.addInstructions
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
@@ -13,7 +13,7 @@ import app.revanced.patches.moneymanager.annotations.UnlockProCompatibility
 import app.revanced.patches.moneymanager.fingerprints.UnlockProFingerprint
 
 @Patch
-@Name("unlock-pro")
+@Name("Unlock pro")
 @Description("Unlocks pro features.")
 @UnlockProCompatibility
 @Version("0.0.1")
@@ -24,10 +24,9 @@ class UnlockProPatch : BytecodePatch(
        UnlockProFingerprint.result!!.mutableMethod.addInstructions(
             0,
             """
-                   const/4 v0, 0x1
-                   
-                   return v0 
-                """
+               const/4 v0, 0x1
+               return v0 
+            """
         )
         return PatchResultSuccess()
     }

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

@@ -4,33 +4,32 @@ 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.InstructionExtensions.addInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.ad.video.annotations.MusicVideoAdsCompatibility
 import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsConstructorFingerprint
 import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsFingerprint
+import app.revanced.patches.music.annotations.MusicCompatibility
 
 @Patch
-@Name("music-video-ads")
+@Name("Music video ads")
 @Description("Removes ads in the music player.")
-@MusicVideoAdsCompatibility
+@MusicCompatibility
 @Version("0.0.1")
 class MusicVideoAdsPatch : BytecodePatch(
-    listOf(
-        ShowMusicVideoAdsConstructorFingerprint
-    )
+    listOf(ShowMusicVideoAdsConstructorFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
         ShowMusicVideoAdsFingerprint.resolve(context, ShowMusicVideoAdsConstructorFingerprint.result!!.classDef)
 
         val result = ShowMusicVideoAdsFingerprint.result!!
 
-        result.mutableMethod.addInstructions(
-            result.scanResult.patternScanResult!!.startIndex, """
+        result.mutableMethod.addInstruction(
+            result.scanResult.patternScanResult!!.startIndex,
+            """
                 const/4 p1, 0x0
             """
         )

src/main/kotlin/app/revanced/patches/music/annotations/MusicCompatibility.kt

@@ -1,8 +1,8 @@
-package app.revanced.patches.music.ad.video.annotations
+package app.revanced.patches.music.annotations
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.google.android.apps.youtube.music")])
 @Target(AnnotationTarget.CLASS)
-internal annotation class MusicVideoAdsCompatibility
+internal annotation class MusicCompatibility

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

@@ -1,8 +0,0 @@
-package app.revanced.patches.music.audio.codecs.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.apps.youtube.music")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class CodecsUnlockCompatibility

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

@@ -10,15 +10,15 @@ 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.annotations.MusicCompatibility
 import app.revanced.patches.music.audio.codecs.fingerprints.AllCodecsReferenceFingerprint
 import app.revanced.patches.music.audio.codecs.fingerprints.CodecsLockFingerprint
 import org.jf.dexlib2.Opcode
 
 @Patch
-@Name("codecs-unlock")
+@Name("Codecs unlock")
 @Description("Adds more audio codec options. The new audio codecs usually result in better audio quality.")
-@CodecsUnlockCompatibility
+@MusicCompatibility
 @Version("0.0.1")
 class CodecsUnlockPatch : BytecodePatch(
     listOf(

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

@@ -1,8 +0,0 @@
-package app.revanced.patches.music.audio.exclusiveaudio.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.apps.youtube.music")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class ExclusiveAudioCompatibility

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

@@ -4,24 +4,22 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.addInstruction
-import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.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.music.audio.exclusiveaudio.annotations.ExclusiveAudioCompatibility
+import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.audio.exclusiveaudio.fingerprints.AudioOnlyEnablerFingerprint
 
 @Patch
-@Name("exclusive-audio-playback")
+@Name("Exclusive audio playback")
 @Description("Enables the option to play music without video.")
-@ExclusiveAudioCompatibility
+@MusicCompatibility
 @Version("0.0.1")
 class ExclusiveAudioPatch : BytecodePatch(
-    listOf(
-        AudioOnlyEnablerFingerprint
-    )
+    listOf(AudioOnlyEnablerFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
         val method = AudioOnlyEnablerFingerprint.result!!.mutableMethod

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

@@ -1,8 +0,0 @@
-package app.revanced.patches.music.layout.compactheader.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.apps.youtube.music")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class CompactHeaderCompatibility

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

@@ -4,24 +4,22 @@ 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.InstructionExtensions.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.music.layout.compactheader.annotations.CompactHeaderCompatibility
+import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.layout.compactheader.fingerprints.CompactHeaderConstructorFingerprint
 import org.jf.dexlib2.builder.instruction.BuilderInstruction11x
 
 @Patch(false)
-@Name("compact-header")
+@Name("Compact header")
 @Description("Hides the music category bar at the top of the homepage.")
-@CompactHeaderCompatibility
+@MusicCompatibility
 @Version("0.0.1")
 class CompactHeaderPatch : BytecodePatch(
-    listOf(
-        CompactHeaderConstructorFingerprint
-    )
+    listOf(CompactHeaderConstructorFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
         val result = CompactHeaderConstructorFingerprint.result!!

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

@@ -1,8 +0,0 @@
-package app.revanced.patches.music.layout.minimizedplayback.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.apps.youtube.music")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class MinimizedPlaybackCompatibility

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

@@ -4,29 +4,28 @@ 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.InstructionExtensions.addInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.layout.minimizedplayback.annotations.MinimizedPlaybackCompatibility
+import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.layout.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
 
 @Patch
-@Name("minimized-playback-music")
+@Name("Minimized playback music")
 @Description("Enables minimized playback on Kids music.")
-@MinimizedPlaybackCompatibility
+@MusicCompatibility
 @Version("0.0.1")
 class MinimizedPlaybackPatch : BytecodePatch(
-    listOf(
-        MinimizedPlaybackManagerFingerprint
-    )
+    listOf(MinimizedPlaybackManagerFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
-        MinimizedPlaybackManagerFingerprint.result!!.mutableMethod.addInstructions(
-            0, """
+        MinimizedPlaybackManagerFingerprint.result!!.mutableMethod.addInstruction(
+            0,
+            """
                 return-void
-                """
+            """
         )
 
         return PatchResultSuccess()

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

@@ -1,31 +0,0 @@
-package app.revanced.patches.music.layout.premium.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [Package(
-        "com.google.android.apps.youtube.music",
-        arrayOf(
-            "5.14.53",
-            "5.16.51",
-            "5.17.51",
-            "5.21.52",
-            "5.22.54",
-            "5.23.50",
-            "5.25.51",
-            "5.25.52",
-            "5.26.52",
-            "5.27.51",
-            "5.28.52",
-            "5.29.52",
-            "5.31.50",
-            "5.34.51",
-            "5.36.51",
-            "5.38.53",
-            "5.39.52"
-        )
-    )]
-)
-@Target(AnnotationTarget.CLASS)
-internal annotation class HideGetPremiumCompatibility

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

@@ -4,26 +4,24 @@ 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.replaceInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.music.layout.premium.annotations.HideGetPremiumCompatibility
+import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.layout.premium.fingerprints.HideGetPremiumFingerprint
 import app.revanced.patches.music.layout.premium.fingerprints.HideGetPremiumParentFingerprint
 
 @Patch
-@Name("hide-get-premium")
+@Name("Hide get premium")
 @Description("Removes all \"Get Premium\" evidences from the avatar menu.")
-@HideGetPremiumCompatibility
+@MusicCompatibility
 @Version("0.0.1")
 class HideGetPremiumPatch : BytecodePatch(
-    listOf(
-        HideGetPremiumParentFingerprint
-    )
+    listOf(HideGetPremiumParentFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
         val parentResult = HideGetPremiumParentFingerprint.result!!
@@ -33,17 +31,19 @@ class HideGetPremiumPatch : BytecodePatch(
 
         val parentMethod = parentResult.mutableMethod
         parentMethod.replaceInstruction(
-            startIndex, """
-            const/4 v1, 0x0
-        """
+            startIndex,
+            """
+                const/4 v1, 0x0
+            """
         )
 
         val result = HideGetPremiumFingerprint.result!!
         val method = result.mutableMethod
-        method.addInstructions(
-            startIndex, """
-            const/16 v0, 0x8
-        """
+        method.addInstruction(
+            startIndex,
+            """
+                const/16 v0, 0x8
+            """
         )
 
         return PatchResultSuccess()

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

@@ -1,13 +0,0 @@
-package app.revanced.patches.music.layout.tastebuilder.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-/**
- * -- Note 2022-08-05 --
- * Since 5.17.xx the tastebuilder component is dismissible, so this patch is less useful
- * also it is partly litho now
- */
-@Compatibility([Package("com.google.android.apps.youtube.music")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class RemoveTasteBuilderCompatibility

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

@@ -1,34 +0,0 @@
-package app.revanced.patches.music.layout.tastebuilder.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-object TasteBuilderConstructorFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L"), listOf(
-        Opcode.INVOKE_DIRECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CONST,
-        Opcode.CONST_4,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.CONST
-    )
-)

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

@@ -1,41 +0,0 @@
-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.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.music.layout.tastebuilder.annotations.RemoveTasteBuilderCompatibility
-import app.revanced.patches.music.layout.tastebuilder.fingerprints.TasteBuilderConstructorFingerprint
-import org.jf.dexlib2.iface.instruction.formats.Instruction22c
-
-@Patch
-@Name("tasteBuilder-remover")
-@Description("Removes the \"Tell us which artists you like\" card from the home screen.")
-@RemoveTasteBuilderCompatibility
-@Version("0.0.1")
-class RemoveTasteBuilderPatch : BytecodePatch(
-    listOf(
-        TasteBuilderConstructorFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext): PatchResult {
-        val result = TasteBuilderConstructorFingerprint.result!!
-        val method = result.mutableMethod
-
-        val insertIndex = result.scanResult.patternScanResult!!.endIndex - 8
-        val register = (method.implementation!!.instructions[insertIndex] as Instruction22c).registerA
-        method.addInstructions(
-            insertIndex, """
-                const/16 v1, 0x8
-                invoke-virtual {v${register}, v1}, Landroid/view/View;->setVisibility(I)V
-            """
-        )
-
-        return PatchResultSuccess()
-    }
-}

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

@@ -1,8 +0,0 @@
-package app.revanced.patches.music.layout.upgradebutton.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.apps.youtube.music")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class RemoveUpgradeButtonCompatibility

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

@@ -4,13 +4,13 @@ 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.InstructionExtensions.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.util.smali.toInstructions
-import app.revanced.patches.music.layout.upgradebutton.annotations.RemoveUpgradeButtonCompatibility
+import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.layout.upgradebutton.fingerprints.PivotBarConstructorFingerprint
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.builder.instruction.BuilderInstruction22t
@@ -19,14 +19,12 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 
 
 @Patch
-@Name("upgrade-button-remover")
+@Name("Upgrade button remover")
 @Description("Removes the upgrade tab from the pivot bar.")
-@RemoveUpgradeButtonCompatibility
+@MusicCompatibility
 @Version("0.0.1")
 class RemoveUpgradeButtonPatch : BytecodePatch(
-    listOf(
-        PivotBarConstructorFingerprint
-    )
+    listOf(PivotBarConstructorFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
         val result = PivotBarConstructorFingerprint.result!!

src/main/kotlin/app/revanced/patches/music/misc/androidauto/annotations/BypassCertificateChecksCompatibility.kt

@@ -1,35 +0,0 @@
-package app.revanced.patches.music.misc.androidauto.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [Package(
-        "com.google.android.apps.youtube.music",
-        arrayOf(
-            "5.14.53",
-            "5.16.51",
-            "5.17.51",
-            "5.21.52",
-            "5.22.54",
-            "5.23.50",
-            "5.25.51",
-            "5.25.52",
-            "5.26.52",
-            "5.27.51",
-            "5.28.52",
-            "5.29.52",
-            "5.31.50",
-            "5.34.51",
-            "5.36.51",
-            "5.38.53",
-            "5.39.52",
-            "5.40.51",
-            "5.41.50",
-            "5.48.52"
-        )
-    )]
-)
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-internal annotation class BypassCertificateChecksCompatibility

src/main/kotlin/app/revanced/patches/music/misc/androidauto/fingerprints/CheckCertificateFingerprint.kt

@@ -1,10 +1,12 @@
 package app.revanced.patches.music.misc.androidauto.fingerprints
 
+import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.music.misc.androidauto.patch.BypassCertificateChecksPatch
-
+import org.jf.dexlib2.AccessFlags
 
 object CheckCertificateFingerprint : MethodFingerprint(
-    "Z",
-    strings = listOf("No match") // Unique in combination with boolean return type
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    returnType = "Z",
+    parameters = listOf("Ljava/lang/String;"),
+    strings = listOf("X509", "Failed to get certificate.")
 )

src/main/kotlin/app/revanced/patches/music/misc/androidauto/patch/BypassCertificateChecksPatch.kt

@@ -5,35 +5,30 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.addInstruction
-import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.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.music.misc.androidauto.annotations.BypassCertificateChecksCompatibility
+import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.misc.androidauto.fingerprints.CheckCertificateFingerprint
 
 @Patch
-@Name("bypass-certificate-checks")
+@Name("Bypass certificate checks")
 @Description("Bypasses certificate checks which prevent YouTube Music from working on Android Auto.")
-@BypassCertificateChecksCompatibility
+@MusicCompatibility
 @Version("0.0.1")
 class BypassCertificateChecksPatch : BytecodePatch(
-    listOf(
-        CheckCertificateFingerprint
-    )
+    listOf(CheckCertificateFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
-        CheckCertificateFingerprint.result?.let { result ->
-            val noMatchIndex = result.scanResult.stringsScanResult!!.matches.first().index
-
-            result.mutableMethod.apply {
-                val isPartnerIndex = noMatchIndex + 2
-
-                replaceInstruction(isPartnerIndex, "const/4 p1, 0x1")
-                addInstruction(isPartnerIndex + 1, "return p1")
-            }
+        CheckCertificateFingerprint.result?.apply {
+            mutableMethod.addInstructions(
+                0, """
+                const/4 v0, 0x1
+                return v0
+                """
+            )
         } ?: return CheckCertificateFingerprint.toErrorResult()
 
         return PatchResultSuccess()

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

@@ -1,8 +0,0 @@
-package app.revanced.patches.music.misc.microg.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.apps.youtube.music")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class MusicMicroGPatchCompatibility

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

@@ -1,65 +1,65 @@
-package app.revanced.patches.music.misc.microg.patch.bytecode
-
-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.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.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.music.misc.microg.shared.Constants.REVANCED_MUSIC_PACKAGE_NAME
-import app.revanced.patches.youtube.misc.microg.shared.Constants
-import app.revanced.util.microg.MicroGBytecodeHelper
-
-@Patch
-@DependsOn([MusicMicroGResourcePatch::class])
-@Name("music-microg-support")
-@Description("Allows YouTube Music ReVanced to run without root and under a different package name.")
-@MusicMicroGPatchCompatibility
-@Version("0.0.2")
-class MusicMicroGBytecodePatch : BytecodePatch(
-    listOf(
-        ServiceCheckFingerprint,
-        GooglePlayUtilityFingerprint,
-        CastDynamiteModuleFingerprint,
-        CastDynamiteModuleV2Fingerprint,
-        CastContextFetchFingerprint,
-        PrimeFingerprint,
-    )
-) {
-    // NOTE: the previous patch also replaced the following strings, but it seems like they are not needed:
-    // - "com.google.android.gms.chimera.GmsIntentOperationService",
-    // - "com.google.android.gms.phenotype.internal.IPhenotypeCallbacks",
-    // - "com.google.android.gms.phenotype.internal.IPhenotypeService",
-    // - "com.google.android.gms.phenotype.PACKAGE_NAME",
-    // - "com.google.android.gms.phenotype.UPDATE",
-    // - "com.google.android.gms.phenotype",
-    override fun execute(context: BytecodeContext) =
-        // apply common microG patch
-        MicroGBytecodeHelper.patchBytecode(
-            context,
-            arrayOf(
-                MicroGBytecodeHelper.packageNameTransform(
-                    Constants.PACKAGE_NAME,
-                    Constants.REVANCED_PACKAGE_NAME
-                )
-            ),
-            MicroGBytecodeHelper.PrimeMethodTransformationData(
-                PrimeFingerprint,
-                MUSIC_PACKAGE_NAME,
-                REVANCED_MUSIC_PACKAGE_NAME
-            ),
-            listOf(
-                ServiceCheckFingerprint,
-                GooglePlayUtilityFingerprint,
-                CastDynamiteModuleFingerprint,
-                CastDynamiteModuleV2Fingerprint,
-                CastContextFetchFingerprint
-            )
-        ).let { PatchResultSuccess() }
-}
+package app.revanced.patches.music.misc.microg.patch.bytecode
+
+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.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.music.annotations.MusicCompatibility
+import app.revanced.patches.music.misc.microg.fingerprints.*
+import app.revanced.patches.music.misc.microg.patch.resource.MicroGResourcePatch
+import app.revanced.patches.music.misc.microg.shared.Constants.MUSIC_PACKAGE_NAME
+import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_PACKAGE_NAME
+import app.revanced.patches.youtube.misc.microg.shared.Constants
+import app.revanced.util.microg.MicroGBytecodeHelper
+
+@Patch
+@DependsOn([MicroGResourcePatch::class])
+@Name("Vanced MicroG support")
+@Description("Allows YouTube Music ReVanced to run without root and under a different package name.")
+@MusicCompatibility
+@Version("0.0.2")
+class MicroGBytecodePatch : BytecodePatch(
+    listOf(
+        ServiceCheckFingerprint,
+        GooglePlayUtilityFingerprint,
+        CastDynamiteModuleFingerprint,
+        CastDynamiteModuleV2Fingerprint,
+        CastContextFetchFingerprint,
+        PrimeFingerprint,
+    )
+) {
+    // NOTE: the previous patch also replaced the following strings, but it seems like they are not needed:
+    // - "com.google.android.gms.chimera.GmsIntentOperationService",
+    // - "com.google.android.gms.phenotype.internal.IPhenotypeCallbacks",
+    // - "com.google.android.gms.phenotype.internal.IPhenotypeService",
+    // - "com.google.android.gms.phenotype.PACKAGE_NAME",
+    // - "com.google.android.gms.phenotype.UPDATE",
+    // - "com.google.android.gms.phenotype",
+    override fun execute(context: BytecodeContext) =
+        // apply common microG patch
+        MicroGBytecodeHelper.patchBytecode(
+            context,
+            arrayOf(
+                MicroGBytecodeHelper.packageNameTransform(
+                    Constants.PACKAGE_NAME,
+                    Constants.REVANCED_PACKAGE_NAME
+                )
+            ),
+            MicroGBytecodeHelper.PrimeMethodTransformationData(
+                PrimeFingerprint,
+                MUSIC_PACKAGE_NAME,
+                REVANCED_MUSIC_PACKAGE_NAME
+            ),
+            listOf(
+                ServiceCheckFingerprint,
+                GooglePlayUtilityFingerprint,
+                CastDynamiteModuleFingerprint,
+                CastDynamiteModuleV2Fingerprint,
+                CastContextFetchFingerprint
+            )
+        ).let { PatchResultSuccess() }
+}

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

@@ -7,7 +7,7 @@ import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
+import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.misc.microg.shared.Constants.MUSIC_PACKAGE_NAME
 import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_APP_NAME
 import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_PACKAGE_NAME
@@ -16,11 +16,11 @@ import app.revanced.patches.music.misc.microg.shared.Constants.SPOOFED_PACKAGE_S
 import app.revanced.util.microg.MicroGManifestHelper
 import app.revanced.util.microg.MicroGResourceHelper
 
-@Name("music-microg-resource-patch")
+@Name("Vanced MicroG resource patch")
 @Description("Resource patch to allow YouTube Music ReVanced to run without root and under a different package name.")
-@MusicMicroGPatchCompatibility
+@MusicCompatibility
 @Version("0.0.2")
-class MusicMicroGResourcePatch : ResourcePatch {
+class MicroGResourcePatch : ResourcePatch {
     override fun execute(context: ResourceContext): PatchResult {
         // update manifest
         MicroGResourceHelper.patchManifest(

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

@@ -1,8 +0,0 @@
-package app.revanced.patches.music.premium.backgroundplay.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility([Package("com.google.android.apps.youtube.music")])
-@Target(AnnotationTarget.CLASS)
-internal annotation class BackgroundPlayCompatibility

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

@@ -4,23 +4,21 @@ 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.InstructionExtensions.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.music.premium.backgroundplay.annotations.BackgroundPlayCompatibility
+import app.revanced.patches.music.annotations.MusicCompatibility
 import app.revanced.patches.music.premium.backgroundplay.fingerprints.BackgroundPlaybackDisableFingerprint
 
 @Patch
-@Name("background-play")
+@Name("Background play")
 @Description("Enables playing music in the background.")
-@BackgroundPlayCompatibility
+@MusicCompatibility
 @Version("0.0.1")
 class BackgroundPlayPatch : BytecodePatch(
-    listOf(
-        BackgroundPlaybackDisableFingerprint
-    )
+    listOf(BackgroundPlaybackDisableFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
         BackgroundPlaybackDisableFingerprint.result!!.mutableMethod.addInstructions(