chore(release): 2.43.1 [skip ci]

## [2.43.1](https://github.com/revanced/revanced-patches/compare/v2.43.0...v2.43.1) (2022-08-26)

### Bug Fixes

* `Patch` annotation for `client-spoof` patch ([6a8af47](ede60b994c))

.github/ISSUE_TEMPLATE/bug-issue.yml

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

.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/feature-issue.yml

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

.github/workflows/release.yml

@@ -1,5 +1,6 @@
 name: Release
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
@@ -11,7 +12,7 @@ on:
 jobs:
   release:
     name: Release
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -27,12 +28,14 @@ jobs:
         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 generateReadme
+      - 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

.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,6 +19,7 @@
       "@semantic-release/git",
       {
         "assets": [
+          "README.md",
           "CHANGELOG.md",
           "gradle.properties"
         ]

README-template.md

@@ -0,0 +1,7 @@
+# 🧩 ReVanced Patches
+
+Official patches by ReVanced
+
+## 📜 List of available patches
+
+{{ table }}

README.md

@@ -1,2 +1,101 @@
-# revanced-patches
-Repo for all ReVanced patches
+# 🧩 ReVanced Patches
+
+Official patches by ReVanced
+
+## 📜 List of available patches
+
+### 📦 `com.twitter.android`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `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 |
+</details>
+
+### 📦 `com.garzotto.pflotsh.ecmwf_a`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `pflotsh-ecmwf-subscription-unlock` | Unlocks all subscription features. | 3.5.4 |
+</details>
+
+### 📦 `com.google.android.apps.youtube.music`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.17.51 |
+| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.16.51 |
+| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.17.51 |
+| `compact-header` | Hides the music category bar at the top of the homepage. | 5.16.51 |
+| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.17.51 |
+| `background-play` | Enables playing music in the background. | 5.17.51 |
+| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.17.51 |
+| `music-video-ads` | Removes ads in the music player. | 5.17.51 |
+| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.17.51 |
+| `exclusive-audio-playback` | Enables the option to play music without video. | 5.17.51 |
+</details>
+
+### 📦 `de.dwd.warnapp`
+<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.ss.android.ugc.trill`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `tiktok-ads` | Removes ads from TikTok. | all |
+</details>
+
+### 📦 `com.google.android.youtube`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `swipe-controls` | Adds volume and brightness swipe controls. | 17.32.35 |
+| `downloads` | Enables downloading music and videos from YouTube. | 17.32.35 |
+| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.32.35 |
+| `amoled` | Enables pure black theme. | 17.32.35 |
+| `disable-create-button` | Hides the create button in the navigation bar. | 17.32.35 |
+| `hide-cast-button` | Hides the cast button in the video player. | all |
+| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.32.35 |
+| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.32.35 |
+| `premium-heading` | Shows premium branding on the home screen. | all |
+| `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
+| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 17.32.35 |
+| `old-quality-layout` | Enables the original quality flyout menu. | 17.32.35 |
+| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.32.35 |
+| `hide-watermark` | Hides creator's watermarks on videos. | 17.32.35 |
+| `sponsorblock` | Integrate SponsorBlock. | 17.32.35 |
+| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.32.35 |
+| `tablet-mini-player` | Enables the tablet mini player layout. | 17.32.35 |
+| `minimized-playback` | Enables minimized and background playback. | 17.32.35 |
+| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
+| `custom-video-buffer` | Lets you change the buffers of videos. | 17.32.35 |
+| `always-autorepeat` | Always repeats the playing video again. | 17.32.35 |
+| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.32.35 |
+| `settings` | Adds settings for ReVanced to YouTube. | all |
+| `enable-debugging` | Enables app debugging by patching the manifest file. | all |
+| `custom-playback-speed` | Adds more video playback speed options. | 17.32.35 |
+| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.32.35 |
+| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.32.35 |
+| `video-ads` | Removes ads in the video player. | 17.32.35 |
+| `general-ads` | Removes general ads. | 17.32.35 |
+| `hide-infocard-suggestions` | Hides infocards in videos. | 17.32.35 |
+</details>
+
+

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:3.3.3")
+    implementation("app.revanced:multidexlib2:2.5.2.r2")
 }
 
-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>("generateReadme") {
+        description = "Generate README.md"
+        dependsOn(build)
+
+        classpath = sourceSets["main"].runtimeClasspath
+        mainClass.set("app.revanced.meta.readme.Generator")
+    }
+    // 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("generateReadme"))
     }
 }

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 1.0.0-dev.8
+version = 2.43.1

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

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

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

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

@@ -0,0 +1,55 @@
+package app.revanced.meta.readme
+
+import app.revanced.patcher.data.Data
+import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
+import app.revanced.patcher.extensions.PatchExtensions.description
+import app.revanced.patcher.extensions.PatchExtensions.patchName
+import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.util.patch.impl.JarPatchBundle
+import java.io.File
+
+object Generator {
+    private const val TABLE_HEADER =
+        "| \uD83D\uDC8A Patch | \uD83D\uDCDC Description | \uD83C\uDFF9 Target Version |\n" +
+                "|:--------:|:--------------:|:-----------------:|"
+
+    @JvmStatic
+    fun main(args: Array<String>) {
+        val buildDir = File("build/libs/")
+        val buildJar =
+            buildDir.listFiles()?.first { it.name.startsWith("revanced-patches-") && it.name.endsWith(".jar") }!!
+
+        val bundle = JarPatchBundle(buildJar.absolutePath).loadPatches()
+
+        val output = StringBuilder()
+
+        val packages = mutableMapOf<String, MutableList<Class<out Patch<Data>>>>()
+
+        bundle.map {
+            val packageName = it.compatiblePackages?.first()?.name!!
+            if (!packages.contains(packageName)) {
+                packages[packageName] = mutableListOf()
+            }
+
+            packages[packageName]?.add(it)
+        }
+
+        for (pkg in packages) {
+            output.appendLine("### \uD83D\uDCE6 `${pkg.key}`")
+            output.appendLine("<details>\n")
+
+            output.appendLine(TABLE_HEADER)
+            pkg.value.forEach { output.appendLine("| `${it.patchName}` | ${it.description} | ${it.getLatestVersion() ?: "all"} |") }
+
+            output.appendLine("</details>\n")
+        }
+
+        val readMeTemplateFile = File("README-template.md")
+        val readmeTemplate = Template(readMeTemplateFile.readText())
+
+        readmeTemplate.replaceVariable("table", output.toString())
+
+        val readme = File("README.md")
+        readme.writeText(readmeTemplate.toString())
+    }
+}

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

