chore(release): 2.138.0 [skip ci]

# [2.138.0](https://github.com/revanced/revanced-patches/compare/v2.137.0...v2.138.0) (2022-12-05)

### Features

* **youtube/debugging:** print stack traces ([4289a49](d77c9fec15))

.github/ISSUE_TEMPLATE/bug-issue.yml

@@ -0,0 +1,73 @@
+name: 🐞 Bug report
+description: Report a very clearly broken issue.
+title: 'bug: <title>'
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # ReVanced bug report
+
+        Important to note that your issue may have already been reported before. Please check for existing issues [here](https://github.com/revanced/revanced-patches/labels/bug).
+
+  - type: dropdown
+    attributes:
+      label: Type
+      options:
+        - Error while patching
+        - Error at runtime
+        - Cosmetic
+        - Other
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Bug description
+      description: How did you find the bug? Any additional details that might help?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: Add the steps to reproduce this bug including your environment.
+      placeholder: Step 1. Download some files. Step 2. ...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Screenshots or videos
+      description: Add screenshots or videos that show the bug here.
+      placeholder: Drag and drop the screenshots/videos into this box.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Solution
+      description: If applicable, add a possible solution.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add additional context here.
+    validations:
+      required: false
+  - type: checkboxes
+    id: acknowledgements
+    attributes:
+      label: Acknowledgements
+      description: Your issue will be closed if you haven't done these steps.
+      options:
+        - label: I have searched the existing issues and this is a new and no duplicate or related to another open issue.
+          required: true
+        - label: I have written a short but informative title.
+          required: true
+        - label: I filled out all of the requested information in this issue properly.
+          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 📃 Documentation
+    url: https://github.com/revanced/revanced-documentation/
+    about: Don't know how or where to start? Check out our documentation!
+  - name: 🗨 Discussions
+    url: https://github.com/revanced/revanced-suggestions/discussions
+    about: Got something you think should change or be added? Search for or start a new discussion!

.github/ISSUE_TEMPLATE/patch-request.yml

@@ -0,0 +1,41 @@
+name: ⭐ Patch Request
+description: Create a detailed patch request.
+title: 'feat(patch): '
+labels: [patch-request]
+body:
+  - type: textarea
+    attributes:
+      label: Application
+      description: Which application is this patch for?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Issue
+      description: What is the issue this patch should solve?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Patch
+      description: "Describe the patch you'd like to see in detail."
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Motivation
+      description: Why should your patch request should be considered? What makes it valuable to the community?
+    validations:
+      required: true
+  - type: checkboxes
+    id: acknowledgements
+    attributes:
+      label: Acknowledgements
+      description: Your issue will be closed if you haven't done these steps.
+      options:
+        - label: I have searched the existing issues and this is a new and no duplicate or related to another open issue.
+          required: true
+        - label: I have written a short but informative title.
+          required: true
+        - label: I filled out all of the requested information in this issue properly.
+          required: true

.github/workflows/release.yml

@@ -1,5 +1,6 @@
 name: Release
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
@@ -11,28 +12,26 @@ on:
 jobs:
   release:
     name: Release
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Setup JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: '17'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: gradle
-      - name: Setup Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: "lts/*"
-      - name: Make gradlew executable
-        run: chmod +x gradlew
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v2
       - name: Build with Gradle
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew build
+        run: ./gradlew build clean generateMeta
+      - name: Install Android build-tools
+        run: sdkmanager "build-tools;32.0.0"
       - name: Setup semantic-release
         run: npm install -g semantic-release @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D
       - name: Release

.gitignore

@@ -114,4 +114,7 @@ gradle-app.setting
 # gradle/wrapper/gradle-wrapper.properties
 
 # Potentially copyrighted test APK
-*.apk
+*.apk
+
+# Ignore vscode config
+.vscode/

.idea/.gitignore

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

.releaserc

@@ -7,7 +7,11 @@
     }
   ],
   "plugins": [
-    "@semantic-release/commit-analyzer",
+    ["@semantic-release/commit-analyzer", {
+      "releaseRules": [
+        {"type": "build", "release": "patch"}
+      ]
+    }],
     "@semantic-release/release-notes-generator",
     "@semantic-release/changelog",
     "gradle-semantic-release-plugin",
@@ -15,11 +19,25 @@
       "@semantic-release/git",
       {
         "assets": [
+          "README.md",
           "CHANGELOG.md",
-          "gradle.properties"
+          "gradle.properties",
+          "patches.json"
         ]
       }
     ],
-    "@semantic-release/github"
+    [
+      "@semantic-release/github",
+      {
+        "assets": [
+          {
+            "path": "build/libs/*.jar"
+          },
+          {
+            "path": "patches.json"
+          }
+        ]
+      }
+    ]
   ]
 }

README-template.md

