chore(release): 2.68.1 [skip ci]

## [2.68.1](https://github.com/revanced/revanced-patches/compare/v2.68.0...v2.68.1) (2022-09-23) ### Bug Fixes * **sponsorblock:** resolve unresolved fingerprint ([986a396](28c864ae95))
fix(sponsorblock): resolve unresolved fingerprint
2026-01-16 15:53:58 +00:00 · 2022-09-23 09:51:06 +00:00 · 2022-09-23 11:49:08 +02:00 · 2022-09-23 05:42:52 +00:00 · 2022-09-23 07:40:50 +02:00 · 2022-09-23 07:40:16 +02:00
56 changed files with 941 additions and 181 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,74 @@
+## [2.68.1](https://github.com/revanced/revanced-patches/compare/v2.68.0...v2.68.1) (2022-09-23)
+
+
+### Bug Fixes
+
+* **sponsorblock:** resolve unresolved fingerprint ([e7296f3](https://github.com/revanced/revanced-patches/commit/e7296f3424bed78a0149cca9bf6e29243e962150))
+
+# [2.68.0](https://github.com/revanced/revanced-patches/compare/v2.67.1...v2.68.0) (2022-09-23)
+
+
+### Bug Fixes
+
+* **hide-premium-navbar:** remove the correct instructions ([#591](https://github.com/revanced/revanced-patches/issues/591)) ([b4b0c97](https://github.com/revanced/revanced-patches/commit/b4b0c972d28cf7591ece04d154d1183c8431cb77))
+
+
+### Features
+
+* **tiktok:** adapt `tiktok-download` with `tiktok-settings`. ([#586](https://github.com/revanced/revanced-patches/issues/586)) ([876b726](https://github.com/revanced/revanced-patches/commit/876b7266109b099597dd19d6ed3fa3dac098b73b))
+
+## [2.67.1](https://github.com/revanced/revanced-patches/compare/v2.67.0...v2.67.1) (2022-09-23)
+
+# [2.67.0](https://github.com/revanced/revanced-patches/compare/v2.66.2...v2.67.0) (2022-09-23)
+
+
+### Bug Fixes
+
+* **hide-premium-nav-bar:** invalid import ([#590](https://github.com/revanced/revanced-patches/issues/590)) ([37ad223](https://github.com/revanced/revanced-patches/commit/37ad22360e6ac5e1b1dce474fe6a4e3813e03330))
+
+
+### Features
+
+* `hide-premium-nav-bar` patch ([#589](https://github.com/revanced/revanced-patches/issues/589)) ([1811416](https://github.com/revanced/revanced-patches/commit/18114168d7f8c3dd41d1f124c3524c7ca850d33d))
+
+## [2.66.2](https://github.com/revanced/revanced-patches/compare/v2.66.1...v2.66.2) (2022-09-22)
+
+
+### Bug Fixes
+
+* **custom-playback-speed:** implement own method instead of `takeWhile` ([8522d4c](https://github.com/revanced/revanced-patches/commit/8522d4cd705118bf1108ec88bbed542a0cb15943))
+
+## [2.66.1](https://github.com/revanced/revanced-patches/compare/v2.66.0...v2.66.1) (2022-09-22)
+
+
+### Bug Fixes
+
+* **sponsorblock:** broken fingerprint and invert setting `shorts_playing` ([#579](https://github.com/revanced/revanced-patches/issues/579)) ([59fb674](https://github.com/revanced/revanced-patches/commit/59fb674437207aeabed5b92ba32bda120820fb8f))
+
+# [2.66.0](https://github.com/revanced/revanced-patches/compare/v2.65.0...v2.66.0) (2022-09-22)
+
+
+### Features
+
+* **custom-playback-speed:** max, min, granularity option ([b1e423d](https://github.com/revanced/revanced-patches/commit/b1e423d9cdca51e54c154cc39a24c508ca322f60))
+
+# [2.65.0](https://github.com/revanced/revanced-patches/compare/v2.64.2...v2.65.0) (2022-09-21)
+
+
+### Features
+
+* `tiktok-feed-filter` , `tiktok-settings` and `tiktok-force-login` patch ([#501](https://github.com/revanced/revanced-patches/issues/501)) ([10e0286](https://github.com/revanced/revanced-patches/commit/10e028626f2b9d9d01279682198daf135bc82c20))
+* **theme:** arbitrary background color for light theme  ([#565](https://github.com/revanced/revanced-patches/issues/565)) ([da40e7e](https://github.com/revanced/revanced-patches/commit/da40e7e0cf266edc89353e62b9821b450f8f0295))
+
+## [2.64.2](https://github.com/revanced/revanced-patches/compare/v2.64.1...v2.64.2) (2022-09-21)
+
+
+### Bug Fixes
+
+* **custom-video-buffer:** use correct offset for `getMaxBuffer` call injection ([6773122](https://github.com/revanced/revanced-patches/commit/6773122d0b1598af78d4619b8af2811be11f6b95))
+
+## [2.64.1](https://github.com/revanced/revanced-patches/compare/v2.64.0...v2.64.1) (2022-09-21)
+
 # [2.64.0](https://github.com/revanced/revanced-patches/compare/v2.63.0...v2.64.0) (2022-09-21)


--- a/README.md
+++ b/README.md
@@ -4,12 +4,60 @@ The official Patch bundle provided by ReVanced and the community.

 > Looking for the JSON variant of this? [Click here](patches.json).

-### 📦 `com.twitter.android`
+### 📦 `com.google.android.youtube`
 <details>

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `timeline-ads` | Removes ads from the Twitter timeline. | all |
+| `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
+| `premium-heading` | Shows premium branding on the home screen. | all |
+| `theme` | Applies a custom theme. | all |
+| `old-quality-layout` | Enables the original quality flyout menu. | 17.36.37 |
+| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.36.37 |
+| `sponsorblock` | Integrate SponsorBlock. | 17.36.37 |
+| `hide-watermark` | Hides creator's watermarks on videos. | 17.36.37 |
+| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 17.36.37 |
+| `hide-create-button` | Hides the create button in the navigation bar. | 17.36.37 |
+| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.36.37 |
+| `tablet-mini-player` | Enables the tablet mini player layout. | 17.36.37 |
+| `hide-time-and-seekbar` | Hides progress bar and time counter on videos. | 17.36.37 |
+| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.36.37 |
+| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 17.36.37 |
+| `disable-auto-player-popup-panels` | Disable automatic popup panels (playlist or live chat) on video player. | 17.36.37 |
+| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.36.37 |
+| `hide-cast-button` | Hides the cast button in the video player. | all |
+| `video-ads` | Removes ads in the video player. | 17.36.37 |
+| `general-ads` | Removes general ads. | 17.36.37 |
+| `hide-infocard-suggestions` | Hides infocards in videos. | 17.36.37 |
+| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.36.37 |
+| `downloads` | Enables downloading music and videos from YouTube. | 17.36.37 |
+| `swipe-controls` | Adds volume and brightness swipe controls. | 17.36.37 |
+| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.36.37 |
+| `settings` | Adds settings for ReVanced to YouTube. | all |
+| `minimized-playback` | Enables minimized and background playback. | 17.36.37 |
+| `custom-video-buffer` | Lets you change the buffers of videos. | 17.36.37 |
+| `custom-playback-speed` | Adds more video playback speed options. | 17.36.37 |
+| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.36.37 |
+| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
+| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.36.37 |
+| `enable-debugging` | Enables app debugging by patching the manifest file. | all |
+| `always-autorepeat` | Always repeats the playing video again. | 17.36.37 |
+</details>
+
+### 📦 `com.vanced.android.youtube`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
+</details>
+
+### 📦 `de.dwd.warnapp`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `promo-code-unlock` | Disables the validation of promo code. Any code will work to unlock all features. | all |
 </details>

 ### 📦 `com.reddit.frontpage`
@@ -21,6 +69,23 @@ The official Patch bundle provided by ReVanced and the community.
 | `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | all |
 </details>

+### 📦 `com.google.android.apps.youtube.music`
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `background-play` | Enables playing music in the background. | 5.23.50 |
+| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.23.50 |
+| `compact-header` | Hides the music category bar at the top of the homepage. | 5.23.50 |
+| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.23.50 |
+| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.23.50 |
+| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.23.50 |
+| `music-video-ads` | Removes ads in the music player. | 5.23.50 |
+| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.23.50 |
+| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.23.50 |
+| `exclusive-audio-playback` | Enables the option to play music without video. | 5.23.50 |
+</details>
+
 ### 📦 `com.garzotto.pflotsh.ecmwf_a`
 <details>

@@ -29,39 +94,17 @@ The official Patch bundle provided by ReVanced and the community.
 | `pflotsh-ecmwf-subscription-unlock` | Unlocks all subscription features. | 3.5.4 |
 </details>

-### 📦 `com.google.android.apps.youtube.music`
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `minimized-playback-music` | Enables minimized playback on Kids music. | 5.23.50 |
-| `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | 5.23.50 |
-| `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | 5.23.50 |
-| `compact-header` | Hides the music category bar at the top of the homepage. | 5.23.50 |
-| `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | 5.23.50 |
-| `background-play` | Enables playing music in the background. | 5.23.50 |
-| `music-microg-support` | Allows YouTube Music ReVanced to run without root and under a different package name. | 5.23.50 |
-| `music-video-ads` | Removes ads in the music player. | 5.23.50 |
-| `codecs-unlock` | Adds more audio codec options. The new audio codecs usually result in better audio quality. | 5.23.50 |
-| `exclusive-audio-playback` | Enables the option to play music without video. | 5.23.50 |
-</details>
-
-### 📦 `de.dwd.warnapp`
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `promo-code-unlock` | Disables the validation of promo code. Any code will work to unlock all features. | all |
-</details>
-
 ### 📦 `com.ss.android.ugc.trill`
 <details>

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `tiktok-download` | Removes download restrictions and changes the default path to download to. | all |
-| `tiktok-seekbar` | Show progress bar for all video. | all |
+| `tiktok-feed-filter` | Filters tiktok videos: removing ads, removing livestreams. | all |
 | `tiktok-ads` | Removes ads from TikTok. | all |
+| `tiktok-seekbar` | Show progress bar for all video. | all |
+| `tiktok-download` | Removes download restrictions and changes the default path to download to. | all |
+| `tiktok-settings` | Add settings menu to TikTok. | all |
+| `tiktok-force-login` | Do not force login. | all |
 </details>

 ### 📦 `com.zhiliaoapp.musically`
@@ -69,57 +112,28 @@ The official Patch bundle provided by ReVanced and the community.

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `tiktok-download` | Removes download restrictions and changes the default path to download to. | all |
-| `tiktok-seekbar` | Show progress bar for all video. | all |
+| `tiktok-feed-filter` | Filters tiktok videos: removing ads, removing livestreams. | all |
 | `tiktok-ads` | Removes ads from TikTok. | all |
+| `tiktok-seekbar` | Show progress bar for all video. | all |
+| `tiktok-download` | Removes download restrictions and changes the default path to download to. | all |
+| `tiktok-settings` | Add settings menu to TikTok. | all |
+| `tiktok-force-login` | Do not force login. | all |
 </details>

-### 📦 `com.google.android.youtube`
+### 📦 `com.twitter.android`
 <details>

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `swipe-controls` | Adds volume and brightness swipe controls. | 17.36.37 |
-| `downloads` | Enables downloading music and videos from YouTube. | 17.36.37 |
-| `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 17.36.37 |
-| `hide-cast-button` | Hides the cast button in the video player. | all |
-| `hide-create-button` | Hides the create button in the navigation bar. | 17.36.37 |
-| `hide-shorts-button` | Hides the shorts button on the navigation bar. | 17.36.37 |
-| `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 17.36.37 |
-| `hide-autoplay-button` | Hides the autoplay button in the video player. | 17.36.37 |
-| `premium-heading` | Shows premium branding on the home screen. | all |
-| `custom-branding` | Changes the YouTube launcher icon and name to your choice (defaults to ReVanced). | all |
-| `disable-fullscreen-panels` | Disables video description and comments panel in fullscreen view. | 17.36.37 |
-| `old-quality-layout` | Enables the original quality flyout menu. | 17.36.37 |
-| `theme` | Applies a custom theme. | all |
-| `hide-watermark` | Hides creator's watermarks on videos. | 17.36.37 |
-| `sponsorblock` | Integrate SponsorBlock. | 17.36.37 |
-| `enable-wide-searchbar` | Replaces the search icon with a wide search bar. This will hide the YouTube logo when active. | 17.36.37 |
-| `hide-time-and-seekbar` | Hides progress bar and time counter on videos. | 17.36.37 |
-| `disable-auto-player-popup-panels` | Disable automatic popup panels (playlist or live chat) on video player. | 17.36.37 |
-| `tablet-mini-player` | Enables the tablet mini player layout. | 17.36.37 |
-| `disable-auto-captions` | Disable forced captions from being automatically enabled. | 17.36.37 |
-| `minimized-playback` | Enables minimized and background playback. | 17.36.37 |
-| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
-| `custom-video-buffer` | Lets you change the buffers of videos. | 17.36.37 |
-| `always-autorepeat` | Always repeats the playing video again. | 17.36.37 |
-| `microg-support` | Allows YouTube ReVanced to run without root and under a different package name with Vanced MicroG. | 17.36.37 |
-| `settings` | Adds settings for ReVanced to YouTube. | all |
-| `enable-debugging` | Enables app debugging by patching the manifest file. | all |
-| `custom-playback-speed` | Adds more video playback speed options. | 17.36.37 |
-| `hdr-auto-brightness` | Makes the brightness of HDR videos follow the system default. | 17.36.37 |
-| `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 17.36.37 |
-| `video-ads` | Removes ads in the video player. | 17.36.37 |
-| `general-ads` | Removes general ads. | 17.36.37 |
-| `hide-infocard-suggestions` | Hides infocards in videos. | 17.36.37 |
+| `timeline-ads` | Removes ads from the Twitter timeline. | all |
 </details>

-### 📦 `com.vanced.android.youtube`
+### 📦 `com.spotify.music`
 <details>

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `client-spoof` | Spoofs the YouTube or Vanced client to prevent playback issues. | all |
+| `hide-premium-navbar` | Removes the premium tab from the navbar. | all |
 </details>


--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,7 +20,7 @@ repositories {
 }

 dependencies {
-    implementation("app.revanced:revanced-patcher:4.4.2")
+    implementation("app.revanced:revanced-patcher:5.0.1")
    implementation("app.revanced:multidexlib2:2.5.2.r2")
    // Required for meta
    implementation("com.google.code.gson:gson:2.9.1")
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.64.0
+version = 2.68.1
--- a/patches.json
+++ b/patches.json
--- a/src/main/kotlin/app/revanced/patches/music/ad/video/patch/MusicVideoAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/ad/video/patch/MusicVideoAdsPatch.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
@@ -30,7 +30,7 @@ class MusicVideoAdsPatch : BytecodePatch(
        val result = ShowMusicVideoAdsFingerprint.result!!

        result.mutableMethod.addInstructions(
-            result.patternScanResult!!.startIndex, """
+            result.scanResult.patternScanResult!!.startIndex, """
                const/4 p1, 0x0
            """
        )
--- a/src/main/kotlin/app/revanced/patches/music/audio/codecs/patch/CodecsUnlockPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/audio/codecs/patch/CodecsUnlockPatch.kt
@@ -30,7 +30,7 @@ class CodecsUnlockPatch : BytecodePatch(

        val implementation = codecsLockResult.mutableMethod.implementation!!

-        val scanResultStartIndex = codecsLockResult.patternScanResult!!.startIndex
+        val scanResultStartIndex = codecsLockResult.scanResult.patternScanResult!!.startIndex
        val instructionIndex = scanResultStartIndex +
                if (implementation.instructions[scanResultStartIndex - 1].opcode == Opcode.CHECK_CAST) {
                    // for 5.16.xx and lower
@@ -43,7 +43,7 @@ class CodecsUnlockPatch : BytecodePatch(
        val allCodecsResult = AllCodecsReferenceFingerprint.result!!
        val allCodecsMethod =
            data.toMethodWalker(allCodecsResult.method)
-                .nextMethod(allCodecsResult.patternScanResult!!.startIndex)
+                .nextMethod(allCodecsResult.scanResult.patternScanResult!!.startIndex)
                .getMethod()

        implementation.replaceInstruction(
--- a/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/patch/ExclusiveAudioPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/patch/ExclusiveAudioPatch.kt
@@ -6,14 +6,12 @@ import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.extensions.replaceInstruction
-import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.music.audio.exclusiveaudio.annotations.ExclusiveAudioCompatibility
 import app.revanced.patches.music.audio.exclusiveaudio.fingerprints.AudioOnlyEnablerFingerprint
-import app.revanced.patches.music.audio.exclusiveaudio.fingerprints.ExclusiveAudioFingerprint

@Patch
@Name("exclusive-audio-playback")
--- a/src/main/kotlin/app/revanced/patches/music/layout/compactheader/patch/CompactHeaderPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/compactheader/patch/CompactHeaderPatch.kt
@@ -27,7 +27,7 @@ class CompactHeaderPatch : BytecodePatch(
        val result = CompactHeaderConstructorFingerprint.result!!
        val method = result.mutableMethod

-        val insertIndex = result.patternScanResult!!.endIndex
+        val insertIndex = result.scanResult.patternScanResult!!.endIndex
        val register = (method.implementation!!.instructions[insertIndex - 1] as BuilderInstruction11x).registerA
        method.addInstructions(
            insertIndex, """
--- a/src/main/kotlin/app/revanced/patches/music/layout/premium/patch/HideGetPremiumPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/premium/patch/HideGetPremiumPatch.kt
@@ -6,7 +6,7 @@ import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.replaceInstruction
-import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
@@ -29,9 +29,11 @@ class HideGetPremiumPatch : BytecodePatch(
        val parentResult = HideGetPremiumParentFingerprint.result!!
        HideGetPremiumFingerprint.resolve(data, parentResult.classDef)

+        val startIndex = parentResult.scanResult.patternScanResult!!.startIndex
+
        val parentMethod = parentResult.mutableMethod
        parentMethod.replaceInstruction(
-            parentResult.patternScanResult!!.startIndex, """
+            startIndex, """
            const/4 v1, 0x0
        """
        )
@@ -39,7 +41,7 @@ class HideGetPremiumPatch : BytecodePatch(
        val result = HideGetPremiumFingerprint.result!!
        val method = result.mutableMethod
        method.addInstructions(
-            result.patternScanResult!!.startIndex, """
+            startIndex, """
            const/16 v0, 0x8
        """
        )
--- a/src/main/kotlin/app/revanced/patches/music/layout/tastebuilder/patch/RemoveTasteBuilderPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/tastebuilder/patch/RemoveTasteBuilderPatch.kt
@@ -27,7 +27,7 @@ class RemoveTasteBuilderPatch : BytecodePatch(
        val result = TasteBuilderConstructorFingerprint.result!!
        val method = result.mutableMethod

-        val insertIndex = result.patternScanResult!!.endIndex - 8
+        val insertIndex = result.scanResult.patternScanResult!!.endIndex - 8
        val register = (method.implementation!!.instructions[insertIndex] as Instruction22c).registerA
        method.addInstructions(
            insertIndex, """
--- a/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/patch/RemoveUpgradeButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/patch/RemoveUpgradeButtonPatch.kt
@@ -33,7 +33,7 @@ class RemoveUpgradeButtonPatch : BytecodePatch(
        val implementation = result.mutableMethod.implementation!!

        val pivotBarElementFieldRef =
-            (implementation.instructions[result.patternScanResult!!.endIndex - 1] as Instruction22c).reference
+            (implementation.instructions[result.scanResult.patternScanResult!!.endIndex - 1] as Instruction22c).reference

        val register = (implementation.instructions.first() as Instruction35c).registerC
        // first compile all the needed instructions
@@ -46,16 +46,18 @@ class RemoveUpgradeButtonPatch : BytecodePatch(
            """.toInstructions().toMutableList()


+        val endIndex = result.scanResult.patternScanResult!!.endIndex
+
        // replace the instruction to retain the label at given index
        implementation.replaceInstruction(
-            result.patternScanResult!!.endIndex - 1, instructionList[0] // invoke-interface
+            endIndex - 1, instructionList[0] // invoke-interface
        )
        // do not forget to remove this instruction since we added it already
        instructionList.removeFirst()

        val exitInstruction = instructionList.last() // iput-object
        implementation.addInstruction(
-            result.patternScanResult!!.endIndex, exitInstruction
+            endIndex, exitInstruction
        )
        // do not forget to remove this instruction since we added it already
        instructionList.removeLast()
@@ -64,12 +66,12 @@ class RemoveUpgradeButtonPatch : BytecodePatch(
        instructionList.add(
            2, // if-le
            BuilderInstruction22t(
-                Opcode.IF_LE, 1, 2, implementation.newLabelForIndex(result.patternScanResult!!.endIndex)
+                Opcode.IF_LE, 1, 2, implementation.newLabelForIndex(endIndex)
            )
        )

        implementation.addInstructions(
-            result.patternScanResult!!.endIndex, instructionList
+            endIndex, instructionList
        )
        return PatchResultSuccess()
    }
--- a/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/annotations/PremiumNavbarTabCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/annotations/PremiumNavbarTabCompatibility.kt
@@ -0,0 +1,9 @@
+package app.revanced.patches.spotify.premium_navbar_tab.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.spotify.music")])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class PremiumNavbarTabCompatibility
--- a/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/fingerprints/AddPremiumNavbarTabFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/fingerprints/AddPremiumNavbarTabFingerprint.kt
@@ -0,0 +1,13 @@
+package app.revanced.patches.spotify.premium_navbar_tab.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.spotify.premium_navbar_tab.annotations.PremiumNavbarTabCompatibility
+
+@Name("premium-navbar-fingerprint")
+@Version("0.0.1")
+@PremiumNavbarTabCompatibility
+object AddPremiumNavbarTabFingerprint : MethodFingerprint(
+    parameters = listOf("L", "L", "L", "L", "L", "L")
+)
--- a/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/fingerprints/AddPremiumNavbarTabParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/fingerprints/AddPremiumNavbarTabParentFingerprint.kt
@@ -0,0 +1,13 @@
+package app.revanced.patches.spotify.premium_navbar_tab.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.spotify.premium_navbar_tab.annotations.PremiumNavbarTabCompatibility
+
+@Name("add-premium-navbar-tab-parent-fingerprint")
+@Version("0.0.1")
+@PremiumNavbarTabCompatibility
+object AddPremiumNavbarTabParentFingerprint : MethodFingerprint(
+     strings = listOf("com.samsung.android.samsungaccount.action.REQUEST_AUTHCODE")
+)
--- a/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/patch/PremiumNavbarTabPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/spotify/premium_navbar_tab/patch/PremiumNavbarTabPatch.kt
@@ -0,0 +1,62 @@
+package app.revanced.patches.spotify.premium_navbar_tab.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.removeInstruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.spotify.premium_navbar_tab.annotations.PremiumNavbarTabCompatibility
+import app.revanced.patches.spotify.premium_navbar_tab.fingerprints.AddPremiumNavbarTabFingerprint
+import app.revanced.patches.spotify.premium_navbar_tab.fingerprints.AddPremiumNavbarTabParentFingerprint
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+
+@Patch
+@Name("hide-premium-navbar")
+@Description("Removes the premium tab from the navbar.")
+@PremiumNavbarTabCompatibility
+@Version("0.0.1")
+@DependsOn([ResourceIdMappingProviderResourcePatch::class])
+class PremiumNavbarTabPatch : BytecodePatch(
+    listOf(
+        AddPremiumNavbarTabParentFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val parentResult = AddPremiumNavbarTabParentFingerprint.result!!
+        AddPremiumNavbarTabFingerprint.resolve(data, parentResult.classDef)
+
+        val result = AddPremiumNavbarTabFingerprint.result!!
+
+        val method = result.mutableMethod
+        val methodInstructions = method.implementation!!.instructions
+        val lastInstructionIdx = methodInstructions.size - 1
+
+        val premiumTabId = ResourceIdMappingProviderResourcePatch.resourceMappings.single{it.type == "id" && it.name == "premium_tab"}.id
+
+        var removeAmount = 2
+        // 2nd const remove method
+        for ((i, instruction) in methodInstructions.asReversed().withIndex()) {
+            if (instruction.opcode.ordinal != Opcode.CONST.ordinal) continue
+            if ((instruction as WideLiteralInstruction).wideLiteral != premiumTabId) continue
+
+            val findThreshold = 10
+            val constIndex = lastInstructionIdx - i
+            val invokeInstruction = methodInstructions.subList(constIndex, constIndex + findThreshold).first {
+                it.opcode.ordinal == Opcode.INVOKE_VIRTUAL_RANGE.ordinal
+            }
+            method.removeInstruction(methodInstructions.indexOf(invokeInstruction))
+
+            if (--removeAmount == 0) break
+        }
+
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/tiktok/feedfilter/annotations/FeedFilterCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/feedfilter/annotations/FeedFilterCompatibility.kt
@@ -0,0 +1,14 @@
+package app.revanced.patches.tiktok.feedfilter.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [
+        Package("com.ss.android.ugc.trill"),
+        Package("com.zhiliaoapp.musically")
+    ]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class FeedFilterCompatibility
--- a/src/main/kotlin/app/revanced/patches/tiktok/feedfilter/fingerprints/FeedApiServiceLIZFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/feedfilter/fingerprints/FeedApiServiceLIZFingerprint.kt
@@ -0,0 +1,23 @@
+package app.revanced.patches.tiktok.feedfilter.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.feedfilter.annotations.FeedFilterCompatibility
+import org.jf.dexlib2.AccessFlags
+
+@Name("feed-api-service-fingerprint")
+@MatchingMethod(
+    "Lcom/ss/android/ugc/aweme/feed/FeedApiService;",
+    "LIZ",
+)
+@FeedFilterCompatibility
+@Version("0.0.1")
+object FeedApiServiceLIZFingerprint : MethodFingerprint(
+    access = AccessFlags.PUBLIC or AccessFlags.STATIC or AccessFlags.FINAL or AccessFlags.SYNTHETIC,
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/FeedApiService;") && methodDef.name == "LIZ"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/feedfilter/patch/TiktokFeedFilter.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/feedfilter/patch/TiktokFeedFilter.kt
@@ -0,0 +1,51 @@
+package app.revanced.patches.tiktok.feedfilter.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.tiktok.feedfilter.annotations.FeedFilterCompatibility
+import app.revanced.patches.tiktok.feedfilter.fingerprints.FeedApiServiceLIZFingerprint
+import app.revanced.patches.tiktok.misc.integrations.patch.TikTokIntegrationsPatch
+import app.revanced.patches.tiktok.misc.settings.fingerprints.SettingsStatusLoadFingerprint
+import app.revanced.patches.tiktok.misc.settings.patch.TikTokSettingsPatch
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+
+@Patch
+@DependsOn([TikTokIntegrationsPatch::class, TikTokSettingsPatch::class])
+@Name("tiktok-feed-filter")
+@Description("Filters tiktok videos: removing ads, removing livestreams.")
+@FeedFilterCompatibility
+@Version("0.0.1")
+class TiktokFeedFilter : BytecodePatch(
+    listOf(
+        FeedApiServiceLIZFingerprint,
+        SettingsStatusLoadFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val method = FeedApiServiceLIZFingerprint.result!!.mutableMethod
+        for ((index, instruction) in method.implementation!!.instructions.withIndex()) {
+            if (instruction.opcode != Opcode.RETURN_OBJECT) continue
+            val feedItemsRegister = (instruction as OneRegisterInstruction).registerA
+            method.addInstruction(
+                index,
+                "invoke-static {v$feedItemsRegister}, Lapp/revanced/tiktok/feedfilter/FeedItemsFilter;->filter(Lcom/ss/android/ugc/aweme/feed/model/FeedItemList;)V"
+            )
+            break
+        }
+        val method2 = SettingsStatusLoadFingerprint.result!!.mutableMethod
+        method2.addInstruction(
+            0,
+            "invoke-static {}, Lapp/revanced/tiktok/settingsmenu/SettingsStatus;->enableFeedFilter()V"
+        )
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/patch/DownloadsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/patch/DownloadsPatch.kt
@@ -5,9 +5,13 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.data.impl.toMethodWalker
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.replaceInstruction
 import app.revanced.patcher.extensions.replaceInstructions
-import app.revanced.patcher.patch.*
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
@@ -16,6 +20,7 @@ import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonS
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint2
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.ACLCommonShareFingerprint3
 import app.revanced.patches.tiktok.interaction.downloads.fingerprints.DownloadPathParentFingerprint
+import app.revanced.patches.tiktok.misc.settings.fingerprints.SettingsStatusLoadFingerprint
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
@@ -31,7 +36,8 @@ class DownloadsPatch : BytecodePatch(
        ACLCommonShareFingerprint,
        ACLCommonShareFingerprint2,
        ACLCommonShareFingerprint3,
-        DownloadPathParentFingerprint
+        DownloadPathParentFingerprint,
+        SettingsStatusLoadFingerprint
    )
 ) {
    override fun execute(data: BytecodeData): PatchResult {
@@ -53,11 +59,16 @@ class DownloadsPatch : BytecodePatch(
        )
        //Download videos without watermark.
        val method3 = ACLCommonShareFingerprint3.result!!.mutableMethod
-        method3.replaceInstructions(
+        method3.addInstructions(
            0,
            """
+                invoke-static {}, Lapp/revanced/tiktok/download/DownloadsPatch;->shouldRemoveWatermark()Z
+                move-result v0
+                if-eqz v0, :noremovewatermark
                const/4 v0, 0x1
                return v0
+                :noremovewatermark
+                nop
            """
        )
        //Change the download path patch
@@ -77,7 +88,6 @@ class DownloadsPatch : BytecodePatch(
        }
        if (targetOffset == -1) return PatchResultError("Can not find download path uri method.")
        //Change videos' download path.
-        val downloadPath = "$downloadPathParent/$downloadPathChild"
        val downloadUriMethod = data
            .toMethodWalker(DownloadPathParentFingerprint.result!!.method)
            .nextMethod(targetOffset, true)
@@ -85,10 +95,11 @@ class DownloadsPatch : BytecodePatch(
        downloadUriMethod.implementation!!.instructions.forEachIndexed { index, instruction ->
            if (instruction.opcode == Opcode.SGET_OBJECT) {
                val overrideRegister = (instruction as OneRegisterInstruction).registerA
-                downloadUriMethod.replaceInstruction(
-                    index,
+                downloadUriMethod.addInstructions(
+                    index + 1,
                    """
-                        const-string v$overrideRegister, "$downloadPath"
+                        invoke-static {}, Lapp/revanced/tiktok/download/DownloadsPatch;->getDownloadPath()Ljava/lang/String;
+                        move-result-object v$overrideRegister
                    """
                )
            }
@@ -106,30 +117,11 @@ class DownloadsPatch : BytecodePatch(
                }
            }
        }
+        val method5 = SettingsStatusLoadFingerprint.result!!.mutableMethod
+        method5.addInstruction(
+            0,
+            "invoke-static {}, Lapp/revanced/tiktok/settingsmenu/SettingsStatus;->enableDownload()V"
+        )
        return PatchResultSuccess()
    }
-
-    companion object : OptionsContainer() {
-        private var downloadPathParent: String? by option(
-            PatchOption.StringListOption(
-                key = "mediaFolder",
-                default = "DCIM",
-                options = listOf(
-                    "DCIM", "Movies", "Pictures"
-                ),
-                title = "Media folder",
-                description = "The media root folder to download to.",
-                required = true
-            )
-        )
-        private var downloadPathChild: String? by option(
-            PatchOption.StringOption(
-                key = "downloadPath",
-                default = "TikTok",
-                title = "Download path",
-                description = "Download path relative to the media folder.",
-                required = true
-            )
-        )
-    }
 }
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/forcelogin/annotations/DisableForceLoginCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/forcelogin/annotations/DisableForceLoginCompatibility.kt
@@ -0,0 +1,14 @@
+package app.revanced.patches.tiktok.misc.forcelogin.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [
+        Package("com.ss.android.ugc.trill"),
+        Package("com.zhiliaoapp.musically")
+    ]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class DisableForceLoginCompatibility
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/forcelogin/fingerprints/MandatoryLoginServiceFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/forcelogin/fingerprints/MandatoryLoginServiceFingerprint.kt
@@ -0,0 +1,18 @@
+package app.revanced.patches.tiktok.misc.forcelogin.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.misc.forcelogin.annotations.DisableForceLoginCompatibility
+
+@Name("mandatory-login-service-fingerprint")
+@MatchingMethod("/MandatoryLoginService;", "enableForcedLogin")
+@DisableForceLoginCompatibility
+@Version("0.0.1")
+object MandatoryLoginServiceFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/MandatoryLoginService;") &&
+                methodDef.name == "enableForcedLogin"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/forcelogin/fingerprints/MandatoryLoginServiceFingerprint2.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/forcelogin/fingerprints/MandatoryLoginServiceFingerprint2.kt
@@ -0,0 +1,18 @@
+package app.revanced.patches.tiktok.misc.forcelogin.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.misc.forcelogin.annotations.DisableForceLoginCompatibility
+
+@Name("mandatory-login-service-fingerprint2")
+@MatchingMethod("/MandatoryLoginService;", "shouldShowForcedLogin")
+@DisableForceLoginCompatibility
+@Version("0.0.1")
+object MandatoryLoginServiceFingerprint2 : MethodFingerprint(
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/MandatoryLoginService;") &&
+                methodDef.name == "shouldShowForcedLogin"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/forcelogin/patch/DisableForceLoginPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/forcelogin/patch/DisableForceLoginPatch.kt
@@ -0,0 +1,43 @@
+package app.revanced.patches.tiktok.misc.forcelogin.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.tiktok.misc.forcelogin.annotations.DisableForceLoginCompatibility
+import app.revanced.patches.tiktok.misc.forcelogin.fingerprints.MandatoryLoginServiceFingerprint
+import app.revanced.patches.tiktok.misc.forcelogin.fingerprints.MandatoryLoginServiceFingerprint2
+
+@Patch
+@Name("tiktok-force-login")
+@Description("Do not force login.")
+@DisableForceLoginCompatibility
+@Version("0.0.1")
+class DisableForceLoginPatch : BytecodePatch(
+    listOf(
+        MandatoryLoginServiceFingerprint,
+        MandatoryLoginServiceFingerprint2
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        listOf(
+            MandatoryLoginServiceFingerprint,
+            MandatoryLoginServiceFingerprint2
+        ).forEach { fingerprint ->
+            val method = fingerprint.result!!.mutableMethod
+            method.addInstructions(
+                0,
+                """
+                const/4 v0, 0x0
+                return v0
+            """
+            )
+        }
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/annotations/TikTokIntegrationsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/annotations/TikTokIntegrationsCompatibility.kt
@@ -0,0 +1,14 @@
+package app.revanced.patches.tiktok.misc.integrations.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [
+        Package("com.ss.android.ugc.trill"),
+        Package("com.zhiliaoapp.musically")
+    ]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class TikTokIntegrationsCompatibility
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/fingerprints/InitFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/fingerprints/InitFingerprint.kt
@@ -0,0 +1,20 @@
+package app.revanced.patches.tiktok.misc.integrations.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.misc.integrations.annotations.TikTokIntegrationsCompatibility
+
+@Name("init-fingerprint")
+@MatchingMethod(
+    "Lcom/ss/android/ugc/aweme/app/host/AwemeHostApplication;", "onCreate"
+)
+@TikTokIntegrationsCompatibility
+@Version("0.0.1")
+object InitFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/AwemeHostApplication;") &&
+                methodDef.name == "onCreate"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/patch/TikTokIntegrationsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/patch/TikTokIntegrationsPatch.kt
@@ -0,0 +1,38 @@
+package app.revanced.patches.tiktok.misc.integrations.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.tiktok.misc.integrations.annotations.TikTokIntegrationsCompatibility
+import app.revanced.patches.tiktok.misc.integrations.fingerprints.InitFingerprint
+
+@Name("tiktok-integrations")
+@Description("Applies mandatory patches to implement the ReVanced integrations into the application.")
+@TikTokIntegrationsCompatibility
+@Version("0.0.1")
+class TikTokIntegrationsPatch : BytecodePatch(
+    listOf(
+        InitFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        if (data.findClass("Lapp/revanced/tiktok/utils/ReVancedUtils") == null)
+            return PatchResultError("Integrations have not been merged yet. This patch can not succeed without the integrations.")
+        val result = InitFingerprint.result!!
+
+        val method = result.mutableMethod
+        val implementation = method.implementation!!
+        val count = implementation.registerCount - 1
+
+        method.addInstruction(
+            0, "sput-object v$count, Lapp/revanced/tiktok/utils/ReVancedUtils;->context:Landroid/content/Context;"
+        )
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/annotations/TikTokSettingsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/annotations/TikTokSettingsCompatibility.kt
@@ -0,0 +1,14 @@
+package app.revanced.patches.tiktok.misc.settings.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [
+        Package("com.ss.android.ugc.trill"),
+        Package("com.zhiliaoapp.musically")
+    ]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class TikTokSettingsCompatibility
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/AdPersonalizationActivityFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/AdPersonalizationActivityFingerprint.kt
@@ -0,0 +1,21 @@
+package app.revanced.patches.tiktok.misc.settings.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.misc.settings.annotations.TikTokSettingsCompatibility
+
+@Name("ad-personalization-activity-fingerprint")
+@MatchingMethod(
+    "Lcom/bytedance/ies/ugc/aweme/commercialize/compliance/personalization/AdPersonalizationActivity;",
+    "onCreate"
+)
+@TikTokSettingsCompatibility
+@Version("0.0.1")
+object AdPersonalizationActivityFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/AdPersonalizationActivity;") &&
+                methodDef.name == "onCreate"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/CopyRightSettingsStringFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/CopyRightSettingsStringFingerprint.kt
@@ -0,0 +1,21 @@
+package app.revanced.patches.tiktok.misc.settings.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.misc.settings.annotations.TikTokSettingsCompatibility
+
+@Name("copyright-settings-string-fingerprint")
+@MatchingMethod(
+    "Lcom/ss/android/ugc/aweme/setting/ui/SettingNewVersionFragment;",
+    "onViewCreated"
+)
+@TikTokSettingsCompatibility
+@Version("0.0.1")
+object CopyRightSettingsStringFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/SettingNewVersionFragment;") &&
+                methodDef.name == "onViewCreated"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/SettingsStatusLoadFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/fingerprints/SettingsStatusLoadFingerprint.kt
@@ -0,0 +1,21 @@
+package app.revanced.patches.tiktok.misc.settings.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.tiktok.misc.settings.annotations.TikTokSettingsCompatibility
+
+@Name("settings-status-load-fingerprint")
+@MatchingMethod(
+    "Lapp/revanced/tiktok/settingsmenu/SettingsStatus;",
+    "load"
+)
+@TikTokSettingsCompatibility
+@Version("0.0.1")
+object SettingsStatusLoadFingerprint : MethodFingerprint(
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("Lapp/revanced/tiktok/settingsmenu/SettingsStatus;") &&
+                methodDef.name == "load"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/patch/TikTokSettingsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/patch/TikTokSettingsPatch.kt
@@ -0,0 +1,98 @@
+package app.revanced.patches.tiktok.misc.settings.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.replaceInstruction
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.DependsOn
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patches.tiktok.misc.integrations.patch.TikTokIntegrationsPatch
+import app.revanced.patches.tiktok.misc.settings.annotations.TikTokSettingsCompatibility
+import app.revanced.patches.tiktok.misc.settings.fingerprints.AdPersonalizationActivityFingerprint
+import app.revanced.patches.tiktok.misc.settings.fingerprints.CopyRightSettingsStringFingerprint
+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 org.jf.dexlib2.iface.reference.MethodReference
+import org.jf.dexlib2.iface.reference.StringReference
+
+@Patch
+@DependsOn([TikTokIntegrationsPatch::class])
+@Name("tiktok-settings")
+@Description("Add settings menu to TikTok.")
+@TikTokSettingsCompatibility
+@Version("0.0.1")
+class TikTokSettingsPatch : BytecodePatch(
+    listOf(
+        AdPersonalizationActivityFingerprint,
+        CopyRightSettingsStringFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        //Replace string `Copyright Policy` to 'Revanced Settings` in TikTok settings.
+        val method1 = CopyRightSettingsStringFingerprint.result!!.mutableMethod
+        val implementation1 = method1.implementation!!
+        for ((index, instruction) in implementation1.instructions.withIndex()) {
+            if (instruction.opcode != Opcode.CONST_STRING) continue
+            val string = ((instruction as ReferenceInstruction).reference as StringReference).string
+            if (string != "copyright_policy") continue
+            var targetIndex = index
+            while (targetIndex >= 0) {
+                targetIndex--
+                val invokeInstruction = implementation1.instructions[targetIndex]
+                if (invokeInstruction.opcode != Opcode.INVOKE_VIRTUAL) continue
+                val methodName = ((invokeInstruction as Instruction35c).reference as MethodReference).name
+                if (methodName != "getString") continue
+                val resultInstruction = implementation1.instructions[targetIndex + 1]
+                if (resultInstruction.opcode != Opcode.MOVE_RESULT_OBJECT) continue
+                val overrideRegister = (resultInstruction as OneRegisterInstruction).registerA
+                method1.replaceInstruction(
+                    targetIndex + 1,
+                    """
+                        const-string v$overrideRegister, "Revanced Settings"
+                    """
+                )
+                break
+            }
+            //Change onClick to start settings activity.
+            val clickInstruction = implementation1.instructions[index - 1]
+            if (clickInstruction.opcode != Opcode.INVOKE_DIRECT)
+                return PatchResultError("Can not find click listener.")
+            val clickClass = ((clickInstruction as ReferenceInstruction).reference as MethodReference).definingClass
+            val mutableClickClass = data.findClass(clickClass)!!.resolve()
+            val mutableOnClickMethod = mutableClickClass.methods.first {
+                it.name == "onClick"
+            }
+            mutableOnClickMethod.addInstructions(
+                0,
+                """
+                    invoke-static {}, Lapp/revanced/tiktok/settingsmenu/SettingsMenu;->startSettingsActivity()V
+                    return-void
+                """
+            )
+            break
+        }
+        //Implement revanced settings screen in `AdPersonalizationActivity`
+        val method2 = AdPersonalizationActivityFingerprint.result!!.mutableMethod
+        for ((index, instruction) in method2.implementation!!.instructions.withIndex()) {
+            if (instruction.opcode != Opcode.INVOKE_SUPER) continue
+            val thisRegister = (instruction as Instruction35c).registerC
+            method2.addInstructions(
+                index + 1,
+                """
+                    invoke-static {v$thisRegister}, Lapp/revanced/tiktok/settingsmenu/SettingsMenu;->initializeSettings(Lcom/bytedance/ies/ugc/aweme/commercialize/compliance/personalization/AdPersonalizationActivity;)V
+                    return-void
+                """
+            )
+            break
+        }
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/twitter/ad/timeline/patch/TimelineAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/twitter/ad/timeline/patch/TimelineAdsPatch.kt
@@ -58,7 +58,7 @@ class TimelineAdsPatch : BytecodePatch(
        // Set the tweetId field to null
        // This will cause twitter to not show the promoted ads, because we set it to null, when the tweet is promoted
        parserFingerprintResult.mutableMethod.addInstructions(
-            parserFingerprintResult.patternScanResult!!.startIndex + 1,
+            parserFingerprintResult.scanResult.patternScanResult!!.startIndex + 1,
            """
                    const/4 v2, 0x0
                    iput-object v2, p0, Lcom/twitter/model/json/timeline/urt/JsonTimelineTweet;->${tweetIdFieldReference.name}:Ljava/lang/String;
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/patch/HideInfocardSuggestionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/infocardsuggestions/patch/HideInfocardSuggestionsPatch.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.replaceInstruction
-import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/video/patch/VideoAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/video/patch/VideoAdsPatch.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/patch/EnableSeekbarTappingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/patch/EnableSeekbarTappingPatch.kt
@@ -79,15 +79,17 @@ class EnableSeekbarTappingPatch : BytecodePatch(
        val pMethod = tapSeekMethods["P"]!!
        val oMethod = tapSeekMethods["O"]!!

+        val insertIndex = result.scanResult.patternScanResult!!.endIndex + 1
+
        // get the required register
-        val instruction = implementation.instructions[result.patternScanResult!!.endIndex]
+        val instruction = implementation.instructions[insertIndex - 1]
        if (instruction.opcode != Opcode.INVOKE_VIRTUAL) return PatchResultError("Could not find the correct register")
        val register = (instruction as Instruction35c).registerC

-        val elseLabel = implementation.newLabelForIndex(result.patternScanResult!!.endIndex + 1)
+        val elseLabel = implementation.newLabelForIndex(insertIndex)
        // the instructions are written in reverse order.
        result.mutableMethod.addInstructions(
-            result.patternScanResult!!.endIndex + 1, """
+            insertIndex, """
               invoke-virtual { v$register, v2 }, ${oMethod.definingClass}->${oMethod.name}(I)V
               invoke-virtual { v$register, v2 }, ${pMethod.definingClass}->${pMethod.name}(I)V
            """
@@ -95,10 +97,10 @@ class EnableSeekbarTappingPatch : BytecodePatch(

        // if tap-seeking is disabled, do not invoke the two methods above by jumping to the else label
        implementation.addInstruction(
-            result.patternScanResult!!.endIndex + 1, BuilderInstruction21t(Opcode.IF_EQZ, 0, elseLabel)
+            insertIndex, BuilderInstruction21t(Opcode.IF_EQZ, 0, elseLabel)
        )
        result.mutableMethod.addInstructions(
-            result.patternScanResult!!.endIndex + 1, """
+            insertIndex, """
                invoke-static { }, Lapp/revanced/integrations/patches/SeekbarTappingPatch;->isTapSeekingEnabled()Z
                move-result v0
            """
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/patch/FullscreenPanelsRemoverPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/patch/FullscreenPanelsRemoverPatch.kt
@@ -6,7 +6,7 @@ import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.removeInstruction
-import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
@@ -50,7 +50,7 @@ class FullscreenPanelsRemoverPatch : BytecodePatch(

        val method = result.mutableMethod

-        val ifIndex = result.patternScanResult!!.startIndex + 2
+        val ifIndex = result.scanResult.patternScanResult!!.startIndex + 2

        method.removeInstruction(ifIndex)
        method.addInstructions(
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/createbutton/patch/CreateButtonRemoverPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/createbutton/patch/CreateButtonRemoverPatch.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
-import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
@@ -55,7 +55,7 @@ class CreateButtonRemoverPatch : BytecodePatch(
            return PatchResultError("${PivotBarCreateButtonViewFingerprint.name} failed")

        val createButtonResult = PivotBarCreateButtonViewFingerprint.result!!
-        val insertIndex = createButtonResult.patternScanResult!!.endIndex
+        val insertIndex = createButtonResult.scanResult.patternScanResult!!.endIndex

        /*
         * Inject hooks
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/shortsbutton/patch/ShortsButtonRemoverPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/pivotbar/shortsbutton/patch/ShortsButtonRemoverPatch.kt
@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
-import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
@@ -58,7 +58,7 @@ class ShortsButtonRemoverPatch : BytecodePatch(

                if (!resolutionSucceeded) return PatchResultError("${it.name} failed")
            }
-            .map { it.result!!.patternScanResult!! }
+            .map { it.result!!.scanResult.patternScanResult!! }

        val enumScanResult = fingerprintResults[0]
        val buttonViewResult = fingerprintResults[1]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/reels/patch/HideReelsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/reels/patch/HideReelsPatch.kt
@@ -42,7 +42,7 @@ class HideReelsPatch : BytecodePatch(
        // HideReel will hide the reel view before it is being used,
        // so we pass the view to the HideReel method
        result.mutableMethod.addInstruction(
-            result.patternScanResult!!.endIndex,
+            result.scanResult.patternScanResult!!.endIndex,
            "invoke-static { v2 }, Lapp/revanced/integrations/patches/HideReelsPatch;->HideReel(Landroid/view/View;)V"
        )

--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/ShortsPlayerConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/ShortsPlayerConstructorFingerprint.kt
@@ -7,8 +7,10 @@ import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility
+import app.revanced.patches.youtube.layout.sponsorblock.resource.patch.SponsorBlockResourcePatch
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction

@Name("shorts-player-constructor-fingerprint")
@MatchingMethod("Lhgp;", "<init>")
@@ -33,6 +35,13 @@ object ShortsPlayerConstructorFingerprint : MethodFingerprint(
        Opcode.IPUT_OBJECT,
        Opcode.NEW_INSTANCE,
        Opcode.INVOKE_DIRECT,
-        Opcode.IPUT_OBJECT
-    )
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.CONST_4
+    ),
+    customFingerprint = { methodDef ->
+        methodDef.implementation?.instructions?.any { instruction ->
+            (instruction as? WideLiteralInstruction)?.wideLiteral == SponsorBlockResourcePatch.reelButtonGroupResourceId
+        } == true
+    }
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt
@@ -10,7 +10,7 @@ import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.extensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
@@ -40,7 +40,7 @@ import org.jf.dexlib2.util.MethodUtil

@Patch
@DependsOn(
-    dependencies = [PlayerControlsBytecodePatch::class, IntegrationsPatch::class, ResourceIdMappingProviderResourcePatch::class, SponsorBlockResourcePatch::class, VideoIdPatch::class]
+    dependencies = [PlayerControlsBytecodePatch::class, IntegrationsPatch::class, SponsorBlockResourcePatch::class, VideoIdPatch::class]
 )
@Name("sponsorblock")
@Description("Integrate SponsorBlock.")
@@ -55,7 +55,8 @@ class SponsorBlockBytecodePatch : BytecodePatch(
        AppendTimeFingerprint,
        PlayerInitFingerprint,
        PlayerOverlaysLayoutInitFingerprint,
-        ShortsPlayerConstructorFingerprint
+        ShortsPlayerConstructorFingerprint,
+        StartVideoInformerFingerprint
    )
 ) {
    override fun execute(data: BytecodeData): PatchResult {/*
@@ -63,7 +64,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(
        */
        val referenceResult = PlayerControllerSetTimeReferenceFingerprint.result!!
        val playerControllerSetTimeMethod =
-            data.toMethodWalker(referenceResult.method).nextMethod(referenceResult.patternScanResult!!.startIndex, true)
+            data.toMethodWalker(referenceResult.method).nextMethod(referenceResult.scanResult.patternScanResult!!.startIndex, true)
                .getMethod() as MutableMethod
        playerControllerSetTimeMethod.addInstruction(
            2,
@@ -163,11 +164,11 @@ class SponsorBlockBytecodePatch : BytecodePatch(
        val videoLengthMethodInstructions = videoLengthMethod.implementation!!.instructions

        val videoLengthRegister =
-            (videoLengthMethodInstructions[videoLengthMethodResult.patternScanResult!!.endIndex - 2] as OneRegisterInstruction).registerA
+            (videoLengthMethodInstructions[videoLengthMethodResult.scanResult.patternScanResult!!.endIndex - 2] as OneRegisterInstruction).registerA
        val dummyRegisterForLong =
            videoLengthRegister + 1 // this is required for long values since they are 64 bit wide
        videoLengthMethod.addInstruction(
-            videoLengthMethodResult.patternScanResult!!.endIndex,
+            videoLengthMethodResult.scanResult.patternScanResult!!.endIndex,
            "invoke-static {v$videoLengthRegister, v$dummyRegisterForLong}, Lapp/revanced/integrations/sponsorblock/PlayerController;->setVideoLength(J)V"
        )

@@ -231,7 +232,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(

        // append the new time to the player layout
        val appendTimeFingerprintResult = AppendTimeFingerprint.result!!
-        val appendTimePatternScanStartIndex = appendTimeFingerprintResult.patternScanResult!!.startIndex
+        val appendTimePatternScanStartIndex = appendTimeFingerprintResult.scanResult.patternScanResult!!.startIndex
        val targetRegister =
            (appendTimeFingerprintResult.method.implementation!!.instructions.elementAt(appendTimePatternScanStartIndex + 1) as OneRegisterInstruction).registerA

@@ -329,7 +330,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(
        val startVideoInformerMethod = StartVideoInformerFingerprint.result!!.mutableMethod
        startVideoInformerMethod.addInstructions(
            0, """
-            const/4 v0, 0x1
+            const/4 v0, 0x0
            sput-boolean v0, Lapp/revanced/integrations/settings/SettingsEnum;->shorts_playing:Z
        """
        )
@@ -338,7 +339,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(

        shortsPlayerConstructorMethod.addInstructions(
            0, """
-            const/4 v0, 0x0
+            const/4 v0, 0x1
            sput-boolean v0, Lapp/revanced/integrations/settings/SettingsEnum;->shorts_playing:Z
        """
        )
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/resource/patch/SponsorBlockResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/resource/patch/SponsorBlockResourcePatch.kt
@@ -9,6 +9,7 @@ import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.impl.ResourcePatch
 import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility
 import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.Preference
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
@@ -19,9 +20,13 @@ import app.revanced.util.resources.ResourceUtils.copyXmlNode

@Name("sponsorblock-resource-patch")
@SponsorBlockCompatibility
-@DependsOn([FixLocaleConfigErrorPatch::class, SettingsPatch::class])
+@DependsOn([FixLocaleConfigErrorPatch::class, SettingsPatch::class, ResourceIdMappingProviderResourcePatch::class])
@Version("0.0.1")
 class SponsorBlockResourcePatch : ResourcePatch() {
+    companion object {
+        internal var reelButtonGroupResourceId: Long = 0
+    }
+
    override fun execute(data: ResourceData): PatchResult {
        val youtubePackage = "com.google.android.youtube"
        SettingsPatch.addPreference(
@@ -102,6 +107,10 @@ class SponsorBlockResourcePatch : ResourcePatch() {
            }
        }.close() // close afterwards

+        reelButtonGroupResourceId = ResourceIdMappingProviderResourcePatch.resourceMappings.single {
+            it.type == "id" && it.name == "reel_persistent_edu_button_group"
+        }.id
+
        return PatchResultSuccess()
    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/patch/TabletMiniPlayerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/patch/TabletMiniPlayerPatch.kt
@@ -6,7 +6,7 @@ import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
@@ -92,7 +92,7 @@ class TabletMiniPlayerPatch : BytecodePatch(

        fun MethodFingerprint.unwrap(): Triple<MutableMethod, Int, Int> {
            val result = this.result!!
-            val scanIndex = result.patternScanResult!!.endIndex
+            val scanIndex = result.scanResult.patternScanResult!!.endIndex
            val method = result.mutableMethod
            val instructions = method.implementation!!.instructions
            val parameterRegister = (instructions[scanIndex] as OneRegisterInstruction).registerA
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/ThemePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/ThemePatch.kt
@@ -23,7 +23,8 @@ import org.w3c.dom.Element
@Version("0.0.1")
 class ThemePatch : ResourcePatch() {
    override fun execute(data: ResourceData): PatchResult {
-        val backgroundColor = backgroundColor!!
+        val darkThemeBackgroundColor = darkThemeBackgroundColor!!
+        val lightThemeBackgroundColor = lightThemeBackgroundColor!!

        data.xmlEditor["res/values/colors.xml"].use { editor ->
            val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element
@@ -33,7 +34,11 @@ class ThemePatch : ResourcePatch() {

                node.textContent = when (node.getAttribute("name")) {
                    "yt_black1", "yt_black1_opacity95", "yt_black2", "yt_black3", "yt_black4",
-                    "yt_status_bar_background_dark" -> backgroundColor
+                    "yt_status_bar_background_dark" -> darkThemeBackgroundColor
+
+                    "yt_white1", "yt_white1_opacity95", "yt_white2", "yt_white3", 
+                    "yt_white4" -> lightThemeBackgroundColor
+
                    else -> continue
                }
            }
@@ -43,7 +48,7 @@ class ThemePatch : ResourcePatch() {
    }

    companion object : OptionsContainer() {
-        var backgroundColor: String? by option(
+        var darkThemeBackgroundColor: String? by option(
            PatchOption.StringOption(
                key = "darkThemeBackgroundColor",
                default = "@android:color/black",
@@ -51,5 +56,14 @@ class ThemePatch : ResourcePatch() {
                description = "The background color of the dark theme. Can be a hex color or a resource reference.",
            )
        )
+
+        var lightThemeBackgroundColor: String? by option(
+            PatchOption.StringOption(
+                key = "lightThemeBackgroundColor",
+                default = "@android:color/white",
+                title = "Background color for the light theme",
+                description = "The background color of the light theme. Can be a hex color or a resource reference.",
+            )
+        )
    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/watermark/patch/HideWatermarkPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/watermark/patch/HideWatermarkPatch.kt
@@ -6,7 +6,7 @@ import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.removeInstruction
-import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/patch/WideSearchbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/widesearchbar/patch/WideSearchbarPatch.kt
@@ -6,7 +6,7 @@ import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.data.impl.toMethodWalker
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
@@ -52,7 +52,7 @@ class WideSearchbarPatch : BytecodePatch(

        //This should be the method aF in class fbn
        val targetMethodOne =
-            data.toMethodWalker(resultOne!!.method).nextMethod(resultOne.patternScanResult!!.endIndex, true).getMethod() as MutableMethod
+            data.toMethodWalker(resultOne!!.method).nextMethod(resultOne.scanResult.patternScanResult!!.endIndex, true).getMethod() as MutableMethod

        //Since both methods have the same smali code, inject instructions using a method.
        addInstructions(targetMethodOne)
@@ -61,7 +61,7 @@ class WideSearchbarPatch : BytecodePatch(

        //This should be the method aB in class fbn
        val targetMethodTwo =
-            data.toMethodWalker(resultTwo!!.method).nextMethod(resultTwo.patternScanResult!!.startIndex, true).getMethod() as MutableMethod
+            data.toMethodWalker(resultTwo!!.method).nextMethod(resultTwo.scanResult.patternScanResult!!.startIndex, true).getMethod() as MutableMethod

        //Since both methods have the same smali code, inject instructions using a method.
        addInstructions(targetMethodTwo)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/patch/AutoRepeatPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/patch/AutoRepeatPatch.kt
@@ -6,7 +6,7 @@ import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.removeInstruction
-import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/clientspoof/patch/ClientSpoofPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/clientspoof/patch/ClientSpoofPatch.kt
@@ -26,7 +26,7 @@ class ClientSpoofPatch : BytecodePatch(
        val result = UserAgentHeaderBuilderFingerprint.result!!
        val method = result.mutableMethod

-        val insertIndex = result.patternScanResult!!.endIndex
+        val insertIndex = result.scanResult.patternScanResult!!.endIndex
        val packageNameRegister = (method.instruction(insertIndex) as FiveRegisterInstruction).registerD

        val originalPackageName = "com.google.android.youtube"
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/fingerprints/VideoSpeedPatchFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/fingerprints/VideoSpeedPatchFingerprint.kt
@@ -0,0 +1,21 @@
+package app.revanced.patches.youtube.misc.customplaybackspeed.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patches.youtube.misc.customplaybackspeed.annotations.CustomPlaybackSpeedCompatibility
+import org.jf.dexlib2.Opcode
+
+@Name("video-speed-patch-fingerprint")
+@MatchingMethod(
+    "Lapp/revanced/integrations/patches/VideoSpeedPatch;", "<init>"
+)
+@CustomPlaybackSpeedCompatibility
+@Version("0.0.1")
+object VideoSpeedPatchFingerprint : MethodFingerprint(
+    opcodes = listOf(Opcode.FILL_ARRAY_DATA),
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("VideoSpeedPatch;") && methodDef.name == "<clinit>"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/patch/CustomPlaybackSpeedPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/customplaybackspeed/patch/CustomPlaybackSpeedPatch.kt
@@ -6,21 +6,23 @@ import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.replaceInstruction
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.*
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.youtube.misc.customplaybackspeed.annotations.CustomPlaybackSpeedCompatibility
 import app.revanced.patches.youtube.misc.customplaybackspeed.fingerprints.SpeedArrayGeneratorFingerprint
 import app.revanced.patches.youtube.misc.customplaybackspeed.fingerprints.SpeedLimiterFingerprint
+import app.revanced.patches.youtube.misc.customplaybackspeed.fingerprints.VideoSpeedPatchFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import org.jf.dexlib2.builder.instruction.BuilderArrayPayload
 import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
 import org.jf.dexlib2.iface.reference.FieldReference
 import org.jf.dexlib2.iface.reference.MethodReference
+import java.util.stream.DoubleStream
+import kotlin.math.roundToInt

@Patch
@Name("custom-playback-speed")
@@ -30,13 +32,17 @@ import org.jf.dexlib2.iface.reference.MethodReference
@Version("0.0.1")
 class CustomPlaybackSpeedPatch : BytecodePatch(
    listOf(
-        SpeedArrayGeneratorFingerprint, SpeedLimiterFingerprint
+        SpeedArrayGeneratorFingerprint, SpeedLimiterFingerprint, VideoSpeedPatchFingerprint
    )
 ) {

    override fun execute(data: BytecodeData): PatchResult {
        //TODO: include setting to skip remembering the new speed

+        val speedLimitMin = minVideoSpeed!!.toFloat()
+        val speedLimitMax = maxVideoSpeed!!.toFloat().coerceAtLeast(speedLimitMin)
+        val speedsGranularity = videoSpeedsGranularity!!.toFloat()
+
        val arrayGenMethod = SpeedArrayGeneratorFingerprint.result?.mutableMethod!!
        val arrayGenMethodImpl = arrayGenMethod.implementation!!

@@ -82,12 +88,9 @@ class CustomPlaybackSpeedPatch : BytecodePatch(
            "sget-object v$originalArrayFetchDestination, $videoSpeedsArrayType"
        )

-        val limiterMethod = SpeedLimiterFingerprint.result?.mutableMethod!!;
+        val limiterMethod = SpeedLimiterFingerprint.result?.mutableMethod!!
        val limiterMethodImpl = limiterMethod.implementation!!

-        val speedLimitMin = 0.25f
-        val speedLimitMax = 100f
-
        val (limiterMinConstIndex, limiterMinConst) = limiterMethodImpl.instructions.withIndex()
            .first { (it.value as? NarrowLiteralInstruction)?.narrowLiteral == 0.25f.toRawBits() }
        val (limiterMaxConstIndex, limiterMaxConst) = limiterMethodImpl.instructions.withIndex()
@@ -107,6 +110,89 @@ class CustomPlaybackSpeedPatch : BytecodePatch(
            "const/high16 v$limiterMaxConstDestination, ${hexFloat(speedLimitMax)}"
        )

+        val constructorResult = VideoSpeedPatchFingerprint.result!!
+        val constructor = constructorResult.mutableMethod
+        val implementation = constructor.implementation!!
+
+        val stepsGranularity = 8F
+        val step = speedLimitMax
+            .minus(speedLimitMin) // calculate the range of the speeds
+            .div(speedsGranularity)
+            .times(stepsGranularity)
+            .roundToInt()
+            .div(stepsGranularity)// round to nearest multiple of stepsGranularity
+            .coerceAtLeast(1 / stepsGranularity) // ensure steps are at least 1/8th of the step granularity
+
+        val videoSpeedsArray = buildList<Number> {
+            DoubleStream
+                .iterate(speedLimitMin.toDouble()) { it + step } // create a stream of speeds
+                .let { speedStream ->
+                    for (speed in speedStream) {
+                        if (speed > speedLimitMax) break
+                        add(speed.toFloat().toRawBits())
+                    }
+                }
+        }
+
+        // adjust the new array of speeds size
+        constructor.replaceInstruction(
+            0,
+            "const/16 v0, ${videoSpeedsArray.size}"
+        )
+
+        // create the payload with the new speeds
+        val arrayPayloadIndex = implementation.instructions.size - 1
+        implementation.replaceInstruction(
+            arrayPayloadIndex,
+            BuilderArrayPayload(
+                4,
+                videoSpeedsArray
+            )
+        )
+
        return PatchResultSuccess()
    }
+
+    companion object : OptionsContainer() {
+        private fun String?.validate(max: Int? = null) = this?.toFloatOrNull() != null &&
+                toFloat().let { float ->
+                    float > 0 && max?.let { max -> float <= max } ?: true
+                }
+
+        val videoSpeedsGranularity by option(
+            PatchOption.StringOption(
+                "granularity",
+                "16",
+                "Video speed granularity",
+                "The granularity of the video speeds. The higher the value, the more speeds will be available.",
+                true
+            ) {
+                it.validate()
+            }
+        )
+
+        val minVideoSpeed by option(
+            PatchOption.StringOption(
+                "min",
+                "0.25",
+                "Minimum video speed",
+                "The minimum video speed.",
+                true
+            ) {
+                it.validate()
+            }
+        )
+
+        val maxVideoSpeed by option(
+            PatchOption.StringOption(
+                "max",
+                "5.0",
+                "Maximum video speed",
+                "The maximum video speed. Must be greater than the minimum video speed and smaller than 5.",
+                true
+            ) {
+                it.validate(5)
+            }
+        )
+    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/bytecode/patch/PlayerControlsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/bytecode/patch/PlayerControlsBytecodePatch.kt
@@ -5,8 +5,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
@@ -47,7 +47,7 @@ class PlayerControlsBytecodePatch : BytecodePatch(
        private var inflateFingerprintResult: MethodFingerprintResult? = null
            set(fingerprint) {
                field = fingerprint!!.also {
-                    moveToRegisterInstructionIndex = it.patternScanResult!!.endIndex
+                    moveToRegisterInstructionIndex = it.scanResult.patternScanResult!!.endIndex
                    viewRegister =
                        (it.mutableMethod.implementation!!.instructions[moveToRegisterInstructionIndex] as OneRegisterInstruction).registerA
                }
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/quality/patch/RememberVideoQualityPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/quality/patch/RememberVideoQualityPatch.kt
@@ -6,7 +6,7 @@ import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/patch/SettingsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/patch/SettingsPatch.kt
@@ -61,7 +61,7 @@ class SettingsPatch : BytecodePatch(
        // add instructions to set the theme of the settings activity
        themeSetterResult.mutableMethod.implementation!!.let {
            it.addInstruction(
-                themeSetterResult.patternScanResult!!.startIndex,
+                themeSetterResult.scanResult.patternScanResult!!.startIndex,
                setThemeInstruction
            )

--- a/src/main/kotlin/app/revanced/patches/youtube/misc/videobuffer/patch/CustomVideoBufferPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/videobuffer/patch/CustomVideoBufferPatch.kt
@@ -5,11 +5,14 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.instruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.InputType
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.PreferenceScreen
@@ -83,10 +86,9 @@ class CustomVideoBufferPatch : BytecodePatch(
    }

    private fun execMaxBuffer() {
-        val result = MaxBufferFingerprint.result!!
-        val method = result.mutableMethod
-        val index = result.patternScanResult!!.endIndex - 1
-        val register = (method.implementation!!.instructions[index] as OneRegisterInstruction).registerA
+        val (method, result) = MaxBufferFingerprint.unwrap(true, -1)
+        val (index, register) = result
+
        method.addInstructions(
            index + 1, """
           invoke-static {}, Lapp/revanced/integrations/patches/VideoBufferPatch;->getMaxBuffer()I
@@ -96,10 +98,9 @@ class CustomVideoBufferPatch : BytecodePatch(
    }

    private fun execPlaybackBuffer() {
-        val result = PlaybackBufferFingerprint.result!!
-        val method = result.mutableMethod
-        val index = result.patternScanResult!!.startIndex
-        val register = (method.implementation!!.instructions[index] as OneRegisterInstruction).registerA
+        val (method, result) = PlaybackBufferFingerprint.unwrap()
+        val (index, register) = result
+
        method.addInstructions(
            index + 1, """
           invoke-static {}, Lapp/revanced/integrations/patches/VideoBufferPatch;->getPlaybackBuffer()I
@@ -109,10 +110,9 @@ class CustomVideoBufferPatch : BytecodePatch(
    }

    private fun execReBuffer() {
-        val result = ReBufferFingerprint.result!!
-        val method = result.mutableMethod
-        val index = result.patternScanResult!!.startIndex
-        val register = (method.implementation!!.instructions.get(index) as OneRegisterInstruction).registerA
+        val (method, result) = ReBufferFingerprint.unwrap()
+        val (index, register) = result
+
        method.addInstructions(
            index + 1, """
           invoke-static {}, Lapp/revanced/integrations/patches/VideoBufferPatch;->getReBuffer()I
@@ -120,4 +120,18 @@ class CustomVideoBufferPatch : BytecodePatch(
        """
        )
    }
+
+    private fun MethodFingerprint.unwrap(
+        forEndIndex: Boolean = false,
+        offset: Int = 0
+    ): Pair<MutableMethod, Pair<Int, Int>> {
+        val result = this.result!!
+        val method = result.mutableMethod
+        val scanResult = result.scanResult.patternScanResult!!
+        val index = (if (forEndIndex) scanResult.endIndex else scanResult.startIndex) + offset
+
+        val register = (method.instruction(index) as OneRegisterInstruction).registerA
+
+        return method to (index to register)
+    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/videoid/patch/VideoIdPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/videoid/patch/VideoIdPatch.kt
@@ -31,7 +31,7 @@ class VideoIdPatch : BytecodePatch(

        insertMethod = result.mutableMethod
        videoIdRegister =
-            (insertMethod.implementation!!.instructions[result.patternScanResult!!.endIndex + 1] as OneRegisterInstruction).registerA
+            (insertMethod.implementation!!.instructions[result.scanResult.patternScanResult!!.endIndex + 1] as OneRegisterInstruction).registerA

        injectCall("Lapp/revanced/integrations/videoplayer/VideoInformation;->setCurrentVideoId(Ljava/lang/String;)V")

@@ -55,7 +55,7 @@ class VideoIdPatch : BytecodePatch(
            methodDescriptor: String
        ) {
            insertMethod.addInstructions(
-                result.patternScanResult!!.endIndex + offset, // move-result-object offset
+                result.scanResult.patternScanResult!!.endIndex + offset, // move-result-object offset
                "invoke-static {v$videoIdRegister}, $methodDescriptor"
            )
        }
Author	SHA1	Message	Date
semantic-release-bot	26ff3b338e	chore(release): 2.68.1 [skip ci] ## [2.68.1](https://github.com/revanced/revanced-patches/compare/v2.68.0...v2.68.1) (2022-09-23) ### Bug Fixes * sponsorblock: resolve unresolved fingerprint ([`986a396`](`28c864ae95`))	2022-09-23 09:51:06 +00:00
oSumAtrIX	28c864ae95	fix(sponsorblock): resolve unresolved fingerprint	2022-09-23 11:49:08 +02:00
semantic-release-bot	deb829c791	chore(release): 2.68.0 [skip ci] # [2.68.0](https://github.com/revanced/revanced-patches/compare/v2.67.1...v2.68.0) (2022-09-23) ### Bug Fixes * hide-premium-navbar: remove the correct instructions ([#591](https://github.com/revanced/revanced-patches/issues/591)) ([`d82a947`](`3c0f3ac968`)) ### Features * tiktok: adapt `tiktok-download` with `tiktok-settings`. ([#586](https://github.com/revanced/revanced-patches/issues/586)) ([`459963c`](`2f6da4ed27`))	2022-09-23 05:42:52 +00:00
Tim Wüstenhagen	3c0f3ac968	fix(hide-premium-navbar): remove the correct instructions (#591 )	2022-09-23 07:40:50 +02:00
d4rkk3y	2f6da4ed27	feat(tiktok): adapt `tiktok-download` with `tiktok-settings`. (#586 )	2022-09-23 07:40:16 +02:00
semantic-release-bot	1b653c77c4	chore(release): 2.67.1 [skip ci] ## [2.67.1](https://github.com/revanced/revanced-patches/compare/v2.67.0...v2.67.1) (2022-09-23)	2022-09-23 04:47:01 +00:00
oSumAtrIX	82ea2d3498	build: update patcher dependency	2022-09-23 06:35:29 +02:00
semantic-release-bot	07dee5b87a	chore(release): 2.67.0 [skip ci] # [2.67.0](https://github.com/revanced/revanced-patches/compare/v2.66.2...v2.67.0) (2022-09-23) ### Bug Fixes * hide-premium-nav-bar: invalid import ([#590](https://github.com/revanced/revanced-patches/issues/590)) ([`78f0200`](`7713516ed8`)) ### Features * `hide-premium-nav-bar` patch ([#589](https://github.com/revanced/revanced-patches/issues/589)) ([`950f7e2`](`22fa09dc27`))	2022-09-23 00:27:51 +00:00
Tim Wüstenhagen	7713516ed8	fix(hide-premium-nav-bar): invalid import (#590 )	2022-09-23 02:26:06 +02:00
Tim Wüstenhagen	22fa09dc27	feat: `hide-premium-nav-bar` patch (#589 )	2022-09-23 02:05:41 +02:00
semantic-release-bot	24d03387de	chore(release): 2.66.2 [skip ci] ## [2.66.2](https://github.com/revanced/revanced-patches/compare/v2.66.1...v2.66.2) (2022-09-22) ### Bug Fixes * custom-playback-speed: implement own method instead of `takeWhile` ([`4070744`](`04310901b7`))	2022-09-22 06:40:39 +00:00
oSumAtrIX	04310901b7	fix(custom-playback-speed): implement own method instead of `takeWhile`	2022-09-22 08:38:49 +02:00
semantic-release-bot	3011c1fa45	chore(release): 2.66.1 [skip ci] ## [2.66.1](https://github.com/revanced/revanced-patches/compare/v2.66.0...v2.66.1) (2022-09-22) ### Bug Fixes * sponsorblock: broken fingerprint and invert setting `shorts_playing` ([#579](https://github.com/revanced/revanced-patches/issues/579)) ([`0125b09`](`6b83fe572a`))	2022-09-22 05:46:12 +00:00
OxrxL	6b83fe572a	fix(sponsorblock): broken fingerprint and invert setting `shorts_playing` (#579 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2022-09-22 07:43:54 +02:00
semantic-release-bot	32d303f4b7	chore(release): 2.66.0 [skip ci] # [2.66.0](https://github.com/revanced/revanced-patches/compare/v2.65.0...v2.66.0) (2022-09-22) ### Features * custom-playback-speed: max, min, granularity option ([`61df23c`](`837c381e19`))	2022-09-22 05:21:14 +00:00
oSumAtrIX	837c381e19	feat(custom-playback-speed): max, min, granularity option	2022-09-22 07:17:10 +02:00
semantic-release-bot	09ae60bb28	chore(release): 2.65.0 [skip ci] # [2.65.0](https://github.com/revanced/revanced-patches/compare/v2.64.2...v2.65.0) (2022-09-21) ### Features * `tiktok-feed-filter` , `tiktok-settings` and `tiktok-force-login` patch ([#501](https://github.com/revanced/revanced-patches/issues/501)) ([`f506bff`](`c40181140d`)) * theme: arbitrary background color for light theme ([#565](https://github.com/revanced/revanced-patches/issues/565)) ([`741d005`](`f9d180aad4`))	2022-09-21 21:03:06 +00:00
Pranshu Goyal	f9d180aad4	feat(theme): arbitrary background color for light theme (#565 )	2022-09-21 23:01:23 +02:00
d4rkk3y	c40181140d	feat: `tiktok-feed-filter` , `tiktok-settings` and `tiktok-force-login` patch (#501 )	2022-09-21 23:00:03 +02:00
semantic-release-bot	c5e190a4d5	chore(release): 2.64.2 [skip ci] ## [2.64.2](https://github.com/revanced/revanced-patches/compare/v2.64.1...v2.64.2) (2022-09-21) ### Bug Fixes * custom-video-buffer: use correct offset for `getMaxBuffer` call injection ([`fa849b6`](`24e3f8b24e`))	2022-09-21 14:46:28 +00:00
oSumAtrIX	24e3f8b24e	fix(custom-video-buffer): use correct offset for `getMaxBuffer` call injection	2022-09-21 16:44:44 +02:00
semantic-release-bot	53b0485642	chore(release): 2.64.1 [skip ci] ## [2.64.1](https://github.com/revanced/revanced-patches/compare/v2.64.0...v2.64.1) (2022-09-21)	2022-09-21 02:17:40 +00:00
oSumAtrIX	b362b560b6	build: bump patcher dependency version to v5.0.0	2022-09-21 04:15:07 +02:00