@@ -0,0 +1,24 @@
+package app.revanced.meta.readme
+
+data class SemanticVersion(val major: Int, val minor: Int, val patch: Int) {
+    companion object {
+        fun fromString(version: String): SemanticVersion {
+            var 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,14 @@
+package app.revanced.meta.readme
+
+class Template(template: String) {
+    val result: StringBuilder = StringBuilder(template)
+
+    fun replaceVariable(name: String, value: String) {
+        val regex = Regex("\\{\\{\\s?$name\\s?}}")
+        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/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")
+    )]
+)
+@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,39 @@
+package app.revanced.patches.music.ad.video.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.music.ad.video.annotations.MusicVideoAdsCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("show-video-ads-constructor-fingerprint")
+@MatchingMethod(
+    "Laghd;",
+    "<init>",
+)
+@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
+@MusicVideoAdsCompatibility
+@Version("0.0.1")
+object ShowMusicVideoAdsConstructorFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L"), listOf(
+        Opcode.INVOKE_DIRECT,
+        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,26 @@
+package app.revanced.patches.music.ad.video.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.music.ad.video.annotations.MusicVideoAdsCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("show-video-ads-method-fingerprint")
+@MatchingMethod(
+    "Laghd;", "d"
+)
+@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
+@MusicVideoAdsCompatibility
+@Version("0.0.1")
+object ShowMusicVideoAdsFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z"), listOf(
+        Opcode.IPUT_BOOLEAN,
+        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.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.music.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(data: BytecodeData): PatchResult {
+        ShowMusicVideoAdsFingerprint.resolve(data, ShowMusicVideoAdsConstructorFingerprint.result!!.classDef)
+
+        val result = ShowMusicVideoAdsFingerprint.result!!
+
+        result.mutableMethod.addInstructions(
+            result.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")
+    )]
+)
+@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,62 @@
+package app.revanced.patches.music.audio.codecs.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher. fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.music.audio.codecs.annotations.CodecsUnlockCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("all-codecs-reference-fingerprint")
+@MatchingMethod(
+    "Laari;",
+    "b",
+)
+@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
+@CodecsUnlockCompatibility
+@Version("0.0.1")
+object AllCodecsReferenceFingerprint : MethodFingerprint(
+    "J", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"), listOf(
+        Opcode.INVOKE_STATIC,
+        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,39 @@
+package app.revanced.patches.music.audio.codecs.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.music.audio.codecs.annotations.CodecsUnlockCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("codec-lock-fingerprint")
+@MatchingMethod(
+    "Lacfr;",
+    "a",
+)
+@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
+@CodecsUnlockCompatibility
+@Version("0.0.1")
+object CodecsLockFingerprint : MethodFingerprint(
+    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, null, 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
+    ),
+    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.impl.BytecodeData
+import app.revanced.patcher.data.impl.toMethodWalker
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+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(data: BytecodeData): PatchResult {
+        val codecsLockResult = CodecsLockFingerprint.result!!
+
+        val implementation = codecsLockResult.mutableMethod.implementation!!
+
+        val scanResultStartIndex = codecsLockResult.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 =
+            data.toMethodWalker(allCodecsResult.method)
+                .nextMethod(allCodecsResult.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")
+    )]
+)
+@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,43 @@
+package app.revanced.patches.music.audio.exclusiveaudio.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.music.audio.exclusiveaudio.annotations.ExclusiveAudioCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("audio-only-enabler-fingerprint")
+@MatchingMethod(
+    "Lgmd;",
+    "d"
+)
+@DirectPatternScanMethod
+@ExclusiveAudioCompatibility
+@Version(
+    "0.0.1"
+)
+object  AudioOnlyEnablerFingerprint: MethodFingerprint(
+    "Z", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
+        Opcode.IGET_OBJECT,
+        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,60 @@
+package app.revanced.patches.music.audio.exclusiveaudio.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.music.audio.exclusiveaudio.annotations.ExclusiveAudioCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("exclusive-audio-fingerprints")
+@MatchingMethod(
+    "Lgmd;", "c"
+)
+@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
+@ExclusiveAudioCompatibility
+@Version("0.0.1")
+object ExclusiveAudioFingerprint : MethodFingerprint(
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    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,35 @@
+package app.revanced.patches.music.audio.exclusiveaudio.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.music.audio.exclusiveaudio.annotations.ExclusiveAudioCompatibility
+import app.revanced.patches.music.audio.exclusiveaudio.fingerprints.AudioOnlyEnablerFingerprint
+import app.revanced.patches.music.audio.exclusiveaudio.fingerprints.ExclusiveAudioFingerprint
+
+@Patch
+@Name("exclusive-audio-playback")
+@Description("Enables the option to play music without video.")
+@ExclusiveAudioCompatibility
+@Version("0.0.1")
+class ExclusiveAudioPatch : BytecodePatch(
+    listOf(
+        AudioOnlyEnablerFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val method = AudioOnlyEnablerFingerprint.result!!.mutableMethod
+        method.replaceInstruction(method.implementation!!.instructions.count() - 1, "const/4 v0, 0x1")
+        method.addInstruction("return v0")
+
+        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")
+    )]
+)
+@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,33 @@
+package app.revanced.patches.music.layout.compactheader.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.music.layout.compactheader.annotations.CompactHeaderCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("compact-header-constructor-fingerprint")
+@MatchingMethod(
+    "Llcz;", "<init>"
+)
+@CompactHeaderCompatibility
+@Version("0.0.1")
+object CompactHeaderConstructorFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L", "L", "L"), listOf(
+        Opcode.INVOKE_DIRECT,
+        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.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+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(data: BytecodeData): PatchResult {
+        val result = CompactHeaderConstructorFingerprint.result!!
+        val method = result.mutableMethod
+
+        val insertIndex = result.patternScanResult!!.endIndex
+        val register = (method.implementation!!.instructions[insertIndex - 1] as BuilderInstruction11x).registerA
+        method.addInstructions(
+            insertIndex, """
+                const/16 v0, 0x8
+                invoke-virtual {v${register}, v0}, 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")
+    )]
+)
+@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,36 @@
+package app.revanced.patches.music.layout.minimizedplayback.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.music.layout.minimizedplayback.annotations.MinimizedPlaybackCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("minimized-playback-manager-fingerprint")
+@MatchingMethod(
+    "Llxw;", "c"
+)
+@MinimizedPlaybackCompatibility
+@Version("0.0.1")
+object MinimizedPlaybackManagerFingerprint : MethodFingerprint(
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    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,38 @@
+package app.revanced.patches.music.layout.minimizedplayback.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.impl.toMethodWalker
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.music.layout.minimizedplayback.annotations.MinimizedPlaybackCompatibility
+import app.revanced.patches.music.layout.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.reference.MethodReference
+
+@Patch
+@Name("minimized-playback-music")
+@Description("Enables minimized playback on Kids music.")
+@MinimizedPlaybackCompatibility
+@Version("0.0.1")
+class MinimizedPlaybackPatch : BytecodePatch(
+    listOf(
+        MinimizedPlaybackManagerFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): 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")
+    )]
+)
+@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,26 @@
+package app.revanced.patches.music.layout.premium.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.music.layout.premium.annotations.HideGetPremiumCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("hide-get-premium-fingerprint")
+@MatchingMethod(
+    "Lktn;", "k"
+)
+@HideGetPremiumCompatibility
+@Version("0.0.1")
+object HideGetPremiumFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
+        Opcode.IF_NEZ,
+        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,29 @@
+package app.revanced.patches.music.layout.premium.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.music.layout.premium.annotations.HideGetPremiumCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("hide-get-premium-parent-fingerprint")
+@MatchingMethod(
+    "Lktn;", "k"
+)
+@HideGetPremiumCompatibility
+@Version("0.0.1")
+object HideGetPremiumParentFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf(
+        Opcode.IGET_BOOLEAN,
+        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,49 @@
+package app.revanced.patches.music.layout.premium.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+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(data: BytecodeData): PatchResult {
+        val parentResult = HideGetPremiumParentFingerprint.result!!
+        HideGetPremiumFingerprint.resolve(data, parentResult.classDef)
+
+        val parentMethod = parentResult.mutableMethod
+        parentMethod.replaceInstruction(
+            parentResult.patternScanResult!!.startIndex, """
+            const/4 v1, 0x0
+        """
+        )
+
+        val result = HideGetPremiumFingerprint.result!!
+        val method = result.mutableMethod
+        method.addInstructions(
+            result.patternScanResult!!.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.14.53", "5.16.51")
+    )]
+)
+@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,43 @@
+package app.revanced.patches.music.layout.tastebuilder.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.music.layout.tastebuilder.annotations.RemoveTasteBuilderCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("taste-builder-constructor-fingerprint")
+@MatchingMethod(
+    "Lkyu;", "<init>"
+)
+@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
+@RemoveTasteBuilderCompatibility
+@Version("0.0.1")
+object TasteBuilderConstructorFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L", "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
+    )
+)

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.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+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(data: BytecodeData): PatchResult {
+        val result = TasteBuilderConstructorFingerprint.result!!
+        val method = result.mutableMethod
+
+        val insertIndex = result.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")
+    )]
+)
+@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,71 @@
+package app.revanced.patches.music.layout.upgradebutton.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.music.layout.upgradebutton.annotations.RemoveUpgradeButtonCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("pivot-bar-constructor-fingerprint")
+@MatchingMethod(
+    "Lhfu;", "<init2>"
+)
+@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
+@RemoveUpgradeButtonCompatibility
+@Version("0.0.1")
+object PivotBarConstructorFingerprint : MethodFingerprint(
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    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,76 @@
+package app.revanced.patches.music.layout.upgradebutton.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.util.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(data: BytecodeData): PatchResult {
+        val result = PivotBarConstructorFingerprint.result!!
+        val implementation = result.mutableMethod.implementation!!
+
+        val pivotBarElementFieldRef =
+            (implementation.instructions[result.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()
+
+
+        // replace the instruction to retain the label at given index
+        implementation.replaceInstruction(
+            result.patternScanResult!!.endIndex - 1, instructionList[0] // invoke-interface
+        )
+        // do not forget to remove this instruction since we added it already
+        instructionList.removeFirst()
+
+        val exitInstruction = instructionList.last() // iput-object
+        implementation.addInstruction(
+            result.patternScanResult!!.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.patternScanResult!!.endIndex)
+            )
+        )
+
+        implementation.addInstructions(
+            result.patternScanResult!!.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")
+    )]
+)
+@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,20 @@
+package app.revanced.patches.music.misc.microg.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
+
+@Name("cast-context-fetch-fingerprint")
+@MatchingMethod(
+    "Lvvz;", "a"
+)
+@DirectPatternScanMethod
+@MicroGPatchCompatibility
+@Version("0.0.1")
+object CastContextFetchFingerprint : MethodFingerprint(
+    null, null, null, null,
+    listOf("Error fetching CastContext.")
+)

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

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

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

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

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

@@ -0,0 +1,21 @@
+package app.revanced.patches.music.misc.microg.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("google-play-utility-fingerprint")
+@MatchingMethod(
+    "Lnuv;", "b"
+)
+@DirectPatternScanMethod
+@MusicMicroGPatchCompatibility
+@Version("0.0.1")
+object GooglePlayUtilityFingerprint : MethodFingerprint(
+    "I", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "I"), null, 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,19 @@
+package app.revanced.patches.music.misc.microg.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
+
+@Name("google-play-prime-fingerprint")
+@MatchingMethod(
+    "Lrwi;", "a"
+)
+@DirectPatternScanMethod
+@MusicMicroGPatchCompatibility
+@Version("0.0.1")
+object PrimeFingerprint : MethodFingerprint(
+    null, null, null, null, listOf("com.google.android.GoogleCamera", "com.android.vending")
+)

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

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

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

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

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

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

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

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

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")
+    )]
+)
+@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,52 @@
+package app.revanced.patches.music.premium.backgroundplay.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.music.premium.backgroundplay.annotations.BackgroundPlayCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("background-playback-disabler-fingerprint")
+@MatchingMethod(
+    "Lafgf;", "e"
+)
+@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
+@BackgroundPlayCompatibility
+@Version("0.0.1")
+object BackgroundPlaybackDisableFingerprint : MethodFingerprint(
+    "Z", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L"), listOf(
+        Opcode.CONST_4,
+        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.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+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(data: BytecodeData): PatchResult {
+        BackgroundPlaybackDisableFingerprint.result!!.mutableMethod.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,13 @@
+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", arrayOf()
+    )]
+)
+@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,55 @@
+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.impl.BytecodeData
+import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.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(data: BytecodeData): PatchResult {
+        data.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 = data.proxy(classDef).resolve()
+
+                    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/tiktok/ad/annotations/TiktokAdsCompatibility.kt

@@ -0,0 +1,14 @@
+package app.revanced.patches.tiktok.ad.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [
+        Package("com.ss.android.ugc.trill", arrayOf()),
+        Package("com.zhiliaoapp.musically", arrayOf())
+    ]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class TiktokAdsCompatibility

src/main/kotlin/app/revanced/patches/tiktok/ad/fingerprints/FeedItemListCloneFingerprint.kt

@@ -0,0 +1,20 @@
+package app.revanced.patches.tiktok.ad.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.ad.annotations.TiktokAdsCompatibility
+
+@Name("feed-item-clone-fingerprint")
+@MatchingMethod(
+    "Lcom/ss/android/ugc/aweme/feed/model/FeedItemList;",
+    "clone",
+)
+@TiktokAdsCompatibility
+@Version("0.0.1")
+object FeedItemListCloneFingerprint : MethodFingerprint(
+    null, null, null, null,null, { methodDef ->
+        methodDef.definingClass.endsWith("/FeedItemList;") && methodDef.name == "clone"
+    }
+)

src/main/kotlin/app/revanced/patches/tiktok/ad/patch/TiktokAdsPatch.kt

@@ -0,0 +1,48 @@
+package app.revanced.patches.tiktok.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.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstruction
+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.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.tiktok.ad.annotations.TiktokAdsCompatibility
+import app.revanced.patches.tiktok.ad.fingerprints.FeedItemListCloneFingerprint
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
+import org.jf.dexlib2.iface.reference.FieldReference
+
+@Patch
+@Name("tiktok-ads")
+@Description("Removes ads from TikTok.")
+@TiktokAdsCompatibility
+@Version("0.0.1")
+class TiktokAdsPatch : BytecodePatch(
+    listOf(FeedItemListCloneFingerprint)
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val method = FeedItemListCloneFingerprint.result!!.mutableMethod
+        // iterate all instructions in the clone method
+        for ((index, instruction) in method.implementation!!.instructions.withIndex()) {
+            // conditions for the instruction we need
+            if (instruction.opcode.ordinal != Opcode.IPUT_OBJECT.ordinal) continue
+            val clonePreloadAdsFieldInstruction = (instruction as? ReferenceInstruction)
+            if ((clonePreloadAdsFieldInstruction?.reference as? FieldReference)?.name != "preloadAds") continue
+
+            // set null instead of the field "preloadAds"
+            val overrideRegister = (clonePreloadAdsFieldInstruction as TwoRegisterInstruction).registerA
+            method.addInstruction(
+                index,
+                "const/4 v$overrideRegister, 0x0"
+            )
+            return PatchResultSuccess()
+        }
+
+        return PatchResultError("Could not find required instruction.")
+    }
+}

src/main/kotlin/app/revanced/patches/twitter/ad/timeline/annotations/TimelineAdsCompatibility.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.twitter.ad.timeline.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.twitter.android", arrayOf()
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class TimelineAdsCompatibility

src/main/kotlin/app/revanced/patches/twitter/ad/timeline/fingerprints/TimelineTweetJsonParserFingerprint.kt

@@ -0,0 +1,26 @@
+package app.revanced.patches.twitter.ad.timeline.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.twitter.ad.timeline.annotations.TimelineAdsCompatibility
+import org.jf.dexlib2.Opcode
+
+@Name("timeline-tweet-json-parser-fingerprint")
+@MatchingMethod("LJsonTimelineTweet\$\$JsonObjectMapper;", "parseField")
+@TimelineAdsCompatibility
+@Version("0.0.1")
+object TimelineTweetJsonParserFingerprint : MethodFingerprint(
+    null, null, null, listOf(
+        Opcode.IPUT_OBJECT,
+        Opcode.GOTO,
+        Opcode.SGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST,
+        Opcode.IPUT_OBJECT,
+        Opcode.RETURN_VOID,
+    ), listOf("tweetPromotedMetadata", "promotedMetadata", "hasModeratedReplies", "conversationAnnotation"),
+    { methodDef -> methodDef.name == "parseField" }
+)

src/main/kotlin/app/revanced/patches/twitter/ad/timeline/patch/TimelineAdsPatch.kt

@@ -0,0 +1,77 @@
+package app.revanced.patches.twitter.ad.timeline.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
+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.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.twitter.ad.timeline.annotations.TimelineAdsCompatibility
+import app.revanced.patches.twitter.ad.timeline.fingerprints.TimelineTweetJsonParserFingerprint
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.builder.BuilderInstruction
+import org.jf.dexlib2.builder.instruction.BuilderInstruction22c
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.reference.FieldReference
+import org.jf.dexlib2.iface.reference.StringReference
+
+@Patch
+@Name("timeline-ads")
+@Description("Removes ads from the Twitter timeline.")
+@TimelineAdsCompatibility
+@Version("0.0.1")
+class TimelineAdsPatch : BytecodePatch(
+    listOf(TimelineTweetJsonParserFingerprint)
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        if (removePromotedAds())
+            return PatchResultError("The instruction for the tweet id field could not be found")
+
+        return PatchResultSuccess()
+    }
+
+    private fun removePromotedAds(): Boolean {
+        val (parserFingerprintResult, parserMethod, instructions) = TimelineTweetJsonParserFingerprint.unwrap()
+
+        // Anchor index
+        val tweetIdFieldInstructionIndex = instructions.indexOfFirst { instruction ->
+            if (instruction.opcode.ordinal != Opcode.CONST_STRING.ordinal) return@indexOfFirst false
+            if (((instruction as? ReferenceInstruction)?.reference as StringReference).string != "tweetSocialProof") return@indexOfFirst false
+
+            // Use the above conditions as an anchor to find the index for the instruction with the field we need
+            return@indexOfFirst true
+        } - 2 // This is where the instruction with the field is located
+
+        // Reference to the tweetId field for of the timeline tweet
+        val tweetIdFieldReference =
+            (parserMethod.instruction(tweetIdFieldInstructionIndex) as? BuilderInstruction22c)?.reference as? FieldReference
+                ?: return true
+
+        // Set the tweetId field to null
+        // This will cause twitter to not show the promoted ads, because we set it to null, when the tweet is promoted
+        parserFingerprintResult.mutableMethod.addInstructions(
+            parserFingerprintResult.patternScanResult!!.startIndex + 1,
+            """
+                    const/4 v2, 0x0
+                    iput-object v2, p0, Lcom/twitter/model/json/timeline/urt/JsonTimelineTweet;->${tweetIdFieldReference.name}:Ljava/lang/String;
+                """
+        )
+        return false
+    }
+
+    private fun MethodFingerprint.unwrap(): Triple<MethodFingerprintResult, MutableMethod, MutableList<BuilderInstruction>> {
+        val parserFingerprintResult = this.result!!
+        val parserMethod = parserFingerprintResult.mutableMethod
+        val instructions = parserMethod.implementation!!.instructions
+
+        return Triple(parserFingerprintResult, parserMethod, instructions)
+    }
+}

src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/annotations/FirebaseGetCertPatchCompatibility.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.warnwetter.misc.firebasegetcert.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "de.dwd.warnapp", arrayOf()
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class FirebaseGetCertPatchCompatibility

src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertMessagingFingerprint.kt

@@ -0,0 +1,25 @@
+package app.revanced.patches.warnwetter.misc.firebasegetcert.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.warnwetter.misc.firebasegetcert.annotations.FirebaseGetCertPatchCompatibility
+
+@Name("messaging-app-certificate-fingerprint")
+@MatchingMethod(
+    "Lcom/google/firebase/installations/remote/c;", "f"
+)
+@FirebaseGetCertPatchCompatibility
+@Version("0.0.1")
+object GetMessagingCertFingerprint : MethodFingerprint(
+    "Ljava/lang/String;",
+    null,
+    null,
+    null,
+    listOf(
+        "ContentValues",
+        "Could not get fingerprint hash for package: ",
+        "No such package: "
+    )
+)

src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertRegistrationFingerprint.kt

@@ -0,0 +1,25 @@
+package app.revanced.patches.warnwetter.misc.firebasegetcert.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.warnwetter.misc.firebasegetcert.annotations.FirebaseGetCertPatchCompatibility
+
+@Name("registration-app-certificate-fingerprint")
+@MatchingMethod(
+    "Lcom/google/firebase/remoteconfig/internal/ConfigFetchHttpClient;", "f"
+)
+@FirebaseGetCertPatchCompatibility
+@Version("0.0.1")
+object GetReqistrationCertFingerprint : MethodFingerprint(
+    "Ljava/lang/String;",
+    null,
+    null,
+    null,
+    listOf(
+        "FirebaseRemoteConfig",
+        "Could not get fingerprint hash for package: ",
+        "No such package: "
+    )
+)

src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/patch/FirebaseGetCertPatch.kt

@@ -0,0 +1,45 @@
+package app.revanced.patches.warnwetter.misc.firebasegetcert.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.warnwetter.misc.firebasegetcert.fingerprints.*
+import app.revanced.patches.warnwetter.misc.firebasegetcert.annotations.FirebaseGetCertPatchCompatibility
+
+@Name("spoof-cert-patch")
+@Description("Spoofs the X-Android-Cert header.")
+@FirebaseGetCertPatchCompatibility
+@Version("0.0.1")
+class FirebaseGetCertPatch : BytecodePatch(
+    listOf(
+        GetReqistrationCertFingerprint,
+        GetMessagingCertFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val spoofedInstruction =
+            """
+                const-string v0, "0799DDF0414D3B3475E88743C91C0676793ED450"
+                return-object v0
+            """
+
+        val registrationCertMethod = GetReqistrationCertFingerprint.result!!.mutableMethod
+        val messagingCertMethod = GetMessagingCertFingerprint.result!!.mutableMethod
+
+        registrationCertMethod.addInstructions(
+            0,
+            spoofedInstruction
+        )
+        messagingCertMethod.addInstructions(
+            0,
+            spoofedInstruction
+        )
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/annotations/PromoCodeUnlockCompatibility.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.warnwetter.misc.promocode.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "de.dwd.warnapp", arrayOf()
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class PromoCodeUnlockCompatibility

src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/fingerprints/PromoCodeUnlockFingerprint.kt

@@ -0,0 +1,24 @@
+package app.revanced.patches.warnwetter.misc.promocode.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.warnwetter.misc.promocode.annotations.PromoCodeUnlockCompatibility
+
+@Name("promo-code-unlock-fingerprint")
+@MatchingMethod(
+    "Lde/dwd/warnapp/model/PromoTokenVerification;", "isValid"
+)
+@PromoCodeUnlockCompatibility
+@Version("0.0.1")
+object PromoCodeUnlockFingerprint : MethodFingerprint(
+    null,
+    null,
+    null,
+    null,
+    null,
+    { methodDef ->
+        methodDef.definingClass.endsWith("PromoTokenVerification;") && methodDef.name == "isValid"
+    }
+)

src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/patch/PromoCodeUnlockPatch.kt

@@ -0,0 +1,47 @@
+package app.revanced.patches.warnwetter.misc.promocode.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patches.warnwetter.misc.firebasegetcert.patch.FirebaseGetCertPatch
+import app.revanced.patches.warnwetter.misc.promocode.annotations.PromoCodeUnlockCompatibility
+import app.revanced.patches.warnwetter.misc.promocode.fingerprints.PromoCodeUnlockFingerprint
+
+@DependsOn(
+    [
+        FirebaseGetCertPatch::class
+    ]
+)
+@Patch
+@Name("promo-code-unlock")
+@Description("Disables the validation of promo code. Any code will work to unlock all features.")
+@PromoCodeUnlockCompatibility
+@Version("0.0.1")
+class PromoCodeUnlockPatch : BytecodePatch(
+    listOf(
+        PromoCodeUnlockFingerprint
+    )
+) {
+
+    override fun execute(data: BytecodeData): PatchResult {
+        val method = PromoCodeUnlockFingerprint.result!!.mutableMethod
+        method.addInstructions(
+            0,
+            """
+                const/4 v0, 0x1
+                return v0
+            """
+        )
+
+        return PatchResultSuccess()
+    }
+
+
+}

src/main/kotlin/app/revanced/patches/youtube/ad/HomePromoPatch.kt

@@ -1,188 +0,0 @@
-package app.revanced.patches.youtube.ad
-
-import app.revanced.extensions.injectHideCall
-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.PatchResultError
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.proxy.mutableTypes.MutableMethod
-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 org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.formats.Instruction11x
-
-private val compatiblePackages = listOf(
-    PackageMetadata(
-        "com.google.android.youtube",
-        listOf("17.03.38", "17.14.35", "17.17.34")
-    )
-)
-
-private val patchMetadata = PatchMetadata(
-    "home-promo-ads",
-    "Home Promo Ads Patch",
-    "Patch to remove promoted ads in YouTube",
-    compatiblePackages,
-    "0.0.1"
-)
-
-private val signatureDescription = "Required signature for ${patchMetadata.name}. Discovered in version 17.03.38."
-
-class HomePromoPatch : BytecodePatch(
-    patchMetadata,
-    listOf(
-        MethodSignature(
-            MethodSignatureMetadata(
-                "promoted-discovery-app-parent-method",
-                MethodMetadata(
-                    "Ljre;",
-                    "lP",
-                ),
-                PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
-                compatiblePackages,
-                signatureDescription,
-                "0.0.1"
-            ),
-            "V",
-            AccessFlags.PUBLIC or AccessFlags.FINAL or AccessFlags.BRIDGE or AccessFlags.SYNTHETIC,
-            listOf("L", "L"),
-            listOf(
-                Opcode.INVOKE_DIRECT,
-                Opcode.IGET_BOOLEAN,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.IGET_OBJECT,
-                Opcode.IGET_OBJECT,
-                Opcode.IF_NEZ,
-                Opcode.IGET_OBJECT,
-                Opcode.IGET_OBJECT,
-                Opcode.IF_NEZ,
-                Opcode.SGET_OBJECT,
-                Opcode.IPUT_OBJECT,
-                Opcode.IGET_OBJECT,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.IGET_OBJECT,
-                Opcode.IF_NEZ,
-                Opcode.IGET_OBJECT,
-                Opcode.IGET_OBJECT,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.MOVE_RESULT,
-                Opcode.NEW_ARRAY,
-                Opcode.IPUT_OBJECT,
-                Opcode.CONST_4,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.MOVE_RESULT,
-                Opcode.IF_GE,
-                Opcode.IGET_OBJECT,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.CHECK_CAST,
-                Opcode.APUT_OBJECT,
-                Opcode.ADD_INT_LIT8,
-                Opcode.GOTO
-            )
-        ),
-        MethodSignature(
-            MethodSignatureMetadata(
-                "promoted-discovery-action-parent-method",
-                MethodMetadata(
-                    "Ljqv;",
-                    "lP",
-                ),
-                PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
-                compatiblePackages,
-                signatureDescription,
-                "0.0.1"
-            ),
-            "V",
-            AccessFlags.PUBLIC or AccessFlags.FINAL or AccessFlags.BRIDGE or AccessFlags.SYNTHETIC,
-            listOf("L", "L"),
-            listOf(
-                Opcode.MOVE_OBJECT_FROM16,
-                Opcode.MOVE_OBJECT_FROM16,
-                Opcode.MOVE_OBJECT_FROM16,
-                Opcode.CHECK_CAST,
-                Opcode.INVOKE_VIRTUAL_RANGE,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.IGET_OBJECT,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.IGET_OBJECT,
-                Opcode.IGET_BOOLEAN,
-                Opcode.CONST_4,
-                Opcode.XOR_INT_2ADDR,
-                Opcode.IGET_BOOLEAN,
-                Opcode.INVOKE_DIRECT,
-                Opcode.IGET_BOOLEAN,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.IGET_OBJECT,
-                Opcode.IGET_OBJECT,
-                Opcode.IF_NEZ,
-                Opcode.IGET_OBJECT,
-                Opcode.IGET_OBJECT,
-                Opcode.IF_NEZ,
-                Opcode.SGET_OBJECT,
-                Opcode.IPUT_OBJECT,
-                Opcode.IGET_OBJECT,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.IGET_OBJECT,
-                Opcode.CONST_4,
-                Opcode.IF_NEZ,
-                Opcode.IGET_OBJECT,
-                Opcode.IGET_OBJECT
-            )
-        )
-    )
-) {
-    override fun execute(data: BytecodeData): PatchResult {
-        for (signature in signatures) {
-            val result = signature.result!!
-
-            val methodMetadata = MethodMetadata(signature.metadata.methodMetadata!!.definingClass, "d")
-            val requiredMethod = result.findParentMethod(
-                MethodSignature(
-                    MethodSignatureMetadata(
-                        "promoted-discovery-action-method",
-                        methodMetadata,
-                        PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
-                        compatiblePackages,
-                        signatureDescription,
-                        "0.0.1"
-                    ),
-                    "V",
-                    AccessFlags.PRIVATE or AccessFlags.FINAL,
-                    listOf("Z", "Z"),
-                    null
-                )
-            )
-                ?: return PatchResultError("Required parent method ${methodMetadata.name} could not be found in ${methodMetadata.definingClass}")
-
-            val toBePatchedInvokeOffset =
-                requiredMethod.immutableMethod.implementation!!.instructions.indexOfFirst { it.opcode == Opcode.INVOKE_DIRECT }
-            val toBePatchedMethod = data
-                .toMethodWalker(requiredMethod.immutableMethod)
-                .walk(toBePatchedInvokeOffset, true)
-                .getMethod() as MutableMethod
-
-            val implementation = toBePatchedMethod.implementation!!
-            val invokeVirtualOffset = implementation.instructions.indexOfFirst { it.opcode == Opcode.INVOKE_VIRTUAL }
-
-            val moveResultInstruction = implementation.instructions[invokeVirtualOffset + 1]
-            if (moveResultInstruction.opcode != Opcode.MOVE_RESULT_OBJECT)
-                return PatchResultError("The toBePatchedInvokeOffset offset was wrong in ${metadata.name}")
-
-            val register = (moveResultInstruction as Instruction11x).registerA
-            implementation.injectHideCall(invokeVirtualOffset + 2, register)
-        }
-
-        return PatchResultSuccess()
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/ad/VideoAdsPatch.kt

@@ -1,112 +0,0 @@
-package app.revanced.patches.youtube.ad
-
-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.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.toInstructions
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-private val packageMetadata = listOf(
-    PackageMetadata(
-        "com.google.android.youtube",
-        listOf("17.14.35", "17.17.34")
-    )
-)
-
-private val patchMetadata = PatchMetadata(
-    "video-ads",
-    "YouTube Video Ads Patch",
-    "Patch to remove ads in the YouTube video player.",
-    packageMetadata,
-    "0.0.1"
-)
-
-class VideoAdsPatch : BytecodePatch(
-    patchMetadata,
-    listOf(
-        MethodSignature(
-            MethodSignatureMetadata(
-                "show-video-ads-constructor",
-                MethodMetadata(
-                    "Laadb",
-                    "<init>",
-                ),
-                PatternScanMethod.Fuzzy(2),// FIXME: Test this threshold and find the best value.
-                packageMetadata,
-                "Required signature for ${patchMetadata.name}. Discovered in version 17.14.35.",
-                "0.0.1"
-            ),
-            "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,
-                null, // either CONST_4 or CONST_16
-                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
-            )
-        )
-    )
-) {
-    override fun execute(data: BytecodeData): PatchResult {
-        var result = signatures.first().result!!
-
-        val responsibleMethodSignature = MethodSignature(
-            MethodSignatureMetadata(
-                "show-video-ads-method",
-                MethodMetadata(
-                    "zai",
-                    null // unknown
-                ),
-                PatternScanMethod.Direct(),
-                packageMetadata,
-                "Signature to find the method, which is responsible for showing the video ads. Discovered in version 17.14.35",
-                "0.0.1"
-            ),
-            "V",
-            AccessFlags.PUBLIC or AccessFlags.FINAL,
-            listOf("Z"),
-            null
-        )
-
-        result = result.findParentMethod(
-            responsibleMethodSignature
-        ) ?: return PatchResultError(
-            "Could not find parent method with signature ${responsibleMethodSignature.metadata.name}"
-        )
-
-        // Override the parameter by calling shouldShowAds and setting the parameter to the result
-        result.method.implementation!!.addInstructions(
-            0,
-            """
-                invoke-static { }, Lfi/vanced/libraries/youtube/whitelisting/Whitelist;->shouldShowAds()Z
-                move-result v1
-            """.trimIndent().toInstructions()
-        )
-
-        return PatchResultSuccess()
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/ad/general/annotation/GeneralAdsCompatibility.kt

@@ -0,0 +1,14 @@
+package app.revanced.patches.youtube.ad.general.annotation
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class GeneralAdsCompatibility
+

src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/extensions/MethodExtensions.kt

@@ -0,0 +1,64 @@
+package app.revanced.patches.youtube.ad.general.bytecode.extensions
+
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.softCompareTo
+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.builder.BuilderInstruction
+import org.jf.dexlib2.builder.MutableMethodImplementation
+import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.iface.instruction.Instruction
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.reference.FieldReference
+import org.jf.dexlib2.iface.reference.MethodReference
+import org.jf.dexlib2.iface.reference.Reference
+import org.jf.dexlib2.immutable.reference.ImmutableMethodReference
+
+internal object MethodExtensions {
+    internal fun MutableMethodImplementation.insertBlocks(
+        startIndex: Int,
+        vararg blocks: List<BuilderInstruction>,
+    ) {
+        blocks.reversed().forEach {
+            this.addInstructions(
+                startIndex, it
+            )
+        }
+    }
+
+    internal fun MutableClass.addMethod(mutableMethod: MutableMethod) {
+        this.methods.add(mutableMethod)
+    }
+
+    internal fun MutableClass.findMutableMethodOf(
+        method: Method
+    ) = this.methods.first {
+        it.softCompareTo(
+            ImmutableMethodReference(
+                method.definingClass, method.name, method.parameters, method.returnType
+            )
+        )
+    }
+
+    internal inline fun <reified T : Reference> Instruction.toDescriptor(): String {
+        val reference = (this as ReferenceInstruction).reference
+        return when (T::class) {
+            MethodReference::class -> {
+                val methodReference = reference as MethodReference
+                "${methodReference.definingClass}->${methodReference.name}(${
+                    methodReference.parameterTypes.joinToString(
+                        ""
+                    ) { it }
+                })${methodReference.returnType}"
+            }
+
+            FieldReference::class -> {
+                val fieldReference = reference as FieldReference
+                "${fieldReference.definingClass}->${fieldReference.name}:${fieldReference.type}"
+            }
+
+            else -> throw PatchResultError("Unsupported reference type")
+        }
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralBytecodeAdsPatch.kt

@@ -0,0 +1,555 @@
+package app.revanced.patches.youtube.ad.general.bytecode.patch
+
+import app.revanced.extensions.injectHideCall
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patcher.util.smali.toInstructions
+import app.revanced.patches.youtube.ad.general.annotation.GeneralAdsCompatibility
+import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.addMethod
+import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.findMutableMethodOf
+import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.insertBlocks
+import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.toDescriptor
+import app.revanced.patches.youtube.ad.general.bytecode.utils.MethodUtils.createMutableMethod
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.builder.MutableMethodImplementation
+import org.jf.dexlib2.builder.instruction.*
+import org.jf.dexlib2.iface.MethodImplementation
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.instruction.formats.Instruction21c
+import org.jf.dexlib2.iface.instruction.formats.Instruction22c
+import org.jf.dexlib2.iface.instruction.formats.Instruction31i
+import org.jf.dexlib2.iface.instruction.formats.Instruction35c
+import org.jf.dexlib2.iface.reference.FieldReference
+import org.jf.dexlib2.iface.reference.MethodReference
+import org.jf.dexlib2.iface.reference.StringReference
+import org.jf.dexlib2.immutable.reference.ImmutableMethodReference
+
+@Patch
+@DependsOn([ResourceIdMappingProviderResourcePatch::class, IntegrationsPatch::class, SettingsPatch::class])
+@Name("general-ads")
+@Description("Removes general ads.")
+@GeneralAdsCompatibility
+@Version("0.0.1")
+class GeneralBytecodeAdsPatch : BytecodePatch() {
+    // a constant used by litho
+    private val lithoConstant = 0xaed2868
+
+    // list of resource names to get the id of
+    private val resourceIds = arrayOf(
+        "ad_attribution",
+        "reel_multiple_items_shelf",
+        "info_cards_drawer_header",
+        "endscreen_element_layout_video",
+        "endscreen_element_layout_circle",
+        "endscreen_element_layout_icon",
+        "promoted_video_item_land",
+        "promoted_video_item_full_bleed",
+    ).map { name ->
+        ResourceIdMappingProviderResourcePatch.resourceMappings.single { it.name == name }.id
+    }
+
+    private val stringReferences = arrayOf(
+        "Claiming to use more elements than provided",
+        "loadVideo() called on LocalDirector in wrong state",
+        "LoggingProperties are not in proto format"
+    )
+
+    override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.ADS.addPreferences(
+            SwitchPreference(
+                "revanced_home_ads_removal",
+                StringResource("revanced_home_ads_removal_title", "Remove home ads"),
+                true,
+                StringResource("revanced_home_ads_removal_summary_on", "Home ads are hidden"),
+                StringResource("revanced_home_ads_removal_summary_off", "Home ads are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_ad_removal",
+                StringResource("revanced_adremover_ad_removal_enabled_title", "Remove general ads"),
+                true,
+                StringResource("revanced_adremover_ad_removal_enabled_summary_on", "General ads are hidden"),
+                StringResource("revanced_adremover_ad_removal_enabled_summary_off", "General ads are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_merchandise",
+                StringResource("revanced_adremover_merchandise_enabled_title", "Remove merchandise banners"),
+                true,
+                StringResource("revanced_adremover_merchandise_enabled_summary_on", "Merchandise banners are hidden"),
+                StringResource("revanced_adremover_merchandise_enabled_summary_off", "Merchandise banners are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_community_posts_removal",
+                StringResource("revanced_adremover_community_posts_enabled_title", "Remove community posts"),
+                true,
+                StringResource("revanced_adremover_community_posts_enabled_summary_on", "Community posts are hidden"),
+                StringResource("revanced_adremover_community_posts_enabled_summary_off", "Community posts are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_compact_banner_removal",
+                StringResource("revanced_adremover_compact_banner_enabled_title", "Remove compact banners"),
+                true,
+                StringResource("revanced_adremover_compact_banner_enabled_summary_on", "Compact banners are hidden"),
+                StringResource("revanced_adremover_compact_banner_enabled_summary_off", "Compact banners are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_comments_removal",
+                StringResource("revanced_adremover_comments_enabled_title", "Remove comments section"),
+                false,
+                StringResource("revanced_adremover_comments_enabled_summary_on", "Comment section is hidden"),
+                StringResource("revanced_adremover_comments_enabled_summary_off", "Comment section is shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_movie",
+                StringResource("revanced_adremover_movie_enabled_title", "Remove movies section"),
+                true,
+                StringResource("revanced_adremover_movie_enabled_summary_on", "Movies section is hidden"),
+                StringResource("revanced_adremover_movie_enabled_summary_off", "Movies section is shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_feed_survey",
+                StringResource("revanced_adremover_feed_survey_enabled_title", "Remove feed surveys"),
+                true,
+                StringResource("revanced_adremover_feed_survey_enabled_summary_on", "Feed surveys are hidden"),
+                StringResource("revanced_adremover_feed_survey_enabled_summary_off", "Feed surveys are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_shorts_shelf",
+                StringResource("revanced_adremover_shorts_shelf_enabled_title", "Remove shorts shelf"),
+                true,
+                StringResource("revanced_adremover_shorts_shelf_enabled_summary_on", "Shorts shelves are hidden"),
+                StringResource("revanced_adremover_shorts_shelf_enabled_summary_off", "Shorts shelves are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_community_guidelines",
+                StringResource("revanced_adremover_community_guidelines_enabled_title", "Remove community guidelines"),
+                true,
+                StringResource("revanced_adremover_community_guidelines_enabled_summary_on", "Community guidelines are hidden"),
+                StringResource("revanced_adremover_community_guidelines_enabled_summary_off", "Community guidelines are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_emergency_box_removal",
+                StringResource("revanced_adremover_emergency_box_enabled_title", "Remove emergency boxes"),
+                true,
+                StringResource("revanced_adremover_emergency_box_enabled_summary_on", "Emergency boxes are hidden"),
+                StringResource("revanced_adremover_emergency_box_enabled_summary_off", "Emergency boxes are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_info_panel",
+                StringResource("revanced_adremover_info_panel_enabled_title", "Remove info panels"),
+                true,
+                StringResource("revanced_adremover_info_panel_enabled_summary_on", "Merchandise banners are hidden"),
+                StringResource("revanced_adremover_info_panel_enabled_summary_off", "Merchandise banners are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_medical_panel",
+                StringResource("revanced_adremover_medical_panel_enabled_title", "Remove medical panels"),
+                true,
+                StringResource("revanced_adremover_medical_panel_enabled_summary_on", "Medical panels are hidden"),
+                StringResource("revanced_adremover_medical_panel_enabled_summary_off", "Medical panels are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_paid_content",
+                StringResource("revanced_adremover_paid_content_enabled_title", "Remove paid content"),
+                true,
+                StringResource("revanced_adremover_paid_content_enabled_summary_on", "Paid content is hidden"),
+                StringResource("revanced_adremover_paid_content_enabled_summary_off", "Paid content is shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_suggested",
+                StringResource("revanced_adremover_suggested_enabled_title", "Remove personal suggestions"),
+                true,
+                StringResource("revanced_adremover_suggested_enabled_summary_on", "Personal suggestions are hidden"),
+                StringResource("revanced_adremover_suggested_enabled_summary_off", "Personal suggestions are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_hide_suggestions",
+                StringResource("revanced_adremover_hide_suggestions_enabled_title", "Hide suggestions"),
+                true,
+                StringResource("revanced_adremover_hide_suggestions_enabled_summary_on", "Suggestions are hidden"),
+                StringResource("revanced_adremover_hide_suggestions_enabled_summary_off", "Suggestions are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_hide_latest_posts",
+                StringResource("revanced_adremover_hide_latest_posts_enabled_title", "Hide latest posts"),
+                true,
+                StringResource("revanced_adremover_hide_latest_posts_enabled_summary_on", "Latest posts are hidden"),
+                StringResource("revanced_adremover_hide_latest_posts_enabled_summary_off", "Latest posts are shown")
+            ),
+            SwitchPreference(
+                "revanced_adremover_hide_channel_guidelines",
+                StringResource("revanced_adremover_hide_channel_guidelines_enabled_title", "Hide channel guidelines"),
+                true,
+                StringResource("revanced_adremover_hide_channel_guidelines_enabled_summary_on", "Channel guidelines are hidden"),
+                StringResource("revanced_adremover_hide_channel_guidelines_enabled_summary_off", "Channel guidelines are shown")
+            ),
+        )
+
+        // iterating through all classes is expensive
+        for (classDef in data.classes) {
+            var mutableClass: MutableClass? = null
+
+            method@ for (method in classDef.methods) {
+                var mutableMethod: MutableMethod? = null
+
+                if (method.implementation == null) continue@method
+
+                val instructions = method.implementation!!.instructions
+                instructions.forEachIndexed { index, instruction ->
+                    when (instruction.opcode) {
+                        Opcode.CONST -> {
+                            // TODO: find a way to de-duplicate code.
+                            //  The issue is we need to save mutableClass and mutableMethod to the existing fields
+                            when ((instruction as Instruction31i).wideLiteral) {
+                                resourceIds[0] -> { // general ads
+                                    //  and is followed by an instruction with the mnemonic INVOKE_VIRTUAL
+                                    val insertIndex = index + 1
+                                    val invokeInstruction = instructions.elementAt(insertIndex)
+                                    if (invokeInstruction.opcode != Opcode.INVOKE_VIRTUAL) return@forEachIndexed
+
+                                    // create proxied method, make sure to not re-resolve() the current class
+                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableMethod == null) mutableMethod =
+                                        mutableClass!!.findMutableMethodOf(method)
+
+                                    // insert hide call to hide the view corresponding to the resource
+                                    val viewRegister = (invokeInstruction as Instruction35c).registerC
+                                    mutableMethod!!.implementation!!.injectHideCall(insertIndex, viewRegister)
+
+                                }
+
+                                resourceIds[1] -> { // reel ads
+                                    //  and is followed by an instruction at insertIndex with the mnemonic IPUT_OBJECT
+                                    val insertIndex = index + 4
+                                    val iPutInstruction = instructions.elementAt(insertIndex)
+                                    if (iPutInstruction.opcode != Opcode.IPUT_OBJECT) return@forEachIndexed
+
+                                    // create proxied method, make sure to not re-resolve() the current class
+                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableMethod == null) mutableMethod =
+                                        mutableClass!!.findMutableMethodOf(method)
+
+                                    val viewRegister = (iPutInstruction as Instruction22c).registerA
+                                    mutableMethod!!.implementation!!.injectHideCall(insertIndex, viewRegister)
+                                }
+
+                                resourceIds[2] -> { // info cards ads
+                                    //  and is followed by an instruction with the mnemonic INVOKE_VIRTUAL
+                                    val removeIndex = index - 1
+                                    val invokeInstruction = instructions.elementAt(removeIndex)
+                                    if (invokeInstruction.opcode != Opcode.INVOKE_VIRTUAL) return@forEachIndexed
+
+                                    // create proxied method, make sure to not re-resolve() the current class
+                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableMethod == null) mutableMethod =
+                                        mutableClass!!.findMutableMethodOf(method)
+
+                                    //ToDo: Add Settings toggle for whatever this is
+                                    mutableMethod!!.implementation!!.removeInstruction(removeIndex)
+                                }
+
+                                resourceIds[3], resourceIds[4], resourceIds[5] -> { // end screen ads
+                                    //  and is followed by an instruction with the mnemonic IPUT_OBJECT
+                                    val insertIndex = index + 7
+                                    val invokeInstruction = instructions.elementAt(insertIndex)
+                                    if (invokeInstruction.opcode != Opcode.IPUT_OBJECT) return@forEachIndexed
+
+                                    // create proxied method, make sure to not re-resolve() the current class
+                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableMethod == null) mutableMethod =
+                                        mutableClass!!.findMutableMethodOf(method)
+
+                                    // TODO: dynamically get registers
+                                    mutableMethod!!.addInstructions(
+                                        insertIndex, """
+                                                const/16 v1, 0x8
+                                                invoke-virtual {v0,v1}, Landroid/widget/FrameLayout;->setVisibility(I)V
+                                            """
+                                    )
+                                }
+
+                                resourceIds[6] -> {
+                                    //  and is followed by an instruction with the mnemonic INVOKE_DIRECT
+                                    val insertIndex = index + 3
+                                    val invokeInstruction = instructions.elementAt(insertIndex)
+                                    if (invokeInstruction.opcode != Opcode.INVOKE_DIRECT) return@forEachIndexed
+
+                                    // create proxied method, make sure to not re-resolve() the current class
+                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableMethod == null) mutableMethod =
+                                        mutableClass!!.findMutableMethodOf(method)
+
+                                    // insert hide call to hide the view corresponding to the resource
+                                    val viewRegister = (invokeInstruction as Instruction35c).registerE
+                                    mutableMethod!!.implementation!!.injectHideCall(insertIndex, viewRegister)
+                                }
+
+                                resourceIds[7] -> {
+                                    // TODO, go to class, hide the inflated view
+                                }
+                            }
+                        }
+
+                        Opcode.CONST_STRING -> {
+                            when (((instruction as Instruction21c).reference as StringReference).string) {
+                                stringReferences[0] -> {
+                                    val stringInstruction = instructions.elementAt(3)
+                                    if (stringInstruction.opcode == Opcode.CONST_STRING) return@forEachIndexed
+
+                                    // create proxied method, make sure to not re-resolve() the current class
+                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableMethod == null) mutableMethod =
+                                        mutableClass!!.findMutableMethodOf(method)
+
+                                    // return the method
+                                    val insertIndex = 1 // after super constructor
+                                    //ToDo: Add setting here
+                                    mutableMethod!!.implementation!!.addInstruction(
+                                        insertIndex, BuilderInstruction10x(Opcode.RETURN_VOID)
+                                    )
+                                }
+
+                                stringReferences[1] -> {
+                                    // TODO: migrate video ads patch to here if necessary
+                                }
+
+                                stringReferences[2] -> { // Litho ads
+                                    // create proxied method.
+                                    val proxy = data.proxy(classDef)
+                                    val proxiedClass = proxy.resolve()
+
+                                    // add getIsEmpty method
+                                    proxiedClass.addGetIsEmptyMethod()
+
+                                    // get required method to patch and get references from
+                                    val lithoMethod = getLithoMethod(proxiedClass)
+                                        ?: return PatchResultError("Could not find required litho method to patch.")
+                                    val lithoMethodImplementation = lithoMethod.implementation!!
+
+                                    // create and add getTemplateName method
+                                    val getTemplateMethod =
+                                        proxiedClass.createGetTemplateNameMethod(lithoMethodImplementation)
+                                    proxiedClass.addMethod(getTemplateMethod)
+
+                                    val lithoInstructions = lithoMethodImplementation.instructions
+                                    val thisType = proxiedClass.type
+                                    val templateNameParameterType = getTemplateMethod.parameterTypes.first()
+
+                                    // get reference descriptors
+                                    val indexOfReference1 = lithoInstructions.indexOfFirst {
+                                        it.opcode == Opcode.INVOKE_STATIC_RANGE
+                                    }
+                                    val descriptor1 =
+                                        lithoInstructions.elementAt(indexOfReference1).toDescriptor<MethodReference>()
+                                    val descriptor2 = lithoInstructions.elementAt(indexOfReference1 + 2)
+                                        .toDescriptor<FieldReference>()
+
+                                    // create label
+                                    val lithoRemoveLabel = lithoMethodImplementation.newLabelForIndex(0)
+
+                                    // create branch instructions
+                                    val ifEqzFirstInstruction =
+                                        BuilderInstruction21t(Opcode.IF_EQZ, 0, lithoRemoveLabel)
+                                    val ifEqzSecondInstruction =
+                                        BuilderInstruction21t(Opcode.IF_EQZ, 1, lithoRemoveLabel)
+
+                                    // create blocks
+                                    val block1 = """
+                                        invoke-static/range {p3}, $thisType->getTemplateName($templateNameParameterType)Ljava/lang/String;
+                                        move-result-object v0
+                                    """.toInstructions(lithoMethod)
+                                    val block2 = """
+                                        move-object/from16 v1, p3
+                                        iget-object v2, v1, $templateNameParameterType->b:Ljava/nio/ByteBuffer;
+                                        invoke-static {v0, v2}, Lapp/revanced/integrations/patches/GeneralBytecodeAdsPatch;->containsAd(Ljava/lang/String;Ljava/nio/ByteBuffer;)Z
+                                        move-result v1
+                                    """.toInstructions(lithoMethod)
+                                    val block3 = """
+                                        move-object/from16 v2, p1
+                                        invoke-static {v2}, $descriptor1
+                                        move-result-object v0
+                                        iget-object v0, v0, $descriptor2
+                                        return-object v0
+                                    """.toInstructions(lithoMethod)
+
+                                    // insert blocks and branch instructions
+                                    lithoMethodImplementation.insertBlocks(
+                                        0,
+                                        block1,
+                                        listOf(ifEqzFirstInstruction),
+                                        block2,
+                                        listOf(ifEqzSecondInstruction),
+                                        block3,
+                                    )
+                                }
+                            }
+
+                        }
+
+                        else -> return@forEachIndexed
+                    }
+                }
+            }
+        }
+        return PatchResultSuccess()
+    }
+
+    private fun getLithoMethod(mutableClass: MutableClass) = mutableClass.methods.firstOrNull {
+        it.implementation?.instructions?.any { instruction ->
+            instruction.opcode == Opcode.CONST && (instruction as Instruction31i).narrowLiteral == lithoConstant
+        } ?: false
+    }
+
+    private fun MutableClass.addGetIsEmptyMethod() {
+        val getIsEmptyImplementation = MutableMethodImplementation(1)
+
+        // create target instructions
+        val firstTargetInstruction = BuilderInstruction11n(Opcode.CONST_4, 0, 1)
+        val secondTargetInstruction = BuilderInstruction11n(Opcode.CONST_4, 0, 0)
+
+        // add instructions to the instruction list
+        getIsEmptyImplementation.addInstructions(
+            0, listOf(
+                // BuilderInstruction21t(Opcode.IF_EQZ, 0, first),
+                BuilderInstruction35c(
+                    Opcode.INVOKE_VIRTUAL,
+                    1,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    ImmutableMethodReference("Ljava/lang/String;", "isEmpty", null, "Z")
+                ),
+                BuilderInstruction11x(Opcode.MOVE_RESULT, 0),
+                // BuilderInstruction21t(Opcode.IF_EQZ, 0, second),
+                // BuilderInstruction10t(Opcode.GOTO, first),
+                secondTargetInstruction,
+                BuilderInstruction11x(Opcode.RETURN, 0),
+                firstTargetInstruction,
+                BuilderInstruction11x(Opcode.RETURN, 0),
+            )
+        )
+
+        val getIsEmptyInstructions = getIsEmptyImplementation.instructions
+
+        // create labels for the target instructions
+        val firstLabel =
+            getIsEmptyImplementation.newLabelForIndex(getIsEmptyInstructions.indexOf(firstTargetInstruction))
+        val secondLabel =
+            getIsEmptyImplementation.newLabelForIndex(getIsEmptyInstructions.indexOf(secondTargetInstruction))
+
+        // create branch instructions to the labels
+        val ifEqzFirstInstruction = BuilderInstruction21t(Opcode.IF_EQZ, 0, firstLabel)
+        val ifEqzSecondInstruction = BuilderInstruction21t(Opcode.IF_EQZ, 0, secondLabel)
+        val gotoInstruction = BuilderInstruction10t(Opcode.GOTO, firstLabel)
+
+        // insert remaining branch instructions, order of adding those instructions is important
+        getIsEmptyImplementation.addInstructions(
+            2, listOf(
+                ifEqzSecondInstruction, gotoInstruction
+            )
+        )
+        getIsEmptyImplementation.addInstruction(
+            0, ifEqzFirstInstruction
+        )
+
+        this.addMethod(
+            createMutableMethod(
+                this.type, "getIsEmpty", "Z", "Ljava/lang/String;", getIsEmptyImplementation
+            )
+        )
+    }
+
+    private fun MutableClass.createGetTemplateNameMethod(lithoMethodImplementation: MethodImplementation): MutableMethod {
+        var counter = 1
+        val descriptors = buildList {
+            for (instruction in lithoMethodImplementation.instructions) {
+                if (instruction !is ReferenceInstruction) continue
+                if (counter++ > 4) break
+
+                add(instruction.toDescriptor<MethodReference>())
+            }
+        }
+
+        val getTemplateNameImplementation = MutableMethodImplementation(2)
+
+        // create code blocks
+        val block1 = """
+            invoke-virtual {p0}, ${descriptors[0]}
+            move-result-object p0
+            const v0, $lithoConstant
+            invoke-static {p0, v0}, ${descriptors[1]}
+            move-result-object p0
+        """.toInstructions()
+        val block2 = """
+              invoke-static {p0}, ${descriptors[2]}
+              move-result-object p0
+              invoke-virtual {p0}, ${descriptors[3]}
+              move-result-object v0
+              invoke-static {v0}, ${this.type}->getIsEmpty(Ljava/lang/String;)Z
+              move-result v0
+        """.toInstructions()
+        val block3 = """
+              invoke-virtual {p0}, ${descriptors[3]}
+              move-result-object p0
+              return-object p0
+        """.toInstructions()
+
+        // create target instruction
+        val targetInstruction = BuilderInstruction11n(Opcode.CONST_4, 1, 0)
+        // and remaining instruction
+        val returnInstruction = BuilderInstruction11x(Opcode.RETURN_OBJECT, 1)
+
+        // insert blocks and instructions
+        getTemplateNameImplementation.insertBlocks(
+            0,
+            block1,
+            block2,
+            block3,
+            listOf(
+                targetInstruction, returnInstruction
+            ),
+        )
+
+        // create label for target instruction
+        val targetInstructionLabel =
+            getTemplateNameImplementation.newLabelForIndex(getTemplateNameImplementation.instructions.size - 2)
+
+        // create branch instructions to the label
+        val ifEqzInstruction = BuilderInstruction21t(Opcode.IF_EQZ, 1, targetInstructionLabel)
+        val ifNezInstruction = BuilderInstruction21t(Opcode.IF_NEZ, 0, targetInstructionLabel)
+
+        // insert branch instructions
+        getTemplateNameImplementation.addInstruction(
+            block1.size, ifEqzInstruction
+        )
+        getTemplateNameImplementation.addInstruction(
+            block1.size + block2.size + 1, ifNezInstruction
+        )
+
+        // create the method
+        return createMutableMethod(
+            this.type,
+            "getTemplateName",
+            "Ljava/lang/String;",
+            descriptors[0].split("->")[0], // a bit weird to get the type this way,
+            getTemplateNameImplementation
+        )
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/utils/MethodUtils.kt

@@ -0,0 +1,20 @@
+package app.revanced.patches.youtube.ad.general.bytecode.utils
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.iface.MethodImplementation
+import org.jf.dexlib2.immutable.ImmutableMethod
+import org.jf.dexlib2.immutable.ImmutableMethodParameter
+
+internal object MethodUtils {
+    internal fun createMutableMethod(
+        definingClass: String, name: String, returnType: String, parameter: String, implementation: MethodImplementation
+    ) = ImmutableMethod(
+        definingClass, name, listOf(
+            ImmutableMethodParameter(
+                parameter, null, null
+            )
+        ), returnType, AccessFlags.PRIVATE or AccessFlags.STATIC, null, null, implementation
+    ).toMutable()
+}

src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/annotations/HideInfocardSuggestionsCompatibility.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.ad.infocardsuggestions.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class HideInfocardSuggestionsCompatibility

src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/fingerprints/HideInfocardSuggestionsFingerprint.kt

@@ -0,0 +1,24 @@
+package app.revanced.patches.youtube.ad.infocardsuggestions.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.ad.infocardsuggestions.annotations.HideInfocardSuggestionsCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("hide-infocard-suggestions-fingerprint")
+@MatchingMethod("Liff;", "i")
+@FuzzyPatternScanMethod(2)
+@HideInfocardSuggestionsCompatibility
+@Version("0.0.1")
+object HideInfocardSuggestionsFingerprint : MethodFingerprint(
+    "Ljava/lang/Boolean;",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    null,
+    null,
+    listOf("vibrator"),
+    null
+)

src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/fingerprints/HideInfocardSuggestionsParentFingerprint.kt

@@ -0,0 +1,24 @@
+package app.revanced.patches.youtube.ad.infocardsuggestions.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.youtube.ad.infocardsuggestions.annotations.HideInfocardSuggestionsCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("hide-infocard-suggestions-parent-fingerprint")
+@MatchingMethod("Liff;", "lE")
+@FuzzyPatternScanMethod(2)
+@HideInfocardSuggestionsCompatibility
+@Version("0.0.1")
+object HideInfocardSuggestionsParentFingerprint : MethodFingerprint(
+    "Ljava/lang/String;",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    listOf(),
+    null,
+    listOf("player_overlay_info_card_teaser"),
+    null
+)

src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/patch/HideInfocardSuggestionsPatch.kt

@@ -0,0 +1,67 @@
+package app.revanced.patches.youtube.ad.infocardsuggestions.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.youtube.ad.infocardsuggestions.annotations.HideInfocardSuggestionsCompatibility
+import app.revanced.patches.youtube.ad.infocardsuggestions.fingerprints.HideInfocardSuggestionsFingerprint
+import app.revanced.patches.youtube.ad.infocardsuggestions.fingerprints.HideInfocardSuggestionsParentFingerprint
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
+import org.jf.dexlib2.builder.instruction.BuilderInstruction35c
+
+@Patch
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
+@Name("hide-infocard-suggestions")
+@Description("Hides infocards in videos.")
+@HideInfocardSuggestionsCompatibility
+@Version("0.0.1")
+class HideInfocardSuggestionsPatch : BytecodePatch(
+    listOf(
+        HideInfocardSuggestionsParentFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.ADS.addPreferences(
+            SwitchPreference(
+                "revanced_info_cards_enabled",
+                StringResource("revanced_info_cards_enabled_title", "Show info-cards"),
+                false,
+                StringResource("revanced_info_cards_enabled_summary_on", "Info-cards are shown"),
+                StringResource("revanced_info_cards_enabled_summary_off", "Info-cards are hidden")
+            )
+        )
+
+        val parentResult = HideInfocardSuggestionsParentFingerprint.result
+            ?: return PatchResultError("Parent fingerprint not resolved!")
+
+
+        HideInfocardSuggestionsFingerprint.resolve(data, parentResult.classDef)
+        val result = HideInfocardSuggestionsFingerprint.result
+            ?: return PatchResultError("Required parent method could not be found.")
+
+        val method = result.mutableMethod
+        val implementation = method.implementation
+            ?: return PatchResultError("Implementation not found.")
+
+        val index = implementation.instructions.indexOfFirst { ((it as? BuilderInstruction35c)?.reference.toString() == "Landroid/view/View;->setVisibility(I)V") }
+
+        method.replaceInstruction(index, """
+            invoke-static {p1}, Lapp/revanced/integrations/patches/HideInfoCardSuggestionsPatch;->hideInfoCardSuggestions(Landroid/view/View;)V
+        """)
+
+        return PatchResultSuccess()
+    }
+
+}

src/main/kotlin/app/revanced/patches/youtube/ad/video/annotations/VideoAdsCompatibility.kt

@@ -0,0 +1,14 @@
+package app.revanced.patches.youtube.ad.video.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class VideoAdsCompatibility
+

src/main/kotlin/app/revanced/patches/youtube/ad/video/fingerprints/ShowVideoAdsConstructorFingerprint.kt

@@ -0,0 +1,40 @@
+package app.revanced.patches.youtube.ad.video.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.youtube.ad.video.annotations.VideoAdsCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("show-video-ads-constructor-fingerprint")
+@MatchingMethod(
+    "Laair",
+    "<init>",
+)
+@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
+@VideoAdsCompatibility
+@Version("0.0.1")
+object ShowVideoAdsConstructorFingerprint : 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,
+        null, // either CONST_4 or CONST_16
+        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/youtube/ad/video/fingerprints/ShowVideoAdsFingerprint.kt

@@ -0,0 +1,21 @@
+package app.revanced.patches.youtube.ad.video.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.ad.video.annotations.VideoAdsCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("show-video-ads-method-fingerprint")
+@MatchingMethod(
+    definingClass = "zai"
+)
+@DirectPatternScanMethod
+@VideoAdsCompatibility
+@Version("0.0.1")
+object ShowVideoAdsFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z"), null
+)

src/main/kotlin/app/revanced/patches/youtube/ad/video/patch/VideoAdsPatch.kt

@@ -0,0 +1,58 @@
+package app.revanced.patches.youtube.ad.video.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.youtube.ad.video.annotations.VideoAdsCompatibility
+import app.revanced.patches.youtube.ad.video.fingerprints.ShowVideoAdsConstructorFingerprint
+import app.revanced.patches.youtube.ad.video.fingerprints.ShowVideoAdsFingerprint
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
+
+@Patch
+@DependsOn([IntegrationsPatch::class, SettingsPatch::class])
+@Name("video-ads")
+@Description("Removes ads in the video player.")
+@VideoAdsCompatibility
+@Version("0.0.1")
+class VideoAdsPatch : BytecodePatch(
+    listOf(
+        ShowVideoAdsConstructorFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        SettingsPatch.PreferenceScreen.ADS.addPreferences(
+            SwitchPreference(
+                "revanced_video_ads_removal",
+                StringResource("revanced_video_ads_removal_title", "Hide video ads"),
+                true,
+                StringResource("revanced_video_ads_removal_summary_on", "Video ads are hidden"),
+                StringResource("revanced_video_ads_removal_summary_off", "Video ads are shown")
+            )
+        )
+
+        ShowVideoAdsFingerprint.resolve(
+            data, ShowVideoAdsConstructorFingerprint.result!!.classDef
+        )
+
+        // Override the parameter by calling shouldShowAds and setting the parameter to the result
+        ShowVideoAdsFingerprint.result!!.mutableMethod.addInstructions(
+            0, """
+                invoke-static { }, Lapp/revanced/integrations/patches/VideoAdsPatch;->shouldShowAds()Z
+                move-result v1
+            """
+        )
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/interaction/EnableSeekbarTappingPatch.kt

@@ -1,186 +0,0 @@
-package app.revanced.patches.youtube.interaction
-
-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.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.toInstructions
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.builder.instruction.BuilderInstruction21t
-import org.jf.dexlib2.iface.Method
-import org.jf.dexlib2.iface.instruction.formats.Instruction11n
-import org.jf.dexlib2.iface.instruction.formats.Instruction35c
-
-private val compatiblePackages = listOf(
-    PackageMetadata(
-        "com.google.android.youtube",
-        listOf("17.17.34")
-    )
-)
-
-class EnableSeekbarTappingPatch : BytecodePatch(
-    PatchMetadata(
-        "seekbar-tapping",
-        "Enable seekbar tapping patch",
-        "Enable tapping on the seekbar of the YouTube player.",
-        compatiblePackages,
-        "0.0.1"
-    ),
-    listOf(
-        MethodSignature(
-            MethodSignatureMetadata(
-                "enable-seekbar-tapping-parent-signature",
-                MethodMetadata("Lzhj;", "J"), // unknown
-                PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
-                compatiblePackages,
-                "Signature for a parent method, which is needed to find the actual method required to be patched.",
-                "0.0.1"
-            ),
-            "L",
-            AccessFlags.PUBLIC or AccessFlags.FINAL,
-            listOf(),
-            listOf(
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.CONST_4,
-                Opcode.NEW_ARRAY,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.MOVE_RESULT_WIDE,
-                Opcode.INVOKE_STATIC,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.INVOKE_STATIC,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.CONST_4,
-                Opcode.APUT_OBJECT,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.MOVE_RESULT_WIDE,
-                Opcode.INVOKE_STATIC,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.INVOKE_STATIC,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.CONST_4,
-                Opcode.APUT_OBJECT,
-                Opcode.CONST,
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.MOVE_RESULT_OBJECT,
-                Opcode.RETURN_OBJECT
-            )
-        ),
-        MethodSignature(
-            MethodSignatureMetadata(
-                "enable-seekbar-tapping-signature",
-                MethodMetadata("Lfao;", "onTouchEvent"), // unknown
-                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("L"),
-            listOf(
-                Opcode.INVOKE_VIRTUAL,
-                Opcode.MOVE_RESULT_WIDE,
-                Opcode.IGET,
-                Opcode.IGET_OBJECT,
-                Opcode.IGET,
-                Opcode.DIV_INT_2ADDR,
-                Opcode.ADD_INT,
-                Opcode.SUB_INT_2ADDR,
-                Opcode.INT_TO_FLOAT,
-                Opcode.CMPG_FLOAT,
-                Opcode.IF_GTZ,
-                Opcode.INT_TO_FLOAT,
-                Opcode.CMPG_FLOAT,
-                Opcode.IF_GTZ,
-                Opcode.CONST_4,
-                Opcode.INVOKE_INTERFACE,
-                Opcode.NEW_INSTANCE,
-                Opcode.INVOKE_DIRECT,
-                Opcode.IPUT_OBJECT,
-                Opcode.INVOKE_VIRTUAL
-            )
-        )
-    )
-) {
-    override fun execute(data: BytecodeData): PatchResult {
-        var result = signatures.first().result!!
-
-        val tapSeekMethods = mutableMapOf<String, Method>()
-
-        // find the methods which tap the seekbar
-        for (it in result.definingClassProxy.immutableClass.methods) {
-            if (it.implementation == null) continue
-
-            val instructions = it.implementation!!.instructions
-            // here we make sure we actually find the method because it has more then 7 instructions
-            if (instructions.count() < 7) continue
-
-            // we know that the 7th instruction has the opcode CONST_4
-            val instruction = instructions.elementAt(6)
-            if (instruction.opcode != Opcode.CONST_4) continue
-
-            // the literal for this instruction has to be either 1 or 2
-            val literal = (instruction as Instruction11n).narrowLiteral
-
-            // method founds
-            if (literal == 1) tapSeekMethods["P"] = it
-            if (literal == 2) tapSeekMethods["O"] = it
-        }
-
-        // replace map because we dont need the upper one anymore
-        result = signatures.last().result!!
-
-        val implementation = result.method.implementation!!
-
-        // if tap-seeking is enabled, do not invoke the two methods below
-        val pMethod = tapSeekMethods["P"]!!
-        val oMethod = tapSeekMethods["O"]!!
-
-        // get the required register
-        val instruction = implementation.instructions[result.scanData.endIndex]
-        if (instruction.opcode != Opcode.INVOKE_VIRTUAL)
-            return PatchResultError("Could not find the correct register")
-        val register = (instruction as Instruction35c).registerC
-
-        // the instructions are written in reverse order.
-        implementation.addInstructions(
-            result.scanData.endIndex + 1,
-            """
-               invoke-virtual { v$register, v2 }, ${oMethod.definingClass}->${oMethod.name}(I)V
-               invoke-virtual { v$register, v2 }, ${pMethod.definingClass}->${pMethod.name}(I)V
-            """.trimIndent().toInstructions()
-        )
-
-        // if tap-seeking is disabled, do not invoke the two methods above by jumping to the else label
-        val elseLabel = implementation.newLabelForIndex(result.scanData.endIndex + 1)
-        implementation.addInstruction(
-            result.scanData.endIndex + 1,
-            BuilderInstruction21t(Opcode.IF_EQZ, 0, elseLabel)
-        )
-        implementation.addInstructions(
-            result.scanData.endIndex + 1,
-            """
-                invoke-static { }, Lfi/razerman/youtube/preferences/BooleanPreferences;->isTapSeekingEnabled()Z
-                move-result v0
-            """.trimIndent().toInstructions()
-        )
-        return PatchResultSuccess()
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/annotation/DownloadsCompatibility.kt

@@ -0,0 +1,14 @@
+package app.revanced.patches.youtube.interaction.downloads.annotation
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.27.39", "17.29.34", "17.32.35")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class DownloadsCompatibility
+

src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/bytecode/patch/DownloadsBytecodePatch.kt

@@ -0,0 +1,52 @@
+package app.revanced.patches.youtube.interaction.downloads.bytecode.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.youtube.interaction.downloads.annotation.DownloadsCompatibility
+import app.revanced.patches.youtube.interaction.downloads.resource.patch.DownloadsResourcePatch
+import app.revanced.patches.youtube.misc.playercontrols.bytecode.patch.PlayerControlsBytecodePatch
+import app.revanced.patches.youtube.misc.videoid.patch.VideoIdPatch
+
+@Patch
+@Name("downloads")
+@DependsOn([DownloadsResourcePatch::class, PlayerControlsBytecodePatch::class, VideoIdPatch::class])
+@Description("Enables downloading music and videos from YouTube.")
+@DownloadsCompatibility
+@Version("0.0.1")
+class DownloadsBytecodePatch : BytecodePatch() {
+    override fun execute(data: BytecodeData): PatchResult {
+        val integrationsPackage = "app/revanced/integrations"
+        val classDescriptor = "L$integrationsPackage/videoplayer/DownloadButton;"
+
+        /*
+        initialize the control
+         */
+
+        val initializeDownloadsDescriptor = "$classDescriptor->initializeDownloadButton(Ljava/lang/Object;)V"
+        PlayerControlsBytecodePatch.initializeControl(initializeDownloadsDescriptor)
+
+        /*
+         add code to change the visibility of the control
+         */
+
+        val changeVisibilityDescriptor = "$classDescriptor->changeVisibility(Z)V"
+        PlayerControlsBytecodePatch.injectVisibilityCheckCall(changeVisibilityDescriptor)
+
+        /*
+         add code to change to update the video id
+         */
+
+        val setVideoIdDescriptor =
+            "L$integrationsPackage/patches/downloads/DownloadsPatch;->setVideoId(Ljava/lang/String;)V"
+        VideoIdPatch.injectCall(setVideoIdDescriptor)
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/resource/patch/DownloadsResourcePatch.kt

@@ -0,0 +1,72 @@
+package app.revanced.patches.youtube.interaction.downloads.resource.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.impl.ResourcePatch
+import app.revanced.patches.youtube.interaction.downloads.annotation.DownloadsCompatibility
+import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
+import app.revanced.patches.youtube.misc.playercontrols.resource.patch.BottomControlsResourcePatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.framework.components.impl.*
+import app.revanced.util.resources.ResourceUtils
+import app.revanced.util.resources.ResourceUtils.Settings.mergeStrings
+import app.revanced.util.resources.ResourceUtils.copyResources
+
+@Name("downloads-resource-patch")
+@DependsOn([BottomControlsResourcePatch::class, FixLocaleConfigErrorPatch::class, SettingsPatch::class])
+@Description("Makes necessary changes to resources for the download button.")
+@DownloadsCompatibility
+@Version("0.0.1")
+class DownloadsResourcePatch : ResourcePatch() {
+    override fun execute(data: ResourceData): PatchResult {
+        SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences(
+            PreferenceScreen(
+                "revanced_downloads",
+                StringResource("revanced_downloads_title", "Download settings"),
+                listOf(
+                    SwitchPreference(
+                        "revanced_downloads",
+                        StringResource("revanced_downloads_enabled_title", "Show download button"),
+                        true,
+                        StringResource("revanced_downloads_enabled_summary_on", "Download button is visible"),
+                        StringResource("revanced_downloads_enabled_summary_off", "Download button is hidden")
+                    ),
+                    TextPreference(
+                        "revanced_downloads_package_name",
+                        StringResource("revanced_downloads_package_name_title", "Downloader package name"),
+                        InputType.STRING,
+                        "org.schabi.newpipe" /* NewPipe */,
+                        StringResource("revanced_downloads_package_name_summary", "Package name of the downloader app such as NewPipe\\'s or PowerTube\\'s")
+                    )
+                ),
+                StringResource("revanced_downloads_summary", "Settings related to downloads")
+            )
+        )
+
+
+        /*
+         * Copy strings
+         */
+
+        data.mergeStrings("downloads/host/values/strings.xml")
+
+        /*
+         * Copy resources
+         */
+
+        data.copyResources("downloads", ResourceUtils.ResourceGroup("drawable", "revanced_yt_download_button.xml"))
+
+        /*
+        * Add download button node
+         */
+
+        BottomControlsResourcePatch.addControls("downloads/host/layout/${BottomControlsResourcePatch.TARGET_RESOURCE_NAME}")
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/annotation/SeekbarTappingCompatibility.kt

@@ -0,0 +1,14 @@
+package app.revanced.patches.youtube.interaction.seekbar.annotation
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34", "17.24.35", "17.25.34", "17.26.35", "17.27.39", "17.28.34", "17.29.34", "17.32.35")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class SeekbarTappingCompatibility
+

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/SeekbarTappingFingerprint.kt

@@ -0,0 +1,41 @@
+package app.revanced.patches.youtube.interaction.seekbar.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.youtube.interaction.seekbar.annotation.SeekbarTappingCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("enable-seekbar-tapping-fingerprint")
+@MatchingMethod("Lfbl;", "onTouchEvent")
+@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
+@SeekbarTappingCompatibility
+@Version("0.0.1")
+object SeekbarTappingFingerprint : MethodFingerprint(
+    "Z", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"), listOf(
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_WIDE,
+        Opcode.IGET,
+        Opcode.IGET_OBJECT,
+        Opcode.IGET,
+        Opcode.DIV_INT_2ADDR,
+        Opcode.ADD_INT,
+        Opcode.SUB_INT_2ADDR,
+        Opcode.INT_TO_FLOAT,
+        Opcode.CMPG_FLOAT,
+        Opcode.IF_GTZ,
+        Opcode.INT_TO_FLOAT,
+        Opcode.CMPG_FLOAT,
+        Opcode.IF_GTZ,
+        Opcode.CONST_4,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.INVOKE_VIRTUAL
+    )
+)