build: bump patcher to 19.0.0

build.gradle.kts

@@ -1,6 +1,7 @@
+import org.gradle.kotlin.dsl.support.listFilesOrdered
+
 plugins {
     kotlin("jvm") version "1.9.10"
-    alias(libs.plugins.ksp)
 }
 
 group = "app.revanced"
@@ -22,12 +23,9 @@ repositories {
 dependencies {
     implementation(libs.revanced.patcher)
     implementation(libs.smali)
-    implementation(libs.revanced.patch.annotation.processor)
     // Used in JsonGenerator.
     implementation(libs.gson)
     implementation(libs.flexver)
-
-    ksp(libs.revanced.patch.annotation.processor)
 }
 
 kotlin {
@@ -40,19 +38,20 @@ tasks {
         dependsOn(build)
 
         doLast {
-            val androidHome = System.getenv("ANDROID_HOME") ?: throw GradleException("ANDROID_HOME not found")
+            val d8 = File(System.getenv("ANDROID_HOME")).resolve("build-tools")
-            val d8 = "${androidHome}/build-tools/34.0.0/d8"
+                .listFilesOrdered().last().resolve("d8").absolutePath
-            val input = configurations.archives.get().allArtifacts.files.files.first().absolutePath
+
-            val work = layout.buildDirectory.dir("libs").get().asFile
+            val artifacts = configurations.archives.get().allArtifacts.files.files.first().absolutePath
+            val workingDirectory = layout.buildDirectory.dir("libs").get().asFile
 
             exec {
-                workingDir = work
+                workingDir = workingDirectory
-                commandLine = listOf(d8, input)
+                commandLine = listOf(d8, artifacts)
             }
 
             exec {
-                workingDir = work
+                workingDir = workingDirectory
-                commandLine = listOf("zip", "-u", input, "classes.dex")
+                commandLine = listOf("zip", "-u", artifacts, "classes.dex")
             }
         }
     }
@@ -65,12 +64,10 @@ tasks {
         mainClass.set("app.revanced.meta.PatchesFileGenerator")
     }
 
-    // Dummy task to fix the Gradle semantic-release plugin.
+    // Required to run tasks because Gradle semantic-release plugin runs the publish task.
-    // Remove this if you forked it to support building only.
+    // Tracking: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435
-    // Tracking issue: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435
     register<DefaultTask>("publish") {
-        group = "publish"
+        dependsOn("generateBundle")
-        description = "Dummy task"
+        dependsOn("generateMeta")
-        dependsOn(named("generateBundle"), named("generateMeta"))
     }
 }

gradle/libs.versions.toml

@@ -1,17 +1,11 @@
 [versions]
-revanced-patcher = "17.0.0"
+revanced-patcher = "19.0.0"
-revanced-patch-annotation-processor = "17.0.0"
-ksp = "1.9.10-1.0.13"
 smali = "3.0.3"
 gson = "2.10.1"
 flexver = "1.1.1"
 
 [libraries]
-revanced-patcher = { module = "app.revanced.revanced-patcher:revanced-patcher", version.ref = "revanced-patcher" }
+revanced-patcher = { module = "app.revanced:revanced-patcher", version.ref = "revanced-patcher" }
-revanced-patch-annotation-processor = { module = "app.revanced.revanced-patcher:revanced-patch-annotation-processor", version.ref = "revanced-patch-annotation-processor" }
 smali = { module = "com.android.tools.smali:smali", version.ref = "smali" }
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 flexver = { module = "com.unascribed:flexver-java", version.ref = "flexver" }
-
-[plugins]
-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }

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

@@ -1,7 +1,7 @@
 package app.revanced.extensions
 
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.proxy.mutableTypes.MutableField

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

