build: move to official Google smali fork

2025-05-29 13:20:19 +02:00 · 2023-07-24 00:41:17 +09:00 · 2023-07-24 00:41:17 +09:00 · 65af056d5b
commit 65af056d5b
parent 441a9ecd58
335 changed files with 608 additions and 606 deletions
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -8,6 +8,7 @@ val githubUsername: String = project.findProperty("gpr.user") as? String ?: Syst
 val githubPassword: String = project.findProperty("gpr.key") as? String ?: System.getenv("GITHUB_TOKEN")

 repositories {
+    google()
    mavenCentral()
    mavenLocal()
    maven {
@ -27,7 +28,9 @@ repositories {

 dependencies {
    implementation("app.revanced:revanced-patcher:11.0.4")
-    implementation("app.revanced:multidexlib2:2.5.3-a3836654")
+    implementation("com.android.tools.smali:smali:3.0.3")
+    implementation("com.android.tools.smali:smali-dexlib2:3.0.3")
+
    // Required for meta
    implementation("com.google.code.gson:gson:2.10.1")
    // Required for FlexVer-Java
@ -40,7 +43,8 @@ tasks {
        dependsOn(build)

        doLast {
-            val androidHome = System.getenv("ANDROID_HOME") ?: throw GradleException("ANDROID_HOME not found")
+            val androidHome =
+                System.getenv("ANDROID_HOME") ?: throw GradleException("ANDROID_HOME not found")
            val d8 = "${androidHome}/build-tools/34.0.0/d8"
            val input = configurations.archives.get().allArtifacts.files.files.first().absolutePath
            val work = File("${buildDir}/libs")
--- a/src/main/kotlin/app/revanced/extensions/Extensions.kt
+++ b/src/main/kotlin/app/revanced/extensions/Extensions.kt
@ -8,9 +8,9 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableField
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.util.integrations.Constants.PATCHES_PATH
-import org.jf.dexlib2.builder.MutableMethodImplementation
-import org.jf.dexlib2.iface.Method
-import org.jf.dexlib2.util.MethodUtil
+import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
+import com.android.tools.smali.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.util.MethodUtil
 import org.w3c.dom.Node

 internal fun MutableMethodImplementation.injectHideCall(
--- a/src/main/kotlin/app/revanced/patches/music/layout/autocaptions/patch/DisableAutoCaptionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/autocaptions/patch/DisableAutoCaptionsPatch.kt
@ -17,7 +17,7 @@ import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch
 import app.revanced.patches.shared.fingerprints.captions.SubtitleTrackFingerprint
 import app.revanced.util.enum.CategoryType
 import app.revanced.util.integrations.Constants.MUSIC_LAYOUT
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction

@Patch
@Name("Disable auto captions")
--- a/src/main/kotlin/app/revanced/patches/music/layout/blacknavigationbar/fingerprints/TabLayoutFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/blacknavigationbar/fingerprints/TabLayoutFingerprint.kt
@ -4,8 +4,8 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch.Companion.ColorGrey
 import app.revanced.util.bytecode.isWideLiteralExists
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object TabLayoutFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/layout/blacknavigationbar/patch/BlackNavigationBarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/blacknavigationbar/patch/BlackNavigationBarPatch.kt
@ -18,7 +18,7 @@ import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.enum.CategoryType
 import app.revanced.util.integrations.Constants.MUSIC_LAYOUT
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction

@Patch
@Name("Enable black navigation bar")
--- a/src/main/kotlin/app/revanced/patches/music/layout/castbutton/fingerprints/HideCastButtonFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/castbutton/fingerprints/HideCastButtonFingerprint.kt
@ -2,7 +2,7 @@ package app.revanced.patches.music.layout.castbutton.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.AccessFlags

 object HideCastButtonFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/layout/castbutton/fingerprints/HideCastButtonParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/castbutton/fingerprints/HideCastButtonParentFingerprint.kt
@ -2,7 +2,7 @@ package app.revanced.patches.music.layout.castbutton.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.AccessFlags

 object HideCastButtonParentFingerprint : MethodFingerprint(
    returnType = "Z",
--- a/src/main/kotlin/app/revanced/patches/music/layout/categorybar/fingerprints/ChipCloudFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/categorybar/fingerprints/ChipCloudFingerprint.kt
@ -3,7 +3,7 @@ package app.revanced.patches.music.layout.categorybar.fingerprints
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch.Companion.ChipCloud
 import app.revanced.util.bytecode.isWideLiteralExists
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.Opcode

 object ChipCloudFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/layout/categorybar/patch/CategoryBarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/categorybar/patch/CategoryBarPatch.kt
@ -18,7 +18,7 @@ import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.enum.CategoryType
 import app.revanced.util.integrations.Constants.MUSIC_LAYOUT
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction

@Patch
@Name("Hide category bar")
--- a/src/main/kotlin/app/revanced/patches/music/layout/colormatchplayer/fingerprints/ColorMatchPlayerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/colormatchplayer/fingerprints/ColorMatchPlayerFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.music.layout.colormatchplayer.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object ColorMatchPlayerFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/layout/colormatchplayer/patch/ColorMatchPlayerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/colormatchplayer/patch/ColorMatchPlayerPatch.kt
@ -22,8 +22,8 @@ import app.revanced.patches.music.utils.fingerprints.ColorMatchPlayerParentFinge
 import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.enum.CategoryType
 import app.revanced.util.integrations.Constants.MUSIC_LAYOUT
-import org.jf.dexlib2.iface.instruction.Instruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.Instruction
+import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction

@Patch
@Name("Enable color match player")
--- a/src/main/kotlin/app/revanced/patches/music/layout/compactdialog/fingerprints/DialogSolidFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/compactdialog/fingerprints/DialogSolidFingerprint.kt
@ -4,8 +4,8 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch.Companion.DialogSolid
 import app.revanced.util.bytecode.isWideLiteralExists
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object DialogSolidFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/layout/dismissqueue/fingerprints/DismissQueueFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/dismissqueue/fingerprints/DismissQueueFingerprint.kt
@ -2,7 +2,7 @@ package app.revanced.patches.music.layout.dismissqueue.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.util.bytecode.isWide32LiteralExists
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.Opcode

 object DismissQueueFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/layout/dismissqueue/patch/DismissQueuePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/dismissqueue/patch/DismissQueuePatch.kt
@ -17,7 +17,7 @@ import app.revanced.patches.music.utils.annotations.MusicCompatibility
 import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.enum.CategoryType
 import app.revanced.util.integrations.Constants.MUSIC_LAYOUT
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction

@Patch
@Name("Enable dismiss queue")
--- a/src/main/kotlin/app/revanced/patches/music/layout/floatingbutton/fingerprints/FloatingButtonFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/floatingbutton/fingerprints/FloatingButtonFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.music.layout.floatingbutton.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object FloatingButtonFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/layout/floatingbutton/fingerprints/FloatingButtonParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/floatingbutton/fingerprints/FloatingButtonParentFingerprint.kt
@ -3,8 +3,8 @@ package app.revanced.patches.music.layout.floatingbutton.fingerprints
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.util.bytecode.isNarrowLiteralExists
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object FloatingButtonParentFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/layout/landscapemode/fingerprints/TabletIdentifierFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/landscapemode/fingerprints/TabletIdentifierFingerprint.kt
@ -4,8 +4,8 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch.Companion.IsTablet
 import app.revanced.util.bytecode.isWideLiteralExists
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object TabletIdentifierFingerprint : MethodFingerprint(
    returnType = "Z",
--- a/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayer/fingerprints/MinimizedPlayerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayer/fingerprints/MinimizedPlayerFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.music.layout.minimizedplayer.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object MinimizedPlayerFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayer/patch/MinimizedPlayerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/minimizedplayer/patch/MinimizedPlayerPatch.kt
@ -16,7 +16,7 @@ import app.revanced.patches.music.utils.annotations.MusicCompatibility
 import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.enum.CategoryType
 import app.revanced.util.integrations.Constants.MUSIC_LAYOUT
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction

@Patch
@Name("Enable force minimized player")
--- a/src/main/kotlin/app/revanced/patches/music/layout/navigationlabel/fingerprints/TabLayoutTextFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/navigationlabel/fingerprints/TabLayoutTextFingerprint.kt
@ -4,8 +4,8 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch.Companion.Text1
 import app.revanced.util.bytecode.isWideLiteralExists
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object TabLayoutTextFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/layout/navigationlabel/patch/NavigationLabelPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/navigationlabel/patch/NavigationLabelPatch.kt
@ -22,8 +22,8 @@ import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch.Co
 import app.revanced.util.bytecode.getWideLiteralIndex
 import app.revanced.util.enum.CategoryType
 import app.revanced.util.integrations.Constants.MUSIC_LAYOUT
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction

@Patch
@Name("Hide navigation label")
--- a/src/main/kotlin/app/revanced/patches/music/layout/newlayout/patch/NewLayoutPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/newlayout/patch/NewLayoutPatch.kt
@ -17,7 +17,7 @@ import app.revanced.patches.music.utils.annotations.MusicCompatibility
 import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.enum.CategoryType
 import app.revanced.util.integrations.Constants.MUSIC_LAYOUT
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction

@Patch
@Name("Enable new layout")
--- a/src/main/kotlin/app/revanced/patches/music/layout/oldstyleminiplayer/fingerprints/NextButtonVisibilityFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/oldstyleminiplayer/fingerprints/NextButtonVisibilityFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.music.layout.oldstyleminiplayer.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object NextButtonVisibilityFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/layout/oldstyleminiplayer/patch/OldStyleMiniPlayerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/oldstyleminiplayer/patch/OldStyleMiniPlayerPatch.kt
@ -20,7 +20,7 @@ import app.revanced.patches.music.utils.fingerprints.ColorMatchPlayerParentFinge
 import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.enum.CategoryType
 import app.revanced.util.integrations.Constants.MUSIC_LAYOUT
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction

@Patch
@Name("Enable old style miniplayer")
--- a/src/main/kotlin/app/revanced/patches/music/layout/sleeptimer/patch/SleepTimerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/sleeptimer/patch/SleepTimerPatch.kt
@ -17,7 +17,7 @@ import app.revanced.patches.music.utils.annotations.MusicCompatibility
 import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.enum.CategoryType
 import app.revanced.util.integrations.Constants.MUSIC_LAYOUT
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction

@Patch
@Name("Enable sleep timer")
--- a/src/main/kotlin/app/revanced/patches/music/layout/zenmode/fingerprints/ZenModeFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/zenmode/fingerprints/ZenModeFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.music.layout.zenmode.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object ZenModeFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/layout/zenmode/patch/ZenModePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/zenmode/patch/ZenModePatch.kt
@ -20,8 +20,8 @@ import app.revanced.patches.music.utils.fingerprints.ColorMatchPlayerParentFinge
 import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.enum.CategoryType
 import app.revanced.util.integrations.Constants.MUSIC_LAYOUT
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction

@Patch
@Name("Enable zen mode")
--- a/src/main/kotlin/app/revanced/patches/music/misc/backgroundplay/fingerprints/BackgroundPlaybackParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/backgroundplay/fingerprints/BackgroundPlaybackParentFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.music.misc.backgroundplay.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object BackgroundPlaybackParentFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/misc/exclusiveaudio/fingerprints/AudioOnlyEnablerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/exclusiveaudio/fingerprints/AudioOnlyEnablerFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.music.misc.exclusiveaudio.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object AudioOnlyEnablerFingerprint : MethodFingerprint(
    returnType = "Z",
--- a/src/main/kotlin/app/revanced/patches/music/misc/minimizedplayback/fingerprints/MinimizedPlaybackManagerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/minimizedplayback/fingerprints/MinimizedPlaybackManagerFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.music.misc.minimizedplayback.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object MinimizedPlaybackManagerFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/misc/premium/fingerprints/AccountMenuFooterFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/premium/fingerprints/AccountMenuFooterFingerprint.kt
@ -4,8 +4,8 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch.Companion.PrivacyTosFooter
 import app.revanced.util.bytecode.isWideLiteralExists
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object AccountMenuFooterFingerprint : MethodFingerprint(
    returnType = "L",
--- a/src/main/kotlin/app/revanced/patches/music/misc/premium/fingerprints/HideGetPremiumFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/premium/fingerprints/HideGetPremiumFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.music.misc.premium.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object HideGetPremiumFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/misc/premium/patch/HideGetPremiumPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/premium/patch/HideGetPremiumPatch.kt
@ -21,11 +21,11 @@ import app.revanced.patches.music.utils.fix.decoding.patch.DecodingPatch
 import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch.Companion.PrivacyTosFooter
 import app.revanced.util.bytecode.getWideLiteralIndex
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
-import org.jf.dexlib2.iface.reference.Reference
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.Reference

@Patch
@Name("Hide get premium")
--- a/src/main/kotlin/app/revanced/patches/music/misc/quality/fingerprints/MusicVideoQualitySettingsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/quality/fingerprints/MusicVideoQualitySettingsFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.music.misc.quality.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object MusicVideoQualitySettingsFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/misc/quality/fingerprints/MusicVideoQualitySettingsParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/quality/fingerprints/MusicVideoQualitySettingsParentFingerprint.kt
@ -4,7 +4,7 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch.Companion.QualityTitle
 import app.revanced.util.bytecode.isWideLiteralExists
-import org.jf.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.AccessFlags

 object MusicVideoQualitySettingsParentFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/misc/quality/fingerprints/UserQualityChangeFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/quality/fingerprints/UserQualityChangeFingerprint.kt
@ -1,7 +1,7 @@
 package app.revanced.patches.music.misc.quality.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.Opcode

 object UserQualityChangeFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/misc/quality/patch/VideoQualityPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/quality/patch/VideoQualityPatch.kt
@ -24,12 +24,12 @@ import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch
 import app.revanced.patches.music.utils.videoid.patch.VideoIdPatch
 import app.revanced.util.enum.CategoryType
 import app.revanced.util.integrations.Constants.MUSIC_MISC_PATH
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.builder.instruction.BuilderInstruction21c
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.instruction.formats.Instruction35c
-import org.jf.dexlib2.iface.reference.MethodReference
-import org.jf.dexlib2.iface.reference.Reference
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction21c
+import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+import com.android.tools.smali.dexlib2.iface.reference.Reference

@Patch
@Name("Remember video quality")
--- a/src/main/kotlin/app/revanced/patches/music/misc/sharebuttonhook/fingerprints/ConnectionTrackerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/sharebuttonhook/fingerprints/ConnectionTrackerFingerprint.kt
@ -1,7 +1,7 @@
 package app.revanced.patches.music.misc.sharebuttonhook.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.Opcode

 object ConnectionTrackerFingerprint : MethodFingerprint(
    returnType = "Z",
--- a/src/main/kotlin/app/revanced/patches/music/misc/sharebuttonhook/fingerprints/SharePanelFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/sharebuttonhook/fingerprints/SharePanelFingerprint.kt
@ -1,7 +1,7 @@
 package app.revanced.patches.music.misc.sharebuttonhook.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.Opcode

 object SharePanelFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/misc/sharebuttonhook/fingerprints/ShowToastFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/sharebuttonhook/fingerprints/ShowToastFingerprint.kt
@ -1,7 +1,7 @@
 package app.revanced.patches.music.misc.sharebuttonhook.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.Opcode

 object ShowToastFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/misc/shuffle/fingerprints/MusicPlaybackControlsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/shuffle/fingerprints/MusicPlaybackControlsFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.music.misc.shuffle.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object MusicPlaybackControlsFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/misc/shuffle/fingerprints/ShuffleClassFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/shuffle/fingerprints/ShuffleClassFingerprint.kt
@ -4,8 +4,8 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch.Companion.DisabledIconAlpha
 import app.revanced.util.bytecode.isWideLiteralExists
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object ShuffleClassFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/misc/shuffle/fingerprints/ShuffleClassReferenceFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/shuffle/fingerprints/ShuffleClassReferenceFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.music.misc.shuffle.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object ShuffleClassReferenceFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/misc/shuffle/patch/EnforceShufflePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/shuffle/patch/EnforceShufflePatch.kt
@ -27,15 +27,15 @@ import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.enum.CategoryType
 import app.revanced.util.integrations.Constants.MUSIC_MISC_PATH
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.iface.instruction.Instruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.FieldReference
-import org.jf.dexlib2.iface.reference.Reference
-import org.jf.dexlib2.immutable.ImmutableField
-import org.jf.dexlib2.immutable.ImmutableMethod
-import org.jf.dexlib2.immutable.ImmutableMethodImplementation
-import org.jf.dexlib2.immutable.ImmutableMethodParameter
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.iface.instruction.Instruction
+import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.reference.FieldReference
+import com.android.tools.smali.dexlib2.iface.reference.Reference
+import com.android.tools.smali.dexlib2.immutable.ImmutableField
+import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
+import com.android.tools.smali.dexlib2.immutable.ImmutableMethodImplementation
+import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter

@Patch
@Name("Enable force shuffle")
@ -92,7 +92,7 @@ class EnforceShufflePatch : BytecodePatch(
                        type,
                        AccessFlags.PUBLIC or AccessFlags.PUBLIC,
                        null,
-                        null,
+                        annotations,
                        null
                    ).toMutable()
                }
@ -120,7 +120,7 @@ class EnforceShufflePatch : BytecodePatch(
                        SHUFFLE_CLASS,
                        AccessFlags.PUBLIC or AccessFlags.STATIC,
                        null,
-                        null,
+                        annotations,
                        null
                    ).toMutable()
                )
@ -131,10 +131,10 @@ class EnforceShufflePatch : BytecodePatch(
                    ImmutableMethod(
                        it.classDef.type,
                        "buttonHook",
-                        listOf(ImmutableMethodParameter("Z", null, null)),
+                        listOf(ImmutableMethodParameter("Z", annotations, null)),
                        "V",
                        AccessFlags.PUBLIC or AccessFlags.FINAL,
-                        null,
+                        annotations,
                        null,
                        ImmutableMethodImplementation(
                            5, """
--- a/src/main/kotlin/app/revanced/patches/music/misc/tastebuilder/fingerprints/TasteBuilderConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/tastebuilder/fingerprints/TasteBuilderConstructorFingerprint.kt
@ -3,8 +3,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.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
 object TasteBuilderConstructorFingerprint : MethodFingerprint(
--- a/src/main/kotlin/app/revanced/patches/music/misc/tastebuilder/patch/TasteBuilderPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/tastebuilder/patch/TasteBuilderPatch.kt
@ -15,7 +15,7 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.music.misc.tastebuilder.fingerprints.TasteBuilderConstructorFingerprint
 import app.revanced.patches.music.utils.annotations.MusicCompatibility
 import app.revanced.patches.music.utils.fix.decoding.patch.DecodingPatch
-import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction

@Patch
@Name("Hide taste builder")
--- a/src/main/kotlin/app/revanced/patches/music/misc/upgradebutton/fingerprints/NotifierShelfFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/upgradebutton/fingerprints/NotifierShelfFingerprint.kt
@ -4,8 +4,8 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch.Companion.MusicNotifierShelf
 import app.revanced.util.bytecode.isWideLiteralExists
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object NotifierShelfFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/misc/upgradebutton/fingerprints/PivotBarConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/upgradebutton/fingerprints/PivotBarConstructorFingerprint.kt
@ -3,8 +3,8 @@ package app.revanced.patches.music.misc.upgradebutton.fingerprints
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.util.bytecode.isNarrowLiteralExists
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object PivotBarConstructorFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/misc/upgradebutton/patch/UpgradeButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/upgradebutton/patch/UpgradeButtonPatch.kt
@ -20,9 +20,9 @@ import app.revanced.patches.music.utils.annotations.MusicCompatibility
 import app.revanced.patches.music.utils.fix.decoding.patch.DecodingPatch
 import app.revanced.patches.music.utils.integrations.patch.IntegrationsPatch
 import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction

@Patch
@Name("Hide upgrade button")
--- a/src/main/kotlin/app/revanced/patches/music/utils/fingerprints/ColorMatchPlayerParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/fingerprints/ColorMatchPlayerParentFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.music.utils.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object ColorMatchPlayerParentFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/utils/fix/clientspoof/fingerprints/UserAgentHeaderBuilderFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/fix/clientspoof/fingerprints/UserAgentHeaderBuilderFingerprint.kt
@ -1,7 +1,7 @@
 package app.revanced.patches.music.utils.fix.clientspoof.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.Opcode

 object UserAgentHeaderBuilderFingerprint : MethodFingerprint(
    parameters = listOf("L"),
--- a/src/main/kotlin/app/revanced/patches/music/utils/fix/clientspoof/patch/ClientSpoofMusicPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/fix/clientspoof/patch/ClientSpoofMusicPatch.kt
@ -9,7 +9,7 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.music.utils.fix.clientspoof.fingerprints.UserAgentHeaderBuilderFingerprint
 import app.revanced.patches.music.utils.microg.shared.Constants.MUSIC_PACKAGE_NAME
-import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction

 class ClientSpoofMusicPatch : BytecodePatch(
    listOf(UserAgentHeaderBuilderFingerprint)
--- a/src/main/kotlin/app/revanced/patches/music/utils/litho/fingerprints/LithoFilterFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/litho/fingerprints/LithoFilterFingerprint.kt
@ -2,7 +2,7 @@ package app.revanced.patches.music.utils.litho.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.AccessFlags

 object LithoFilterFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/utils/microg/bytecode/fingerprints/GooglePlayUtilityFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/microg/bytecode/fingerprints/GooglePlayUtilityFingerprint.kt
@ -2,7 +2,7 @@ package app.revanced.patches.music.utils.microg.bytecode.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.AccessFlags

 object GooglePlayUtilityFingerprint : MethodFingerprint(
    returnType = "I",
--- a/src/main/kotlin/app/revanced/patches/music/utils/microg/bytecode/fingerprints/ServiceCheckFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/microg/bytecode/fingerprints/ServiceCheckFingerprint.kt
@ -2,7 +2,7 @@ package app.revanced.patches.music.utils.microg.bytecode.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.AccessFlags

 object ServiceCheckFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/utils/settings/bytecode/fingerprints/PreferenceFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/settings/bytecode/fingerprints/PreferenceFingerprint.kt
@ -1,7 +1,7 @@
 package app.revanced.patches.music.utils.settings.bytecode.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.Opcode

 object PreferenceFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/utils/settings/bytecode/fingerprints/SettingsHeadersFragmentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/settings/bytecode/fingerprints/SettingsHeadersFragmentFingerprint.kt
@ -1,7 +1,7 @@
 package app.revanced.patches.music.utils.settings.bytecode.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.Opcode

 object SettingsHeadersFragmentFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/utils/settings/bytecode/patch/SettingsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/settings/bytecode/patch/SettingsBytecodePatch.kt
@ -12,8 +12,8 @@ import app.revanced.patches.music.utils.integrations.patch.IntegrationsPatch
 import app.revanced.patches.music.utils.settings.bytecode.fingerprints.PreferenceFingerprint
 import app.revanced.patches.music.utils.settings.bytecode.fingerprints.SettingsHeadersFragmentFingerprint
 import app.revanced.util.integrations.Constants.MUSIC_INTEGRATIONS_PATH
-import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction

@DependsOn([IntegrationsPatch::class])
 class SettingsBytecodePatch : BytecodePatch(
--- a/src/main/kotlin/app/revanced/patches/music/utils/videoid/fingerprint/VideoIdParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/videoid/fingerprint/VideoIdParentFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.music.utils.videoid.fingerprint

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object VideoIdParentFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/music/utils/videoid/patch/VideoIdPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/utils/videoid/patch/VideoIdPatch.kt
@ -10,10 +10,10 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.music.utils.videoid.fingerprint.VideoIdParentFingerprint
 import app.revanced.util.integrations.Constants.MUSIC_UTILS_PATH
-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.FieldReference
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.reference.FieldReference

 class VideoIdPatch : BytecodePatch(
    listOf(VideoIdParentFingerprint)
--- a/src/main/kotlin/app/revanced/patches/reddit/ad/comments/fingerprints/HideCommentAdsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/ad/comments/fingerprints/HideCommentAdsFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.reddit.ad.comments.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object HideCommentAdsFingerprint : MethodFingerprint(
    returnType = "L",
--- a/src/main/kotlin/app/revanced/patches/reddit/ad/general/fingerprints/AdPostFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/ad/general/fingerprints/AdPostFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.reddit.ad.general.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object AdPostFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/reddit/ad/general/fingerprints/NewAdPostFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/ad/general/fingerprints/NewAdPostFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.reddit.ad.general.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object NewAdPostFingerprint : MethodFingerprint(
    returnType = "L",
--- a/src/main/kotlin/app/revanced/patches/reddit/ad/general/patch/HideAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/ad/general/patch/HideAdsPatch.kt
@ -20,9 +20,9 @@ import app.revanced.patches.reddit.ad.comments.patch.HideCommentAdsPatch
 import app.revanced.patches.reddit.ad.general.fingerprints.AdPostFingerprint
 import app.revanced.patches.reddit.ad.general.fingerprints.NewAdPostFingerprint
 import app.revanced.patches.reddit.utils.annotations.RedditCompatibility
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.instruction.formats.Instruction22c
-import org.jf.dexlib2.iface.reference.FieldReference
+import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction22c
+import com.android.tools.smali.dexlib2.iface.reference.FieldReference

@Patch
@Name("Hide ads")
--- a/src/main/kotlin/app/revanced/patches/reddit/layout/navigation/fingerprints/BottomNavScreenFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/layout/navigation/fingerprints/BottomNavScreenFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.reddit.layout.navigation.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object BottomNavScreenFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/reddit/layout/navigation/patch/NavigationButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/layout/navigation/patch/NavigationButtonsPatch.kt
@ -8,7 +8,7 @@ import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.reddit.layout.navigation.fingerprints.BottomNavScreenFingerprint
-import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction

 class NavigationButtonsPatch : BytecodePatch(
    listOf(BottomNavScreenFingerprint)
--- a/src/main/kotlin/app/revanced/patches/reddit/layout/screenshotpopup/fingerprints/ScreenshotTakenBannerFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/layout/screenshotpopup/fingerprints/ScreenshotTakenBannerFingerprint.kt
@ -4,7 +4,7 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.reddit.utils.resourceid.patch.SharedResourceIdPatch.Companion.ScreenShotShareBanner
 import app.revanced.util.bytecode.isWideLiteralExists
-import org.jf.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.AccessFlags

 object ScreenshotTakenBannerFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/reddit/misc/openlink/fingerprints/ScreenNavigatorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/misc/openlink/fingerprints/ScreenNavigatorFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.reddit.misc.openlink.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object ScreenNavigatorFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/reddit/utils/settings/bytecode/fingerprints/OssLicensesMenuActivityOnCreateFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/utils/settings/bytecode/fingerprints/OssLicensesMenuActivityOnCreateFingerprint.kt
@ -1,7 +1,7 @@
 package app.revanced.patches.reddit.utils.settings.bytecode.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.Opcode

 object OssLicensesMenuActivityOnCreateFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/shared/fingerprints/ads/LegacyAdsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/fingerprints/ads/LegacyAdsFingerprint.kt
@ -2,9 +2,9 @@ package app.revanced.patches.shared.fingerprints.ads

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.NarrowLiteralInstruction

 object LegacyAdsFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/shared/fingerprints/captions/SubtitleTrackFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/fingerprints/captions/SubtitleTrackFingerprint.kt
@ -2,7 +2,7 @@ package app.revanced.patches.shared.fingerprints.captions

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.AccessFlags

 object SubtitleTrackFingerprint : MethodFingerprint(
    returnType = "Z",
--- a/src/main/kotlin/app/revanced/patches/shared/fingerprints/litho/ByteBufferHookFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/fingerprints/litho/ByteBufferHookFingerprint.kt
@ -1,7 +1,7 @@
 package app.revanced.patches.shared.fingerprints.litho

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.Opcode

 object ByteBufferHookFingerprint : MethodFingerprint(
    returnType = "L",
--- a/src/main/kotlin/app/revanced/patches/shared/fingerprints/litho/EmptyComponentBuilderFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/fingerprints/litho/EmptyComponentBuilderFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.shared.fingerprints.litho

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object EmptyComponentBuilderFingerprint : MethodFingerprint(
    returnType = "L",
--- a/src/main/kotlin/app/revanced/patches/shared/fingerprints/litho/IdentifierFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/fingerprints/litho/IdentifierFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.shared.fingerprints.litho

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object IdentifierFingerprint : MethodFingerprint(
    returnType = "L",
--- a/src/main/kotlin/app/revanced/patches/shared/fingerprints/opus/CodecReferenceFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/fingerprints/opus/CodecReferenceFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.shared.fingerprints.opus

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object CodecReferenceFingerprint : MethodFingerprint(
    returnType = "J",
--- a/src/main/kotlin/app/revanced/patches/shared/fingerprints/opus/CodecSelectorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/fingerprints/opus/CodecSelectorFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.shared.fingerprints.opus

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object CodecSelectorFingerprint : MethodFingerprint(
    returnType = "L",
--- a/src/main/kotlin/app/revanced/patches/shared/fingerprints/versionspoof/ClientInfoFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/fingerprints/versionspoof/ClientInfoFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.shared.fingerprints.versionspoof

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object ClientInfoFingerprint : MethodFingerprint(
    returnType = "L",
--- a/src/main/kotlin/app/revanced/patches/shared/patch/integrations/AbstractIntegrationsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/patch/integrations/AbstractIntegrationsPatch.kt
@ -11,9 +11,9 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.shared.patch.integrations.AbstractIntegrationsPatch.IntegrationsFingerprint.RegisterResolver
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.ClassDef
-import org.jf.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.ClassDef
+import com.android.tools.smali.dexlib2.iface.Method

@Description("Applies mandatory patches to implement the ReVanced integrations into the application.")
@Version("0.0.1")
--- a/src/main/kotlin/app/revanced/patches/shared/patch/litho/ComponentParserPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/patch/litho/ComponentParserPatch.kt
@ -17,14 +17,14 @@ import app.revanced.patches.shared.fingerprints.litho.ByteBufferHookFingerprint
 import app.revanced.patches.shared.fingerprints.litho.EmptyComponentBuilderFingerprint
 import app.revanced.patches.shared.fingerprints.litho.IdentifierFingerprint
 import app.revanced.util.bytecode.getStringIndex
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.builder.instruction.BuilderInstruction35c
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
-import org.jf.dexlib2.iface.reference.FieldReference
-import org.jf.dexlib2.immutable.ImmutableField
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction35c
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.FieldReference
+import com.android.tools.smali.dexlib2.immutable.ImmutableField
 import kotlin.properties.Delegates

 class ComponentParserPatch : BytecodePatch(
@ -63,7 +63,7 @@ class ComponentParserPatch : BytecodePatch(
                        "Ljava/nio/ByteBuffer;",
                        AccessFlags.PUBLIC or AccessFlags.STATIC,
                        null,
-                        null,
+                        annotations,
                        null
                    ).toMutable()
                )
--- a/src/main/kotlin/app/revanced/patches/shared/patch/opus/AbstractOpusCodecsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/patch/opus/AbstractOpusCodecsPatch.kt
@ -11,10 +11,10 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.shared.fingerprints.opus.CodecReferenceFingerprint
 import app.revanced.patches.shared.fingerprints.opus.CodecSelectorFingerprint
-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.Reference
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.reference.Reference

 abstract class AbstractOpusCodecsPatch(
    private val descriptor: String
--- a/src/main/kotlin/app/revanced/patches/shared/patch/versionspoof/AbstractVersionSpoofPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/patch/versionspoof/AbstractVersionSpoofPatch.kt
@ -9,10 +9,10 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patches.shared.fingerprints.versionspoof.ClientInfoFingerprint
 import app.revanced.patches.shared.fingerprints.versionspoof.ClientInfoParentFingerprint
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.dexbacked.reference.DexBackedFieldReference
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.dexbacked.reference.DexBackedFieldReference
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction

 abstract class AbstractVersionSpoofPatch(
    private val descriptor: String
--- a/src/main/kotlin/app/revanced/patches/youtube/ads/general/bytecode/patch/GeneralAdsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ads/general/bytecode/patch/GeneralAdsBytecodePatch.kt
@ -12,7 +12,8 @@ import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.AdAttribution
 import app.revanced.util.bytecode.getWideLiteralIndex
 import app.revanced.util.bytecode.isWideLiteralExists
-import org.jf.dexlib2.iface.instruction.formats.Instruction35c
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c

@DependsOn([SharedResourceIdPatch::class])
@Suppress("LABEL_NAME_CLASH")
@ -28,7 +29,7 @@ class GeneralAdsBytecodePatch : BytecodePatch() {
                    .findMutableMethodOf(method)
                    .apply {
                        val insertIndex = getWideLiteralIndex(AdAttribution) + 1
-                        if (getInstruction(insertIndex).opcode != org.jf.dexlib2.Opcode.INVOKE_VIRTUAL)
+                        if (getInstruction(insertIndex).opcode != Opcode.INVOKE_VIRTUAL)
                            return@forEach

                        val viewRegister = getInstruction<Instruction35c>(insertIndex).registerC
--- a/src/main/kotlin/app/revanced/patches/youtube/ads/getpremium/fingerprints/CompactYpcOfferModuleViewFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ads/getpremium/fingerprints/CompactYpcOfferModuleViewFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.youtube.ads.getpremium.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object CompactYpcOfferModuleViewFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/youtube/ads/getpremium/patch/HideGetPremiumPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ads/getpremium/patch/HideGetPremiumPatch.kt
@ -10,7 +10,7 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.youtube.ads.getpremium.fingerprints.CompactYpcOfferModuleViewFingerprint
 import app.revanced.util.integrations.Constants.PATCHES_PATH
-import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction

 class HideGetPremiumPatch : BytecodePatch(
    listOf(CompactYpcOfferModuleViewFingerprint)
--- a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/feed/fingerprints/BottomSheetMenuItemBuilderFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/feed/fingerprints/BottomSheetMenuItemBuilderFingerprint.kt
@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.flyoutpanel.feed.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.Opcode

 object BottomSheetMenuItemBuilderFingerprint : MethodFingerprint(
    returnType = "L",
--- a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/feed/patch/FeedFlyoutPanelPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/feed/patch/FeedFlyoutPanelPatch.kt
@ -17,8 +17,8 @@ import app.revanced.patches.youtube.flyoutpanel.feed.fingerprints.BottomSheetMen
 import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.FLYOUT_PANEL
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction

@Patch
@Name("Hide feed flyout panel")
--- a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/fingerprints/QualityMenuViewInflateFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/fingerprints/QualityMenuViewInflateFingerprint.kt
@ -4,8 +4,8 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.VideoQualityBottomSheet
 import app.revanced.util.bytecode.isWideLiteralExists
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object QualityMenuViewInflateFingerprint : MethodFingerprint(
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
--- a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/patch/OldQualityLayoutPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/patch/OldQualityLayoutPatch.kt
@ -20,7 +20,7 @@ import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.bytecode.BytecodeHelper.updatePatchStatus
 import app.revanced.util.integrations.Constants.FLYOUT_PANEL
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction

@Patch
@Name("Enable old quality layout")
--- a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldspeedlayout/fingerprints/FlyoutPanelPatchFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldspeedlayout/fingerprints/FlyoutPanelPatchFingerprint.kt
@ -2,7 +2,7 @@ package app.revanced.patches.youtube.flyoutpanel.oldspeedlayout.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.AccessFlags

 object FlyoutPanelPatchFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldspeedlayout/fingerprints/PlaybackRateBottomSheetBuilderFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldspeedlayout/fingerprints/PlaybackRateBottomSheetBuilderFingerprint.kt
@ -2,7 +2,7 @@ package app.revanced.patches.youtube.flyoutpanel.oldspeedlayout.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.AccessFlags

 object PlaybackRateBottomSheetBuilderFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldspeedlayout/fingerprints/PlaybackRateBottomSheetClassFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldspeedlayout/fingerprints/PlaybackRateBottomSheetClassFingerprint.kt
@ -2,7 +2,7 @@ package app.revanced.patches.youtube.flyoutpanel.oldspeedlayout.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.AccessFlags

 object PlaybackRateBottomSheetClassFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldspeedlayout/patch/OldSpeedLayoutPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldspeedlayout/patch/OldSpeedLayoutPatch.kt
@ -18,9 +18,9 @@ import app.revanced.patches.youtube.utils.fingerprints.NewFlyoutPanelBuilderFing
 import app.revanced.patches.youtube.utils.litho.patch.LithoFilterPatch
 import app.revanced.util.bytecode.BytecodeHelper.updatePatchStatus
 import app.revanced.util.integrations.Constants.FLYOUT_PANEL
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.immutable.ImmutableField
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.immutable.ImmutableField

@DependsOn([LithoFilterPatch::class])
 class OldSpeedLayoutPatch : BytecodePatch(
@ -57,7 +57,7 @@ class OldSpeedLayoutPatch : BytecodePatch(
                        PLAYBACK_RATE_BOTTOM_SHEET_CLASS,
                        AccessFlags.PUBLIC or AccessFlags.STATIC,
                        null,
-                        null,
+                        annotations,
                        null
                    ).toMutable()
                )
--- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/autoplaypreview/patch/HideAutoplayPreviewPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/autoplaypreview/patch/HideAutoplayPreviewPatch.kt
@ -22,7 +22,7 @@ import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.bytecode.getStringIndex
 import app.revanced.util.bytecode.getWideLiteralIndex
 import app.revanced.util.integrations.Constants.FULLSCREEN
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction

@Patch
@Name("Hide autoplay preview")
--- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/compactcontrolsoverlay/patch/CompactControlsOverlayPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/compactcontrolsoverlay/patch/CompactControlsOverlayPatch.kt
@ -19,7 +19,7 @@ import app.revanced.patches.youtube.utils.fingerprints.YouTubeControlsOverlayFin
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.FULLSCREEN
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction

@Patch
@Name("Enable compact controls overlay")
--- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/fingerprints/FullscreenViewAdderFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/fingerprints/FullscreenViewAdderFingerprint.kt
@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.fullscreen.fullscreenpanels.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.Opcode

 object FullscreenViewAdderFingerprint : MethodFingerprint(
    parameters = listOf("L", "L"),
--- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/patch/HideFullscreenPanelsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/patch/HideFullscreenPanelsPatch.kt
@ -25,13 +25,12 @@ import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch.Companion.FullScreenEngagementPanel
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.bytecode.getNarrowLiteralIndex
-import app.revanced.util.bytecode.getStringIndex
 import app.revanced.util.bytecode.getWideLiteralIndex
 import app.revanced.util.integrations.Constants.FULLSCREEN
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.instruction.formats.Instruction35c
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c

@Patch
@Name("Hide fullscreen panels")
--- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/fingerprints/OrientationPrimaryFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/fingerprints/OrientationPrimaryFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.youtube.fullscreen.landscapemode.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object OrientationPrimaryFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/fingerprints/OrientationSecondaryFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/fingerprints/OrientationSecondaryFingerprint.kt
@ -2,8 +2,8 @@ package app.revanced.patches.youtube.fullscreen.landscapemode.fingerprints

 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode

 object OrientationSecondaryFingerprint : MethodFingerprint(
    returnType = "V",
--- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/patch/LandScapeModePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/patch/LandScapeModePatch.kt
@ -20,7 +20,7 @@ import app.revanced.patches.youtube.fullscreen.landscapemode.fingerprints.Orient
 import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.util.integrations.Constants.FULLSCREEN
-import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction

@Patch(false)
@Name("Disable landscape mode")
--- a/src/main/kotlin/app/revanced/patches/youtube/general/accountmenu/fingerprints/AccountMenuFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/accountmenu/fingerprints/AccountMenuFingerprint.kt
@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.general.accountmenu.fingerprints

 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.Opcode

 object AccountMenuFingerprint : MethodFingerprint(
    returnType = "V",
--- a/Show More
+++ b/Show More