Merge pull request #7 from ReVancedTeam/music-patches

feat: `YouTube Music` patches

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

@@ -1,16 +1,17 @@
 package app.revanced.patches
 
 import app.revanced.patcher.patch.Patch
-import app.revanced.patches.ad.HomeAdsPatch
+import app.revanced.patches.music.audio.EnableAudioOnlyPatch
-import app.revanced.patches.ad.HomePromoPatch
+import app.revanced.patches.music.layout.RemoveUpgradeTabPatch
-import app.revanced.patches.ad.VideoAdsPatch
+import app.revanced.patches.music.layout.RemoveTasteBuilderPatch
-import app.revanced.patches.interaction.EnableSeekbarTappingPatch
+import app.revanced.patches.music.premium.BackgroundPlayPatch
-import app.revanced.patches.layout.CreateButtonRemoverPatch
+import app.revanced.patches.music.audio.CodecsUnlockPatch
-import app.revanced.patches.layout.ShortsButtonRemoverPatch
+import app.revanced.patches.youtube.ad.HomeAdsPatch
-import app.revanced.patches.layout.HideReelsPatch
+import app.revanced.patches.youtube.ad.HomePromoPatch
-import app.revanced.patches.layout.MinimizedPlaybackPatch
+import app.revanced.patches.youtube.ad.VideoAdsPatch
-import app.revanced.patches.layout.OldQualityLayoutPatch
+import app.revanced.patches.youtube.interaction.EnableSeekbarTappingPatch
-import app.revanced.patches.misc.IntegrationsPatch
+import app.revanced.patches.youtube.layout.*
+import app.revanced.patches.youtube.misc.IntegrationsPatch
 
 /**
  * Index contains all the patches.
@@ -31,6 +32,11 @@ object Index {
         ::ShortsButtonRemoverPatch,
         ::HideReelsPatch,
         ::OldQualityLayoutPatch,
-        ::EnableSeekbarTappingPatch
+        ::EnableSeekbarTappingPatch,
+        ::EnableAudioOnlyPatch,
+        ::RemoveUpgradeTabPatch,
+        ::RemoveTasteBuilderPatch,
+        ::BackgroundPlayPatch,
+        ::CodecsUnlockPatch
     )
 }

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

@@ -0,0 +1,153 @@
+package app.revanced.patches.music.audio
+
+import app.revanced.patcher.PatcherData
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.patch.*
+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 app.revanced.patcher.toMethodWalker
+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 : Patch(
+    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(patcherData: PatcherData): PatchResult {
+        var result = signatures.first().result!!
+
+        val implementation = result.method.implementation!!
+
+        val instructionIndex = result.scanData.startIndex
+
+        result = signatures.last().result!!
+        val codecMethod = patcherData
+            .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

@@ -0,0 +1,128 @@
+package app.revanced.patches.music.audio
+
+import app.revanced.patcher.PatcherData
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.patch.*
+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 : Patch(
+    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(patcherData: PatcherData): 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/layout/RemoveTasteBuilderPatch.kt

@@ -0,0 +1,90 @@
+package app.revanced.patches.music.layout
+
+import app.revanced.patcher.PatcherData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.patch.*
+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 : Patch(
+    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(patcherData: PatcherData): 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

@@ -0,0 +1,147 @@
+package app.revanced.patches.music.layout
+
+import app.revanced.patcher.PatcherData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.patch.*
+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 : Patch(
+    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(patcherData: PatcherData): 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/premium/BackgroundPlayPatch.kt

@@ -0,0 +1,88 @@
+package app.revanced.patches.music.premium
+
+import app.revanced.patcher.PatcherData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.patch.*
+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 : Patch(
+    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(patcherData: PatcherData): PatchResult {
+        signatures.first().result!!.method.implementation!!.addInstructions(
+            0,
+            """
+                const/4 v0, 0x1
+                return v0
+            """.trimIndent().toInstructions()
+        )
+
+        return PatchResultSuccess()
+    }
+}

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

@@ -1,4 +1,4 @@
-package app.revanced.patches.ad
+package app.revanced.patches.youtube.ad
 
 import app.revanced.extensions.injectHideCall
 import app.revanced.patcher.PatcherData

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

@@ -1,4 +1,4 @@
-package app.revanced.patches.ad
+package app.revanced.patches.youtube.ad
 
 import app.revanced.extensions.injectHideCall
 import app.revanced.patcher.PatcherData

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

@@ -1,4 +1,4 @@
-package app.revanced.patches.ad
+package app.revanced.patches.youtube.ad
 
 import app.revanced.patcher.PatcherData
 import app.revanced.patcher.extensions.addInstructions

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

@@ -1,4 +1,4 @@
-package app.revanced.patches.interaction
+package app.revanced.patches.youtube.interaction
 
 import app.revanced.patcher.PatcherData
 import app.revanced.patcher.extensions.addInstructions

src/main/kotlin/app/revanced/patches/youtube/layout/CreateButtonRemoverPatch.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.layout
+package app.revanced.patches.youtube.layout
 
 import app.revanced.patcher.PatcherData
 import app.revanced.patcher.extensions.or

src/main/kotlin/app/revanced/patches/youtube/layout/HideReelsPatch.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.layout
+package app.revanced.patches.youtube.layout
 
 import app.revanced.patcher.PatcherData
 import app.revanced.patcher.extensions.or

src/main/kotlin/app/revanced/patches/youtube/layout/MinimizedPlaybackPatch.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.layout
+package app.revanced.patches.youtube.layout
 
 import app.revanced.patcher.PatcherData
 import app.revanced.patcher.extensions.addInstructions

src/main/kotlin/app/revanced/patches/youtube/layout/OldQualityLayoutPatch.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.layout
+package app.revanced.patches.youtube.layout
 
 import app.revanced.patcher.PatcherData
 import app.revanced.patcher.extensions.addInstructions

src/main/kotlin/app/revanced/patches/youtube/layout/ShortsButtonRemoverPatch.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.layout
+package app.revanced.patches.youtube.layout
 
 import app.revanced.patcher.PatcherData
 import app.revanced.patcher.extensions.or
@@ -10,10 +10,7 @@ import app.revanced.patcher.signature.PatternScanMethod
 import app.revanced.patcher.smali.toInstruction
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.formats.Instruction35c
-import org.jf.dexlib2.iface.instruction.formats.Instruction3rc
 import org.jf.dexlib2.iface.instruction.formats.Instruction11x
-import org.jf.dexlib2.builder.instruction.BuilderInstruction32x
 
 private val compatiblePackages = listOf(
     PackageMetadata(

src/main/kotlin/app/revanced/patches/youtube/misc/IntegrationsPatch.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.misc
+package app.revanced.patches.youtube.misc
 
 import app.revanced.patcher.PatcherData
 import app.revanced.patcher.extensions.addInstructions