refactor: make use of named arguments

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")
 )

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,
+    strings = listOf("Error fetching CastContext.")
-    listOf("Error fetching CastContext.")
 )

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,
+    strings = listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
-    listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
 )

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,
+    strings = listOf("Failed to load module via V2: ")
-    listOf("Failed to load module via V2: ")
 )

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"
+    )
 )

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")
 )

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")
 )

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(
+@Compatibility([Package("com.reddit.frontpage")])
-    [Package(
-        "com.reddit.frontpage", arrayOf()
-    )]
-)
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 internal annotation class GeneralAdsCompatibility

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(
+@Compatibility([Package("com.reddit.frontpage")])
-    [Package(
-        "com.reddit.frontpage", arrayOf()
-    )]
-)
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 internal annotation class PremiumIconCompatibility

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,
+    customFingerprint = { methodDef ->
-    null,
-    null,
-    null,
-    { methodDef ->
         methodDef.definingClass.endsWith("MyAccount;") && methodDef.name == "isPremiumSubscriber"
     }
 )

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.ss.android.ugc.trill"),
-        Package("com.zhiliaoapp.musically", arrayOf())
+        Package("com.zhiliaoapp.musically")
     ]
 )
 @Target(AnnotationTarget.CLASS)

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"
     }
 )

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

@@ -5,8 +5,8 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [
-        Package("com.ss.android.ugc.trill", arrayOf()),
+        Package("com.ss.android.ugc.trill"),
-        Package("com.zhiliaoapp.musically", arrayOf())
+        Package("com.zhiliaoapp.musically")
     ]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint.kt