@@ -0,0 +1,122 @@
+## 🧩 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,2 +1,386 @@
-# revanced-patches
-Repo for all ReVanced patches
+## 🧩 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`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `always-autorepeat` | Always repeats the playing video again. | 17.45.36 |
+| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
+| `comments` | Hides components related to comments. | 17.45.36 |
+| `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
+| `custom-video-buffer` | Lets you change the buffers of videos. | 17.45.36 |
+| `custom-video-speed` | Adds more video speed options. | 17.45.36 |
+| `debugging` | Adds debugging options. | all |
+| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 17.45.36 |
+| `disable-auto-player-popup-panels` | Disable automatic popup panels (playlist or live chat) on video player. | 17.45.36 |
+| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 17.45.36 |
+| `disable-startup-shorts-player` | Disables playing YouTube Shorts when launching YouTube. | 17.45.36 |
+| `disable-zoom-haptics` | Disables haptics when zooming. | all |
+| `downloads` | Enables downloading music and videos from YouTube. | 17.45.36 |
+| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.45.36 |
+| `general-ads` | Removes general ads. | 17.45.36 |
+| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.45.36 |
+| `hide-album-cards` | Hides the album cards below the artist description. | 17.45.36 |
+| `hide-artist-card` | Hides the artist card below the searchbar. | 17.45.36 |
+| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.45.36 |
+| `hide-captions-button` | Hides the captions button on video player. | 17.45.36 |
+| `hide-cast-button` | Hides the cast button in the video player. | all |
+| `hide-create-button` | Hides the create button in the navigation bar. | 17.45.36 |
+| `hide-crowdfunding-box` | Hides the crowdfunding box between the player and video description. | 17.45.36 |
+| `hide-email-address` | Hides the email address in the account switcher. | 17.45.36 |
+| `hide-endscreen-cards` | Hides the suggested video cards at the end of a video in fullscreen. | 17.45.36 |
+| `hide-info-cards` | Hides info-cards in videos. | 17.45.36 |
+| `hide-my-mix` | Hides mix playlists. | 17.45.36 |
+| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.45.36 |
+| `hide-time-and-seekbar` | Hides progress bar and time counter on videos. | 17.45.36 |
+| `hide-video-buttons` | Adds options to hide action buttons under a video. | 17.45.36 |
+| `hide-watch-in-vr` | Hides the Watch in VR option from the player settings flyout panel. | 17.45.36 |
+| `hide-watermark` | Hides creator's watermarks on videos. | 17.45.36 |
+| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.45.36 |
+| `minimized-playback` | Enables minimized and background playback. | 17.45.36 |
+| `old-quality-layout` | Enables the original quality flyout menu. | 17.45.36 |
+| `open-links-directly` | Bypasses redirect links and allows opening links directly. | 17.45.36 |
+| `premium-heading` | Shows premium branding on the home screen. | all |
+| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.45.36 |
+| `remove-player-button-background` | Removes the background from the video player buttons. | 17.45.36 |
+| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.45.36 |
+| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.45.36 |
+| `settings` | Adds settings for ReVanced to YouTube. | all |
+| `sponsorblock` | Integrate SponsorBlock. | 17.45.36 |
+| `swipe-controls` | Adds volume and brightness swipe controls. | 17.45.36 |
+| `tablet-mini-player` | Enables the tablet mini player layout. | 17.45.36 |
+| `theme` | Applies a custom theme. | all |
+| `video-ads` | Removes ads in the video player. | 17.45.36 |
+</details>
+
+### 📦 `com.google.android.apps.youtube.music`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `background-play` | Enables playing music in the background. | 5.31.50 |
+| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.31.50 |
+| `compact-header` | Hides the music category bar at the top of the homepage. | 5.31.50 |
+| `exclusive-audio-playback` | Enables the option to play music without video. | 5.31.50 |
+| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.31.50 |
+| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.31.50 |
+| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.31.50 |
+| `music-video-ads` | Removes ads in the music player. | 5.31.50 |
+| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.31.50 |
+| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.31.50 |
+</details>
+
+### 📦 `com.ss.android.ugc.trill`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `disable-login-requirement` | Do not force login. | all |
+| `downloads` | Removes download restrictions and changes the default path to download to. | all |
+| `feed-filter` | Filters tiktok videos: removing ads, removing livestreams. | all |
+| `fix-google-login` | Allows logging in with a Google account. | all |
+| `hide-ads` | Removes ads from TikTok. | all |
+| `playback-speed` | Enables the playback speed option for all videos. | all |
+| `settings` | Adds settings for ReVanced to TikTok. | all |
+| `show-seekbar` | Shows progress bar for all video. | all |
+| `sim-spoof` | Spoofs the information which is retrieved from the sim-card. | all |
+</details>
+
+### 📦 `com.zhiliaoapp.musically`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `disable-login-requirement` | Do not force login. | all |
+| `downloads` | Removes download restrictions and changes the default path to download to. | all |
+| `feed-filter` | Filters tiktok videos: removing ads, removing livestreams. | all |
+| `fix-google-login` | Allows logging in with a Google account. | all |
+| `hide-ads` | Removes ads from TikTok. | all |
+| `playback-speed` | Enables the playback speed option for all videos. | all |
+| `settings` | Adds settings for ReVanced to TikTok. | all |
+| `show-seekbar` | Shows progress bar for all video. | all |
+| `sim-spoof` | Spoofs the information which is retrieved from the sim-card. | all |
+</details>
+
+### 📦 `tv.twitch.android.app`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `block-audio-ads` | Blocks audio ads in streams and VODs. | all |
+| `block-video-ads` | Blocks video ads in streams and VODs. | all |
+| `debug-mode` | Enables Twitch's internal debugging mode. | all |
+| `settings` | Adds settings menu to Twitch. | all |
+| `show-deleted-messages` | Shows deleted chat messages behind a clickable spoiler. | all |
+</details>
+
+### 📦 `com.spotify.music`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `disable-capture-restriction` | Allows capturing Spotify's audio output while screen sharing or screen recording. | all |
+| `hide-premium-navbar` | Removes the premium tab from the navbar. | all |
+| `spotify-theme` | Applies a custom theme. | all |
+</details>
+
+### 📦 `com.twitter.android`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `dynamic-color` | Replaces the default Twitter Blue with the users Material You palette. | all |
+| `monochrome-icon` | Adds a monochrome icon. | all |
+| `timeline-ads` | Removes ads from the Twitter timeline. | all |
+</details>
+
+### 📦 `com.reddit.frontpage`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | all |
+| `premium-icon-reddit` | Unlocks premium Reddit app icons. | all |
+</details>
+
+### 📦 `com.vanced.android.youtube`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
+</details>
+
+### 📦 `com.myprog.hexedit`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `disable-ads` | Disables ads in HexEditor. | all |
+</details>
+
+### 📦 `com.crunchyroll.crunchyroid`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `enable-downloads` | Enables downloads for Crunchyroll. | all |
+</details>
+
+### 📦 `com.garzotto.pflotsh.ecmwf_a`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `pflotsh-ecmwf-subscription-unlock` | Unlocks all subscription features. | 3.5.4 |
+</details>
+
+### 📦 `org.citra.citra_emu`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `premium-unlock` | Unlocks premium functions. | all |
+</details>
+
+### 📦 `com.backdrops.wallpapers`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `pro-unlock` | Unlocks pro-only functions. | all |
+</details>
+
+### 📦 `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>
+
+### 📦 `com.urbandroid.sleep`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-premium` | Unlocks all premium features. | all |
+</details>
+
+### 📦 `com.shervinkoushan.anyTracker`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-premium` | Unlocks all premium features. | all |
+</details>
+
+### 📦 `ginlemon.iconpackstudio`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks all pro features. | all |
+</details>
+
+### 📦 `com.ithebk.expensemanager`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks pro features. | all |
+</details>
+
+### 📦 `org.totschnig.myexpenses`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks all professional features. | all |
+</details>
+
+### 📦 `co.windyapp.android`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks all pro features. | all |
+</details>
+
+### 📦 `com.awedea.nyx`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-pro` | Unlocks all pro features. | all |
+</details>
+
+### 📦 `com.ticktick.task`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-themes` | Unlocks all themes. | all |
+</details>
+
+
+
+## 📝 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": []
+      }
+    ]
+  }
+]
+```

build.gradle.kts

@@ -1,59 +1,66 @@
 plugins {
-    kotlin("jvm") version "1.6.20"
-    java
-    `maven-publish`
+    kotlin("jvm") version "1.7.0"
 }
 
 group = "app.revanced"
 
+val githubUsername: String = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR")
+val githubPassword: String = project.findProperty("gpr.key") as? String ?: System.getenv("GITHUB_TOKEN")
+
 repositories {
     mavenCentral()
     mavenLocal()
     maven {
-        url = uri("https://maven.pkg.github.com/revanced/revanced-patcher") // note the "r"!
+        url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
         credentials {
-            // DO NOT set these variables in the project's gradle.properties.
-            // Instead, you should set them in:
-            // Windows: %homepath%\.gradle\gradle.properties
-            // Linux: ~/.gradle/gradle.properties
-            username = project.findProperty("gpr.user") as String? ?: System.getenv("GITHUB_ACTOR") // DO NOT CHANGE!
-            password = project.findProperty("gpr.key")  as String? ?: System.getenv("GITHUB_TOKEN") // DO NOT CHANGE!
+            username = githubUsername
+            password = githubPassword
         }
     }
 }
 
 dependencies {
-    implementation(kotlin("stdlib"))
-    testImplementation(kotlin("test"))
-
-    implementation("app.revanced:revanced-patcher:1.+")
+    implementation("app.revanced:revanced-patcher:6.3.0")
+    implementation("app.revanced:multidexlib2:2.5.2.r2")
+    // Required for meta
+    implementation("com.google.code.gson:gson:2.10")
 }
 
-java {
-    withSourcesJar()
-    withJavadocJar()
-}
+tasks {
+    register<DefaultTask>("generateBundle") {
+        description = "Generate dex files from build and bundle them in the jar file"
+        dependsOn(build)
 
-val isGitHubCI = System.getenv("GITHUB_ACTOR") != null
+        doLast {
+            val androidHome = System.getenv("ANDROID_HOME") ?: throw GradleException("ANDROID_HOME not found")
+            val d8 = "${androidHome}/build-tools/32.0.0/d8"
+            val input = configurations.archives.get().allArtifacts.files.files.first().absolutePath
+            val work = File("${buildDir}/libs")
 
-publishing {
-    repositories {
-        if (isGitHubCI) {
-            maven {
-                name = "GitHubPackages"
-                url = uri("https://maven.pkg.github.com/revanced/revanced-patches") // note the "s"!
-                credentials {
-                    username = System.getenv("GITHUB_ACTOR")
-                    password = System.getenv("GITHUB_TOKEN")
-                }
+            exec {
+                workingDir = work
+                commandLine = listOf(d8, input)
+            }
+
+            exec {
+                workingDir = work
+                commandLine = listOf("zip", "-u", input, "classes.dex")
             }
-        } else {
-            mavenLocal()
         }
     }
-    publications {
-        register<MavenPublication>("gpr") {
-            from(components["java"])
-        }
+    register<JavaExec>("generateMeta") {
+        description = "Generate metadata for this bundle"
+        dependsOn(build)
+
+        classpath = sourceSets["main"].runtimeClasspath
+        mainClass.set("app.revanced.meta.Meta")
+    }
+    // Dummy task to fix the Gradle semantic-release plugin.
+    // Remove this if you forked it to support building only.
+    // Tracking issue: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435
+    register<DefaultTask>("publish") {
+        group = "publish"
+        description = "Dummy task"
+        dependsOn(named("generateBundle"), named("generateMeta"))
     }
 }

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 1.0.0-dev.7
+version = 2.138.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -1,14 +1,58 @@
 package app.revanced.extensions
 
-import app.revanced.patcher.smali.toInstruction
-import org.jf.dexlib2.builder.MutableMethodImplementation
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.util.MethodUtil
+import org.w3c.dom.Node
 
-internal fun MutableMethodImplementation.injectHideCall(
-    index: Int,
-    register: Int
-) {
-    this.addInstruction(
-        index,
-        "invoke-static { v$register }, Lfi/razerman/youtube/XAdRemover;->HideView(Landroid/view/View;)V".toInstruction()
-    )
+// TODO: populate this to all patches
+/**
+ * Convert a [MethodFingerprint] to a [PatchResultError].
+ *
+ * @return A [PatchResultError] for the [MethodFingerprint].
+ */
+fun MethodFingerprint.toErrorResult() = PatchResultError("Failed to resolve $name")
+
+/**
+ * Find the [MutableMethod] from a given [Method] in a [MutableClass].
+ *
+ * @param method The [Method] to find.
+ * @return The [MutableMethod].
+ */
+fun MutableClass.findMutableMethodOf(method: Method) = this.methods.first {
+    MethodUtil.methodSignaturesMatch(it, method)
+}
+
+/**
+ * traverse the class hierarchy starting from the given root class
+ *
+ * @param targetClass the class to start traversing the class hierarchy from
+ * @param callback function that is called for every class in the hierarchy
+ */
+fun BytecodeContext.traverseClassHierarchy(targetClass: MutableClass, callback: MutableClass.() -> Unit) {
+    callback(targetClass)
+    this.findClass(targetClass.superclass ?: return)?.mutableClass?.let {
+        traverseClassHierarchy(it, callback)
+    }
+}
+
+/**
+ * apply a transform to all methods of the class
+ *
+ * @param transform the transformation function. original method goes in, transformed method goes out
+ */
+fun MutableClass.transformMethods(transform: MutableMethod.() -> MutableMethod) {
+    val transformedMethods = methods.map { it.transform() }
+    methods.clear()
+    methods.addAll(transformedMethods)
+}
+
+internal fun Node.doRecursively(action: (Node) -> Unit) {
+    action(this)
+    for (i in 0 until this.childNodes.length) this.childNodes.item(i).doRecursively(action)
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/main/kotlin/app/revanced/patches/Index.kt

@@ -1,44 +0,0 @@
-package app.revanced.patches
-
-import app.revanced.patcher.data.base.Data
-import app.revanced.patcher.patch.base.Patch
-import app.revanced.patches.music.audio.CodecsUnlockPatch
-import app.revanced.patches.music.audio.EnableAudioOnlyPatch
-import app.revanced.patches.music.layout.RemoveTasteBuilderPatch
-import app.revanced.patches.music.layout.RemoveUpgradeTabPatch
-import app.revanced.patches.music.premium.BackgroundPlayPatch
-import app.revanced.patches.youtube.ad.HomePromoPatch
-import app.revanced.patches.youtube.ad.VideoAdsPatch
-import app.revanced.patches.youtube.interaction.EnableSeekbarTappingPatch
-import app.revanced.patches.youtube.layout.*
-import app.revanced.patches.youtube.misc.FixLocaleConfigErrorPatch
-import app.revanced.patches.youtube.misc.IntegrationsPatch
-
-/**
- * Index contains all the patches.
- */
-@Suppress("Unused")
-object Index {
-    /**
-     * Array of patches.
-     * New patches should be added to the array.
-     */
-    val patches: List<() -> Patch<Data>> = listOf(
-        ::IntegrationsPatch,
-        ::FixLocaleConfigErrorPatch,
-        //::HomeAdsPatch,
-        ::VideoAdsPatch,
-        ::HomePromoPatch,
-        ::MinimizedPlaybackPatch,
-        ::CreateButtonRemoverPatch,
-        ::ShortsButtonRemoverPatch,
-        ::HideReelsPatch,
-        ::OldQualityLayoutPatch,
-        ::EnableSeekbarTappingPatch,
-        ::EnableAudioOnlyPatch,
-        ::RemoveUpgradeTabPatch,
-        ::RemoveTasteBuilderPatch,
-        ::BackgroundPlayPatch,
-        ::CodecsUnlockPatch
-    )
-}

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

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

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

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

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

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

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

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

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

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

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

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

src/main/kotlin/app/revanced/patches/crunchyroll/downloads/annotations/DownloadsCompatibility.kt

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

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

@@ -0,0 +1,23 @@
+package app.revanced.patches.crunchyroll.downloads.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.crunchyroll.downloads.annotations.DownloadsCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("downloads-fingerprint")
+@DownloadsCompatibility
+@Version("0.0.1")
+object DownloadsFingerprint : MethodFingerprint(
+    "Z", AccessFlags.PUBLIC or AccessFlags.FINAL, null,
+    opcodes = listOf(
+        Opcode.CONST_STRING,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.RETURN
+    ),
+    strings = listOf("offline_viewing"),
+)

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

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

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

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

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

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

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

@@ -0,0 +1,39 @@
+package app.revanced.patches.hexeditor.ad.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.removeInstruction
+import app.revanced.patcher.extensions.replaceInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.hexeditor.ad.annotations.HexEditorAdsCompatibility
+import app.revanced.patches.hexeditor.ad.fingerprints.PrimaryAdsFingerprint
+
+@Patch
+@Name("disable-ads")
+@Description("Disables ads in HexEditor.")
+@HexEditorAdsCompatibility
+@Version("0.0.1")
+class HexEditorAdsPatch : BytecodePatch(
+    listOf(
+        PrimaryAdsFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        val method = PrimaryAdsFingerprint.result!!.mutableMethod
+        
+        method.replaceInstructions(
+            0,
+            """
+                const/4 v0, 0x1
+                return v0
+            """
+        )
+
+        return PatchResultSuccess()
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,13 @@
+package app.revanced.patches.music.ad.video.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")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class MusicVideoAdsCompatibility

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

@@ -0,0 +1,27 @@
+package app.revanced.patches.music.ad.video.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 ShowMusicVideoAdsConstructorFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L"), listOf(
+        Opcode.INVOKE_DIRECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.CONST_4,
+        Opcode.IPUT_BOOLEAN,
+        Opcode.RETURN_VOID
+    )
+)

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

@@ -0,0 +1,14 @@
+package app.revanced.patches.music.ad.video.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+object ShowMusicVideoAdsFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z"), listOf(
+        Opcode.IPUT_BOOLEAN,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.RETURN_VOID
+    )
+)

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

@@ -0,0 +1,40 @@
+package app.revanced.patches.music.ad.video.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+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
+
+@Patch
+@Name("music-video-ads")
+@Description("Removes ads in the music player.")
+@MusicVideoAdsCompatibility
+@Version("0.0.1")
+class MusicVideoAdsPatch : BytecodePatch(
+    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, """
+                const/4 p1, 0x0
+            """
+        )
+
+        return PatchResultSuccess()
+    }
+}

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

@@ -1,157 +0,0 @@
-package app.revanced.patches.music.audio
-
-import app.revanced.patcher.data.implementation.BytecodeData
-import app.revanced.patcher.data.implementation.toMethodWalker
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.patch.implementation.BytecodePatch
-import app.revanced.patcher.patch.implementation.metadata.PackageMetadata
-import app.revanced.patcher.patch.implementation.metadata.PatchMetadata
-import app.revanced.patcher.patch.implementation.misc.PatchResult
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.signature.MethodMetadata
-import app.revanced.patcher.signature.MethodSignature
-import app.revanced.patcher.signature.MethodSignatureMetadata
-import app.revanced.patcher.signature.PatternScanMethod
-import app.revanced.patcher.smali.toInstruction
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-private val packageMetadata = listOf(
-    PackageMetadata(
-        "com.google.android.apps.youtube.music",
-        listOf("5.03.50")
-    )
-)
-
-private val patchMetadata = PatchMetadata(
-    "codecs-unlock",
-    "Audio codecs unlock patch",
-    "Enables more audio codecs. Usually results in better audio quality but may depend on song and device.",
-    packageMetadata,
-    "0.0.1"
-)
-
-class CodecsUnlockPatch : BytecodePatch(
-    patchMetadata,
-    listOf(
-        MethodSignature(
-            MethodSignatureMetadata(
-                "codec-lock-method",
-                MethodMetadata(
-                    "Labwj;",
-                    "a",
-                ),
-                PatternScanMethod.Fuzzy(2),// FIXME: Test this threshold and find the best value.
-                packageMetadata,
-                "Required signature for ${patchMetadata.name}. Discovered in version 5.03.50.",
-                "0.0.1"
-            ),
-            "L",
-            AccessFlags.PUBLIC or AccessFlags.STATIC,
-            listOf("L", "L", "L", "L"),
-            listOf(
-                Opcode.INVOKE_STATIC,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.INVOKE_DIRECT,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.MOVE_RESULT,
-                Opcode.IF_NEZ,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.MOVE_RESULT,
-                Opcode.IF_NEZ,
-                Opcode.SGET,
-                Opcode.INVOKE_STATIC,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.MOVE_RESULT,
-                Opcode.IF_NEZ,
-                Opcode.SGET_OBJECT,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.CHECK_CAST,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.INVOKE_DIRECT,
-                Opcode.RETURN_OBJECT
-            )
-        ),
-        MethodSignature(
-            MethodSignatureMetadata(
-                "all-codecs-reference-method",
-                MethodMetadata(
-                    "Laari;",
-                    "b",
-                ),
-                PatternScanMethod.Fuzzy(2),// FIXME: Test this threshold and find the best value.
-                packageMetadata,
-                "Required signature for ${patchMetadata.name}. Discovered in version 5.03.50.",
-                "0.0.1"
-            ),
-            "J",
-            AccessFlags.PUBLIC or AccessFlags.FINAL,
-            listOf("L"),
-            listOf(
-                Opcode.INVOKE_STATIC,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.INVOKE_STATIC,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.MOVE_RESULT,
-                Opcode.CONST_4,
-                Opcode.IF_EQZ,
-                Opcode.IGET_BOOLEAN,
-                Opcode.IF_NEZ,
-                Opcode.IGET_OBJECT,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.IPUT_BOOLEAN,
-                Opcode.IGET_OBJECT,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.GOTO,
-                Opcode.INVOKE_STATIC,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.MOVE_RESULT,
-                Opcode.IF_NEZ,
-                Opcode.INVOKE_STATIC,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.MOVE_RESULT,
-                Opcode.IF_EQZ,
-                Opcode.IGET_BOOLEAN,
-                Opcode.IF_NEZ,
-                Opcode.IGET_OBJECT,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.IPUT_BOOLEAN,
-                Opcode.IGET_OBJECT,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.GOTO,
-                Opcode.MOVE_EXCEPTION,
-                Opcode.INVOKE_SUPER,
-                Opcode.MOVE_RESULT_WIDE,
-                Opcode.RETURN_WIDE
-            ),
-            listOf("itag")
-        )
-    )
-) {
-    override fun execute(data: BytecodeData): PatchResult {
-        var result = signatures.first().result!!
-
-        val implementation = result.method.implementation!!
-
-        val instructionIndex = result.scanData.startIndex
-
-        result = signatures.last().result!!
-        val codecMethod = data
-            .toMethodWalker(result.immutableMethod)
-            .walk(result.scanData.startIndex)
-            .getMethod()
-
-        implementation.replaceInstruction(
-            instructionIndex,
-            "invoke-static {}, ${codecMethod.definingClass}->${codecMethod.name}()Ljava/util/Set;".toInstruction()
-        )
-
-        return PatchResultSuccess()
-    }
-}

src/main/kotlin/app/revanced/patches/music/audio/EnableAudioOnlyPatch.kt

@@ -1,133 +0,0 @@
-package app.revanced.patches.music.audio
-
-import app.revanced.patcher.data.implementation.BytecodeData
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.patch.implementation.BytecodePatch
-import app.revanced.patcher.patch.implementation.metadata.PackageMetadata
-import app.revanced.patcher.patch.implementation.metadata.PatchMetadata
-import app.revanced.patcher.patch.implementation.misc.PatchResult
-import app.revanced.patcher.patch.implementation.misc.PatchResultError
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.signature.MethodMetadata
-import app.revanced.patcher.signature.MethodSignature
-import app.revanced.patcher.signature.MethodSignatureMetadata
-import app.revanced.patcher.signature.PatternScanMethod
-import app.revanced.patcher.smali.toInstruction
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-private val compatiblePackages = listOf(
-    PackageMetadata(
-        "com.google.android.apps.youtube.music",
-        listOf("5.03.50")
-    )
-)
-
-class EnableAudioOnlyPatch : BytecodePatch(
-    PatchMetadata(
-        "audio-only-playback-patch",
-        "Audio Only Mode Patch",
-        "Add the option to play music without video.",
-        compatiblePackages,
-        "0.0.1"
-    ),
-    listOf(
-        MethodSignature(
-            MethodSignatureMetadata(
-                "audio-only-method-signature",
-                MethodMetadata("Lgmd;", "c"),
-                PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
-                compatiblePackages,
-                "Signature for the method required to be patched.",
-                "0.0.1"
-            ),
-            "V",
-            AccessFlags.PUBLIC or AccessFlags.FINAL,
-            listOf("L", "Z"),
-            listOf(
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.CHECK_CAST,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.MOVE_RESULT,
-                Opcode.IF_EQ,
-                Opcode.CONST_4,
-                Opcode.GOTO,
-                Opcode.NOP,
-                Opcode.IGET_OBJECT,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.INVOKE_STATIC,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.IGET_OBJECT,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.MOVE_RESULT,
-                Opcode.IF_EQZ,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.CHECK_CAST,
-                Opcode.IF_EQZ,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.CHECK_CAST,
-                Opcode.IF_EQZ,
-                Opcode.IF_EQZ,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.GOTO,
-                Opcode.RETURN_VOID
-            )
-        )
-    )
-) {
-    override fun execute(data: BytecodeData): PatchResult {
-        val result = signatures.first().result!!.findParentMethod(
-            MethodSignature(
-                MethodSignatureMetadata(
-                    "audio-only-enabler-method",
-                    MethodMetadata("Lgmd;", "d"),
-                    PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
-                    compatiblePackages,
-                    "Signature for the method required to be patched.",
-                    "0.0.1"
-                ),
-                "Z",
-                AccessFlags.PUBLIC or AccessFlags.FINAL,
-                listOf(),
-                listOf(
-                    Opcode.IGET_OBJECT,
-                    Opcode.INVOKE_INTERFACE,
-                    Opcode.MOVE_RESULT_OBJECT,
-                    Opcode.IGET_OBJECT,
-                    Opcode.INVOKE_INTERFACE,
-                    Opcode.MOVE_RESULT_OBJECT,
-                    Opcode.INVOKE_VIRTUAL,
-                    Opcode.MOVE_RESULT_OBJECT,
-                    Opcode.CHECK_CAST,
-                    Opcode.IF_NEZ,
-                    Opcode.IGET_OBJECT,
-                    Opcode.INVOKE_VIRTUAL,
-                    Opcode.MOVE_RESULT,
-                    Opcode.GOTO,
-                    Opcode.INVOKE_VIRTUAL,
-                    Opcode.MOVE_RESULT,
-                    Opcode.RETURN
-                )
-            )
-        ) ?: return PatchResultError("Required method for ${metadata.shortName} not found.")
-
-        val implementation = result.method.implementation!!
-        implementation.replaceInstruction(
-            implementation.instructions.count() - 1,
-            "const/4 v0, 0x1".toInstruction()
-        )
-        implementation.addInstruction(
-            "return v0".toInstruction()
-        )
-
-        return PatchResultSuccess()
-    }
-}

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

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

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

@@ -0,0 +1,52 @@
+package app.revanced.patches.music.audio.codecs.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 AllCodecsReferenceFingerprint : MethodFingerprint(
+    "J", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"), listOf(
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT,
+        Opcode.CONST_4,
+        Opcode.IF_EQZ,
+        Opcode.IGET_BOOLEAN,
+        Opcode.IF_NEZ,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.IPUT_BOOLEAN,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.GOTO,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_NEZ,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_EQZ,
+        Opcode.IGET_BOOLEAN,
+        Opcode.IF_NEZ,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.IPUT_BOOLEAN,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.GOTO,
+        Opcode.MOVE_EXCEPTION,
+        Opcode.INVOKE_SUPER,
+        Opcode.MOVE_RESULT_WIDE,
+        Opcode.RETURN_WIDE
+    ), listOf("itag")
+)

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

@@ -0,0 +1,29 @@
+package app.revanced.patches.music.audio.codecs.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 CodecsLockFingerprint : MethodFingerprint(
+    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, opcodes = listOf(
+        Opcode.INVOKE_DIRECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_NEZ,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_NEZ,
+        Opcode.SGET_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.RETURN_OBJECT
+    ),
+    strings = listOf("eac3_supported")
+)

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

@@ -0,0 +1,56 @@
+package app.revanced.patches.music.audio.codecs.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.data.toMethodWalker
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.util.smali.toInstruction
+import app.revanced.patches.music.audio.codecs.annotations.CodecsUnlockCompatibility
+import app.revanced.patches.music.audio.codecs.fingerprints.AllCodecsReferenceFingerprint
+import app.revanced.patches.music.audio.codecs.fingerprints.CodecsLockFingerprint
+import org.jf.dexlib2.Opcode
+
+@Patch
+@Name("codecs-unlock")
+@Description("Adds more audio codec options. The new audio codecs usually result in better audio quality.")
+@CodecsUnlockCompatibility
+@Version("0.0.1")
+class CodecsUnlockPatch : BytecodePatch(
+    listOf(
+        CodecsLockFingerprint, AllCodecsReferenceFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        val codecsLockResult = CodecsLockFingerprint.result!!
+
+        val implementation = codecsLockResult.mutableMethod.implementation!!
+
+        val scanResultStartIndex = codecsLockResult.scanResult.patternScanResult!!.startIndex
+        val instructionIndex = scanResultStartIndex +
+                if (implementation.instructions[scanResultStartIndex - 1].opcode == Opcode.CHECK_CAST) {
+                    // for 5.16.xx and lower
+                    -3
+                } else {
+                    // since 5.17.xx
+                    -2
+                }
+
+        val allCodecsResult = AllCodecsReferenceFingerprint.result!!
+        val allCodecsMethod =
+            context.toMethodWalker(allCodecsResult.method)
+                .nextMethod(allCodecsResult.scanResult.patternScanResult!!.startIndex)
+                .getMethod()
+
+        implementation.replaceInstruction(
+            instructionIndex,
+            "invoke-static {}, ${allCodecsMethod.definingClass}->${allCodecsMethod.name}()Ljava/util/Set;".toInstruction()
+        )
+
+        return PatchResultSuccess()
+    }
+}

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

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

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

@@ -0,0 +1,28 @@
+package app.revanced.patches.music.audio.exclusiveaudio.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+object  AudioOnlyEnablerFingerprint: MethodFingerprint(
+    "Z", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST,
+        Opcode.IF_NEZ,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.GOTO,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.RETURN
+    )
+)

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

@@ -0,0 +1,51 @@
+package app.revanced.patches.music.audio.exclusiveaudio.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 ExclusiveAudioFingerprint : MethodFingerprint(
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    listOf("L", "Z"),
+    listOf(
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_EQ,
+        Opcode.CONST_4,
+        Opcode.GOTO,
+        Opcode.NOP,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_EQZ,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST,
+        Opcode.IF_EQZ,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST,
+        Opcode.IF_EQZ,
+        Opcode.IF_EQZ,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.GOTO,
+        Opcode.RETURN_VOID
+    )
+)

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

@@ -0,0 +1,33 @@
+package app.revanced.patches.music.audio.exclusiveaudio.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.music.audio.exclusiveaudio.annotations.ExclusiveAudioCompatibility
+import app.revanced.patches.music.audio.exclusiveaudio.fingerprints.AudioOnlyEnablerFingerprint
+
+@Patch
+@Name("exclusive-audio-playback")
+@Description("Enables the option to play music without video.")
+@ExclusiveAudioCompatibility
+@Version("0.0.1")
+class ExclusiveAudioPatch : BytecodePatch(
+    listOf(
+        AudioOnlyEnablerFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        val method = AudioOnlyEnablerFingerprint.result!!.mutableMethod
+        method.replaceInstruction(method.implementation!!.instructions.count() - 1, "const/4 v0, 0x1")
+        method.addInstruction("return v0")
+
+        return PatchResultSuccess()
+    }
+}

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

@@ -1,94 +0,0 @@
-package app.revanced.patches.music.layout
-
-import app.revanced.patcher.data.implementation.BytecodeData
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.patch.implementation.BytecodePatch
-import app.revanced.patcher.patch.implementation.metadata.PackageMetadata
-import app.revanced.patcher.patch.implementation.metadata.PatchMetadata
-import app.revanced.patcher.patch.implementation.misc.PatchResult
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.signature.MethodMetadata
-import app.revanced.patcher.signature.MethodSignature
-import app.revanced.patcher.signature.MethodSignatureMetadata
-import app.revanced.patcher.signature.PatternScanMethod
-import app.revanced.patcher.smali.toInstructions
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.formats.Instruction22c
-
-private val compatiblePackages = listOf(
-    PackageMetadata(
-        "com.google.android.apps.youtube.music",
-        listOf("5.03.50")
-    )
-)
-
-class RemoveTasteBuilderPatch : BytecodePatch(
-    PatchMetadata(
-        "tasteBuilder-remover",
-        "Remove TasteBuilder Patch",
-        "Removes the \"Tell us which artists you like\" card from the Home screen. The same functionality can be triggered from the settings anyway.",
-        compatiblePackages,
-        "0.0.1"
-    ),
-    listOf(
-        MethodSignature(
-            MethodSignatureMetadata(
-                "taste-builder-constructor",
-                MethodMetadata("Lkyu;", "<init>"),
-                PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
-                compatiblePackages,
-                "Required signature for this patch.",
-                "0.0.1"
-            ),
-            "V",
-            AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-            listOf("L", "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.IPUT_OBJECT,
-                Opcode.NEW_INSTANCE,
-                Opcode.INVOKE_DIRECT,
-                Opcode.IPUT_OBJECT
-            )
-        )
-    )
-) {
-    override fun execute(data: BytecodeData): PatchResult {
-        val result = signatures.first().result!!
-        val implementation = result.method.implementation!!
-
-        val insertIndex = result.scanData.endIndex - 8
-
-        val register = (implementation.instructions[insertIndex] as Instruction22c).registerA
-
-        val instructionList =
-            """
-                const/16 v1, 0x8
-                invoke-virtual {v${register}, v1}, Landroid/view/View;->setVisibility(I)V
-            """.trimIndent().toInstructions().toMutableList()
-
-        implementation.addInstructions(
-            insertIndex,
-            instructionList
-        )
-
-        return PatchResultSuccess()
-    }
-}

src/main/kotlin/app/revanced/patches/music/layout/RemoveUpgradeTabPatch.kt

@@ -1,151 +0,0 @@
-package app.revanced.patches.music.layout
-
-import app.revanced.patcher.data.implementation.BytecodeData
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.patch.implementation.BytecodePatch
-import app.revanced.patcher.patch.implementation.metadata.PackageMetadata
-import app.revanced.patcher.patch.implementation.metadata.PatchMetadata
-import app.revanced.patcher.patch.implementation.misc.PatchResult
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.signature.MethodMetadata
-import app.revanced.patcher.signature.MethodSignature
-import app.revanced.patcher.signature.MethodSignatureMetadata
-import app.revanced.patcher.signature.PatternScanMethod
-import app.revanced.patcher.smali.toInstructions
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.builder.instruction.BuilderInstruction22t
-import org.jf.dexlib2.iface.instruction.formats.Instruction22c
-import org.jf.dexlib2.iface.instruction.formats.Instruction35c
-
-private val compatiblePackages = listOf(
-    PackageMetadata(
-        "com.google.android.apps.youtube.music",
-        listOf("5.03.50")
-    )
-)
-
-class RemoveUpgradeTabPatch : BytecodePatch(
-    PatchMetadata(
-        "upgrade-tab-remover",
-        "Remove Upgrade Tab Patch",
-        "Remove the upgrade tab from t he pivot bar in YouTube music.",
-        compatiblePackages,
-        "0.0.1"
-    ),
-    listOf(
-        MethodSignature(
-            MethodSignatureMetadata(
-                "pivot-bar-constructor",
-                MethodMetadata("Lhfu;", "<init2>"), // unknown
-                PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
-                compatiblePackages,
-                "Required signature for this patch.",
-                "0.0.1"
-            ),
-            "V",
-            AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-            listOf("L", "Z"),
-            listOf(
-                Opcode.INVOKE_DIRECT,
-                Opcode.CONST_4,
-                Opcode.IPUT_OBJECT,
-                Opcode.IPUT_OBJECT,
-                Opcode.IPUT_BOOLEAN,
-                Opcode.IGET_OBJECT,
-                Opcode.IF_NEZ,
-                Opcode.GOTO,
-                Opcode.NEW_INSTANCE,
-                Opcode.INVOKE_DIRECT,
-                Opcode.IGET_OBJECT,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.MOVE_RESULT,
-                Opcode.IF_EQZ,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.CHECK_CAST,
-                Opcode.IGET,
-                Opcode.CONST,
-                Opcode.IF_NE,
-                Opcode.IGET_OBJECT,
-                Opcode.CHECK_CAST,
-                Opcode.GOTO,
-                Opcode.SGET_OBJECT,
-                Opcode.IGET_OBJECT,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.MOVE_RESULT,
-                Opcode.IF_EQZ,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.CHECK_CAST,
-                Opcode.IGET,
-                Opcode.CONST,
-                Opcode.IF_NE,
-                Opcode.IGET_OBJECT,
-                Opcode.CHECK_CAST,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.GOTO,
-                Opcode.NOP,
-                Opcode.IPUT_OBJECT,
-                Opcode.RETURN_VOID
-            )
-        )
-    )
-) {
-    override fun execute(data: BytecodeData): PatchResult {
-        val result = signatures.first().result!!
-        val implementation = result.method.implementation!!
-
-        val pivotBarElementFieldRef =
-            (implementation.instructions[result.scanData.endIndex - 1] as Instruction22c).reference
-
-        val register = (implementation.instructions.first() as Instruction35c).registerC
-        // first compile all the needed instructions
-        val instructionList =
-            """
-                invoke-interface { v0 }, Ljava/util/List;->size()I
-                move-result v1
-                const/4 v2, 0x3
-                invoke-interface {v0, v2}, Ljava/util/List;->remove(I)Ljava/lang/Object;
-                iput-object v0, v$register, $pivotBarElementFieldRef
-            """.trimIndent().toInstructions().toMutableList()
-
-
-        // replace the instruction to retain the label at given index
-        implementation.replaceInstruction(
-            result.scanData.endIndex - 1,
-            instructionList[0] // invoke-interface
-        )
-        // do not forget to remove this instruction since we added it already
-        instructionList.removeFirst()
-
-        val exitInstruction = instructionList.last() // iput-object
-        implementation.addInstruction(
-            result.scanData.endIndex,
-            exitInstruction
-        )
-        // do not forget to remove this instruction since we added it already
-        instructionList.removeLast()
-
-        // add the necessary if statement to remove the upgrade tab button in case it exists
-        instructionList.add(
-            2, // if-le
-            BuilderInstruction22t(
-                Opcode.IF_LE,
-                1, 2,
-                implementation.newLabelForIndex(result.scanData.endIndex)
-            )
-        )
-
-        implementation.addInstructions(
-            result.scanData.endIndex,
-            instructionList
-        )
-        return PatchResultSuccess()
-    }
-}

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

@@ -0,0 +1,13 @@
+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", arrayOf("5.14.53", "5.16.51", "5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52", "5.27.51", "5.28.52", "5.29.52", "5.31.50")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class CompactHeaderCompatibility

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

@@ -0,0 +1,23 @@
+package app.revanced.patches.music.layout.compactheader.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+object CompactHeaderConstructorFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L", "L", "L"), listOf(
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.CONST,
+        Opcode.CONST_4,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST
+    )
+)

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

@@ -0,0 +1,41 @@
+package app.revanced.patches.music.layout.compactheader.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.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.compactheader.annotations.CompactHeaderCompatibility
+import app.revanced.patches.music.layout.compactheader.fingerprints.CompactHeaderConstructorFingerprint
+import org.jf.dexlib2.builder.instruction.BuilderInstruction11x
+
+@Patch(false)
+@Name("compact-header")
+@Description("Hides the music category bar at the top of the homepage.")
+@CompactHeaderCompatibility
+@Version("0.0.1")
+class CompactHeaderPatch : BytecodePatch(
+    listOf(
+        CompactHeaderConstructorFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        val result = CompactHeaderConstructorFingerprint.result!!
+        val method = result.mutableMethod
+
+        val insertIndex = result.scanResult.patternScanResult!!.endIndex
+        val register = (method.implementation!!.instructions[insertIndex - 1] as BuilderInstruction11x).registerA
+        method.addInstructions(
+            insertIndex, """
+                const/16 v2, 0x8
+                invoke-virtual {v${register}, v2}, Landroid/view/View;->setVisibility(I)V
+            """
+        )
+
+        return PatchResultSuccess()
+    }
+}

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

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

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

@@ -0,0 +1,26 @@
+package app.revanced.patches.music.layout.minimizedplayback.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+object MinimizedPlaybackManagerFingerprint : MethodFingerprint(
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    listOf("I", "L", "Z"),
+    listOf(
+        Opcode.IGET,
+        Opcode.IF_NE,
+        Opcode.IGET_OBJECT,
+        Opcode.IF_NE,
+        Opcode.IGET_BOOLEAN,
+        Opcode.IF_EQ,
+        Opcode.GOTO,
+        Opcode.RETURN_VOID,
+        Opcode.SGET_OBJECT,
+        Opcode.CONST_4,
+        Opcode.IF_NE,
+        Opcode.IPUT_BOOLEAN,
+    )
+)

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

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

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

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

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

@@ -0,0 +1,16 @@
+package app.revanced.patches.music.layout.premium.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+object HideGetPremiumFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
+        Opcode.IF_NEZ,
+        Opcode.CONST_16,
+        Opcode.GOTO,
+        Opcode.NOP,
+        Opcode.INVOKE_VIRTUAL
+    )
+)

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

@@ -0,0 +1,19 @@
+package app.revanced.patches.music.layout.premium.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+object HideGetPremiumParentFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
+        Opcode.IGET_BOOLEAN,
+        Opcode.CONST_4,
+        Opcode.IF_EQZ,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_STATIC
+    ),
+    listOf("FEmusic_history"),
+)

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

@@ -0,0 +1,51 @@
+package app.revanced.patches.music.layout.premium.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.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.layout.premium.fingerprints.HideGetPremiumFingerprint
+import app.revanced.patches.music.layout.premium.fingerprints.HideGetPremiumParentFingerprint
+
+@Patch
+@Name("hide-get-premium")
+@Description("Removes all \"Get Premium\" evidences from the avatar menu.")
+@HideGetPremiumCompatibility
+@Version("0.0.1")
+class HideGetPremiumPatch : BytecodePatch(
+    listOf(
+        HideGetPremiumParentFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        val parentResult = HideGetPremiumParentFingerprint.result!!
+        HideGetPremiumFingerprint.resolve(context, parentResult.classDef)
+
+        val startIndex = parentResult.scanResult.patternScanResult!!.startIndex
+
+        val parentMethod = parentResult.mutableMethod
+        parentMethod.replaceInstruction(
+            startIndex, """
+            const/4 v1, 0x0
+        """
+        )
+
+        val result = HideGetPremiumFingerprint.result!!
+        val method = result.mutableMethod
+        method.addInstructions(
+            startIndex, """
+            const/16 v0, 0x8
+        """
+        )
+
+        return PatchResultSuccess()
+    }
+}

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

@@ -0,0 +1,18 @@
+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", arrayOf("5.21.52", "5.22.54", "5.23.50", "5.25.51", "5.25.52", "5.26.52", "5.27.51", "5.28.52", "5.29.52", "5.31.50")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class RemoveTasteBuilderCompatibility

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

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

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

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

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

@@ -0,0 +1,62 @@
+package app.revanced.patches.music.layout.upgradebutton.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 PivotBarConstructorFingerprint : MethodFingerprint(
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    listOf("L", "Z"),
+    listOf(
+        Opcode.INVOKE_DIRECT,
+        Opcode.CONST_4,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_BOOLEAN,
+        Opcode.IGET_OBJECT,
+        Opcode.IF_NEZ,
+        Opcode.GOTO,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_EQZ,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST,
+        Opcode.IGET,
+        Opcode.CONST,
+        Opcode.IF_NE,
+        Opcode.IGET_OBJECT,
+        Opcode.CHECK_CAST,
+        Opcode.GOTO,
+        Opcode.SGET_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT,
+        Opcode.IF_EQZ,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST,
+        Opcode.IGET,
+        Opcode.CONST,
+        Opcode.IF_NE,
+        Opcode.IGET_OBJECT,
+        Opcode.CHECK_CAST,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.GOTO,
+        Opcode.NOP,
+        Opcode.IPUT_OBJECT,
+        Opcode.RETURN_VOID
+    )
+)

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

@@ -0,0 +1,78 @@
+package app.revanced.patches.music.layout.upgradebutton.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.util.smali.toInstructions
+import app.revanced.patches.music.layout.upgradebutton.annotations.RemoveUpgradeButtonCompatibility
+import app.revanced.patches.music.layout.upgradebutton.fingerprints.PivotBarConstructorFingerprint
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.builder.instruction.BuilderInstruction22t
+import org.jf.dexlib2.iface.instruction.formats.Instruction22c
+import org.jf.dexlib2.iface.instruction.formats.Instruction35c
+
+
+@Patch
+@Name("upgrade-button-remover")
+@Description("Removes the upgrade tab from the pivot bar.")
+@RemoveUpgradeButtonCompatibility
+@Version("0.0.1")
+class RemoveUpgradeButtonPatch : BytecodePatch(
+    listOf(
+        PivotBarConstructorFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        val result = PivotBarConstructorFingerprint.result!!
+        val implementation = result.mutableMethod.implementation!!
+
+        val pivotBarElementFieldRef =
+            (implementation.instructions[result.scanResult.patternScanResult!!.endIndex - 1] as Instruction22c).reference
+
+        val register = (implementation.instructions.first() as Instruction35c).registerC
+        // first compile all the needed instructions
+        val instructionList = """
+                invoke-interface { v0 }, Ljava/util/List;->size()I
+                move-result v1
+                const/4 v2, 0x3
+                invoke-interface {v0, v2}, Ljava/util/List;->remove(I)Ljava/lang/Object;
+                iput-object v0, v$register, $pivotBarElementFieldRef
+            """.toInstructions().toMutableList()
+
+
+        val endIndex = result.scanResult.patternScanResult!!.endIndex
+
+        // replace the instruction to retain the label at given index
+        implementation.replaceInstruction(
+            endIndex - 1, instructionList[0] // invoke-interface
+        )
+        // do not forget to remove this instruction since we added it already
+        instructionList.removeFirst()
+
+        val exitInstruction = instructionList.last() // iput-object
+        implementation.addInstruction(
+            endIndex, exitInstruction
+        )
+        // do not forget to remove this instruction since we added it already
+        instructionList.removeLast()
+
+        // add the necessary if statement to remove the upgrade tab button in case it exists
+        instructionList.add(
+            2, // if-le
+            BuilderInstruction22t(
+                Opcode.IF_LE, 1, 2, implementation.newLabelForIndex(endIndex)
+            )
+        )
+
+        implementation.addInstructions(
+            endIndex, instructionList
+        )
+        return PatchResultSuccess()
+    }
+}

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

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

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

@@ -0,0 +1,8 @@
+package app.revanced.patches.music.misc.microg.fingerprints
+
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object CastContextFetchFingerprint : MethodFingerprint(
+    strings = listOf("Error fetching CastContext.")
+)

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

@@ -0,0 +1,8 @@
+package app.revanced.patches.music.misc.microg.fingerprints
+
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object CastDynamiteModuleFingerprint : MethodFingerprint(
+    strings = listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
+)

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

@@ -0,0 +1,8 @@
+package app.revanced.patches.music.misc.microg.fingerprints
+
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object CastDynamiteModuleV2Fingerprint : MethodFingerprint(
+    strings = listOf("Failed to load module via V2: ")
+)

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

@@ -0,0 +1,18 @@
+package app.revanced.patches.music.misc.microg.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+
+object GooglePlayUtilityFingerprint : MethodFingerprint(
+    "I",
+    AccessFlags.PUBLIC or AccessFlags.STATIC,
+    listOf("L", "I"),
+    strings = listOf(
+        "This should never happen.",
+        "MetadataValueReader",
+        "GooglePlayServicesUtil",
+        "com.android.vending",
+        "android.hardware.type.embedded"
+    )
+)

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

@@ -0,0 +1,8 @@
+package app.revanced.patches.music.misc.microg.fingerprints
+
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object PrimeFingerprint : MethodFingerprint(
+    strings = listOf("com.google.android.GoogleCamera", "com.android.vending")
+)

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

@@ -0,0 +1,15 @@
+package app.revanced.patches.music.misc.microg.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
+
+
+@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
+object ServiceCheckFingerprint : MethodFingerprint(
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.STATIC,
+    listOf("L", "I"),
+    strings = listOf("Google Play Services not available")
+)

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

@@ -0,0 +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() }
+}

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

@@ -0,0 +1,41 @@
+package app.revanced.patches.music.misc.microg.patch.resource
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
+import app.revanced.patches.music.misc.microg.shared.Constants.MUSIC_PACKAGE_NAME
+import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_APP_NAME
+import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_PACKAGE_NAME
+import app.revanced.patches.music.misc.microg.shared.Constants.SPOOFED_PACKAGE_NAME
+import app.revanced.patches.music.misc.microg.shared.Constants.SPOOFED_PACKAGE_SIGNATURE
+import app.revanced.util.microg.MicroGManifestHelper
+import app.revanced.util.microg.MicroGResourceHelper
+
+@Name("music-microg-resource-patch")
+@Description("Resource patch to allow YouTube Music ReVanced to run without root and under a different package name.")
+@MusicMicroGPatchCompatibility
+@Version("0.0.2")
+class MusicMicroGResourcePatch : ResourcePatch {
+    override fun execute(context: ResourceContext): PatchResult {
+        // update manifest
+        MicroGResourceHelper.patchManifest(
+            context,
+            MUSIC_PACKAGE_NAME,
+            REVANCED_MUSIC_PACKAGE_NAME,
+            REVANCED_MUSIC_APP_NAME
+        )
+
+        // add metadata to the manifest
+        MicroGManifestHelper.addSpoofingMetadata(
+            context,
+            SPOOFED_PACKAGE_NAME,
+            SPOOFED_PACKAGE_SIGNATURE
+        )
+        return PatchResultSuccess()
+    }
+}

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

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

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

@@ -1,92 +0,0 @@
-package app.revanced.patches.music.premium
-
-import app.revanced.patcher.data.implementation.BytecodeData
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.patch.implementation.BytecodePatch
-import app.revanced.patcher.patch.implementation.metadata.PackageMetadata
-import app.revanced.patcher.patch.implementation.metadata.PatchMetadata
-import app.revanced.patcher.patch.implementation.misc.PatchResult
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.signature.MethodMetadata
-import app.revanced.patcher.signature.MethodSignature
-import app.revanced.patcher.signature.MethodSignatureMetadata
-import app.revanced.patcher.signature.PatternScanMethod
-import app.revanced.patcher.smali.toInstructions
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-private val compatiblePackages = listOf(
-    PackageMetadata(
-        "com.google.android.apps.youtube.music",
-        listOf("5.03.50")
-    )
-)
-
-class BackgroundPlayPatch : BytecodePatch(
-    PatchMetadata(
-        "background-play",
-        "Enable Background Playback Patch",
-        "Enable playing music in the background.",
-        compatiblePackages,
-        "0.0.1"
-    ),
-    listOf(
-        MethodSignature(
-            MethodSignatureMetadata(
-                "background-playback-disabler-method",
-                MethodMetadata("Lafgf;", "e"),
-                PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
-                compatiblePackages,
-                "Signature for the method required to be patched.",
-                "0.0.1"
-            ),
-            "Z",
-            AccessFlags.PUBLIC or AccessFlags.STATIC,
-            listOf("L"),
-            listOf(
-                Opcode.CONST_4,
-                Opcode.IF_EQZ,
-                Opcode.IGET,
-                Opcode.AND_INT_LIT16,
-                Opcode.IF_EQZ,
-                Opcode.IGET_OBJECT,
-                Opcode.IF_NEZ,
-                Opcode.SGET_OBJECT,
-                Opcode.IGET,
-                Opcode.CONST,
-                Opcode.IF_NE,
-                Opcode.IGET_OBJECT,
-                Opcode.IF_NEZ,
-                Opcode.SGET_OBJECT,
-                Opcode.IGET,
-                Opcode.IF_NE,
-                Opcode.IGET_OBJECT,
-                Opcode.CHECK_CAST,
-                Opcode.GOTO,
-                Opcode.SGET_OBJECT,
-                Opcode.GOTO,
-                Opcode.CONST_4,
-                Opcode.IF_EQZ,
-                Opcode.IGET_BOOLEAN,
-                Opcode.IF_EQZ,
-                Opcode.CONST_4,
-                Opcode.RETURN,
-                Opcode.RETURN,
-                Opcode.RETURN
-            )
-        )
-    )
-) {
-    override fun execute(data: BytecodeData): PatchResult {
-        signatures.first().result!!.method.implementation!!.addInstructions(
-            0,
-            """
-                const/4 v0, 0x1
-                return v0
-            """.trimIndent().toInstructions()
-        )
-
-        return PatchResultSuccess()
-    }
-}

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

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

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

@@ -0,0 +1,43 @@
+package app.revanced.patches.music.premium.backgroundplay.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 BackgroundPlaybackDisableFingerprint : MethodFingerprint(
+    "Z", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L"), listOf(
+        Opcode.CONST_4,
+        Opcode.IF_EQZ,
+        Opcode.IGET,
+        Opcode.AND_INT_LIT16,
+        Opcode.IF_EQZ,
+        Opcode.IGET_OBJECT,
+        Opcode.IF_NEZ,
+        Opcode.SGET_OBJECT,
+        Opcode.IGET,
+        Opcode.CONST,
+        Opcode.IF_NE,
+        Opcode.IGET_OBJECT,
+        Opcode.IF_NEZ,
+        Opcode.SGET_OBJECT,
+        Opcode.IGET,
+        Opcode.IF_NE,
+        Opcode.IGET_OBJECT,
+        Opcode.CHECK_CAST,
+        Opcode.GOTO,
+        Opcode.SGET_OBJECT,
+        Opcode.GOTO,
+        Opcode.CONST_4,
+        Opcode.IF_EQZ,
+        Opcode.IGET_BOOLEAN,
+        Opcode.IF_EQZ,
+        Opcode.CONST_4,
+        Opcode.RETURN,
+        Opcode.RETURN,
+        Opcode.RETURN
+    )
+)

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

@@ -0,0 +1,36 @@
+package app.revanced.patches.music.premium.backgroundplay.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.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.premium.backgroundplay.annotations.BackgroundPlayCompatibility
+import app.revanced.patches.music.premium.backgroundplay.fingerprints.BackgroundPlaybackDisableFingerprint
+
+@Patch
+@Name("background-play")
+@Description("Enables playing music in the background.")
+@BackgroundPlayCompatibility
+@Version("0.0.1")
+class BackgroundPlayPatch : BytecodePatch(
+    listOf(
+        BackgroundPlaybackDisableFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        BackgroundPlaybackDisableFingerprint.result!!.mutableMethod.addInstructions(
+            0,
+            """
+                const/4 v0, 0x1
+                return v0
+            """
+        )
+
+        return PatchResultSuccess()
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

src/main/kotlin/app/revanced/patches/reddit/ad/general/annotations/GeneralAdsCompatibility.kt

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

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

@@ -0,0 +1,54 @@
+package app.revanced.patches.reddit.ad.general.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.reddit.ad.general.annotations.GeneralAdsCompatibility
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.builder.instruction.BuilderInstruction21c
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.reference.StringReference
+import org.jf.dexlib2.immutable.reference.ImmutableStringReference
+
+@Patch
+@Name("general-reddit-ads")
+@Description("Removes general ads from the Reddit frontpage and subreddits.")
+@GeneralAdsCompatibility
+@Version("0.0.1")
+class GeneralAdsPatch : BytecodePatch() {
+    override fun execute(context: BytecodeContext): PatchResult {
+        context.classes.forEach { classDef ->
+            classDef.methods.forEach methodLoop@{ method ->
+                val implementation = method.implementation ?: return@methodLoop
+
+                implementation.instructions.forEachIndexed { i, instruction ->
+                    if (instruction.opcode != Opcode.CONST_STRING) return@forEachIndexed
+                    if (((instruction as ReferenceInstruction).reference as StringReference).string != "AdPost") return@forEachIndexed
+
+                    val proxiedClass = context.proxy(classDef).mutableClass
+
+                    val proxiedImplementation = proxiedClass.methods.first {
+                        it.name == method.name && it.parameterTypes.containsAll(method.parameterTypes)
+                    }.implementation!!
+
+                    var newString = "AdPost1"
+                    if (proxiedImplementation.instructions[i - 1].opcode == Opcode.CONST_STRING) {
+                        newString = "SubredditPost"
+                    }
+                    proxiedImplementation.replaceInstruction(
+                        i, BuilderInstruction21c(
+                            Opcode.CONST_STRING, (proxiedImplementation.instructions[i] as BuilderInstruction21c).registerA, ImmutableStringReference(newString)
+                        )
+                    )
+                }
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+}

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

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

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

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

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

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

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

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