chore(release): 2.50.3 [skip ci]

## [2.50.3](https://github.com/revanced/revanced-patches/compare/v2.50.2...v2.50.3) (2022-09-01) ### Bug Fixes * partial ad blockage in `tiktok-ads` patch ([#420](https://github.com/revanced/revanced-patches/issues/420)) ([bc6d192](1702322671))
fix: partial ad blockage in tiktok-ads patch (#420 )
2026-01-16 15:53:58 +00:00 · 2022-09-01 17:13:54 +00:00 · 2022-09-01 19:12:16 +02:00 · 2022-08-31 18:44:22 +00:00 · 2022-08-31 20:42:18 +02:00 · 2022-08-31 20:38:38 +02:00
103 changed files with 452 additions and 392 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+## [2.50.3](https://github.com/revanced/revanced-patches/compare/v2.50.2...v2.50.3) (2022-09-01)
+
+
+### Bug Fixes
+
+* partial ad blockage in `tiktok-ads` patch ([#420](https://github.com/revanced/revanced-patches/issues/420)) ([bc6d192](https://github.com/revanced/revanced-patches/commit/bc6d19205940e3b4b228a9b5de627a2260abd00e))
+
+## [2.50.2](https://github.com/revanced/revanced-patches/compare/v2.50.1...v2.50.2) (2022-08-31)
+
+
+### Bug Fixes
+
+* wrong dependency version ([1e63a57](https://github.com/revanced/revanced-patches/commit/1e63a57b86475670442e6a24a7f24c02dabee239))
+
+## [2.50.1](https://github.com/revanced/revanced-patches/compare/v2.50.0...v2.50.1) (2022-08-31)
+
+
+### Bug Fixes
+
+* resolve fingerprint in `premium-icon-reddit` patch ([#413](https://github.com/revanced/revanced-patches/issues/413)) ([60ec2c6](https://github.com/revanced/revanced-patches/commit/60ec2c6f8a29cfc36313617a92e976f01213ce00))
+
+# [2.50.0](https://github.com/revanced/revanced-patches/compare/v2.49.0...v2.50.0) (2022-08-31)
+
+
+### Features
+
+* `tiktok-download` and `tiktok-seekbar` patch ([#405](https://github.com/revanced/revanced-patches/issues/405)) ([f36e000](https://github.com/revanced/revanced-patches/commit/f36e0007c52f4e925a3a2370cdb51bd45ee00a1b))
+
 # [2.49.0](https://github.com/revanced/revanced-patches/compare/v2.48.2...v2.49.0) (2022-08-31)


--- a/README.md
+++ b/README.md
@@ -59,6 +59,8 @@ The official Patch bundle provided by ReVanced and the community.

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
+| `tiktok-download` | Remove restrictions on downloads video. | all |
+| `tiktok-seekbar` | Show progress bar for all video. | all |
 | `tiktok-ads` | Removes ads from TikTok. | all |
 </details>

--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,7 +22,7 @@ repositories {
 dependencies {
    implementation(kotlin("stdlib"))

-    implementation("app.revanced:revanced-patcher:3.3.3")
+    implementation("app.revanced:revanced-patcher:3.4.0")
    implementation("app.revanced:multidexlib2:2.5.2.r2")

    // Required for meta
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.49.0
+version = 2.50.3
--- a/patches.json
+++ b/patches.json
--- a/src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/CodecsLockFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/CodecsLockFingerprint.kt
@@ -3,9 +3,9 @@ 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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.audio.codecs.annotations.CodecsUnlockCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
@@ -19,7 +19,7 @@ import org.jf.dexlib2.Opcode
@CodecsUnlockCompatibility
@Version("0.0.1")
 object CodecsLockFingerprint : MethodFingerprint(
-    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, null, listOf(
+    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, opcodes = listOf(
        Opcode.INVOKE_DIRECT,
        Opcode.INVOKE_VIRTUAL,
        Opcode.MOVE_RESULT,
@@ -35,5 +35,5 @@ object CodecsLockFingerprint : MethodFingerprint(
        Opcode.INVOKE_DIRECT,
        Opcode.RETURN_OBJECT
    ),
-    listOf("eac3_supported")
+    strings = listOf("eac3_supported")
 )
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastContextFetchFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastContextFetchFingerprint.kt
@@ -2,9 +2,9 @@ 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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility

@Name("cast-context-fetch-fingerprint")
@@ -15,6 +15,5 @@ import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibi
@MicroGPatchCompatibility
@Version("0.0.1")
 object CastContextFetchFingerprint : MethodFingerprint(
-    null, null, null, null,
-    listOf("Error fetching CastContext.")
+    strings = listOf("Error fetching CastContext.")
 )
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt
@@ -2,9 +2,9 @@ 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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility

@Name("cast-module-fingerprint")
@@ -15,6 +15,5 @@ import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibi
@MicroGPatchCompatibility
@Version("0.0.1")
 object CastDynamiteModuleFingerprint : MethodFingerprint(
-    null, null, null, null,
-    listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
+    strings = listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
 )
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt
@@ -2,9 +2,9 @@ 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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility

@Name("cast-context-fetch-fingerprint")
@@ -15,6 +15,5 @@ import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibi
@MicroGPatchCompatibility
@Version("0.0.1")
 object CastDynamiteModuleV2Fingerprint : MethodFingerprint(
-    null, null, null, null,
-    listOf("Failed to load module via V2: ")
+    strings = listOf("Failed to load module via V2: ")
 )
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt
@@ -3,9 +3,9 @@ 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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
 import org.jf.dexlib2.AccessFlags

@@ -17,5 +17,14 @@ import org.jf.dexlib2.AccessFlags
@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")
+    "I",
+    AccessFlags.PUBLIC or AccessFlags.STATIC,
+    listOf("L", "I"),
+    strings = listOf(
+        "This should never happen.",
+        "MetadataValueReader",
+        "GooglePlayServicesUtil",
+        "com.android.vending",
+        "android.hardware.type.embedded"
+    )
 )
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/PrimeFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/PrimeFingerprint.kt
@@ -2,9 +2,9 @@ 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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility

@Name("google-play-prime-fingerprint")
@@ -15,5 +15,5 @@ import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompat
@MusicMicroGPatchCompatibility
@Version("0.0.1")
 object PrimeFingerprint : MethodFingerprint(
-    null, null, null, null, listOf("com.google.android.GoogleCamera", "com.android.vending")
+    strings = listOf("com.google.android.GoogleCamera", "com.android.vending")
 )
--- a/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/ServiceCheckFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/microg/fingerprints/ServiceCheckFingerprint.kt
@@ -3,9 +3,9 @@ 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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.misc.microg.annotations.MusicMicroGPatchCompatibility
 import org.jf.dexlib2.AccessFlags

@@ -17,5 +17,8 @@ import org.jf.dexlib2.AccessFlags
@MusicMicroGPatchCompatibility
@Version("0.0.1")
 object ServiceCheckFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "I"), null, listOf("Google Play Services not available")
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.STATIC,
+    listOf("L", "I"),
+    strings = listOf("Google Play Services not available")
 )
--- a/src/main/kotlin/app/revanced/patches/reddit/ad/general/annotations/GeneralAdsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/ad/general/annotations/GeneralAdsCompatibility.kt
@@ -3,11 +3,7 @@ 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()
-    )]
-)
+@Compatibility([Package("com.reddit.frontpage")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class GeneralAdsCompatibility
--- a/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/annotations/PremiumIconCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/annotations/PremiumIconCompatibility.kt
@@ -3,11 +3,7 @@ package app.revanced.patches.reddit.layout.premiumicon.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility(
-    [Package(
-        "com.reddit.frontpage", arrayOf()
-    )]
-)
+@Compatibility([Package("com.reddit.frontpage")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class PremiumIconCompatibility
--- a/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/fingerprints/PremiumIconFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/fingerprints/PremiumIconFingerprint.kt
@@ -2,8 +2,8 @@ package app.revanced.patches.reddit.layout.premiumicon.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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.reddit.layout.premiumicon.annotations.PremiumIconCompatibility

@Name("premium-icon-fingerprint")
@@ -14,11 +14,7 @@ import app.revanced.patches.reddit.layout.premiumicon.annotations.PremiumIconCom
@Version("0.0.1")
 object PremiumIconFingerprint : MethodFingerprint(
    "Z",
-    null,
-    null,
-    null,
-    null,
-    { methodDef ->
+    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("MyAccount;") && methodDef.name == "isPremiumSubscriber"
    }
 )
--- a/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/patch/PremiumIconPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/patch/PremiumIconPatch.kt
@@ -17,7 +17,11 @@ import app.revanced.patches.reddit.layout.premiumicon.fingerprints.PremiumIconFi
@Description("Unlocking Premium Icons in reddit app.")
@PremiumIconCompatibility
@Version("0.0.1")
-class PremiumIconPatch : BytecodePatch() {
+class PremiumIconPatch : BytecodePatch(
+    listOf(
+        PremiumIconFingerprint
+    )
+) {
    override fun execute(data: BytecodeData): PatchResult {
        val method = PremiumIconFingerprint.result!!.mutableMethod
        method.addInstructions(
--- a/src/main/kotlin/app/revanced/patches/tiktok/ad/annotations/TiktokAdsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/ad/annotations/TiktokAdsCompatibility.kt
@@ -5,8 +5,8 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [
-        Package("com.ss.android.ugc.trill", arrayOf()),
-        Package("com.zhiliaoapp.musically", arrayOf())
+        Package("com.ss.android.ugc.trill"),
+        Package("com.zhiliaoapp.musically")
    ]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/tiktok/ad/fingerprints/ConvertHelpFeedItemListFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/ad/fingerprints/ConvertHelpFeedItemListFingerprint.kt
@@ -0,0 +1,21 @@
+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("convert-help-v2-feeditemlist-fingerprint")
+@MatchingMethod(
+    "Lbeancopy/ConvertHelp;",
+    "com${'$'}ss${'$'}ugc${'$'}aweme${'$'}proto${'$'}aweme_v2_feed_response${'$'}${'$'}com${'$'}ss${'$'}android${'$'}ugc${'$'}aweme${'$'}feed${'$'}model${'$'}FeedItemList",
+)
+@TiktokAdsCompatibility
+@Version("0.0.1")
+object ConvertHelpFeedItemListFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/ConvertHelp;") &&
+                methodDef.name.endsWith("${'$'}FeedItemList")
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/ad/fingerprints/FeedItemListCloneFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/ad/fingerprints/FeedItemListCloneFingerprint.kt
@@ -14,7 +14,7 @@ import app.revanced.patches.tiktok.ad.annotations.TiktokAdsCompatibility
@TiktokAdsCompatibility
@Version("0.0.1")
 object FeedItemListCloneFingerprint : MethodFingerprint(
-    null, null, null, null,null, { methodDef ->
+    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("/FeedItemList;") && methodDef.name == "clone"
    }
 )
--- a/src/main/kotlin/app/revanced/patches/tiktok/ad/patch/TiktokAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/ad/patch/TiktokAdsPatch.kt
@@ -11,6 +11,7 @@ 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.ConvertHelpFeedItemListFingerprint
 import app.revanced.patches.tiktok.ad.fingerprints.FeedItemListCloneFingerprint
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
@@ -23,26 +24,34 @@ import org.jf.dexlib2.iface.reference.FieldReference
@TiktokAdsCompatibility
@Version("0.0.1")
 class TiktokAdsPatch : BytecodePatch(
-    listOf(FeedItemListCloneFingerprint)
+    listOf(
+        FeedItemListCloneFingerprint,
+        ConvertHelpFeedItemListFingerprint
+    )
 ) {
    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
+        listOf(
+            FeedItemListCloneFingerprint,
+            ConvertHelpFeedItemListFingerprint
+        ).forEach { fingerprint ->
+            val method = fingerprint.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 preloadAdsFieldInstruction = (instruction as? ReferenceInstruction)
+                if ((preloadAdsFieldInstruction?.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()
+                // set null instead of the field "preloadAds"
+                val overrideRegister = (preloadAdsFieldInstruction as TwoRegisterInstruction).registerA
+                method.addInstruction(
+                    index,
+                    "const/4 v$overrideRegister, 0x0"
+                )
+                return@forEach
+            }
+            return PatchResultError("Can not find required instruction.")
        }
-
-        return PatchResultError("Could not find required instruction.")
+        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/annotations/DownloadsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/annotations/DownloadsCompatibility.kt
@@ -0,0 +1,14 @@
+package app.revanced.patches.tiktok.interaction.downloads.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [
+        Package("com.ss.android.ugc.trill"),
+        Package("com.zhiliaoapp.musically")
+    ]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class DownloadsCompatibility
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint.kt
@@ -0,0 +1,22 @@
+package app.revanced.patches.tiktok.interaction.downloads.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.interaction.downloads.annotations.DownloadsCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("acl-common-share-get-code")
+@MatchingMethod("ACLCommonShare", "getCode")
+@DownloadsCompatibility
+@Version("0.0.1")
+object ACLCommonShareFingerprint : MethodFingerprint(
+    "I",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/ACLCommonShare;") &&
+                methodDef.name == "getCode"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint2.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint2.kt
@@ -0,0 +1,22 @@
+package app.revanced.patches.tiktok.interaction.downloads.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.interaction.downloads.annotations.DownloadsCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("acl-common-share-get-show-type")
+@MatchingMethod("ACLCommonShare", "getShowType")
+@DownloadsCompatibility
+@Version("0.0.1")
+object ACLCommonShareFingerprint2 : MethodFingerprint(
+    "I",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/ACLCommonShare;") &&
+                methodDef.name == "getShowType"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint3.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint3.kt
@@ -0,0 +1,22 @@
+package app.revanced.patches.tiktok.interaction.downloads.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.interaction.downloads.annotations.DownloadsCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("acl-common-share-get-transcode")
+@MatchingMethod("ACLCommonShare", "getTranscode")
+@DownloadsCompatibility
+@Version("0.0.1")
+object ACLCommonShareFingerprint3 : MethodFingerprint(
+    "I",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/ACLCommonShare;") &&
+                methodDef.name == "getTranscode"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/patch/DownloadsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/patch/DownloadsPatch.kt
@@ -0,0 +1,56 @@
+package app.revanced.patches.tiktok.interaction.downloads.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.replaceInstructions
+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.tiktok.interaction.downloads.annotations.DownloadsCompatibility
+import app.revanced.patches.tiktok.interaction.downloads.fingerprints.*
+
+@Patch
+@Name("tiktok-download")
+@Description("Remove restrictions on downloads video.")
+@DownloadsCompatibility
+@Version("0.0.1")
+class DownloadsPatch : BytecodePatch(
+    listOf(
+        ACLCommonShareFingerprint,
+        ACLCommonShareFingerprint2,
+        ACLCommonShareFingerprint3
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val method1 = ACLCommonShareFingerprint.result!!.mutableMethod
+        method1.replaceInstructions(
+            0,
+            """
+                const/4 v0, 0x0
+                return v0
+            """
+        )
+        val method2 = ACLCommonShareFingerprint2.result!!.mutableMethod
+        method2.replaceInstructions(
+            0,
+            """
+                const/4 v0, 0x2
+                return v0
+            """
+        )
+        //Download videos without watermark.
+        val method3 = ACLCommonShareFingerprint3.result!!.mutableMethod
+        method3.replaceInstructions(
+            0,
+            """
+                const/4 v0, 0x1
+                return v0
+            """
+        )
+        return PatchResultSuccess()
+    }
+
+}
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/annotations/SeekbarCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/annotations/SeekbarCompatibility.kt
@@ -0,0 +1,14 @@
+package app.revanced.patches.tiktok.interaction.seekbar.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [
+        Package("com.ss.android.ugc.trill"),
+        Package("com.zhiliaoapp.musically")
+    ]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class SeekbarCompatibility
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/fingerprints/AwemeGetVideoControlFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/fingerprints/AwemeGetVideoControlFingerprint.kt
@@ -0,0 +1,20 @@
+package app.revanced.patches.tiktok.interaction.seekbar.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.interaction.seekbar.annotations.SeekbarCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("aweme-get-video-control")
+@MatchingMethod("Aweme", "getVideoControl")
+@SeekbarCompatibility
+@Version("0.0.1")
+object AwemeGetVideoControlFingerprint : MethodFingerprint(
+    "L",
+    AccessFlags.PUBLIC.value,
+   customFingerprint = { methodDef ->
+       methodDef.definingClass.endsWith("/Aweme;") && methodDef.name == "getVideoControl"
+   }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/patch/TiktokSeekbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/patch/TiktokSeekbarPatch.kt
@@ -0,0 +1,47 @@
+package app.revanced.patches.tiktok.interaction.seekbar.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.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.interaction.seekbar.annotations.SeekbarCompatibility
+import app.revanced.patches.tiktok.interaction.seekbar.fingerprints.*
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.builder.instruction.BuilderInstruction11n
+import org.jf.dexlib2.builder.instruction.BuilderInstruction22c
+
+@Patch
+@Name("tiktok-seekbar")
+@Description("Show progress bar for all video.")
+@SeekbarCompatibility
+@Version("0.0.1")
+class TiktokSeekbarPatch : BytecodePatch(
+    listOf(
+        AwemeGetVideoControlFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        //Get VideoControl FieldReference
+        val videoControl = data.findClass { it.type.endsWith("/VideoControl;") }
+            ?: return PatchResultError("Can not find target class")
+        val fieldList = videoControl.immutableClass.fields.associateBy { field -> field.name }
+
+        val method = AwemeGetVideoControlFingerprint.result!!.mutableMethod
+        val implementation = method.implementation!!
+        implementation.addInstructions(
+            1, listOf(
+                BuilderInstruction11n(Opcode.CONST_4, 1, 1),
+                BuilderInstruction22c(Opcode.IPUT, 1, 0, fieldList["showProgressBar"]!!),
+                BuilderInstruction22c(Opcode.IPUT, 1, 0, fieldList["draftProgressBar"]!!)
+            )
+        )
+        return PatchResultSuccess()
+    }
+
+}
--- a/src/main/kotlin/app/revanced/patches/twitter/ad/timeline/annotations/TimelineAdsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/twitter/ad/timeline/annotations/TimelineAdsCompatibility.kt
@@ -3,11 +3,7 @@ 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()
-    )]
-)
+@Compatibility([Package("com.twitter.android")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class TimelineAdsCompatibility
--- a/src/main/kotlin/app/revanced/patches/twitter/ad/timeline/fingerprints/TimelineTweetJsonParserFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/twitter/ad/timeline/fingerprints/TimelineTweetJsonParserFingerprint.kt
@@ -12,7 +12,7 @@ import org.jf.dexlib2.Opcode
@TimelineAdsCompatibility
@Version("0.0.1")
 object TimelineTweetJsonParserFingerprint : MethodFingerprint(
-    null, null, null, listOf(
+    opcodes = listOf(
        Opcode.IPUT_OBJECT,
        Opcode.GOTO,
        Opcode.SGET_OBJECT,
@@ -21,6 +21,6 @@ object TimelineTweetJsonParserFingerprint : MethodFingerprint(
        Opcode.CHECK_CAST,
        Opcode.IPUT_OBJECT,
        Opcode.RETURN_VOID,
-    ), listOf("tweetPromotedMetadata", "promotedMetadata", "hasModeratedReplies", "conversationAnnotation"),
-    { methodDef -> methodDef.name == "parseField" }
+    ), strings = listOf("tweetPromotedMetadata", "promotedMetadata", "hasModeratedReplies", "conversationAnnotation"),
+    customFingerprint = { methodDef -> methodDef.name == "parseField" }
 )
--- a/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/annotations/FirebaseGetCertPatchCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/annotations/FirebaseGetCertPatchCompatibility.kt
@@ -3,11 +3,7 @@ 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()
-    )]
-)
+@Compatibility([Package("de.dwd.warnapp")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class FirebaseGetCertPatchCompatibility
--- a/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertMessagingFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertMessagingFingerprint.kt
@@ -14,10 +14,7 @@ import app.revanced.patches.warnwetter.misc.firebasegetcert.annotations.Firebase
@Version("0.0.1")
 object GetMessagingCertFingerprint : MethodFingerprint(
    "Ljava/lang/String;",
-    null,
-    null,
-    null,
-    listOf(
+    strings = listOf(
        "ContentValues",
        "Could not get fingerprint hash for package: ",
        "No such package: "
--- a/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertRegistrationFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/warnwetter/misc/firebasegetcert/fingerprints/GetCertRegistrationFingerprint.kt
@@ -14,10 +14,7 @@ import app.revanced.patches.warnwetter.misc.firebasegetcert.annotations.Firebase
@Version("0.0.1")
 object GetReqistrationCertFingerprint : MethodFingerprint(
    "Ljava/lang/String;",
-    null,
-    null,
-    null,
-    listOf(
+    strings = listOf(
        "FirebaseRemoteConfig",
        "Could not get fingerprint hash for package: ",
        "No such package: "
--- a/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/annotations/PromoCodeUnlockCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/annotations/PromoCodeUnlockCompatibility.kt
@@ -3,11 +3,7 @@ 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()
-    )]
-)
+@Compatibility([Package("de.dwd.warnapp")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class PromoCodeUnlockCompatibility
--- a/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/fingerprints/PromoCodeUnlockFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/fingerprints/PromoCodeUnlockFingerprint.kt
@@ -2,8 +2,8 @@ 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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.warnwetter.misc.promocode.annotations.PromoCodeUnlockCompatibility

@Name("promo-code-unlock-fingerprint")
@@ -13,12 +13,7 @@ import app.revanced.patches.warnwetter.misc.promocode.annotations.PromoCodeUnloc
@PromoCodeUnlockCompatibility
@Version("0.0.1")
 object PromoCodeUnlockFingerprint : MethodFingerprint(
-    null,
-    null,
-    null,
-    null,
-    null,
-    { methodDef ->
+    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("PromoTokenVerification;") && methodDef.name == "isValid"
    }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/fingerprints/HideInfocardSuggestionsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/fingerprints/HideInfocardSuggestionsFingerprint.kt
@@ -17,8 +17,5 @@ import org.jf.dexlib2.AccessFlags
 object HideInfocardSuggestionsFingerprint : MethodFingerprint(
    "Ljava/lang/Boolean;",
    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    null,
-    null,
-    listOf("vibrator"),
-    null
+    strings = listOf("vibrator")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/fingerprints/HideInfocardSuggestionsParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/fingerprints/HideInfocardSuggestionsParentFingerprint.kt
@@ -3,9 +3,9 @@ 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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.ad.infocardsuggestions.annotations.HideInfocardSuggestionsCompatibility
 import org.jf.dexlib2.AccessFlags

@@ -17,8 +17,5 @@ import org.jf.dexlib2.AccessFlags
 object HideInfocardSuggestionsParentFingerprint : MethodFingerprint(
    "Ljava/lang/String;",
    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    listOf(),
-    null,
-    listOf("player_overlay_info_card_teaser"),
-    null
+    strings = listOf("player_overlay_info_card_teaser"),
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/video/fingerprints/ShowVideoAdsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/video/fingerprints/ShowVideoAdsFingerprint.kt
@@ -17,5 +17,5 @@ import org.jf.dexlib2.AccessFlags
@VideoAdsCompatibility
@Version("0.0.1")
 object ShowVideoAdsFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z"), null
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/SwipeControlsHostActivityFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/SwipeControlsHostActivityFingerprint.kt
@@ -15,7 +15,7 @@ import app.revanced.patches.youtube.interaction.swipecontrols.annotation.SwipeCo
@SwipeControlsCompatibility
@Version("0.0.1")
 object SwipeControlsHostActivityFingerprint : MethodFingerprint(
-    null, null, null, null, null, { methodDef ->
+    customFingerprint = { methodDef ->
        methodDef.definingClass == "Lapp/revanced/integrations/swipecontrols/SwipeControlsHostActivity;" && methodDef.name == "<init>"
    }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/WatchWhileActivityFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/WatchWhileActivityFingerprint.kt
@@ -15,7 +15,7 @@ import app.revanced.patches.youtube.interaction.swipecontrols.annotation.SwipeCo
@SwipeControlsCompatibility
@Version("0.0.1")
 object WatchWhileActivityFingerprint : MethodFingerprint(
-    null, null, null, null, null, { methodDef ->
+    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("WatchWhileActivity;") && methodDef.name == "<init>"
    }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/resource/SwipeControlsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/resource/SwipeControlsResourcePatch.kt
@@ -92,8 +92,6 @@ class SwipeControlsResourcePatch : ResourcePatch() {
            )
        )

-        val resourcesDir = "swipecontrols"
-
        data.copyResources(
            "swipecontrols",
            ResourceUtils.ResourceGroup(
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/amoled/annotations/AmoledCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/amoled/annotations/AmoledCompatibility.kt
@@ -3,11 +3,7 @@ package app.revanced.patches.youtube.layout.amoled.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf()
-    )]
-)
+@Compatibility([Package("com.google.android.youtube")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class AmoledCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/AutoNavInformerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/AutoNavInformerFingerprint.kt
@@ -3,7 +3,6 @@ package app.revanced.patches.youtube.layout.autoplaybutton.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.layout.autoplaybutton.annotations.AutoplayButtonCompatibility
@@ -19,8 +18,7 @@ import org.jf.dexlib2.Opcode
 object AutoNavInformerFingerprint : MethodFingerprint(
    "Z",
    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    null,
-    listOf(
+    opcodes = listOf(
        Opcode.IGET_OBJECT,
        Opcode.INVOKE_INTERFACE,
        Opcode.MOVE_RESULT_OBJECT,
@@ -28,6 +26,5 @@ object AutoNavInformerFingerprint : MethodFingerprint(
        Opcode.INVOKE_VIRTUAL,
        Opcode.MOVE_RESULT,
    ),
-    null,
-    { it.definingClass.endsWith("WillAutonavInformer;") }
+    customFingerprint = { it.definingClass.endsWith("WillAutonavInformer;") }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/LayoutConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/fingerprints/LayoutConstructorFingerprint.kt
@@ -13,8 +13,8 @@ import app.revanced.patches.youtube.layout.autoplaybutton.annotations.AutoplayBu
@AutoplayButtonCompatibility
@Version("0.0.1")
 object LayoutConstructorFingerprint : MethodFingerprint(
-    null, null, null, null, listOf("1.0x"),
-    { methodDef ->
+    strings = listOf("1.0x"),
+    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("YouTubeControlsOverlay;")
    }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/annotations/PremiumHeadingCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/annotations/PremiumHeadingCompatibility.kt
@@ -3,11 +3,7 @@ package app.revanced.patches.youtube.layout.branding.header.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf()
-    )]
-)
+@Compatibility([Package("com.google.android.youtube")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class PremiumHeadingCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/annotations/CustomBrandingCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/annotations/CustomBrandingCompatibility.kt
@@ -3,11 +3,7 @@ package app.revanced.patches.youtube.layout.branding.icon.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf()
-    )]
-)
+@Compatibility([Package("com.google.android.youtube")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class CustomBrandingCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/castbutton/annotations/CastPatchCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/castbutton/annotations/CastPatchCompatibility.kt
@@ -3,11 +3,7 @@ package app.revanced.patches.youtube.layout.castbutton.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf()
-    )]
-)
+@Compatibility([Package("com.google.android.youtube")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class CastButtonCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/fingerprints/FullscreenViewAdderFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/fingerprints/FullscreenViewAdderFingerprint.kt
@@ -16,10 +16,7 @@ import org.jf.dexlib2.Opcode
@ShortsButtonCompatibility
@Version("0.0.1")
 object FullscreenViewAdderFingerprint : MethodFingerprint(
-    null,
-    null,
-    null,
-    listOf(
+    opcodes = listOf(
        Opcode.IGET_BOOLEAN
    )
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/fingerprints/FullscreenViewAdderParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/fingerprints/FullscreenViewAdderParentFingerprint.kt
@@ -16,10 +16,8 @@ import org.jf.dexlib2.Opcode
@ShortsButtonCompatibility
@Version("0.0.1")
 object FullscreenViewAdderParentFingerprint : MethodFingerprint(
-    null,
-    null,
-    listOf("L", "L"),
-    listOf(
+    parameters = listOf("L", "L"),
+    opcodes = listOf(
        Opcode.GOTO,
        Opcode.IGET_BOOLEAN,
        Opcode.IF_EQ,
@@ -27,6 +25,5 @@ object FullscreenViewAdderParentFingerprint : MethodFingerprint(
        Opcode.CONST_4,
        Opcode.INVOKE_VIRTUAL,
    ),
-    null,
-    { it.definingClass.endsWith("FullscreenEngagementPanelOverlay;") }
+    customFingerprint = { it.definingClass.endsWith("FullscreenEngagementPanelOverlay;") }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/reels/fingerprints/HideReelsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/reels/fingerprints/HideReelsFingerprint.kt
@@ -3,9 +3,9 @@ package app.revanced.patches.youtube.layout.reels.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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.layout.reels.annotations.HideReelsCompatibility
 import org.jf.dexlib2.AccessFlags

@@ -17,6 +17,6 @@ import org.jf.dexlib2.AccessFlags
@HideReelsCompatibility
@Version("0.0.1")
 object HideReelsFingerprint : MethodFingerprint(
-    null, AccessFlags.PROTECTED or AccessFlags.FINAL, listOf("L", "L"), null,
-    listOf("multiReelDismissalCallback", "reelItemRenderers", "reelDismissalInfo")
+    access = AccessFlags.PROTECTED or AccessFlags.FINAL, parameters = listOf("L", "L"),
+    strings = listOf("multiReelDismissalCallback", "reelItemRenderers", "reelDismissalInfo")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/DislikeFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/DislikeFingerprint.kt
@@ -19,7 +19,5 @@ import org.jf.dexlib2.AccessFlags
 object DislikeFingerprint : MethodFingerprint(
    "V",
    AccessFlags.PROTECTED or AccessFlags.CONSTRUCTOR,
-    null,
-    null,
-    listOf("like/dislike")
+    strings = listOf("like/dislike")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/LikeFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/LikeFingerprint.kt
@@ -19,7 +19,5 @@ import org.jf.dexlib2.AccessFlags
 object LikeFingerprint : MethodFingerprint(
    "V",
    AccessFlags.PROTECTED or AccessFlags.CONSTRUCTOR,
-    null,
-    null,
-    listOf("like/like")
+     strings = listOf("like/like")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/RemoveLikeFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/RemoveLikeFingerprint.kt
@@ -19,7 +19,5 @@ import org.jf.dexlib2.AccessFlags
 object RemoveLikeFingerprint : MethodFingerprint(
    "V",
    AccessFlags.PROTECTED or AccessFlags.CONSTRUCTOR,
-    null,
-    null,
-    listOf("like/removelike")
+    strings = listOf("like/removelike")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentSpecParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/TextComponentSpecParentFingerprint.kt
@@ -15,9 +15,5 @@ import app.revanced.patches.youtube.layout.returnyoutubedislike.annotations.Retu
@ReturnYouTubeDislikeCompatibility
@Version("0.0.1")
 object TextComponentSpecParentFingerprint : MethodFingerprint(
-    null,
-    null,
-    null,
-    null,
-    listOf("TextComponentSpec: No converter for extension: ")
+    strings = listOf("TextComponentSpec: No converter for extension: ")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/CreateVideoPlayerSeekbarFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/CreateVideoPlayerSeekbarFingerprint.kt
@@ -15,7 +15,6 @@ import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlock
@SponsorBlockCompatibility
@Version("0.0.1")
 object CreateVideoPlayerSeekbarFingerprint : MethodFingerprint(
-    "V", null, null,
-    null,
-    listOf("timed_markers_width")
+    "V",
+    strings = listOf("timed_markers_width")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/NextGenWatchLayoutFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/NextGenWatchLayoutFingerprint.kt
@@ -17,8 +17,5 @@ import org.jf.dexlib2.util.MethodUtil
@Version("0.0.1")
 object NextGenWatchLayoutFingerprint : MethodFingerprint(
    "V", // constructors return void, in favour of speed of matching, this fingerprint has been added
-    null,
-    null,
-    null,
    customFingerprint =  { methodDef -> MethodUtil.isConstructor(methodDef) && methodDef.parameterTypes.size == 3 && methodDef.definingClass.endsWith("NextGenWatchLayout;") }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/PlayerControllerSetTimeReferenceFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/PlayerControllerSetTimeReferenceFingerprint.kt
@@ -16,7 +16,6 @@ import org.jf.dexlib2.Opcode
@SponsorBlockCompatibility
@Version("0.0.1")
 object PlayerControllerSetTimeReferenceFingerprint : MethodFingerprint(
-    null, null, null,
-    listOf(Opcode.INVOKE_DIRECT_RANGE, Opcode.IGET_OBJECT),
-    listOf("Media progress reported outside media playback: ")
+    opcodes = listOf(Opcode.INVOKE_DIRECT_RANGE, Opcode.IGET_OBJECT),
+    strings = listOf("Media progress reported outside media playback: ")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/PlayerInitFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/PlayerInitFingerprint.kt
@@ -15,8 +15,6 @@ import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlock
@SponsorBlockCompatibility
@Version("0.0.1")
 object PlayerInitFingerprint : MethodFingerprint(
-    null, null, null,
-    null,
    strings = listOf(
        "playVideo called on player response with no videoStreamingData."
    ),
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/PlayerOverlaysLayoutInitFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/PlayerOverlaysLayoutInitFingerprint.kt
@@ -15,8 +15,6 @@ import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlock
@SponsorBlockCompatibility
@Version("0.0.1")
 object PlayerOverlaysLayoutInitFingerprint : MethodFingerprint(
-    null, null, null,
-    null,
-    null,
-    { methodDef -> methodDef.returnType.endsWith("YouTubePlayerOverlaysLayout;") }
+
+    customFingerprint = { methodDef -> methodDef.returnType.endsWith("YouTubePlayerOverlaysLayout;") }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/RectangleFieldInvalidatorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/RectangleFieldInvalidatorFingerprint.kt
@@ -18,11 +18,7 @@ import org.jf.dexlib2.iface.reference.MethodReference
@Version("0.0.1")
 object RectangleFieldInvalidatorFingerprint : MethodFingerprint(
    "V",
-    null,
-    null,
-    null,
-    null,
-    custom@{ methodDef ->
+    customFingerprint = custom@{ methodDef ->
        val instructions = methodDef.implementation?.instructions!!
        val instructionCount = instructions.count()

--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/SeekFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/SeekFingerprint.kt
@@ -15,9 +15,5 @@ import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlock
@SponsorBlockCompatibility
@Version("0.0.1")
 object SeekFingerprint : MethodFingerprint(
-    null,
-    null,
-    null,
-    null,
-    listOf("Attempting to seek during an ad")
+    strings = listOf("Attempting to seek during an ad")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/VideoLengthFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/VideoLengthFingerprint.kt
@@ -16,8 +16,7 @@ import org.jf.dexlib2.Opcode
@SponsorBlockCompatibility
@Version("0.0.1")
 object VideoLengthFingerprint : MethodFingerprint(
-    null, null, null,
-    listOf(
+    opcodes = listOf(
        Opcode.MOVE_RESULT_WIDE,
        Opcode.CMP_LONG,
        Opcode.IF_LEZ,
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/VideoTimeFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/VideoTimeFingerprint.kt
@@ -15,6 +15,5 @@ import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlock
@SponsorBlockCompatibility
@Version("0.0.1")
 object VideoTimeFingerprint : MethodFingerprint(
-    null, null, null, null,
-    listOf("MedialibPlayerTimeInfo{currentPositionMillis=")
+    strings = listOf("MedialibPlayerTimeInfo{currentPositionMillis=")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideFingerprint.kt
@@ -16,6 +16,6 @@ import org.jf.dexlib2.Opcode
@TabletMiniPlayerCompatibility
@Version("0.0.1")
 object MiniPlayerOverrideFingerprint : MethodFingerprint(
-    "Z", AccessFlags.STATIC or AccessFlags.PUBLIC ,null,
-    listOf(Opcode.RETURN), // anchor to insert the instruction
+    "Z", AccessFlags.STATIC or AccessFlags.PUBLIC,
+    opcodes = listOf(Opcode.RETURN), // anchor to insert the instruction
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideNoContextFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideNoContextFingerprint.kt
@@ -16,6 +16,6 @@ import org.jf.dexlib2.Opcode
@TabletMiniPlayerCompatibility
@Version("0.0.1")
 object MiniPlayerOverrideNoContextFingerprint : MethodFingerprint(
-    "Z", AccessFlags.FINAL or AccessFlags.PRIVATE ,null,
-    listOf(Opcode.RETURN), // anchor to insert the instruction
+    "Z", AccessFlags.FINAL or AccessFlags.PRIVATE,
+    opcodes = listOf(Opcode.RETURN), // anchor to insert the instruction
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerResponseModelSizeCheckFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerResponseModelSizeCheckFingerprint.kt
@@ -32,6 +32,5 @@ object MiniPlayerResponseModelSizeCheckFingerprint : MethodFingerprint(
        Opcode.INVOKE_STATIC,
        Opcode.MOVE_RESULT,
        Opcode.IF_NEZ,
-        ),
-    null
+        )
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/watermark/fingerprints/HideWatermarkFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/watermark/fingerprints/HideWatermarkFingerprint.kt
@@ -17,5 +17,5 @@ import org.jf.dexlib2.AccessFlags
@HideWatermarkCompatibility
@Version("0.0.1")
 object HideWatermarkFingerprint : MethodFingerprint (
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L"), null ,null, null
+    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/watermark/fingerprints/HideWatermarkParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/watermark/fingerprints/HideWatermarkParentFingerprint.kt
@@ -17,5 +17,5 @@ import org.jf.dexlib2.AccessFlags
@HideWatermarkCompatibility
@Version("0.0.1")
 object HideWatermarkParentFingerprint : MethodFingerprint (
-    "L", AccessFlags.PUBLIC or AccessFlags.FINAL, null, null, listOf("player_overlay_in_video_programming"), null
+    "L", AccessFlags.PUBLIC or AccessFlags.FINAL, strings = listOf("player_overlay_in_video_programming")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarOneFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarOneFingerprint.kt
@@ -6,7 +6,6 @@ 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.layout.reels.annotations.HideReelsCompatibility
 import app.revanced.patches.youtube.layout.widesearchbar.annotations.WideSearchbarCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
@@ -18,31 +17,7 @@ import org.jf.dexlib2.Opcode
@DirectPatternScanMethod
@WideSearchbarCompatibility
@Version("0.0.1")
-
-/*
-This finds the following method:
-public final View i(akrl akrlVar, adpd adpdVar) {
-}
-
-Method we search for is located in smali now.
-See:
-.method public final i(Lakrl;Ladpd;)Landroid/view/View;
-    iget-object v0, p0, Ljkg;->a:Landroid/app/Activity;
-    invoke-static {v0}, Landroid/view/LayoutInflater;->from(Landroid/content/Context;)Landroid/view/LayoutInflater;
-    move-result-object v0
-    iget-object v1, p0, Ljkg;->g:Ljis;
-    const/4 v2, 0x0
-    invoke-interface {v1, v2}, Ljis;->h(Z)V
-    iget-object p1, p1, Lakrl;->f:Lahnq;
-    if-nez p1, :cond_12
-    sget-object p1, Lahnq;->a:Lahnq;
-    :cond_12
-    iget-object v1, p0, Ljkg;->x:Ltxm;
-    invoke-static {v1}, Lfbn;->aF(Ltxm;)Z //THIS IS WHAT WE SEARCH FOR (Method fbn.aF)
-    move-result v1
- */
-
 object WideSearchbarOneFingerprint : MethodFingerprint(
-    "L", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L"), listOf(Opcode.IF_NEZ, Opcode.SGET_OBJECT, Opcode.IGET_OBJECT, Opcode.INVOKE_STATIC),
-    null, null
+    "L", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L"),
+    listOf(Opcode.IF_NEZ, Opcode.SGET_OBJECT, Opcode.IGET_OBJECT, Opcode.INVOKE_STATIC)
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarOneParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarOneParentFingerprint.kt
@@ -3,10 +3,9 @@ package app.revanced.patches.youtube.layout.widesearchbar.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.layout.reels.annotations.HideReelsCompatibility
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.layout.widesearchbar.annotations.WideSearchbarCompatibility
 import org.jf.dexlib2.AccessFlags

@@ -17,31 +16,7 @@ import org.jf.dexlib2.AccessFlags
@FuzzyPatternScanMethod(3)
@WideSearchbarCompatibility
@Version("0.0.1")
-
-/*
- * This finds the following method:
-  private final void l(PaneDescriptor paneDescriptor) {
-        Class cls = null;
-        ahat f = paneDescriptor != null ? paneDescriptor.f() : null;
-        if (paneDescriptor != null) {
-            cls = paneDescriptor.a;
-        }
-        ftu k = k();
-        if ((k == null || !k.bk()) && ((!frx.k(f) && !((Boolean) aqer.S(this.n).X(new fac(this, f, 19)).K(irx.i).aH(false)).booleanValue()) || (f != null && f.qA(ReelWatchEndpointOuterClass$ReelWatchEndpoint.reelWatchEndpoint)))) {
-            String j = frx.j(f);
-            if ((j != null && ("FEhistory".equals(j) || "FEmy_videos".equals(j) || "FEpurchases".equals(j) || j.startsWith("VL"))) || cls == this.I.E() || cls == this.G.a) {
-                this.F = 3;
-                return;
-            } else {
-                this.F = 2;
-                return;
-            }
-        }
-        this.F = 1;
-    }
- */
-
 object WideSearchbarOneParentFingerprint : MethodFingerprint(
-    "V", AccessFlags.PRIVATE or AccessFlags.FINAL, listOf("L"), null,
-    listOf("FEhistory", "FEmy_videos", "FEpurchases")
+    "V", AccessFlags.PRIVATE or AccessFlags.FINAL, listOf("L"),
+    strings = listOf("FEhistory", "FEmy_videos", "FEpurchases")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarTwoFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarTwoFingerprint.kt
@@ -6,7 +6,6 @@ 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.layout.reels.annotations.HideReelsCompatibility
 import app.revanced.patches.youtube.layout.widesearchbar.annotations.WideSearchbarCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
@@ -18,32 +17,8 @@ import org.jf.dexlib2.Opcode
@DirectPatternScanMethod
@WideSearchbarCompatibility
@Version("0.0.1")
-
-/*
-public static jis h(Context context, txm txmVar, uag uagVar, txp txpVar) {
-        return fbn.aB(txmVar) ? new jhx(context, txmVar, uagVar, txpVar) : jis.d;
-    }
-
-Method we search for is located in smali now.
-See:
-.method public static h(Landroid/content/Context;Ltxm;Luag;Ltxp;)Ljis;
-    invoke-static {p1}, Lfbn;->aB(Ltxm;)Z //this is the method we want to change. fbn.aB
-    move-result v0
-    if-eqz v0, :cond_c
-    new-instance v0, Ljhx;
-    invoke-direct {v0, p0, p1, p2, p3}, Ljhx;-><init>(Landroid/content/Context;Ltxm;Luag;Ltxp;)V
-    goto :goto_e
-    :cond_c
-    sget-object v0, Ljis;->d:Ljis;
-    :goto_e
-    return-object v0
-.end method
-
- */
-
 object WideSearchbarTwoFingerprint : MethodFingerprint(
-    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, null, listOf(
+    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, opcodes = listOf(
        Opcode.INVOKE_STATIC, Opcode.MOVE_RESULT, Opcode.IF_EQZ, Opcode.NEW_INSTANCE
-    ),
-    null, null
+    )
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarTwoParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/fingerprints/WideSearchbarTwoParentFingerprint.kt
@@ -14,19 +14,7 @@ import org.jf.dexlib2.AccessFlags
 )
@WideSearchbarCompatibility
@Version("0.0.1")
-
-/*
-This finds following method:
-public static ies i(br brVar) {
-        bp f = brVar.getSupportFragmentManager().f("VIDEO_QUALITIES_QUICK_MENU_BOTTOM_SHEET_FRAGMENT");
-        if (f != null) {
-            return (kga) f;
-        }
-        return new kga();
-    }
- */
-
 object WideSearchbarTwoParentFingerprint : MethodFingerprint(
-    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L"), null,
-    listOf("VIDEO_QUALITIES_QUICK_MENU_BOTTOM_SHEET_FRAGMENT")
+    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L"),
+    strings = listOf("VIDEO_QUALITIES_QUICK_MENU_BOTTOM_SHEET_FRAGMENT")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/fingerprints/AutoRepeatFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/fingerprints/AutoRepeatFingerprint.kt
@@ -26,7 +26,5 @@ object AutoRepeatFingerprint : MethodFingerprint(
    "V",
    AccessFlags.PUBLIC or AccessFlags.FINAL,
    listOf(),
-    null,
-    null,
    customFingerprint = { methodDef -> methodDef.implementation!!.instructions.count() == 3 && methodDef.annotations.isEmpty()}
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/fingerprints/AutoRepeatParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/fingerprints/AutoRepeatParentFingerprint.kt
@@ -3,9 +3,9 @@ package app.revanced.patches.youtube.misc.autorepeat.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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.autorepeat.annotations.AutoRepeatCompatibility
 import org.jf.dexlib2.AccessFlags

@@ -16,20 +16,11 @@ import org.jf.dexlib2.AccessFlags
@FuzzyPatternScanMethod(2)
@AutoRepeatCompatibility
@Version("0.0.1")
-//This Fingerprints finds the play() method needed to be called when AutoRepeatPatch.shouldAutoRepeat() == true
-/*
-public final void E() {
-Stuff happens
-String str = "play() called when the player wasn't loaded.";
-String str2 = "play() blocked because Background Playability failed";
-Stuff happens again
-}
- */
 object AutoRepeatParentFingerprint : MethodFingerprint(
    "V",
    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    null,
-    null,
-    listOf("play() called when the player wasn't loaded.", "play() blocked because Background Playability failed"),
-    null
+    strings = listOf(
+        "play() called when the player wasn't loaded.",
+        "play() blocked because Background Playability failed"
+    )
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/clientspoof/annotations/ClientSpoofCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/clientspoof/annotations/ClientSpoofCompatibility.kt
@@ -5,8 +5,8 @@ import app.revanced.patcher.annotation.Package

@Compatibility(
    [
-        Package("com.google.android.youtube", arrayOf()),
-        Package("com.vanced.android.youtube", arrayOf())
+        Package("com.google.android.youtube"),
+        Package("com.vanced.android.youtube")
    ]
 )
@Target(AnnotationTarget.CLASS)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/clientspoof/fingerprints/UserAgentHeaderBuilderFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/clientspoof/fingerprints/UserAgentHeaderBuilderFingerprint.kt
@@ -12,9 +12,7 @@ import org.jf.dexlib2.Opcode
@DirectPatternScanMethod
@Version("0.0.1")
 object UserAgentHeaderBuilderFingerprint : MethodFingerprint(
-    null,
-    null,
-    listOf("L", "L", "L"),
-    listOf(Opcode.MOVE_RESULT_OBJECT, Opcode.INVOKE_VIRTUAL),
-    listOf("(Linux; U; Android "),
+    parameters = listOf("L", "L", "L"),
+    opcodes = listOf(Opcode.MOVE_RESULT_OBJECT, Opcode.INVOKE_VIRTUAL),
+    strings = listOf("(Linux; U; Android "),
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/clientspoof/patch/ClientSpoofPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/clientspoof/patch/ClientSpoofPatch.kt
@@ -12,7 +12,6 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.youtube.misc.clientspoof.annotations.ClientSpoofCompatibility
 import app.revanced.patches.youtube.misc.clientspoof.fingerprints.UserAgentHeaderBuilderFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction

@Patch
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/fingerprints/SpeedArrayGeneratorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/fingerprints/SpeedArrayGeneratorFingerprint.kt
@@ -3,9 +3,9 @@ package app.revanced.patches.youtube.misc.customplaybackspeed.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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.customplaybackspeed.annotations.CustomPlaybackSpeedCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
@@ -20,8 +20,7 @@ import org.jf.dexlib2.Opcode
 object SpeedArrayGeneratorFingerprint : MethodFingerprint(
    "[L",
    AccessFlags.PUBLIC or AccessFlags.STATIC,
-    null,
-    listOf(
+    opcodes = listOf(
        Opcode.IF_NEZ,
        Opcode.SGET_OBJECT,
        Opcode.GOTO,
@@ -29,5 +28,5 @@ object SpeedArrayGeneratorFingerprint : MethodFingerprint(
        Opcode.MOVE_RESULT_OBJECT,
        Opcode.IGET_OBJECT,
    ),
-    listOf("0.0#")
+    strings = listOf("0.0#")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/enabledebugging/annotations/EnableDebuggingCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/enabledebugging/annotations/EnableDebuggingCompatibility.kt
@@ -3,11 +3,7 @@ package app.revanced.patches.youtube.misc.enabledebugging.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf()
-    )]
-)
+@Compatibility([Package("com.google.android.youtube")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class EnableDebuggingCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprintYEL.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprintYEL.kt
@@ -32,7 +32,6 @@ object HDRBrightnessFingerprintYEL : MethodFingerprint(
        Opcode.IGET_OBJECT,
        Opcode.INVOKE_VIRTUAL
    ),
-    null,
    customFingerprint = { methodDef ->
        methodDef.implementation!!.instructions.any {
            ((it as? ReferenceInstruction)?.reference as? FieldReference)?.let { field ->
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprintYJK.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprintYJK.kt
@@ -16,8 +16,8 @@ import org.jf.dexlib2.Opcode
@HDRBrightnessCompatibility
@Version("0.0.1")
 object HDRBrightnessFingerprintYJK : MethodFingerprint(
-    "V", null, null,
-    listOf(
+    "V",
+    opcodes = listOf(
        Opcode.SGET_OBJECT,
        Opcode.IGET_OBJECT,
        Opcode.INVOKE_VIRTUAL,
@@ -27,5 +27,5 @@ object HDRBrightnessFingerprintYJK : MethodFingerprint(
        Opcode.IGET_OBJECT,
        Opcode.INVOKE_VIRTUAL
    ),
-    listOf("c.SettingNotFound;", "screen_brightness", "android.mediaview"),
+    strings = listOf("c.SettingNotFound;", "screen_brightness", "android.mediaview"),
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/integrations/fingerprints/InitFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/integrations/fingerprints/InitFingerprint.kt
@@ -2,8 +2,8 @@ package app.revanced.patches.youtube.misc.integrations.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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.integrations.annotations.IntegrationsCompatibility

@Name("init-fingerprint")
@@ -13,6 +13,5 @@ import app.revanced.patches.youtube.misc.integrations.annotations.IntegrationsCo
@IntegrationsCompatibility
@Version("0.0.1")
 object InitFingerprint : MethodFingerprint(
-    null, null, null, null,
-    listOf("Application creation")
+    strings = listOf("Application creation")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/manifest/annotations/FixLocaleConfigErrorCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/manifest/annotations/FixLocaleConfigErrorCompatibility.kt
@@ -3,11 +3,7 @@ package app.revanced.patches.youtube.misc.manifest.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf()
-    )]
-)
+@Compatibility([Package("com.google.android.youtube")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class FixLocaleConfigErrorCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/CastContextFetchFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/CastContextFetchFingerprint.kt
@@ -2,9 +2,9 @@ package app.revanced.patches.youtube.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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility

@Name("cast-context-fetch-fingerprint")
@@ -15,6 +15,5 @@ import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibi
@MicroGPatchCompatibility
@Version("0.0.1")
 object CastContextFetchFingerprint : MethodFingerprint(
-    null, null, null, null,
-    listOf("Error fetching CastContext.")
+    strings = listOf("Error fetching CastContext.")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt
@@ -2,9 +2,9 @@ package app.revanced.patches.youtube.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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility

@Name("cast-module-fingerprint")
@@ -15,6 +15,5 @@ import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibi
@MicroGPatchCompatibility
@Version("0.0.1")
 object CastDynamiteModuleFingerprint : MethodFingerprint(
-    null, null, null, null,
-    listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
+    strings = listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt
@@ -2,9 +2,9 @@ package app.revanced.patches.youtube.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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility

@Name("cast-context-fetch-fingerprint")
@@ -15,6 +15,5 @@ import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibi
@MicroGPatchCompatibility
@Version("0.0.1")
 object CastDynamiteModuleV2Fingerprint : MethodFingerprint(
-    null, null, null, null,
-    listOf("Failed to load module via V2: ")
+    strings = listOf("Failed to load module via V2: ")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt
@@ -17,5 +17,8 @@ import org.jf.dexlib2.AccessFlags
@MicroGPatchCompatibility
@Version("0.0.1")
 object GooglePlayUtilityFingerprint : MethodFingerprint(
-    "I", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "L"), null, listOf("This should never happen.", "MetadataValueReader", "com.google.android.gms")
+    "I",
+    AccessFlags.PUBLIC or AccessFlags.STATIC,
+    listOf("L", "L"),
+    strings = listOf("This should never happen.", "MetadataValueReader", "com.google.android.gms")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/IntegrityCheckFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/IntegrityCheckFingerprint.kt
@@ -17,5 +17,6 @@ import org.jf.dexlib2.AccessFlags
@MicroGPatchCompatibility
@Version("0.0.1")
 object IntegrityCheckFingerprint : MethodFingerprint(
-    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "L"), null, listOf("This should never happen.", "GooglePlayServicesUtil", "Google Play Store signature invalid.")
+    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "L"),
+    strings = listOf("This should never happen.", "GooglePlayServicesUtil", "Google Play Store signature invalid.")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/PrimeFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/PrimeFingerprint.kt
@@ -2,9 +2,9 @@ package app.revanced.patches.youtube.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.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility

@Name("google-play-prime-fingerprint")
@@ -15,5 +15,5 @@ import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibi
@MicroGPatchCompatibility
@Version("0.0.1")
 object PrimeFingerprint : MethodFingerprint(
-    null, null, null, null, listOf("com.google.android.GoogleCamera", "com.android.vending")
+    strings = listOf("com.google.android.GoogleCamera", "com.android.vending")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/ServiceCheckFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/ServiceCheckFingerprint.kt
@@ -17,6 +17,6 @@ import org.jf.dexlib2.AccessFlags
@MicroGPatchCompatibility
@Version("0.0.1")
 object ServiceCheckFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "I"), null
-    , listOf("Google Play Services not available", "GooglePlayServices not available due to error ")
+    "V", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "I"),
+    strings = listOf("Google Play Services not available", "GooglePlayServices not available due to error ")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackKidsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackKidsFingerprint.kt
@@ -29,6 +29,5 @@ object MinimizedPlaybackKidsFingerprint : MethodFingerprint(
        Opcode.IGET,
        Opcode.INVOKE_STATIC
    ),
-    null,
-    { it.definingClass.endsWith("MinimizedPlaybackPolicyController;") }
+    customFingerprint = { it.definingClass.endsWith("MinimizedPlaybackPolicyController;") }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackSettingsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackSettingsFingerprint.kt
@@ -20,8 +20,7 @@ import org.jf.dexlib2.Opcode
 object MinimizedPlaybackSettingsFingerprint : MethodFingerprint(
    "L",
    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    null,
-    listOf(
+    opcodes = listOf(
        Opcode.INVOKE_VIRTUAL,
        Opcode.MOVE_RESULT,
        Opcode.INVOKE_VIRTUAL,
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/BottomControlsInflateFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/BottomControlsInflateFingerprint.kt
@@ -18,12 +18,12 @@ import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
@PlayerControlsCompatibility
@Version("0.0.1")
 object BottomControlsInflateFingerprint : MethodFingerprint(
-    null, null, null, listOf(
+    opcodes = listOf(
        Opcode.CHECK_CAST,
        Opcode.INVOKE_VIRTUAL,
        Opcode.MOVE_RESULT_OBJECT
-    ), null,
-    { methodDef ->
+    ),
+    customFingerprint = { methodDef ->
        methodDef.implementation?.instructions?.any { instruction ->
            (instruction as? WideLiteralInstruction)?.wideLiteral == PlayerControlsBytecodePatch.bottomUiContainerResourceId
        } == true
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerControlsVisibilityFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerControlsVisibilityFingerprint.kt
@@ -15,7 +15,9 @@ import app.revanced.patches.youtube.misc.playercontrols.annotation.PlayerControl
@PlayerControlsCompatibility
@Version("0.0.1")
 object PlayerControlsVisibilityFingerprint : MethodFingerprint(
-    "V", null, listOf("Z", "Z"), null, null, { methodDef ->
+    "V",
+    parameters = listOf("Z", "Z"),
+    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("YouTubeControlsOverlay;")
    }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playeroverlay/fingerprint/PlayerOverlaysOnFinishInflateFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playeroverlay/fingerprint/PlayerOverlaysOnFinishInflateFingerprint.kt
@@ -15,7 +15,7 @@ import app.revanced.patches.youtube.misc.playeroverlay.annotation.PlayerOverlays
@PlayerOverlaysHookCompatibility
@Version("0.0.1")
 object PlayerOverlaysOnFinishInflateFingerprint : MethodFingerprint(
-    null, null, null, null, null, { methodDef ->
+    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("YouTubePlayerOverlaysLayout;") && methodDef.name == "onFinishInflate"
    }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playertype/fingerprint/UpdatePlayerTypeFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playertype/fingerprint/UpdatePlayerTypeFingerprint.kt
@@ -22,8 +22,7 @@ import org.jf.dexlib2.Opcode
 object UpdatePlayerTypeFingerprint : MethodFingerprint(
    "V",
    AccessFlags.PUBLIC or AccessFlags.FINAL,
-    null,
-    listOf(
+    opcodes = listOf(
        Opcode.INVOKE_VIRTUAL,
        Opcode.IGET_OBJECT,
        Opcode.IF_NE,
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/annotations/SettingsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/annotations/SettingsCompatibility.kt
@@ -3,11 +3,7 @@ package app.revanced.patches.youtube.misc.settings.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf()
-    )]
-)
+@Compatibility([Package("com.google.android.youtube")])
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class SettingsCompatibility
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/LicenseActivityFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/LicenseActivityFingerprint.kt
@@ -15,12 +15,7 @@ import app.revanced.patches.youtube.misc.settings.annotations.SettingsCompatibil
@SettingsCompatibility
@Version("0.0.1")
 object LicenseActivityFingerprint : MethodFingerprint(
-    null,
-    null,
-    null,
-    null,
-    null,
-    { methodDef ->
+    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("LicenseActivity;") && methodDef.name == "onCreate"
    }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/ReVancedSettingsActivityFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/ReVancedSettingsActivityFingerprint.kt
@@ -15,12 +15,7 @@ import app.revanced.patches.youtube.misc.settings.annotations.SettingsCompatibil
@SettingsCompatibility
@Version("0.0.1")
 object ReVancedSettingsActivityFingerprint : MethodFingerprint(
-    null,
-    null,
-    null,
-    null,
-    null,
-    { methodDef ->
+    customFingerprint = { methodDef ->
        methodDef.definingClass.endsWith("ReVancedSettingActivity;") && methodDef.name == "initializeSettings"
    }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/ThemeSetterFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/ThemeSetterFingerprint.kt
@@ -17,11 +17,8 @@ import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
@Version("0.0.1")
 object ThemeSetterFingerprint : MethodFingerprint(
    "L",
-    null,
-    null,
-    listOf(Opcode.RETURN_OBJECT),
-    null,
-    { methodDef ->
+    opcodes = listOf(Opcode.RETURN_OBJECT),
+    customFingerprint = { methodDef ->
        methodDef.implementation?.instructions?.any {
            it.opcode.ordinal == Opcode.CONST.ordinal && (it as WideLiteralInstruction).wideLiteral == SettingsPatch.appearanceStringId
        } == true
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
semantic-release-bot	7ad2be7f27	chore(release): 2.50.3 [skip ci] ## [2.50.3](https://github.com/revanced/revanced-patches/compare/v2.50.2...v2.50.3) (2022-09-01) ### Bug Fixes * partial ad blockage in `tiktok-ads` patch ([#420](https://github.com/revanced/revanced-patches/issues/420)) ([bc6d192](`1702322671`))	2022-09-01 17:13:54 +00:00
d4rkk3y	1702322671	fix: partial ad blockage in `tiktok-ads` patch (#420 )	2022-09-01 19:12:16 +02:00
semantic-release-bot	9c9bfbd593	chore(release): 2.50.2 [skip ci] ## [2.50.2](https://github.com/revanced/revanced-patches/compare/v2.50.1...v2.50.2) (2022-08-31) ### Bug Fixes * wrong dependency version ([1e63a57](`3df662a39c`))	2022-08-31 18:44:22 +00:00
oSumAtrIX	3df662a39c	fix: wrong dependency version Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>	2022-08-31 20:42:18 +02:00
oSumAtrIX	572c110a6e	refactor: make use of named arguments	2022-08-31 20:38:38 +02:00
oSumAtrIX	0be9f00915	build: bump patcher dependency version Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>	2022-08-31 20:36:57 +02:00
semantic-release-bot	0b6f643ff3	chore(release): 2.50.1 [skip ci] ## [2.50.1](https://github.com/revanced/revanced-patches/compare/v2.50.0...v2.50.1) (2022-08-31) ### Bug Fixes * resolve fingerprint in `premium-icon-reddit` patch ([#413](https://github.com/revanced/revanced-patches/issues/413)) ([60ec2c6](`1989d53938`))	2022-08-31 16:04:43 +00:00
Technikte	1989d53938	fix: resolve fingerprint in `premium-icon-reddit` patch (#413 )	2022-08-31 18:03:03 +02:00
semantic-release-bot	ac1acf10e6	chore(release): 2.50.0 [skip ci] # [2.50.0](https://github.com/revanced/revanced-patches/compare/v2.49.0...v2.50.0) (2022-08-31) ### Features * `tiktok-download` and `tiktok-seekbar` patch ([#405](https://github.com/revanced/revanced-patches/issues/405)) ([f36e000](`0ad686da21`))	2022-08-31 15:59:52 +00:00
d4rkk3y	0ad686da21	feat: `tiktok-download` and `tiktok-seekbar` patch (#405 )	2022-08-31 17:57:51 +02:00