some fixes

patches/src/main/kotlin/app/revanced/patches/amazon/DeepLinkingPatch.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.amazon
 
-import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.util.returnEarly
 
 @Suppress("unused")
 val deepLinkingPatch = bytecodePatch(
@@ -11,12 +11,6 @@ val deepLinkingPatch = bytecodePatch(
     compatibleWith("com.amazon.mShop.android.shopping")
 
     apply {
-        deepLinkingMethod.addInstructions(
+        deepLinkingMethod.returnEarly(true)
-            0,
-            """
-                const/4 v0, 0x1
-                return v0
-            """,
-        )
     }
 }

patches/src/main/kotlin/app/revanced/patches/cieid/restrictions/root/BypassRootChecksPatch.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.cieid.restrictions.root
 
-import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.util.returnEarly
 
 @Suppress("unused")
 val bypassRootChecksPatch = bytecodePatch(
@@ -11,6 +11,6 @@ val bypassRootChecksPatch = bytecodePatch(
     compatibleWith("it.ipzs.cieid")
 
     apply {
-        checkRootMethod.addInstruction(1, "return-void")
+        checkRootMethod.returnEarly()
     }
 }

patches/src/main/kotlin/app/revanced/patches/duolingo/ad/DisableAdsPatch.kt

@@ -21,10 +21,10 @@ val disableAdsPatch = bytecodePatch(
         // SharedPreferences has a debug boolean value with key "disable_ads", which maps to "DebugCategory.DISABLE_ADS".
         //
         // MonetizationDebugSettings seems to be the most general setting to work fine.
-        initializeMonetizationDebugSettingsMethod.match( // TODO
+        initializeMonetizationDebugSettingsMethodMatch.match(
-            monetizationDebugSettingsToStringMethod.classDef
+            monetizationDebugSettingsToStringMethod.classDef,
         ).method.apply {
-            val insertIndex = initializeMonetizationDebugSettingsMethod.instructionMatches.first().index
+            val insertIndex = initializeMonetizationDebugSettingsMethodMatch.indices.first()
             val register = getInstruction<TwoRegisterInstruction>(insertIndex).registerA
 
             addInstructions(

patches/src/main/kotlin/app/revanced/patches/duolingo/ad/Fingerprints.kt

@@ -5,15 +5,14 @@ import app.revanced.patcher.patch.BytecodePatchContext
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
-internal val BytecodePatchContext.initializeMonetizationDebugSettingsMethod by gettingFirstMutableMethodDeclaratively {
+internal val initializeMonetizationDebugSettingsMethodMatch = firstMethodComposite {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
     returnType("V")
     // Parameters have not been reliable for fingerprinting between versions.
     opcodes(Opcode.IPUT_BOOLEAN)
 }
 
-internal val BytecodePatchContext.monetizationDebugSettingsToStringMethod by gettingFirstMutableMethodDeclaratively(
+internal val BytecodePatchContext.monetizationDebugSettingsToStringMethod by gettingFirstMutableMethodDeclaratively {
-    "MonetizationDebugSettings(" // Partial string match.
-) {
     name("toString")
+    instructions(string("MonetizationDebugSettings(", String::contains))
 }

patches/src/main/kotlin/app/revanced/patches/duolingo/debug/EnableDebugMenuPatch.kt

@@ -10,7 +10,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Suppress("unused")
 val enableDebugMenuPatch = bytecodePatch(
     name = "Enable debug menu",
-    use = false
+    use = false,
 ) {
     compatibleWith("com.duolingo")
 
@@ -19,18 +19,13 @@ val enableDebugMenuPatch = bytecodePatch(
         debugCategoryAllowOnReleaseBuildsMethod.returnEarly(true)
 
         // Change build config debug build flag.
-        buildConfigProviderConstructorMethod.match( // TODO
+        buildConfigProviderConstructorMethodMatch.match(
-            buildConfigProviderToStringMethod.classDef
+            buildConfigProviderToStringMethod.classDef,
         ).let {
-            val index = it.patternMatch.startIndex // TODO
+            val index = it.indices.first()
 
-            it.apply {
+            val register = it.method.getInstruction<OneRegisterInstruction>(index).registerA
-                val register = getInstruction<OneRegisterInstruction>(index).registerA // TODO
+            it.method.addInstruction(index + 1, "const/4 v$register, 0x1")
-                addInstruction(
-                    index + 1,
-                    "const/4 v$register, 0x1"
-                )
-            }
         }
     }
 }

patches/src/main/kotlin/app/revanced/patches/duolingo/debug/Fingerprints.kt

@@ -12,17 +12,16 @@ internal val BytecodePatchContext.debugCategoryAllowOnReleaseBuildsMethod by get
     parameterTypes()
 }
 
-internal val BytecodePatchContext.buildConfigProviderConstructorMethod by gettingFirstMutableMethodDeclaratively {
+internal val buildConfigProviderConstructorMethodMatch = firstMethodComposite {
 
     accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
     parameterTypes()
     opcodes(Opcode.CONST_4)
 }
 
-internal val BytecodePatchContext.buildConfigProviderToStringMethod by gettingFirstMutableMethodDeclaratively(
+internal val BytecodePatchContext.buildConfigProviderToStringMethod by gettingFirstMutableMethodDeclaratively {
-    "BuildConfigProvider(" // Partial string match.
-) {
     name("toString")
     parameterTypes()
     returnType("Ljava/lang/String;")
+    instructions(string("BuildConfigProvider(", String::contains))
 }

patches/src/main/kotlin/app/revanced/patches/duolingo/energy/Fingerprints.kt

@@ -14,10 +14,12 @@ internal val BytecodePatchContext.initializeEnergyConfigMethod by gettingFirstMu
 }
 
 // Class name currently is not obfuscated, but it may be in the future.
-internal val BytecodePatchContext.energyConfigToStringMethod by gettingFirstMutableMethodDeclaratively(
+internal val BytecodePatchContext.energyConfigToStringMethod by gettingFirstMutableMethodDeclaratively {
-    "EnergyConfig(", "maxEnergy=" // Partial string matches.
-) {
     name("toString")
     parameterTypes()
     returnType("Ljava/lang/String;")
+    instructions(
+        string("EnergyConfig(", String::contains),
+        string("maxEnergy=", String::contains),
+    )
 }

patches/src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/BootloaderDetectionPatch.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.finanzonline.detection.bootloader
 
-import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.util.returnEarly
 
 @Suppress("unused")
 val bootloaderDetectionPatch = bytecodePatch(
@@ -11,14 +11,8 @@ val bootloaderDetectionPatch = bytecodePatch(
     compatibleWith("at.gv.bmf.bmf2go")
 
     apply {
-        setOf(createKeyMethod, bootStateMethod).forEach { fingerprint ->
+        setOf(createKeyMethod, bootStateMethod).forEach { method ->
-            fingerprint.addInstructions(
+            method.returnEarly(true)
-                0,
-                """
-                    const/4 v0, 0x1
-                    return v0
-                """,
-            )
         }
     }
 }

patches/src/main/kotlin/app/revanced/patches/finanzonline/detection/bootloader/Fingerprints.kt

@@ -29,18 +29,17 @@ internal val BytecodePatchContext.bootStateMethod by gettingFirstMutableMethodDe
         Opcode.IF_NE,
         Opcode.GOTO,
         Opcode.MOVE,
-        Opcode.RETURN
+        Opcode.RETURN,
     )
 }
 
-
 // Located @ at.gv.bmf.bmf2go.taxequalization.tools.utils.AttestationHelper#createKey (3.0.1)
 internal val BytecodePatchContext.createKeyMethod by gettingFirstMutableMethodDeclaratively(
     "attestation",
     "SHA-256",
     "random",
     "EC",
-    "AndroidKeyStore"
+    "AndroidKeyStore",
 ) {
     accessFlags(AccessFlags.PUBLIC)
     returnType("Z")

patches/src/main/kotlin/app/revanced/patches/googlenews/customtabs/EnableCustomTabsPatch.kt

@@ -13,8 +13,8 @@ val enableCustomTabsPatch = bytecodePatch(
     compatibleWith("com.google.android.apps.magazines")
 
     apply {
-        launchCustomTabMethod.apply {
+        launchCustomTabMethodMatch.method.apply {
-            val checkIndex = launchCustomTabMethod.instructionMatches.last().index + 1 // TODO
+            val checkIndex = launchCustomTabMethodMatch.indices.last() + 1
             val register = getInstruction<OneRegisterInstruction>(checkIndex).registerA
 
             replaceInstruction(checkIndex, "const/4 v$register, 0x1")

patches/src/main/kotlin/app/revanced/patches/googlenews/customtabs/Fingerprints.kt

@@ -2,13 +2,12 @@ package app.revanced.patches.googlenews.customtabs
 
 import app.revanced.patcher.accessFlags
 import app.revanced.patcher.definingClass
-import app.revanced.patcher.gettingFirstMutableMethodDeclaratively
+import app.revanced.patcher.firstMethodComposite
 import app.revanced.patcher.opcodes
-import app.revanced.patcher.patch.BytecodePatchContext
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
-internal val BytecodePatchContext.launchCustomTabMethod by gettingFirstMutableMethodDeclaratively {
+internal val launchCustomTabMethodMatch = firstMethodComposite {
     definingClass("CustomTabsArticleLauncher;"::endsWith)
     accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
     opcodes(

patches/src/main/kotlin/app/revanced/patches/hexeditor/ad/DisableAdsPatch.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.hexeditor.ad
 
-import app.revanced.patcher.extensions.replaceInstructions
 import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.util.returnEarly
 
 @Suppress("unused")
 val disableAdsPatch = bytecodePatch(
@@ -10,12 +10,6 @@ val disableAdsPatch = bytecodePatch(
     compatibleWith("com.myprog.hexedit")
 
     apply {
-        primaryAdsMethod.replaceInstructions(
+        primaryAdsMethod.returnEarly(true)
-            0,
-            """
-                const/4 v0, 0x1
-                return v0
-            """,
-        )
     }
 }

patches/src/main/kotlin/app/revanced/patches/lightroom/misc/bypassVersionCheck/DisableVersionCheckPatch.kt

@@ -1,22 +0,0 @@
-package app.revanced.patches.lightroom.misc.version
-
-import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patches.lightroom.misc.bypassVersionCheck.refreshRemoteConfigurationMethod
-
-@Suppress("unused")
-val disableVersionCheckPatch = bytecodePatch(
-    name = "Disable version check",
-    description = "Disables the server-side version check that prevents the app from starting.",
-) {
-    compatibleWith("com.adobe.lrmobile"("9.3.0"))
-
-    apply {
-        refreshRemoteConfigurationMethod.apply {
-            val igetIndex = refreshRemoteConfigurationMethod.patternMatch!!.endIndex // TODO
-
-            // This value represents the server command to clear all version restrictions.
-            val statusForceReset = "-0x2";
-            replaceInstruction(igetIndex, "const/4 v1, $statusForceReset")
-        }
-    }
-}

patches/src/main/kotlin/app/revanced/patches/lightroom/misc/login/DisableMandatoryLoginPatch.kt

@@ -1,5 +1,6 @@
 package app.revanced.patches.lightroom.misc.login
 
+import app.revanced.patcher.extensions.instructions
 import app.revanced.patcher.extensions.replaceInstruction
 import app.revanced.patcher.patch.bytecodePatch
 
@@ -10,10 +11,8 @@ val disableMandatoryLoginPatch = bytecodePatch(
     compatibleWith("com.adobe.lrmobile"("9.3.0"))
 
     apply {
-        isLoggedInMethod.apply {
+        val index = isLoggedInMethod.instructions.lastIndex - 1
-            val index = implementation!!.instructions.lastIndex - 1
+        // Set isLoggedIn = true.
-            // Set isLoggedIn = true.
+        isLoggedInMethod.replaceInstruction(index, "const/4 v0, 0x1")
-            replaceInstruction(index, "const/4 v0, 0x1")
-        }
     }
 }

patches/src/main/kotlin/app/revanced/patches/lightroom/misc/version/DisableVersionCheckPatch.kt

@@ -0,0 +1,20 @@
+package app.revanced.patches.lightroom.misc.version
+
+import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.patch.bytecodePatch
+
+@Suppress("unused")
+val disableVersionCheckPatch = bytecodePatch(
+    name = "Disable version check",
+    description = "Disables the server-side version check that prevents the app from starting.",
+) {
+    compatibleWith("com.adobe.lrmobile"("9.3.0"))
+
+    apply {
+        val igetIndex = refreshRemoteConfigurationMethodMatch.indices.last()
+
+        // This value represents the server command to clear all version restrictions.
+        val statusForceReset = "-0x2"
+        refreshRemoteConfigurationMethodMatch.method.replaceInstruction(igetIndex, "const/4 v1, $statusForceReset")
+    }
+}

patches/src/main/kotlin/app/revanced/patches/lightroom/misc/version/Fingerprints.kt

@@ -1,15 +1,14 @@
-package app.revanced.patches.lightroom.misc.bypassVersionCheck
+package app.revanced.patches.lightroom.misc.version
 
 import app.revanced.patcher.accessFlags
-import app.revanced.patcher.gettingFirstMutableMethodDeclaratively
+import app.revanced.patcher.firstMethodComposite
 import app.revanced.patcher.opcodes
-import app.revanced.patcher.patch.BytecodePatchContext
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
-internal val BytecodePatchContext.refreshRemoteConfigurationMethod by gettingFirstMutableMethodDeclaratively(
+internal val refreshRemoteConfigurationMethodMatch = firstMethodComposite(
     "com.adobe.lrmobile.denylisted_version_set_key",
-    "com.adobe.lrmobile.app_min_version_key"
+    "com.adobe.lrmobile.app_min_version_key",
 ) {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC)
     opcodes(

patches/src/main/kotlin/app/revanced/patches/messenger/metaai/Fingerprints.kt

@@ -7,12 +7,11 @@ import com.android.tools.smali.dexlib2.Opcode
 internal val BytecodePatchContext.getMobileConfigBoolMethod by gettingFirstMutableMethodDeclaratively {
     returnType("Z")
     opcodes(Opcode.RETURN)
-    custom { immutableClassDef.interfaces.contains("Lcom/facebook/mobileconfig/factory/MobileConfigUnsafeContext;") }
+    custom { "Lcom/facebook/mobileconfig/factory/MobileConfigUnsafeContext;" in immutableClassDef.interfaces }
 }
 
 internal val BytecodePatchContext.metaAIKillSwitchCheckMethod by gettingFirstMutableMethodDeclaratively("SearchAiagentImplementationsKillSwitch") {
     opcodes(Opcode.CONST_WIDE)
-
 }
 internal val BytecodePatchContext.extensionMethodMethod by gettingFirstMutableMethodDeclaratively("REPLACED_BY_PATCH") {
     name(EXTENSION_METHOD_NAME)

patches/src/main/kotlin/app/revanced/patches/music/layout/branding/Fingerprints.kt

@@ -4,14 +4,11 @@ import app.revanced.patcher.*
 import app.revanced.patcher.patch.BytecodePatchContext
 import app.revanced.patches.music.shared.YOUTUBE_MUSIC_MAIN_ACTIVITY_CLASS_TYPE
 import app.revanced.patches.shared.misc.mapping.ResourceType
-import app.revanced.patches.shared.misc.mapping.resourceLiteral
 
 internal val BytecodePatchContext.cairoSplashAnimationConfigMethod by gettingFirstMutableMethodDeclaratively {
     name("onCreate")
     returnType("V")
     definingClass(YOUTUBE_MUSIC_MAIN_ACTIVITY_CLASS_TYPE)
     parameterTypes("Landroid/os/Bundle;")
-    instructions(
+    instructions(ResourceType.LAYOUT("main_activity_launch_animation"))
-        resourceLiteral(ResourceType.LAYOUT, "main_activity_launch_animation")
-    )
 }

patches/src/main/kotlin/app/revanced/patches/music/misc/backgroundplayback/BackgroundPlaybackPatch.kt

@@ -1,6 +1,5 @@
 package app.revanced.patches.music.misc.backgroundplayback
 
-import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patches.music.misc.extension.sharedExtensionPatch
 import app.revanced.patches.music.misc.settings.settingsPatch
@@ -12,22 +11,18 @@ val backgroundPlaybackPatch = bytecodePatch(
 ) {
     dependsOn(
         sharedExtensionPatch,
-        settingsPatch
+        settingsPatch,
     )
 
     compatibleWith(
         "com.google.android.apps.youtube.music"(
             "7.29.52",
-            "8.10.52"
+            "8.10.52",
-        )
+        ),
     )
 
     apply {
-        kidsBackgroundPlaybackPolicyControllerMethod.addInstruction(
+        kidsBackgroundPlaybackPolicyControllerMethod.returnEarly()
-            0,
-            "return-void",
-        )
-
         backgroundPlaybackDisableMethod.returnEarly(true)
     }
 }

patches/src/main/kotlin/app/revanced/patches/protonvpn/splittunneling/UnlockSplitTunneling.kt

@@ -1,8 +1,8 @@
 package app.revanced.patches.protonvpn.splittunneling
 
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
+import app.revanced.patcher.extensions.removeInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.extensions.replaceInstruction
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow

patches/src/main/kotlin/app/revanced/patches/shared/misc/mapping/ResourceMappingPatch.kt

@@ -1,7 +1,6 @@
 package app.revanced.patches.shared.misc.mapping
 
-import app.revanced.patcher.InstructionLocation
+import app.revanced.patcher.Predicate
-import app.revanced.patcher.LiteralFilter
 import app.revanced.patcher.extensions.wideLiteral
 import app.revanced.patcher.literal
 import app.revanced.patcher.patch.PatchException
@@ -35,10 +34,12 @@ enum class ResourceType(val value: String) {
     STYLEABLE("styleable"),
     TRANSITION("transition"),
     VALUES("values"),
-    XML("xml");
+    XML("xml"),
+    ;
 
-    operator fun invoke(name: String): Instruction.() -> Boolean =
+    val id = getResourceId(this, name)
-        getResourceId(this, name).let { { wideLiteral(it) } }
+
+    operator fun invoke(name: String): Predicate<Instruction> = { wideLiteral == id }
 
     companion object {
         private val VALUE_MAP: Map<String, ResourceType> = entries.associateBy { it.value }
@@ -82,7 +83,7 @@ fun hasResourceId(type: ResourceType, name: String) = resourceMappings[type.valu
 fun resourceLiteral(
     type: ResourceType,
     name: String,
-    location: InstructionLocation = InstructionLocation.MatchAfterAnywhere()
+    location: InstructionLocation = InstructionLocation.MatchAfterAnywhere(),
 ) = literal({ getResourceId(type, name) }, null, location)
 
 val resourceMappingPatch = resourcePatch {

patches/src/main/kotlin/app/revanced/patches/soundcloud/offlinesync/EnableOfflineSyncPatch.kt

@@ -37,7 +37,7 @@ val enableOfflineSync = bytecodePatch(
 
         // Patch the URL builder to use the HTTPS_STREAM endpoint
         // instead of the offline sync endpoint to downloading the track.
-        downloadOperationsURLBuilderFingerprint.apply {
+        downloadOperationsURLBuilderMethod.apply {
             val getEndpointsEnumFieldIndex = 1
             val getEndpointsEnumFieldInstruction = getInstruction<OneRegisterInstruction>(getEndpointsEnumFieldIndex)
 
@@ -53,7 +53,7 @@ val enableOfflineSync = bytecodePatch(
         // The HTTPS_STREAM endpoint does not return the necessary headers for offline sync.
         // Mock the headers to prevent the app from crashing by setting them to empty strings.
         // The headers are all cosmetic and do not affect the functionality of the app.
-        downloadOperationsHeaderVerificationFingerprint.apply {
+        downloadOperationsHeaderVerificationMethod.apply {
             // The first three null checks need to be patched.
             instructions.asSequence().filter {
                 it.opcode == Opcode.IF_EQZ

patches/src/main/kotlin/app/revanced/patches/soundcloud/offlinesync/Fingerprints.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.patch.BytecodePatchContext
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
-internal val BytecodePatchContext.downloadOperationsURLBuilderFingerprint by gettingFirstMutableMethodDeclaratively {
+internal val BytecodePatchContext.downloadOperationsURLBuilderMethod by gettingFirstMutableMethodDeclaratively {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
     returnType("Ljava/lang/String")
     parameterTypes("L", "L")
@@ -16,10 +16,10 @@ internal val BytecodePatchContext.downloadOperationsURLBuilderFingerprint by get
     )
 }
 
-internal val BytecodePatchContext.downloadOperationsHeaderVerificationFingerprint by gettingFirstMutableMethodDeclaratively(
+internal val BytecodePatchContext.downloadOperationsHeaderVerificationMethod by gettingFirstMutableMethodDeclaratively(
     "X-SC-Mime-Type",
     "X-SC-Preset",
-    "X-SC-Quality"
+    "X-SC-Quality",
 ) {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
     returnType("V")

patches/src/main/kotlin/app/revanced/patches/strava/upselling/DisableSubscriptionSuggestionsPatch.kt

@@ -1,13 +1,12 @@
 package app.revanced.patches.strava.upselling
 
-import app.revanced.patcher.classDef
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.removeInstruction
 import app.revanced.patcher.patch.bytecodePatch
-import com.android.tools.smali.dexlib2.mutable.MutableMethod.Companion.toMutable
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
 import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
+import com.android.tools.smali.dexlib2.mutable.MutableMethod.Companion.toMutable
 
 @Suppress("unused")
 val disableSubscriptionSuggestionsPatch = bytecodePatch(
@@ -20,11 +19,11 @@ val disableSubscriptionSuggestionsPatch = bytecodePatch(
         val pageSuffix = "_upsell"
         val label = "original"
 
-        val className = getModulesMethod.classDef.type
+        val className = getModulesMethodMatch.classDef.type
-        val originalMethod = getModulesMethod
+        val originalMethod = getModulesMethodMatch.method
         val returnType = originalMethod.returnType
 
-        getModulesMethod.classDef.methods.add(
+        getModulesMethodMatch.classDef.methods.add(
             ImmutableMethod(
                 className,
                 helperMethodName,
@@ -53,16 +52,14 @@ val disableSubscriptionSuggestionsPatch = bytecodePatch(
             },
         )
 
-        val getModulesIndex = getModulesMethod.instructionMatches.first().index // TODO
+        val getModulesIndex = getModulesMethodMatch.indices.first()
-        with(originalMethod) {
+        originalMethod.removeInstruction(getModulesIndex)
-            removeInstruction(getModulesIndex)
+        originalMethod.addInstructions(
-            addInstructions(
+            getModulesIndex,
-                getModulesIndex,
+            """
-                """
+                invoke-direct {p0}, $className->$helperMethodName()$returnType
-                    invoke-direct {p0}, $className->$helperMethodName()$returnType
+                move-result-object v0
-                    move-result-object v0
+            """,
-                """,
+        )
-            )
-        }
     }
 }

patches/src/main/kotlin/app/revanced/patches/strava/upselling/Fingerprints.kt

@@ -1,13 +1,12 @@
 package app.revanced.patches.strava.upselling
 
 import app.revanced.patcher.definingClass
-import app.revanced.patcher.gettingFirstMutableMethodDeclaratively
+import app.revanced.patcher.firstMethodComposite
 import app.revanced.patcher.name
 import app.revanced.patcher.opcodes
-import app.revanced.patcher.patch.BytecodePatchContext
 import com.android.tools.smali.dexlib2.Opcode
 
-internal val BytecodePatchContext.getModulesMethod by gettingFirstMutableMethodDeclaratively {
+internal val getModulesMethodMatch = firstMethodComposite {
     name("getModules")
     definingClass("/GenericLayoutEntry;"::endsWith)
     opcodes(Opcode.IGET_OBJECT)

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

@@ -1,10 +1,6 @@
 package app.revanced.patches.tiktok.interaction.downloads
 
-import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.extensions.*
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.getInstruction
-import app.revanced.patcher.extensions.removeInstructions
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patches.tiktok.misc.extension.sharedExtensionPatch
 import app.revanced.patches.tiktok.misc.settings.settingsPatch
@@ -75,7 +71,7 @@ val downloadsPatch = bytecodePatch(
             }
         }
 
-        settingsStatusLoadFingerprint.method.addInstruction( // TODO
+        settingsStatusLoadFingerprint.method.addInstruction(
             0,
             "invoke-static {}, Lapp/revanced/extension/tiktok/settings/SettingsStatus;->enableDownload()V",
         )

patches/src/main/kotlin/app/revanced/patches/tumblr/annoyances/popups/DisableGiftMessagePopupPatch.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.tumblr.annoyances.popups
 
-import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.util.returnEarly
 
 @Suppress("unused")
 val disableGiftMessagePopupPatch = bytecodePatch(
@@ -11,6 +11,6 @@ val disableGiftMessagePopupPatch = bytecodePatch(
     compatibleWith("com.tumblr")
 
     apply {
-        showGiftMessagePopupMethod.addInstructions(0, "return-void")
+        showGiftMessagePopupMethod.returnEarly()
     }
 }

patches/src/main/kotlin/app/revanced/patches/twitch/ad/embedded/EmbeddedAdsPatch.kt

@@ -28,7 +28,7 @@ val embeddedAdsPatch = bytecodePatch(
             ListPreference("revanced_block_embedded_ads"),
         )
 
-        // Inject OkHttp3 application interceptor
+        // Inject OkHttp3 application interceptor.
         createsUsherClientMethod.addInstructions(
             3,
             """

patches/src/main/kotlin/app/revanced/patches/twitch/chat/autoclaim/AutoClaimChannelPointsPatch.kt

@@ -1,10 +1,10 @@
 package app.revanced.patches.twitch.chat.autoclaim
 
+import app.revanced.patcher.extensions.ExternalLabel
 import app.revanced.patcher.extensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.getInstruction
 import app.revanced.patcher.extensions.instructions
 import app.revanced.patcher.patch.bytecodePatch
-import app.revanced.patcher.extensions.ExternalLabel
 import app.revanced.patches.all.misc.resources.addResources
 import app.revanced.patches.all.misc.resources.addResourcesPatch
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference

patches/src/main/kotlin/app/revanced/patches/twitch/debug/DebugModePatch.kt

@@ -33,8 +33,8 @@ val debugModePatch = bytecodePatch(
             isDebugConfigEnabledMethod,
             isOmVerificationEnabledMethod,
             shouldShowDebugOptionsMethod,
-        ).forEach { fingerprint ->
+        ).forEach { method ->
-            fingerprint.addInstructions(
+            method.addInstructions(
                 0,
                 """
                     invoke-static {}, Lapp/revanced/extension/twitch/patches/DebugModePatch;->isDebugModeEnabled()Z