@@ -18,7 +18,8 @@ internal class JsonGenerator : PatchesFileGenerator {
                 it.options.values.map { option ->
                     JsonPatch.Option(
                         option.key,
-                        option.value,
+                        option.default,
+                        option.values,
                         option.title,
                         option.description,
                         option.required
@@ -41,6 +42,7 @@ internal class JsonGenerator : PatchesFileGenerator {
         class Option(
             val key: String,
             val default: Any?,
+            val values: Map<String, Any?>?,
             val title: String?,
             val description: String?,
             val required: Boolean,

src/main/kotlin/app/revanced/patches/music/account/component/fingerprints/MenuEntryFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.account.component.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.MenuEntry
 import app.revanced.util.bytecode.isWideLiteralExists
 

src/main/kotlin/app/revanced/patches/music/account/handle/fingerprints/AccountSwitcherAccessibilityLabelFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.account.handle.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.AccountSwitcherAccessibility
 import app.revanced.util.bytecode.isWideLiteralExists
 

src/main/kotlin/app/revanced/patches/music/account/handle/fingerprints/NamesInactiveAccountThumbnailSizeFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.account.handle.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.NamesInactiveAccountThumbnailSize
 import app.revanced.util.bytecode.isWideLiteralExists
 import com.android.tools.smali.dexlib2.Opcode

src/main/kotlin/app/revanced/patches/music/account/tos/fingerprints/TermsOfServiceFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.account.tos.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.TosFooter
 import app.revanced.util.bytecode.isWideLiteralExists
 

src/main/kotlin/app/revanced/patches/music/actionbar/label/ActionBarLabelPatch.kt

@@ -4,7 +4,6 @@ import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch

src/main/kotlin/app/revanced/patches/music/actionbar/label/fingerprints/ActionBarLabelFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.actionbar.label.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 

src/main/kotlin/app/revanced/patches/music/flyoutpanel/compactdialog/fingerprints/DialogSolidFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.flyoutpanel.compactdialog.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.DialogSolid
 import app.revanced.util.bytecode.isWideLiteralExists
 import com.android.tools.smali.dexlib2.AccessFlags

src/main/kotlin/app/revanced/patches/music/flyoutpanel/sleeptimer/fingerprints/SleepTimerFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.flyoutpanel.sleeptimer.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.util.bytecode.isWide32LiteralExists
 
 object SleepTimerFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/general/branding/name/CustomBrandingNamePatch.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patcher.patch.options.types.StringPatchOption.Companion.stringPatchOption
+import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption
 
 @Patch(
     name = "Custom branding Music name",
@@ -27,41 +27,50 @@ import app.revanced.patcher.patch.options.types.StringPatchOption.Companion.stri
 object CustomBrandingNamePatch : ResourcePatch() {
     override fun execute(context: ResourceContext) {
 
-        val longName = MusicLongName
+        AppNameNotification?.let { notificationName ->
-            ?: throw PatchException("Invalid app name.")
+            AppNameLauncher?.let { launcherName ->
+                context.xmlEditor["res/values/strings.xml"].use { editor ->
+                    val document = editor.file
 
-        val shortName = MusicShortName
+                    mapOf(
-            ?: throw PatchException("Invalid app name.")
+                        "app_name" to notificationName,
+                        "app_launcher_name" to launcherName
+                    ).forEach { (k, v) ->
+                        val stringElement = document.createElement("string")
 
-        context.xmlEditor["res/values/strings.xml"].use { editor ->
+                        stringElement.setAttribute("name", k)
-            val document = editor.file
+                        stringElement.textContent = v
-
-            mapOf(
-                "app_name" to longName,
-                "app_launcher_name" to shortName
-            ).forEach { (k, v) ->
-                val stringElement = document.createElement("string")
-
-                stringElement.setAttribute("name", k)
-                stringElement.textContent = v
-
-                document.getElementsByTagName("resources").item(0).appendChild(stringElement)
-            }
-        }
 
+                        document.getElementsByTagName("resources").item(0)
+                            .appendChild(stringElement)
+                    }
+                }
+            } ?: throw PatchException("Invalid app name.")
+        } ?: throw PatchException("Invalid app name.")
     }
 
-    internal var MusicLongName by stringPatchOption(
+    private const val APP_NAME_NOTIFICATION = "ReVanced Extended Music"
-        key = "MusicLongName",
+    private const val APP_NAME_LAUNCHER = "RVX Music"
-        default = "ReVanced Extended Music",
+
-        title = "Application Name of YouTube Music",
+    internal var AppNameNotification by stringPatchOption(
-        description = "The name of the YouTube Music it will show on your notification panel."
+        key = "AppNameNotification",
+        default = APP_NAME_NOTIFICATION,
+        values = mapOf(
+            "Full name" to APP_NAME_NOTIFICATION,
+            "Short name" to APP_NAME_LAUNCHER
+        ),
+        title = "App name in notification panel",
+        description = "The name of the app as it appears in the notification panel."
     )
 
-    internal var MusicShortName by stringPatchOption(
+    internal var AppNameLauncher by stringPatchOption(
-        key = "MusicShortName",
+        key = "AppNameLauncher",
-        default = "RVX Music",
+        default = APP_NAME_LAUNCHER,
-        title = "Application Name of YouTube Music",
+        values = mapOf(
-        description = "The name of the YouTube Music it will show on your home screen."
+            "Full name" to APP_NAME_NOTIFICATION,
+            "Short name" to APP_NAME_LAUNCHER
+        ),
+        title = "App name in launcher",
+        description = "The name of the app as it appears in the launcher."
     )
 }

src/main/kotlin/app/revanced/patches/music/general/castbutton/fingerprints/MediaRouteButtonFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.general.castbutton.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 
 object MediaRouteButtonFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/general/castbutton/fingerprints/PlayerOverlayChipFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.general.castbutton.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.PlayerOverlayChip
 import app.revanced.util.bytecode.isWideLiteralExists
 import com.android.tools.smali.dexlib2.AccessFlags

src/main/kotlin/app/revanced/patches/music/general/categorybar/fingerprints/ChipCloudFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.general.categorybar.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.ChipCloud
 import app.revanced.util.bytecode.isWideLiteralExists
 import com.android.tools.smali.dexlib2.Opcode

src/main/kotlin/app/revanced/patches/music/general/floatingbutton/NewPlaylistButtonPatch.kt

@@ -4,7 +4,6 @@ import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch

src/main/kotlin/app/revanced/patches/music/general/floatingbutton/fingerprints/FloatingButtonFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.general.floatingbutton.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 

src/main/kotlin/app/revanced/patches/music/general/floatingbutton/fingerprints/FloatingButtonParentFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.general.floatingbutton.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.util.bytecode.isNarrowLiteralExists
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

src/main/kotlin/app/revanced/patches/music/general/landscapemode/fingerprints/TabletIdentifierFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.general.landscapemode.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.IsTablet
 import app.revanced.util.bytecode.isWideLiteralExists
 import com.android.tools.smali.dexlib2.AccessFlags

src/main/kotlin/app/revanced/patches/music/general/oldstylelibraryshelf/fingerprints/BrowseIdFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.general.oldstylelibraryshelf.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.util.bytecode.isWide32LiteralExists
 import com.android.tools.smali.dexlib2.AccessFlags
 

src/main/kotlin/app/revanced/patches/music/general/startpage/fingerprints/ColdStartUpFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.general.startpage.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 

src/main/kotlin/app/revanced/patches/music/general/tooltip/fingerprints/TooltipContentViewFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.general.tooltip.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.ToolTipContentView
 import app.revanced.util.bytecode.isWideLiteralExists
 import com.android.tools.smali.dexlib2.AccessFlags

src/main/kotlin/app/revanced/patches/music/misc/backgroundplay/fingerprints/BackgroundPlaybackParentFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.misc.backgroundplay.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 

src/main/kotlin/app/revanced/patches/music/misc/exclusiveaudio/fingerprints/DataSavingSettingsFragmentFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.misc.exclusiveaudio.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 
 object DataSavingSettingsFragmentFingerprint : MethodFingerprint(
     returnType = "V",

src/main/kotlin/app/revanced/patches/music/misc/exclusiveaudio/fingerprints/MusicBrowserServiceFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.misc.exclusiveaudio.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 
 object MusicBrowserServiceFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/misc/exclusiveaudio/fingerprints/PodCastConfigFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.misc.exclusiveaudio.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.util.bytecode.isWide32LiteralExists
 import com.android.tools.smali.dexlib2.AccessFlags
 

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

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.misc.minimizedplayback.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 

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

@@ -5,7 +5,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch

src/main/kotlin/app/revanced/patches/music/misc/premium/fingerprints/AccountMenuFooterFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.misc.premium.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.PrivacyTosFooter
 import app.revanced.util.bytecode.isWideLiteralExists
 import com.android.tools.smali.dexlib2.AccessFlags

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

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.misc.premium.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 

src/main/kotlin/app/revanced/patches/music/misc/premium/fingerprints/MembershipSettingsFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.misc.premium.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 
 object MembershipSettingsFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/misc/premium/fingerprints/MembershipSettingsParentFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.misc.premium.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 
 object MembershipSettingsParentFingerprint : MethodFingerprint(

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

@@ -1,8 +1,8 @@
 package app.revanced.patches.music.misc.tastebuilder.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.fingerprint.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.annotation.FuzzyPatternScanMethod
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 

src/main/kotlin/app/revanced/patches/music/navigation/black/fingerprints/TabLayoutFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.navigation.black.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.ColorGrey
 import app.revanced.util.bytecode.isWideLiteralExists
 import com.android.tools.smali.dexlib2.AccessFlags

src/main/kotlin/app/revanced/patches/music/navigation/component/fingerprints/TabLayoutTextFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.navigation.component.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.Text1
 import app.revanced.util.bytecode.isWideLiteralExists
 import com.android.tools.smali.dexlib2.AccessFlags

src/main/kotlin/app/revanced/patches/music/player/colormatchplayer/ColorMatchPlayerPatch.kt

@@ -5,7 +5,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch

src/main/kotlin/app/revanced/patches/music/player/colormatchplayer/fingerprints/NewPlayerColorFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.player.colormatchplayer.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 

src/main/kotlin/app/revanced/patches/music/player/minimizedplayer/fingerprints/MinimizedPlayerFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.player.minimizedplayer.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 

src/main/kotlin/app/revanced/patches/music/player/newplayerbackground/fingerprints/NewPlayerBackgroundFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.player.newplayerbackground.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.util.bytecode.isWide32LiteralExists
 
 object NewPlayerBackgroundFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/player/oldstyleminiplayer/OldStyleMiniPlayerPatch.kt

@@ -4,7 +4,6 @@ import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch

src/main/kotlin/app/revanced/patches/music/player/oldstyleminiplayer/fingerprints/NextButtonVisibilityFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.player.oldstyleminiplayer.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 

src/main/kotlin/app/revanced/patches/music/player/oldstyleminiplayer/fingerprints/SwipeToCloseFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.player.oldstyleminiplayer.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.util.bytecode.isWide32LiteralExists
 
 object SwipeToCloseFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/player/repeat/fingerprints/RepeatTrackFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.player.repeat.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 

src/main/kotlin/app/revanced/patches/music/player/replace/fingerprints/CastButtonContainerFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.player.replace.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.PlayerCastMediaRouteButton
 import app.revanced.util.bytecode.isWideLiteralExists
 

src/main/kotlin/app/revanced/patches/music/player/replace/fingerprints/PlaybackStartDescriptorFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.player.replace.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 

src/main/kotlin/app/revanced/patches/music/player/shuffle/fingerprints/MusicPlaybackControlsFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.player.shuffle.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 

src/main/kotlin/app/revanced/patches/music/player/shuffle/fingerprints/ShuffleClassReferenceFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.player.shuffle.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 

src/main/kotlin/app/revanced/patches/music/player/zenmode/ZenModePatch.kt

@@ -5,7 +5,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch

src/main/kotlin/app/revanced/patches/music/player/zenmode/fingerprints/ZenModeFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.player.zenmode.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 

src/main/kotlin/app/revanced/patches/music/utils/actionbarhook/ActionBarHookPatch.kt

@@ -4,7 +4,6 @@ import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.music.utils.actionbarhook.fingerprints.ActionBarHookFingerprint

src/main/kotlin/app/revanced/patches/music/utils/actionbarhook/fingerprints/ActionBarHookFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.utils.actionbarhook.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 

src/main/kotlin/app/revanced/patches/music/utils/fingerprints/ActionsBarParentFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.utils.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.ActionsContainer
 import app.revanced.util.bytecode.isWideLiteralExists
 import com.android.tools.smali.dexlib2.AccessFlags

src/main/kotlin/app/revanced/patches/music/utils/fingerprints/MenuItemFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.utils.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 

src/main/kotlin/app/revanced/patches/music/utils/fingerprints/NewPlayerLayoutFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.utils.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.util.bytecode.isWide32LiteralExists
 
 object NewPlayerLayoutFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/utils/fingerprints/PlayerColorFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.utils.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 

src/main/kotlin/app/revanced/patches/music/utils/fingerprints/SeekBarConstructorFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.utils.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.InlineTimeBarAdBreakMarkerColor
 import app.revanced.util.bytecode.isWideLiteralExists
 

src/main/kotlin/app/revanced/patches/music/utils/fix/androidauto/fingerprints/CertificateCheckFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.utils.fix.androidauto.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 
 object CertificateCheckFingerprint : MethodFingerprint(
     returnType = "Z",

src/main/kotlin/app/revanced/patches/music/utils/fix/clientspoof/fingerprints/UserAgentHeaderBuilderFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.utils.fix.clientspoof.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode
 
 object UserAgentHeaderBuilderFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/utils/flyoutbutton/fingerprints/FlyoutPanelLikeButtonFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.utils.flyoutbutton.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.MusicMenuLikeButtons
 import app.revanced.util.bytecode.isWideLiteralExists
 import com.android.tools.smali.dexlib2.AccessFlags

src/main/kotlin/app/revanced/patches/music/utils/intenthook/fingerprints/FullStackTraceActivityFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.utils.intenthook.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 
 object FullStackTraceActivityFingerprint : MethodFingerprint(
     returnType = "V",

src/main/kotlin/app/revanced/patches/music/utils/litho/fingerprints/LithoFilterFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.utils.litho.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 
 object LithoFilterFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/utils/microg/MicroGPatch.kt

@@ -56,10 +56,10 @@ object MicroGPatch : BytecodePatch(
     // - "com.google.android.gms.phenotype.UPDATE",
     // - "com.google.android.gms.phenotype",
     override fun execute(context: BytecodeContext) {
-        val youtubePackageName = PackageNamePatch.YouTubePackageName
+        val youtubePackageName = PackageNamePatch.PackageNameYouTube
             ?: throw PatchException("Invalid package name.")
 
-        val musicPackageName = PackageNamePatch.MusicPackageName
+        val musicPackageName = PackageNamePatch.PackageNameYouTubeMusic
             ?: throw PatchException("Invalid package name.")
 
         if (youtubePackageName == YOUTUBE_PACKAGE_NAME || musicPackageName == MUSIC_PACKAGE_NAME)

src/main/kotlin/app/revanced/patches/music/utils/microg/MicroGResourcePatch.kt

@@ -15,7 +15,7 @@ import app.revanced.util.resources.MusicResourceHelper.setMicroG
 @Patch(dependencies = [PackageNamePatch::class])
 object MicroGResourcePatch : ResourcePatch() {
     override fun execute(context: ResourceContext) {
-        val packageName = PackageNamePatch.MusicPackageName
+        val packageName = PackageNamePatch.PackageNameYouTubeMusic
             ?: throw PatchException("Invalid package name.")
 
         if (packageName == MUSIC_PACKAGE_NAME)

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

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.utils.microg.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 
 object CastContextFetchFingerprint : MethodFingerprint(
     strings = listOf("Error fetching CastContext.")

src/main/kotlin/app/revanced/patches/music/utils/microg/fingerprints/CastDynamiteModuleFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.utils.microg.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 
 object CastDynamiteModuleFingerprint : MethodFingerprint(
     strings = listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")

src/main/kotlin/app/revanced/patches/music/utils/microg/fingerprints/CastDynamiteModuleV2Fingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.utils.microg.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 
 object CastDynamiteModuleV2Fingerprint : MethodFingerprint(
     strings = listOf("Failed to load module via V2: ")

src/main/kotlin/app/revanced/patches/music/utils/microg/fingerprints/GooglePlayUtilityFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.utils.microg.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 
 object GooglePlayUtilityFingerprint : MethodFingerprint(

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

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.utils.microg.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 
 object PrimeFingerprint : MethodFingerprint(
     strings = listOf("com.google.android.GoogleCamera", "com.android.vending")

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

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.utils.microg.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 
 object ServiceCheckFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/utils/overridequality/fingerprints/VideoQualityListFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.utils.overridequality.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.QualityAuto
 import app.revanced.util.bytecode.isWideLiteralExists
 import com.android.tools.smali.dexlib2.Opcode

src/main/kotlin/app/revanced/patches/music/utils/overridequality/fingerprints/VideoQualityPatchFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.utils.overridequality.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 
 object VideoQualityPatchFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/utils/overridespeed/OverrideSpeedHookPatch.kt

@@ -6,7 +6,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMutable
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod

src/main/kotlin/app/revanced/patches/music/utils/overridespeed/fingerprints/PlaybackSpeedFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.utils.overridespeed.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 

src/main/kotlin/app/revanced/patches/music/utils/overridespeed/fingerprints/PlaybackSpeedParentFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.utils.overridespeed.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 
 object PlaybackSpeedParentFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/utils/overridespeed/fingerprints/PlaybackSpeedPatchFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.utils.overridespeed.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 
 object PlaybackSpeedPatchFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/utils/playertype/fingerprint/PlayerTypeFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.utils.playertype.fingerprint
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 

src/main/kotlin/app/revanced/patches/music/utils/returnyoutubedislike/ReturnYouTubeDislikeBytecodePatch.kt

@@ -4,7 +4,7 @@ import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotation.Patch

src/main/kotlin/app/revanced/patches/music/utils/returnyoutubedislike/fingerprints/DislikeFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.utils.returnyoutubedislike.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 
 object DislikeFingerprint : MethodFingerprint(
     returnType = "V",

src/main/kotlin/app/revanced/patches/music/utils/returnyoutubedislike/fingerprints/LikeFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.utils.returnyoutubedislike.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 
 object LikeFingerprint : MethodFingerprint(
     returnType = "V",

src/main/kotlin/app/revanced/patches/music/utils/returnyoutubedislike/fingerprints/RemoveLikeFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.utils.returnyoutubedislike.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 
 object RemoveLikeFingerprint : MethodFingerprint(
     returnType = "V",

src/main/kotlin/app/revanced/patches/music/utils/returnyoutubedislike/fingerprints/TextComponentFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.utils.returnyoutubedislike.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.SharedResourceIdPatch.ButtonIconPaddingMedium
 import app.revanced.util.bytecode.isWideLiteralExists
 import com.android.tools.smali.dexlib2.Opcode

src/main/kotlin/app/revanced/patches/music/utils/settings/fingerprints/PreferenceFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.utils.settings.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode
 
 object PreferenceFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/utils/settings/fingerprints/SettingsHeadersFragmentFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.utils.settings.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode
 
 object SettingsHeadersFragmentFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/utils/sponsorblock/SponsorBlockBytecodePatch.kt

@@ -5,7 +5,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.music.utils.fingerprints.SeekBarConstructorFingerprint

src/main/kotlin/app/revanced/patches/music/utils/sponsorblock/fingerprints/MusicPlaybackControlsTimeBarDrawFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.utils.sponsorblock.bytecode.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 
 object MusicPlaybackControlsTimeBarDrawFingerprint : MethodFingerprint(
     returnType = "V",

src/main/kotlin/app/revanced/patches/music/utils/sponsorblock/fingerprints/MusicPlaybackControlsTimeBarOnMeasureFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.utils.sponsorblock.bytecode.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode
 
 object MusicPlaybackControlsTimeBarOnMeasureFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/utils/sponsorblock/fingerprints/SeekbarOnDrawFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.utils.sponsorblock.bytecode.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 
 object SeekbarOnDrawFingerprint : MethodFingerprint(
     customFingerprint = { methodDef, _ -> methodDef.name == "onDraw" }

src/main/kotlin/app/revanced/patches/music/utils/videotype/VideoTypeHookPatch.kt

@@ -5,7 +5,6 @@ import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patches.music.utils.videotype.fingerprint.VideoTypeFingerprint
 import app.revanced.patches.music.utils.videotype.fingerprint.VideoTypeParentFingerprint

src/main/kotlin/app/revanced/patches/music/utils/videotype/fingerprint/VideoTypeFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.utils.videotype.fingerprint
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 

src/main/kotlin/app/revanced/patches/music/utils/videotype/fingerprint/VideoTypeParentFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.utils.videotype.fingerprint
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 
 object VideoTypeParentFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/video/information/VideoInformationPatch.kt

@@ -6,7 +6,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod

src/main/kotlin/app/revanced/patches/music/video/information/fingerprints/PlayerControllerSetTimeReferenceFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.video.information.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode
 
 object PlayerControllerSetTimeReferenceFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/video/information/fingerprints/VideoEndFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.video.information.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 
 object VideoEndFingerprint : MethodFingerprint(
     strings = listOf("Attempting to seek during an ad")

src/main/kotlin/app/revanced/patches/music/video/information/fingerprints/VideoIdParentFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.video.information.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 

src/main/kotlin/app/revanced/patches/music/video/information/fingerprints/VideoLengthFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.video.information.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode
 
 object VideoLengthFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/video/quality/fingerprints/UserQualityChangeFingerprint.kt

@@ -1,6 +1,6 @@
 package app.revanced.patches.music.video.quality.fingerprints
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.Opcode
 
 object UserQualityChangeFingerprint : MethodFingerprint(

src/main/kotlin/app/revanced/patches/music/video/speed/PlaybackSpeedPatch.kt

@@ -4,7 +4,6 @@ import app.revanced.extensions.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch

src/main/kotlin/app/revanced/patches/music/video/speed/fingerprints/PlaybackSpeedBottomSheetFingerprint.kt

@@ -1,7 +1,7 @@
 package app.revanced.patches.music.video.speed.fingerprints
 
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode