chore(release): 1.4.1 [skip ci]

## [1.4.1](https://github.com/revanced/revanced-patches/compare/v1.4.0...v1.4.1) (2022-06-15)

### Bug Fixes

* `hide-cast-button` patch ([e85c30c](e85c30c9c2))
* comments ([903c01b](903c01b765))

.github/workflows/release.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   release:
     name: Release
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -30,12 +30,23 @@ jobs:
           node-version: "lts/*"
       - name: Setup Android SDK
         uses: android-actions/setup-android@v2
+      - name: Make gradlew executable
+        run: chmod +x gradlew
       - name: Build with Gradle
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew build clean
+        run: ./gradlew build
       - name: Install Android build-tools
         run: sdkmanager "build-tools;32.0.0"
+      - name: Generate Patches DEX
+        run: |
+          mkdir -p bin
+          fn=$(find build/libs -maxdepth 1 | grep -P "[\d]+\.jar")
+          out=bin/$(basename "$fn" | sed 's/jar/dex/g')
+          $ANDROID_HOME/build-tools/32.0.0/d8 $fn
+          mv *.dex $out
+      - name: Clean build
+        run: ./gradlew clean
       - name: Setup semantic-release
         run: npm install -g semantic-release @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D
       - name: Release

.releaserc

@@ -10,7 +10,6 @@
     "@semantic-release/commit-analyzer",
     "@semantic-release/release-notes-generator",
     "@semantic-release/changelog",
-    "gradle-semantic-release-plugin",
     [
       "@semantic-release/git",
       {
@@ -28,7 +27,7 @@
             "path": "build/libs/*.jar"
           },
           {
-            "path": "build/libs/*.dex"
+            "path": "bin/*.dex"
           }
         ]
       }

CHANGELOG.md

@@ -1,162 +1,10 @@
-## [1.10.5](https://github.com/revanced/revanced-patches/compare/v1.10.4...v1.10.5) (2022-06-25)
+## [1.4.1](https://github.com/revanced/revanced-patches/compare/v1.4.0...v1.4.1) (2022-06-15)
 
 
 ### Bug Fixes
 
-* put back proper variable ([#61](https://github.com/revanced/revanced-patches/issues/61)) ([d26c423](https://github.com/revanced/revanced-patches/commit/d26c4233031fd418eb37c8f05e9bc1857e0572e6))
-
-## [1.10.4](https://github.com/revanced/revanced-patches/compare/v1.10.3...v1.10.4) (2022-06-23)
-
-
-### Bug Fixes
-
-* missing brackets at inlining ([8936c8a](https://github.com/revanced/revanced-patches/commit/8936c8aaedb56817cda5eec5f4a8c32f433862aa))
-
-## [1.10.3](https://github.com/revanced/revanced-patches/compare/v1.10.2...v1.10.3) (2022-06-23)
-
-
-### Bug Fixes
-
-* get create button view register by more reliable means ([#59](https://github.com/revanced/revanced-patches/issues/59)) ([6ab821e](https://github.com/revanced/revanced-patches/commit/6ab821e377176f4e9f1b7ec2b58a924fa40299db))
-
-## [1.10.2](https://github.com/revanced/revanced-patches/compare/v1.10.1...v1.10.2) (2022-06-23)
-
-
-### Bug Fixes
-
-* `disable-create-button` not working with prebuilt jar file ([#55](https://github.com/revanced/revanced-patches/issues/55)) ([78be64a](https://github.com/revanced/revanced-patches/commit/78be64accc2023281c0c376849cdb0213622dc5c))
-
-## [1.10.1](https://github.com/revanced/revanced-patches/compare/v1.10.0...v1.10.1) (2022-06-23)
-
-
-### Bug Fixes
-
-* patcher not propagating dexlib ([980c486](https://github.com/revanced/revanced-patches/commit/980c48673259496d793bc7f864ad355188dcf7b6))
-* update patcher version ([e3d0bb7](https://github.com/revanced/revanced-patches/commit/e3d0bb7ee1923ea996cf637267c62d233a74c7fa))
-
-# [1.10.0](https://github.com/revanced/revanced-patches/compare/v1.9.1...v1.10.0) (2022-06-23)
-
-
-### Features
-
-* add compatibility for YouTube v17.23.36 and v17.24.34 ([1812bc3](https://github.com/revanced/revanced-patches/commit/1812bc39e0e88f1ab02ae8127e9000780eedf49c))
-
-## [1.9.1](https://github.com/revanced/revanced-patches/compare/v1.9.0...v1.9.1) (2022-06-21)
-
-
-### Bug Fixes
-
-* update patcher version ([5f54bc9](https://github.com/revanced/revanced-patches/commit/5f54bc9aa8fd8b83448141a9b05746e3e977369d))
-
-# [1.9.0](https://github.com/revanced/revanced-patches/compare/v1.8.2...v1.9.0) (2022-06-21)
-
-
-### Features
-
-* use `install` mode by default ([c2b2993](https://github.com/revanced/revanced-patches/commit/c2b299336a984d66a2d066e5ebe9c4f9bee5c2aa))
-
-## [1.8.2](https://github.com/revanced/revanced-patches/compare/v1.8.1...v1.8.2) (2022-06-20)
-
-
-### Bug Fixes
-
-* migrate to breaking changes from patcher ([2c0a419](https://github.com/revanced/revanced-patches/commit/2c0a4196fed2fbdcd454ed882b720898d3050c51))
-* old usage of `toInstructions` extension method ([65ddd52](https://github.com/revanced/revanced-patches/commit/65ddd522dca19e0590d9cb6fdb2d85ad7b98481e))
-
-## [1.8.1](https://github.com/revanced/revanced-patches/compare/v1.8.0...v1.8.1) (2022-06-20)
-
-
-### Bug Fixes
-
-* add execute permission to `./gradlew` file ([ff7a560](https://github.com/revanced/revanced-patches/commit/ff7a5602f68428111fea6c60cbea694592039ef1))
-
-# [1.8.0](https://github.com/revanced/revanced-patches/compare/v1.7.0...v1.8.0) (2022-06-20)
-
-
-### Features
-
-* bump compatibility of patches for Youtube to v17.23.35 ([3748d05](https://github.com/revanced/revanced-patches/commit/3748d0533e62a8871ab2202ce9b61170a90dae62))
-
-# [1.7.0](https://github.com/revanced/revanced-patches/compare/v1.6.4...v1.7.0) (2022-06-20)
-
-
-### Features
-
-* `disable-fullscreen-panels` patch ([3bf0561](https://github.com/revanced/revanced-patches/commit/3bf056163500b006d1a20c5f3a3e0c92fec13bd8))
-
-## [1.6.4](https://github.com/revanced/revanced-patches/compare/v1.6.3...v1.6.4) (2022-06-19)
-
-
-### Bug Fixes
-
-* update patcher version ([#35](https://github.com/revanced/revanced-patches/issues/35)) ([1a379df](https://github.com/revanced/revanced-patches/commit/1a379dfd974b9f92d4bd0d5d7a4711eb6d1060b3)), closes [#34](https://github.com/revanced/revanced-patches/issues/34)
-
-## [1.6.3](https://github.com/revanced/revanced-patches/compare/v1.6.2...v1.6.3) (2022-06-16)
-
-
-### Bug Fixes
-
-* wrong dex path ([170fbbb](https://github.com/revanced/revanced-patches/commit/170fbbb99e4a2dbe3e0febe44d07a692aa9d7224))
-
-## [1.6.2](https://github.com/revanced/revanced-patches/compare/v1.6.1...v1.6.2) (2022-06-16)
-
-
-### Bug Fixes
-
-* broken gradle task ([91483a8](https://github.com/revanced/revanced-patches/commit/91483a8fbf92559d079dc52f846f5f871f5d6b5c))
-
-## [1.6.1](https://github.com/revanced/revanced-patches/compare/v1.6.0...v1.6.1) (2022-06-16)
-
-
-### Bug Fixes
-
-* broken gradle task ([4d07961](https://github.com/revanced/revanced-patches/commit/4d07961c8afd24da7f8879d11419147f2e100f05))
-
-# [1.6.0](https://github.com/revanced/revanced-patches/compare/v1.5.3...v1.6.0) (2022-06-16)
-
-
-### Bug Fixes
-
-* broken gradle task ([28e3f55](https://github.com/revanced/revanced-patches/commit/28e3f554ea6a7144416523fe48ce7adbb613b263))
-
-
-### Features
-
-* generate dex files using gradle task ([c34c1be](https://github.com/revanced/revanced-patches/commit/c34c1be21f50b4f720a7cd81e0dfe5ef6330caab))
-
-## [1.5.3](https://github.com/revanced/revanced-patches/compare/v1.5.2...v1.5.3) (2022-06-16)
-
-
-### Bug Fixes
-
-* forgot about this ([7102a25](https://github.com/revanced/revanced-patches/commit/7102a25dc618f19b324b01870d23f5418f375b2a))
-
-## [1.5.2](https://github.com/revanced/revanced-patches/compare/v1.5.1...v1.5.2) (2022-06-16)
-
-
-### Bug Fixes
-
-* dummy task for Gradle semantic-release plugin ([f6a8911](https://github.com/revanced/revanced-patches/commit/f6a8911906dfe52fcdb685daf7a02d6d0052cba9))
-* releases ([30d5c9a](https://github.com/revanced/revanced-patches/commit/30d5c9a67ccf88ca6ac00d0a9f2a2e330f8092dd))
-
-## [1.5.1](https://github.com/revanced/revanced-patches/compare/v1.5.0...v1.5.1) (2022-06-16)
-
-
-### Reverts
-
-* Revert "Changed app name to ReVanced (#21)" (#24) ([70a48c5](https://github.com/revanced/revanced-patches/commit/70a48c5f35cd236612352a1dbbf50487625e6e96)), closes [#21](https://github.com/revanced/revanced-patches/issues/21) [#24](https://github.com/revanced/revanced-patches/issues/24)
-
-# [1.5.0](https://github.com/revanced/revanced-patches/compare/v1.4.0...v1.5.0) (2022-06-15)
-
-
-### Bug Fixes
-
-* sync version ([6170e36](https://github.com/revanced/revanced-patches/commit/6170e3689d9c8998be94a8464352af620cccd11b))
-
-
-### Features
-
-* `hide-cast-button` patch ([2cd531e](https://github.com/revanced/revanced-patches/commit/2cd531eb5a334f3cf91cba4556f07e863cd9ec1b))
+* `hide-cast-button` patch ([6a9ffe0](https://github.com/revanced/revanced-patches/commit/6a9ffe05734a775a555e98cb365df96133f7cd8b))
+* comments ([d102883](https://github.com/revanced/revanced-patches/commit/d1028831ca889f1214801174d1d75ce24505e7ba))
 
 # [1.4.0](https://github.com/revanced/revanced-patches/compare/v1.3.1...v1.4.0) (2022-06-15)
 

README.md

@@ -1 +1,2 @@
-Repo for all ReVanced patches 
+# revanced-patches
+Repo for all ReVanced patches

build.gradle.kts

@@ -18,38 +18,5 @@ repositories {
 dependencies {
     implementation(kotlin("stdlib"))
 
-    implementation("app.revanced:revanced-patcher:1.10.2")
-}
-
-tasks {
-    register<DefaultTask>("generateDex") {
-        description = "Generate dex files from build"
-        dependsOn(build)
-
-        doLast {
-            val androidHome = System.getenv("ANDROID_HOME") ?: throw GradleException("ANDROID_HOME not found")
-            val d8 = "${androidHome}/build-tools/32.0.0/d8"
-            val input = configurations.archives.get().allArtifacts.files.files.first().absolutePath
-            val output = input.replace(".jar", ".dex")
-            val work = File("${buildDir}/libs")
-
-            exec {
-                workingDir = work
-                commandLine = listOf(d8, input)
-            }
-
-            exec {
-                workingDir = work
-                commandLine = listOf("mv", "classes.dex", output)
-            }
-        }
-    }
-    // Dummy task to fix the Gradle semantic-release plugin.
-    // Remove this if you forked it to support building only.
-    // Tracking issue: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435
-    register<DefaultTask>("publish") {
-        group = "publish"
-        description = "Dummy task"
-        dependsOn(named("generateDex"))
-    }
-}
+    implementation("app.revanced:revanced-patcher:1.1.0")
+}

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 1.10.5
+version = 1.2.1

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

@@ -10,7 +10,7 @@ internal fun MutableMethodImplementation.injectHideCall(
 ) {
     this.addInstruction(
         index,
-        "invoke-static { v$register }, Lapp/revanced/integrations/patches/HideHomeAdsPatch;->HideHomeAds(Landroid/view/View;)V".toInstruction()
+        "invoke-static { v$register }, Lfi/razerman/youtube/XAdRemover;->HideView(Landroid/view/View;)V".toInstruction()
     )
 }
 

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

@@ -25,13 +25,13 @@ class CodecsUnlockPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        var result = CodecsLockSignature.result!!
+        var result = signatures.first().result!!
 
         val implementation = result.method.implementation!!
 
         val instructionIndex = result.scanResult.startIndex
 
-        result = AllCodecsReferenceSignature.result!!
+        result = signatures.last().result!!
         val codecMethod =
             data.toMethodWalker(result.immutableMethod).nextMethod(result.scanResult.startIndex).getMethod()
 

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

@@ -30,7 +30,7 @@ class ExclusiveAudioPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result = ExclusiveAudioSignature.result!!.findParentMethod(@Name("audio-only-enabler-method") @MatchingMethod(
+        val result = signatures.first().result!!.findParentMethod(@Name("audio-only-enabler-method") @MatchingMethod(
             "Lgmd;",
             "d"
         ) @DirectPatternScanMethod @ExclusiveAudioCompatibility @Version(
@@ -67,4 +67,4 @@ class ExclusiveAudioPatch : BytecodePatch(
 
         return PatchResultSuccess()
     }
-}
+}

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

@@ -9,6 +9,7 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.implementation.BytecodePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.music.layout.tastebuilder.annotations.RemoveTasteBuilderCompatibility
 import app.revanced.patches.music.layout.tastebuilder.signatures.TasteBuilderConstructorSignature
 import org.jf.dexlib2.iface.instruction.formats.Instruction22c
@@ -24,18 +25,20 @@ class RemoveTasteBuilderPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result = TasteBuilderConstructorSignature.result!!
+        val result = signatures.first().result!!
         val implementation = result.method.implementation!!
 
         val insertIndex = result.scanResult.endIndex - 8
 
         val register = (implementation.instructions[insertIndex] as Instruction22c).registerA
 
-        result.method.addInstructions(
-            insertIndex, """
+        val instructionList = """
                 const/16 v1, 0x8
                 invoke-virtual {v${register}, v1}, Landroid/view/View;->setVisibility(I)V
-            """
+            """.trimIndent().toInstructions().toMutableList()
+
+        implementation.addInstructions(
+            insertIndex, instructionList
         )
 
         return PatchResultSuccess()

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

@@ -29,7 +29,7 @@ class RemoveUpgradeButtonPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result = PivotBarConstructorSignature.result!!
+        val result = signatures.first().result!!
         val implementation = result.method.implementation!!
 
         val pivotBarElementFieldRef =

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

@@ -9,6 +9,7 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.implementation.BytecodePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.music.premium.backgroundplay.annotations.BackgroundPlayCompatibility
 import app.revanced.patches.music.premium.backgroundplay.signatures.BackgroundPlaybackDisableSignature
 
@@ -23,12 +24,12 @@ class BackgroundPlayPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        BackgroundPlaybackDisableSignature.result!!.method.addInstructions(
+        signatures.first().result!!.method.implementation!!.addInstructions(
             0,
             """
                 const/4 v0, 0x1
                 return v0
-            """
+            """.trimIndent().toInstructions()
         )
 
         return PatchResultSuccess()

src/main/kotlin/app/revanced/patches/youtube/ad/general/annotation/GeneralAdsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34")
+        "com.google.android.youtube", arrayOf("17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -148,11 +148,11 @@ class GeneralBytecodeAdsPatch : BytecodePatch(
                                         mutableClass!!.findMutableMethodOf(method)
 
                                     // TODO: dynamically get registers
-                                    mutableMethod!!.addInstructions(
+                                    mutableMethod!!.implementation!!.addInstructions(
                                         insertIndex, """
                                                 const/16 v1, 0x8
                                                 invoke-virtual {v0,v1}, Landroid/widget/FrameLayout;->setVisibility(I)V
-                                            """
+                                            """.trimIndent().toInstructions()
                                     )
                                 }
 
@@ -242,23 +242,25 @@ class GeneralBytecodeAdsPatch : BytecodePatch(
                                         BuilderInstruction21t(Opcode.IF_EQZ, 1, lithoRemoveLabel)
 
                                     // create blocks
+                                    val parameters = lithoMethod.parameterTypes.joinToString("") { it }
+                                    val registers = lithoMethodImplementation.registerCount
                                     val block1 = """
                                         invoke-static/range {p3}, $thisType->getTemplateName($templateNameParameterType)Ljava/lang/String;
                                         move-result-object v0
-                                    """.trimIndent().toInstructions(lithoMethod)
+                                    """.trimIndent().toInstructions(parameters, registers, false)
                                     val block2 = """
                                         move-object/from16 v1, p3
                                         iget-object v2, v1, $templateNameParameterType->b:Ljava/nio/ByteBuffer;
-                                        invoke-static {v0, v2}, Lapp/revanced/integrations/patches/GeneralBytecodeAdsPatch;->containsAd(Ljava/lang/String;Ljava/nio/ByteBuffer;)Z
+                                        invoke-static {v0, v2}, Lfi/razerman/youtube/litho/LithoAdRemoval;->containsAd(Ljava/lang/String;Ljava/nio/ByteBuffer;)Z
                                         move-result v1
-                                    """.trimIndent().toInstructions(lithoMethod)
+                                    """.trimIndent().toInstructions(parameters, registers, false)
                                     val block3 = """
                                         move-object/from16 v2, p1
                                         invoke-static {v2}, $descriptor1
                                         move-result-object v0
                                         iget-object v0, v0, $descriptor2
                                         return-object v0
-                                    """.trimIndent().toInstructions(lithoMethod)
+                                    """.trimIndent().toInstructions(parameters, registers, false)
 
                                     // insert blocks and branch instructions
                                     lithoMethodImplementation.insertBlocks(

src/main/kotlin/app/revanced/patches/youtube/ad/video/annotations/VideoAdsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -15,6 +15,7 @@ import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
 import app.revanced.patcher.signature.implementation.method.MethodSignature
 import app.revanced.patcher.signature.implementation.method.annotation.DirectPatternScanMethod
 import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.youtube.ad.video.annotations.VideoAdsCompatibility
 import app.revanced.patches.youtube.ad.video.signatures.ShowVideoAdsConstructorSignature
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
@@ -33,18 +34,18 @@ class VideoAdsPatch : BytecodePatch(
 ) {
     override fun execute(data: BytecodeData): PatchResult {
         val result =
-            ShowVideoAdsConstructorSignature.result!!.findParentMethod(@Name("show-video-ads-method-signature") @MatchingMethod(
+            signatures.first().result!!.findParentMethod(@Name("show-video-ads-method-signature") @MatchingMethod(
                 definingClass = "zai"
             ) @DirectPatternScanMethod @VideoAdsCompatibility @Version("0.0.1") object : MethodSignature(
                 "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z"), null
             ) {}) ?: return PatchResultError("Required parent method could not be found.")
 
         // Override the parameter by calling shouldShowAds and setting the parameter to the result
-        result.method.addInstructions(
+        result.method.implementation!!.addInstructions(
             0, """
-                invoke-static { }, Lapp/revanced/integrations/patches/VideoAdsPatch;->shouldShowAds()Z
+                invoke-static { }, Lfi/vanced/libraries/youtube/whitelisting/Whitelist;->shouldShowAds()Z
                 move-result v1
-            """
+            """.trimIndent().toInstructions()
         )
 
         return PatchResultSuccess()

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/annotation/SeekbarTappingCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34")
+        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -11,6 +11,7 @@ import app.revanced.patcher.patch.implementation.BytecodePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultError
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.youtube.interaction.seekbar.annotation.SeekbarTappingCompatibility
 import app.revanced.patches.youtube.interaction.seekbar.signatures.SeekbarTappingParentSignature
 import app.revanced.patches.youtube.interaction.seekbar.signatures.SeekbarTappingSignature
@@ -33,7 +34,7 @@ class EnableSeekbarTappingPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        var result = SeekbarTappingParentSignature.result!!
+        var result = signatures.first().result!!
 
         val tapSeekMethods = mutableMapOf<String, Method>()
 
@@ -58,7 +59,7 @@ class EnableSeekbarTappingPatch : BytecodePatch(
         }
 
         // replace map because we dont need the upper one anymore
-        result = SeekbarTappingSignature.result!!
+        result = signatures.last().result!!
 
         val implementation = result.method.implementation!!
 
@@ -72,11 +73,11 @@ class EnableSeekbarTappingPatch : BytecodePatch(
         val register = (instruction as Instruction35c).registerC
 
         // the instructions are written in reverse order.
-        result.method.addInstructions(
+        implementation.addInstructions(
             result.scanResult.endIndex + 1, """
                invoke-virtual { v$register, v2 }, ${oMethod.definingClass}->${oMethod.name}(I)V
                invoke-virtual { v$register, v2 }, ${pMethod.definingClass}->${pMethod.name}(I)V
-            """
+            """.trimIndent().toInstructions()
         )
 
         // if tap-seeking is disabled, do not invoke the two methods above by jumping to the else label
@@ -84,11 +85,11 @@ class EnableSeekbarTappingPatch : BytecodePatch(
         implementation.addInstruction(
             result.scanResult.endIndex + 1, BuilderInstruction21t(Opcode.IF_EQZ, 0, elseLabel)
         )
-        result.method.addInstructions(
+        implementation.addInstructions(
             result.scanResult.endIndex + 1, """
-                invoke-static { }, Lapp/revanced/integrations/patches/SeekbarTappingPatch;->isTapSeekingEnabled()Z
+                invoke-static { }, Lfi/razerman/youtube/preferences/BooleanPreferences;->isTapSeekingEnabled()Z
                 move-result v0
-            """
+            """.trimIndent().toInstructions()
         )
         return PatchResultSuccess()
     }

src/main/kotlin/app/revanced/patches/youtube/layout/amoled/annotations/AmoledCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/castbutton/patch/HideCastButtonPatch.kt

@@ -11,6 +11,7 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.implementation.BytecodePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.youtube.layout.castbutton.annotations.CastButtonCompatibility
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 
@@ -25,14 +26,14 @@ class HideCastButtonPatch : BytecodePatch(listOf()) {
         data.classes.forEach { classDef ->
             classDef.methods.forEach { method ->
                 if (classDef.type.endsWith("MediaRouteButton;") && method.name == "setVisibility") {
-                    val setVisibilityMethod =
-                        data.proxy(classDef).resolve().methods.first { it.name == "setVisibility" }
+                    val implementation =
+                        data.proxy(classDef).resolve().methods.first { it.name == "setVisibility" }.implementation!!
 
-                    setVisibilityMethod.addInstructions(
+                    implementation.addInstructions(
                         0, """
-                            invoke-static {p1}, Lapp/revanced/integrations/patches/HideCastButtonPatch;->getCastButtonOverrideV2(I)I
-                            move-result p1
-                        """
+                        invoke-static {p1}, Lfi/razerman/youtube/XGlobals;->getCastButtonOverrideV2(I)I
+                        move-result p1
+                    """.trimIndent().toInstructions("I", 2, false)
                     )
                 }
             }

src/main/kotlin/app/revanced/patches/youtube/layout/createbutton/annotations/CreateButtonCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/createbutton/patch/CreateButtonRemoverPatch.kt

@@ -4,25 +4,21 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.implementation.BytecodeData
-import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.patch.annotations.Dependencies
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.implementation.BytecodePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultError
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patches.youtube.layout.createbutton.annotations.CreateButtonCompatibility
 import app.revanced.patches.youtube.layout.createbutton.signatures.CreateButtonSignature
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
 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.WideLiteralInstruction
-import org.jf.dexlib2.iface.reference.MethodReference
+import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 
 @Patch
-@Dependencies(dependencies = [IntegrationsPatch::class, ResourceIdMappingProviderResourcePatch::class])
+@Dependencies(dependencies = [IntegrationsPatch::class])
 @Name("disable-create-button")
 @Description("Disable the create button.")
 @CreateButtonCompatibility
@@ -33,31 +29,20 @@ class CreateButtonRemoverPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result = CreateButtonSignature.result!!
+        val result = signatures.first().result!!
 
         // Get the required register which holds the view object we need to pass to the method hideCreateButton
         val implementation = result.method.implementation!!
-
-        val imageOnlyLayout = ResourceIdMappingProviderResourcePatch.resourceMappings["image_only_tab"]
-            ?: return PatchResultError("Required resource could not be found in the map")
-
-        val imageOnlyLayoutConstIndex =
-            implementation.instructions.indexOfFirst { (it as? WideLiteralInstruction)?.wideLiteral == imageOnlyLayout }
-
-        val (instructionIndex, instruction) = implementation.instructions.drop(imageOnlyLayoutConstIndex).withIndex()
-            .first { (((it.value as? ReferenceInstruction)?.reference) as? MethodReference)?.definingClass?.contains("PivotBar") ?: false }
-
-        if (instruction.opcode != Opcode.INVOKE_VIRTUAL) return PatchResultError("Could not find the correct instruction")
-
-        val moveResultIndex = imageOnlyLayoutConstIndex + instructionIndex + 1
-        val moveResultInstruction = implementation.instructions[moveResultIndex] as OneRegisterInstruction
+        val instruction = implementation.instructions[result.scanResult.endIndex + 1]
+        if (instruction.opcode != Opcode.INVOKE_STATIC) return PatchResultError("Could not find the correct register")
+        val register = (instruction as Instruction35c).registerC
 
         // Hide the button view via proxy by passing it to the hideCreateButton method
-        result.method.addInstruction(
-            moveResultIndex + 1,
-            "invoke-static { v${moveResultInstruction.registerA} }, Lapp/revanced/integrations/patches/HideCreateButtonPatch;->hideCreateButton(Landroid/view/View;)V"
+        implementation.addInstruction(
+            result.scanResult.endIndex + 1,
+            "invoke-static { v$register }, Lfi/razerman/youtube/XAdRemover;->hideCreateButton(Landroid/view/View;)V".toInstruction()
         )
 
         return PatchResultSuccess()
     }
-}
+}

src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/annotations/FullscreenPanelsCompatibility.kt

@@ -1,13 +0,0 @@
-package app.revanced.patches.youtube.layout.fullscreenpanels.annotations
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Package
-
-@Compatibility(
-    [Package(
-        "com.google.android.youtube", arrayOf("17.23.35", "17.23.36", "17.24.34")
-    )]
-)
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-internal annotation class FullscreenPanelsCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/patch/FullscreenPanelsRemoverPatch.kt

@@ -1,36 +0,0 @@
-package app.revanced.patches.youtube.layout.fullscreenpanels.patch
-
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.implementation.BytecodeData
-import app.revanced.patcher.data.implementation.proxy
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.implementation.BytecodePatch
-import app.revanced.patcher.patch.implementation.misc.PatchResult
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patches.youtube.layout.fullscreenpanels.annotations.FullscreenPanelsCompatibility
-
-@Patch
-@Name("disable-fullscreen-panels")
-@Description("Disable comments panel in fullscreen view.")
-@FullscreenPanelsCompatibility
-@Version("0.0.1")
-class FullscreenPanelsRemovalPatch : BytecodePatch(listOf()) {
-    override fun execute(data: BytecodeData): PatchResult {
-        val classDef = data.classes.first { it.type.endsWith("FullscreenEngagementPanelOverlay;") }
-        val method = data.proxy(classDef).resolve().methods.first { it.name == "<init>" }
-        val implementation = method.implementation!!
-
-        method.addInstructions(
-            implementation.instructions.count() - 1,
-            """
-			 const/4 v1, 0x0
-             iput-boolean v1, v0, ${classDef.type}->a:Z
-       		"""
-        )
-
-        return PatchResultSuccess()
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/layout/minimizedplayback/annotations/MinimizedPlaybackCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

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

@@ -3,12 +3,13 @@ package app.revanced.patches.youtube.layout.minimizedplayback.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.implementation.BytecodePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.youtube.layout.minimizedplayback.annotations.MinimizedPlaybackCompatibility
 import app.revanced.patches.youtube.layout.minimizedplayback.signatures.MinimizedPlaybackManagerSignature
 
@@ -26,11 +27,11 @@ class MinimizedPlaybackPatch : BytecodePatch(
     override fun execute(data: BytecodeData): PatchResult {
         // Instead of removing all instructions like Vanced,
         // we return the method at the beginning instead
-        MinimizedPlaybackManagerSignature.result!!.method.addInstructions(
+        signatures.first().result!!.method.implementation!!.addInstructions(
             0, """
                 const/4 v0, 0x1
                 return v0
-                """
+                """.trimIndent().toInstructions()
         )
         return PatchResultSuccess()
     }

src/main/kotlin/app/revanced/patches/youtube/layout/oldqualitylayout/annotations/OldQualityLayoutCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34")
+        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/oldqualitylayout/patch/OldQualityLayoutPatch.kt

@@ -15,6 +15,7 @@ import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
 import app.revanced.patcher.signature.implementation.method.MethodSignature
 import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.youtube.layout.oldqualitylayout.annotations.OldQualityLayoutCompatibility
 import app.revanced.patches.youtube.layout.oldqualitylayout.signatures.OldQualityParentSignature
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
@@ -34,7 +35,7 @@ class OldQualityLayoutPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result = OldQualityParentSignature.result!!.findParentMethod(@Name("old-quality-signature") @MatchingMethod(
+        val result = signatures.first().result!!.findParentMethod(@Name("old-quality-signature") @MatchingMethod(
             definingClass = "Libh"
         ) @FuzzyPatternScanMethod(2) @OldQualityLayoutCompatibility @Version("0.0.1") object : MethodSignature(
             "L", AccessFlags.FINAL or AccessFlags.PRIVATE, listOf("Z"), listOf(
@@ -56,11 +57,11 @@ class OldQualityLayoutPatch : BytecodePatch(
             Opcode.IF_NEZ, 0, implementation.instructions[result.scanResult.endIndex].location.labels.first()
         )
         implementation.addInstruction(5, jmpInstruction)
-        result.method.addInstructions(
+        implementation.addInstructions(
             0, """
-                invoke-static { }, Lapp/revanced/integrations/patches/OldStyleQualityPatch;->useOldStyleQualitySettings()Z
+                invoke-static { }, Lfi/razerman/youtube/XGlobals;->useOldStyleQualitySettings()Z
                 move-result v0
-            """
+            """.trimIndent().toInstructions()
         )
 
         return PatchResultSuccess()

src/main/kotlin/app/revanced/patches/youtube/layout/reels/annotations/HideReelsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.23.35", "17.23.36", "17.24.34")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/reels/patch/HideReelsPatch.kt

@@ -4,10 +4,10 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.implementation.BytecodeData
-import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.patch.implementation.BytecodePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patches.youtube.layout.reels.annotations.HideReelsCompatibility
 import app.revanced.patches.youtube.layout.reels.signatures.HideReelsSignature
 
@@ -22,13 +22,14 @@ class HideReelsPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result = HideReelsSignature.result!!
+        val result = signatures.first().result!!
+        val implementation = result.method.implementation!!
 
         // HideReel will hide the reel view before it is being used,
         // so we pass the view to the HideReel method
-        result.method.addInstruction(
+        implementation.addInstruction(
             result.scanResult.endIndex,
-            "invoke-static { v2 }, Lapp/revanced/integrations/patches/HideReelsPatch;->HideReel(Landroid/view/View;)V"
+            "invoke-static { v2 }, Lfi/razerman/youtube/XAdRemover;->HideReel(Landroid/view/View;)V".toInstruction()
         )
 
         return PatchResultSuccess()

src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/annotations/ShortsButtonCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/patch/ShortsButtonRemoverPatch.kt

@@ -4,12 +4,12 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.implementation.BytecodeData
-import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.patch.annotations.Dependencies
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.implementation.BytecodePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patches.youtube.layout.shorts.button.annotations.ShortsButtonCompatibility
 import app.revanced.patches.youtube.layout.shorts.button.signatures.PivotBarButtonTabenumSignature
 import app.revanced.patches.youtube.layout.shorts.button.signatures.PivotBarButtonsViewSignature
@@ -28,29 +28,29 @@ class ShortsButtonRemoverPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result1 = PivotBarButtonTabenumSignature.result!!
+        val result1 = signatures.first().result!!
         val implementation1 = result1.method.implementation!!
         val moveEnumInstruction = implementation1.instructions[result1.scanResult.endIndex]
         val enumRegister = (moveEnumInstruction as Instruction11x).registerA
 
-        val result2 = PivotBarButtonsViewSignature.result!!
+        val result2 = signatures.last().result!!
         val implementation2 = result2.method.implementation!!
         val moveViewInstruction = implementation2.instructions[result2.scanResult.endIndex]
         val viewRegister = (moveViewInstruction as Instruction11x).registerA
 
         // Save the tab enum in XGlobals to avoid smali/register workarounds
-        result1.method.addInstruction(
+        implementation1.addInstruction(
             result1.scanResult.endIndex + 1,
-            "sput-object v$enumRegister, Lapp/revanced/integrations/patches/HideShortsButtonPatch;->lastPivotTab:Ljava/lang/Enum;"
+            "sput-object v$enumRegister, Lfi/razerman/youtube/XGlobals;->lastPivotTab:Ljava/lang/Enum;".toInstruction()
         )
 
         // Hide the button view via proxy by passing it to the hideShortsButton method
         // It only hides it if the last tab name is "TAB_SHORTS"
-        result2.method.addInstruction(
+        implementation2.addInstruction(
             result2.scanResult.endIndex + 2,
-            "invoke-static { v$viewRegister }, Lapp/revanced/integrations/patches/HideShortsButtonPatch;->hideShortsButton(Landroid/view/View;)V"
+            "invoke-static { v$viewRegister }, Lfi/razerman/youtube/XAdRemover;->hideShortsButton(Landroid/view/View;)V".toInstruction()
         )
 
         return PatchResultSuccess()
     }
-}
+}

src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/signatures/PivotBarButtonTabenumSignature.kt

@@ -42,4 +42,4 @@ object PivotBarButtonTabenumSignature : MethodSignature(
         Opcode.INVOKE_STATIC, // SomeEnum.fromValue(tabOrdinal)
         Opcode.MOVE_RESULT_OBJECT
     )
-)
+)

src/main/kotlin/app/revanced/patches/youtube/misc/integrations/annotations/IntegrationsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.03.38", "17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34")
+        "com.google.android.youtube", arrayOf("17.03.38", "17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/integrations/patch/IntegrationsPatch.kt

@@ -28,19 +28,19 @@ class IntegrationsPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        if (data.findClass("Lapp/revanced/integrations/utils/Globals") == null)
+        if (data.findClass("Lapp/revanced/integrations/Globals") == null)
             return PatchResultError("Integrations have not been merged yet. This patch can not succeed without the integrations.")
 
-        val result = InitSignature.result!!
+        val result = signatures.first().result!!
 
         val implementation = result.method.implementation!!
         val count = implementation.registerCount - 1
 
-        result.method.addInstructions(
+        implementation.addInstructions(
             result.scanResult.endIndex + 1, """
-                  invoke-static {v$count}, Lapp/revanced/integrations/sponsorblock/StringRef;->setContext(Landroid/content/Context;)V
-                  sput-object v$count, Lapp/revanced/integrations/utils/Globals;->context:Landroid/content/Context;
-            """
+                  invoke-static {v$count}, Lpl/jakubweg/StringRef;->setContext(Landroid/content/Context;)V
+                  sput-object v$count, Lapp/revanced/integrations/Globals;->context:Landroid/content/Context;
+            """.trimIndent().toInstructions()
         )
 
         val classDef = result.definingClassProxy.resolve()
@@ -55,7 +55,7 @@ class IntegrationsPatch : BytecodePatch(
                 null,
                 ImmutableMethodImplementation(
                     1, """
-                        invoke-static { }, Lapp/revanced/integrations/utils/Globals;->getAppContext()Landroid/content/Context;
+                        invoke-static { }, Lapp/revanced/integrations/Globals;->getAppContext()Landroid/content/Context;
                         move-result-object v0
                         return-object v0
                     """.trimIndent().toInstructions(), null, null

src/main/kotlin/app/revanced/patches/youtube/misc/manifest/annotations/FixLocaleConfigErrorCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/microg/annotations/MicroGPatchCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.19.36", "17.20.37", "17.22.36")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/bytecode/MicroGBytecodePatch.kt

@@ -16,7 +16,6 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.youtube.layout.castbutton.patch.HideCastButtonPatch
-import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
 import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
 import app.revanced.patches.youtube.misc.microg.patch.resource.MicroGResourcePatch
 import app.revanced.patches.youtube.misc.microg.patch.resource.enum.StringReplaceMode
@@ -30,13 +29,9 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction21c
 import org.jf.dexlib2.iface.reference.StringReference
 import org.jf.dexlib2.immutable.reference.ImmutableStringReference
 
-@Patch
+@Patch(include = false)
 @Dependencies(
-    dependencies = [
-        MicroGResourcePatch::class,
-        HideCastButtonPatch::class,
-        FixLocaleConfigErrorPatch::class
-    ]
+    dependencies = [MicroGResourcePatch::class, HideCastButtonPatch::class]
 )
 @Name("microg-support")
 @Description("Patch to allow YouTube ReVanced to run without root and under a different package name.")
@@ -70,11 +65,13 @@ class MicroGBytecodePatch : BytecodePatch(
 
                     val replaceMode = if (stringValue.equalsAny(
                             "com.google.android.gms",
+                            "com.google.android.youtube.fileprovider",
                             "com.google.android.c2dm.intent.REGISTER",
                             "com.google.android.c2dm.permission.SEND",
                             "com.google.iid.TOKEN_REQUEST",
                             "com.google",
                             "com.google.android.gms.auth.accounts",
+                            "com.google.android.youtube.SuggestionProvider",
                             "com.google.android.c2dm.intent.REGISTRATION",
                             "com.google.android.gsf.action.GET_GLS",
                             "com.google.android.gsf.login",
@@ -120,19 +117,13 @@ class MicroGBytecodePatch : BytecodePatch(
             }
         }
 
+        signatures.last()
         return PatchResultSuccess()
     }
 
     private fun disablePlayServiceChecksAndFixCastIssues() {
-        listOf(
-            IntegrityCheckSignature,
-            ServiceCheckSignature,
-            GooglePlayUtilitySignature,
-            CastDynamiteModuleSignature,
-            CastDynamiteModuleV2Signature,
-            CastContextFetchSignature
-        ).forEach { signature ->
-            val result = signature.result!!
+        for (i in 0 until signatures.count() - 1) {
+            val result = signatures.elementAt(i).result!!
             val stringInstructions = when (result.immutableMethod.returnType.first()) {
                 'L' -> """
                         const/4 v0, 0x0
@@ -147,12 +138,12 @@ class MicroGBytecodePatch : BytecodePatch(
 
                 else -> throw Exception("This case should never happen.")
             }
-            result.method.addInstructions(
-                0, stringInstructions
+            result.method.implementation!!.addInstructions(
+                0, stringInstructions.trimIndent().toInstructions()
             )
         }
 
-        val implementation = PrimeSignature.result!!.method.implementation!!
+        val implementation = signatures.last().result!!.method.implementation!!
 
         var register = 2
         val index = implementation.instructions.indexOfFirst {

src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/resource/MicroGResourcePatch.kt

@@ -4,7 +4,6 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.implementation.ResourceData
-import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.implementation.ResourcePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
@@ -40,6 +39,10 @@ class MicroGResourcePatch : ResourcePatch() {
                 "android:label=\"@string/application_name", "android:label=\"$REVANCED_APP_NAME"
             ).replace(
                 "android:authorities=\"com.google.android.youtube", "android:authorities=\"$REVANCED_PACKAGE_NAME"
+            ).replace(
+                "com.google.android.youtube.fileprovider", "$REVANCED_PACKAGE_NAME.fileprovider"
+            ).replace(
+                "com.google.android.youtube.SuggestionProvider", "$REVANCED_PACKAGE_NAME.SuggestionProvider"
             ).replace(
                 "com.google.android.youtube.permission.C2D_MESSAGE", "$REVANCED_PACKAGE_NAME.permission.C2D_MESSAGE"
             ).replace( // TODO: might not be needed

src/main/kotlin/app/revanced/patches/youtube/misc/microg/shared/Constants.kt

@@ -3,5 +3,5 @@ package app.revanced.patches.youtube.misc.microg.shared
 object Constants {
     internal const val BASE_MICROG_PACKAGE_NAME = "com.mgoogle"
     internal const val REVANCED_PACKAGE_NAME = "app.revanced.android.youtube"
-    internal const val REVANCED_APP_NAME = "YouTube ReVanced"
-}
+    internal const val REVANCED_APP_NAME = "ReVanced"
+}