@@ -15,10 +15,7 @@ import org.jf.dexlib2.AccessFlags
 object ACLCommonShareFingerprint : MethodFingerprint(
     "I",
     AccessFlags.PUBLIC or AccessFlags.FINAL,
-    null,
+    customFingerprint = { methodDef ->
-    null,
-    null,
-    { methodDef ->
         methodDef.definingClass.endsWith("/ACLCommonShare;") &&
                 methodDef.name == "getCode"
     }

src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint2.kt

@@ -15,10 +15,7 @@ import org.jf.dexlib2.AccessFlags
 object ACLCommonShareFingerprint2 : MethodFingerprint(
     "I",
     AccessFlags.PUBLIC or AccessFlags.FINAL,
-    null,
+    customFingerprint = { methodDef ->
-    null,
-    null,
-    { methodDef ->
         methodDef.definingClass.endsWith("/ACLCommonShare;") &&
                 methodDef.name == "getShowType"
     }

src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/fingerprints/ACLCommonShareFingerprint3.kt

@@ -15,10 +15,7 @@ import org.jf.dexlib2.AccessFlags
 object ACLCommonShareFingerprint3 : MethodFingerprint(
     "I",
     AccessFlags.PUBLIC or AccessFlags.FINAL,
-    null,
+    customFingerprint = { methodDef ->
-    null,
-    null,
-    { methodDef ->
         methodDef.definingClass.endsWith("/ACLCommonShare;") &&
                 methodDef.name == "getTranscode"
     }

src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/annotations/SeekbarCompatibility.kt

@@ -5,8 +5,8 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [
-        Package("com.ss.android.ugc.trill", arrayOf()),
+        Package("com.ss.android.ugc.trill"),
-        Package("com.zhiliaoapp.musically", arrayOf())
+        Package("com.zhiliaoapp.musically")
     ]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/fingerprints/AwemeGetVideoControlFingerprint.kt

@@ -14,10 +14,7 @@ import org.jf.dexlib2.AccessFlags
 object AwemeGetVideoControlFingerprint : MethodFingerprint(
     "L",
     AccessFlags.PUBLIC.value,
-    null,
+   customFingerprint = { methodDef ->
-    null,
+       methodDef.definingClass.endsWith("/Aweme;") && methodDef.name == "getVideoControl"
-    null,
+   }
-    { methodDef ->
-        methodDef.definingClass.endsWith("/Aweme;") && methodDef.name == "getVideoControl"
-    }
 )

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(
+@Compatibility([Package("com.twitter.android")])
-    [Package(
-        "com.twitter.android", arrayOf()
-    )]
-)
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 internal annotation class TimelineAdsCompatibility

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

@@ -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"),
+    ), strings = listOf("tweetPromotedMetadata", "promotedMetadata", "hasModeratedReplies", "conversationAnnotation"),
-    { methodDef -> methodDef.name == "parseField" }
+    customFingerprint = { methodDef -> methodDef.name == "parseField" }
 )

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(
+@Compatibility([Package("de.dwd.warnapp")])
-    [Package(
-        "de.dwd.warnapp", arrayOf()
-    )]
-)
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 internal annotation class FirebaseGetCertPatchCompatibility

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

@@ -14,10 +14,7 @@ import app.revanced.patches.warnwetter.misc.firebasegetcert.annotations.Firebase
 @Version("0.0.1")
 object GetMessagingCertFingerprint : MethodFingerprint(
     "Ljava/lang/String;",
-    null,
+    strings = listOf(
-    null,
-    null,
-    listOf(
         "ContentValues",
         "Could not get fingerprint hash for package: ",
         "No such package: "

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

@@ -14,10 +14,7 @@ import app.revanced.patches.warnwetter.misc.firebasegetcert.annotations.Firebase
 @Version("0.0.1")
 object GetReqistrationCertFingerprint : MethodFingerprint(
     "Ljava/lang/String;",
-    null,
+    strings = listOf(
-    null,
-    null,
-    listOf(
         "FirebaseRemoteConfig",
         "Could not get fingerprint hash for package: ",
         "No such package: "

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(
+@Compatibility([Package("de.dwd.warnapp")])
-    [Package(
-        "de.dwd.warnapp", arrayOf()
-    )]
-)
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 internal annotation class PromoCodeUnlockCompatibility

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

@@ -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,
+    customFingerprint = { methodDef ->
-    null,
-    null,
-    null,
-    null,
-    { methodDef ->
         methodDef.definingClass.endsWith("PromoTokenVerification;") && methodDef.name == "isValid"
     }
 )

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,
+    strings = listOf("vibrator")
-    null,
-    listOf("vibrator"),
-    null
 )

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(),
+    strings = listOf("player_overlay_info_card_teaser"),
-    null,
-    listOf("player_overlay_info_card_teaser"),
-    null
 )

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")
 )

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>"
     }
 )

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>"
     }
 )

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(

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(
+@Compatibility([Package("com.google.android.youtube")])
-    [Package(
-        "com.google.android.youtube", arrayOf()
-    )]
-)
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 internal annotation class AmoledCompatibility

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,
+    opcodes = listOf(
-    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,
+    customFingerprint = { it.definingClass.endsWith("WillAutonavInformer;") }
-    { it.definingClass.endsWith("WillAutonavInformer;") }
 )

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"),
+    strings = listOf("1.0x"),
-    { methodDef ->
+    customFingerprint = { methodDef ->
         methodDef.definingClass.endsWith("YouTubeControlsOverlay;")
     }
 )

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(
+@Compatibility([Package("com.google.android.youtube")])
-    [Package(
-        "com.google.android.youtube", arrayOf()
-    )]
-)
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 internal annotation class PremiumHeadingCompatibility

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(
+@Compatibility([Package("com.google.android.youtube")])
-    [Package(
-        "com.google.android.youtube", arrayOf()
-    )]
-)
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 internal annotation class CustomBrandingCompatibility

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(
+@Compatibility([Package("com.google.android.youtube")])
-    [Package(
-        "com.google.android.youtube", arrayOf()
-    )]
-)
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 internal annotation class CastButtonCompatibility

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,
+    opcodes = listOf(
-    null,
-    null,
-    listOf(
         Opcode.IGET_BOOLEAN
     )
 )

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,
+    parameters = listOf("L", "L"),
-    null,
+    opcodes = listOf(
-    listOf("L", "L"),
-    listOf(
         Opcode.GOTO,
         Opcode.IGET_BOOLEAN,
         Opcode.IF_EQ,
@@ -27,6 +25,5 @@ object FullscreenViewAdderParentFingerprint : MethodFingerprint(
         Opcode.CONST_4,
         Opcode.INVOKE_VIRTUAL,
     ),
-    null,
+    customFingerprint = { it.definingClass.endsWith("FullscreenEngagementPanelOverlay;") }
-    { it.definingClass.endsWith("FullscreenEngagementPanelOverlay;") }
 )

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,
+    access = AccessFlags.PROTECTED or AccessFlags.FINAL, parameters = listOf("L", "L"),
-    listOf("multiReelDismissalCallback", "reelItemRenderers", "reelDismissalInfo")
+    strings = listOf("multiReelDismissalCallback", "reelItemRenderers", "reelDismissalInfo")
 )

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,
+    strings = listOf("like/dislike")
-    null,
-    listOf("like/dislike")
 )

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,
+     strings = listOf("like/like")
-    null,
-    listOf("like/like")
 )

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,
+    strings = listOf("like/removelike")
-    null,
-    listOf("like/removelike")
 )

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,
+    strings = listOf("TextComponentSpec: No converter for extension: ")
-    null,
-    null,
-    null,
-    listOf("TextComponentSpec: No converter for extension: ")
 )

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,
+    "V",
-    null,
+    strings = listOf("timed_markers_width")
-    listOf("timed_markers_width")
 )

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;") }
 )

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,
+    opcodes = listOf(Opcode.INVOKE_DIRECT_RANGE, Opcode.IGET_OBJECT),
-    listOf(Opcode.INVOKE_DIRECT_RANGE, Opcode.IGET_OBJECT),
+    strings = listOf("Media progress reported outside media playback: ")
-    listOf("Media progress reported outside media playback: ")
 )

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."
     ),

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,
+    customFingerprint = { methodDef -> methodDef.returnType.endsWith("YouTubePlayerOverlaysLayout;") }
-    null,
-    { methodDef -> methodDef.returnType.endsWith("YouTubePlayerOverlaysLayout;") }
 )

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,
+    customFingerprint = custom@{ methodDef ->
-    null,
-    null,
-    null,
-    custom@{ methodDef ->
         val instructions = methodDef.implementation?.instructions!!
         val instructionCount = instructions.count()
 

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,
+    strings = listOf("Attempting to seek during an ad")
-    null,
-    null,
-    null,
-    listOf("Attempting to seek during an ad")
 )

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,
+    opcodes = listOf(
-    listOf(
         Opcode.MOVE_RESULT_WIDE,
         Opcode.CMP_LONG,
         Opcode.IF_LEZ,

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,
+    strings = listOf("MedialibPlayerTimeInfo{currentPositionMillis=")
-    listOf("MedialibPlayerTimeInfo{currentPositionMillis=")
 )

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,
+    "Z", AccessFlags.STATIC or AccessFlags.PUBLIC,
-    listOf(Opcode.RETURN), // anchor to insert the instruction
+    opcodes = listOf(Opcode.RETURN), // anchor to insert the instruction
 )

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,
+    "Z", AccessFlags.FINAL or AccessFlags.PRIVATE,
-    listOf(Opcode.RETURN), // anchor to insert the instruction
+    opcodes = listOf(Opcode.RETURN), // anchor to insert the instruction
 )

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
 )

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")
 )

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")
 )

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),
+    "L", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L"),
-    null, null
+    listOf(Opcode.IF_NEZ, Opcode.SGET_OBJECT, Opcode.IGET_OBJECT, Opcode.INVOKE_STATIC)
 )

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,
+    "V", AccessFlags.PRIVATE or AccessFlags.FINAL, listOf("L"),
-    listOf("FEhistory", "FEmy_videos", "FEpurchases")
+    strings = listOf("FEhistory", "FEmy_videos", "FEpurchases")
 )

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
 )

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,
+    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L"),
-    listOf("VIDEO_QUALITIES_QUICK_MENU_BOTTOM_SHEET_FRAGMENT")
+    strings = listOf("VIDEO_QUALITIES_QUICK_MENU_BOTTOM_SHEET_FRAGMENT")
 )

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()}
 )

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,
+    strings = listOf(
-    null,
+        "play() called when the player wasn't loaded.",
-    listOf("play() called when the player wasn't loaded.", "play() blocked because Background Playability failed"),
+        "play() blocked because Background Playability failed"
-    null
+    )
 )

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.google.android.youtube"),
-        Package("com.vanced.android.youtube", arrayOf())
+        Package("com.vanced.android.youtube")
     ]
 )
 @Target(AnnotationTarget.CLASS)

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,
+    parameters = listOf("L", "L", "L"),
-    null,
+    opcodes = listOf(Opcode.MOVE_RESULT_OBJECT, Opcode.INVOKE_VIRTUAL),
-    listOf("L", "L", "L"),
+    strings = listOf("(Linux; U; Android "),
-    listOf(Opcode.MOVE_RESULT_OBJECT, Opcode.INVOKE_VIRTUAL),
-    listOf("(Linux; U; Android "),
 )

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

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,
+    opcodes = listOf(
-    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#")
 )

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(
+@Compatibility([Package("com.google.android.youtube")])
-    [Package(
-        "com.google.android.youtube", arrayOf()
-    )]
-)
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 internal annotation class EnableDebuggingCompatibility

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 ->

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,
+    "V",
-    listOf(
+    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"),
 )

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,
+    strings = listOf("Application creation")
-    listOf("Application creation")
 )

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(
+@Compatibility([Package("com.google.android.youtube")])
-    [Package(
-        "com.google.android.youtube", arrayOf()
-    )]
-)
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 internal annotation class FixLocaleConfigErrorCompatibility

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,
+    strings = listOf("Error fetching CastContext.")
-    listOf("Error fetching CastContext.")
 )

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,
+    strings = listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
-    listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
 )

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,
+    strings = listOf("Failed to load module via V2: ")
-    listOf("Failed to load module via V2: ")
 )

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")
 )

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.")
 )

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")
 )

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
+    "V", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L", "I"),
-    , listOf("Google Play Services not available", "GooglePlayServices not available due to error ")
+    strings = listOf("Google Play Services not available", "GooglePlayServices not available due to error ")
 )

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,
+    customFingerprint = { it.definingClass.endsWith("MinimizedPlaybackPolicyController;") }
-    { it.definingClass.endsWith("MinimizedPlaybackPolicyController;") }
 )

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,
+    opcodes = listOf(
-    listOf(
         Opcode.INVOKE_VIRTUAL,
         Opcode.MOVE_RESULT,
         Opcode.INVOKE_VIRTUAL,

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

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;")
     }
 )

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"
     }
 )

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,
+    opcodes = listOf(
-    listOf(
         Opcode.INVOKE_VIRTUAL,
         Opcode.IGET_OBJECT,
         Opcode.IF_NE,

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(
+@Compatibility([Package("com.google.android.youtube")])
-    [Package(
-        "com.google.android.youtube", arrayOf()
-    )]
-)
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 internal annotation class SettingsCompatibility

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,
+    customFingerprint = { methodDef ->
-    null,
-    null,
-    null,
-    null,
-    { methodDef ->
         methodDef.definingClass.endsWith("LicenseActivity;") && methodDef.name == "onCreate"
     }
 )

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,
+    customFingerprint = { methodDef ->
-    null,
-    null,
-    null,
-    null,
-    { methodDef ->
         methodDef.definingClass.endsWith("ReVancedSettingActivity;") && methodDef.name == "initializeSettings"
     }
 )

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,
+    opcodes = listOf(Opcode.RETURN_OBJECT),
-    null,
+    customFingerprint = { methodDef ->
-    listOf(Opcode.RETURN_OBJECT),
-    null,
-    { methodDef ->
         methodDef.implementation?.instructions?.any {
             it.opcode.ordinal == Opcode.CONST.ordinal && (it as WideLiteralInstruction).wideLiteral == SettingsPatch.appearanceStringId
         } == true

src/main/kotlin/app/revanced/patches/youtube/misc/videobuffer/fingerprints/MaxBufferFingerprint.kt

@@ -21,12 +21,11 @@ import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction
 object MaxBufferFingerprint : MethodFingerprint(
     "I", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(),
     listOf(Opcode.SGET_OBJECT, Opcode.IGET, Opcode.IF_EQZ, Opcode.RETURN),
-    null,
     customFingerprint = { methodDef ->
-        methodDef.definingClass.equals("Lcom/google/android/libraries/youtube/innertube/model/media/PlayerConfigModel;")
+        methodDef.definingClass == "Lcom/google/android/libraries/youtube/innertube/model/media/PlayerConfigModel;"
                 && methodDef.implementation!!.instructions.any {
             ((it as? NarrowLiteralInstruction)?.narrowLiteral == 120000)
-                    && methodDef.name.equals("r")
+                    && methodDef.name == "r"
         }
     }
 )

src/main/kotlin/app/revanced/patches/youtube/misc/videobuffer/fingerprints/PlaybackBufferFingerprint.kt

@@ -21,9 +21,8 @@ import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction
 object PlaybackBufferFingerprint : MethodFingerprint(
     "I", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(),
     listOf(Opcode.IF_LEZ, Opcode.RETURN),
-    null,
     customFingerprint = { methodDef ->
-        methodDef.definingClass.equals("Lcom/google/android/libraries/youtube/innertube/model/media/PlayerConfigModel;")
+        methodDef.definingClass == "Lcom/google/android/libraries/youtube/innertube/model/media/PlayerConfigModel;"
                 && methodDef.implementation!!.instructions.any {
             ((it as? NarrowLiteralInstruction)?.narrowLiteral == 1600)
         }

src/main/kotlin/app/revanced/patches/youtube/misc/videobuffer/fingerprints/ReBufferFingerprint.kt

@@ -21,9 +21,8 @@ import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction
 object ReBufferFingerprint : MethodFingerprint(
     "I", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(),
     listOf(Opcode.IF_LEZ, Opcode.RETURN),
-    null,
     customFingerprint = { methodDef ->
-        methodDef.definingClass.equals("Lcom/google/android/libraries/youtube/innertube/model/media/PlayerConfigModel;")
+        methodDef.definingClass == "Lcom/google/android/libraries/youtube/innertube/model/media/PlayerConfigModel;"
                 && methodDef.implementation!!.instructions.any {
             ((it as? NarrowLiteralInstruction)?.narrowLiteral == 5000)
         }