chore(release): 2.81.4 [skip ci]

## [2.81.4](https://github.com/revanced/revanced-patches/compare/v2.81.3...v2.81.4) (2022-10-10)

### Bug Fixes

* **general-ads:** invalid smali syntax ([1772dcf](01be9fd79e))

CHANGELOG.md

@@ -1,3 +1,94 @@
+## [2.81.4](https://github.com/revanced/revanced-patches/compare/v2.81.3...v2.81.4) (2022-10-10)
+
+
+### Bug Fixes
+
+* **general-ads:** invalid smali syntax ([86224c1](https://github.com/revanced/revanced-patches/commit/86224c1f601c1bd22c0ce4dcf2a8e79ea3b8b2ae))
+
+## [2.81.3](https://github.com/revanced/revanced-patches/compare/v2.81.2...v2.81.3) (2022-10-10)
+
+
+### Bug Fixes
+
+* **video-ads:** return empty ad list instead of null ([f6c5027](https://github.com/revanced/revanced-patches/commit/f6c5027981a2b55bbcd2e55d294ebfd5e6f0b527))
+
+## [2.81.2](https://github.com/revanced/revanced-patches/compare/v2.81.1...v2.81.2) (2022-10-08)
+
+
+### Bug Fixes
+
+* **theme:** include coloring the playlist action bar ([#742](https://github.com/revanced/revanced-patches/issues/742)) ([6766ec8](https://github.com/revanced/revanced-patches/commit/6766ec8f31da6dd71fff0ae4b7044af5ec4a5dfd))
+
+## [2.81.1](https://github.com/revanced/revanced-patches/compare/v2.81.0...v2.81.1) (2022-10-07)
+
+
+### Bug Fixes
+
+* **video-ads:** block remaining video ads ([fbc83a2](https://github.com/revanced/revanced-patches/commit/fbc83a22d37012394311a87d27202b7cc86e047d))
+
+# [2.81.0](https://github.com/revanced/revanced-patches/compare/v2.80.0...v2.81.0) (2022-10-06)
+
+
+### Features
+
+* **youtube/general-ads:** do not hide community posts by default ([6269638](https://github.com/revanced/revanced-patches/commit/626963819c183cbfeca4ff4ab0a16fc39ed9d8a8))
+
+# [2.80.0](https://github.com/revanced/revanced-patches/compare/v2.79.2...v2.80.0) (2022-10-04)
+
+
+### Features
+
+* **youtube/remember-video-quality:** remember current quality option ([9c510d4](https://github.com/revanced/revanced-patches/commit/9c510d472048f5bce127eb0329e53aaf259e9b1b))
+
+## [2.79.2](https://github.com/revanced/revanced-patches/compare/v2.79.1...v2.79.2) (2022-10-04)
+
+
+### Bug Fixes
+
+* **youtube/disable-startup-shorts-player:** don't affect functionality of navigation bar  ([#716](https://github.com/revanced/revanced-patches/issues/716)) ([05f5cc1](https://github.com/revanced/revanced-patches/commit/05f5cc17e3fcbf255c6fe5b503c9fd20c218f5a1))
+
+## [2.79.1](https://github.com/revanced/revanced-patches/compare/v2.79.0...v2.79.1) (2022-10-03)
+
+
+### Bug Fixes
+
+* **youtube/disable-startup-shorts-player:** do not prevent playing videos on startup ([#714](https://github.com/revanced/revanced-patches/issues/714)) ([9a0d379](https://github.com/revanced/revanced-patches/commit/9a0d3798afd75bba5c63e1b8803dc25814586be9))
+
+# [2.79.0](https://github.com/revanced/revanced-patches/compare/v2.78.0...v2.79.0) (2022-10-03)
+
+
+### Features
+
+* `hide-video-buttons` patch ([584803a](https://github.com/revanced/revanced-patches/commit/584803aa900f94de1b2b2a0c41fb0884fa9270d3))
+
+# [2.78.0](https://github.com/revanced/revanced-patches/compare/v2.77.1...v2.78.0) (2022-10-02)
+
+
+### Features
+
+* **youtube/general-ads:** check for ad in identifier ([fd0506e](https://github.com/revanced/revanced-patches/commit/fd0506eb95dbf398eb7d6bfa8732f517b9867545))
+
+## [2.77.1](https://github.com/revanced/revanced-patches/compare/v2.77.0...v2.77.1) (2022-10-01)
+
+
+### Bug Fixes
+
+* **tiktok/tiktok-downloads:** add missing patch dependencies ([#686](https://github.com/revanced/revanced-patches/issues/686)) ([5c3b4ed](https://github.com/revanced/revanced-patches/commit/5c3b4ed0530e89d50db3b5bb9893e1ef4b463bae))
+
+# [2.77.0](https://github.com/revanced/revanced-patches/compare/v2.76.3...v2.77.0) (2022-10-01)
+
+
+### Features
+
+* **youtube/hdr-auto-brightness:** increase strength of fingerprint ([2379b58](https://github.com/revanced/revanced-patches/commit/2379b5892b3505c8780f475bbc56f520613fa31d))
+
+## [2.76.3](https://github.com/revanced/revanced-patches/compare/v2.76.2...v2.76.3) (2022-10-01)
+
+
+### Performance Improvements
+
+* **general-ads:** hook pathBuilder ([b9bad0b](https://github.com/revanced/revanced-patches/commit/b9bad0bb922bbd44ddf2acbfae87243beb28851a))
+
 ## [2.76.2](https://github.com/revanced/revanced-patches/compare/v2.76.1...v2.76.2) (2022-09-30)
 
 

README.md

@@ -125,6 +125,7 @@ The official Patch bundle provided by ReVanced and the community.
 | `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
 | `hide-create-button` | Hides the create button in the navigation bar. | 17.36.37 |
 | `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.36.37 |
+| `hide-video-buttons` | Adds options to hide action buttons under a video. | 17.36.37 |
 | `theme` | Applies a custom theme. | all |
 | `hide-email-address` | Hides the email address in the account switcher. | 17.36.37 |
 | `sponsorblock` | Integrate SponsorBlock. | 17.36.37 |

build.gradle.kts

@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation("app.revanced:revanced-patcher:5.1.2")
+    implementation("app.revanced:revanced-patcher:6.0.0")
     implementation("app.revanced:multidexlib2:2.5.2.r2")
     // Required for meta
     implementation("com.google.code.gson:gson:2.9.1")

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.76.2
+version = 2.81.4

src/main/kotlin/app/revanced/extensions/Extensions.kt

@@ -1,7 +1,7 @@
 package app.revanced.extensions
 
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
@@ -35,9 +35,9 @@ internal fun MutableMethodImplementation.injectHideCall(
  * @param targetClass the class to start traversing the class hierarchy from
  * @param callback function that is called for every class in the hierarchy
  */
-fun BytecodeData.traverseClassHierarchy(targetClass: MutableClass, callback: MutableClass.() -> Unit) {
+fun BytecodeContext.traverseClassHierarchy(targetClass: MutableClass, callback: MutableClass.() -> Unit) {
     callback(targetClass)
-    this.findClass(targetClass.superclass ?: return)?.resolve()?.let {
+    this.findClass(targetClass.superclass ?: return)?.mutableClass?.let {
         traverseClassHierarchy(it, callback)
     }
 }
@@ -135,7 +135,7 @@ internal fun MutableMethod.injectConsumableEventHook(hookRef: ImmutableMethodRef
  * @param resourceType the resource type, for example 'drawable'. this has to match both the source and the target
  * @param resourceFileNames names of all resources of this type to inject
  */
-fun ResourceData.injectResources(
+fun ResourceContext.injectResources(
     classLoader: ClassLoader,
     patchDirectoryPath: String,
     resourceType: String,
@@ -160,7 +160,7 @@ fun ResourceData.injectResources(
  * @param patchDirectoryPath path to the files. this will be the directory you created under the 'resources' source folder
  * @param languageIdentifier ISO 639-2 two- letter language code identifier (aka the one android uses for values directory)
  */
-fun ResourceData.injectStrings(
+fun ResourceContext.injectStrings(
     classLoader: ClassLoader,
     patchDirectoryPath: String,
     languageIdentifier: String? = null,

src/main/kotlin/app/revanced/meta/Meta.kt

@@ -2,12 +2,12 @@ package app.revanced.meta
 
 import app.revanced.meta.json.generateJson
 import app.revanced.meta.readme.generateText
-import app.revanced.patcher.data.Data
+import app.revanced.patcher.data.Context
 import app.revanced.patcher.patch.Patch
-import app.revanced.patcher.util.patch.impl.JarPatchBundle
+import app.revanced.patcher.util.patch.PatchBundle
 import java.io.File
 
-typealias Bundle = List<Class<out Patch<Data>>>
+typealias Bundle = List<Class<out Patch<Context>>>
 
 object Meta {
     @JvmStatic
@@ -20,7 +20,7 @@ object Meta {
     }
 }
 
-fun accumulatePatches() = JarPatchBundle(
+fun accumulatePatches() = PatchBundle.Jar(
     File("build/libs/").listFiles()!!.first {
         it.name.startsWith("revanced-patches-") && it.name.endsWith(".jar")
     }.absolutePath

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

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

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

@@ -1,7 +1,7 @@
 package app.revanced.meta.readme
 
 import app.revanced.meta.Bundle
-import app.revanced.patcher.data.Data
+import app.revanced.patcher.data.Context
 import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
 import app.revanced.patcher.extensions.PatchExtensions.description
 import app.revanced.patcher.extensions.PatchExtensions.patchName
@@ -15,7 +15,7 @@ private val TABLE_REGEX = Regex("\\{\\{\\s?table\\s?}}")
 
 fun generateText(bundle: Bundle) {
     val output = StringBuilder()
-    val packages = mutableMapOf<String, MutableList<Class<out Patch<Data>>>>()
+    val packages = mutableMapOf<String, MutableList<Class<out Patch<Context>>>>()
 
     for (patch in bundle) {
         patch.compatiblePackages?.forEach { pkg ->

src/main/kotlin/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsConstructorFingerprint.kt

@@ -3,18 +3,13 @@ package app.revanced.patches.music.ad.video.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.ad.video.annotations.MusicVideoAdsCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("show-video-ads-constructor-fingerprint")
-@MatchingMethod(
-    "Laghd;",
-    "<init>",
-)
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @MusicVideoAdsCompatibility
 @Version("0.0.1")

src/main/kotlin/app/revanced/patches/music/ad/video/fingerprints/ShowMusicVideoAdsFingerprint.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.music.ad.video.annotations.MusicVideoAdsCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("show-video-ads-method-fingerprint")
-@MatchingMethod(
-    "Laghd;", "d"
-)
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @MusicVideoAdsCompatibility
 @Version("0.0.1")

src/main/kotlin/app/revanced/patches/music/ad/video/patch/MusicVideoAdsPatch.kt

@@ -3,13 +3,13 @@ package app.revanced.patches.music.ad.video.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 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.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.music.ad.video.annotations.MusicVideoAdsCompatibility
 import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsConstructorFingerprint
 import app.revanced.patches.music.ad.video.fingerprints.ShowMusicVideoAdsFingerprint
@@ -24,8 +24,8 @@ class MusicVideoAdsPatch : BytecodePatch(
         ShowMusicVideoAdsConstructorFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
-        ShowMusicVideoAdsFingerprint.resolve(data, ShowMusicVideoAdsConstructorFingerprint.result!!.classDef)
+        ShowMusicVideoAdsFingerprint.resolve(context, ShowMusicVideoAdsConstructorFingerprint.result!!.classDef)
 
         val result = ShowMusicVideoAdsFingerprint.result!!
 

src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/AllCodecsReferenceFingerprint.kt

@@ -3,18 +3,13 @@ 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
 
 @Name("all-codecs-reference-fingerprint")
-@MatchingMethod(
-    "Laari;",
-    "b",
-)
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @CodecsUnlockCompatibility
 @Version("0.0.1")

src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/CodecsLockFingerprint.kt

@@ -4,17 +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.music.audio.codecs.annotations.CodecsUnlockCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("codec-lock-fingerprint")
-@MatchingMethod(
-    "Lacfr;",
-    "a",
-)
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @CodecsUnlockCompatibility
 @Version("0.0.1")

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

@@ -3,12 +3,12 @@ package app.revanced.patches.music.audio.codecs.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.impl.toMethodWalker
+import app.revanced.patcher.data.toMethodWalker
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patches.music.audio.codecs.annotations.CodecsUnlockCompatibility
 import app.revanced.patches.music.audio.codecs.fingerprints.AllCodecsReferenceFingerprint
@@ -25,7 +25,7 @@ class CodecsUnlockPatch : BytecodePatch(
         CodecsLockFingerprint, AllCodecsReferenceFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val codecsLockResult = CodecsLockFingerprint.result!!
 
         val implementation = codecsLockResult.mutableMethod.implementation!!
@@ -42,7 +42,7 @@ class CodecsUnlockPatch : BytecodePatch(
 
         val allCodecsResult = AllCodecsReferenceFingerprint.result!!
         val allCodecsMethod =
-            data.toMethodWalker(allCodecsResult.method)
+            context.toMethodWalker(allCodecsResult.method)
                 .nextMethod(allCodecsResult.scanResult.patternScanResult!!.startIndex)
                 .getMethod()
 

src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/AudioOnlyEnablerFingerprint.kt

@@ -3,19 +3,14 @@ package app.revanced.patches.music.audio.exclusiveaudio.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
+
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.audio.exclusiveaudio.annotations.ExclusiveAudioCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("audio-only-enabler-fingerprint")
-@MatchingMethod(
+
-    "Lgmd;",
-    "d"
-)
-@DirectPatternScanMethod
 @ExclusiveAudioCompatibility
 @Version(
     "0.0.1"

src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/fingerprints/ExclusiveAudioFingerprint.kt

@@ -3,17 +3,13 @@ package app.revanced.patches.music.audio.exclusiveaudio.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.audio.exclusiveaudio.annotations.ExclusiveAudioCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("exclusive-audio-fingerprints")
-@MatchingMethod(
-    "Lgmd;", "c"
-)
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @ExclusiveAudioCompatibility
 @Version("0.0.1")

src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/patch/ExclusiveAudioPatch.kt

@@ -3,13 +3,13 @@ package app.revanced.patches.music.audio.exclusiveaudio.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.extensions.replaceInstruction
+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.music.audio.exclusiveaudio.annotations.ExclusiveAudioCompatibility
 import app.revanced.patches.music.audio.exclusiveaudio.fingerprints.AudioOnlyEnablerFingerprint
 
@@ -23,7 +23,7 @@ class ExclusiveAudioPatch : BytecodePatch(
         AudioOnlyEnablerFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val method = AudioOnlyEnablerFingerprint.result!!.mutableMethod
         method.replaceInstruction(method.implementation!!.instructions.count() - 1, "const/4 v0, 0x1")
         method.addInstruction("return v0")

src/main/kotlin/app/revanced/patches/music/layout/compactheader/fingerprints/CompactHeaderConstructorFingerprint.kt

@@ -4,15 +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.MatchingMethod
 import app.revanced.patches.music.layout.compactheader.annotations.CompactHeaderCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("compact-header-constructor-fingerprint")
-@MatchingMethod(
-    "Llcz;", "<init>"
-)
 @CompactHeaderCompatibility
 @Version("0.0.1")
 object CompactHeaderConstructorFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/layout/compactheader/patch/CompactHeaderPatch.kt

@@ -3,12 +3,12 @@ package app.revanced.patches.music.layout.compactheader.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.layout.compactheader.annotations.CompactHeaderCompatibility
 import app.revanced.patches.music.layout.compactheader.fingerprints.CompactHeaderConstructorFingerprint
 import org.jf.dexlib2.builder.instruction.BuilderInstruction11x
@@ -23,7 +23,7 @@ class CompactHeaderPatch : BytecodePatch(
         CompactHeaderConstructorFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val result = CompactHeaderConstructorFingerprint.result!!
         val method = result.mutableMethod
 

src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/fingerprints/MinimizedPlaybackManagerFingerprint.kt

@@ -4,15 +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.MatchingMethod
 import app.revanced.patches.music.layout.minimizedplayback.annotations.MinimizedPlaybackCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("minimized-playback-manager-fingerprint")
-@MatchingMethod(
-    "Llxw;", "c"
-)
 @MinimizedPlaybackCompatibility
 @Version("0.0.1")
 object MinimizedPlaybackManagerFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/patch/MinimizedPlaybackPatch.kt

@@ -3,18 +3,14 @@ package app.revanced.patches.music.layout.minimizedplayback.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.impl.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.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.music.layout.minimizedplayback.annotations.MinimizedPlaybackCompatibility
 import app.revanced.patches.music.layout.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.MethodReference
 
 @Patch
 @Name("minimized-playback-music")
@@ -26,7 +22,7 @@ class MinimizedPlaybackPatch : BytecodePatch(
         MinimizedPlaybackManagerFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         MinimizedPlaybackManagerFingerprint.result!!.mutableMethod.addInstructions(
             0, """
                 return-void

src/main/kotlin/app/revanced/patches/music/layout/premium/fingerprints/HideGetPremiumFingerprint.kt

@@ -4,15 +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.MatchingMethod
 import app.revanced.patches.music.layout.premium.annotations.HideGetPremiumCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("hide-get-premium-fingerprint")
-@MatchingMethod(
-    "Lktn;", "k"
-)
 @HideGetPremiumCompatibility
 @Version("0.0.1")
 object HideGetPremiumFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/layout/premium/fingerprints/HideGetPremiumParentFingerprint.kt

@@ -4,15 +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.MatchingMethod
 import app.revanced.patches.music.layout.premium.annotations.HideGetPremiumCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("hide-get-premium-parent-fingerprint")
-@MatchingMethod(
-    "Lktn;", "k"
-)
 @HideGetPremiumCompatibility
 @Version("0.0.1")
 object HideGetPremiumParentFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/layout/premium/patch/HideGetPremiumPatch.kt

@@ -3,14 +3,14 @@ package app.revanced.patches.music.layout.premium.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.layout.premium.annotations.HideGetPremiumCompatibility
 import app.revanced.patches.music.layout.premium.fingerprints.HideGetPremiumFingerprint
 import app.revanced.patches.music.layout.premium.fingerprints.HideGetPremiumParentFingerprint
@@ -25,9 +25,9 @@ class HideGetPremiumPatch : BytecodePatch(
         HideGetPremiumParentFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val parentResult = HideGetPremiumParentFingerprint.result!!
-        HideGetPremiumFingerprint.resolve(data, parentResult.classDef)
+        HideGetPremiumFingerprint.resolve(context, parentResult.classDef)
 
         val startIndex = parentResult.scanResult.patternScanResult!!.startIndex
 

src/main/kotlin/app/revanced/patches/music/layout/tastebuilder/fingerprints/TasteBuilderConstructorFingerprint.kt

@@ -3,17 +3,13 @@ package app.revanced.patches.music.layout.tastebuilder.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.layout.tastebuilder.annotations.RemoveTasteBuilderCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("taste-builder-constructor-fingerprint")
-@MatchingMethod(
-    "Lkyu;", "<init>"
-)
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @RemoveTasteBuilderCompatibility
 @Version("0.0.1")

src/main/kotlin/app/revanced/patches/music/layout/tastebuilder/patch/RemoveTasteBuilderPatch.kt

@@ -3,12 +3,12 @@ package app.revanced.patches.music.layout.tastebuilder.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.layout.tastebuilder.annotations.RemoveTasteBuilderCompatibility
 import app.revanced.patches.music.layout.tastebuilder.fingerprints.TasteBuilderConstructorFingerprint
 import org.jf.dexlib2.iface.instruction.formats.Instruction22c
@@ -23,7 +23,7 @@ class RemoveTasteBuilderPatch : BytecodePatch(
         TasteBuilderConstructorFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val result = TasteBuilderConstructorFingerprint.result!!
         val method = result.mutableMethod
 

src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/fingerprints/PivotBarConstructorFingerprint.kt

@@ -3,17 +3,13 @@ package app.revanced.patches.music.layout.upgradebutton.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.layout.upgradebutton.annotations.RemoveUpgradeButtonCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("pivot-bar-constructor-fingerprint")
-@MatchingMethod(
-    "Lhfu;", "<init2>"
-)
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @RemoveUpgradeButtonCompatibility
 @Version("0.0.1")

src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/patch/RemoveUpgradeButtonPatch.kt

@@ -3,12 +3,12 @@ package app.revanced.patches.music.layout.upgradebutton.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.music.layout.upgradebutton.annotations.RemoveUpgradeButtonCompatibility
 import app.revanced.patches.music.layout.upgradebutton.fingerprints.PivotBarConstructorFingerprint
@@ -28,7 +28,7 @@ class RemoveUpgradeButtonPatch : BytecodePatch(
         PivotBarConstructorFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val result = PivotBarConstructorFingerprint.result!!
         val implementation = result.mutableMethod.implementation!!
 

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

@@ -2,16 +2,12 @@ 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.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/music/misc/microg/fingerprints/CastDynamiteModuleFingerprint.kt

@@ -2,16 +2,12 @@ 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.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/music/misc/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt

@@ -2,16 +2,12 @@ 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.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/music/misc/microg/fingerprints/GooglePlayUtilityFingerprint.kt

@@ -3,17 +3,13 @@ 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.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
 
 @Name("google-play-utility-fingerprint")
-@MatchingMethod(
+
-    "Lnuv;", "b"
-)
-@DirectPatternScanMethod
 @MusicMicroGPatchCompatibility
 @Version("0.0.1")
 object GooglePlayUtilityFingerprint : MethodFingerprint(

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

@@ -2,16 +2,12 @@ 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.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")
-@MatchingMethod(
+
-    "Lrwi;", "a"
-)
-@DirectPatternScanMethod
 @MusicMicroGPatchCompatibility
 @Version("0.0.1")
 object PrimeFingerprint : MethodFingerprint(

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

@@ -4,15 +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.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
 
 @Name("google-play-service-checker-fingerprint")
-@MatchingMethod(
-    "Lnuv;", "d"
-)
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @MusicMicroGPatchCompatibility
 @Version("0.0.1")

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

@@ -3,11 +3,11 @@ package app.revanced.patches.music.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.music.misc.microg.annotations.MusicMicroGPatchCompatibility
 import app.revanced.patches.music.misc.microg.fingerprints.*
 import app.revanced.patches.music.misc.microg.patch.resource.MusicMicroGResourcePatch
@@ -39,10 +39,10 @@ class MusicMicroGBytecodePatch : BytecodePatch(
     // - "com.google.android.gms.phenotype.PACKAGE_NAME",
     // - "com.google.android.gms.phenotype.UPDATE",
     // - "com.google.android.gms.phenotype",
-    override fun execute(data: BytecodeData) =
+    override fun execute(context: BytecodeContext) =
         // apply common microG patch
         MicroGBytecodeHelper.patchBytecode(
-            data,
+            context,
             arrayOf(
                 MicroGBytecodeHelper.packageNameTransform(
                     Constants.PACKAGE_NAME,

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

@@ -3,10 +3,10 @@ package app.revanced.patches.music.misc.microg.patch.resource
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.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.music.misc.microg.annotations.MusicMicroGPatchCompatibility
 import app.revanced.patches.music.misc.microg.shared.Constants.MUSIC_PACKAGE_NAME
 import app.revanced.patches.music.misc.microg.shared.Constants.REVANCED_MUSIC_APP_NAME
@@ -20,11 +20,11 @@ import app.revanced.util.microg.MicroGResourceHelper
 @Description("Resource patch to allow YouTube Music ReVanced to run without root and under a different package name.")
 @MusicMicroGPatchCompatibility
 @Version("0.0.2")
-class MusicMicroGResourcePatch : ResourcePatch() {
+class MusicMicroGResourcePatch : ResourcePatch {
-    override fun execute(data: ResourceData): PatchResult {
+    override fun execute(context: ResourceContext): PatchResult {
         // update manifest
         MicroGResourceHelper.patchManifest(
-            data,
+            context,
             MUSIC_PACKAGE_NAME,
             REVANCED_MUSIC_PACKAGE_NAME,
             REVANCED_MUSIC_APP_NAME
@@ -32,7 +32,7 @@ class MusicMicroGResourcePatch : ResourcePatch() {
 
         // add metadata to the manifest
         MicroGManifestHelper.addSpoofingMetadata(
-            data,
+            context,
             SPOOFED_PACKAGE_NAME,
             SPOOFED_PACKAGE_SIGNATURE
         )

src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/fingerprints/BackgroundPlaybackDisableFingerprint.kt

@@ -3,17 +3,13 @@ package app.revanced.patches.music.premium.backgroundplay.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.premium.backgroundplay.annotations.BackgroundPlayCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("background-playback-disabler-fingerprint")
-@MatchingMethod(
-    "Lafgf;", "e"
-)
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @BackgroundPlayCompatibility
 @Version("0.0.1")

src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/patch/BackgroundPlayPatch.kt

@@ -3,12 +3,12 @@ package app.revanced.patches.music.premium.backgroundplay.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.premium.backgroundplay.annotations.BackgroundPlayCompatibility
 import app.revanced.patches.music.premium.backgroundplay.fingerprints.BackgroundPlaybackDisableFingerprint
 
@@ -22,7 +22,7 @@ class BackgroundPlayPatch : BytecodePatch(
         BackgroundPlaybackDisableFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         BackgroundPlaybackDisableFingerprint.result!!.mutableMethod.addInstructions(
             0,
             """

src/main/kotlin/app/revanced/patches/reddit/ad/general/patch/GeneralAdsPatch.kt

@@ -3,12 +3,11 @@ package app.revanced.patches.reddit.ad.general.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.reddit.ad.general.annotations.GeneralAdsCompatibility
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.builder.instruction.BuilderInstruction21c
@@ -22,8 +21,8 @@ import org.jf.dexlib2.immutable.reference.ImmutableStringReference
 @GeneralAdsCompatibility
 @Version("0.0.1")
 class GeneralAdsPatch : BytecodePatch() {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
-        data.classes.forEach { classDef ->
+        context.classes.forEach { classDef ->
             classDef.methods.forEach methodLoop@{ method ->
                 val implementation = method.implementation ?: return@methodLoop
 
@@ -31,7 +30,7 @@ class GeneralAdsPatch : BytecodePatch() {
                     if (instruction.opcode != Opcode.CONST_STRING) return@forEachIndexed
                     if (((instruction as ReferenceInstruction).reference as StringReference).string != "AdPost") return@forEachIndexed
 
-                    val proxiedClass = data.proxy(classDef).resolve()
+                    val proxiedClass = context.proxy(classDef).mutableClass
 
                     val proxiedImplementation = proxiedClass.methods.first {
                         it.name == method.name && it.parameterTypes.containsAll(method.parameterTypes)

src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/fingerprints/PremiumIconFingerprint.kt

@@ -2,14 +2,10 @@ 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.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.reddit.layout.premiumicon.annotations.PremiumIconCompatibility
 
 @Name("premium-icon-fingerprint")
-@MatchingMethod(
-    "Lcom/reddit/domain/model/MyAccount;", "isPremiumSubscriber"
-)
 @PremiumIconCompatibility
 @Version("0.0.1")
 object PremiumIconFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/reddit/layout/premiumicon/patch/PremiumIconPatch.kt

@@ -3,12 +3,12 @@ package app.revanced.patches.reddit.layout.premiumicon.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.annotations.Patch
+import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.reddit.layout.premiumicon.annotations.PremiumIconCompatibility
 import app.revanced.patches.reddit.layout.premiumicon.fingerprints.PremiumIconFingerprint
 
@@ -22,7 +22,7 @@ class PremiumIconPatch : BytecodePatch(
         PremiumIconFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val method = PremiumIconFingerprint.result!!.mutableMethod
         method.addInstructions(
             0,

src/main/kotlin/app/revanced/patches/spotify/audio/bytecode/patch/DisableCaptureRestrictionBytecodePatch.kt

@@ -3,14 +3,14 @@ package app.revanced.patches.spotify.audio.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.instruction
 import app.revanced.patcher.extensions.replaceInstruction
+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.spotify.audio.annotation.DisableCaptureRestrictionCompatibility
 import app.revanced.patches.spotify.audio.fingerprints.DisableCaptureRestrictionAudioDriverFingerprint
@@ -36,7 +36,7 @@ class DisableCaptureRestrictionBytecodePatch : BytecodePatch(
         )
     }
 
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val method = DisableCaptureRestrictionAudioDriverFingerprint.result!!.mutableMethod
 
         // Replace constant that contains the capture policy parameter for AudioAttributesBuilder.setAllowedCapturePolicy()

src/main/kotlin/app/revanced/patches/spotify/audio/fingerprints/DisableCaptureRestrictionAudioDriverFingerprint.kt

@@ -2,16 +2,12 @@ package app.revanced.patches.spotify.audio.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.spotify.audio.annotation.DisableCaptureRestrictionCompatibility
 
 @Name("disable-capture-restriction-audio-driver-fingerprint")
-@MatchingMethod(
+
-    "Lcom/spotify/playback/playbacknative/AudioDriver;", "constructAudioAttributes"
-)
-@DirectPatternScanMethod
 @DisableCaptureRestrictionCompatibility
 @Version("0.0.1")
 object DisableCaptureRestrictionAudioDriverFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/spotify/audio/resource/patch/DisableCaptureRestrictionResourcePatch.kt

@@ -3,23 +3,21 @@ package app.revanced.patches.spotify.audio.resource.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.impl.ResourcePatch
 import app.revanced.patches.spotify.audio.annotation.DisableCaptureRestrictionCompatibility
-import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
 import org.w3c.dom.Element
 
 @Name("disable-capture-restriction-resource-patch")
 @Description("Sets allowAudioPlaybackCapture in manifest to true.")
 @DisableCaptureRestrictionCompatibility
 @Version("0.0.1")
-class DisableCaptureRestrictionResourcePatch : ResourcePatch() {
+class DisableCaptureRestrictionResourcePatch : ResourcePatch {
-    override fun execute(data: ResourceData): PatchResult {
+    override fun execute(context: ResourceContext): PatchResult {
         // 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/spotify/layout/theme/patch/ThemePatch.kt

@@ -3,14 +3,10 @@ package app.revanced.patches.spotify.layout.theme.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.OptionsContainer
+import app.revanced.patcher.patch.*
-import app.revanced.patcher.patch.PatchOption
-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.ResourcePatch
 import app.revanced.patches.spotify.layout.theme.annotations.ThemeCompatibility
 import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
 import org.w3c.dom.Element
@@ -21,9 +17,9 @@ import org.w3c.dom.Element
 @Description("Applies a custom theme.")
 @ThemeCompatibility
 @Version("0.0.1")
-class ThemePatch : ResourcePatch() {
+class ThemePatch : ResourcePatch {
-    override fun execute(data: ResourceData): PatchResult {
+    override fun execute(context: ResourceContext): PatchResult {
-        data.xmlEditor["res/values/colors.xml"].use { editor ->
+        context.xmlEditor["res/values/colors.xml"].use { editor ->
             val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element
 
             for (i in 0 until resourcesNode.childNodes.length) {

src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/patch/PremiumNavbarTabPatch.kt

@@ -3,14 +3,14 @@ package app.revanced.patches.spotify.premium_navbar_tab.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.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.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.spotify.premium_navbar_tab.annotations.PremiumNavbarTabCompatibility
 import app.revanced.patches.spotify.premium_navbar_tab.fingerprints.AddPremiumNavbarTabFingerprint
 import app.revanced.patches.spotify.premium_navbar_tab.fingerprints.AddPremiumNavbarTabParentFingerprint
@@ -29,9 +29,9 @@ class PremiumNavbarTabPatch : BytecodePatch(
         AddPremiumNavbarTabParentFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val parentResult = AddPremiumNavbarTabParentFingerprint.result!!
-        AddPremiumNavbarTabFingerprint.resolve(data, parentResult.classDef)
+        AddPremiumNavbarTabFingerprint.resolve(context, parentResult.classDef)
 
         val result = AddPremiumNavbarTabFingerprint.result!!
 
@@ -39,7 +39,8 @@ class PremiumNavbarTabPatch : BytecodePatch(
         val methodInstructions = method.implementation!!.instructions
         val lastInstructionIdx = methodInstructions.size - 1
 
-        val premiumTabId = ResourceMappingResourcePatch.resourceMappings.single{it.type == "id" && it.name == "premium_tab"}.id
+        val premiumTabId =
+            ResourceMappingResourcePatch.resourceMappings.single { it.type == "id" && it.name == "premium_tab" }.id
 
         var removeAmount = 2
         // 2nd const remove method

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

@@ -2,15 +2,10 @@ package app.revanced.patches.tiktok.ad.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.tiktok.ad.annotations.TiktokAdsCompatibility
 
 @Name("convert-help-v2-feeditemlist-fingerprint")
-@MatchingMethod(
-    "Lbeancopy/ConvertHelp;",
-    "com${'$'}ss${'$'}ugc${'$'}aweme${'$'}proto${'$'}aweme_v2_feed_response${'$'}${'$'}com${'$'}ss${'$'}android${'$'}ugc${'$'}aweme${'$'}feed${'$'}model${'$'}FeedItemList",
-)
 @TiktokAdsCompatibility
 @Version("0.0.1")
 object ConvertHelpFeedItemListFingerprint : MethodFingerprint(

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

@@ -2,15 +2,10 @@ package app.revanced.patches.tiktok.ad.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.tiktok.ad.annotations.TiktokAdsCompatibility
 
 @Name("feed-item-clone-fingerprint")
-@MatchingMethod(
-    "Lcom/ss/android/ugc/aweme/feed/model/FeedItemList;",
-    "clone",
-)
 @TiktokAdsCompatibility
 @Version("0.0.1")
 object FeedItemListCloneFingerprint : MethodFingerprint(

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

@@ -3,13 +3,13 @@ package app.revanced.patches.tiktok.ad.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.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.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.tiktok.ad.annotations.TiktokAdsCompatibility
 import app.revanced.patches.tiktok.ad.fingerprints.ConvertHelpFeedItemListFingerprint
 import app.revanced.patches.tiktok.ad.fingerprints.FeedItemListCloneFingerprint
@@ -29,7 +29,7 @@ class TiktokAdsPatch : BytecodePatch(
         ConvertHelpFeedItemListFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         listOf(
             FeedItemListCloneFingerprint,
             ConvertHelpFeedItemListFingerprint

src/main/kotlin/app/revanced/patches/tiktok/feedfilter/fingerprints/FeedApiServiceLIZFingerprint.kt

@@ -3,16 +3,11 @@ package app.revanced.patches.tiktok.feedfilter.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.tiktok.feedfilter.annotations.FeedFilterCompatibility
 import org.jf.dexlib2.AccessFlags
 
 @Name("feed-api-service-fingerprint")
-@MatchingMethod(
-    "Lcom/ss/android/ugc/aweme/feed/FeedApiService;",
-    "LIZ",
-)
 @FeedFilterCompatibility
 @Version("0.0.1")
 object FeedApiServiceLIZFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/tiktok/feedfilter/patch/TiktokFeedFilter.kt

@@ -3,13 +3,13 @@ package app.revanced.patches.tiktok.feedfilter.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.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.tiktok.feedfilter.annotations.FeedFilterCompatibility
 import app.revanced.patches.tiktok.feedfilter.fingerprints.FeedApiServiceLIZFingerprint
 import app.revanced.patches.tiktok.misc.integrations.patch.TikTokIntegrationsPatch
@@ -30,7 +30,7 @@ class TiktokFeedFilter : BytecodePatch(
         SettingsStatusLoadFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val method = FeedApiServiceLIZFingerprint.result!!.mutableMethod
         for ((index, instruction) in method.implementation!!.instructions.withIndex()) {
             if (instruction.opcode != Opcode.RETURN_OBJECT) continue

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

@@ -3,13 +3,11 @@ package app.revanced.patches.tiktok.interaction.downloads.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.tiktok.interaction.downloads.annotations.DownloadsCompatibility
 import org.jf.dexlib2.AccessFlags
 
 @Name("acl-common-share-get-code")
-@MatchingMethod("ACLCommonShare", "getCode")
 @DownloadsCompatibility
 @Version("0.0.1")
 object ACLCommonShareFingerprint : MethodFingerprint(

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

@@ -3,13 +3,11 @@ package app.revanced.patches.tiktok.interaction.downloads.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.tiktok.interaction.downloads.annotations.DownloadsCompatibility
 import org.jf.dexlib2.AccessFlags
 
 @Name("acl-common-share-get-show-type")
-@MatchingMethod("ACLCommonShare", "getShowType")
 @DownloadsCompatibility
 @Version("0.0.1")
 object ACLCommonShareFingerprint2 : MethodFingerprint(

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

@@ -3,13 +3,11 @@ package app.revanced.patches.tiktok.interaction.downloads.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.tiktok.interaction.downloads.annotations.DownloadsCompatibility
 import org.jf.dexlib2.AccessFlags
 
 @Name("acl-common-share-get-transcode")
-@MatchingMethod("ACLCommonShare", "getTranscode")
 @DownloadsCompatibility
 @Version("0.0.1")
 object ACLCommonShareFingerprint3 : MethodFingerprint(

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

@@ -3,13 +3,11 @@ package app.revanced.patches.tiktok.interaction.downloads.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.tiktok.interaction.downloads.annotations.DownloadsCompatibility
 import org.jf.dexlib2.AccessFlags
 
 @Name("download-path-parent-fingerprint")
-@MatchingMethod("LX/4bF;", "LIZ")
 @DownloadsCompatibility
 @Version("0.0.1")
 object DownloadPathParentFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/patch/DownloadsPatch.kt

@@ -3,30 +3,34 @@ package app.revanced.patches.tiktok.interaction.downloads.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.impl.toMethodWalker
+import app.revanced.patcher.data.toMethodWalker
 import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.replaceInstruction
 import app.revanced.patcher.extensions.replaceInstructions
+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.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.tiktok.interaction.downloads.annotations.DownloadsCompatibility
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint2
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint3
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.DownloadPathParentFingerprint
+import app.revanced.patches.tiktok.misc.integrations.patch.TikTokIntegrationsPatch
 import app.revanced.patches.tiktok.misc.settings.fingerprints.SettingsStatusLoadFingerprint
+import app.revanced.patches.tiktok.misc.settings.patch.TikTokSettingsPatch
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
 import org.jf.dexlib2.iface.reference.StringReference
 
 @Patch
+@DependsOn([TikTokIntegrationsPatch::class, TikTokSettingsPatch::class])
 @Name("tiktok-download")
 @Description("Removes download restrictions and changes the default path to download to.")
 @DownloadsCompatibility
@@ -40,7 +44,7 @@ class DownloadsPatch : BytecodePatch(
         SettingsStatusLoadFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val method1 = ACLCommonShareFingerprint.result!!.mutableMethod
         method1.replaceInstructions(
             0,
@@ -88,7 +92,7 @@ class DownloadsPatch : BytecodePatch(
         }
         if (targetOffset == -1) return PatchResultError("Can not find download path uri method.")
         //Change videos' download path.
-        val downloadUriMethod = data
+        val downloadUriMethod = context
             .toMethodWalker(DownloadPathParentFingerprint.result!!.method)
             .nextMethod(targetOffset, true)
             .getMethod() as MutableMethod

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

@@ -2,13 +2,11 @@ package app.revanced.patches.tiktok.interaction.seekbar.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.tiktok.interaction.seekbar.annotations.SeekbarCompatibility
 import org.jf.dexlib2.AccessFlags
 
 @Name("aweme-get-video-control")
-@MatchingMethod("Aweme", "getVideoControl")
 @SeekbarCompatibility
 @Version("0.0.1")
 object AwemeGetVideoControlFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/tiktok/interaction/seekbar/patch/TiktokSeekbarPatch.kt

@@ -3,15 +3,15 @@ package app.revanced.patches.tiktok.interaction.seekbar.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.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.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.tiktok.interaction.seekbar.annotations.SeekbarCompatibility
-import app.revanced.patches.tiktok.interaction.seekbar.fingerprints.*
+import app.revanced.patches.tiktok.interaction.seekbar.fingerprints.AwemeGetVideoControlFingerprint
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.builder.instruction.BuilderInstruction11n
 import org.jf.dexlib2.builder.instruction.BuilderInstruction22c
@@ -26,9 +26,9 @@ class TiktokSeekbarPatch : BytecodePatch(
         AwemeGetVideoControlFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         //Get VideoControl FieldReference
-        val videoControl = data.findClass { it.type.endsWith("/VideoControl;") }
+        val videoControl = context.findClass { it.type.endsWith("/VideoControl;") }
             ?: return PatchResultError("Can not find target class")
         val fieldList = videoControl.immutableClass.fields.associateBy { field -> field.name }
 

src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/fingerprints/SpeedControlParentFingerprint.kt

@@ -3,13 +3,11 @@ package app.revanced.patches.tiktok.interaction.speed.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.tiktok.interaction.speed.annotations.SpeedCompatibility
 import org.jf.dexlib2.AccessFlags
 
 @Name("speed-control-parent-fingerprint")
-@MatchingMethod("LX/4cP;", "LJIILL")
 @SpeedCompatibility
 @Version("0.0.1")
 object SpeedControlParentFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/patch/SpeedPatch.kt

@@ -3,13 +3,13 @@ package app.revanced.patches.tiktok.interaction.speed.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.data.impl.toMethodWalker
+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.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.tiktok.interaction.speed.annotations.SpeedCompatibility
 import app.revanced.patches.tiktok.interaction.speed.fingerprints.SpeedControlParentFingerprint
@@ -25,12 +25,12 @@ class SpeedPatch : BytecodePatch(
         SpeedControlParentFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val parentMethod = SpeedControlParentFingerprint.result!!.mutableMethod
         val parentMethodInstructions = parentMethod.implementation!!.instructions
         for ((index, instruction) in parentMethodInstructions.withIndex()) {
             if (instruction.opcode != Opcode.INVOKE_VIRTUAL) continue
-            val isSpeedEnableMethod = data
+            val isSpeedEnableMethod = context
                 .toMethodWalker(parentMethod)
                 .nextMethod(index, true)
                 .getMethod() as MutableMethod

src/main/kotlin/app/revanced/patches/tiktok/misc/forcelogin/fingerprints/MandatoryLoginServiceFingerprint.kt

@@ -2,12 +2,10 @@ package app.revanced.patches.tiktok.misc.forcelogin.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.tiktok.misc.forcelogin.annotations.DisableForceLoginCompatibility
 
 @Name("mandatory-login-service-fingerprint")
-@MatchingMethod("/MandatoryLoginService;", "enableForcedLogin")
 @DisableForceLoginCompatibility
 @Version("0.0.1")
 object MandatoryLoginServiceFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/tiktok/misc/forcelogin/fingerprints/MandatoryLoginServiceFingerprint2.kt

@@ -2,12 +2,10 @@ package app.revanced.patches.tiktok.misc.forcelogin.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.tiktok.misc.forcelogin.annotations.DisableForceLoginCompatibility
 
 @Name("mandatory-login-service-fingerprint2")
-@MatchingMethod("/MandatoryLoginService;", "shouldShowForcedLogin")
 @DisableForceLoginCompatibility
 @Version("0.0.1")
 object MandatoryLoginServiceFingerprint2 : MethodFingerprint(

src/main/kotlin/app/revanced/patches/tiktok/misc/forcelogin/patch/DisableForceLoginPatch.kt

@@ -3,12 +3,12 @@ package app.revanced.patches.tiktok.misc.forcelogin.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.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.tiktok.misc.forcelogin.annotations.DisableForceLoginCompatibility
 import app.revanced.patches.tiktok.misc.forcelogin.fingerprints.MandatoryLoginServiceFingerprint
 import app.revanced.patches.tiktok.misc.forcelogin.fingerprints.MandatoryLoginServiceFingerprint2
@@ -24,7 +24,7 @@ class DisableForceLoginPatch : BytecodePatch(
         MandatoryLoginServiceFingerprint2
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         listOf(
             MandatoryLoginServiceFingerprint,
             MandatoryLoginServiceFingerprint2

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

@@ -2,14 +2,10 @@ package app.revanced.patches.tiktok.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.tiktok.misc.integrations.annotations.TikTokIntegrationsCompatibility
 
 @Name("init-fingerprint")
-@MatchingMethod(
-    "Lcom/ss/android/ugc/aweme/app/host/AwemeHostApplication;", "onCreate"
-)
 @TikTokIntegrationsCompatibility
 @Version("0.0.1")
 object InitFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/patch/TikTokIntegrationsPatch.kt

@@ -3,12 +3,12 @@ package app.revanced.patches.tiktok.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.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.patches.tiktok.misc.integrations.annotations.TikTokIntegrationsCompatibility
 import app.revanced.patches.tiktok.misc.integrations.fingerprints.InitFingerprint
 
@@ -21,8 +21,8 @@ class TikTokIntegrationsPatch : BytecodePatch(
         InitFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
-        if (data.findClass("Lapp/revanced/tiktok/utils/ReVancedUtils") == null)
+        if (context.findClass("Lapp/revanced/tiktok/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/tiktok/misc/settings/fingerprints/AdPersonalizationActivityFingerprint.kt

@@ -2,15 +2,10 @@ package app.revanced.patches.tiktok.misc.settings.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.tiktok.misc.settings.annotations.TikTokSettingsCompatibility
 
 @Name("ad-personalization-activity-fingerprint")
-@MatchingMethod(
-    "Lcom/bytedance/ies/ugc/aweme/commercialize/compliance/personalization/AdPersonalizationActivity;",
-    "onCreate"
-)
 @TikTokSettingsCompatibility
 @Version("0.0.1")
 object AdPersonalizationActivityFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/CopyRightSettingsStringFingerprint.kt

@@ -2,15 +2,10 @@ package app.revanced.patches.tiktok.misc.settings.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.tiktok.misc.settings.annotations.TikTokSettingsCompatibility
 
 @Name("copyright-settings-string-fingerprint")
-@MatchingMethod(
-    "Lcom/ss/android/ugc/aweme/setting/ui/SettingNewVersionFragment;",
-    "onViewCreated"
-)
 @TikTokSettingsCompatibility
 @Version("0.0.1")
 object CopyRightSettingsStringFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/SettingsStatusLoadFingerprint.kt

@@ -2,15 +2,10 @@ package app.revanced.patches.tiktok.misc.settings.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.tiktok.misc.settings.annotations.TikTokSettingsCompatibility
 
 @Name("settings-status-load-fingerprint")
-@MatchingMethod(
-    "Lapp/revanced/tiktok/settingsmenu/SettingsStatus;",
-    "load"
-)
 @TikTokSettingsCompatibility
 @Version("0.0.1")
 object SettingsStatusLoadFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/tiktok/misc/settings/patch/TikTokSettingsPatch.kt

@@ -3,15 +3,15 @@ package app.revanced.patches.tiktok.misc.settings.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.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.tiktok.misc.integrations.patch.TikTokIntegrationsPatch
 import app.revanced.patches.tiktok.misc.settings.annotations.TikTokSettingsCompatibility
 import app.revanced.patches.tiktok.misc.settings.fingerprints.AdPersonalizationActivityFingerprint
@@ -35,7 +35,7 @@ class TikTokSettingsPatch : BytecodePatch(
         CopyRightSettingsStringFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         //Replace string `Copyright Policy` to 'Revanced Settings` in TikTok settings.
         val method1 = CopyRightSettingsStringFingerprint.result!!.mutableMethod
         val implementation1 = method1.implementation!!
@@ -66,7 +66,7 @@ class TikTokSettingsPatch : BytecodePatch(
             if (clickInstruction.opcode != Opcode.INVOKE_DIRECT)
                 return PatchResultError("Can not find click listener.")
             val clickClass = ((clickInstruction as ReferenceInstruction).reference as MethodReference).definingClass
-            val mutableClickClass = data.findClass(clickClass)!!.resolve()
+            val mutableClickClass = context.findClass(clickClass)!!.mutableClass
             val mutableOnClickMethod = mutableClickClass.methods.first {
                 it.name == "onClick"
             }

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

@@ -2,13 +2,11 @@ package app.revanced.patches.twitter.ad.timeline.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.twitter.ad.timeline.annotations.TimelineAdsCompatibility
 import org.jf.dexlib2.Opcode
 
 @Name("timeline-tweet-json-parser-fingerprint")
-@MatchingMethod("LJsonTimelineTweet\$\$JsonObjectMapper;", "parseField")
 @TimelineAdsCompatibility
 @Version("0.0.1")
 object TimelineTweetJsonParserFingerprint : MethodFingerprint(

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

@@ -3,16 +3,16 @@ package app.revanced.patches.twitter.ad.timeline.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.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.fingerprint.method.impl.MethodFingerprintResult
+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.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.twitter.ad.timeline.annotations.TimelineAdsCompatibility
 import app.revanced.patches.twitter.ad.timeline.fingerprints.TimelineTweetJsonParserFingerprint
@@ -31,7 +31,7 @@ import org.jf.dexlib2.iface.reference.StringReference
 class TimelineAdsPatch : BytecodePatch(
     listOf(TimelineTweetJsonParserFingerprint)
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         if (removePromotedAds())
             return PatchResultError("The instruction for the tweet id field could not be found")
 

src/main/kotlin/app/revanced/patches/twitter/misc/dynamiccolor/patch/DynamicColorPatch.kt

@@ -3,12 +3,12 @@ package app.revanced.patches.twitter.misc.dynamiccolor.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.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.ResourcePatch
 import app.revanced.patches.twitter.misc.dynamiccolor.annotations.DynamicColorCompatibility
 import java.io.FileWriter
 import java.nio.file.Files
@@ -18,9 +18,9 @@ import java.nio.file.Files
 @Description("Replaces the default Twitter Blue with the users Material You palette.")
 @DynamicColorCompatibility
 @Version("0.0.1")
-class DynamicColorPatch : ResourcePatch() {
+class DynamicColorPatch : ResourcePatch {
-    override fun execute(data: ResourceData): PatchResult {
+    override fun execute(context: ResourceContext): PatchResult {
-        val resDirectory = data["res"]
+        val resDirectory = context["res"]
         if (!resDirectory.isDirectory) return PatchResultError("The res folder can not be found.")
 
         val valuesV31Directory = resDirectory.resolve("values-v31")
@@ -39,7 +39,7 @@ class DynamicColorPatch : ResourcePatch() {
             }
         }
 
-        data.xmlEditor["res/values-v31/colors.xml"].use { editor ->
+        context.xmlEditor["res/values-v31/colors.xml"].use { editor ->
             val document = editor.file
 
             mapOf(
@@ -62,7 +62,7 @@ class DynamicColorPatch : ResourcePatch() {
             }
         }
 
-        data.xmlEditor["res/values-night-v31/colors.xml"].use { editor ->
+        context.xmlEditor["res/values-night-v31/colors.xml"].use { editor ->
             val document = editor.file
 
             mapOf(

src/main/kotlin/app/revanced/patches/twitter/misc/monochrome/patch/MonochromeIconPatch.kt

@@ -3,12 +3,12 @@ package app.revanced.patches.twitter.misc.monochrome.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.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.ResourcePatch
 import app.revanced.patches.twitter.misc.monochrome.annotations.MonochromeIconCompatibility
 import java.io.FileWriter
 import java.nio.file.Files
@@ -18,9 +18,9 @@ import java.nio.file.Files
 @Description("Adds a monochrome icon.")
 @MonochromeIconCompatibility
 @Version("0.0.1")
-class MonochromeIconPatch : ResourcePatch() {
+class MonochromeIconPatch : ResourcePatch {
-    override fun execute(data: ResourceData): PatchResult {
+    override fun execute(context: ResourceContext): PatchResult {
-        val resDirectory = data["res"]
+        val resDirectory = context["res"]
         if (!resDirectory.isDirectory) return PatchResultError("The res folder can not be found.")
 
         val mipmapV33Directory = resDirectory.resolve("mipmap-anydpi-v33")

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

@@ -2,14 +2,10 @@ package app.revanced.patches.warnwetter.misc.firebasegetcert.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.warnwetter.misc.firebasegetcert.annotations.FirebaseGetCertPatchCompatibility
 
 @Name("messaging-app-certificate-fingerprint")
-@MatchingMethod(
-    "Lcom/google/firebase/installations/remote/c;", "f"
-)
 @FirebaseGetCertPatchCompatibility
 @Version("0.0.1")
 object GetMessagingCertFingerprint : MethodFingerprint(

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

@@ -2,14 +2,10 @@ package app.revanced.patches.warnwetter.misc.firebasegetcert.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.warnwetter.misc.firebasegetcert.annotations.FirebaseGetCertPatchCompatibility
 
 @Name("registration-app-certificate-fingerprint")
-@MatchingMethod(
-    "Lcom/google/firebase/remoteconfig/internal/ConfigFetchHttpClient;", "f"
-)
 @FirebaseGetCertPatchCompatibility
 @Version("0.0.1")
 object GetReqistrationCertFingerprint : MethodFingerprint(

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

@@ -3,13 +3,14 @@ package app.revanced.patches.warnwetter.misc.firebasegetcert.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.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.impl.BytecodePatch
-import app.revanced.patches.warnwetter.misc.firebasegetcert.fingerprints.*
 import app.revanced.patches.warnwetter.misc.firebasegetcert.annotations.FirebaseGetCertPatchCompatibility
+import app.revanced.patches.warnwetter.misc.firebasegetcert.fingerprints.GetMessagingCertFingerprint
+import app.revanced.patches.warnwetter.misc.firebasegetcert.fingerprints.GetReqistrationCertFingerprint
 
 @Name("spoof-cert-patch")
 @Description("Spoofs the X-Android-Cert header.")
@@ -21,7 +22,7 @@ class FirebaseGetCertPatch : BytecodePatch(
         GetMessagingCertFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val spoofedInstruction =
             """
                 const-string v0, "0799DDF0414D3B3475E88743C91C0676793ED450"

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

@@ -2,14 +2,10 @@ 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.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.warnwetter.misc.promocode.annotations.PromoCodeUnlockCompatibility
 
 @Name("promo-code-unlock-fingerprint")
-@MatchingMethod(
-    "Lde/dwd/warnapp/model/PromoTokenVerification;", "isValid"
-)
 @PromoCodeUnlockCompatibility
 @Version("0.0.1")
 object PromoCodeUnlockFingerprint : MethodFingerprint(

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

@@ -3,13 +3,13 @@ package app.revanced.patches.warnwetter.misc.promocode.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.warnwetter.misc.firebasegetcert.patch.FirebaseGetCertPatch
 import app.revanced.patches.warnwetter.misc.promocode.annotations.PromoCodeUnlockCompatibility
 import app.revanced.patches.warnwetter.misc.promocode.fingerprints.PromoCodeUnlockFingerprint
@@ -30,7 +30,7 @@ class PromoCodeUnlockPatch : BytecodePatch(
     )
 ) {
 
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val method = PromoCodeUnlockFingerprint.result!!.mutableMethod
         method.addInstructions(
             0,

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

@@ -1,12 +1,8 @@
 package app.revanced.patches.youtube.ad.general.bytecode.extensions
 
-import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.softCompareTo
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import org.jf.dexlib2.builder.BuilderInstruction
-import org.jf.dexlib2.builder.MutableMethodImplementation
 import org.jf.dexlib2.iface.Method
 import org.jf.dexlib2.iface.instruction.Instruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
@@ -16,21 +12,6 @@ import org.jf.dexlib2.iface.reference.Reference
 import org.jf.dexlib2.immutable.reference.ImmutableMethodReference
 
 internal object MethodExtensions {
-    internal fun MutableMethodImplementation.insertBlocks(
-        startIndex: Int,
-        vararg blocks: List<BuilderInstruction>,
-    ) {
-        blocks.reversed().forEach {
-            this.addInstructions(
-                startIndex, it
-            )
-        }
-    }
-
-    internal fun MutableClass.addMethod(mutableMethod: MutableMethod) {
-        this.methods.add(mutableMethod)
-    }
-
     internal fun MutableClass.findMutableMethodOf(
         method: Method
     ) = this.methods.first {

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

@@ -4,33 +4,31 @@ import app.revanced.extensions.injectHideCall
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.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.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.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patcher.util.smali.toInstructions
+import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.youtube.ad.general.annotation.GeneralAdsCompatibility
-import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.addMethod
 import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.findMutableMethodOf
-import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.insertBlocks
 import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.toDescriptor
-import app.revanced.patches.youtube.ad.general.bytecode.utils.MethodUtils.createMutableMethod
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.mapping.patch.ResourceMappingResourcePatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
 import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.builder.MutableMethodImplementation
+import org.jf.dexlib2.builder.instruction.BuilderInstruction10x
-import org.jf.dexlib2.builder.instruction.*
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.MethodImplementation
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
 import org.jf.dexlib2.iface.instruction.formats.Instruction21c
 import org.jf.dexlib2.iface.instruction.formats.Instruction22c
 import org.jf.dexlib2.iface.instruction.formats.Instruction31i
@@ -38,7 +36,6 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 import org.jf.dexlib2.iface.reference.FieldReference
 import org.jf.dexlib2.iface.reference.MethodReference
 import org.jf.dexlib2.iface.reference.StringReference
-import org.jf.dexlib2.immutable.reference.ImmutableMethodReference
 
 @Patch
 @DependsOn([ResourceMappingResourcePatch::class, IntegrationsPatch::class, SettingsPatch::class])
@@ -70,7 +67,7 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
         "LoggingProperties are not in proto format"
     )
 
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         SettingsPatch.PreferenceScreen.ADS.addPreferences(
             SwitchPreference(
                 "revanced_home_ads_removal",
@@ -96,7 +93,7 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
             SwitchPreference(
                 "revanced_adremover_community_posts_removal",
                 StringResource("revanced_adremover_community_posts_enabled_title", "Remove community posts"),
-                true,
+                false,
                 StringResource("revanced_adremover_community_posts_enabled_summary_on", "Community posts are hidden"),
                 StringResource("revanced_adremover_community_posts_enabled_summary_off", "Community posts are shown")
             ),
@@ -170,13 +167,6 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
                 StringResource("revanced_adremover_paid_content_enabled_summary_on", "Paid content is hidden"),
                 StringResource("revanced_adremover_paid_content_enabled_summary_off", "Paid content is shown")
             ),
-            SwitchPreference(
-                "revanced_adremover_suggested",
-                StringResource("revanced_adremover_suggested_enabled_title", "Remove personal suggestions"),
-                true,
-                StringResource("revanced_adremover_suggested_enabled_summary_on", "Personal suggestions are hidden"),
-                StringResource("revanced_adremover_suggested_enabled_summary_off", "Personal suggestions are shown")
-            ),
             SwitchPreference(
                 "revanced_adremover_hide_suggestions",
                 StringResource("revanced_adremover_hide_suggestions_enabled_title", "Hide suggestions"),
@@ -201,7 +191,7 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
         )
 
         // iterating through all classes is expensive
-        for (classDef in data.classes) {
+        for (classDef in context.classes) {
             var mutableClass: MutableClass? = null
 
             method@ for (method in classDef.methods) {
@@ -223,7 +213,7 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
                                     if (invokeInstruction.opcode != Opcode.INVOKE_VIRTUAL) return@forEachIndexed
 
                                     // create proxied method, make sure to not re-resolve() the current class
-                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableClass == null) mutableClass = context.proxy(classDef).mutableClass
                                     if (mutableMethod == null) mutableMethod =
                                         mutableClass!!.findMutableMethodOf(method)
 
@@ -240,7 +230,7 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
                                     if (iPutInstruction.opcode != Opcode.IPUT_OBJECT) return@forEachIndexed
 
                                     // create proxied method, make sure to not re-resolve() the current class
-                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableClass == null) mutableClass = context.proxy(classDef).mutableClass
                                     if (mutableMethod == null) mutableMethod =
                                         mutableClass!!.findMutableMethodOf(method)
 
@@ -255,7 +245,7 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
                                     if (invokeInstruction.opcode != Opcode.INVOKE_VIRTUAL) return@forEachIndexed
 
                                     // create proxied method, make sure to not re-resolve() the current class
-                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableClass == null) mutableClass = context.proxy(classDef).mutableClass
                                     if (mutableMethod == null) mutableMethod =
                                         mutableClass!!.findMutableMethodOf(method)
 
@@ -270,7 +260,7 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
                                     if (invokeInstruction.opcode != Opcode.IPUT_OBJECT) return@forEachIndexed
 
                                     // create proxied method, make sure to not re-resolve() the current class
-                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableClass == null) mutableClass = context.proxy(classDef).mutableClass
                                     if (mutableMethod == null) mutableMethod =
                                         mutableClass!!.findMutableMethodOf(method)
 
@@ -290,7 +280,7 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
                                     if (invokeInstruction.opcode != Opcode.INVOKE_DIRECT) return@forEachIndexed
 
                                     // create proxied method, make sure to not re-resolve() the current class
-                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableClass == null) mutableClass = context.proxy(classDef).mutableClass
                                     if (mutableMethod == null) mutableMethod =
                                         mutableClass!!.findMutableMethodOf(method)
 
@@ -312,7 +302,7 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
                                     if (stringInstruction.opcode == Opcode.CONST_STRING) return@forEachIndexed
 
                                     // create proxied method, make sure to not re-resolve() the current class
-                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableClass == null) mutableClass = context.proxy(classDef).mutableClass
                                     if (mutableMethod == null) mutableMethod =
                                         mutableClass!!.findMutableMethodOf(method)
 
@@ -329,72 +319,54 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
                                 }
 
                                 stringReferences[2] -> { // Litho ads
-                                    // create proxied method.
+                                    val proxy = context.proxy(classDef)
-                                    val proxy = data.proxy(classDef)
+                                    val proxiedClass = proxy.mutableClass
-                                    val proxiedClass = proxy.resolve()
 
-                                    // add getIsEmpty method
-                                    proxiedClass.addGetIsEmptyMethod()
-
-                                    // get required method to patch and get references from
                                     val lithoMethod = getLithoMethod(proxiedClass)
-                                        ?: return PatchResultError("Could not find required litho method to patch.")
+                                        ?: return PatchResultError("Could not find required Litho method to patch.")
-                                    val lithoMethodImplementation = lithoMethod.implementation!!
 
-                                    // create and add getTemplateName method
+                                    val instructionWithNeededDescriptor =
-                                    val getTemplateMethod =
+                                        lithoMethod.implementation!!.instructions.indexOfFirst {
-                                        proxiedClass.createGetTemplateNameMethod(lithoMethodImplementation)
+                                            it.opcode == Opcode.INVOKE_STATIC_RANGE
-                                    proxiedClass.addMethod(getTemplateMethod)
+                                        }
 
-                                    val lithoInstructions = lithoMethodImplementation.instructions
+                                    // get required descriptors
-                                    val thisType = proxiedClass.type
+                                    val createEmptyComponentDescriptor =
-                                    val templateNameParameterType = getTemplateMethod.parameterTypes.first()
+                                        lithoMethod.instruction(instructionWithNeededDescriptor)
+                                            .toDescriptor<MethodReference>()
+                                    val emptyComponentFieldDescriptor =
+                                        lithoMethod.instruction(instructionWithNeededDescriptor + 2)
+                                            .toDescriptor<FieldReference>()
 
-                                    // get reference descriptors
+                                    val pathBuilderAnchorFingerprint = object : MethodFingerprint(
-                                    val indexOfReference1 = lithoInstructions.indexOfFirst {
+                                        opcodes = listOf(
-                                        it.opcode == Opcode.INVOKE_STATIC_RANGE
+                                            Opcode.CONST_16,
-                                    }
+                                            Opcode.INVOKE_VIRTUAL,
-                                    val descriptor1 =
+                                            Opcode.IPUT_OBJECT
-                                        lithoInstructions.elementAt(indexOfReference1).toDescriptor<MethodReference>()
+                                        )
-                                    val descriptor2 = lithoInstructions.elementAt(indexOfReference1 + 2)
+                                    ) {}
-                                        .toDescriptor<FieldReference>()
 
-                                    // create label
+                                    val pathBuilderScanResult = pathBuilderAnchorFingerprint.also {
-                                    val lithoRemoveLabel = lithoMethodImplementation.newLabelForIndex(0)
+                                        it.resolve(context, lithoMethod, classDef)
+                                    }.result!!.scanResult.patternScanResult!!
 
-                                    // create branch instructions
+                                    val clobberedRegister =
-                                    val ifEqzFirstInstruction =
+                                        (lithoMethod.instruction(pathBuilderScanResult.startIndex) as OneRegisterInstruction).registerA
-                                        BuilderInstruction21t(Opcode.IF_EQZ, 0, lithoRemoveLabel)
-                                    val ifEqzSecondInstruction =
-                                        BuilderInstruction21t(Opcode.IF_EQZ, 1, lithoRemoveLabel)
 
-                                    // create blocks
+                                    val insertIndex = pathBuilderScanResult.endIndex + 1
-                                    val block1 = """
+                                    lithoMethod.addInstructions(
-                                        invoke-static/range {p3}, $thisType->getTemplateName($templateNameParameterType)Ljava/lang/String;
+                                        insertIndex, // right after setting the component.pathBuilder field,
-                                        move-result-object v0
+                                        """
-                                    """.toInstructions(lithoMethod)
+                                                invoke-static {v5, v2}, Lapp/revanced/integrations/patches/LithoFilterPatch;->filter(Ljava/lang/StringBuilder;Ljava/lang/String;)Z
-                                    val block2 = """
+                                                move-result v$clobberedRegister
-                                        move-object/from16 v1, p3
+                                                if-eqz v$clobberedRegister, :not_an_ad
-                                        iget-object v2, v1, $templateNameParameterType->b:Ljava/nio/ByteBuffer;
+                                                move-object/from16 v2, p1
-                                        invoke-static {v0, v2}, Lapp/revanced/integrations/patches/GeneralBytecodeAdsPatch;->containsAd(Ljava/lang/String;Ljava/nio/ByteBuffer;)Z
+                                                invoke-static {v2}, $createEmptyComponentDescriptor
-                                        move-result v1
+                                                move-result-object v0
-                                    """.toInstructions(lithoMethod)
+                                                iget-object v0, v0, $emptyComponentFieldDescriptor
-                                    val block3 = """
+                                                return-object v0
-                                        move-object/from16 v2, p1
+                                            """,
-                                        invoke-static {v2}, $descriptor1
+                                        listOf(ExternalLabel("not_an_ad", lithoMethod.instruction(insertIndex)))
-                                        move-result-object v0
-                                        iget-object v0, v0, $descriptor2
-                                        return-object v0
-                                    """.toInstructions(lithoMethod)
-
-                                    // insert blocks and branch instructions
-                                    lithoMethodImplementation.insertBlocks(
-                                        0,
-                                        block1,
-                                        listOf(ifEqzFirstInstruction),
-                                        block2,
-                                        listOf(ifEqzSecondInstruction),
-                                        block3,
                                     )
                                 }
                             }
@@ -414,142 +386,4 @@ class GeneralBytecodeAdsPatch : BytecodePatch() {
             instruction.opcode == Opcode.CONST && (instruction as Instruction31i).narrowLiteral == lithoConstant
         } ?: false
     }
-
-    private fun MutableClass.addGetIsEmptyMethod() {
-        val getIsEmptyImplementation = MutableMethodImplementation(1)
-
-        // create target instructions
-        val firstTargetInstruction = BuilderInstruction11n(Opcode.CONST_4, 0, 1)
-        val secondTargetInstruction = BuilderInstruction11n(Opcode.CONST_4, 0, 0)
-
-        // add instructions to the instruction list
-        getIsEmptyImplementation.addInstructions(
-            0, listOf(
-                // BuilderInstruction21t(Opcode.IF_EQZ, 0, first),
-                BuilderInstruction35c(
-                    Opcode.INVOKE_VIRTUAL,
-                    1,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    ImmutableMethodReference("Ljava/lang/String;", "isEmpty", null, "Z")
-                ),
-                BuilderInstruction11x(Opcode.MOVE_RESULT, 0),
-                // BuilderInstruction21t(Opcode.IF_EQZ, 0, second),
-                // BuilderInstruction10t(Opcode.GOTO, first),
-                secondTargetInstruction,
-                BuilderInstruction11x(Opcode.RETURN, 0),
-                firstTargetInstruction,
-                BuilderInstruction11x(Opcode.RETURN, 0),
-            )
-        )
-
-        val getIsEmptyInstructions = getIsEmptyImplementation.instructions
-
-        // create labels for the target instructions
-        val firstLabel =
-            getIsEmptyImplementation.newLabelForIndex(getIsEmptyInstructions.indexOf(firstTargetInstruction))
-        val secondLabel =
-            getIsEmptyImplementation.newLabelForIndex(getIsEmptyInstructions.indexOf(secondTargetInstruction))
-
-        // create branch instructions to the labels
-        val ifEqzFirstInstruction = BuilderInstruction21t(Opcode.IF_EQZ, 0, firstLabel)
-        val ifEqzSecondInstruction = BuilderInstruction21t(Opcode.IF_EQZ, 0, secondLabel)
-        val gotoInstruction = BuilderInstruction10t(Opcode.GOTO, firstLabel)
-
-        // insert remaining branch instructions, order of adding those instructions is important
-        getIsEmptyImplementation.addInstructions(
-            2, listOf(
-                ifEqzSecondInstruction, gotoInstruction
-            )
-        )
-        getIsEmptyImplementation.addInstruction(
-            0, ifEqzFirstInstruction
-        )
-
-        this.addMethod(
-            createMutableMethod(
-                this.type, "getIsEmpty", "Z", "Ljava/lang/String;", getIsEmptyImplementation
-            )
-        )
-    }
-
-    private fun MutableClass.createGetTemplateNameMethod(lithoMethodImplementation: MethodImplementation): MutableMethod {
-        var counter = 1
-        val descriptors = buildList {
-            for (instruction in lithoMethodImplementation.instructions) {
-                if (instruction !is ReferenceInstruction) continue
-                if (counter++ > 4) break
-
-                add(instruction.toDescriptor<MethodReference>())
-            }
-        }
-
-        val getTemplateNameImplementation = MutableMethodImplementation(2)
-
-        // create code blocks
-        val block1 = """
-            invoke-virtual {p0}, ${descriptors[0]}
-            move-result-object p0
-            const v0, $lithoConstant
-            invoke-static {p0, v0}, ${descriptors[1]}
-            move-result-object p0
-        """.toInstructions()
-        val block2 = """
-              invoke-static {p0}, ${descriptors[2]}
-              move-result-object p0
-              invoke-virtual {p0}, ${descriptors[3]}
-              move-result-object v0
-              invoke-static {v0}, ${this.type}->getIsEmpty(Ljava/lang/String;)Z
-              move-result v0
-        """.toInstructions()
-        val block3 = """
-              invoke-virtual {p0}, ${descriptors[3]}
-              move-result-object p0
-              return-object p0
-        """.toInstructions()
-
-        // create target instruction
-        val targetInstruction = BuilderInstruction11n(Opcode.CONST_4, 1, 0)
-        // and remaining instruction
-        val returnInstruction = BuilderInstruction11x(Opcode.RETURN_OBJECT, 1)
-
-        // insert blocks and instructions
-        getTemplateNameImplementation.insertBlocks(
-            0,
-            block1,
-            block2,
-            block3,
-            listOf(
-                targetInstruction, returnInstruction
-            ),
-        )
-
-        // create label for target instruction
-        val targetInstructionLabel =
-            getTemplateNameImplementation.newLabelForIndex(getTemplateNameImplementation.instructions.size - 2)
-
-        // create branch instructions to the label
-        val ifEqzInstruction = BuilderInstruction21t(Opcode.IF_EQZ, 1, targetInstructionLabel)
-        val ifNezInstruction = BuilderInstruction21t(Opcode.IF_NEZ, 0, targetInstructionLabel)
-
-        // insert branch instructions
-        getTemplateNameImplementation.addInstruction(
-            block1.size, ifEqzInstruction
-        )
-        getTemplateNameImplementation.addInstruction(
-            block1.size + block2.size + 1, ifNezInstruction
-        )
-
-        // create the method
-        return createMutableMethod(
-            this.type,
-            "getTemplateName",
-            "Ljava/lang/String;",
-            descriptors[0].split("->")[0], // a bit weird to get the type this way,
-            getTemplateNameImplementation
-        )
-    }
 }

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

@@ -4,13 +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.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.ad.infocardsuggestions.annotations.HideInfocardSuggestionsCompatibility
 import org.jf.dexlib2.AccessFlags
 
 @Name("hide-infocard-suggestions-fingerprint")
-@MatchingMethod("Liff;", "i")
 @FuzzyPatternScanMethod(2)
 @HideInfocardSuggestionsCompatibility
 @Version("0.0.1")

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

@@ -4,13 +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.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.ad.infocardsuggestions.annotations.HideInfocardSuggestionsCompatibility
 import org.jf.dexlib2.AccessFlags
 
 @Name("hide-infocard-suggestions-parent-fingerprint")
-@MatchingMethod("Liff;", "lE")
 @FuzzyPatternScanMethod(2)
 @HideInfocardSuggestionsCompatibility
 @Version("0.0.1")

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

@@ -3,15 +3,15 @@ package app.revanced.patches.youtube.ad.infocardsuggestions.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.replaceInstruction
 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.ad.infocardsuggestions.annotations.HideInfocardSuggestionsCompatibility
 import app.revanced.patches.youtube.ad.infocardsuggestions.fingerprints.HideInfocardSuggestionsFingerprint
 import app.revanced.patches.youtube.ad.infocardsuggestions.fingerprints.HideInfocardSuggestionsParentFingerprint
@@ -32,7 +32,7 @@ class HideInfocardSuggestionsPatch : BytecodePatch(
         HideInfocardSuggestionsParentFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         SettingsPatch.PreferenceScreen.ADS.addPreferences(
             SwitchPreference(
                 "revanced_info_cards_enabled",
@@ -47,7 +47,7 @@ class HideInfocardSuggestionsPatch : BytecodePatch(
             ?: return PatchResultError("Parent fingerprint not resolved!")
 
 
-        HideInfocardSuggestionsFingerprint.resolve(data, parentResult.classDef)
+        HideInfocardSuggestionsFingerprint.resolve(context, parentResult.classDef)
         val result = HideInfocardSuggestionsFingerprint.result
             ?: return PatchResultError("Required parent method could not be found.")
 

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

@@ -0,0 +1,18 @@
+package app.revanced.patches.youtube.ad.video.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.ad.video.annotations.VideoAdsCompatibility
+
+@Name("load-ads-fingerprint")
+
+@VideoAdsCompatibility
+@Version("0.0.1")
+object LoadAdsFingerprint : MethodFingerprint(
+    strings = listOf("Unexpected playerAd type: "),
+    customFingerprint = { method ->
+        method.parameterTypes.size > 0 && method.parameterTypes.first() == "Ljava/lang/String;"
+    }
+)

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

@@ -1,40 +0,0 @@
-package app.revanced.patches.youtube.ad.video.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patches.youtube.ad.video.annotations.VideoAdsCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@Name("show-video-ads-constructor-fingerprint")
-@MatchingMethod(
-    "Laair",
-    "<init>",
-)
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@VideoAdsCompatibility
-@Version("0.0.1")
-object ShowVideoAdsConstructorFingerprint : MethodFingerprint(
-    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L"), listOf(
-        Opcode.INVOKE_DIRECT,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.NEW_INSTANCE,
-        null, // either CONST_4 or CONST_16
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.CONST_4,
-        Opcode.IPUT_BOOLEAN,
-        Opcode.RETURN_VOID
-    )
-)

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

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

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

@@ -3,17 +3,17 @@ package app.revanced.patches.youtube.ad.video.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+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.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.youtube.ad.video.annotations.VideoAdsCompatibility
-import app.revanced.patches.youtube.ad.video.fingerprints.ShowVideoAdsConstructorFingerprint
+import app.revanced.patches.youtube.ad.video.fingerprints.LoadAdsFingerprint
-import app.revanced.patches.youtube.ad.video.fingerprints.ShowVideoAdsFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
@@ -27,10 +27,10 @@ import app.revanced.patches.youtube.misc.settings.framework.components.impl.Swit
 @Version("0.0.1")
 class VideoAdsPatch : BytecodePatch(
     listOf(
-        ShowVideoAdsConstructorFingerprint
+        LoadAdsFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         SettingsPatch.PreferenceScreen.ADS.addPreferences(
             SwitchPreference(
                 "revanced_video_ads_removal",
@@ -41,17 +41,20 @@ class VideoAdsPatch : BytecodePatch(
             )
         )
 
-        ShowVideoAdsFingerprint.resolve(
+        LoadAdsFingerprint.result!!.mutableMethod.let { method ->
-            data, ShowVideoAdsConstructorFingerprint.result!!.classDef
+            method.addInstructions(
-        )
+                0,
-
+                """ 
-        // Override the parameter by calling shouldShowAds and setting the parameter to the result
+                    invoke-static { }, Lapp/revanced/integrations/patches/VideoAdsPatch;->shouldShowAds()Z
-        ShowVideoAdsFingerprint.result!!.mutableMethod.addInstructions(
+                    move-result v1
-            0, """
+                    if-nez v1, :show_video_ads
-                invoke-static { }, Lapp/revanced/integrations/patches/VideoAdsPatch;->shouldShowAds()Z
+                    new-instance v0, Ljava/util/ArrayList;
-                move-result v1
+                    invoke-direct { v0 }, Ljava/util/ArrayList;-><init>()V
-            """
+                    return-object v0
-        )
+                """,
+                listOf(ExternalLabel("show_video_ads", method.instruction(0)))
+            )
+        }
 
         return PatchResultSuccess()
     }

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

@@ -3,12 +3,12 @@ package app.revanced.patches.youtube.interaction.downloads.bytecode.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.BytecodeContext
+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.interaction.downloads.annotation.DownloadsCompatibility
 import app.revanced.patches.youtube.interaction.downloads.resource.patch.DownloadsResourcePatch
 import app.revanced.patches.youtube.misc.playercontrols.bytecode.patch.PlayerControlsBytecodePatch
@@ -21,7 +21,7 @@ import app.revanced.patches.youtube.misc.videoid.patch.VideoIdPatch
 @DownloadsCompatibility
 @Version("0.0.1")
 class DownloadsBytecodePatch : BytecodePatch() {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val integrationsPackage = "app/revanced/integrations"
         val classDescriptor = "L$integrationsPackage/videoplayer/DownloadButton;"
 

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

@@ -3,11 +3,11 @@ package app.revanced.patches.youtube.interaction.downloads.resource.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.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.interaction.downloads.annotation.DownloadsCompatibility
 import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
 import app.revanced.patches.youtube.misc.playercontrols.resource.patch.BottomControlsResourcePatch
@@ -22,8 +22,8 @@ import app.revanced.util.resources.ResourceUtils.copyResources
 @Description("Makes necessary changes to resources for the download button.")
 @DownloadsCompatibility
 @Version("0.0.1")
-class DownloadsResourcePatch : ResourcePatch() {
+class DownloadsResourcePatch : ResourcePatch {
-    override fun execute(data: ResourceData): PatchResult {
+    override fun execute(context: ResourceContext): PatchResult {
         SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences(
             PreferenceScreen(
                 "revanced_downloads",
@@ -53,13 +53,13 @@ class DownloadsResourcePatch : ResourcePatch() {
          * Copy strings
          */
 
-        data.mergeStrings("downloads/host/values/strings.xml")
+        context.mergeStrings("downloads/host/values/strings.xml")
 
         /*
          * Copy resources
          */
 
-        data.copyResources("downloads", ResourceUtils.ResourceGroup("drawable", "revanced_yt_download_button.xml"))
+        context.copyResources("downloads", ResourceUtils.ResourceGroup("drawable", "revanced_yt_download_button.xml"))
 
         /*
         * Add download button node

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

@@ -3,15 +3,13 @@ package app.revanced.patches.youtube.interaction.seekbar.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.interaction.seekbar.annotation.SeekbarTappingCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("enable-seekbar-tapping-fingerprint")
-@MatchingMethod("Lfbl;", "onTouchEvent")
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @SeekbarTappingCompatibility
 @Version("0.0.1")

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

@@ -3,15 +3,13 @@ package app.revanced.patches.youtube.interaction.seekbar.fingerprints
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.interaction.seekbar.annotation.SeekbarTappingCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("enable-seekbar-tapping-parent-fingerprint")
-@MatchingMethod("Lzmx;", "I")
 @FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 @SeekbarTappingCompatibility
 @Version("0.0.1")

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

@@ -3,14 +3,14 @@ package app.revanced.patches.youtube.interaction.seekbar.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.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.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.interaction.seekbar.annotation.SeekbarTappingCompatibility
 import app.revanced.patches.youtube.interaction.seekbar.fingerprints.SeekbarTappingFingerprint
 import app.revanced.patches.youtube.interaction.seekbar.fingerprints.SeekbarTappingParentFingerprint
@@ -35,7 +35,7 @@ class EnableSeekbarTappingPatch : BytecodePatch(
         SeekbarTappingParentFingerprint, SeekbarTappingFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences(
             SwitchPreference(
                 "revanced_enable_tap_seeking",

src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/SwipeControlsHostActivityFingerprint.kt

@@ -2,16 +2,12 @@ package app.revanced.patches.youtube.interaction.swipecontrols.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.interaction.swipecontrols.annotation.SwipeControlsCompatibility
 
 @Name("swipe-controls-host-activity-fingerprint")
-@MatchingMethod(
+
-    "Lapp/revanced/integrations/swipecontrols/SwipeControlsHostActivity;", "<init>"
-)
-@DirectPatternScanMethod
 @SwipeControlsCompatibility
 @Version("0.0.1")
 object SwipeControlsHostActivityFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/fingerprints/WatchWhileActivityFingerprint.kt

@@ -2,16 +2,12 @@ package app.revanced.patches.youtube.interaction.swipecontrols.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.interaction.swipecontrols.annotation.SwipeControlsCompatibility
 
 @Name("watch-while-activity-fingerprint")
-@MatchingMethod(
+
-    "LWatchWhileActivity;", "<init>"
-)
-@DirectPatternScanMethod
 @SwipeControlsCompatibility
 @Version("0.0.1")
 object WatchWhileActivityFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/bytecode/SwipeControlsBytecodePatch.kt

@@ -5,12 +5,12 @@ import app.revanced.extensions.traverseClassHierarchy
 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.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.Companion.toMutable
 import app.revanced.patches.youtube.interaction.swipecontrols.annotation.SwipeControlsCompatibility
 import app.revanced.patches.youtube.interaction.swipecontrols.fingerprints.SwipeControlsHostActivityFingerprint
@@ -39,7 +39,7 @@ class SwipeControlsBytecodePatch : BytecodePatch(
         SwipeControlsHostActivityFingerprint
     )
 ) {
-    override fun execute(data: BytecodeData): PatchResult {
+    override fun execute(context: BytecodeContext): PatchResult {
         val wrapperClass = SwipeControlsHostActivityFingerprint.result!!.mutableClass
         val targetClass = WatchWhileActivityFingerprint.result!!.mutableClass
 
@@ -48,7 +48,7 @@ class SwipeControlsBytecodePatch : BytecodePatch(
         targetClass.setSuperClass(wrapperClass.type)
 
         // ensure all classes and methods in the hierarchy are non-final, so we can override them in integrations
-        data.traverseClassHierarchy(targetClass) {
+        context.traverseClassHierarchy(targetClass) {
             accessFlags = accessFlags and AccessFlags.FINAL.value.inv()
             transformMethods {
                 ImmutableMethod(

src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/patch/resource/SwipeControlsResourcePatch.kt

@@ -2,11 +2,11 @@ package app.revanced.patches.youtube.interaction.swipecontrols.patch.resource
 
 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.youtube.interaction.swipecontrols.annotation.SwipeControlsCompatibility
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.*
@@ -17,8 +17,8 @@ import app.revanced.util.resources.ResourceUtils.copyResources
 @DependsOn([SettingsPatch::class])
 @SwipeControlsCompatibility
 @Version("0.0.1")
-class SwipeControlsResourcePatch : ResourcePatch() {
+class SwipeControlsResourcePatch : ResourcePatch {
-    override fun execute(data: ResourceData): PatchResult {
+    override fun execute(context: ResourceContext): PatchResult {
         SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences(
             PreferenceScreen(
                 "revanced_swipe_controls", StringResource("revanced_swipe_controls_title", "Swipe controls"), listOf(
@@ -92,7 +92,7 @@ class SwipeControlsResourcePatch : ResourcePatch() {
             )
         )
 
-        data.copyResources(
+        context.copyResources(
             "swipecontrols",
             ResourceUtils.ResourceGroup(
                 "drawable",

src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/fingerprints/StartVideoInformerFingerprint.kt

@@ -4,14 +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.layout.autocaptions.annotations.AutoCaptionsCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("start-video-informer-fingerprint")
-@MatchingMethod("Laaxf;", "d")
 @FuzzyPatternScanMethod(3)
 @AutoCaptionsCompatibility
 @Version("0.0.1")

src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/fingerprints/SubtitleButtonControllerFingerprint.kt

@@ -3,14 +3,12 @@ package app.revanced.patches.youtube.layout.autocaptions.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.layout.autocaptions.annotations.AutoCaptionsCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("subtitle-button-controller-fingerprint")
-@MatchingMethod("Lcom/google/android/apps/youtube/app/player/overlay/SubtitleButtonController;", "E")
 @AutoCaptionsCompatibility
 @Version("0.0.1")
 object SubtitleButtonControllerFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/fingerprints/SubtitleTrackFingerprint.kt

@@ -3,14 +3,12 @@ package app.revanced.patches.youtube.layout.autocaptions.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.layout.autocaptions.annotations.AutoCaptionsCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
 @Name("subtitle-track-fingerprint")
-@MatchingMethod("Lcom/google/android/libraries/youtube/player/subtitles/model/SubtitleTrack;", "t")
 @AutoCaptionsCompatibility
 @Version("0.0.1")
 object SubtitleTrackFingerprint : MethodFingerprint(