chore(release): 1.0.0-dev.13 [skip ci]

# [1.0.0-dev.13](https://github.com/revanced/revanced-patcher/compare/v1.0.0-dev.12...v1.0.0-dev.13) (2022-05-24)

### Performance Improvements

* decode manifest only when not using resource patcher ([40b1fa4](40b1fa43e1))

.gitattributes

@@ -1,9 +0,0 @@
-#
-# https://help.github.com/articles/dealing-with-line-endings/
-#
-# Linux start script should use lf
-/gradlew        text eol=lf
-
-# These are Windows script files and should use crlf
-*.bat           text eol=crlf
-

.github/ISSUE_TEMPLATE/bug-issue.yml

@@ -1,72 +0,0 @@
-name: 🐞 Bug report
-description: Report a very clearly broken issue.
-title: 'bug: <title>'
-labels: [bug]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        # ReVanced bug report
-
-        Important to note that your issue may have already been reported before. Please check for existing issues [here](https://github.com/revanced/revanced-patcher/labels/bug).
-
-  - type: dropdown
-    attributes:
-      label: Type
-      options:
-        - Crash
-        - Cosmetic
-        - Other
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Bug description
-      description: How did you find the bug? Any additional details that might help?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Steps to reproduce
-      description: Add the steps to reproduce this bug including your environment.
-      placeholder: Step 1. Download some files. Step 2. ...
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Relevant log output
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
-      render: shell
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Screenshots or videos
-      description: Add screenshots or videos that show the bug here.
-      placeholder: Drag and drop the screenshots/videos into this box.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Solution
-      description: If applicable, add a possible solution.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add additional context here.
-    validations:
-      required: false
-  - type: checkboxes
-    id: acknowledgements
-    attributes:
-      label: Acknowledgements
-      description: Your issue will be closed if you haven't done these steps.
-      options:
-        - label: I have searched the existing issues and this is a new and no duplicate or related to another open issue.
-          required: true
-        - label: I have written a short but informative title.
-          required: true
-        - label: I filled out all of the requested information in this issue properly.
-          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: 📃 Documentation
-    url: https://github.com/revanced/revanced-documentation/
-    about: Don't know how or where to start? Check out our documentation!
-  - name: 🗨 Discussions
-    url: https://github.com/revanced/revanced-suggestions/discussions
-    about: Got something you think should change or be added? Search for or start a new discussion!

.github/ISSUE_TEMPLATE/feature-issue.yml

@@ -1,58 +0,0 @@
-name: ⭐ Feature request
-description: Create a detailed feature request.
-title: 'feat: <title>'
-labels: [feature-request]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        # ReVanced feature request
-        
-        Do not submit requests for patches here. Please submit them [here](https://github.com/orgs/revanced/discussions/categories/patches) instead.
-        Important to note that your feature request may have already been made before. Please check for existing feature requests [here](https://github.com/revanced/revanced-patcher/labels/feature-request).
-
-  - type: dropdown
-    attributes:
-      label: Type
-      options:
-        - Functionality
-        - Cosmetic
-        - Other
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Issue
-      description: What is the current problem. Why does it require a feature request?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Feature
-      description: Describe your feature in detail. How does it solve the issue?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Motivation
-      description: Why should your feature should be considered?
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add additional context here.
-    validations:
-      required: false
-  - type: checkboxes
-    id: acknowledgements
-    attributes:
-      label: Acknowledgements
-      description: Your issue will be closed if you haven't done these steps.
-      options:
-        - label: I have searched the existing issues and this is a new and no duplicate or related to another open issue.
-          required: true
-        - label: I have written a short but informative title.
-          required: true
-        - label: I filled out all of the requested information in this issue properly.
-          required: true

.github/config.yml

@@ -1,2 +0,0 @@
-firstPRMergeComment: >
-  Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) if you want to receive a contributor role.

.github/workflows/pull_request.yml

@@ -1,25 +0,0 @@
-name: PR to main
-
-on:
-  push:
-    branches:
-      - dev
-  workflow_dispatch:
-
-env:
-  MESSAGE: merge branch `${{ github.head_ref || github.ref_name }}` to `main`
-
-jobs:
-  pull-request:
-    name: Open pull request
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Open pull request
-        uses: repo-sync/pull-request@v2
-        with:
-          destination_branch: 'main'
-          pr_title: 'chore: ${{ env.MESSAGE }}'
-          pr_body: 'This pull request will ${{ env.MESSAGE }}.'
-          pr_draft: true

.github/workflows/release.yml

@@ -1,7 +1,5 @@
 name: Release
-
 on:
-  workflow_dispatch:
   push:
     branches:
       - main
@@ -10,36 +8,34 @@ on:
     branches:
       - main
       - dev
-
 jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
-          # Make sure the release step uses its own credentials:
-          # https://github.com/cycjimmy/semantic-release-action#private-packages
-          persist-credentials: false
           fetch-depth: 0
-      - name: Cache
-        uses: actions/cache@v3
+      - name: Setup JDK
+        uses: actions/setup-java@v2
         with:
-          path: |
-            ${{ runner.home }}/.gradle/caches
-            ${{ runner.home }}/.gradle/wrapper
-            .gradle
-            build
-            node_modules
-          key: ${{ runner.os }}-gradle-npm-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'package-lock.json') }}
+          java-version: '17'
+          distribution: 'adopt'
+          cache: gradle
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: "lts/*"
+      - name: Make gradlew executable
+        run: chmod +x gradlew
       - name: Build with Gradle
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew clean --no-daemon
+        run: ./gradlew build
       - name: Setup semantic-release
-        run: npm install
+        run: npm install -g semantic-release @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D
       - name: Release
         env:
-          GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
-        run: npm exec semantic-release
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: npx semantic-release

.gitignore

@@ -74,7 +74,6 @@ cmake-build-*/
 
 # IntelliJ
 out/
-.idea/
 
 # mpeltonen/sbt-idea plugin
 .idea_modules/
@@ -116,9 +115,3 @@ gradle-app.setting
 
 # Avoid ignoring test resources
 !src/test/resources/*
-
-# Dependency directories
-node_modules/
-
-# Gradle props, to avoid sharing the gpr key
-gradle.properties

.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/codeStyles/Project.xml

@@ -0,0 +1,10 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

.idea/discord.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DiscordProjectSettings">
+    <option name="show" value="PROJECT_FILES" />
+    <option name="description" value="" />
+  </component>
+</project>

.idea/git_toolbox_prj.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxProjectSettings">
+    <option name="commitMessageIssueKeyValidationOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+    <option name="commitMessageValidationEnabledOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+  </component>
+</project>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="UnusedSymbol" enabled="false" level="WARNING" enabled_by_default="false" />
+  </profile>
+</component>

.idea/misc.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="azul-17" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CommitMessageInspectionProfile">
+    <profile version="1.0">
+      <inspection_tool class="CommitFormat" enabled="true" level="WARNING" enabled_by_default="true" />
+      <inspection_tool class="CommitNamingConvention" enabled="true" level="WARNING" enabled_by_default="true" />
+    </profile>
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

.releaserc

@@ -7,13 +7,7 @@
     }
   ],
   "plugins": [
-    [
-      "@semantic-release/commit-analyzer", {
-        "releaseRules": [
-          { "type": "build", "scope": "Needs bump", "release": "patch" }
-        ]
-      }
-    ],
+    "@semantic-release/commit-analyzer",
     "@semantic-release/release-notes-generator",
     "@semantic-release/changelog",
     "gradle-semantic-release-plugin",
@@ -26,18 +20,6 @@
         ]
       }
     ],
-    [
-      "@saithodev/semantic-release-backmerge",
-      {
-        backmergeBranches: [{"from": "main", "to": "dev"}],
-        clearWorkspace: true
-      }
-    ],
-    [
-        "@semantic-release/github",
-        {
-            successComment: false
-        }
-    ]
+    "@semantic-release/github"
   ]
 }

README.md

@@ -1,3 +1 @@
-# 💉 ReVanced Patcher
-
-ReVanced Patcher used to patch Android applications.
+# Patcher

build.gradle.kts

@@ -1,35 +1,36 @@
 plugins {
-    kotlin("jvm") version "1.8.20"
+    kotlin("jvm") version "1.6.21"
+    java
     `maven-publish`
 }
 
 group = "app.revanced"
 
-val githubUsername: String = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR")
-val githubPassword: String = project.findProperty("gpr.key") as? String ?: System.getenv("GITHUB_TOKEN")
-
 repositories {
     mavenCentral()
-    google()
-    listOf("multidexlib2", "apktool").forEach { repo ->
-        maven {
-            url = uri("https://maven.pkg.github.com/revanced/$repo")
-            credentials {
-                username = githubUsername
-                password = githubPassword
-            }
+    maven {
+        url = uri("https://maven.pkg.github.com/revanced/multidexlib2")
+        credentials {
+            // DO NOT set these variables in the project's gradle.properties.
+            // Instead, you should set them in:
+            // Windows: %homepath%\.gradle\gradle.properties
+            // Linux: ~/.gradle/gradle.properties
+            username = project.findProperty("gpr.user") as String? ?: System.getenv("GITHUB_ACTOR") // DO NOT CHANGE!
+            password = project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN") // DO NOT CHANGE!
         }
     }
 }
 
 dependencies {
-    implementation("xpp3:xpp3:1.1.4c")
-    implementation("com.android.tools.smali:smali:3.0.3")
-    implementation("app.revanced:multidexlib2:3.0.3.r2")
-    implementation("app.revanced:apktool-lib:2.8.2-3")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
 
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.22")
-    testImplementation("org.jetbrains.kotlin:kotlin-test:1.8.20-RC")
+    api("xpp3:xpp3:1.1.4c")
+    api("org.apktool:apktool-lib:2.6.1")
+    api("app.revanced:multidexlib2:2.5.2.r2")
+    api("org.smali:smali:2.5.2")
+
+    testImplementation("org.jetbrains.kotlin:kotlin-test:1.6.21")
+    implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.21")
 }
 
 tasks {
@@ -39,22 +40,18 @@ tasks {
             events("PASSED", "SKIPPED", "FAILED")
         }
     }
-    processResources {
-        expand("projectVersion" to project.version)
-    }
 }
 
 java {
     withSourcesJar()
+    withJavadocJar()
 }
 
-kotlin {
-    jvmToolchain(11)
-}
+val isGitHubCI = System.getenv("GITHUB_ACTOR") != null
 
 publishing {
     repositories {
-        if (System.getenv("GITHUB_ACTOR") != null)
+        if (isGitHubCI) {
             maven {
                 name = "GitHubPackages"
                 url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
@@ -63,12 +60,13 @@ publishing {
                     password = System.getenv("GITHUB_TOKEN")
                 }
             }
-        else
+        } else {
             mavenLocal()
+        }
     }
     publications {
         register<MavenPublication>("gpr") {
             from(components["java"])
         }
     }
-}
+}

gradle.properties

@@ -1,4 +1,2 @@
-org.gradle.parallel = true
-org.gradle.caching = true
 kotlin.code.style = official
-version = 13.0.0-dev.2
+version = 1.0.0-dev.13

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,98 +17,67 @@
 #
 
 ##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
 done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"
 
 warn () {
     echo "$*"
-} >&2
+}
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-} >&2
+}
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MSYS* | MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -118,9 +87,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
     else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -129,120 +98,88 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
 fi
 
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
 
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
     done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi
 
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,8 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -41,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -76,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

package.json

@@ -1,9 +0,0 @@
-{
-  "devDependencies": {
-    "@saithodev/semantic-release-backmerge": "^3.1.0",
-    "@semantic-release/changelog": "^6.0.2",
-    "@semantic-release/git": "^10.0.1",
-    "gradle-semantic-release-plugin": "^1.7.6",
-    "semantic-release": "^20.1.0"
-  }
-}

src/main/kotlin/app/revanced/patcher/Patcher.kt

@@ -1,396 +1,241 @@
 package app.revanced.patcher
 
-import app.revanced.patcher.data.Context
-import app.revanced.patcher.extensions.PatchExtensions.dependencies
-import app.revanced.patcher.extensions.PatchExtensions.patchName
-import app.revanced.patcher.extensions.PatchExtensions.requiresIntegrations
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolveUsingLookupMap
-import app.revanced.patcher.patch.*
-import brut.androlib.AaptInvoker
-import brut.androlib.ApkDecoder
-import brut.androlib.Config
-import brut.androlib.apk.ApkInfo
-import brut.androlib.apk.UsesFramework
-import brut.androlib.res.Framework
-import brut.androlib.res.ResourcesDecoder
-import brut.androlib.res.decoder.AndroidManifestResourceParser
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.data.PatcherData
+import app.revanced.patcher.data.base.Data
+import app.revanced.patcher.data.implementation.findIndexed
+import app.revanced.patcher.extensions.findAnnotationRecursively
+import app.revanced.patcher.patch.base.Patch
+import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.implementation.ResourcePatch
+import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.signature.implementation.method.resolver.MethodSignatureResolver
+import app.revanced.patcher.util.ListBackedSet
+import brut.androlib.Androlib
+import brut.androlib.meta.UsesFramework
+import brut.androlib.res.AndrolibResources
+import brut.androlib.res.data.ResPackage
+import brut.androlib.res.decoder.AXmlResourceParser
+import brut.androlib.res.decoder.ResAttrDecoder
 import brut.androlib.res.decoder.XmlPullStreamDecoder
-import brut.androlib.res.xml.ResXmlPatcher
 import brut.directory.ExtFile
-import com.android.tools.smali.dexlib2.Opcodes
-import com.android.tools.smali.dexlib2.iface.DexFile
-import com.android.tools.smali.dexlib2.writer.io.MemoryDataStore
 import lanchon.multidexlib2.BasicDexFileNamer
 import lanchon.multidexlib2.DexIO
 import lanchon.multidexlib2.MultiDexIO
-import java.io.Closeable
+import org.jf.dexlib2.Opcodes
+import org.jf.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.DexFile
+import org.jf.dexlib2.writer.io.MemoryDataStore
 import java.io.File
 import java.io.OutputStream
-import java.nio.file.Files
-import java.util.logging.LogManager
 
-internal val NAMER = BasicDexFileNamer()
+val NAMER = BasicDexFileNamer()
 
 /**
  * The ReVanced Patcher.
- * @param options The options for the patcher.
+ * @param inputFile The input file (usually an apk file).
+ * @param resourceCacheDirectory Directory to cache resources.
+ * @param patchResources Weather to use the resource patcher. Resources will still need to be decoded.
  */
