chore: migrate to new changes from the patcher

src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/fingerprints/AutoRepeatFingerprint.kt

@@ -3,25 +3,13 @@ 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.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
 
 @Name("auto-repeat-fingerprint")
-@MatchingMethod(
-    "Laamp;", "ae"
-)
-@FuzzyPatternScanMethod(2)
 @AutoRepeatCompatibility
 @Version("0.0.1")
-//Finds method:
-/*
-public final void ae() {
-        aq(aabj.ENDED);
-    }
- */
 object AutoRepeatFingerprint : MethodFingerprint(
     "V",
     AccessFlags.PUBLIC or AccessFlags.FINAL,

src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/fingerprints/AutoRepeatParentFingerprint.kt

@@ -3,17 +3,11 @@ 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.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
 
 @Name("auto-repeat-parent-fingerprint")
-@MatchingMethod(
-    "Laamp;", "E"
-)
-@FuzzyPatternScanMethod(2)
 @AutoRepeatCompatibility
 @Version("0.0.1")
 object AutoRepeatParentFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/patch/AutoRepeatPatch.kt

@@ -3,16 +3,16 @@ package app.revanced.patches.youtube.misc.autorepeat.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.removeInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.youtube.misc.autorepeat.annotations.AutoRepeatCompatibility
 import app.revanced.patches.youtube.misc.autorepeat.fingerprints.AutoRepeatFingerprint
 import app.revanced.patches.youtube.misc.autorepeat.fingerprints.AutoRepeatParentFingerprint
@@ -32,7 +32,7 @@ class AutoRepeatPatch : BytecodePatch(
         AutoRepeatParentFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         SettingsPatch.PreferenceScreen.MISC.addPreferences(
             SwitchPreference(
                 "revanced_pref_auto_repeat",
@@ -49,7 +49,7 @@ class AutoRepeatPatch : BytecodePatch(
 
         //this one needs to be called when app/revanced/integrations/patches/AutoRepeatPatch;->shouldAutoRepeat() returns true
         val playMethod = parentResult.mutableMethod
-        AutoRepeatFingerprint.resolve(data, parentResult.classDef)
+        AutoRepeatFingerprint.resolve(context, parentResult.classDef)
         //String is: Laamp;->E()V
         val methodToCall = playMethod.definingClass + "->" + playMethod.name + "()V";
 

src/main/kotlin/app/revanced/patches/youtube/misc/clientspoof/fingerprints/UserAgentHeaderBuilderFingerprint.kt

@@ -2,14 +2,14 @@ package app.revanced.patches.youtube.misc.clientspoof.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
+
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.clientspoof.annotations.ClientSpoofCompatibility
 import org.jf.dexlib2.Opcode
 
 @Name("user-agent-header-builder-fingerprint")
 @ClientSpoofCompatibility
-@DirectPatternScanMethod
+
 @Version("0.0.1")
 object UserAgentHeaderBuilderFingerprint : MethodFingerprint(
     parameters = listOf("L", "L", "L"),

src/main/kotlin/app/revanced/patches/youtube/misc/clientspoof/patch/ClientSpoofPatch.kt

@@ -3,13 +3,13 @@ package app.revanced.patches.youtube.misc.clientspoof.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.youtube.misc.clientspoof.annotations.ClientSpoofCompatibility
 import app.revanced.patches.youtube.misc.clientspoof.fingerprints.UserAgentHeaderBuilderFingerprint
 import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
@@ -22,7 +22,7 @@ import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
 class ClientSpoofPatch : BytecodePatch(
     listOf(UserAgentHeaderBuilderFingerprint)
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val result = UserAgentHeaderBuilderFingerprint.result!!
         val method = result.mutableMethod
 

src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/fingerprints/SpeedArrayGeneratorFingerprint.kt

@@ -4,16 +4,12 @@ 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.misc.customplaybackspeed.annotations.CustomPlaybackSpeedCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("speed-array-generator-fingerprint")
-@MatchingMethod(
-    "Lzdj;", "d"
-)
 @FuzzyPatternScanMethod(2)
 @CustomPlaybackSpeedCompatibility
 @Version("0.0.1")

src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/fingerprints/SpeedLimiterFingerprint.kt

@@ -3,18 +3,14 @@ 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
 
 @Name("speed-limiter-fingerprint")
-@MatchingMethod(
-    "Lxgy;", "y"
-)
-@FuzzyPatternScanMethod(2) 
+@FuzzyPatternScanMethod(2)
 @CustomPlaybackSpeedCompatibility
 @Version("0.0.1")
 object SpeedLimiterFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/fingerprints/VideoSpeedPatchFingerprint.kt

@@ -2,15 +2,11 @@ package app.revanced.patches.youtube.misc.customplaybackspeed.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.youtube.misc.customplaybackspeed.annotations.CustomPlaybackSpeedCompatibility
 import org.jf.dexlib2.Opcode
 
 @Name("video-speed-patch-fingerprint")
-@MatchingMethod(
-    "Lapp/revanced/integrations/patches/VideoSpeedPatch;", "<init>"
-)
 @CustomPlaybackSpeedCompatibility
 @Version("0.0.1")
 object VideoSpeedPatchFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/patch/CustomPlaybackSpeedPatch.kt

@@ -3,13 +3,12 @@ package app.revanced.patches.youtube.misc.customplaybackspeed.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.replaceInstruction
 import app.revanced.patcher.patch.*
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.youtube.misc.customplaybackspeed.annotations.CustomPlaybackSpeedCompatibility
 import app.revanced.patches.youtube.misc.customplaybackspeed.fingerprints.SpeedArrayGeneratorFingerprint
 import app.revanced.patches.youtube.misc.customplaybackspeed.fingerprints.SpeedLimiterFingerprint
@@ -37,7 +36,7 @@ class CustomPlaybackSpeedPatch : BytecodePatch(
     )
 ) {
 
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         //TODO: include setting to skip remembering the new speed
 
         val speedLimitMin = minVideoSpeed!!.toFloat()

src/main/kotlin/app/revanced/patches/youtube/misc/enabledebugging/patch/EnableDebuggingPatch.kt

@@ -3,12 +3,12 @@ package app.revanced.patches.youtube.misc.enabledebugging.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.ResourcePatch
 import app.revanced.patches.youtube.misc.enabledebugging.annotations.EnableDebuggingCompatibility
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
@@ -22,8 +22,8 @@ import org.w3c.dom.Element
 @Description("Enables app debugging by patching the manifest file.")
 @EnableDebuggingCompatibility
 @Version("0.0.1")
-class EnableDebuggingPatch : ResourcePatch() {
-    override fun execute(data: ResourceData): PatchResult {
+class EnableDebuggingPatch : ResourcePatch {
+    override fun execute(context: ResourceContext): PatchResult {
         SettingsPatch.PreferenceScreen.MISC.addPreferences(
             SwitchPreference(
                 "revanced_debug_enabled",
@@ -35,7 +35,7 @@ class EnableDebuggingPatch : ResourcePatch() {
         )
 
         // create an xml editor instance
-        data.xmlEditor["AndroidManifest.xml"].use { dom ->
+        context.xmlEditor["AndroidManifest.xml"].use { dom ->
             // get the application node
             val applicationNode = dom
                 .file

src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/fingerprints/HDRBrightnessFingerprint.kt

@@ -2,15 +2,11 @@ package app.revanced.patches.youtube.misc.hdrbrightness.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.youtube.misc.hdrbrightness.annotations.HDRBrightnessCompatibility
 import org.jf.dexlib2.Opcode
 
 @Name("hdr-brightness-fingerprint")
-@MatchingMethod(
-    "Lyls;", "c"
-)
 @HDRBrightnessCompatibility
 @Version("0.0.1")
 object HDRBrightnessFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/youtube/misc/hdrbrightness/patch/HDRBrightnessPatch.kt

@@ -3,13 +3,13 @@ package app.revanced.patches.youtube.misc.hdrbrightness.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.youtube.misc.hdrbrightness.annotations.HDRBrightnessCompatibility
 import app.revanced.patches.youtube.misc.hdrbrightness.fingerprints.HDRBrightnessFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
@@ -29,7 +29,7 @@ import org.jf.dexlib2.iface.reference.FieldReference
 class HDRBrightnessPatch : BytecodePatch(
     listOf(HDRBrightnessFingerprint)
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         SettingsPatch.PreferenceScreen.MISC.addPreferences(
             SwitchPreference(
                 "revanced_pref_hdr_autobrightness",

src/main/kotlin/app/revanced/patches/youtube/misc/integrations/fingerprints/InitFingerprint.kt

@@ -2,14 +2,10 @@ 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.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.integrations.annotations.IntegrationsCompatibility
 
 @Name("init-fingerprint")
-@MatchingMethod(
-    "Lacuu", "onCreate"
-)
 @IntegrationsCompatibility
 @Version("0.0.1")
 object InitFingerprint : MethodFingerprint(

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

@@ -3,13 +3,13 @@ package app.revanced.patches.youtube.misc.integrations.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.extensions.or
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.youtube.misc.integrations.annotations.IntegrationsCompatibility
@@ -27,8 +27,8 @@ class IntegrationsPatch : BytecodePatch(
         InitFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
-        if (data.findClass("Lapp/revanced/integrations/utils/ReVancedUtils") == null)
+    override fun execute(context: BytecodeContext): PatchResult {
+        if (context.findClass("Lapp/revanced/integrations/utils/ReVancedUtils") == null)
             return PatchResultError("Integrations have not been merged yet. This patch can not succeed without the integrations.")
 
         val result = InitFingerprint.result!!

src/main/kotlin/app/revanced/patches/youtube/misc/manifest/patch/FixLocaleConfigErrorPatch.kt

@@ -3,10 +3,10 @@ package app.revanced.patches.youtube.misc.manifest.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.impl.ResourcePatch
+import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patches.youtube.misc.manifest.annotations.FixLocaleConfigErrorCompatibility
 import org.w3c.dom.Element
 
@@ -14,10 +14,10 @@ import org.w3c.dom.Element
 @Description("Fixes an error when building the resources by patching the manifest file.")
 @FixLocaleConfigErrorCompatibility
 @Version("0.0.1")
-class FixLocaleConfigErrorPatch : ResourcePatch() {
-    override fun execute(data: ResourceData): PatchResult {
+class FixLocaleConfigErrorPatch : ResourcePatch {
+    override fun execute(context: ResourceContext): PatchResult {
         // create an xml editor instance
-        data.xmlEditor["AndroidManifest.xml"].use {
+        context.xmlEditor["AndroidManifest.xml"].use {
             // edit the application nodes attribute...
             val applicationNode = it
                 .file

src/main/kotlin/app/revanced/patches/youtube/misc/mapping/patch/ResourceMappingResourcePatch.kt

@@ -3,10 +3,10 @@ package app.revanced.patches.youtube.misc.mapping.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.impl.ResourcePatch
+import app.revanced.patcher.patch.ResourcePatch
 import org.w3c.dom.Element
 import java.util.*
 import java.util.concurrent.Executors
@@ -16,7 +16,7 @@ import java.util.concurrent.TimeUnit
 @Name("resource-mapping")
 @Description("Creates a map of public resources.")
 @Version("0.0.1")
-class ResourceMappingResourcePatch : ResourcePatch() {
+class ResourceMappingResourcePatch : ResourcePatch {
     companion object {
         internal lateinit var resourceMappings: List<ResourceElement>
             private set
@@ -25,16 +25,16 @@ class ResourceMappingResourcePatch : ResourcePatch() {
         private val threadPoolExecutor = Executors.newFixedThreadPool(THREAD_COUNT)
     }
 
-    override fun execute(data: ResourceData): PatchResult {
+    override fun execute(context: ResourceContext): PatchResult {
         // save the file in memory to concurrently read from
-        val resourceXmlFile = data["res/values/public.xml"].readBytes()
+        val resourceXmlFile = context["res/values/public.xml"].readBytes()
 
         // create a synchronized list to store the resource mappings
         val mappings = Collections.synchronizedList(mutableListOf<ResourceElement>())
 
         for (threadIndex in 0 until THREAD_COUNT) {
             threadPoolExecutor.execute thread@{
-                data.xmlEditor[resourceXmlFile.inputStream()].use { editor ->
+                context.xmlEditor[resourceXmlFile.inputStream()].use { editor ->
                     val resources = editor.file.documentElement.childNodes
                     val resourcesLength = resources.length
                     val jobSize = resourcesLength / THREAD_COUNT

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

@@ -2,16 +2,11 @@ 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.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")
-@MatchingMethod(
-    "Lvvz;", "a"
-)
-@DirectPatternScanMethod
 @MicroGPatchCompatibility
 @Version("0.0.1")
 object CastContextFetchFingerprint : MethodFingerprint(

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

@@ -2,16 +2,11 @@ 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.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")
-@MatchingMethod(
-    "Llqh;", "c"
-)
-@DirectPatternScanMethod
 @MicroGPatchCompatibility
 @Version("0.0.1")
 object CastDynamiteModuleFingerprint : MethodFingerprint(

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

@@ -2,16 +2,11 @@ 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.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")
-@MatchingMethod(
-    "Lmcf;", "c"
-)
-@DirectPatternScanMethod
 @MicroGPatchCompatibility
 @Version("0.0.1")
 object CastDynamiteModuleV2Fingerprint : MethodFingerprint(

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

@@ -3,17 +3,11 @@ package app.revanced.patches.youtube.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.annotation.FuzzyPatternScanMethod
-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
 import org.jf.dexlib2.AccessFlags
 
 @Name("google-play-utility-fingerprint")
-@MatchingMethod(
-    "Lmco;", "b"
-)
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @MicroGPatchCompatibility
 @Version("0.0.1")
 object GooglePlayUtilityFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/youtube/misc/microg/fingerprints/IntegrityCheckFingerprint.kt

@@ -3,17 +3,11 @@ package app.revanced.patches.youtube.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.annotation.FuzzyPatternScanMethod
-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
 import org.jf.dexlib2.AccessFlags
 
 @Name("google-play-sig-check-fingerprint")
-@MatchingMethod(
-    "Leae;", "d"
-)
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @MicroGPatchCompatibility
 @Version("0.0.1")
 object IntegrityCheckFingerprint : MethodFingerprint(

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

@@ -2,16 +2,11 @@ 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.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")
-@MatchingMethod(
-    "Lpag;", "d"
-)
-@DirectPatternScanMethod
 @MicroGPatchCompatibility
 @Version("0.0.1")
 object PrimeFingerprint : MethodFingerprint(

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

@@ -3,17 +3,11 @@ package app.revanced.patches.youtube.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.annotation.FuzzyPatternScanMethod
-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
 import org.jf.dexlib2.AccessFlags
 
 @Name("google-play-service-checker-fingerprint")
-@MatchingMethod(
-    "Lmco;", "d"
-)
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @MicroGPatchCompatibility
 @Version("0.0.1")
 object ServiceCheckFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/bytecode/MicroGBytecodePatch.kt

@@ -3,11 +3,11 @@ package app.revanced.patches.youtube.misc.microg.patch.bytecode
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.youtube.layout.castbutton.patch.HideCastButtonPatch
 import app.revanced.patches.youtube.misc.clientspoof.patch.ClientSpoofPatch
 import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
@@ -40,10 +40,10 @@ class MicroGBytecodePatch : BytecodePatch(
         PrimeFingerprint,
     )
 ) {
-    override fun execute(data: BytecodeData) =
+    override fun execute(context: BytecodeContext) =
         // apply common microG patch
         MicroGBytecodeHelper.patchBytecode(
-            data, arrayOf(
+            context, arrayOf(
                 MicroGBytecodeHelper.packageNameTransform(
                     PACKAGE_NAME,
                     REVANCED_PACKAGE_NAME

src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/resource/MicroGResourcePatch.kt

@@ -3,12 +3,11 @@ package app.revanced.patches.youtube.misc.microg.patch.resource
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.impl.ResourcePatch
-import app.revanced.patches.music.misc.microg.shared.Constants
 import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
 import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
 import app.revanced.patches.youtube.misc.microg.shared.Constants.PACKAGE_NAME
@@ -29,8 +28,8 @@ import app.revanced.util.microg.MicroGResourceHelper
 @Description("Resource patch to allow YouTube ReVanced to run without root and under a different package name.")
 @MicroGPatchCompatibility
 @Version("0.0.1")
-class MicroGResourcePatch : ResourcePatch() {
-    override fun execute(data: ResourceData): PatchResult {
+class MicroGResourcePatch : ResourcePatch {
+    override fun execute(context: ResourceContext): PatchResult {
         SettingsPatch.addPreference(
             Preference(
                 StringResource("microg_settings", "MicroG Settings"),
@@ -42,7 +41,7 @@ class MicroGResourcePatch : ResourcePatch() {
 
         // update manifest
         MicroGResourceHelper.patchManifest(
-            data,
+            context,
             PACKAGE_NAME,
             REVANCED_PACKAGE_NAME,
             REVANCED_APP_NAME
@@ -50,7 +49,7 @@ class MicroGResourcePatch : ResourcePatch() {
 
         // add metadata to manifest
         MicroGManifestHelper.addSpoofingMetadata(
-            data,
+            context,
             SPOOFED_PACKAGE_NAME,
             SPOOFED_PACKAGE_SIGNATURE
         )

src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackKidsFingerprint.kt

@@ -3,16 +3,12 @@ package app.revanced.patches.youtube.misc.minimizedplayback.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.minimizedplayback.annotations.MinimizedPlaybackCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("minimized-playback-kids-fingerprint")
-@MatchingMethod(
-    "LMinimizedPlaybackPolicyController;", "k"
-)
 @MinimizedPlaybackCompatibility
 @Version("0.0.1")
 object MinimizedPlaybackKidsFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackManagerFingerprint.kt

@@ -3,17 +3,13 @@ package app.revanced.patches.youtube.misc.minimizedplayback.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.minimizedplayback.annotations.MinimizedPlaybackCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("minimized-playback-manager-fingerprint")
-@MatchingMethod(
-    "Lyuf", "n"
-)
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @MinimizedPlaybackCompatibility
 @Version("0.0.1")

src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackSettingsFingerprint.kt

@@ -4,16 +4,12 @@ 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.misc.minimizedplayback.annotations.MinimizedPlaybackCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("minimized-playback-manager-fingerprint")
-@MatchingMethod(
-    "Ladj", "w"
-)
 @FuzzyPatternScanMethod(2)
 @MinimizedPlaybackCompatibility
 @Version("0.0.1")

src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/patch/MinimizedPlaybackPatch.kt

@@ -3,20 +3,20 @@ package app.revanced.patches.youtube.misc.minimizedplayback.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
-import app.revanced.patcher.data.impl.toMethodWalker
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.minimizedplayback.annotations.MinimizedPlaybackCompatibility
 import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.MinimizedPlaybackKidsFingerprint
 import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
 import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.MinimizedPlaybackSettingsFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
@@ -35,7 +35,7 @@ class MinimizedPlaybackPatch : BytecodePatch(
         MinimizedPlaybackKidsFingerprint, MinimizedPlaybackManagerFingerprint, MinimizedPlaybackSettingsFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         SettingsPatch.PreferenceScreen.MISC.addPreferences(
             SwitchPreference(
                 "revanced_enable_minimized_playback",
@@ -62,7 +62,7 @@ class MinimizedPlaybackPatch : BytecodePatch(
 
         val settingsBooleanIndex = booleanCalls.elementAt(1).index
         val settingsBooleanMethod =
-            data.toMethodWalker(method).nextMethod(settingsBooleanIndex, true).getMethod() as MutableMethod
+            context.toMethodWalker(method).nextMethod(settingsBooleanIndex, true).getMethod() as MutableMethod
 
         settingsBooleanMethod.addInstructions(
             0, """

src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/bytecode/patch/PlayerControlsBytecodePatch.kt

@@ -3,14 +3,14 @@ package app.revanced.patches.youtube.misc.playercontrols.bytecode.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
 import app.revanced.patches.youtube.misc.playercontrols.annotation.PlayerControlsCompatibility
 import app.revanced.patches.youtube.misc.playercontrols.fingerprints.BottomControlsInflateFingerprint
@@ -25,7 +25,7 @@ import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 class PlayerControlsBytecodePatch : BytecodePatch(
     listOf(PlayerControlsVisibilityFingerprint)
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         showPlayerControlsFingerprintResult = PlayerControlsVisibilityFingerprint.result!!
 
         bottomUiContainerResourceId = ResourceMappingResourcePatch
@@ -33,7 +33,7 @@ class PlayerControlsBytecodePatch : BytecodePatch(
             .single { it.type == "id" && it.name == "bottom_ui_container_stub" }.id
 
         // TODO: another solution is required, this is hacky
-        listOf(BottomControlsInflateFingerprint).resolve(data, data.classes)
+        listOf(BottomControlsInflateFingerprint).resolve(context, context.classes)
         inflateFingerprintResult = BottomControlsInflateFingerprint.result!!
 
         return PatchResultSuccess()

src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/BottomControlsInflateFingerprint.kt

@@ -2,8 +2,7 @@ package app.revanced.patches.youtube.misc.playercontrols.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-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.playercontrols.annotation.PlayerControlsCompatibility
 import app.revanced.patches.youtube.misc.playercontrols.bytecode.patch.PlayerControlsBytecodePatch
@@ -11,10 +10,6 @@ import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
 
 @Name("bottom-controls-inflate-fingerprint")
-@MatchingMethod(
-    "Lknf;", "a"
-)
-@DirectPatternScanMethod
 @PlayerControlsCompatibility
 @Version("0.0.1")
 object BottomControlsInflateFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerControlsVisibilityFingerprint.kt

@@ -2,16 +2,11 @@ package app.revanced.patches.youtube.misc.playercontrols.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-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.playercontrols.annotation.PlayerControlsCompatibility
 
 @Name("player-controls-visibility-fingerprint")
-@MatchingMethod(
-    "LYouTubeControlsOverlay;", "ag"
-)
-@DirectPatternScanMethod
 @PlayerControlsCompatibility
 @Version("0.0.1")
 object PlayerControlsVisibilityFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/resource/patch/BottomControlsResourcePatch.kt

@@ -3,25 +3,24 @@ package app.revanced.patches.youtube.misc.playercontrols.resource.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.DomFileEditor
-import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.data.DomFileEditor
+import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.impl.ResourcePatch
 import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
 import app.revanced.patches.youtube.misc.playercontrols.annotation.PlayerControlsCompatibility
-import java.io.Closeable
 
 @Name("bottom-controls-resource-patch")
 @DependsOn([FixLocaleConfigErrorPatch::class])
 @Description("Manages the resources for the bottom controls of the YouTube player.")
 @PlayerControlsCompatibility
 @Version("0.0.1")
-class BottomControlsResourcePatch : ResourcePatch(), Closeable {
-    override fun execute(data: ResourceData): PatchResult {
-        resourceData = data
-        targetXmlEditor = data.xmlEditor[TARGET_RESOURCE]
+class BottomControlsResourcePatch : ResourcePatch {
+    override fun execute(context: ResourceContext): PatchResult {
+        resourceContext = context
+        targetXmlEditor = context.xmlEditor[TARGET_RESOURCE]
 
         return PatchResultSuccess()
     }
@@ -30,7 +29,7 @@ class BottomControlsResourcePatch : ResourcePatch(), Closeable {
         internal const val TARGET_RESOURCE_NAME = "youtube_controls_bottom_ui_container.xml"
         private const val TARGET_RESOURCE = "res/layout/$TARGET_RESOURCE_NAME"
 
-        private lateinit var resourceData: ResourceData
+        private lateinit var resourceContext: ResourceContext
         private lateinit var targetXmlEditor: DomFileEditor
 
         // The element to which to add the new elements to
@@ -44,7 +43,7 @@ class BottomControlsResourcePatch : ResourcePatch(), Closeable {
          */
         internal fun addControls(hostYouTubeControlsBottomUiResourceName: String) {
             val sourceXmlEditor =
-                resourceData.xmlEditor[this::class.java.classLoader.getResourceAsStream(
+                resourceContext.xmlEditor[this::class.java.classLoader.getResourceAsStream(
                     hostYouTubeControlsBottomUiResourceName
                 )!!]
 

src/main/kotlin/app/revanced/patches/youtube/misc/playeroverlay/fingerprint/PlayerOverlaysOnFinishInflateFingerprint.kt

@@ -2,16 +2,11 @@ package app.revanced.patches.youtube.misc.playeroverlay.fingerprint
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-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.playeroverlay.annotation.PlayerOverlaysHookCompatibility
 
 @Name("player-overlays-onFinishInflate-fingerprint")
-@MatchingMethod(
-    "LYouTubePlayerOverlaysLayout;", "onFinishInflate"
-)
-@DirectPatternScanMethod
 @PlayerOverlaysHookCompatibility
 @Version("0.0.1")
 object PlayerOverlaysOnFinishInflateFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/youtube/misc/playeroverlay/patch/PlayerOverlaysHookPatch.kt

@@ -3,12 +3,12 @@ package app.revanced.patches.youtube.misc.playeroverlay.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.playeroverlay.annotation.PlayerOverlaysHookCompatibility
 import app.revanced.patches.youtube.misc.playeroverlay.fingerprint.PlayerOverlaysOnFinishInflateFingerprint
@@ -23,7 +23,7 @@ class PlayerOverlaysHookPatch : BytecodePatch(
         PlayerOverlaysOnFinishInflateFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         // hook YouTubePlayerOverlaysLayout.onFinishInflate()
         val method = PlayerOverlaysOnFinishInflateFingerprint.result!!.mutableMethod
         method.addInstruction(

src/main/kotlin/app/revanced/patches/youtube/misc/playertype/fingerprint/UpdatePlayerTypeFingerprint.kt

@@ -4,7 +4,6 @@ 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.interaction.swipecontrols.annotation.SwipeControlsCompatibility
 import org.jf.dexlib2.AccessFlags
@@ -12,10 +11,6 @@ import org.jf.dexlib2.Opcode
 
 //TODO constrain to only match in YoutubePlayerOverlaysLayout?
 @Name("update-player-type-fingerprint")
-@MatchingMethod(
-    "LYoutubePlayerOverlaysLayout;",
-    "nM"
-)
 @FuzzyPatternScanMethod(2)
 @SwipeControlsCompatibility
 @Version("0.0.1")

src/main/kotlin/app/revanced/patches/youtube/misc/playertype/patch/PlayerTypeHookPatch.kt

@@ -3,12 +3,12 @@ package app.revanced.patches.youtube.misc.playertype.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.playertype.annotation.PlayerTypeHookCompatibility
 import app.revanced.patches.youtube.misc.playertype.fingerprint.UpdatePlayerTypeFingerprint
@@ -23,7 +23,7 @@ class PlayerTypeHookPatch : BytecodePatch(
         UpdatePlayerTypeFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         // hook YouTubePlayerOverlaysLayout.updatePlayerLayout()
         UpdatePlayerTypeFingerprint.result!!.mutableMethod.addInstruction(
             0,

src/main/kotlin/app/revanced/patches/youtube/misc/quality/fingerprints/VideoQualityReferenceFingerprint.kt

@@ -4,14 +4,11 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patches.youtube.misc.quality.annotations.DefaultVideoQualityCompatibility
-import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
 @Name("video-quality-reference-fingerprint")
-@MatchingMethod("Lkec;", "b")
-@DirectPatternScanMethod
 @DefaultVideoQualityCompatibility
 @Version("0.0.1")
 object VideoQualityReferenceFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/youtube/misc/quality/fingerprints/VideoQualitySetterFingerprint.kt

@@ -4,18 +4,13 @@ package app.revanced.patches.youtube.misc.quality.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.quality.annotations.DefaultVideoQualityCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("video-quality-setter-fingerprint")
-@MatchingMethod(
-    "Lkec;", "a"
-)
-@DirectPatternScanMethod
 @DefaultVideoQualityCompatibility
 @Version("0.0.1")
 object VideoQualitySetterFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/youtube/misc/quality/fingerprints/VideoUserQualityChangeFingerprint.kt

@@ -5,15 +5,12 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+
 import app.revanced.patches.youtube.misc.quality.annotations.DefaultVideoQualityCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("video-user-quality-change-fingerprint")
-@MatchingMethod("Lkec;", "onItemClick")
-@DirectPatternScanMethod
 @DefaultVideoQualityCompatibility
 @Version("0.0.1")
 object VideoUserQualityChangeFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/youtube/misc/quality/patch/RememberVideoQualityPatch.kt

@@ -3,15 +3,15 @@ package app.revanced.patches.youtube.misc.quality.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.quality.annotations.DefaultVideoQualityCompatibility
 import app.revanced.patches.youtube.misc.quality.fingerprints.VideoQualityReferenceFingerprint
@@ -20,10 +20,8 @@ import app.revanced.patches.youtube.misc.quality.fingerprints.VideoUserQualityCh
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
-import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsResourcePatch
 import app.revanced.patches.youtube.misc.videoid.patch.VideoIdPatch
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.instruction.SwitchPayload
 import org.jf.dexlib2.iface.reference.FieldReference
 
 @Patch
@@ -37,23 +35,29 @@ class RememberVideoQualityPatch : BytecodePatch(
         VideoQualitySetterFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         SettingsPatch.PreferenceScreen.MISC.addPreferences(
             SwitchPreference(
                 "revanced_remember_video_quality_selection",
                 StringResource("revanced_remember_video_quality_selection_title", "Remember current video quality"),
                 true,
-                StringResource("revanced_remember_video_quality_selection_summary_on", "The current video quality will not change"),
-                StringResource("revanced_remember_video_quality_selection_summary_off", "Video quality will be remembered until a new quality is chosen")
+                StringResource(
+                    "revanced_remember_video_quality_selection_summary_on",
+                    "The current video quality will not change"
+                ),
+                StringResource(
+                    "revanced_remember_video_quality_selection_summary_off",
+                    "Video quality will be remembered until a new quality is chosen"
+                )
             )
         )
 
         val setterMethod = VideoQualitySetterFingerprint.result!!
 
-        VideoUserQualityChangeFingerprint.resolve(data, setterMethod.classDef)
+        VideoUserQualityChangeFingerprint.resolve(context, setterMethod.classDef)
         val userQualityMethod = VideoUserQualityChangeFingerprint.result!!
 
-        VideoQualityReferenceFingerprint.resolve(data, setterMethod.classDef)
+        VideoQualityReferenceFingerprint.resolve(context, setterMethod.classDef)
         val qualityFieldReference =
             VideoQualityReferenceFingerprint.result!!.method.let { method ->
                 (method.implementation!!.instructions.elementAt(0) as ReferenceInstruction).reference as FieldReference
@@ -62,7 +66,7 @@ class RememberVideoQualityPatch : BytecodePatch(
         VideoIdPatch.injectCall("Lapp/revanced/integrations/patches/VideoQualityPatch;->newVideoStarted(Ljava/lang/String;)V")
 
         val qIndexMethodName =
-            data.classes.single { it.type == qualityFieldReference.type }.methods.single { it.parameterTypes.first() == "I" }.name
+            context.classes.single { it.type == qualityFieldReference.type }.methods.single { it.parameterTypes.first() == "I" }.name
 
         setterMethod.mutableMethod.addInstructions(
             0,

src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/LicenseActivityFingerprint.kt

@@ -2,16 +2,12 @@ package app.revanced.patches.youtube.misc.settings.bytecode.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.youtube.misc.settings.annotations.SettingsCompatibility
 
 // TODO: This is more of a class fingerprint than a method fingerprint.
 //  Convert to a class fingerprint whenever possible.
 @Name("license-activity-fingerprint")
-@MatchingMethod(
-    "Lcom/google/android/libraries/social/licenses/LicenseActivity;", "onCreate"
-)
 @SettingsCompatibility
 @Version("0.0.1")
 object LicenseActivityFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/ReVancedSettingsActivityFingerprint.kt

@@ -2,16 +2,12 @@ package app.revanced.patches.youtube.misc.settings.bytecode.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.youtube.misc.settings.annotations.SettingsCompatibility
 
 // TODO: This is more of a class fingerprint than a method fingerprint.
 //  Convert to a class fingerprint whenever possible.
 @Name("revanced-settings-activity-fingerprint")
-@MatchingMethod(
-    "Lapp/revanced/integrations/settingsmenu/ReVancedSettingActivity;", "initializeSettings"
-)
 @SettingsCompatibility
 @Version("0.0.1")
 object ReVancedSettingsActivityFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/fingerprints/ThemeSetterFingerprint.kt

@@ -2,7 +2,6 @@ package app.revanced.patches.youtube.misc.settings.bytecode.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.youtube.misc.settings.annotations.SettingsCompatibility
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
@@ -10,9 +9,6 @@ import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
 
 @Name("theme-setter-fingerprint")
-@MatchingMethod(
-    "Lfyq;", "a"
-)
 @SettingsCompatibility
 @Version("0.0.1")
 object ThemeSetterFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/patch/SettingsPatch.kt

@@ -3,14 +3,14 @@ package app.revanced.patches.youtube.misc.settings.bytecode.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
@@ -40,8 +40,8 @@ import java.io.Closeable
 @Version("0.0.1")
 class SettingsPatch : BytecodePatch(
     listOf(LicenseActivityFingerprint, ReVancedSettingsActivityFingerprint, ThemeSetterFingerprint)
-), Closeable {
-    override fun execute(data: BytecodeData): PatchResult {
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
         val licenseActivityResult = LicenseActivityFingerprint.result!!
         val settingsResult = ReVancedSettingsActivityFingerprint.result!!
         val themeSetterResult = ThemeSetterFingerprint.result!!

src/main/kotlin/app/revanced/patches/youtube/misc/settings/resource/patch/SettingsResourcePatch.kt

@@ -2,12 +2,12 @@ package app.revanced.patches.youtube.misc.settings.resource.patch
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.DomFileEditor
-import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.data.DomFileEditor
+import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.impl.ResourcePatch
 import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
 import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
 import app.revanced.patches.youtube.misc.settings.annotations.SettingsCompatibility
@@ -18,19 +18,18 @@ import app.revanced.util.resources.ResourceUtils
 import app.revanced.util.resources.ResourceUtils.copyResources
 import org.w3c.dom.Element
 import org.w3c.dom.Node
-import java.io.Closeable
 
 @Name("settings-resource-patch")
 @SettingsCompatibility
 @DependsOn([FixLocaleConfigErrorPatch::class, ResourceMappingResourcePatch::class])
 @Version("0.0.1")
-class SettingsResourcePatch : ResourcePatch(), Closeable {
+class SettingsResourcePatch : ResourcePatch {
 
-    override fun execute(data: ResourceData): PatchResult {
+    override fun execute(context: ResourceContext): PatchResult {
         /*
          * create missing directory for the resources
          */
-        data["res/drawable-ldrtl-xxxhdpi"].mkdirs()
+        context["res/drawable-ldrtl-xxxhdpi"].mkdirs()
 
         /*
          * copy layout resources
@@ -51,10 +50,10 @@ class SettingsResourcePatch : ResourcePatch(), Closeable {
                 "drawable-ldrtl-xxxhdpi", "quantum_ic_arrow_back_white_24.png"
             )
         ).forEach { resourceGroup ->
-            data.copyResources("settings", resourceGroup)
+            context.copyResources("settings", resourceGroup)
         }
 
-        data.xmlEditor["AndroidManifest.xml"].use { editor ->
+        context.xmlEditor["AndroidManifest.xml"].use { editor ->
             editor.file.getElementsByTagName("manifest").item(0).also {
                 it.appendChild(it.ownerDocument.createElement("uses-permission").also { element ->
                     element.setAttribute("android:name", "android.permission.SCHEDULE_EXACT_ALARM")
@@ -62,11 +61,11 @@ class SettingsResourcePatch : ResourcePatch(), Closeable {
             }
         }
 
-        revancedPreferencesEditor = data.xmlEditor["res/xml/revanced_prefs.xml"]
-        preferencesEditor = data.xmlEditor["res/xml/settings_fragment.xml"]
+        revancedPreferencesEditor = context.xmlEditor["res/xml/revanced_prefs.xml"]
+        preferencesEditor = context.xmlEditor["res/xml/settings_fragment.xml"]
 
-        stringsEditor = data.xmlEditor["res/values/strings.xml"]
-        arraysEditor = data.xmlEditor["res/values/arrays.xml"]
+        stringsEditor = context.xmlEditor["res/values/strings.xml"]
+        arraysEditor = context.xmlEditor["res/values/arrays.xml"]
 
         // Add the ReVanced settings to the YouTube settings
         val youtubePackage = "com.google.android.youtube"

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

@@ -3,8 +3,7 @@ package app.revanced.patches.youtube.misc.videobuffer.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.videobuffer.annotations.CustomVideoBufferCompatibility
 import org.jf.dexlib2.AccessFlags
@@ -12,10 +11,6 @@ import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction
 
 @Name("maxbuffer-fingerprint")
-@MatchingMethod(
-    "Lcom/google/android/libraries/youtube/innertube/model/media/PlayerConfigModel;", "r"
-)
-@DirectPatternScanMethod
 @CustomVideoBufferCompatibility
 @Version("0.0.1")
 object MaxBufferFingerprint : MethodFingerprint(

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

@@ -3,8 +3,7 @@ package app.revanced.patches.youtube.misc.videobuffer.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.videobuffer.annotations.CustomVideoBufferCompatibility
 import org.jf.dexlib2.AccessFlags
@@ -12,10 +11,6 @@ import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction
 
 @Name("playbackbuffer-fingerprint")
-@MatchingMethod(
-    "Lcom/google/android/libraries/youtube/innertube/model/media/PlayerConfigModel;", "p"
-)
-@DirectPatternScanMethod
 @CustomVideoBufferCompatibility
 @Version("0.0.1")
 object PlaybackBufferFingerprint : MethodFingerprint(

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

@@ -3,8 +3,7 @@ package app.revanced.patches.youtube.misc.videobuffer.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.videobuffer.annotations.CustomVideoBufferCompatibility
 import org.jf.dexlib2.AccessFlags
@@ -12,10 +11,6 @@ import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction
 
 @Name("playbackbuffer-fingerprint")
-@MatchingMethod(
-    "Lcom/google/android/libraries/youtube/innertube/model/media/PlayerConfigModel;", "t"
-)
-@DirectPatternScanMethod
 @CustomVideoBufferCompatibility
 @Version("0.0.1")
 object ReBufferFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/youtube/misc/videobuffer/patch/CustomVideoBufferPatch.kt

@@ -3,15 +3,15 @@ package app.revanced.patches.youtube.misc.videobuffer.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.instruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.InputType
@@ -35,7 +35,7 @@ class CustomVideoBufferPatch : BytecodePatch(
         MaxBufferFingerprint, PlaybackBufferFingerprint, ReBufferFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         SettingsPatch.PreferenceScreen.MISC.addPreferences(
             PreferenceScreen(
                 "revanced_custom_video_buffer",

src/main/kotlin/app/revanced/patches/youtube/misc/videoid/fingerprint/VideoIdFingerprint.kt

@@ -3,18 +3,13 @@ package app.revanced.patches.youtube.misc.videoid.fingerprint
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.misc.videoid.annotation.VideoIdCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("video-id-fingerprint")
-@MatchingMethod(
-    "Lcom/google/android/apps/youtube/app/common/player/PlaybackLifecycleMonitor;", "l"
-)
-@DirectPatternScanMethod
 @VideoIdCompatibility
 @Version("0.0.1")
 object VideoIdFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/youtube/misc/videoid/patch/VideoIdPatch.kt

@@ -3,13 +3,13 @@ package app.revanced.patches.youtube.misc.videoid.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
+import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.videoid.annotation.VideoIdCompatibility
@@ -26,7 +26,7 @@ class VideoIdPatch : BytecodePatch(
         VideoIdFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         result = VideoIdFingerprint.result!!
 
         insertMethod = result.mutableMethod