-class Patcher(private val options: PatcherOptions) {
-    val context: PatcherContext
-
-    private val logger = options.logger
+class Patcher(
+    inputFile: File,
+    // TODO: maybe a file system in memory is better. Could cause high memory usage.
+    private val resourceCacheDirectory: String, private val patchResources: Boolean = false
+) {
+    val packageVersion: String
+    val packageName: String
 
+    private lateinit var usesFramework: UsesFramework
+    private val patcherData: PatcherData
     private val opcodes: Opcodes
+    private var signaturesResolved = false
 
-    private var resourceDecodingMode = ResourceDecodingMode.MANIFEST_ONLY
-
-    private var mergeIntegrations = false
-
-    private val config = Config.getDefaultConfig().apply {
-        useAapt2 = true
-        aaptPath = options.aaptPath
-        frameworkDirectory = options.frameworkDirectory
-    }
 
     init {
-        // Disable unwanted logging.
-        LogManager.getLogManager().let {
-            listOf("app.revanced.apktool-lib", "app.revanced.brut.*").forEach { loggerName ->
-                it.getLogger(loggerName)?.useParentHandlers = false
-            }
+        val extFileInput = ExtFile(inputFile)
+        val outDir = File(resourceCacheDirectory)
+
+        if (outDir.exists()) outDir.deleteRecursively()
+        outDir.mkdir()
+
+        // load the resource table from the input file
+        val androlib = Androlib()
+        val resourceTable = androlib.getResTable(extFileInput, true)
+
+        if (patchResources) {
+            // 1. decode resources to cache directory
+            androlib.decodeManifestWithResources(extFileInput, outDir, resourceTable)
+            androlib.decodeResourcesFull(extFileInput, outDir, resourceTable)
+
+            // 2. read framework ids from the resource table
+            usesFramework = UsesFramework()
+            usesFramework.ids = resourceTable.listFramePackages().map { it.id }.sorted()
+        } else {
+            // create decoder for the resource table
+            val decoder = ResAttrDecoder()
+            decoder.currentPackage = ResPackage(resourceTable, 0, null)
+
+            // create xml parser with the decoder
+            val axmlParser = AXmlResourceParser()
+            axmlParser.attrDecoder = decoder
+
+            // parse package information with the decoder and parser which will set required values in the resource table
+            // instead of decodeManifest another more low level solution can be created to make it faster/better
+            XmlPullStreamDecoder(
+                axmlParser, AndrolibResources().resXmlSerializer
+            ).decodeManifest(
+                extFileInput.directory.getFileInput("AndroidManifest.xml"), OutputStream.nullOutputStream()
+            )
         }
 
-        logger.info("Reading dex files")
-
+        // set package information
+        packageVersion = resourceTable.versionInfo.versionName
+        packageName = resourceTable.currentResPackage.name
         // read dex files
-        val dexFile = MultiDexIO.readDexFile(true, options.inputFile, NAMER, null, null)
-
-        // get the opcodes
+        val dexFile = MultiDexIO.readDexFile(true, inputFile, NAMER, null, null)
         opcodes = dexFile.opcodes
 
-        // finally create patcher context
-        context = PatcherContext(dexFile.classes.toMutableList(), File(options.resourceCacheDirectory))
-
-        // decode manifest file
-        decodeResources(ResourceDecodingMode.MANIFEST_ONLY)
+        // save to patcher data
+        patcherData = PatcherData(dexFile.classes.toMutableList(), resourceCacheDirectory)
     }
 
     /**
-     * Add integrations to be merged by the patcher.
-     * The integrations will only be merged, if necessary.
-     *
-     * @param integrations The integrations, must be dex files or dex file container such as ZIP, APK or DEX files.
-     * @param callback The callback for [integrations] which are being added.
+     * Add additional dex file container to the patcher.
+     * @param files The dex file containers to add to the patcher.
+     * @param allowedOverwrites A list of class types that are allowed to be overwritten.
+     * @param throwOnDuplicates If this is set to true, the patcher will throw an exception if a duplicate class has been found.
      */
-    fun addIntegrations(
-        integrations: List<File>,
-        callback: (File) -> Unit
+    fun addFiles(
+        files: Iterable<File>, allowedOverwrites: Iterable<String> = emptyList(), throwOnDuplicates: Boolean = false
     ) {
-        context.integrations.apply integrations@{
-            add(integrations)
-            this@integrations.callback = callback
+        for (file in files) {
+            val dexFile = MultiDexIO.readDexFile(true, file, NAMER, null, null)
+            for (classDef in dexFile.classes) {
+                val e = patcherData.bytecodeData.classes.internalClasses.findIndexed { it.type == classDef.type }
+                if (e != null) {
+                    if (throwOnDuplicates) {
+                        throw Exception("Class ${classDef.type} has already been added to the patcher.")
+                    }
+                    val (_, idx) = e
+                    if (allowedOverwrites.contains(classDef.type)) {
+                        patcherData.bytecodeData.classes.internalClasses[idx] = classDef
+                    }
+                    continue
+                }
+                patcherData.bytecodeData.classes.internalClasses.add(classDef)
+            }
         }
     }
 
     /**
      * Save the patched dex file.
      */
-    fun save(): PatcherResult {
-        var resourceFile: File? = null
+    fun save(): Map<String, MemoryDataStore> {
+        val newDexFile = object : DexFile {
+            override fun getClasses(): Set<ClassDef> {
+                patcherData.bytecodeData.classes.applyProxies()
+                return ListBackedSet(patcherData.bytecodeData.classes.internalClasses)
+            }
 
-        if (resourceDecodingMode == ResourceDecodingMode.FULL) {
-            logger.info("Compiling resources")
-
-            val cacheDirectory = ExtFile(options.resourceCacheDirectory)
-            val aaptFile = cacheDirectory.resolve("aapt_temp_file").also {
-                Files.deleteIfExists(it.toPath())
-            }.also { resourceFile = it }
-
-            try {
-                AaptInvoker(
-                    config,
-                    context.packageMetadata.apkInfo
-                ).invokeAapt(
-                    aaptFile,
-                    cacheDirectory.resolve("AndroidManifest.xml").also {
-                        ResXmlPatcher.fixingPublicAttrsInProviderAttributes(it)
-                    },
-                    cacheDirectory.resolve("res"),
-                    null,
-                    null,
-                    context.packageMetadata.apkInfo.usesFramework.let { usesFramework ->
-                        usesFramework.ids.map { id ->
-                            Framework(config).getFrameworkApk(id, usesFramework.tag)
-                        }.toTypedArray()
-                    }
-                )
-            } finally {
-                cacheDirectory.close()
+            override fun getOpcodes(): Opcodes {
+                return this@Patcher.opcodes
             }
         }
 
-        logger.info("Writing modified dex files")
+        // build modified resources
+        if (patchResources) {
+            val extDir = ExtFile(resourceCacheDirectory)
 
-        return mutableMapOf<String, MemoryDataStore>().apply {
-            MultiDexIO.writeDexFile(
-                true,
-                -1, // Defaults to amount of available cores.
-                this,
-                NAMER,
-                object : DexFile {
-                    override fun getClasses() = context.bytecodeContext.classes.also { it.replaceClasses() }
-                    override fun getOpcodes() = this@Patcher.opcodes
-                },
-                DexIO.DEFAULT_MAX_DEX_POOL_SIZE,
-                null
-            )
-        }.let { dexFiles ->
-            PatcherResult(
-                dexFiles.map {
-                    app.revanced.patcher.util.dex.DexFile(it.key, it.value.readAt(0))
-                },
-                context.packageMetadata.apkInfo.doNotCompress?.toList(),
-                resourceFile
-            )
+            // TODO: figure out why a new instance of Androlib is necessary here
+            Androlib().buildResources(extDir, usesFramework)
         }
+
+        // write dex modified files
+        val output = mutableMapOf<String, MemoryDataStore>()
+        MultiDexIO.writeDexFile(
+            true, -1, // core count
+            output, NAMER, newDexFile, DexIO.DEFAULT_MAX_DEX_POOL_SIZE, null
+        )
+        return output
     }
 
     /**
-     * Add [Patch]es to the patcher.
-     * @param patches [Patch]es The patches to add.
+     * Add a patch to the patcher.
+     * @param patches The patches to add.
      */
-    fun addPatches(patches: Iterable<Class<out Patch<Context>>>) {
-        /**
-         * Returns true if at least one patches or its dependencies matches the given predicate.
-         */
-        fun Class<out Patch<Context>>.anyRecursively(predicate: (Class<out Patch<Context>>) -> Boolean): Boolean =
-            predicate(this) || dependencies?.any { it.java.anyRecursively(predicate) } == true
-
-
-        // Determine if resource patching is required.
-        for (patch in patches) {
-            if (patch.anyRecursively { ResourcePatch::class.java.isAssignableFrom(it) }) {
-                resourceDecodingMode = ResourceDecodingMode.FULL
-                break
-            }
-        }
-
-        // Determine if merging integrations is required.
-        for (patch in patches) {
-            if (patch.anyRecursively { it.requiresIntegrations }) {
-                mergeIntegrations = true
-                break
-            }
-        }
-
-        context.patches.addAll(patches)
+    fun addPatches(patches: Iterable<Patch<Data>>) {
+        patcherData.patches.addAll(patches)
     }
 
     /**
-     * Decode resources for the patcher.
-     *
-     * @param mode The [ResourceDecodingMode] to use when decoding.
+     * Resolves all signatures.
      */
-    private fun decodeResources(mode: ResourceDecodingMode) {
-        val apkInfo = ApkInfo(ExtFile(options.inputFile)).also { context.packageMetadata.apkInfo = it }
-
-        // Needed to record uncompressed files.
-        val apkDecoder = ApkDecoder(config, apkInfo)
-
-        // Needed to decode resources.
-        val resourcesDecoder = ResourcesDecoder(config, apkInfo)
-
-        try {
-            when (mode) {
-                ResourceDecodingMode.FULL -> {
-                    logger.info("Decoding resources")
-
-                    val outDir = options.recreateResourceCacheDirectory()
-
-                    resourcesDecoder.decodeManifest(outDir)
-                    resourcesDecoder.decodeResources(outDir)
-
-                    apkDecoder.recordUncompressedFiles(resourcesDecoder.resFileMapping)
-
-                    apkInfo.usesFramework = UsesFramework().apply {
-                        ids = resourcesDecoder.resTable.listFramePackages().map { it.id }
-                    }
-                }
-                ResourceDecodingMode.MANIFEST_ONLY -> {
-                    logger.info("Decoding app manifest")
-
-                    // Decode manually instead of using resourceDecoder.decodeManifest
-                    // because it does not support decoding to an OutputStream.
-                    XmlPullStreamDecoder(
-                        AndroidManifestResourceParser(resourcesDecoder.resTable),
-                        resourcesDecoder.resXmlSerializer
-                    ).decodeManifest(
-                        apkInfo.apkFile.directory.getFileInput("AndroidManifest.xml"),
-                        // Older Android versions do not support OutputStream.nullOutputStream()
-                        object : OutputStream() {
-                            override fun write(b: Int) { /* do nothing */
-                            }
-                        }
-                    )
-
-                    // Get the package name and version from the manifest using the XmlPullStreamDecoder.
-                    // XmlPullStreamDecoder.decodeManifest() sets metadata.apkInfo.
-                    context.packageMetadata.let { metadata ->
-                        metadata.packageName = resourcesDecoder.resTable.packageRenamed
-                        apkInfo.versionInfo.let {
-                            metadata.packageVersion = it.versionName ?: it.versionCode
-                        }
-                    }
-                }
+    fun resolveSignatures(): List<MethodSignature> {
+        val signatures = buildList {
+            for (patch in patcherData.patches) {
+                if (patch !is BytecodePatch) continue
+                this.addAll(patch.signatures)
             }
-        } finally {
-            apkInfo.apkFile.close()
         }
+        if (signatures.isEmpty()) {
+            return emptyList()
+        }
+
+        MethodSignatureResolver(patcherData.bytecodeData.classes.internalClasses, signatures).resolve(patcherData)
+        signaturesResolved = true
+        return signatures
     }
 
+
     /**
-     * Execute patches added the patcher.
-     *
+     * Apply patches loaded into the patcher.
      * @param stopOnError If true, the patches will stop on the first error.
-     * @return A pair of the name of the [Patch] and its [PatchResult].
+     * @return A map of [PatchResultSuccess]. If the [Patch] was successfully applied,
+     * [PatchResultSuccess] will always be returned to the wrapping Result object.
+     * If the [Patch] failed to apply, an Exception will always be returned to the wrapping Result object.
      */
-    fun executePatches(stopOnError: Boolean = false): Sequence<Pair<String, Result<PatchResultSuccess>>> {
-        /**
-         * Execute a [Patch] and its dependencies recursively.
-         *
-         * @param patchClass The [Patch] to execute.
-         * @param executedPatches A map of [Patch]es paired to a boolean indicating their success, to prevent infinite recursion.
-         * @return The result of executing the [Patch].
-         */
-        fun executePatch(
-            patchClass: Class<out Patch<Context>>,
-            executedPatches: LinkedHashMap<String, ExecutedPatch>
-        ): PatchResult {
-            val patchName = patchClass.patchName
-
-            // if the patch has already applied silently skip it
-            if (executedPatches.contains(patchName)) {
-                if (!executedPatches[patchName]!!.success)
-                    return PatchResultError("'$patchName' did not succeed previously")
-
-                logger.trace("Skipping '$patchName' because it has already been applied")
-
-                return PatchResultSuccess()
-            }
-
-            // recursively execute all dependency patches
-            patchClass.dependencies?.forEach { dependencyClass ->
-                val dependency = dependencyClass.java
-
-                val result = executePatch(dependency, executedPatches)
-                if (result.isSuccess()) return@forEach
-
-                return PatchResultError(
-                    "'$patchName' depends on '${dependency.patchName}' but the following error was raised: " +
-                            result.error()!!.let { it.cause?.stackTraceToString() ?: it.message }
-                )
-            }
-
-            val isResourcePatch = ResourcePatch::class.java.isAssignableFrom(patchClass)
-            val patchInstance = patchClass.getDeclaredConstructor().newInstance()
-
-            // TODO: implement this in a more polymorphic way
-            val patchContext = if (isResourcePatch) {
-                context.resourceContext
-            } else {
-                context.bytecodeContext.also { context ->
-                    (patchInstance as BytecodePatch).fingerprints?.resolveUsingLookupMap(context)
-                }
-            }
-
-            logger.trace("Executing '$patchName' of type: ${if (isResourcePatch) "resource" else "bytecode"}")
-
-            return try {
-                patchInstance.execute(patchContext).also {
-                    executedPatches[patchName] = ExecutedPatch(patchInstance, it.isSuccess())
-                }
-            } catch (e: Exception) {
-                PatchResultError(e).also {
-                    executedPatches[patchName] = ExecutedPatch(patchInstance, false)
-                }
-            }
+    fun applyPatches(
+        stopOnError: Boolean = false, callback: (String) -> Unit = {}
+    ): Map<String, Result<PatchResultSuccess>> {
+        if (!signaturesResolved) {
+            resolveSignatures()
         }
+        return buildMap {
+            for (patch in patcherData.patches) {
+                val resourcePatch = patch is ResourcePatch
+                if (!patchResources && resourcePatch) continue
 
-        return sequence {
-            if (mergeIntegrations) context.integrations.merge(logger)
+                val patchNameAnnotation = patch::class.java.findAnnotationRecursively(Name::class.java)
 
-            logger.trace("Initialize lookup maps for method MethodFingerprint resolution")
-
-            MethodFingerprint.initializeFingerprintResolutionLookupMaps(context.bytecodeContext)
-
-            // prevent from decoding the manifest twice if it is not needed
-            if (resourceDecodingMode == ResourceDecodingMode.FULL) decodeResources(ResourceDecodingMode.FULL)
-
-            logger.info("Executing patches")
-
-            val executedPatches = LinkedHashMap<String, ExecutedPatch>() // first is name
-
-            context.patches.forEach { patch ->
-                val patchResult = executePatch(patch, executedPatches)
-
-                val result = if (patchResult.isSuccess()) {
-                    Result.success(patchResult.success()!!)
-                } else {
-                    Result.failure(patchResult.error()!!)
+                patchNameAnnotation?.let {
+                    callback(it.name)
                 }
 
-                // TODO: This prints before the patch really finishes in case it is a Closeable
-                //  because the Closeable is closed after all patches are executed.
-                yield(patch.patchName to result)
-
-                if (stopOnError && patchResult.isError()) return@sequence
-            }
-
-            executedPatches.values
-                .filter(ExecutedPatch::success)
-                .map(ExecutedPatch::patchInstance)
-                .filterIsInstance(Closeable::class.java)
-                .asReversed().forEach {
-                    try {
-                        it.close()
-                    } catch (exception: Exception) {
-                        val patchName = (it as Patch<Context>).javaClass.patchName
-
-                        logger.error("Failed to close '$patchName': ${exception.stackTraceToString()}")
-
-                        yield(patchName to Result.failure(exception))
-
-                        // This is not failsafe. If a patch throws an exception while closing,
-                        // the other patches that depend on it may fail.
-                        if (stopOnError) return@sequence
+                val result: Result<PatchResultSuccess> = try {
+                    val data = if (resourcePatch) {
+                        patcherData.resourceData
+                    } else {
+                        patcherData.bytecodeData
                     }
+
+                    val pr = patch.execute(data)
+
+                    if (pr.isSuccess()) {
+                        Result.success(pr.success()!!)
+                    } else {
+                        Result.failure(Exception(pr.error()?.errorMessage() ?: "Unknown error"))
+                    }
+                } catch (e: Exception) {
+                    Result.failure(e)
                 }
 
-            MethodFingerprint.clearFingerprintResolutionLookupMaps()
+                patchNameAnnotation?.let {
+                    this[patchNameAnnotation.name] = result
+                }
+
+                if (result.isFailure && stopOnError) break
+            }
         }
     }
-
-    /**
-     * The type of decoding the resources.
-     */
-    private enum class ResourceDecodingMode {
-        /**
-         * Decode all resources.
-         */
-        FULL,
-
-        /**
-         * Decode the manifest file only.
-         */
-        MANIFEST_ONLY,
-    }
 }
-
-/**
- * A result of executing a [Patch].
- *
- * @param patchInstance The instance of the [Patch] that was applied.
- * @param success The result of the [Patch].
- */
-internal data class ExecutedPatch(val patchInstance: Patch<Context>, val success: Boolean)

src/main/kotlin/app/revanced/patcher/PatcherContext.kt

@@ -1,64 +0,0 @@
-package app.revanced.patcher
-
-import app.revanced.patcher.data.*
-import app.revanced.patcher.logging.Logger
-import app.revanced.patcher.patch.Patch
-import app.revanced.patcher.util.ClassMerger.merge
-import com.android.tools.smali.dexlib2.iface.ClassDef
-import java.io.File
-
-data class PatcherContext(
-    val classes: MutableList<ClassDef>,
-    val resourceCacheDirectory: File,
-) {
-    val packageMetadata = PackageMetadata()
-    internal val patches = mutableListOf<Class<out Patch<Context>>>()
-    internal val integrations = Integrations(this)
-    internal val bytecodeContext = BytecodeContext(classes)
-    internal val resourceContext = ResourceContext(resourceCacheDirectory)
-
-    internal class Integrations(val context: PatcherContext) {
-        var callback: ((File) -> Unit)? = null
-        private val integrations: MutableList<File> = mutableListOf()
-
-        fun add(integrations: List<File>) = this@Integrations.integrations.addAll(integrations)
-
-        /**
-         * Merge integrations.
-         * @param logger A logger.
-         */
-        fun merge(logger: Logger) {
-            with(context.bytecodeContext.classes) {
-                for (integrations in integrations) {
-                    callback?.let { it(integrations) }
-
-                    for (classDef in lanchon.multidexlib2.MultiDexIO.readDexFile(
-                        true,
-                        integrations,
-                        NAMER,
-                        null,
-                        null
-                    ).classes) {
-                        val type = classDef.type
-
-                        val result = classes.findIndexed { it.type == type }
-                        if (result == null) {
-                            logger.trace("Merging type $type")
-                            classes.add(classDef)
-                            continue
-                        }
-
-                        val (existingClass, existingClassIndex) = result
-
-                        logger.trace("Type $type exists. Adding missing methods and fields.")
-
-                        existingClass.merge(classDef, context, logger).let { mergedClass ->
-                            if (mergedClass !== existingClass) // referential equality check
-                                classes[existingClassIndex] = mergedClass
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

src/main/kotlin/app/revanced/patcher/PatcherOptions.kt

@@ -1,32 +0,0 @@
-package app.revanced.patcher
-
-import app.revanced.patcher.logging.Logger
-import app.revanced.patcher.logging.impl.NopLogger
-import java.io.File
-
-/**
- * Options for the [Patcher].
- * @param inputFile The input file (usually an apk file).
- * @param resourceCacheDirectory Directory to cache resources.
- * @param aaptPath Optional path to a custom aapt binary.
- * @param frameworkDirectory Optional path to a custom framework directory.
- * @param logger Custom logger implementation for the [Patcher].
- */
-data class PatcherOptions(
-    internal val inputFile: File,
-    internal val resourceCacheDirectory: String,
-    internal val aaptPath: String? = null,
-    internal val frameworkDirectory: String? = null,
-    internal val logger: Logger = NopLogger
-) {
-    fun recreateResourceCacheDirectory() = File(resourceCacheDirectory).also {
-        if (it.exists()) {
-            logger.info("Deleting existing resource cache directory")
-
-            if (!it.deleteRecursively())
-                logger.error("Failed to delete existing resource cache directory")
-        }
-
-        it.mkdirs()
-    }
-}

src/main/kotlin/app/revanced/patcher/PatcherResult.kt

@@ -1,16 +0,0 @@
-package app.revanced.patcher
-
-import app.revanced.patcher.util.dex.DexFile
-import java.io.File
-
-/**
- * The result of a patcher.
- * @param dexFiles The patched dex files.
- * @param doNotCompress List of relative paths to files to exclude from compressing.
- * @param resourceFile File containing resources that need to be extracted into the APK.
- */
-data class PatcherResult(
-    val dexFiles: List<DexFile>,
-    val doNotCompress: List<String>? = null,
-    val resourceFile: File?
-)

src/main/kotlin/app/revanced/patcher/annotation/CompatibilityAnnotation.kt

@@ -1,12 +1,15 @@
 package app.revanced.patcher.annotation
 
-import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.patch.base.Patch
+import app.revanced.patcher.signature.implementation.method.MethodSignature
 
 /**
- * Annotation to constrain a [Patch] to compatible packages.
- * @param compatiblePackages A list of packages a [Patch] is compatible with.
+ * Annotation to constrain a [Patch] or [MethodSignature] to compatible packages.
+ * @param compatiblePackages A list of packages a [Patch] or [MethodSignature] is compatible with.
  */
 @Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+@MustBeDocumented
 annotation class Compatibility(
     val compatiblePackages: Array<Package>,
 )
@@ -14,10 +17,12 @@ annotation class Compatibility(
 /**
  * Annotation to represent packages a patch can be compatible with.
  * @param name The package identifier name.
- * @param versions The versions of the package the [Patch] is compatible with.
+ * @param versions The versions of the package the [Patch] or [MethodSignature]is compatible with.
  */
 @Target()
+@Retention(AnnotationRetention.RUNTIME)
+@MustBeDocumented
 annotation class Package(
     val name: String,
-    val versions: Array<String> = [],
-)
+    val versions: Array<String>
+)

src/main/kotlin/app/revanced/patcher/annotation/MetadataAnnotation.kt

@@ -1,32 +1,38 @@
 package app.revanced.patcher.annotation
 
-import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.patch.base.Patch
+import app.revanced.patcher.signature.implementation.method.MethodSignature
 
 /**
- * Annotation to name a [Patch].
- * @param name A suggestive name for the [Patch].
+ * Annotation to name a [Patch] or [MethodSignature].
+ * @param name A suggestive name for the [Patch] or [MethodSignature].
  */
 @Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+@MustBeDocumented
 annotation class Name(
     val name: String,
 )
 
 /**
- * Annotation to describe a [Patch].
- * @param description A description for the [Patch].
+ * Annotation to describe a [Patch] or [MethodSignature].
+ * @param description A description for the [Patch] or [MethodSignature].
  */
 @Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+@MustBeDocumented
 annotation class Description(
     val description: String,
 )
 
 
 /**
- * Annotation to version a [Patch].
- * @param version The version of a [Patch].
+ * Annotation to version a [Patch] or [MethodSignature].
+ * @param version The version of a [Patch] or [MethodSignature].
  */
 @Target(AnnotationTarget.CLASS)
-@Deprecated("This annotation is deprecated and will be removed in a future release.")
+@Retention(AnnotationRetention.RUNTIME)
+@MustBeDocumented
 annotation class Version(
     val version: String,
 )

src/main/kotlin/app/revanced/patcher/data/Context.kt

@@ -1,170 +0,0 @@
-package app.revanced.patcher.data
-
-import app.revanced.patcher.util.ProxyBackedClassList
-import app.revanced.patcher.util.method.MethodWalker
-import com.android.tools.smali.dexlib2.iface.ClassDef
-import com.android.tools.smali.dexlib2.iface.Method
-import org.w3c.dom.Document
-import java.io.Closeable
-import java.io.File
-import java.io.InputStream
-import java.io.OutputStream
-import javax.xml.parsers.DocumentBuilderFactory
-import javax.xml.transform.TransformerFactory
-import javax.xml.transform.dom.DOMSource
-import javax.xml.transform.stream.StreamResult
-
-/**
- * A common interface to constrain [Context] to [BytecodeContext] and [ResourceContext].
- */
-
-sealed interface Context
-
-class BytecodeContext internal constructor(classes: MutableList<ClassDef>) : Context {
-    /**
-     * The list of classes.
-     */
-    val classes = ProxyBackedClassList(classes)
-
-    /**
-     * Find a class by a given class name.
-     *
-     * @param className The name of the class.
-     * @return A proxy for the first class that matches the class name.
-     */
-    fun findClass(className: String) = findClass { it.type.contains(className) }
-
-    /**
-     * Find a class by a given predicate.
-     *
-     * @param predicate A predicate to match the class.
-     * @return A proxy for the first class that matches the predicate.
-     */
-    fun findClass(predicate: (ClassDef) -> Boolean) =
-        // if we already proxied the class matching the predicate...
-        classes.proxies.firstOrNull { predicate(it.immutableClass) } ?:
-        // else resolve the class to a proxy and return it, if the predicate is matching a class
-        classes.find(predicate)?.let { proxy(it) }
-
-    fun proxy(classDef: ClassDef): app.revanced.patcher.util.proxy.ClassProxy {
-        var proxy = this.classes.proxies.find { it.immutableClass.type == classDef.type }
-        if (proxy == null) {
-            proxy = app.revanced.patcher.util.proxy.ClassProxy(classDef)
-            this.classes.add(proxy)
-        }
-        return proxy
-    }
-}
-
-/**
- * Create a [MethodWalker] instance for the current [BytecodeContext].
- *
- * @param startMethod The method to start at.
- * @return A [MethodWalker] instance.
- */
-fun BytecodeContext.toMethodWalker(startMethod: Method): MethodWalker {
-    return MethodWalker(this, startMethod)
-}
-
-internal inline fun <T> Iterable<T>.findIndexed(predicate: (T) -> Boolean): Pair<T, Int>? {
-    for ((index, element) in this.withIndex()) {
-        if (predicate(element)) {
-            return element to index
-        }
-    }
-    return null
-}
-
-class ResourceContext internal constructor(private val resourceCacheDirectory: File) : Context, Iterable<File> {
-    val xmlEditor = XmlFileHolder()
-
-    operator fun get(path: String) = resourceCacheDirectory.resolve(path)
-
-    override fun iterator() = resourceCacheDirectory.walkTopDown().iterator()
-
-    inner class XmlFileHolder {
-        operator fun get(inputStream: InputStream) =
-            DomFileEditor(inputStream)
-
-        operator fun get(path: String): DomFileEditor {
-            return DomFileEditor(this@ResourceContext[path])
-        }
-
-    }
-}
-
-/**
- * Wrapper for a file that can be edited as a dom document.
- *
- * This constructor does not check for locks to the file when writing.
- * Use the secondary constructor.
- *
- * @param inputStream the input stream to read the xml file from.
- * @param outputStream the output stream to write the xml file to. If null, the file will be read only.
- *
- */
-class DomFileEditor internal constructor(
-    private val inputStream: InputStream,
-    private val outputStream: Lazy<OutputStream>? = null,
-) : Closeable {
-    // path to the xml file to unlock the resource when closing the editor
-    private var filePath: String? = null
-    private var closed: Boolean = false
-
-    /**
-     * The document of the xml file
-     */
-    val file: Document = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(inputStream)
-        .also(Document::normalize)
-
-
-    // lazily open an output stream
-    // this is required because when constructing a DomFileEditor the output stream is created along with the input stream, which is not allowed
-    // the workaround is to lazily create the output stream. This way it would be used after the input stream is closed, which happens in the constructor
-    constructor(file: File) : this(file.inputStream(), lazy { file.outputStream() }) {
-        // increase the lock
-        locks.merge(file.path, 1, Integer::sum)
-        filePath = file.path
-    }
-
-    /**
-     * Closes the editor. Write backs and decreases the lock count.
-     *
-     * Will not write back to the file if the file is still locked.
-     */
-    override fun close() {
-        if (closed) return
-
-        inputStream.close()
-
-        // if the output stream is not null, do not close it
-        outputStream?.let {
-            // prevent writing to same file, if it is being locked
-            // isLocked will be false if the editor was created through a stream
-            val isLocked = filePath?.let { path ->
-                val isLocked = locks[path]!! > 1
-                // decrease the lock count if the editor was opened for a file
-                locks.merge(path, -1, Integer::sum)
-                isLocked
-            } ?: false
-
-            // if unlocked, write back to the file
-            if (!isLocked) {
-                it.value.use { stream ->
-                    val result = StreamResult(stream)
-                    TransformerFactory.newInstance().newTransformer().transform(DOMSource(file), result)
-                }
-
-                it.value.close()
-                return
-            }
-        }
-
-        closed = true
-    }
-
-    private companion object {
-        // map of concurrent open files
-        val locks = mutableMapOf<String, Int>()
-    }
-}

src/main/kotlin/app/revanced/patcher/data/PackageMetadata.kt

@@ -1,15 +0,0 @@
-package app.revanced.patcher.data
-
-import brut.androlib.apk.ApkInfo
-
-/**
- * Metadata about a package.
- */
-class PackageMetadata {
-    lateinit var packageName: String
-        internal set
-    lateinit var packageVersion: String
-        internal set
-
-    internal lateinit var apkInfo: ApkInfo
-}

src/main/kotlin/app/revanced/patcher/data/PatcherData.kt

@@ -0,0 +1,18 @@
+package app.revanced.patcher.data
+
+import app.revanced.patcher.data.base.Data
+import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.implementation.ResourceData
+import app.revanced.patcher.patch.base.Patch
+import org.jf.dexlib2.iface.ClassDef
+import java.io.File
+
+internal data class PatcherData(
+    val internalClasses: MutableList<ClassDef>,
+    val resourceCacheDirectory: String
+) {
+    internal val patches = mutableListOf<Patch<Data>>()
+
+    internal val bytecodeData = BytecodeData(patches, internalClasses)
+    internal val resourceData = ResourceData(File(resourceCacheDirectory))
+}

src/main/kotlin/app/revanced/patcher/data/base/Data.kt

@@ -0,0 +1,9 @@
+package app.revanced.patcher.data.base
+
+import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.implementation.ResourceData
+
+/**
+ * Constraint interface for [BytecodeData] and [ResourceData]
+ */
+interface Data

src/main/kotlin/app/revanced/patcher/data/implementation/BytecodeData.kt

@@ -0,0 +1,86 @@
+package app.revanced.patcher.data.implementation
+
+import app.revanced.patcher.data.base.Data
+import app.revanced.patcher.patch.base.Patch
+import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.signature.implementation.method.resolver.SignatureResolverResult
+import app.revanced.patcher.util.ProxyBackedClassList
+import app.revanced.patcher.util.method.MethodWalker
+import org.jf.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.Method
+
+class BytecodeData(
+    // FIXME: ugly solution due to design.
+    //  It does not make sense for a BytecodeData instance to have access to the patches
+    private val patches: List<Patch<Data>>,
+    internalClasses: MutableList<ClassDef>
+) : Data {
+    val classes = ProxyBackedClassList(internalClasses)
+
+    /**
+     * Find a class by a given class name
+     * @return A proxy for the first class that matches the class name
+     */
+    fun findClass(className: String) = findClass { it.type.contains(className) }
+
+    /**
+     * Find a class by a given predicate
+     * @return A proxy for the first class that matches the predicate
+     */
+    fun findClass(predicate: (ClassDef) -> Boolean): app.revanced.patcher.util.proxy.ClassProxy? {
+        // if we already proxied the class matching the predicate...
+        for (patch in patches) {
+            if (patch !is BytecodePatch) continue
+            for (signature in patch.signatures) {
+                val result = signature.result
+                result ?: continue
+
+                if (predicate(result.definingClassProxy.immutableClass)) return result.definingClassProxy  // ...then return that proxy
+            }
+        }
+        // else resolve the class to a proxy and return it, if the predicate is matching a class
+        return classes.find(predicate)?.let {
+            proxy(it)
+        }
+    }
+}
+
+
+class MethodMap : LinkedHashMap<String, SignatureResolverResult>() {
+    override fun get(key: String): SignatureResolverResult {
+        return super.get(key) ?: throw MethodNotFoundException("Method $key was not found in the method cache")
+    }
+}
+
+internal class MethodNotFoundException(s: String) : Exception(s)
+
+internal inline fun <reified T> Iterable<T>.find(predicate: (T) -> Boolean): T? {
+    for (element in this) {
+        if (predicate(element)) {
+            return element
+        }
+    }
+    return null
+}
+
+fun BytecodeData.toMethodWalker(startMethod: Method): MethodWalker {
+    return MethodWalker(this, startMethod)
+}
+
+internal inline fun <T> Iterable<T>.findIndexed(predicate: (T) -> Boolean): Pair<T, Int>? {
+    for ((index, element) in this.withIndex()) {
+        if (predicate(element)) {
+            return element to index
+        }
+    }
+    return null
+}
+
+fun BytecodeData.proxy(classDef: ClassDef): app.revanced.patcher.util.proxy.ClassProxy {
+    var proxy = this.classes.proxies.find { it.immutableClass.type == classDef.type }
+    if (proxy == null) {
+        proxy = app.revanced.patcher.util.proxy.ClassProxy(classDef)
+        this.classes.proxies.add(proxy)
+    }
+    return proxy
+}

src/main/kotlin/app/revanced/patcher/data/implementation/ResourceData.kt

@@ -0,0 +1,48 @@
+package app.revanced.patcher.data.implementation
+
+import app.revanced.patcher.data.base.Data
+import org.w3c.dom.Document
+import java.io.Closeable
+import java.io.File
+import javax.xml.XMLConstants
+import javax.xml.parsers.DocumentBuilderFactory
+import javax.xml.transform.TransformerFactory
+import javax.xml.transform.dom.DOMSource
+import javax.xml.transform.stream.StreamResult
+
+class ResourceData(private val resourceCacheDirectory: File) : Data {
+    private fun resolve(path: String) = resourceCacheDirectory.resolve(path)
+
+    fun forEach(action: (File) -> Unit) = resourceCacheDirectory.walkTopDown().forEach(action)
+    fun get(path: String) = resolve(path)
+
+    fun replace(path: String, oldValue: String, newValue: String, oldValueIsRegex: Boolean = false) {
+        // TODO: buffer this somehow
+        val content = resolve(path).readText()
+
+        if (oldValueIsRegex) {
+            content.replace(Regex(oldValue), newValue)
+            return
+        }
+    }
+
+    fun getXmlEditor(path: String) = DomFileEditor(resolve(path))
+}
+
+class DomFileEditor internal constructor(private val domFile: File) : Closeable {
+    val file: Document
+
+    init {
+        val factory = DocumentBuilderFactory.newInstance()
+        factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true)
+
+        val builder = factory.newDocumentBuilder()
+
+        // this will expectedly throw
+        file = builder.parse(domFile)
+        file.normalize()
+    }
+
+    override fun close() = TransformerFactory.newInstance().newTransformer()
+        .transform(DOMSource(file), StreamResult(domFile.outputStream()))
+}

src/main/kotlin/app/revanced/patcher/extensions/AnnotationExtensions.kt

@@ -1,33 +0,0 @@
-package app.revanced.patcher.extensions
-
-import kotlin.reflect.KClass
-
-internal object AnnotationExtensions {
-    /**
-     * Recursively find a given annotation on a class.
-     *
-     * @param targetAnnotation The annotation to find.
-     * @return The annotation.
-     */
-    fun <T : Annotation> Class<*>.findAnnotationRecursively(targetAnnotation: KClass<T>): T? {
-        fun <T : Annotation> Class<*>.findAnnotationRecursively(
-            targetAnnotation: Class<T>, traversed: MutableSet<Annotation>
-        ): T? {
-            val found = this.annotations.firstOrNull { it.annotationClass.java.name == targetAnnotation.name }
-
-            @Suppress("UNCHECKED_CAST") if (found != null) return found as T
-
-            for (annotation in this.annotations) {
-                if (traversed.contains(annotation)) continue
-                traversed.add(annotation)
-
-                return (annotation.annotationClass.java.findAnnotationRecursively(targetAnnotation, traversed))
-                    ?: continue
-            }
-
-            return null
-        }
-
-        return this.findAnnotationRecursively(targetAnnotation.java, mutableSetOf())
-    }
-}

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

@@ -1,33 +1,108 @@
 package app.revanced.patcher.extensions
 
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import com.android.tools.smali.dexlib2.AccessFlags
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.builder.BuilderInstruction
+import org.jf.dexlib2.builder.MutableMethodImplementation
+import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.iface.reference.MethodReference
+import org.jf.dexlib2.immutable.ImmutableMethod
+import org.jf.dexlib2.immutable.ImmutableMethodImplementation
+import org.jf.dexlib2.util.MethodUtil
 
 /**
- * Create a label for the instruction at given index.
- *
- * @param index The index to create the label for the instruction at.
- * @return The label.
+ * Recursively find a given annotation on a class
+ * @param targetAnnotation The annotation to find
+ * @return The annotation
  */
-fun MutableMethod.newLabel(index: Int) = implementation!!.newLabelForIndex(index)
+fun <T : Annotation> Class<*>.findAnnotationRecursively(targetAnnotation: Class<T>) =
+    this.findAnnotationRecursively(targetAnnotation, mutableSetOf())
 
-/**
- * Perform a bitwise OR operation between two [AccessFlags].
- *
- * @param other The other [AccessFlags] to perform the operation with.
- */
-infix fun AccessFlags.or(other: AccessFlags) = value or other.value
+private fun <T : Annotation> Class<*>.findAnnotationRecursively(
+    targetAnnotation: Class<T>,
+    traversed: MutableSet<Annotation>
+): T? {
+    val found = this.annotations.firstOrNull { it.annotationClass.java.name == targetAnnotation.name }
 
-/**
- * Perform a bitwise OR operation between an [AccessFlags] and an [Int].
- *
- * @param other The [Int] to perform the operation with.
- */
+    @Suppress("UNCHECKED_CAST")
+    if (found != null) return found as T
+
+    for (annotation in this.annotations) {
+        if (traversed.contains(annotation)) continue
+        traversed.add(annotation)
+
+        return (annotation.annotationClass.java.findAnnotationRecursively(targetAnnotation, traversed)) ?: continue
+    }
+
+    return null
+}
+
+infix fun AccessFlags.or(other: AccessFlags) = this.value or other.value
 infix fun Int.or(other: AccessFlags) = this or other.value
 
+fun MutableMethodImplementation.addInstructions(index: Int, instructions: List<BuilderInstruction>) {
+    for (i in instructions.lastIndex downTo 0) {
+        this.addInstruction(index, instructions[i])
+    }
+}
+
 /**
- * Perform a bitwise OR operation between an [Int] and an [AccessFlags].
- *
- * @param other The [AccessFlags] to perform the operation with.
+ * Clones the method.
+ * @param registerCount This parameter allows you to change the register count of the method.
+ * This may be a positive or negative number.
+ * @return The **immutable** cloned method. Call [toMutable] or [cloneMutable] to get a **mutable** copy.
  */
-infix fun AccessFlags.or(other: Int) = value or other
+internal fun Method.clone(
+    registerCount: Int = 0,
+): ImmutableMethod {
+    val clonedImplementation = implementation?.let {
+        ImmutableMethodImplementation(
+            it.registerCount + registerCount,
+            it.instructions,
+            it.tryBlocks,
+            it.debugItems,
+        )
+    }
+    return ImmutableMethod(
+        returnType,
+        name,
+        parameters,
+        returnType,
+        accessFlags,
+        annotations,
+        hiddenApiRestrictions,
+        clonedImplementation
+    )
+}
+
+/**
+ * Clones the method.
+ * @param registerCount This parameter allows you to change the register count of the method.
+ * This may be a positive or negative number.
+ * @return The **mutable** cloned method. Call [clone] to get an **immutable** copy.
+ */
+internal fun Method.cloneMutable(
+    registerCount: Int = 0,
+) = clone(registerCount).toMutable()
+
+internal fun Method.softCompareTo(
+    otherMethod: MethodReference
+): Boolean {
+    if (MethodUtil.isConstructor(this) && !parametersEqual(this.parameterTypes, otherMethod.parameterTypes))
+        return false
+    return this.name == otherMethod.name
+}
+
+// FIXME: also check the order of parameters as different order equals different method overload
+internal fun parametersEqual(
+    parameters1: Iterable<CharSequence>,
+    parameters2: Iterable<CharSequence>
+): Boolean {
+    return parameters1.count() == parameters2.count() && parameters1.all { parameter ->
+        parameters2.any {
+            it.startsWith(
+                parameter
+            )
+        }
+    }
+}

src/main/kotlin/app/revanced/patcher/extensions/InstructionExtensions.kt

@@ -1,331 +0,0 @@
-package app.revanced.patcher.extensions
-
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patcher.util.smali.toInstruction
-import app.revanced.patcher.util.smali.toInstructions
-import com.android.tools.smali.dexlib2.builder.BuilderInstruction
-import com.android.tools.smali.dexlib2.builder.BuilderOffsetInstruction
-import com.android.tools.smali.dexlib2.builder.Label
-import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
-import com.android.tools.smali.dexlib2.builder.instruction.*
-import com.android.tools.smali.dexlib2.iface.instruction.Instruction
-
-object InstructionExtensions {
-
-    /**
-     * Add instructions to a method at the given index.
-     *
-     * @param index The index to add the instructions at.
-     * @param instructions The instructions to add.
-     */
-    fun MutableMethodImplementation.addInstructions(
-        index: Int,
-        instructions: List<BuilderInstruction>
-    ) =
-        instructions.asReversed().forEach { addInstruction(index, it) }
-
-    /**
-     * Add instructions to a method.
-     * The instructions will be added at the end of the method.
-     *
-     * @param instructions The instructions to add.
-     */
-    fun MutableMethodImplementation.addInstructions(instructions: List<BuilderInstruction>) =
-        instructions.forEach { this.addInstruction(it) }
-
-    /**
-     * Remove instructions from a method at the given index.
-     *
-     * @param index The index to remove the instructions at.
-     * @param count The amount of instructions to remove.
-     */
-    fun MutableMethodImplementation.removeInstructions(index: Int, count: Int) = repeat(count) {
-        removeInstruction(index)
-    }
-
-    /**
-     * Remove the first instructions from a method.
-     *
-     * @param count The amount of instructions to remove.
-     */
-    fun MutableMethodImplementation.removeInstructions(count: Int) = removeInstructions(0, count)
-
-    /**
-     * Replace instructions at the given index with the given instructions.
-     * The amount of instructions to replace is the amount of instructions in the given list.
-     *
-     * @param index The index to replace the instructions at.
-     * @param instructions The instructions to replace the instructions with.
-     */
-    fun MutableMethodImplementation.replaceInstructions(index: Int, instructions: List<BuilderInstruction>) {
-        // Remove the instructions at the given index.
-        removeInstructions(index, instructions.size)
-
-        // Add the instructions at the given index.
-        addInstructions(index, instructions)
-    }
-
-    /**
-     * Add an instruction to a method at the given index.
-     *
-     * @param index The index to add the instruction at.
-     * @param instruction The instruction to add.
-     */
-    fun MutableMethod.addInstruction(index: Int, instruction: BuilderInstruction) =
-        implementation!!.addInstruction(index, instruction)
-
-    /**
-     * Add an instruction to a method.
-     *
-     * @param instruction The instructions to add.
-     */
-    fun MutableMethod.addInstruction(instruction: BuilderInstruction) =
-        implementation!!.addInstruction(instruction)
-
-    /**
-     * Add an instruction to a method at the given index.
-     *
-     * @param index The index to add the instruction at.
-     * @param smaliInstructions The instruction to add.
-     */
-    fun MutableMethod.addInstruction(index: Int, smaliInstructions: String) =
-        implementation!!.addInstruction(index, smaliInstructions.toInstruction(this))
-
-    /**
-     * Add an instruction to a method.
-     *
-     * @param smaliInstructions The instruction to add.
-     */
-    fun MutableMethod.addInstruction(smaliInstructions: String) =
-        implementation!!.addInstruction(smaliInstructions.toInstruction(this))
-
-
-    /**
-     * Add instructions to a method at the given index.
-     *
-     * @param index The index to add the instructions at.
-     * @param instructions The instructions to add.
-     */
-    fun MutableMethod.addInstructions(index: Int, instructions: List<BuilderInstruction>) =
-        implementation!!.addInstructions(index, instructions)
-
-    /**
-     * Add instructions to a method.
-     *
-     * @param instructions The instructions to add.
-     */
-    fun MutableMethod.addInstructions(instructions: List<BuilderInstruction>) =
-        implementation!!.addInstructions(instructions)
-
-    /**
-     * Add instructions to a method.
-     *
-     * @param smaliInstructions The instructions to add.
-     */
-    fun MutableMethod.addInstructions(index: Int, smaliInstructions: String) =
-        implementation!!.addInstructions(index, smaliInstructions.toInstructions(this))
-
-    /**
-     * Add instructions to a method.
-     *
-     * @param smaliInstructions The instructions to add.
-     */
-    fun MutableMethod.addInstructions(smaliInstructions: String) =
-        implementation!!.addInstructions(smaliInstructions.toInstructions(this))
-
-    /**
-     * Add instructions to a method at the given index.
-     *
-     * @param index The index to add the instructions at.
-     * @param smaliInstructions The instructions to add.
-     * @param externalLabels A list of [ExternalLabel] for instructions outside of [smaliInstructions].
-     */
-// Special function for adding instructions with external labels.
-    fun MutableMethod.addInstructionsWithLabels(
-        index: Int,
-        smaliInstructions: String,
-        vararg externalLabels: ExternalLabel
-    ) {
-        // Create reference dummy instructions for the instructions.
-        val nopSmali = StringBuilder(smaliInstructions).also { builder ->
-            externalLabels.forEach { (name, _) ->
-                builder.append("\n:$name\nnop")
-            }
-        }.toString()
-
-        // Compile the instructions with the dummy labels
-        val compiledInstructions = nopSmali.toInstructions(this)
-
-        // Add the compiled list of instructions to the method.
-        addInstructions(
-            index,
-            compiledInstructions.subList(0, compiledInstructions.size - externalLabels.size)
-        )
-
-        implementation!!.apply {
-            this@apply.instructions.subList(index, index + compiledInstructions.size - externalLabels.size)
-                .forEachIndexed { compiledInstructionIndex, compiledInstruction ->
-                    // If the compiled instruction is not an offset instruction, skip it.
-                    if (compiledInstruction !is BuilderOffsetInstruction) return@forEachIndexed
-
-                    /**
-                     * Creates a new label for the instruction
-                     * and replaces it with the label of the [compiledInstruction] at [compiledInstructionIndex].
-                     */
-                    fun Instruction.makeNewLabel() {
-                        fun replaceOffset(
-                            i: BuilderOffsetInstruction, label: Label
-                        ): BuilderOffsetInstruction {
-                            return when (i) {
-                                is BuilderInstruction10t -> BuilderInstruction10t(i.opcode, label)
-                                is BuilderInstruction20t -> BuilderInstruction20t(i.opcode, label)
-                                is BuilderInstruction21t -> BuilderInstruction21t(i.opcode, i.registerA, label)
-                                is BuilderInstruction22t -> BuilderInstruction22t(
-                                    i.opcode,
-                                    i.registerA,
-                                    i.registerB,
-                                    label
-                                )
-                                is BuilderInstruction30t -> BuilderInstruction30t(i.opcode, label)
-                                is BuilderInstruction31t -> BuilderInstruction31t(i.opcode, i.registerA, label)
-                                else -> throw IllegalStateException(
-                                    "A non-offset instruction was given, this should never happen!"
-                                )
-                            }
-                        }
-
-                        // Create the final label.
-                        val label = newLabelForIndex(this@apply.instructions.indexOf(this))
-
-                        // Create the final instruction with the new label.
-                        val newInstruction = replaceOffset(
-                            compiledInstruction, label
-                        )
-
-                        // Replace the instruction pointing to the dummy label
-                        // with the new instruction pointing to the real instruction.
-                        replaceInstruction(index + compiledInstructionIndex, newInstruction)
-                    }
-
-                    // If the compiled instruction targets its own instruction,
-                    // which means it points to some of its own, simply an offset has to be applied.
-                    val labelIndex = compiledInstruction.target.location.index
-                    if (labelIndex < compiledInstructions.size - externalLabels.size) {
-                        // Get the targets index (insertion index + the index of the dummy instruction).
-                        this.instructions[index + labelIndex].makeNewLabel()
-                        return@forEachIndexed
-                    }
-
-                    // Since the compiled instruction points to a dummy instruction,
-                    // we can find the real instruction which it was created for by calculation.
-
-                    // Get the index of the instruction in the externalLabels list
-                    // which the dummy instruction was created for.
-                    // This works because we created the dummy instructions in the same order as the externalLabels list.
-                    val (_, instruction) = externalLabels[(compiledInstructions.size - 1) - labelIndex]
-                    instruction.makeNewLabel()
-                }
-        }
-    }
-
-    /**
-     * Remove an instruction at the given index.
-     *
-     * @param index The index to remove the instruction at.
-     */
-    fun MutableMethod.removeInstruction(index: Int) =
-        implementation!!.removeInstruction(index)
-
-    /**
-     * Remove instructions at the given index.
-     *
-     * @param index The index to remove the instructions at.
-     * @param count The amount of instructions to remove.
-     */
-    fun MutableMethod.removeInstructions(index: Int, count: Int) =
-        implementation!!.removeInstructions(index, count)
-
-    /**
-     * Remove instructions at the given index.
-     *
-     * @param count The amount of instructions to remove.
-     */
-    fun MutableMethod.removeInstructions(count: Int) =
-        implementation!!.removeInstructions(count)
-
-    /**
-     * Replace an instruction at the given index.
-     *
-     * @param index The index to replace the instruction at.
-     * @param instruction The instruction to replace the instruction with.
-     */
-    fun MutableMethod.replaceInstruction(index: Int, instruction: BuilderInstruction) =
-        implementation!!.replaceInstruction(index, instruction)
-
-    /**
-     * Replace an instruction at the given index.
-     *
-     * @param index The index to replace the instruction at.
-     * @param smaliInstruction The smali instruction to replace the instruction with.
-     */
-    fun MutableMethod.replaceInstruction(index: Int, smaliInstruction: String) =
-        implementation!!.replaceInstruction(index, smaliInstruction.toInstruction(this))
-
-    /**
-     * Replace instructions at the given index.
-     *
-     * @param index The index to replace the instructions at.
-     * @param instructions The instructions to replace the instructions with.
-     */
-    fun MutableMethod.replaceInstructions(index: Int, instructions: List<BuilderInstruction>) =
-        implementation!!.replaceInstructions(index, instructions)
-
-    /**
-     * Replace instructions at the given index.
-     *
-     * @param index The index to replace the instructions at.
-     * @param smaliInstructions The smali instructions to replace the instructions with.
-     */
-    fun MutableMethod.replaceInstructions(index: Int, smaliInstructions: String) =
-        implementation!!.replaceInstructions(index, smaliInstructions.toInstructions(this))
-
-    /**
-     * Get an instruction at the given index.
-     *
-     * @param index The index to get the instruction at.
-     * @return The instruction.
-     */
-    fun MutableMethodImplementation.getInstruction(index: Int): BuilderInstruction = instructions[index]
-
-    /**
-     * Get an instruction at the given index.
-     *
-     * @param index The index to get the instruction at.
-     * @param T The type of instruction to return.
-     * @return The instruction.
-     */
-    @Suppress("UNCHECKED_CAST")
-    fun <T> MutableMethodImplementation.getInstruction(index: Int): T = getInstruction(index) as T
-
-    /**
-     * Get an instruction at the given index.
-     * @param index The index to get the instruction at.
-     * @return The instruction.
-     */
-    fun MutableMethod.getInstruction(index: Int): BuilderInstruction = implementation!!.getInstruction(index)
-
-    /**
-     * Get an instruction at the given index.
-     * @param index The index to get the instruction at.
-     * @param T The type of instruction to return.
-     * @return The instruction.
-     */
-    fun <T> MutableMethod.getInstruction(index: Int): T = implementation!!.getInstruction<T>(index)
-
-    /**
-     * Get the instructions of a method.
-     * @return The instructions.
-     */
-    fun MutableMethod.getInstructions(): MutableList<BuilderInstruction> = implementation!!.instructions
-}

src/main/kotlin/app/revanced/patcher/extensions/MethodFingerprintExtensions.kt

@@ -1,20 +0,0 @@
-package app.revanced.patcher.extensions
-
-import app.revanced.patcher.extensions.AnnotationExtensions.findAnnotationRecursively
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-object MethodFingerprintExtensions {
-
-    /**
-     * The name of a [MethodFingerprint].
-     */
-    val MethodFingerprint.name: String
-        get() = this.javaClass.simpleName
-
-    /**
-     * The [FuzzyPatternScanMethod] annotation of a [MethodFingerprint].
-     */
-    val MethodFingerprint.fuzzyPatternScanMethod
-        get() = javaClass.findAnnotationRecursively(FuzzyPatternScanMethod::class)
-}

src/main/kotlin/app/revanced/patcher/extensions/PatchExtensions.kt

@@ -1,72 +0,0 @@
-package app.revanced.patcher.extensions
-
-import app.revanced.patcher.annotation.Compatibility
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.Context
-import app.revanced.patcher.extensions.AnnotationExtensions.findAnnotationRecursively
-import app.revanced.patcher.patch.OptionsContainer
-import app.revanced.patcher.patch.Patch
-import app.revanced.patcher.patch.PatchOptions
-import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.RequiresIntegrations
-import kotlin.reflect.KVisibility
-import kotlin.reflect.full.companionObject
-import kotlin.reflect.full.companionObjectInstance
-
-object PatchExtensions {
-    /**
-     * The name of a [Patch].
-     */
-    val Class<out Patch<Context>>.patchName: String
-        get() = findAnnotationRecursively(Name::class)?.name ?: this.simpleName
-
-    /**
-     * The version of a [Patch].
-     */
-    @Deprecated("This property is deprecated and will be removed in a future release.")
-    val Class<out Patch<Context>>.version
-        get() = findAnnotationRecursively(Version::class)?.version
-
-    /**
-     * Weather or not a [Patch] should be included.
-     */
-    val Class<out Patch<Context>>.include
-        get() = findAnnotationRecursively(app.revanced.patcher.patch.annotations.Patch::class)!!.include
-
-    /**
-     * The description of a [Patch].
-     */
-    val Class<out Patch<Context>>.description
-        get() = findAnnotationRecursively(Description::class)?.description
-
-    /**
-     * The dependencies of a [Patch].
-     */
-    val Class<out Patch<Context>>.dependencies
-        get() = findAnnotationRecursively(DependsOn::class)?.dependencies
-
-    /**
-     * The packages a [Patch] is compatible with.
-     */
-    val Class<out Patch<Context>>.compatiblePackages
-        get() = findAnnotationRecursively(Compatibility::class)?.compatiblePackages
-
-    /**
-     * Weather or not a [Patch] requires integrations.
-     */
-    internal val Class<out Patch<Context>>.requiresIntegrations
-        get() = findAnnotationRecursively(RequiresIntegrations::class) != null
-
-    /**
-     * The options of a [Patch].
-     */
-    val Class<out Patch<Context>>.options: PatchOptions?
-        get() = kotlin.companionObject?.let { cl ->
-            if (cl.visibility != KVisibility.PUBLIC) return null
-            kotlin.companionObjectInstance?.let {
-                (it as? OptionsContainer)?.options
-            }
-        }
-}

src/main/kotlin/app/revanced/patcher/fingerprint/Fingerprint.kt

@@ -1,9 +0,0 @@
-package app.revanced.patcher.fingerprint
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-/**
- * A ReVanced fingerprint.
- * Can be a [MethodFingerprint].
- */
-interface Fingerprint

src/main/kotlin/app/revanced/patcher/fingerprint/method/annotation/MethodFingerprintMetadata.kt

@@ -1,12 +0,0 @@
-package app.revanced.patcher.fingerprint.method.annotation
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-
-/**
- * Annotations to scan a pattern [MethodFingerprint] with fuzzy algorithm.
- * @param threshold if [threshold] or more of the opcodes do not match, skip.
- */
-@Target(AnnotationTarget.CLASS)
-annotation class FuzzyPatternScanMethod(
-    val threshold: Int = 1
-)

src/main/kotlin/app/revanced/patcher/fingerprint/method/impl/MethodFingerprint.kt

@@ -1,513 +0,0 @@
-package app.revanced.patcher.fingerprint.method.impl
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.MethodFingerprintExtensions.fuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.Fingerprint
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.patch.PatchResultError
-import app.revanced.patcher.util.proxy.ClassProxy
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.ClassDef
-import com.android.tools.smali.dexlib2.iface.Method
-import com.android.tools.smali.dexlib2.iface.instruction.Instruction
-import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
-import com.android.tools.smali.dexlib2.iface.reference.StringReference
-import com.android.tools.smali.dexlib2.util.MethodUtil
-import java.util.*
-
-private typealias StringMatch = MethodFingerprintResult.MethodFingerprintScanResult.StringsScanResult.StringMatch
-private typealias StringsScanResult = MethodFingerprintResult.MethodFingerprintScanResult.StringsScanResult
-private typealias MethodClassPair = Pair<Method, ClassDef>
-
-/**
- * A fingerprint to resolve methods.
- *
- * @param returnType The method's return type compared using [String.startsWith].
- * @param accessFlags The method's exact access flags using values of [AccessFlags].
- * @param parameters The parameters of the method. Partial matches allowed and follow the same rules as [returnType].
- * @param opcodes An opcode pattern of the method's instructions. Wildcard or unknown opcodes can be specified by `null`.
- * @param strings A list of the method's strings compared each using [String.contains].
- * @param customFingerprint A custom condition for this fingerprint.
- */
-abstract class MethodFingerprint(
-    internal val returnType: String? = null,
-    internal val accessFlags: Int? = null,
-    internal val parameters: Iterable<String>? = null,
-    internal val opcodes: Iterable<Opcode?>? = null,
-    internal val strings: Iterable<String>? = null,
-    internal val customFingerprint: ((methodDef: Method, classDef: ClassDef) -> Boolean)? = null
-) : Fingerprint {
-    /**
-     * The result of the [MethodFingerprint].
-     */
-    var result: MethodFingerprintResult? = null
-
-    companion object {
-        /**
-         * A list of methods and the class they were found in.
-         */
-        private val methods = mutableListOf<MethodClassPair>()
-
-        /**
-         * Lookup map for methods keyed to the methods access flags, return type and parameter.
-         */
-        private val methodSignatureLookupMap = mutableMapOf<String, MutableList<MethodClassPair>>()
-
-        /**
-         * Lookup map for methods keyed to the strings contained in the method.
-         */
-        private val methodStringsLookupMap = mutableMapOf<String, MutableList<MethodClassPair>>()
-
-        /**
-         * Appends a string based on the parameter reference types of this method.
-         */
-        private fun StringBuilder.appendParameters(parameters: Iterable<CharSequence>) {
-            // Maximum parameters to use in the signature key.
-            // Some apps have methods with an incredible number of parameters (over 100 parameters have been seen).
-            // To keep the signature map from becoming needlessly bloated,
-            // group together in the same map entry all methods with the same access/return and 5 or more parameters.
-            // The value of 5 was chosen based on local performance testing and is not set in stone.
-            val maxSignatureParameters = 5
-            // Must append a unique value before the parameters to distinguish this key includes the parameters.
-            // If this is not appended, then methods with no parameters
-            // will collide with different keys that specify access/return but omit the parameters.
-            append("p:")
-            parameters.forEachIndexed { index, parameter ->
-                if (index >= maxSignatureParameters) return
-                append(parameter.first())
-            }
-        }
-
-        /**
-         * Initializes lookup maps for [MethodFingerprint] resolution
-         * using attributes of methods such as the method signature or strings.
-         *
-         * @param context The [BytecodeContext] containing the classes to initialize the lookup maps with.
-         */
-        internal fun initializeFingerprintResolutionLookupMaps(context: BytecodeContext) {
-            fun MutableMap<String, MutableList<MethodClassPair>>.add(
-                key: String,
-                methodClassPair: MethodClassPair
-            ) {
-                var methodClassPairs = this[key]
-
-                methodClassPairs ?: run {
-                    methodClassPairs = LinkedList<MethodClassPair>().also { this[key] = it }
-                }
-
-                methodClassPairs!!.add(methodClassPair)
-            }
-
-            if (methods.isNotEmpty()) MethodFingerprint.clearFingerprintResolutionLookupMaps()
-
-            context.classes.classes.forEach { classDef ->
-                classDef.methods.forEach { method ->
-                    val methodClassPair = method to classDef
-
-                    // For fingerprints with no access or return type specified.
-                    methods += methodClassPair
-
-                    val accessFlagsReturnKey = method.accessFlags.toString() + method.returnType.first()
-
-                    // Add <access><returnType> as the key.
-                    methodSignatureLookupMap.add(accessFlagsReturnKey, methodClassPair)
-
-                    // Add <access><returnType>[parameters] as the key.
-                    methodSignatureLookupMap.add(
-                        buildString {
-                            append(accessFlagsReturnKey)
-                            appendParameters(method.parameterTypes)
-                        },
-                        methodClassPair
-                    )
-
-                    // Add strings contained in the method as the key.
-                    method.implementation?.instructions?.forEach instructions@{ instruction ->
-                        if (instruction.opcode != Opcode.CONST_STRING && instruction.opcode != Opcode.CONST_STRING_JUMBO)
-                            return@instructions
-
-                        val string = ((instruction as ReferenceInstruction).reference as StringReference).string
-
-                        methodStringsLookupMap.add(string, methodClassPair)
-                    }
-
-                    // In the future, the class type could be added to the lookup map.
-                    // This would require MethodFingerprint to be changed to include the class type.
-                }
-            }
-        }
-
-        /**
-         * Clears the internal lookup maps created in [initializeFingerprintResolutionLookupMaps]
-         */
-        internal fun clearFingerprintResolutionLookupMaps() {
-            methods.clear()
-            methodSignatureLookupMap.clear()
-            methodStringsLookupMap.clear()
-        }
-
-        /**
-         * Resolve a list of [MethodFingerprint] using the lookup map built by [initializeFingerprintResolutionLookupMaps].
-         *
-         * [MethodFingerprint] resolution is fast, but if many are present they can consume a noticeable
-         * amount of time because they are resolved in sequence.
-         *
-         * For apps with many fingerprints, resolving performance can be improved by:
-         * - Slowest: Specify [opcodes] and nothing else.
-         * - Fast: Specify [accessFlags], [returnType].
-         * - Faster: Specify [accessFlags], [returnType] and [parameters].
-         * - Fastest: Specify [strings], with at least one string being an exact (non-partial) match.
-         */
-        internal fun Iterable<MethodFingerprint>.resolveUsingLookupMap(context: BytecodeContext) {
-            if (methods.isEmpty()) throw PatchResultError("lookup map not initialized")
-
-            for (fingerprint in this) {
-                fingerprint.resolveUsingLookupMap(context)
-            }
-        }
-
-        /**
-         * Resolve a [MethodFingerprint] using the lookup map built by [initializeFingerprintResolutionLookupMaps].
-         *
-         * [MethodFingerprint] resolution is fast, but if many are present they can consume a noticeable
-         * amount of time because they are resolved in sequence.
-         *
-         * For apps with many fingerprints, resolving performance can be improved by:
-         * - Slowest: Specify [opcodes] and nothing else.
-         * - Fast: Specify [accessFlags], [returnType].
-         * - Faster: Specify [accessFlags], [returnType] and [parameters].
-         * - Fastest: Specify [strings], with at least one string being an exact (non-partial) match.
-         */
-        internal fun MethodFingerprint.resolveUsingLookupMap(context: BytecodeContext): Boolean {
-            /**
-             * Lookup [MethodClassPair]s that match the methods strings present in a [MethodFingerprint].
-             *
-             * @return A list of [MethodClassPair]s that match the methods strings present in a [MethodFingerprint].
-             */
-            fun MethodFingerprint.methodStringsLookup(): List<MethodClassPair>? {
-                strings?.forEach {
-                    val methods = methodStringsLookupMap[it]
-                    if (methods != null) return methods
-                }
-                return null
-            }
-
-            /**
-             * Lookup [MethodClassPair]s that match the method signature present in a [MethodFingerprint].
-             *
-             * @return A list of [MethodClassPair]s that match the method signature present in a [MethodFingerprint].
-             */
-            fun MethodFingerprint.methodSignatureLookup(): List<MethodClassPair> {
-                if (accessFlags == null) return methods
-
-                var returnTypeValue = returnType
-                if (returnTypeValue == null) {
-                    if (AccessFlags.CONSTRUCTOR.isSet(accessFlags)) {
-                        // Constructors always have void return type
-                        returnTypeValue = "V"
-                    } else {
-                        return methods
-                    }
-                }
-
-                val key = buildString {
-                    append(accessFlags)
-                    append(returnTypeValue.first())
-                    if (parameters != null) appendParameters(parameters)
-                }
-                return methodSignatureLookupMap[key] ?: return emptyList()
-            }
-
-            /**
-             * Resolve a [MethodFingerprint] using a list of [MethodClassPair].
-             *
-             * @return True if the resolution was successful, false otherwise.
-             */
-            fun MethodFingerprint.resolveUsingMethodClassPair(classMethods: Iterable<MethodClassPair>): Boolean {
-                classMethods.forEach { classAndMethod ->
-                    if (resolve(context, classAndMethod.first, classAndMethod.second)) return true
-                }
-                return false
-            }
-
-            val methodsWithSameStrings = methodStringsLookup()
-            if (methodsWithSameStrings != null) if (resolveUsingMethodClassPair(methodsWithSameStrings)) return true
-
-            // No strings declared or none matched (partial matches are allowed).
-            // Use signature matching.
-            return resolveUsingMethodClassPair(methodSignatureLookup())
-        }
-
-        /**
-         * Resolve a list of [MethodFingerprint] against a list of [ClassDef].
-         *
-         * @param classes The classes on which to resolve the [MethodFingerprint] in.
-         * @param context The [BytecodeContext] to host proxies.
-         * @return True if the resolution was successful, false otherwise.
-         */
-        fun Iterable<MethodFingerprint>.resolve(context: BytecodeContext, classes: Iterable<ClassDef>) {
-            for (fingerprint in this) // For each fingerprint...
-                classes@ for (classDef in classes) // ...search through all classes for the MethodFingerprint
-                    if (fingerprint.resolve(context, classDef))
-                        break@classes // ...if the resolution succeeded, continue with the next MethodFingerprint.
-        }
-
-        /**
-         * Resolve a [MethodFingerprint] against a [ClassDef].
-         *
-         * @param forClass The class on which to resolve the [MethodFingerprint] in.
-         * @param context The [BytecodeContext] to host proxies.
-         * @return True if the resolution was successful, false otherwise.
-         */
-        fun MethodFingerprint.resolve(context: BytecodeContext, forClass: ClassDef): Boolean {
-            for (method in forClass.methods)
-                if (this.resolve(context, method, forClass))
-                    return true
-            return false
-        }
-
-        /**
-         * Resolve a [MethodFingerprint] against a [Method].
-         *
-         * @param method The class on which to resolve the [MethodFingerprint] in.
-         * @param forClass The class on which to resolve the [MethodFingerprint].
-         * @param context The [BytecodeContext] to host proxies.
-         * @return True if the resolution was successful or if the fingerprint is already resolved, false otherwise.
-         */
-        fun MethodFingerprint.resolve(context: BytecodeContext, method: Method, forClass: ClassDef): Boolean {
-            val methodFingerprint = this
-
-            if (methodFingerprint.result != null) return true
-
-            if (methodFingerprint.returnType != null && !method.returnType.startsWith(methodFingerprint.returnType))
-                return false
-
-            if (methodFingerprint.accessFlags != null && methodFingerprint.accessFlags != method.accessFlags)
-                return false
-
-
-            fun parametersEqual(
-                parameters1: Iterable<CharSequence>, parameters2: Iterable<CharSequence>
-            ): Boolean {
-                if (parameters1.count() != parameters2.count()) return false
-                val iterator1 = parameters1.iterator()
-                parameters2.forEach {
-                    if (!it.startsWith(iterator1.next())) return false
-                }
-                return true
-            }
-
-            if (methodFingerprint.parameters != null && !parametersEqual(
-                    methodFingerprint.parameters, // TODO: parseParameters()
-                    method.parameterTypes
-                )
-            ) return false
-
-            @Suppress("UNNECESSARY_NOT_NULL_ASSERTION")
-            if (methodFingerprint.customFingerprint != null && !methodFingerprint.customFingerprint!!(method, forClass))
-                return false
-
-            val stringsScanResult: StringsScanResult? =
-                if (methodFingerprint.strings != null) {
-                    StringsScanResult(
-                        buildList {
-                            val implementation = method.implementation ?: return false
-
-                            val stringsList = methodFingerprint.strings.toMutableList()
-
-                            implementation.instructions.forEachIndexed { instructionIndex, instruction ->
-                                if (
-                                    instruction.opcode != Opcode.CONST_STRING &&
-                                    instruction.opcode != Opcode.CONST_STRING_JUMBO
-                                ) return@forEachIndexed
-
-                                val string = ((instruction as ReferenceInstruction).reference as StringReference).string
-                                val index = stringsList.indexOfFirst(string::contains)
-                                if (index == -1) return@forEachIndexed
-
-                                add(
-                                    StringMatch(
-                                        string,
-                                        instructionIndex
-                                    )
-                                )
-                                stringsList.removeAt(index)
-                            }
-
-                            if (stringsList.isNotEmpty()) return false
-                        }
-                    )
-                } else null
-
-            val patternScanResult = if (methodFingerprint.opcodes != null) {
-                method.implementation?.instructions ?: return false
-
-                fun Method.patternScan(
-                    fingerprint: MethodFingerprint
-                ): MethodFingerprintResult.MethodFingerprintScanResult.PatternScanResult? {
-                    val instructions = this.implementation!!.instructions
-                    val fingerprintFuzzyPatternScanThreshold = fingerprint.fuzzyPatternScanMethod?.threshold ?: 0
-
-                    val pattern = fingerprint.opcodes!!
-                    val instructionLength = instructions.count()
-                    val patternLength = pattern.count()
-
-                    for (index in 0 until instructionLength) {
-                        var patternIndex = 0
-                        var threshold = fingerprintFuzzyPatternScanThreshold
-
-                        while (index + patternIndex < instructionLength) {
-                            val originalOpcode = instructions.elementAt(index + patternIndex).opcode
-                            val patternOpcode = pattern.elementAt(patternIndex)
-
-                            if (patternOpcode != null && patternOpcode.ordinal != originalOpcode.ordinal) {
-                                // reaching maximum threshold (0) means,
-                                // the pattern does not match to the current instructions
-                                if (threshold-- == 0) break
-                            }
-
-                            if (patternIndex < patternLength - 1) {
-                                // if the entire pattern has not been scanned yet
-                                // continue the scan
-                                patternIndex++
-                                continue
-                            }
-                            // the pattern is valid, generate warnings if fuzzyPatternScanMethod is FuzzyPatternScanMethod
-                            val result =
-                                MethodFingerprintResult.MethodFingerprintScanResult.PatternScanResult(
-                                    index,
-                                    index + patternIndex
-                                )
-                            if (fingerprint.fuzzyPatternScanMethod !is FuzzyPatternScanMethod) return result
-                            result.warnings = result.createWarnings(pattern, instructions)
-
-                            return result
-                        }
-                    }
-
-                    return null
-                }
-
-                method.patternScan(methodFingerprint) ?: return false
-            } else null
-
-            methodFingerprint.result = MethodFingerprintResult(
-                method,
-                forClass,
-                MethodFingerprintResult.MethodFingerprintScanResult(
-                    patternScanResult,
-                    stringsScanResult
-                ),
-                context
-            )
-
-            return true
-        }
-
-        private fun MethodFingerprintResult.MethodFingerprintScanResult.PatternScanResult.createWarnings(
-            pattern: Iterable<Opcode?>, instructions: Iterable<Instruction>
-        ) = buildList {
-            for ((patternIndex, instructionIndex) in (this@createWarnings.startIndex until this@createWarnings.endIndex).withIndex()) {
-                val originalOpcode = instructions.elementAt(instructionIndex).opcode
-                val patternOpcode = pattern.elementAt(patternIndex)
-
-                if (patternOpcode == null || patternOpcode.ordinal == originalOpcode.ordinal) continue
-
-                this.add(
-                    MethodFingerprintResult.MethodFingerprintScanResult.PatternScanResult.Warning(
-                        originalOpcode,
-                        patternOpcode,
-                        instructionIndex,
-                        patternIndex
-                    )
-                )
-            }
-        }
-    }
-}
-
-/**
- * Represents the result of a [MethodFingerprintResult].
- *
- * @param method The matching method.
- * @param classDef The [ClassDef] that contains the matching [method].
- * @param scanResult The result of scanning for the [MethodFingerprint].
- * @param context The [BytecodeContext] this [MethodFingerprintResult] is attached to, to create proxies.
- */
-data class MethodFingerprintResult(
-    val method: Method,
-    val classDef: ClassDef,
-    val scanResult: MethodFingerprintScanResult,
-    internal val context: BytecodeContext
-) {
-    /**
-     * Returns a mutable clone of [classDef]
-     *
-     * Please note, this method allocates a [ClassProxy].
-     * Use [classDef] where possible.
-     */
-    @Suppress("MemberVisibilityCanBePrivate")
-    val mutableClass by lazy { context.proxy(classDef).mutableClass }
-
-    /**
-     * Returns a mutable clone of [method]
-     *
-     * Please note, this method allocates a [ClassProxy].
-     * Use [method] where possible.
-     */
-    val mutableMethod by lazy {
-        mutableClass.methods.first {
-            MethodUtil.methodSignaturesMatch(it, this.method)
-        }
-    }
-
-    /**
-     * The result of scanning on the [MethodFingerprint].
-     * @param patternScanResult The result of the pattern scan.
-     * @param stringsScanResult The result of the string scan.
-     */
-    data class MethodFingerprintScanResult(
-        val patternScanResult: PatternScanResult?,
-        val stringsScanResult: StringsScanResult?
-    ) {
-        /**
-         * The result of scanning strings on the [MethodFingerprint].
-         * @param matches The list of strings that were matched.
-         */
-        data class StringsScanResult(val matches: List<StringMatch>) {
-            /**
-             * Represents a match for a string at an index.
-             * @param string The string that was matched.
-             * @param index The index of the string.
-             */
-            data class StringMatch(val string: String, val index: Int)
-        }
-
-        /**
-         * The result of a pattern scan.
-         * @param startIndex The start index of the instructions where to which this pattern matches.
-         * @param endIndex The end index of the instructions where to which this pattern matches.
-         * @param warnings A list of warnings considering this [PatternScanResult].
-         */
-        data class PatternScanResult(
-            val startIndex: Int,
-            val endIndex: Int,
-            var warnings: List<Warning>? = null
-        ) {
-            /**
-             * Represents warnings of the pattern scan.
-             * @param correctOpcode The opcode the instruction list has.
-             * @param wrongOpcode The opcode the pattern list of the signature currently has.
-             * @param instructionIndex The index of the opcode relative to the instruction list.
-             * @param patternIndex The index of the opcode relative to the pattern list from the signature.
-             */
-            data class Warning(
-                val correctOpcode: Opcode,
-                val wrongOpcode: Opcode,
-                val instructionIndex: Int,
-                val patternIndex: Int,
-            )
-        }
-    }
-}

src/main/kotlin/app/revanced/patcher/logging/Logger.kt

@@ -1,8 +0,0 @@
-package app.revanced.patcher.logging
-
-interface Logger {
-    fun error(msg: String) {}
-    fun warn(msg: String) {}
-    fun info(msg: String) {}
-    fun trace(msg: String) {}
-}

src/main/kotlin/app/revanced/patcher/logging/impl/NopLogger.kt

@@ -1,5 +0,0 @@
-package app.revanced.patcher.logging.impl
-
-import app.revanced.patcher.logging.Logger
-
-object NopLogger : Logger

src/main/kotlin/app/revanced/patcher/patch/OptionsContainer.kt

@@ -1,18 +0,0 @@
-package app.revanced.patcher.patch
-
-/**
- * A container for patch options.
- */
-abstract class OptionsContainer {
-    /**
-     * A list of [PatchOption]s.
-     * @see PatchOptions
-     */
-    @Suppress("MemberVisibilityCanBePrivate")
-    val options = PatchOptions()
-
-    protected fun <T> option(opt: PatchOption<T>): PatchOption<T> {
-        options.register(opt)
-        return opt
-    }
-}

src/main/kotlin/app/revanced/patcher/patch/Patch.kt

@@ -1,37 +0,0 @@
-package app.revanced.patcher.patch
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.data.Context
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import java.io.Closeable
-
-/**
- * A ReVanced patch.
- *
- * If it implements [Closeable], it will be closed after all patches have been executed.
- * Closing will be done in reverse execution order.
- */
-sealed interface Patch<out T : Context> {
-    /**
-     * The main function of the [Patch] which the patcher will call.
-     *
-     * @param context The [Context] the patch will work on.
-     * @return The result of executing the patch.
-     */
-    fun execute(context: @UnsafeVariance T): PatchResult
-}
-
-/**
- * Resource patch for the Patcher.
- */
-interface ResourcePatch : Patch<ResourceContext>
-
-/**
- * Bytecode patch for the Patcher.
- *
- * @param fingerprints A list of [MethodFingerprint] this patch relies on.
- */
-abstract class BytecodePatch(
-    internal val fingerprints: Iterable<MethodFingerprint>? = null
-) : Patch<BytecodeContext>

src/main/kotlin/app/revanced/patcher/patch/PatchOption.kt

@@ -1,232 +0,0 @@
-@file:Suppress("CanBeParameter", "MemberVisibilityCanBePrivate", "UNCHECKED_CAST")
-
-package app.revanced.patcher.patch
-
-import java.nio.file.Path
-import kotlin.io.path.pathString
-import kotlin.reflect.KProperty
-
-class NoSuchOptionException(val option: String) : Exception("No such option: $option")
-class IllegalValueException(val value: Any?) : Exception("Illegal value: $value")
-class InvalidTypeException(val got: String, val expected: String) :
-    Exception("Invalid option value type: $got, expected $expected")
-
-object RequirementNotMetException : Exception("null was passed into an option that requires a value")
-
-/**
- * A registry for an array of [PatchOption]s.
- * @param options An array of [PatchOption]s.
- */
-class PatchOptions(vararg options: PatchOption<*>) : Iterable<PatchOption<*>> {
-    private val register = mutableMapOf<String, PatchOption<*>>()
-
-    init {
-        options.forEach { register(it) }
-    }
-
-    internal fun register(option: PatchOption<*>) {
-        if (register.containsKey(option.key)) {
-            throw IllegalStateException("Multiple options found with the same key")
-        }
-        register[option.key] = option
-    }
-
-    /**
-     * Get a [PatchOption] by its key.
-     * @param key The key of the [PatchOption].
-     */
-    @JvmName("getUntyped")
-    operator fun get(key: String) = register[key] ?: throw NoSuchOptionException(key)
-
-    /**
-     * Get a [PatchOption] by its key.
-     * @param key The key of the [PatchOption].
-     */
-    inline operator fun <reified T> get(key: String): PatchOption<T> {
-        val opt = get(key)
-        if (opt.value !is T) throw InvalidTypeException(
-            opt.value?.let { it::class.java.canonicalName } ?: "null",
-            T::class.java.canonicalName
-        )
-        return opt as PatchOption<T>
-    }
-
-    /**
-     * Set the value of a [PatchOption].
-     * @param key The key of the [PatchOption].
-     * @param value The value you want it to be.
-     * Please note that using the wrong value type results in a runtime error.
-     */
-    inline operator fun <reified T> set(key: String, value: T) {
-        val opt = get<T>(key)
-        if (opt.value !is T) throw InvalidTypeException(
-            T::class.java.canonicalName,
-            opt.value?.let { it::class.java.canonicalName } ?: "null"
-        )
-        opt.value = value
-    }
-
-    /**
-     * Sets the value of a [PatchOption] to `null`.
-     * @param key The key of the [PatchOption].
-     */
-    fun nullify(key: String) {
-        get(key).value = null
-    }
-
-    override fun iterator() = register.values.iterator()
-}
-
-/**
- * A [Patch] option.
- * @param key Unique identifier of the option. Example: _`settings`_
- * @param default The default value of the option.
- * @param title A human-readable title of the option. Example: _Patch Settings_
- * @param description A human-readable description of the option. Example: _Settings for the patches._
- * @param required Whether the option is required.
- */
-@Suppress("MemberVisibilityCanBePrivate")
-sealed class PatchOption<T>(
-    val key: String,
-    default: T?,
-    val title: String,
-    val description: String,
-    val required: Boolean,
-    val validator: (T?) -> Boolean
-) {
-    var value: T? = default
-        get() {
-            if (field == null && required) {
-                throw RequirementNotMetException
-            }
-            return field
-        }
-        set(value) {
-            if (value == null && required) {
-                throw RequirementNotMetException
-            }
-            if (!validator(value)) {
-                throw IllegalValueException(value)
-            }
-            field = value
-        }
-
-    /**
-     * Gets the value of the option.
-     * Please note that using the wrong value type results in a runtime error.
-     */
-    @JvmName("getValueTyped")
-    inline operator fun <reified V> getValue(thisRef: Nothing?, property: KProperty<*>): V? {
-        if (value !is V?) throw InvalidTypeException(
-            V::class.java.canonicalName,
-            value?.let { it::class.java.canonicalName } ?: "null"
-        )
-        return value as? V?
-    }
-
-    operator fun getValue(thisRef: Any?, property: KProperty<*>) = value
-
-    /**
-     * Gets the value of the option.
-     * Please note that using the wrong value type results in a runtime error.
-     */
-    @JvmName("setValueTyped")
-    inline operator fun <reified V> setValue(thisRef: Nothing?, property: KProperty<*>, new: V) {
-        if (value !is V) throw InvalidTypeException(
-            V::class.java.canonicalName,
-            value?.let { it::class.java.canonicalName } ?: "null"
-        )
-        value = new as T
-    }
-
-    operator fun setValue(thisRef: Any?, property: KProperty<*>, new: T?) {
-        value = new
-    }
-
-    /**
-     * A [PatchOption] representing a [String].
-     * @see PatchOption
-     */
-    class StringOption(
-        key: String,
-        default: String?,
-        title: String,
-        description: String,
-        required: Boolean = false,
-        validator: (String?) -> Boolean = { true }
-    ) : PatchOption<String>(
-        key, default, title, description, required, validator
-    )
-
-    /**
-     * A [PatchOption] representing a [Boolean].
-     * @see PatchOption
-     */
-    class BooleanOption(
-        key: String,
-        default: Boolean?,
-        title: String,
-        description: String,
-        required: Boolean = false,
-        validator: (Boolean?) -> Boolean = { true }
-    ) : PatchOption<Boolean>(
-        key, default, title, description, required, validator
-    )
-
-    /**
-     * A [PatchOption] with a list of allowed options.
-     * @param options A list of allowed options for the [ListOption].
-     * @see PatchOption
-     */
-    sealed class ListOption<E>(
-        key: String,
-        default: E?,
-        val options: Iterable<E>,
-        title: String,
-        description: String,
-        required: Boolean = false,
-        validator: (E?) -> Boolean = { true }
-    ) : PatchOption<E>(
-        key, default, title, description, required, {
-            (it?.let { it in options } ?: true) && validator(it)
-        }
-    ) {
-        init {
-            if (default != null && default !in options) {
-                throw IllegalStateException("Default option must be an allowed option")
-            }
-        }
-    }
-
-    /**
-     * A [ListOption] of type [String].
-     * @see ListOption
-     */
-    class StringListOption(
-        key: String,
-        default: String?,
-        options: Iterable<String>,
-        title: String,
-        description: String,
-        required: Boolean = false,
-        validator: (String?) -> Boolean = { true }
-    ) : ListOption<String>(
-        key, default, options, title, description, required, validator
-    )
-
-    /**
-     * A [ListOption] of type [Int].
-     * @see ListOption
-     */
-    class IntListOption(
-        key: String,
-        default: Int?,
-        options: Iterable<Int>,
-        title: String,
-        description: String,
-        required: Boolean = false,
-        validator: (Int?) -> Boolean = { true }
-    ) : ListOption<Int>(
-        key, default, options, title, description, required, validator
-    )
-}

src/main/kotlin/app/revanced/patcher/patch/annotations/PatchAnnotation.kt

@@ -1,27 +1,9 @@
 package app.revanced.patcher.patch.annotations
 
-import app.revanced.patcher.data.Context
-import app.revanced.patcher.patch.Patch
-import kotlin.reflect.KClass
-
 /**
- * Annotation to mark a class as a patch.
- * @param include If false, the patch should be treated as optional by default.
+ * Annotation to mark a Class as a patch.
  */
 @Target(AnnotationTarget.CLASS)
-annotation class Patch(val include: Boolean = true)
-
-/**
- * Annotation for dependencies of [Patch]es.
- */
-@Target(AnnotationTarget.CLASS)
-annotation class DependsOn(
-    val dependencies: Array<KClass<out Patch<Context>>> = []
-)
-
-
-/**
- * Annotation to mark [Patch]es which depend on integrations.
- */
-@Target(AnnotationTarget.CLASS)
-annotation class RequiresIntegrations // required because integrations are decoupled from patches
+@Retention(AnnotationRetention.RUNTIME)
+@MustBeDocumented
+annotation class Patch

src/main/kotlin/app/revanced/patcher/patch/base/Patch.kt

@@ -0,0 +1,18 @@
+package app.revanced.patcher.patch.base
+
+import app.revanced.patcher.data.base.Data
+import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.implementation.ResourcePatch
+import app.revanced.patcher.patch.implementation.misc.PatchResult
+
+
+/**
+ * A ReVanced patch.
+ * Can either be a [ResourcePatch] or a [BytecodePatch].
+ */
+abstract class Patch<out T : Data> {
+    /**
+     * The main function of the [Patch] which the patcher will call.
+     */
+    abstract fun execute(data: @UnsafeVariance T): PatchResult // FIXME: remove the UnsafeVariance annotation
+}

src/main/kotlin/app/revanced/patcher/patch/implementation/BytecodePatch.kt

@@ -0,0 +1,13 @@
+package app.revanced.patcher.patch.implementation
+
+import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.patch.base.Patch
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+
+/**
+ * Bytecode patch for the Patcher.
+ * @param signatures A list of [MethodSignature] this patch relies on.
+ */
+abstract class BytecodePatch(
+    val signatures: Iterable<MethodSignature>
+) : Patch<BytecodeData>()

src/main/kotlin/app/revanced/patcher/patch/implementation/ResourcePatch.kt

@@ -0,0 +1,9 @@
+package app.revanced.patcher.patch.implementation
+
+import app.revanced.patcher.data.implementation.ResourceData
+import app.revanced.patcher.patch.base.Patch
+
+/**
+ * Resource patch for the Patcher.
+ */
+abstract class ResourcePatch : Patch<ResourceData>()

src/main/kotlin/app/revanced/patcher/patch/implementation/misc/PatchResult.kt

@@ -1,4 +1,4 @@
-package app.revanced.patcher.patch
+package app.revanced.patcher.patch.implementation.misc
 
 interface PatchResult {
     fun error(): PatchResultError? {
@@ -24,12 +24,10 @@ interface PatchResult {
     }
 }
 
-class PatchResultError(
-    errorMessage: String?, cause: Exception?
-) : Exception(errorMessage, cause), PatchResult {
-    constructor(errorMessage: String) : this(errorMessage, null)
-    constructor(cause: Exception) : this(cause.message, cause)
-
+class PatchResultError(private val errorMessage: String) : PatchResult {
+    fun errorMessage(): String {
+        return errorMessage
+    }
 }
 
 class PatchResultSuccess : PatchResult

src/main/kotlin/app/revanced/patcher/signature/base/Signature.kt

@@ -0,0 +1,9 @@
+package app.revanced.patcher.signature.base
+
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+
+/**
+ * A ReVanced signature.
+ * Can be a [MethodSignature].
+ */
+interface Signature

src/main/kotlin/app/revanced/patcher/signature/implementation/method/MethodSignature.kt

@@ -0,0 +1,47 @@
+package app.revanced.patcher.signature.implementation.method
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.data.implementation.MethodNotFoundException
+import app.revanced.patcher.signature.base.Signature
+import app.revanced.patcher.signature.implementation.method.resolver.SignatureResolverResult
+import org.jf.dexlib2.Opcode
+
+/**
+ * Represents the [MethodSignature] for a method.
+ * @param returnType The return type of the method.
+ * @param accessFlags The access flags of the method.
+ * @param methodParameters The parameters of the method.
+ * @param opcodes The list of opcodes of the method.
+ * @param strings A list of strings which a method contains.
+ * A `null` opcode is equals to an unknown opcode.
+ */
+abstract class MethodSignature(
+    internal val returnType: String?,
+    internal val accessFlags: Int?,
+    internal val methodParameters: Iterable<String>?,
+    internal val opcodes: Iterable<Opcode?>?,
+    internal val strings: Iterable<String>? = null
+) : Signature {
+    /**
+     * The result of the signature
+     */
+    var result: SignatureResolverResult? = null
+        get() {
+            return field ?: throw MethodNotFoundException(
+                "Could not resolve required signature ${
+                    (this::class.annotations.find { it is Name }?.let {
+                        (it as Name).name
+                    })
+                }"
+            )
+        }
+    val resolved: Boolean
+        get() {
+            var resolved = false
+            try {
+                resolved = result != null
+            } catch (_: Exception) {
+            }
+            return resolved
+        }
+}

src/main/kotlin/app/revanced/patcher/signature/implementation/method/annotation/MethodSignatureMetadata.kt

@@ -0,0 +1,32 @@
+package app.revanced.patcher.signature.implementation.method.annotation
+
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+
+/**
+ * Annotations for a method which matches to a [MethodSignature].
+ * @param definingClass The defining class name of the method.
+ * @param name A suggestive name for the method which the [MethodSignature] was created for.
+ */
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class MatchingMethod(
+    val definingClass: String = "L<unspecified-class>",
+    val name: String = "<unspecified-method>"
+)
+
+/**
+ * Annotations to scan a pattern [MethodSignature] with fuzzy algorithm.
+ * @param threshold if [threshold] or more of the opcodes do not match, skip.
+ */
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class FuzzyPatternScanMethod(
+    val threshold: Int = 1
+)
+
+/**
+ * Annotations to scan a pattern [MethodSignature] directly.
+ */
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class DirectPatternScanMethod

src/main/kotlin/app/revanced/patcher/signature/implementation/method/resolver/MethodSignatureResolver.kt

@@ -0,0 +1,167 @@
+package app.revanced.patcher.signature.implementation.method.resolver
+
+import app.revanced.patcher.data.PatcherData
+import app.revanced.patcher.data.implementation.proxy
+import app.revanced.patcher.extensions.findAnnotationRecursively
+import app.revanced.patcher.extensions.parametersEqual
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.iface.instruction.Instruction
+import org.jf.dexlib2.iface.instruction.formats.Instruction21c
+import org.jf.dexlib2.iface.reference.StringReference
+
+internal class MethodSignatureResolver(
+    private val classes: List<ClassDef>,
+    private val methodSignatures: Iterable<MethodSignature>
+) {
+    fun resolve(patcherData: PatcherData) {
+        for (signature in methodSignatures) {
+            for (classDef in classes) {
+                for (method in classDef.methods) {
+                    val patternScanData = compareSignatureToMethod(signature, method) ?: continue
+
+                    // create class proxy, in case a patch needs mutability
+                    val classProxy = patcherData.bytecodeData.proxy(classDef)
+                    signature.result = SignatureResolverResult(
+                        classProxy,
+                        patternScanData,
+                        method,
+                    )
+                }
+            }
+        }
+    }
+
+    // These functions do not require the constructor values, so they can be static.
+    companion object {
+        fun resolveFromProxy(
+            classProxy: app.revanced.patcher.util.proxy.ClassProxy,
+            signature: MethodSignature
+        ): SignatureResolverResult? {
+            for (method in classProxy.immutableClass.methods) {
+                val result = compareSignatureToMethod(signature, method) ?: continue
+                return SignatureResolverResult(
+                    classProxy,
+                    result,
+                    method,
+                )
+            }
+            return null
+        }
+
+        private fun compareSignatureToMethod(
+            signature: MethodSignature,
+            method: Method
+        ): PatternScanResult? {
+            signature.returnType?.let {
+                if (!method.returnType.startsWith(signature.returnType)) {
+                    return null
+                }
+            }
+
+            signature.accessFlags?.let {
+                if (signature.accessFlags != method.accessFlags) {
+                    return null
+                }
+            }
+
+            signature.methodParameters?.let {
+                if (!parametersEqual(signature.methodParameters, method.parameterTypes)) {
+                    return null
+                }
+            }
+
+            signature.strings?.let { strings ->
+                method.implementation ?: return null
+
+                method.implementation!!.instructions.let { instructions ->
+                    val stringsList = strings.toMutableList()
+
+                    for (instruction in instructions) {
+                        if (instruction.opcode != Opcode.CONST_STRING) continue
+
+                        val string = ((instruction as Instruction21c).reference as StringReference).string
+                        val i = stringsList.indexOfFirst { it == string }
+                        if (i != -1) stringsList.removeAt(i)
+                    }
+
+                    if (stringsList.isNotEmpty()) return null
+                }
+            }
+
+            return if (signature.opcodes == null) {
+                PatternScanResult(0, 0)
+            } else {
+                method.implementation?.instructions?.let {
+                    compareOpcodes(signature, it)
+                }
+            }
+        }
+
+        private fun compareOpcodes(
+            signature: MethodSignature,
+            instructions: Iterable<Instruction>
+        ): PatternScanResult? {
+            val count = instructions.count()
+            val pattern = signature.opcodes!!
+            val size = pattern.count()
+
+            val threshold =
+                signature::class.java.findAnnotationRecursively(FuzzyPatternScanMethod::class.java)?.threshold
+                    ?: 0
+
+            for (instructionIndex in 0 until count) {
+                var patternIndex = 0
+                var currentThreshold = threshold
+                while (instructionIndex + patternIndex < count) {
+                    val originalOpcode = instructions.elementAt(instructionIndex + patternIndex).opcode
+                    val patternOpcode = pattern.elementAt(patternIndex)
+                    if (
+                        patternOpcode != null && // unknown opcode
+                        originalOpcode != patternOpcode &&
+                        currentThreshold-- == 0
+                    ) break
+                    if (++patternIndex < size) continue
+                    patternIndex-- // fix pattern offset
+
+                    val result = PatternScanResult(instructionIndex, instructionIndex + patternIndex)
+
+                    result.warnings = generateWarnings(signature, instructions, result)
+
+                    return result
+                }
+            }
+
+            return null
+        }
+
+        private fun generateWarnings(
+            signature: MethodSignature,
+            instructions: Iterable<Instruction>,
+            scanResult: PatternScanResult,
+        ) = buildList {
+            val pattern = signature.opcodes!!
+            for ((patternIndex, instructionIndex) in (scanResult.startIndex until scanResult.endIndex).withIndex()) {
+                val correctOpcode = instructions.elementAt(instructionIndex).opcode
+                val patternOpcode = pattern.elementAt(patternIndex)
+                if (
+                    patternOpcode != null && // unknown opcode
+                    correctOpcode != patternOpcode
+                ) {
+                    this.add(
+                        PatternScanResult.Warning(
+                            correctOpcode, patternOpcode,
+                            instructionIndex, patternIndex,
+                        )
+                    )
+                }
+            }
+        }
+    }
+}
+
+private operator fun ClassDef.component1() = this
+private operator fun ClassDef.component2() = this.methods

src/main/kotlin/app/revanced/patcher/signature/implementation/method/resolver/MethodSignatureResolverResult.kt

@@ -0,0 +1,75 @@
+package app.revanced.patcher.signature.implementation.method.resolver
+
+import app.revanced.patcher.extensions.softCompareTo
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.util.proxy.ClassProxy
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.Method
+
+/**
+ * Represents the result of a [MethodSignatureResolver].
+ * @param definingClassProxy The [ClassProxy] that the matching method was found in.
+ * @param resolvedMethod The actual matching method.
+ * @param scanResult Opcodes pattern scan result.
+ */
+data class SignatureResolverResult(
+    val definingClassProxy: ClassProxy,
+    val scanResult: PatternScanResult,
+    private val resolvedMethod: Method,
+) {
+    /**
+     * Returns the **mutable** method by the [resolvedMethod] from the [definingClassProxy].
+     *
+     * Please note, this method allocates a [ClassProxy].
+     * Use [immutableMethod] where possible.
+     */
+    val method
+        get() = definingClassProxy.resolve().methods.first {
+            it.softCompareTo(resolvedMethod)
+        }
+
+    /**
+     * Returns the **immutable** method by the [resolvedMethod] from the [definingClassProxy].
+     *
+     * If you need to modify the method, use [method] instead.
+     */
+    @Suppress("MemberVisibilityCanBePrivate")
+    val immutableMethod: Method
+        get() = definingClassProxy.immutableClass.methods.first {
+            it.softCompareTo(resolvedMethod)
+        }
+
+    fun findParentMethod(signature: MethodSignature): SignatureResolverResult? {
+        return MethodSignatureResolver.resolveFromProxy(definingClassProxy, signature)
+    }
+}
+
+data class PatternScanResult(
+    val startIndex: Int,
+    val endIndex: Int
+) {
+    /**
+     * A list of warnings the resolver found.
+     *
+     * This list will be allocated when the signature has been found.
+     * Meaning, if the signature was not found,
+     * or the signature was not yet resolved,
+     * the list will be null.
+     */
+    var warnings: List<Warning>? = null
+
+    /**
+     * Represents a resolver warning.
+     * @param correctOpcode The opcode the instruction list has.
+     * @param wrongOpcode The opcode the pattern list of the signature currently has.
+     * @param instructionIndex The index of the opcode relative to the instruction list.
+     * @param patternIndex The index of the opcode relative to the pattern list from the signature.
+     */
+    data class Warning(
+        val correctOpcode: Opcode,
+        val wrongOpcode: Opcode,
+        val instructionIndex: Int,
+        val patternIndex: Int,
+    )
+}
+

src/main/kotlin/app/revanced/patcher/util/ClassMerger.kt

@@ -1,214 +0,0 @@
-package app.revanced.patcher.util
-
-import app.revanced.patcher.PatcherContext
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.logging.Logger
-import app.revanced.patcher.util.ClassMerger.Utils.asMutableClass
-import app.revanced.patcher.util.ClassMerger.Utils.filterAny
-import app.revanced.patcher.util.ClassMerger.Utils.filterNotAny
-import app.revanced.patcher.util.ClassMerger.Utils.isPublic
-import app.revanced.patcher.util.ClassMerger.Utils.toPublic
-import app.revanced.patcher.util.TypeUtil.traverseClassHierarchy
-import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
-import app.revanced.patcher.util.proxy.mutableTypes.MutableClass.Companion.toMutable
-import app.revanced.patcher.util.proxy.mutableTypes.MutableField
-import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMutable
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.iface.ClassDef
-import com.android.tools.smali.dexlib2.util.MethodUtil
-import kotlin.reflect.KFunction2
-
-/**
- * Experimental class to merge a [ClassDef] with another.
- * Note: This will not consider method implementations or if the class is missing a superclass or interfaces.
- */
-internal object ClassMerger {
-    /**
-     * Merge a class with [otherClass].
-     *
-     * @param otherClass The class to merge with
-     * @param context The context to traverse the class hierarchy in.
-     * @param logger A logger.
-     */
-    fun ClassDef.merge(otherClass: ClassDef, context: PatcherContext, logger: Logger? = null) = this
-        //.fixFieldAccess(otherClass, logger)
-        //.fixMethodAccess(otherClass, logger)
-        .addMissingFields(otherClass, logger)
-        .addMissingMethods(otherClass, logger)
-        .publicize(otherClass, context, logger)
-
-    /**
-     * Add methods which are missing but existing in [fromClass].
-     *
-     * @param fromClass The class to add missing methods from.
-     * @param logger A logger.
-     */
-    private fun ClassDef.addMissingMethods(fromClass: ClassDef, logger: Logger? = null): ClassDef {
-        val missingMethods = fromClass.methods.let { fromMethods ->
-            methods.filterNot { method ->
-                fromMethods.any { fromMethod ->
-                    MethodUtil.methodSignaturesMatch(fromMethod, method)
-                }
-            }
-        }
-
-        if (missingMethods.isEmpty()) return this
-
-        logger?.trace("Found ${missingMethods.size} missing methods")
-
-        return asMutableClass().apply {
-            methods.addAll(missingMethods.map { it.toMutable() })
-        }
-    }
-
-    /**
-     * Add fields which are missing but existing in [fromClass].
-     *
-     * @param fromClass The class to add missing fields from.
-     * @param logger A logger.
-     */
-    private fun ClassDef.addMissingFields(fromClass: ClassDef, logger: Logger? = null): ClassDef {
-        val missingFields = fields.filterNotAny(fromClass.fields) { field, fromField ->
-            fromField.name == field.name
-        }
-
-        if (missingFields.isEmpty()) return this
-
-        logger?.trace("Found ${missingFields.size} missing fields")
-
-        return asMutableClass().apply {
-            fields.addAll(missingFields.map { it.toMutable() })
-        }
-    }
-
-    /**
-     * Make a class and its super class public recursively.
-     * @param reference The class to check the [AccessFlags] of.
-     * @param context The context to traverse the class hierarchy in.
-     * @param logger A logger.
-     */
-    private fun ClassDef.publicize(reference: ClassDef, context: PatcherContext, logger: Logger? = null) =
-        if (reference.accessFlags.isPublic() && !accessFlags.isPublic())
-            this.asMutableClass().apply {
-                context.bytecodeContext.traverseClassHierarchy(this) {
-                    if (accessFlags.isPublic()) return@traverseClassHierarchy
-
-                    logger?.trace("Publicizing ${this.type}")
-
-                    accessFlags = accessFlags.toPublic()
-                }
-            }
-        else this
-
-    /**
-     * Publicize fields if they are public in [reference].
-     *
-     * @param reference The class to check the [AccessFlags] of the fields in.
-     * @param logger A logger.
-     */
-    private fun ClassDef.fixFieldAccess(reference: ClassDef, logger: Logger? = null): ClassDef {
-        val brokenFields = fields.filterAny(reference.fields) { field, referenceField ->
-            if (field.name != referenceField.name) return@filterAny false
-
-            referenceField.accessFlags.isPublic() && !field.accessFlags.isPublic()
-        }
-
-        if (brokenFields.isEmpty()) return this
-
-        logger?.trace("Found ${brokenFields.size} broken fields")
-
-        /**
-         * Make a field public.
-         */
-        fun MutableField.publicize() {
-            accessFlags = accessFlags.toPublic()
-        }
-
-        return asMutableClass().apply {
-            fields.filter { brokenFields.contains(it) }.forEach(MutableField::publicize)
-        }
-    }
-
-    /**
-     * Publicize methods if they are public in [reference].
-     *
-     * @param reference The class to check the [AccessFlags] of the methods in.
-     * @param logger A logger.
-     */
-    private fun ClassDef.fixMethodAccess(reference: ClassDef, logger: Logger? = null): ClassDef {
-        val brokenMethods = methods.filterAny(reference.methods) { method, referenceMethod ->
-            if (!MethodUtil.methodSignaturesMatch(method, referenceMethod)) return@filterAny false
-
-            referenceMethod.accessFlags.isPublic() && !method.accessFlags.isPublic()
-        }
-
-        if (brokenMethods.isEmpty()) return this
-
-        logger?.trace("Found ${brokenMethods.size} methods")
-
-        /**
-         * Make a method public.
-         */
-        fun MutableMethod.publicize() {
-            accessFlags = accessFlags.toPublic()
-        }
-
-        return asMutableClass().apply {
-            methods.filter { brokenMethods.contains(it) }.forEach(MutableMethod::publicize)
-        }
-    }
-
-    private object Utils {
-        fun ClassDef.asMutableClass() = if (this is MutableClass) this else this.toMutable()
-
-        /**
-         * Check if the [AccessFlags.PUBLIC] flag is set.
-         *
-         * @return True, if the flag is set.
-         */
-        fun Int.isPublic() = AccessFlags.PUBLIC.isSet(this)
-
-        /**
-         * Make [AccessFlags] public.
-         *
-         * @return The new [AccessFlags].
-         */
-        fun Int.toPublic() = this.or(AccessFlags.PUBLIC).and(AccessFlags.PRIVATE.value.inv())
-
-        /**
-         * Filter [this] on [needles] matching the given [predicate].
-         *
-         * @param this The hay to filter for [needles].
-         * @param needles The needles to filter [this] with.
-         * @param predicate The filter.
-         * @return The [this] filtered on [needles] matching the given [predicate].
-         */
-        fun <HayType, NeedleType> Iterable<HayType>.filterAny(
-            needles: Iterable<NeedleType>, predicate: (HayType, NeedleType) -> Boolean
-        ) = Iterable<HayType>::filter.any(this, needles, predicate)
-
-        /**
-         * Filter [this] on [needles] not matching the given [predicate].
-         *
-         * @param this The hay to filter for [needles].
-         * @param needles The needles to filter [this] with.
-         * @param predicate The filter.
-         * @return The [this] filtered on [needles] not matching the given [predicate].
-         */
-        fun <HayType, NeedleType> Iterable<HayType>.filterNotAny(
-            needles: Iterable<NeedleType>, predicate: (HayType, NeedleType) -> Boolean
-        ) = Iterable<HayType>::filterNot.any(this, needles, predicate)
-
-        fun <HayType, NeedleType> KFunction2<Iterable<HayType>, (HayType) -> Boolean, List<HayType>>.any(
-            haystack: Iterable<HayType>,
-            needles: Iterable<NeedleType>,
-            predicate: (HayType, NeedleType) -> Boolean
-        ) = this(haystack) { hay ->
-            needles.any { needle ->
-                predicate(hay, needle)
-            }
-        }
-    }
-}

src/main/kotlin/app/revanced/patcher/util/ProxyBackedClassList.kt

@@ -1,46 +1,45 @@
 package app.revanced.patcher.util
 
-import app.revanced.patcher.util.proxy.ClassProxy
-import com.android.tools.smali.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.ClassDef
 
-/**
- * A class that represents a set of classes and proxies.
- *
- * @param classes The classes to be backed by proxies.
- */
-class ProxyBackedClassList(internal val classes: MutableList<ClassDef>) : Set<ClassDef> {
-    internal val proxies = mutableListOf<ClassProxy>()
+class ProxyBackedClassList(internal val internalClasses: MutableList<ClassDef>) : List<ClassDef> {
+    internal val proxies = mutableListOf<app.revanced.patcher.util.proxy.ClassProxy>()
+
+    fun add(classDef: ClassDef) {
+        internalClasses.add(classDef)
+    }
+
+    fun add(classProxy: app.revanced.patcher.util.proxy.ClassProxy) {
+        proxies.add(classProxy)
+    }
 
     /**
-     * Add a [ClassDef].
+     * Apply all resolved classes into [internalClasses] and clean the [proxies] list.
      */
-    fun add(classDef: ClassDef) = classes.add(classDef)
-
-    /**
-     * Add a [ClassProxy].
-     */
-    fun add(classProxy: ClassProxy) = proxies.add(classProxy)
-
-    /**
-     * Replace all classes with their mutated versions.
-     */
-    internal fun replaceClasses() =
+    fun applyProxies() {
+        // FIXME: check if this could cause issues when multiple patches use the same proxy
         proxies.removeIf { proxy ->
             // if the proxy is unused, keep it in the list
-            if (!proxy.resolved) return@removeIf false
+            if (!proxy.proxyUsed) return@removeIf false
 
-            // if it has been used, replace the original class with the new class
-            val index = classes.indexOfFirst { it.type == proxy.immutableClass.type }
-            classes[index] = proxy.mutableClass
+            // if it has been used, replace the internal class which it proxied
+            val index = internalClasses.indexOfFirst { it.type == proxy.immutableClass.type }
+            internalClasses[index] = proxy.mutatedClass
 
             // return true to remove it from the proxies list
             return@removeIf true
         }
+    }
 
-
-    override val size get() = classes.size
-    override fun contains(element: ClassDef) = classes.contains(element)
-    override fun containsAll(elements: Collection<ClassDef>) = classes.containsAll(elements)
-    override fun isEmpty() = classes.isEmpty()
-    override fun iterator() = classes.iterator()
+    override val size get() = internalClasses.size
+    override fun contains(element: ClassDef) = internalClasses.contains(element)
+    override fun containsAll(elements: Collection<ClassDef>) = internalClasses.containsAll(elements)
+    override fun get(index: Int) = internalClasses[index]
+    override fun indexOf(element: ClassDef) = internalClasses.indexOf(element)
+    override fun isEmpty() = internalClasses.isEmpty()
+    override fun iterator() = internalClasses.iterator()
+    override fun lastIndexOf(element: ClassDef) = internalClasses.lastIndexOf(element)
+    override fun listIterator() = internalClasses.listIterator()
+    override fun listIterator(index: Int) = internalClasses.listIterator(index)
+    override fun subList(fromIndex: Int, toIndex: Int) = internalClasses.subList(fromIndex, toIndex)
 }

src/main/kotlin/app/revanced/patcher/util/TypeUtil.kt

@@ -1,19 +0,0 @@
-package app.revanced.patcher.util
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
-
-object TypeUtil {
-    /**
-     * traverse the class hierarchy starting from the given root class
-     *
-     * @param targetClass the class to start traversing the class hierarchy from
-     * @param callback function that is called for every class in the hierarchy
-     */
-    fun BytecodeContext.traverseClassHierarchy(targetClass: MutableClass, callback: MutableClass.() -> Unit) {
-        callback(targetClass)
-        this.findClass(targetClass.superclass ?: return)?.mutableClass?.let {
-            traverseClassHierarchy(it, callback)
-        }
-    }
-}

src/main/kotlin/app/revanced/patcher/util/dex/DexFile.kt

@@ -1,10 +0,0 @@
-package app.revanced.patcher.util.dex
-
-import java.io.InputStream
-
-/**
- * Wrapper for dex files.
- * @param name The original name of the dex file.
- * @param stream The dex file as [InputStream].
- */
-data class DexFile(val name: String, val stream: InputStream)

src/main/kotlin/app/revanced/patcher/util/method/MethodWalker.kt

@@ -1,27 +1,27 @@
 package app.revanced.patcher.util.method
 
-import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.implementation.MethodNotFoundException
+import app.revanced.patcher.extensions.softCompareTo
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import com.android.tools.smali.dexlib2.iface.Method
-import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
-import com.android.tools.smali.dexlib2.iface.reference.MethodReference
-import com.android.tools.smali.dexlib2.util.MethodUtil
+import org.jf.dexlib2.Format
+import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.iface.instruction.formats.Instruction35c
+import org.jf.dexlib2.iface.reference.MethodReference
+import org.jf.dexlib2.util.Preconditions
 
 /**
  * Find a method from another method via instruction offsets.
- * @param bytecodeContext The context to use when resolving the next method reference.
+ * @param bytecodeData The bytecodeData to use when resolving the next method reference.
  * @param currentMethod The method to start from.
  */
 class MethodWalker internal constructor(
-    private val bytecodeContext: BytecodeContext,
+    private val bytecodeData: BytecodeData,
     private var currentMethod: Method
 ) {
     /**
      * Get the method which was walked last.
-     *
      * It is possible to cast this method to a [MutableMethod], if the method has been walked mutably.
-     *
-     * @return The method which was walked last.
      */
     fun getMethod(): Method {
         return currentMethod
@@ -29,28 +29,27 @@ class MethodWalker internal constructor(
 
     /**
      * Walk to a method defined at the offset in the instruction list of the current method.
-     *
-     * The current method will be mutable.
-     *
      * @param offset The offset of the instruction. This instruction must be of format 35c.
      * @param walkMutable If this is true, the class of the method will be resolved mutably.
-     * @return The same [MethodWalker] instance with the method at [offset].
+     * The current method will be mutable.
      */
-    fun nextMethod(offset: Int, walkMutable: Boolean = false): MethodWalker {
+    fun walk(offset: Int, walkMutable: Boolean = false): MethodWalker {
         currentMethod.implementation?.instructions?.let { instructions ->
             val instruction = instructions.elementAt(offset)
 
-            val newMethod = (instruction as ReferenceInstruction).reference as MethodReference
-            val proxy = bytecodeContext.findClass(newMethod.definingClass)!!
+            Preconditions.checkFormat(instruction.opcode, Format.Format35c)
 
-            val methods = if (walkMutable) proxy.mutableClass.methods else proxy.immutableClass.methods
-            currentMethod = methods.first {
-                return@first MethodUtil.methodSignaturesMatch(it, newMethod)
+            val newMethod = (instruction as Instruction35c).reference as MethodReference
+            val proxy = bytecodeData.findClass(newMethod.definingClass)!!
+
+            val methods = if (walkMutable) proxy.resolve().methods else proxy.immutableClass.methods
+            currentMethod = methods.first { it ->
+                return@first it.softCompareTo(newMethod)
             }
             return this
         }
         throw MethodNotFoundException("This method can not be walked at offset $offset inside the method ${currentMethod.name}")
     }
 
-    internal class MethodNotFoundException(exception: String) : Exception(exception)
+
 }

src/main/kotlin/app/revanced/patcher/util/patch/PatchBundle.kt

@@ -1,76 +0,0 @@
-@file:Suppress("unused")
-
-package app.revanced.patcher.util.patch
-
-import app.revanced.patcher.data.Context
-import app.revanced.patcher.extensions.AnnotationExtensions.findAnnotationRecursively
-import app.revanced.patcher.extensions.PatchExtensions.patchName
-import app.revanced.patcher.patch.Patch
-import com.android.tools.smali.dexlib2.DexFileFactory
-import java.io.File
-import java.net.URLClassLoader
-import java.util.jar.JarFile
-
-/**
- * A patch bundle.
-
- * @param path The path to the patch bundle.
- */
-sealed class PatchBundle(path: String) : File(path) {
-    internal fun loadPatches(classLoader: ClassLoader, classNames: Iterator<String>) = buildList {
-        classNames.forEach { className ->
-            val clazz = classLoader.loadClass(className)
-
-            // Annotations can not Patch.
-            if (clazz.isAnnotation) return@forEach
-
-            clazz.findAnnotationRecursively(app.revanced.patcher.patch.annotations.Patch::class)
-                ?: return@forEach
-
-            @Suppress("UNCHECKED_CAST") this.add(clazz as Class<out Patch<Context>>)
-        }
-    }.sortedBy { it.patchName }
-
-    /**
-     * A patch bundle of type [Jar].
-     *
-     * @param patchBundlePath The path to the patch bundle.
-     */
-    class Jar(patchBundlePath: String) : PatchBundle(patchBundlePath) {
-
-        /**
-         * Load patches from the patch bundle.
-         *
-         * Patches will be loaded with a new [URLClassLoader].
-         */
-        fun loadPatches() = loadPatches(
-            URLClassLoader(
-                arrayOf(this.toURI().toURL()),
-                Thread.currentThread().contextClassLoader // TODO: find out why this is required
-            ),
-            JarFile(this)
-                .stream()
-                .filter { it.name.endsWith(".class") && !it.name.contains("$") }
-                .map { it.realName.replace('/', '.').replace(".class", "") }.iterator()
-            )
-    }
-
-    /**
-     * A patch bundle of type [Dex] format.
-     *
-     * @param patchBundlePath The path to a patch bundle of dex format.
-     * @param dexClassLoader The dex class loader.
-     */
-    class Dex(patchBundlePath: String, private val dexClassLoader: ClassLoader) : PatchBundle(patchBundlePath) {
-        /**
-         * Load patches from the patch bundle.
-         *
-         * Patches will be loaded to the provided [dexClassLoader].
-         */
-        fun loadPatches() = loadPatches(dexClassLoader,
-            DexFileFactory.loadDexFile(path, null).classes.asSequence().map { classDef ->
-                classDef.type.substring(1, classDef.length - 1).replace('/', '.')
-            }.iterator()
-        )
-    }
-}

src/main/kotlin/app/revanced/patcher/util/patch/PatchLoader.kt

@@ -0,0 +1,34 @@
+package app.revanced.patcher.util.patch
+
+import app.revanced.patcher.patch.base.Patch
+import java.io.File
+import java.net.URLClassLoader
+import java.util.jar.JarFile
+
+object PatchLoader {
+    /**
+     * This method loads patches from a given jar file containing [Patch]es
+     * @return the loaded patches represented as a list of [Patch] classes
+     */
+    fun loadFromFile(patchesJar: File) = buildList {
+        val jarFile = JarFile(patchesJar)
+        val classLoader = URLClassLoader(arrayOf(patchesJar.toURI().toURL()))
+
+        val entries = jarFile.entries()
+        while (entries.hasMoreElements()) {
+            val entry = entries.nextElement()
+            if (!entry.name.endsWith(".class") || entry.name.contains("$")) continue
+
+            val clazz = classLoader.loadClass(entry.realName.replace('/', '.').replace(".class", ""))
+
+            if (!clazz.isAnnotationPresent(app.revanced.patcher.patch.annotations.Patch::class.java)) continue
+
+            @Suppress("UNCHECKED_CAST")
+            val patch = clazz as Class<Patch<*>>
+
+            // TODO: include declared classes from patch
+
+            this.add(patch)
+        }
+    }
+}

src/main/kotlin/app/revanced/patcher/util/proxy/ClassProxy.kt

@@ -1,33 +1,41 @@
 package app.revanced.patcher.util.proxy
 
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
-import com.android.tools.smali.dexlib2.iface.ClassDef
+import org.jf.dexlib2.iface.ClassDef
 
 /**
  * A proxy class for a [ClassDef].
  *
  * A class proxy simply holds a reference to the original class
  * and allocates a mutable clone for the original class if needed.
- * @param immutableClass The class to proxy.
+ * @param immutableClass The class to proxy
  */
-class ClassProxy internal constructor(
+class ClassProxy(
     val immutableClass: ClassDef,
 ) {
-    /**
-     * Weather the proxy was actually used.
-     */
-    internal var resolved = false
+    internal var proxyUsed = false
+    internal lateinit var mutatedClass: MutableClass
+
+    init {
+        // in the instance, that a [MutableClass] is being proxied,
+        // do not create an additional clone and reuse the [MutableClass] instance
+        if (immutableClass is MutableClass) {
+            mutatedClass = immutableClass
+            proxyUsed = true
+        }
+    }
 
     /**
-     * The mutable clone of the original class.
-     *
-     * Note: This is only allocated if the proxy is actually used.
+     * Allocates and returns a mutable clone of the original class.
+     * A patch should always use the original immutable class reference
+     * to avoid unnecessary allocations for the mutable class.
+     * @return A mutable clone of the original class.
      */
-    val mutableClass by lazy {
-        resolved = true
-        if (immutableClass is MutableClass) {
-            immutableClass
-        } else
-            MutableClass(immutableClass)
+    fun resolve(): MutableClass {
+        if (!proxyUsed) {
+            proxyUsed = true
+            mutatedClass = MutableClass(immutableClass)
+        }
+        return mutatedClass
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation.kt

@@ -1,8 +1,8 @@
 package app.revanced.patcher.util.proxy.mutableTypes
 
 import app.revanced.patcher.util.proxy.mutableTypes.MutableAnnotationElement.Companion.toMutable
-import com.android.tools.smali.dexlib2.base.BaseAnnotation
-import com.android.tools.smali.dexlib2.iface.Annotation
+import org.jf.dexlib2.base.BaseAnnotation
+import org.jf.dexlib2.iface.Annotation
 
 class MutableAnnotation(annotation: Annotation) : BaseAnnotation() {
     private val visibility = annotation.visibility

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement.kt

@@ -2,9 +2,9 @@ package app.revanced.patcher.util.proxy.mutableTypes
 
 import app.revanced.patcher.util.proxy.mutableTypes.encodedValue.MutableEncodedValue
 import app.revanced.patcher.util.proxy.mutableTypes.encodedValue.MutableEncodedValue.Companion.toMutable
-import com.android.tools.smali.dexlib2.base.BaseAnnotationElement
-import com.android.tools.smali.dexlib2.iface.AnnotationElement
-import com.android.tools.smali.dexlib2.iface.value.EncodedValue
+import org.jf.dexlib2.base.BaseAnnotationElement
+import org.jf.dexlib2.iface.AnnotationElement
+import org.jf.dexlib2.iface.value.EncodedValue
 
 class MutableAnnotationElement(annotationElement: AnnotationElement) : BaseAnnotationElement() {
     private var name = annotationElement.name

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableClass.kt

@@ -4,10 +4,10 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableAnnotation.Companion.
 import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMutable
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import com.google.common.collect.Iterables
-import com.android.tools.smali.dexlib2.base.reference.BaseTypeReference
-import com.android.tools.smali.dexlib2.iface.ClassDef
-import com.android.tools.smali.dexlib2.util.FieldUtil
-import com.android.tools.smali.dexlib2.util.MethodUtil
+import org.jf.dexlib2.base.reference.BaseTypeReference
+import org.jf.dexlib2.iface.ClassDef
+import org.jf.dexlib2.util.FieldUtil
+import org.jf.dexlib2.util.MethodUtil
 
 class MutableClass(classDef: ClassDef) : ClassDef, BaseTypeReference() {
     // Class

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableField.kt

@@ -3,9 +3,9 @@ package app.revanced.patcher.util.proxy.mutableTypes
 import app.revanced.patcher.util.proxy.mutableTypes.MutableAnnotation.Companion.toMutable
 import app.revanced.patcher.util.proxy.mutableTypes.encodedValue.MutableEncodedValue
 import app.revanced.patcher.util.proxy.mutableTypes.encodedValue.MutableEncodedValue.Companion.toMutable
-import com.android.tools.smali.dexlib2.HiddenApiRestriction
-import com.android.tools.smali.dexlib2.base.reference.BaseFieldReference
-import com.android.tools.smali.dexlib2.iface.Field
+import org.jf.dexlib2.HiddenApiRestriction
+import org.jf.dexlib2.base.reference.BaseFieldReference
+import org.jf.dexlib2.iface.Field
 
 class MutableField(field: Field) : Field, BaseFieldReference() {
     private var definingClass = field.definingClass

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethod.kt

@@ -2,10 +2,10 @@ package app.revanced.patcher.util.proxy.mutableTypes
 
 import app.revanced.patcher.util.proxy.mutableTypes.MutableAnnotation.Companion.toMutable
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethodParameter.Companion.toMutable
-import com.android.tools.smali.dexlib2.HiddenApiRestriction
-import com.android.tools.smali.dexlib2.base.reference.BaseMethodReference
-import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
-import com.android.tools.smali.dexlib2.iface.Method
+import org.jf.dexlib2.HiddenApiRestriction
+import org.jf.dexlib2.base.reference.BaseMethodReference
+import org.jf.dexlib2.builder.MutableMethodImplementation
+import org.jf.dexlib2.iface.Method
 
 class MutableMethod(method: Method) : Method, BaseMethodReference() {
     private var definingClass = method.definingClass
@@ -20,22 +20,6 @@ class MutableMethod(method: Method) : Method, BaseMethodReference() {
     private val _parameterTypes by lazy { method.parameterTypes.toMutableList() }
     private val _hiddenApiRestrictions by lazy { method.hiddenApiRestrictions }
 
-    fun setDefiningClass(definingClass: String) {
-        this.definingClass = definingClass
-    }
-
-    fun setName(name: String) {
-        this.name = name
-    }
-
-    fun setAccessFlags(accessFlags: Int) {
-        this.accessFlags = accessFlags
-    }
-
-    fun setReturnType(returnType: String) {
-        this.returnType = returnType
-    }
-
     override fun getDefiningClass(): String {
         return definingClass
     }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter.kt

@@ -1,8 +1,8 @@
 package app.revanced.patcher.util.proxy.mutableTypes
 
 import app.revanced.patcher.util.proxy.mutableTypes.MutableAnnotation.Companion.toMutable
-import com.android.tools.smali.dexlib2.base.BaseMethodParameter
-import com.android.tools.smali.dexlib2.iface.MethodParameter
+import org.jf.dexlib2.base.BaseMethodParameter
+import org.jf.dexlib2.iface.MethodParameter
 
 // TODO: finish overriding all members if necessary
 class MutableMethodParameter(parameter: MethodParameter) : MethodParameter, BaseMethodParameter() {

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue.kt

@@ -1,9 +1,9 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
 import app.revanced.patcher.util.proxy.mutableTypes.MutableAnnotationElement.Companion.toMutable
-import com.android.tools.smali.dexlib2.base.value.BaseAnnotationEncodedValue
-import com.android.tools.smali.dexlib2.iface.AnnotationElement
-import com.android.tools.smali.dexlib2.iface.value.AnnotationEncodedValue
+import org.jf.dexlib2.base.value.BaseAnnotationEncodedValue
+import org.jf.dexlib2.iface.AnnotationElement
+import org.jf.dexlib2.iface.value.AnnotationEncodedValue
 
 class MutableAnnotationEncodedValue(annotationEncodedValue: AnnotationEncodedValue) : BaseAnnotationEncodedValue(),
     MutableEncodedValue {

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue.kt

@@ -1,9 +1,9 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
 import app.revanced.patcher.util.proxy.mutableTypes.encodedValue.MutableEncodedValue.Companion.toMutable
-import com.android.tools.smali.dexlib2.base.value.BaseArrayEncodedValue
-import com.android.tools.smali.dexlib2.iface.value.ArrayEncodedValue
-import com.android.tools.smali.dexlib2.iface.value.EncodedValue
+import org.jf.dexlib2.base.value.BaseArrayEncodedValue
+import org.jf.dexlib2.iface.value.ArrayEncodedValue
+import org.jf.dexlib2.iface.value.EncodedValue
 
 class MutableArrayEncodedValue(arrayEncodedValue: ArrayEncodedValue) : BaseArrayEncodedValue(), MutableEncodedValue {
     private val _value by lazy {

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue.kt

@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.base.value.BaseBooleanEncodedValue
-import com.android.tools.smali.dexlib2.iface.value.BooleanEncodedValue
+import org.jf.dexlib2.base.value.BaseBooleanEncodedValue
+import org.jf.dexlib2.iface.value.BooleanEncodedValue
 
 class MutableBooleanEncodedValue(booleanEncodedValue: BooleanEncodedValue) : BaseBooleanEncodedValue(),
     MutableEncodedValue {

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue.kt

@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.base.value.BaseByteEncodedValue
-import com.android.tools.smali.dexlib2.iface.value.ByteEncodedValue
+import org.jf.dexlib2.base.value.BaseByteEncodedValue
+import org.jf.dexlib2.iface.value.ByteEncodedValue
 
 class MutableByteEncodedValue(byteEncodedValue: ByteEncodedValue) : BaseByteEncodedValue(), MutableEncodedValue {
     private var value = byteEncodedValue.value

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue.kt

@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.base.value.BaseCharEncodedValue
-import com.android.tools.smali.dexlib2.iface.value.CharEncodedValue
+import org.jf.dexlib2.base.value.BaseCharEncodedValue
+import org.jf.dexlib2.iface.value.CharEncodedValue
 
 class MutableCharEncodedValue(charEncodedValue: CharEncodedValue) : BaseCharEncodedValue(), MutableEncodedValue {
     private var value = charEncodedValue.value

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue.kt

@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.base.value.BaseDoubleEncodedValue
-import com.android.tools.smali.dexlib2.iface.value.DoubleEncodedValue
+import org.jf.dexlib2.base.value.BaseDoubleEncodedValue
+import org.jf.dexlib2.iface.value.DoubleEncodedValue
 
 class MutableDoubleEncodedValue(doubleEncodedValue: DoubleEncodedValue) : BaseDoubleEncodedValue(),
     MutableEncodedValue {

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEncodedValue.kt

@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.ValueType
-import com.android.tools.smali.dexlib2.iface.value.*
+import org.jf.dexlib2.ValueType
+import org.jf.dexlib2.iface.value.*
 
 interface MutableEncodedValue : EncodedValue {
     companion object {

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEnumEncodedValue.kt

@@ -1,8 +1,8 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.base.value.BaseEnumEncodedValue
-import com.android.tools.smali.dexlib2.iface.reference.FieldReference
-import com.android.tools.smali.dexlib2.iface.value.EnumEncodedValue
+import org.jf.dexlib2.base.value.BaseEnumEncodedValue
+import org.jf.dexlib2.iface.reference.FieldReference
+import org.jf.dexlib2.iface.value.EnumEncodedValue
 
 class MutableEnumEncodedValue(enumEncodedValue: EnumEncodedValue) : BaseEnumEncodedValue(), MutableEncodedValue {
     private var value = enumEncodedValue.value

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFieldEncodedValue.kt

@@ -1,9 +1,9 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.ValueType
-import com.android.tools.smali.dexlib2.base.value.BaseFieldEncodedValue
-import com.android.tools.smali.dexlib2.iface.reference.FieldReference
-import com.android.tools.smali.dexlib2.iface.value.FieldEncodedValue
+import org.jf.dexlib2.ValueType
+import org.jf.dexlib2.base.value.BaseFieldEncodedValue
+import org.jf.dexlib2.iface.reference.FieldReference
+import org.jf.dexlib2.iface.value.FieldEncodedValue
 
 class MutableFieldEncodedValue(fieldEncodedValue: FieldEncodedValue) : BaseFieldEncodedValue(), MutableEncodedValue {
     private var value = fieldEncodedValue.value

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFloatEncodedValue.kt

@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.base.value.BaseFloatEncodedValue
-import com.android.tools.smali.dexlib2.iface.value.FloatEncodedValue
+import org.jf.dexlib2.base.value.BaseFloatEncodedValue
+import org.jf.dexlib2.iface.value.FloatEncodedValue
 
 class MutableFloatEncodedValue(floatEncodedValue: FloatEncodedValue) : BaseFloatEncodedValue(), MutableEncodedValue {
     private var value = floatEncodedValue.value

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableIntEncodedValue.kt

@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.base.value.BaseIntEncodedValue
-import com.android.tools.smali.dexlib2.iface.value.IntEncodedValue
+import org.jf.dexlib2.base.value.BaseIntEncodedValue
+import org.jf.dexlib2.iface.value.IntEncodedValue
 
 class MutableIntEncodedValue(intEncodedValue: IntEncodedValue) : BaseIntEncodedValue(), MutableEncodedValue {
     private var value = intEncodedValue.value

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableLongEncodedValue.kt

@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.base.value.BaseLongEncodedValue
-import com.android.tools.smali.dexlib2.iface.value.LongEncodedValue
+import org.jf.dexlib2.base.value.BaseLongEncodedValue
+import org.jf.dexlib2.iface.value.LongEncodedValue
 
 class MutableLongEncodedValue(longEncodedValue: LongEncodedValue) : BaseLongEncodedValue(), MutableEncodedValue {
     private var value = longEncodedValue.value

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodEncodedValue.kt

@@ -1,8 +1,8 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.base.value.BaseMethodEncodedValue
-import com.android.tools.smali.dexlib2.iface.reference.MethodReference
-import com.android.tools.smali.dexlib2.iface.value.MethodEncodedValue
+import org.jf.dexlib2.base.value.BaseMethodEncodedValue
+import org.jf.dexlib2.iface.reference.MethodReference
+import org.jf.dexlib2.iface.value.MethodEncodedValue
 
 class MutableMethodEncodedValue(methodEncodedValue: MethodEncodedValue) : BaseMethodEncodedValue(),
     MutableEncodedValue {

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodHandleEncodedValue.kt

@@ -1,8 +1,8 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.base.value.BaseMethodHandleEncodedValue
-import com.android.tools.smali.dexlib2.iface.reference.MethodHandleReference
-import com.android.tools.smali.dexlib2.iface.value.MethodHandleEncodedValue
+import org.jf.dexlib2.base.value.BaseMethodHandleEncodedValue
+import org.jf.dexlib2.iface.reference.MethodHandleReference
+import org.jf.dexlib2.iface.value.MethodHandleEncodedValue
 
 class MutableMethodHandleEncodedValue(methodHandleEncodedValue: MethodHandleEncodedValue) :
     BaseMethodHandleEncodedValue(),

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodTypeEncodedValue.kt

@@ -1,8 +1,8 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.base.value.BaseMethodTypeEncodedValue
-import com.android.tools.smali.dexlib2.iface.reference.MethodProtoReference
-import com.android.tools.smali.dexlib2.iface.value.MethodTypeEncodedValue
+import org.jf.dexlib2.base.value.BaseMethodTypeEncodedValue
+import org.jf.dexlib2.iface.reference.MethodProtoReference
+import org.jf.dexlib2.iface.value.MethodTypeEncodedValue
 
 class MutableMethodTypeEncodedValue(methodTypeEncodedValue: MethodTypeEncodedValue) : BaseMethodTypeEncodedValue(),
     MutableEncodedValue {

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableNullEncodedValue.kt

@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.base.value.BaseNullEncodedValue
-import com.android.tools.smali.dexlib2.iface.value.ByteEncodedValue
+import org.jf.dexlib2.base.value.BaseNullEncodedValue
+import org.jf.dexlib2.iface.value.ByteEncodedValue
 
 class MutableNullEncodedValue : BaseNullEncodedValue(), MutableEncodedValue {
     companion object {

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableShortEncodedValue.kt

@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.base.value.BaseShortEncodedValue
-import com.android.tools.smali.dexlib2.iface.value.ShortEncodedValue
+import org.jf.dexlib2.base.value.BaseShortEncodedValue
+import org.jf.dexlib2.iface.value.ShortEncodedValue
 
 class MutableShortEncodedValue(shortEncodedValue: ShortEncodedValue) : BaseShortEncodedValue(), MutableEncodedValue {
     private var value = shortEncodedValue.value

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableStringEncodedValue.kt

@@ -1,8 +1,8 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.base.value.BaseStringEncodedValue
-import com.android.tools.smali.dexlib2.iface.value.ByteEncodedValue
-import com.android.tools.smali.dexlib2.iface.value.StringEncodedValue
+import org.jf.dexlib2.base.value.BaseStringEncodedValue
+import org.jf.dexlib2.iface.value.ByteEncodedValue
+import org.jf.dexlib2.iface.value.StringEncodedValue
 
 class MutableStringEncodedValue(stringEncodedValue: StringEncodedValue) : BaseStringEncodedValue(),
     MutableEncodedValue {

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableTypeEncodedValue.kt

@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 
-import com.android.tools.smali.dexlib2.base.value.BaseTypeEncodedValue
-import com.android.tools.smali.dexlib2.iface.value.TypeEncodedValue
+import org.jf.dexlib2.base.value.BaseTypeEncodedValue
+import org.jf.dexlib2.iface.value.TypeEncodedValue
 
 class MutableTypeEncodedValue(typeEncodedValue: TypeEncodedValue) : BaseTypeEncodedValue(), MutableEncodedValue {
     private var value = typeEncodedValue.value

src/main/kotlin/app/revanced/patcher/util/smali/ExternalLabel.kt

@@ -1,10 +0,0 @@
-package app.revanced.patcher.util.smali
-
-import com.android.tools.smali.dexlib2.iface.instruction.Instruction
-
-/**
- * A class that represents a label for an instruction.
- * @param name The label name.
- * @param instruction The instruction that this label is for.
- */
-data class ExternalLabel(internal val name: String, internal val instruction: Instruction)

src/main/kotlin/app/revanced/patcher/util/smali/InlineSmaliCompiler.kt

@@ -1,45 +1,43 @@
 package app.revanced.patcher.util.smali
 
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import org.antlr.runtime.CommonTokenStream
 import org.antlr.runtime.TokenSource
 import org.antlr.runtime.tree.CommonTreeNodeStream
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcodes
-import com.android.tools.smali.dexlib2.builder.BuilderInstruction
-import com.android.tools.smali.dexlib2.writer.builder.DexBuilder
-import com.android.tools.smali.smali.LexerErrorInterface
-import com.android.tools.smali.smali.smaliFlexLexer
-import com.android.tools.smali.smali.smaliParser
-import com.android.tools.smali.smali.smaliTreeWalker
+import org.jf.dexlib2.Opcodes
+import org.jf.dexlib2.builder.BuilderInstruction
+import org.jf.dexlib2.writer.builder.DexBuilder
+import org.jf.smali.LexerErrorInterface
+import org.jf.smali.smaliFlexLexer
+import org.jf.smali.smaliParser
+import org.jf.smali.smaliTreeWalker
 import java.io.InputStreamReader
 
 private const val METHOD_TEMPLATE = """
-    .class LInlineCompiler;
-    .super Ljava/lang/Object;
-    .method %s dummyMethod(%s)V
-        .registers %d
-        %s
-    .end method
+.class public Linlinecompiler;
+.super Ljava/lang/Object;
+.method public static compiler(%s)V
+    .registers %d
+    %s
+.end method
 """
 
 class InlineSmaliCompiler {
     companion object {
         /**
          * Compiles a string of Smali code to a list of instructions.
-         * Special registers (such as p0, p1) will only work correctly
-         * if the parameters and registers of the method are passed.
+         * p0, p1 etc. will only work correctly if the parameters and registers are passed.
+         * Do not cross the boundaries of the control flow (if-nez insn, etc),
+         * as that will result in exceptions since the labels cannot be calculated.
+         * Do not create dummy labels to fix the issue, since the code addresses will
+         * be messed up and results in broken Dalvik bytecode.
+         * FIXME: Fix the above issue. When this is fixed, add the proper conversions in [InstructionConverter].
          */
-        fun compile(
-            instructions: String, parameters: String, registers: Int, forStaticMethod: Boolean
+        fun compileMethodInstructions(
+            instructions: String,
+            parameters: String,
+            registers: Int
         ): List<BuilderInstruction> {
-            val input = METHOD_TEMPLATE.format(
-                if (forStaticMethod) {
-                    "static"
-                } else {
-                    ""
-                }, parameters, registers, instructions
-            )
+            val input = METHOD_TEMPLATE.format(parameters, registers, instructions)
             val reader = InputStreamReader(input.byteInputStream())
             val lexer: LexerErrorInterface = smaliFlexLexer(reader, 15)
             val tokens = CommonTokenStream(lexer as TokenSource)
@@ -55,30 +53,13 @@ class InlineSmaliCompiler {
             val dexGen = smaliTreeWalker(treeStream)
             dexGen.setDexBuilder(DexBuilder(Opcodes.getDefault()))
             val classDef = dexGen.smali_file()
-            return classDef.methods.first().implementation!!.instructions.map { it as BuilderInstruction }
+            return classDef.methods.first().implementation!!.instructions.map { it.toBuilderInstruction() }
         }
     }
 }
 
-/**
- * Compile lines of Smali code to a list of instructions.
- *
- * Note: Adding compiled instructions to an existing method with
- * offset instructions WITHOUT specifying a parent method will not work.
- * @param method The method to compile the instructions against.
- * @returns A list of instructions.
- */
-fun String.toInstructions(method: MutableMethod? = null): List<BuilderInstruction> {
-    return InlineSmaliCompiler.compile(this,
-        method?.parameters?.joinToString("") { it } ?: "",
-        method?.implementation?.registerCount ?: 1,
-        method?.let { AccessFlags.STATIC.isSet(it.accessFlags) } ?: true
-    )
-}
+fun String.toInstructions(parameters: String = "", registers: Int = 1) =
+    InlineSmaliCompiler.compileMethodInstructions(this, parameters, registers)
 
-/**
- * Compile a line of Smali code to an instruction.
- * @param templateMethod The method to compile the instructions against.
- * @return The instruction.
- */
-fun String.toInstruction(templateMethod: MutableMethod? = null) = this.toInstructions(templateMethod).first()
+fun String.toInstruction(parameters: String = "", registers: Int = 1) =
+    this.toInstructions(parameters, registers).first()

src/main/kotlin/app/revanced/patcher/util/smali/InstructionConverter.kt

@@ -0,0 +1,261 @@
+package app.revanced.patcher.util.smali
+
+import org.jf.dexlib2.Format
+import org.jf.dexlib2.builder.instruction.*
+import org.jf.dexlib2.iface.instruction.Instruction
+import org.jf.dexlib2.iface.instruction.formats.*
+import org.jf.util.ExceptionWithContext
+
+fun Instruction.toBuilderInstruction() =
+    when (this.opcode.format) {
+        Format.Format10x -> InstructionConverter.newBuilderInstruction10x(this as Instruction10x)
+        Format.Format11n -> InstructionConverter.newBuilderInstruction11n(this as Instruction11n)
+        Format.Format11x -> InstructionConverter.newBuilderInstruction11x(this as Instruction11x)
+        Format.Format12x -> InstructionConverter.newBuilderInstruction12x(this as Instruction12x)
+        Format.Format20bc -> InstructionConverter.newBuilderInstruction20bc(this as Instruction20bc)
+        Format.Format21c -> InstructionConverter.newBuilderInstruction21c(this as Instruction21c)
+        Format.Format21ih -> InstructionConverter.newBuilderInstruction21ih(this as Instruction21ih)
+        Format.Format21lh -> InstructionConverter.newBuilderInstruction21lh(this as Instruction21lh)
+        Format.Format21s -> InstructionConverter.newBuilderInstruction21s(this as Instruction21s)
+        Format.Format22b -> InstructionConverter.newBuilderInstruction22b(this as Instruction22b)
+        Format.Format22c -> InstructionConverter.newBuilderInstruction22c(this as Instruction22c)
+        Format.Format22cs -> InstructionConverter.newBuilderInstruction22cs(this as Instruction22cs)
+        Format.Format22s -> InstructionConverter.newBuilderInstruction22s(this as Instruction22s)
+        Format.Format22x -> InstructionConverter.newBuilderInstruction22x(this as Instruction22x)
+        Format.Format23x -> InstructionConverter.newBuilderInstruction23x(this as Instruction23x)
+        Format.Format31c -> InstructionConverter.newBuilderInstruction31c(this as Instruction31c)
+        Format.Format31i -> InstructionConverter.newBuilderInstruction31i(this as Instruction31i)
+        Format.Format32x -> InstructionConverter.newBuilderInstruction32x(this as Instruction32x)
+        Format.Format35c -> InstructionConverter.newBuilderInstruction35c(this as Instruction35c)
+        Format.Format35mi -> InstructionConverter.newBuilderInstruction35mi(this as Instruction35mi)
+        Format.Format35ms -> InstructionConverter.newBuilderInstruction35ms(this as Instruction35ms)
+        Format.Format3rc -> InstructionConverter.newBuilderInstruction3rc(this as Instruction3rc)
+        Format.Format3rmi -> InstructionConverter.newBuilderInstruction3rmi(this as Instruction3rmi)
+        Format.Format3rms -> InstructionConverter.newBuilderInstruction3rms(this as Instruction3rms)
+        Format.Format51l -> InstructionConverter.newBuilderInstruction51l(this as Instruction51l)
+        else -> throw ExceptionWithContext("Instruction format %s not supported", this.opcode.format)
+    }
+
+internal class InstructionConverter {
+    companion object {
+        internal fun newBuilderInstruction10x(instruction: Instruction10x): BuilderInstruction10x {
+            return BuilderInstruction10x(
+                instruction.opcode
+            )
+        }
+
+        internal fun newBuilderInstruction11n(instruction: Instruction11n): BuilderInstruction11n {
+            return BuilderInstruction11n(
+                instruction.opcode,
+                instruction.registerA,
+                instruction.narrowLiteral
+            )
+        }
+
+        internal fun newBuilderInstruction11x(instruction: Instruction11x): BuilderInstruction11x {
+            return BuilderInstruction11x(
+                instruction.opcode,
+                instruction.registerA
+            )
+        }
+
+        internal fun newBuilderInstruction12x(instruction: Instruction12x): BuilderInstruction12x {
+            return BuilderInstruction12x(
+                instruction.opcode,
+                instruction.registerA,
+                instruction.registerB
+            )
+        }
+
+        internal fun newBuilderInstruction20bc(instruction: Instruction20bc): BuilderInstruction20bc {
+            return BuilderInstruction20bc(
+                instruction.opcode,
+                instruction.verificationError,
+                instruction.reference
+            )
+        }
+
+        internal fun newBuilderInstruction21c(instruction: Instruction21c): BuilderInstruction21c {
+            return BuilderInstruction21c(
+                instruction.opcode,
+                instruction.registerA,
+                instruction.reference
+            )
+        }
+
+        internal fun newBuilderInstruction21ih(instruction: Instruction21ih): BuilderInstruction21ih {
+            return BuilderInstruction21ih(
+                instruction.opcode,
+                instruction.registerA,
+                instruction.narrowLiteral
+            )
+        }
+
+        internal fun newBuilderInstruction21lh(instruction: Instruction21lh): BuilderInstruction21lh {
+            return BuilderInstruction21lh(
+                instruction.opcode,
+                instruction.registerA,
+                instruction.wideLiteral
+            )
+        }
+
+        internal fun newBuilderInstruction21s(instruction: Instruction21s): BuilderInstruction21s {
+            return BuilderInstruction21s(
+                instruction.opcode,
+                instruction.registerA,
+                instruction.narrowLiteral
+            )
+        }
+
+        internal fun newBuilderInstruction22b(instruction: Instruction22b): BuilderInstruction22b {
+            return BuilderInstruction22b(
+                instruction.opcode,
+                instruction.registerA,
+                instruction.registerB,
+                instruction.narrowLiteral
+            )
+        }
+
+        internal fun newBuilderInstruction22c(instruction: Instruction22c): BuilderInstruction22c {
+            return BuilderInstruction22c(
+                instruction.opcode,
+                instruction.registerA,
+                instruction.registerB,
+                instruction.reference
+            )
+        }
+
+        internal fun newBuilderInstruction22cs(instruction: Instruction22cs): BuilderInstruction22cs {
+            return BuilderInstruction22cs(
+                instruction.opcode,
+                instruction.registerA,
+                instruction.registerB,
+                instruction.fieldOffset
+            )
+        }
+
+        internal fun newBuilderInstruction22s(instruction: Instruction22s): BuilderInstruction22s {
+            return BuilderInstruction22s(
+                instruction.opcode,
+                instruction.registerA,
+                instruction.registerB,
+                instruction.narrowLiteral
+            )
+        }
+
+        internal fun newBuilderInstruction22x(instruction: Instruction22x): BuilderInstruction22x {
+            return BuilderInstruction22x(
+                instruction.opcode,
+                instruction.registerA,
+                instruction.registerB
+            )
+        }
+
+        internal fun newBuilderInstruction23x(instruction: Instruction23x): BuilderInstruction23x {
+            return BuilderInstruction23x(
+                instruction.opcode,
+                instruction.registerA,
+                instruction.registerB,
+                instruction.registerC
+            )
+        }
+
+        internal fun newBuilderInstruction31c(instruction: Instruction31c): BuilderInstruction31c {
+            return BuilderInstruction31c(
+                instruction.opcode,
+                instruction.registerA,
+                instruction.reference
+            )
+        }
+
+        internal fun newBuilderInstruction31i(instruction: Instruction31i): BuilderInstruction31i {
+            return BuilderInstruction31i(
+                instruction.opcode,
+                instruction.registerA,
+                instruction.narrowLiteral
+            )
+        }
+
+        internal fun newBuilderInstruction32x(instruction: Instruction32x): BuilderInstruction32x {
+            return BuilderInstruction32x(
+                instruction.opcode,
+                instruction.registerA,
+                instruction.registerB
+            )
+        }
+
+        internal fun newBuilderInstruction35c(instruction: Instruction35c): BuilderInstruction35c {
+            return BuilderInstruction35c(
+                instruction.opcode,
+                instruction.registerCount,
+                instruction.registerC,
+                instruction.registerD,
+                instruction.registerE,
+                instruction.registerF,
+                instruction.registerG,
+                instruction.reference
+            )
+        }
+
+        internal fun newBuilderInstruction35mi(instruction: Instruction35mi): BuilderInstruction35mi {
+            return BuilderInstruction35mi(
+                instruction.opcode,
+                instruction.registerCount,
+                instruction.registerC,
+                instruction.registerD,
+                instruction.registerE,
+                instruction.registerF,
+                instruction.registerG,
+                instruction.inlineIndex
+            )
+        }
+
+        internal fun newBuilderInstruction35ms(instruction: Instruction35ms): BuilderInstruction35ms {
+            return BuilderInstruction35ms(
+                instruction.opcode,
+                instruction.registerCount,
+                instruction.registerC,
+                instruction.registerD,
+                instruction.registerE,
+                instruction.registerF,
+                instruction.registerG,
+                instruction.vtableIndex
+            )
+        }
+
+        internal fun newBuilderInstruction3rc(instruction: Instruction3rc): BuilderInstruction3rc {
+            return BuilderInstruction3rc(
+                instruction.opcode,
+                instruction.startRegister,
+                instruction.registerCount,
+                instruction.reference
+            )
+        }
+
+        internal fun newBuilderInstruction3rmi(instruction: Instruction3rmi): BuilderInstruction3rmi {
+            return BuilderInstruction3rmi(
+                instruction.opcode,
+                instruction.startRegister,
+                instruction.registerCount,
+                instruction.inlineIndex
+            )
+        }
+
+        internal fun newBuilderInstruction3rms(instruction: Instruction3rms): BuilderInstruction3rms {
+            return BuilderInstruction3rms(
+                instruction.opcode,
+                instruction.startRegister,
+                instruction.registerCount,
+                instruction.vtableIndex
+            )
+        }
+
+        internal fun newBuilderInstruction51l(instruction: Instruction51l): BuilderInstruction51l {
+            return BuilderInstruction51l(
+                instruction.opcode,
+                instruction.registerA,
+                instruction.wideLiteral
+            )
+        }
+    }
+}

src/main/resources/revanced-patcher/version.properties

@@ -1 +0,0 @@
-version=${projectVersion}

src/test/kotlin/app/revanced/patcher/extensions/InstructionExtensionsTest.kt

@@ -1,233 +0,0 @@
-package app.revanced.patcher.extensions
-
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstructions
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
-import app.revanced.patcher.util.smali.ExternalLabel
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.builder.BuilderOffsetInstruction
-import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
-import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction21s
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
-import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-import kotlin.test.assertEquals
-
-private object InstructionExtensionsTest {
-    private lateinit var testMethod: MutableMethod
-    private lateinit var testMethodImplementation: MutableMethodImplementation
-
-    @BeforeEach
-    fun createTestMethod() = ImmutableMethod(
-        "TestClass;",
-        "testMethod",
-        null,
-        "V",
-        AccessFlags.PUBLIC.value,
-        null,
-        null,
-        MutableMethodImplementation(16).also { testMethodImplementation = it }.apply {
-            repeat(10) { i -> this.addInstruction(TestInstruction(i)) }
-        },
-    ).let { testMethod = it.toMutable() }
-
-    @Test
-    fun addInstructionsToImplementationIndexed() = applyToImplementation {
-        addInstructions(5, getTestInstructions(5..6)).also {
-            assertRegisterIs(5, 5)
-            assertRegisterIs(6, 6)
-
-            assertRegisterIs(5, 7)
-        }
-    }
-
-    @Test
-    fun addInstructionsToImplementation() = applyToImplementation {
-        addInstructions(getTestInstructions(10..11)).also {
-            assertRegisterIs(10, 10)
-            assertRegisterIs(11, 11)
-        }
-    }
-
-    @Test
-    fun removeInstructionsFromImplementationIndexed() = applyToImplementation {
-        removeInstructions(5, 5).also { assertRegisterIs(4, 4) }
-    }
-
-    @Test
-    fun removeInstructionsFromImplementation() = applyToImplementation {
-        removeInstructions(0).also { assertRegisterIs(9, 9) }
-        removeInstructions(1).also { assertRegisterIs(1, 0) }
-        removeInstructions(2).also { assertRegisterIs(3, 0) }
-    }
-
-    @Test
-    fun replaceInstructionsInImplementationIndexed() = applyToImplementation {
-        replaceInstructions(5, getTestInstructions(0..1)).also {
-            assertRegisterIs(0, 5)
-            assertRegisterIs(1, 6)
-            assertRegisterIs(7, 7)
-        }
-    }
-
-    @Test
-    fun addInstructionToMethodIndexed() = applyToMethod {
-        addInstruction(5, TestInstruction(0)).also { assertRegisterIs(0, 5) }
-    }
-
-    @Test
-    fun addInstructionToMethod() = applyToMethod {
-        addInstruction(TestInstruction(0)).also { assertRegisterIs(0, 10) }
-    }
-
-    @Test
-    fun addSmaliInstructionToMethodIndexed() = applyToMethod {
-        addInstruction(5, getTestSmaliInstruction(0)).also { assertRegisterIs(0, 5) }
-    }
-
-    @Test
-    fun addSmaliInstructionToMethod() = applyToMethod {
-        addInstruction(getTestSmaliInstruction(0)).also { assertRegisterIs(0, 10) }
-    }
-
-    @Test
-    fun addInstructionsToMethodIndexed() = applyToMethod {
-        addInstructions(5, getTestInstructions(0..1)).also {
-            assertRegisterIs(0, 5)
-            assertRegisterIs(1, 6)
-
-            assertRegisterIs(5, 7)
-        }
-    }
-
-    @Test
-    fun addInstructionsToMethod() = applyToMethod {
-        addInstructions(getTestInstructions(0..1)).also {
-            assertRegisterIs(0, 10)
-            assertRegisterIs(1, 11)
-
-            assertRegisterIs(9, 9)
-        }
-    }
-
-    @Test
-    fun addSmaliInstructionsToMethodIndexed() = applyToMethod {
-        addInstructionsWithLabels(5, getTestSmaliInstructions(0..1)).also {
-            assertRegisterIs(0, 5)
-            assertRegisterIs(1, 6)
-
-            assertRegisterIs(5, 7)
-        }
-    }
-
-    @Test
-    fun addSmaliInstructionsToMethod() = applyToMethod {
-        addInstructions(getTestSmaliInstructions(0..1)).also {
-            assertRegisterIs(0, 10)
-            assertRegisterIs(1, 11)
-
-            assertRegisterIs(9, 9)
-        }
-    }
-
-    @Test
-    fun addSmaliInstructionsWithExternalLabelToMethodIndexed() = applyToMethod {
-        val label = ExternalLabel("testLabel", getInstruction(5))
-
-        addInstructionsWithLabels(
-            5,
-            getTestSmaliInstructions(0..1).plus("\n").plus("goto :${label.name}"),
-            label
-        ).also {
-            assertRegisterIs(0, 5)
-            assertRegisterIs(1, 6)
-            assertRegisterIs(5, 8)
-
-            val gotoTarget = getInstruction<BuilderOffsetInstruction>(7)
-                .target.location.instruction as OneRegisterInstruction
-
-            assertEquals(5, gotoTarget.registerA)
-        }
-    }
-
-    @Test
-    fun removeInstructionFromMethodIndexed() = applyToMethod {
-        removeInstruction(5).also {
-            assertRegisterIs(4, 4)
-            assertRegisterIs(6, 5)
-        }
-    }
-
-    @Test
-    fun removeInstructionsFromMethodIndexed() = applyToMethod {
-        removeInstructions(5, 5).also { assertRegisterIs(4, 4) }
-    }
-
-    @Test
-    fun removeInstructionsFromMethod() = applyToMethod {
-        removeInstructions(0).also { assertRegisterIs(9, 9) }
-        removeInstructions(1).also { assertRegisterIs(1, 0) }
-        removeInstructions(2).also { assertRegisterIs(3, 0) }
-    }
-
-    @Test
-    fun replaceInstructionInMethodIndexed() = applyToMethod {
-        replaceInstruction(5, TestInstruction(0)).also { assertRegisterIs(0, 5) }
-    }
-
-    @Test
-    fun replaceInstructionsInMethodIndexed() = applyToMethod {
-        replaceInstructions(5, getTestInstructions(0..1)).also {
-            assertRegisterIs(0, 5)
-            assertRegisterIs(1, 6)
-            assertRegisterIs(7, 7)
-        }
-    }
-
-    @Test
-    fun replaceSmaliInstructionsInMethodIndexed() = applyToMethod {
-        replaceInstructions(5, getTestSmaliInstructions(0..1)).also {
-            assertRegisterIs(0, 5)
-            assertRegisterIs(1, 6)
-            assertRegisterIs(7, 7)
-        }
-    }
-
-    // region Helper methods
-
-    private fun applyToImplementation(block: MutableMethodImplementation.() -> Unit) {
-        testMethodImplementation.apply(block)
-    }
-
-    private fun applyToMethod(block: MutableMethod.() -> Unit) {
-        testMethod.apply(block)
-    }
-
-    private fun MutableMethodImplementation.assertRegisterIs(register: Int, atIndex: Int) = assertEquals(
-        register, getInstruction<OneRegisterInstruction>(atIndex).registerA
-    )
-
-    private fun MutableMethod.assertRegisterIs(register: Int, atIndex: Int) =
-        implementation!!.assertRegisterIs(register, atIndex)
-
-    private fun getTestInstructions(range: IntRange) = range.map { TestInstruction(it) }
-
-    private fun getTestSmaliInstruction(register: Int) = "const/16 v$register, 0"
-
-    private fun getTestSmaliInstructions(range: IntRange) = range.joinToString("\n") {
-        getTestSmaliInstruction(it)
-    }
-
-    // endregion
-
-    private class TestInstruction(register: Int) : BuilderInstruction21s(Opcode.CONST_16, register, 0)
-}