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

# [1.0.0-dev.17](https://github.com/revanced/revanced-patcher/compare/v1.0.0-dev.16...v1.0.0-dev.17) (2022-05-31)

### Features

* patch dependencies annotation and `PatcherOptions` ([8442991](8442991290))

.github/ISSUE_TEMPLATE/bug-issue.yml

@@ -1,60 +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

.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,46 +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

.github/workflows/release.yml

@@ -28,6 +28,8 @@ jobs:
         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 }}

.releaserc

@@ -7,11 +7,7 @@
     }
   ],
   "plugins": [
-    ["@semantic-release/commit-analyzer", {
+    "@semantic-release/commit-analyzer",
-      "releaseRules": [
-        {"type": "build", "release": "patch"}
-      ]
-    }],
     "@semantic-release/release-notes-generator",
     "@semantic-release/changelog",
     "gradle-semantic-release-plugin",

CHANGELOG.md

@@ -1,552 +1,3 @@
-# [3.2.0](https://github.com/revanced/revanced-patcher/compare/v3.1.0...v3.2.0) (2022-08-02)
-
-
-### Features
-
-* PatchOptions#nullify to nullify an option ([371f0c4](https://github.com/revanced/revanced-patcher/commit/371f0c4d0bf96e7f6db35085efccaed3000a096c))
-
-# [3.1.0](https://github.com/revanced/revanced-patcher/compare/v3.0.0...v3.1.0) (2022-08-02)
-
-
-### Features
-
-* validator for patch options ([4e2e772](https://github.com/revanced/revanced-patcher/commit/4e2e77238957d7732326cfe5e05145bf7dab5bfb))
-
-# [3.0.0](https://github.com/revanced/revanced-patcher/compare/v2.9.0...v3.0.0) (2022-08-02)
-
-
-### Features
-
-* registry for patch options ([2431785](https://github.com/revanced/revanced-patcher/commit/2431785d0e494d6271c6951eec9adfff9db95c17))
-
-
-### BREAKING CHANGES
-
-* Patch options now use the PatchOptions registry class instead of an Iterable. This change requires modifications to existing patches using this API.
-
-# [2.9.0](https://github.com/revanced/revanced-patcher/compare/v2.8.0...v2.9.0) (2022-08-02)
-
-
-### Bug Fixes
-
-* show error message instead of `null` ([8d95b14](https://github.com/revanced/revanced-patcher/commit/8d95b14f350b47ec029f35e776f6e627aaf5f607))
-
-
-### Features
-
-* exclusive mutable access to files ([814ce0b](https://github.com/revanced/revanced-patcher/commit/814ce0b9ae29725417c86b7d11b40d025724a426))
-
-# [2.8.0](https://github.com/revanced/revanced-patcher/compare/v2.7.0...v2.8.0) (2022-08-01)
-
-
-### Bug Fixes
-
-* remove requirement for solution [skip ci] ([#80](https://github.com/revanced/revanced-patcher/issues/80)) ([9a4d30e](https://github.com/revanced/revanced-patcher/commit/9a4d30e15234ef62844f035c58a1143674d4c12e))
-
-
-### Features
-
-* patch options ([#81](https://github.com/revanced/revanced-patcher/issues/81)) ([fbb09f3](https://github.com/revanced/revanced-patcher/commit/fbb09f38dce49adc7f63b71bdf2df2ef0b84db04))
-
-# [2.7.0](https://github.com/revanced/revanced-patcher/compare/v2.6.0...v2.7.0) (2022-08-01)
-
-
-### Features
-
-* `Closeable` patches ([bbd40bf](https://github.com/revanced/revanced-patcher/commit/bbd40bf2f6ff200705f2bcb272dd1680bb244e3f))
-
-# [2.6.0](https://github.com/revanced/revanced-patcher/compare/v2.5.2...v2.6.0) (2022-07-31)
-
-
-### Features
-
-* add Patch#dependsOn extension ([523f67b](https://github.com/revanced/revanced-patcher/commit/523f67b238646caaa9b7676a0e238ce82adbdda4))
-* Soft Dependencies for Patches ([8c12f8d](https://github.com/revanced/revanced-patcher/commit/8c12f8d488f939cc932e826aad0b20876ae165b7))
-
-## [2.5.2](https://github.com/revanced/revanced-patcher/compare/v2.5.1...v2.5.2) (2022-07-24)
-
-## [2.5.1](https://github.com/revanced/revanced-patcher/compare/v2.5.0...v2.5.1) (2022-07-17)
-
-
-### Bug Fixes
-
-* close stream when closing `DomFileEditor` ([77604d4](https://github.com/revanced/revanced-patcher/commit/77604d40785847b775155c0e75b663a3c7336aa3))
-
-# [2.5.0](https://github.com/revanced/revanced-patcher/compare/v2.4.0...v2.5.0) (2022-07-11)
-
-
-### Bug Fixes
-
-* missing additional items [skip ci] ([0ebab8b](https://github.com/revanced/revanced-patcher/commit/0ebab8bf598d993df6e340651205cba48f1ef725))
-
-
-### Features
-
-* feature request issue template ([1b39278](https://github.com/revanced/revanced-patcher/commit/1b39278b24ba2f964d93bd8ad2e28472ee036d90))
-* issue templates [skip ci] ([112bc99](https://github.com/revanced/revanced-patcher/commit/112bc998f4761a647cb9eab7454e35264fa96fd9))
-
-# [2.4.0](https://github.com/revanced/revanced-patcher/compare/v2.3.1...v2.4.0) (2022-07-09)
-
-
-### Features
-
-* Improve Smali Compiler ([6bfe571](https://github.com/revanced/revanced-patcher/commit/6bfe5716c38181bbe9476b5c6ad29526edb4e022))
-
-## [2.3.1](https://github.com/revanced/revanced-patcher/compare/v2.3.0...v2.3.1) (2022-07-07)
-
-
-### Bug Fixes
-
-* handle null properly ([#64](https://github.com/revanced/revanced-patcher/issues/64)) ([482af78](https://github.com/revanced/revanced-patcher/commit/482af78f2ba23b8003fc9961df5fde54d7295d5c))
-
-# [2.3.0](https://github.com/revanced/revanced-patcher/compare/v2.2.2...v2.3.0) (2022-07-05)
-
-
-### Features
-
-* nullability for `BytecodePatch` constructor ([#59](https://github.com/revanced/revanced-patcher/issues/59)) ([4ea030d](https://github.com/revanced/revanced-patcher/commit/4ea030d0a03f736bbecbd491317ba2167b18fe94))
-
-## [2.2.2](https://github.com/revanced/revanced-patcher/compare/v2.2.1...v2.2.2) (2022-07-04)
-
-
-### Bug Fixes
-
-* `MethodWalker` not accounting for all reference instructions ([48068cb](https://github.com/revanced/revanced-patcher/commit/48068cb3d79e283ff1cad9f3f78dc1d0fcd14f83))
-
-## [2.2.1](https://github.com/revanced/revanced-patcher/compare/v2.2.0...v2.2.1) (2022-07-03)
-
-
-### Bug Fixes
-
-* more useful error message ([4b2e323](https://github.com/revanced/revanced-patcher/commit/4b2e3230ec74fa3a57ae86067e5cb7cecbe45013))
-
-# [2.2.0](https://github.com/revanced/revanced-patcher/compare/v2.1.2...v2.2.0) (2022-07-02)
-
-
-### Bug Fixes
-
-* DomFileEditor opening in- and output streams on the same file ([83187c9](https://github.com/revanced/revanced-patcher/commit/83187c9edd7b088bc18960c5eb9a2042ca536b5f))
-
-
-### Features
-
-* remove deprecated functions ([ada5a03](https://github.com/revanced/revanced-patcher/commit/ada5a033de3cf94e7255ec2d522520f86431f001))
-* streams overload for `XmlFileHolder` ([6f72c4c](https://github.com/revanced/revanced-patcher/commit/6f72c4c4c051e48c8d03d2a7b2cfc1c53028ed86))
-
-# [2.2.0-dev.3](https://github.com/revanced/revanced-patcher/compare/v2.2.0-dev.2...v2.2.0-dev.3) (2022-07-02)
-
-
-### Bug Fixes
-
-* DomFileEditor opening in- and output streams on the same file ([83187c9](https://github.com/revanced/revanced-patcher/commit/83187c9edd7b088bc18960c5eb9a2042ca536b5f))
-
-# [2.2.0-dev.2](https://github.com/revanced/revanced-patcher/compare/v2.2.0-dev.1...v2.2.0-dev.2) (2022-07-02)
-
-
-### Features
-
-* streams overload for `XmlFileHolder` ([6f72c4c](https://github.com/revanced/revanced-patcher/commit/6f72c4c4c051e48c8d03d2a7b2cfc1c53028ed86))
-
-# [2.2.0-dev.1](https://github.com/revanced/revanced-patcher/compare/v2.1.2...v2.2.0-dev.1) (2022-07-02)
-
-
-### Features
-
-* remove deprecated functions ([ada5a03](https://github.com/revanced/revanced-patcher/commit/ada5a033de3cf94e7255ec2d522520f86431f001))
-
-## [2.1.2](https://github.com/revanced/revanced-patcher/compare/v2.1.1...v2.1.2) (2022-06-29)
-
-
-### Bug Fixes
-
-* invert fingerprint resolution condition of `customFingerprint` ([e2faf4c](https://github.com/revanced/revanced-patcher/commit/e2faf4ca9b6de23300b20ab471ee9dc365b04339))
-
-## [2.1.1](https://github.com/revanced/revanced-patcher/compare/v2.1.0...v2.1.1) (2022-06-28)
-
-# [2.1.0](https://github.com/revanced/revanced-patcher/compare/v2.0.4...v2.1.0) (2022-06-28)
-
-
-### Features
-
-* log failed patches due to failed dependencies ([a467fbb](https://github.com/revanced/revanced-patcher/commit/a467fbb704eebe812cdec14025398dab2af43959))
-
-## [2.0.4](https://github.com/revanced/revanced-patcher/compare/v2.0.3...v2.0.4) (2022-06-27)
-
-## [2.0.3](https://github.com/revanced/revanced-patcher/compare/v2.0.2...v2.0.3) (2022-06-27)
-
-## [2.0.2](https://github.com/revanced/revanced-patcher/compare/v2.0.1...v2.0.2) (2022-06-27)
-
-## [2.0.1](https://github.com/revanced/revanced-patcher/compare/v2.0.0...v2.0.1) (2022-06-26)
-
-
-### Bug Fixes
-
-* use `Exception` instead of `MethodNotFoundException` ([2fc4ec4](https://github.com/revanced/revanced-patcher/commit/2fc4ec40217a917ea6106ddc87be332f725aa13c))
-
-# [2.0.0](https://github.com/revanced/revanced-patcher/compare/v1.11.0...v2.0.0) (2022-06-26)
-
-
-### Code Refactoring
-
-* migrate from `Signature` to `Fingerprint` ([efa8ea1](https://github.com/revanced/revanced-patcher/commit/efa8ea144528fcff588e782468845c315a7d6abd))
-
-
-### BREAKING CHANGES
-
-* Not backwards compatible, since a lot of classes where renamed.
-
-# [1.11.0](https://github.com/revanced/revanced-patcher/compare/v1.10.2...v1.11.0) (2022-06-24)
-
-
-### Features
-
-* add replace and remove extensions ([#50](https://github.com/revanced/revanced-patcher/issues/50)) ([92ac5e4](https://github.com/revanced/revanced-patcher/commit/92ac5e4dc25f612856e2b5e528cf5fd48a5f20af))
-
-## [1.10.2](https://github.com/revanced/revanced-patcher/compare/v1.10.1...v1.10.2) (2022-06-23)
-
-
-### Bug Fixes
-
-* dexlib must be propagated ([b738dcd](https://github.com/revanced/revanced-patcher/commit/b738dcd7ea04f5fe56e66af46fb11541fe54f6af))
-
-## [1.10.1](https://github.com/revanced/revanced-patcher/compare/v1.10.0...v1.10.1) (2022-06-23)
-
-
-### Bug Fixes
-
-* callback only when inteded ([e3bf367](https://github.com/revanced/revanced-patcher/commit/e3bf367ad6615b30b06027d65f906b2588567a7f))
-* mutability of local variable `modified` ([0e87ef5](https://github.com/revanced/revanced-patcher/commit/0e87ef56c418d5c37d58abb9b27f85e25fd44f81))
-
-# [1.10.0](https://github.com/revanced/revanced-patcher/compare/v1.9.0...v1.10.0) (2022-06-23)
-
-
-### Features
-
-* improve logging ([c20dfe1](https://github.com/revanced/revanced-patcher/commit/c20dfe12d5c737264b844e6634de11bf1e1629f0))
-
-# [1.9.0](https://github.com/revanced/revanced-patcher/compare/v1.8.0...v1.9.0) (2022-06-22)
-
-
-### Bug Fixes
-
-* callback for each file instead of class ([930768d](https://github.com/revanced/revanced-patcher/commit/930768dfb31dc5fa6c248050b08ac117c40ee0a3))
-
-
-### Features
-
-* yield the patch result ([dde5385](https://github.com/revanced/revanced-patcher/commit/dde5385232abddc8a85d6e9a939549b71dd9130e))
-
-# [1.8.0](https://github.com/revanced/revanced-patcher/compare/v1.7.2...v1.8.0) (2022-06-22)
-
-
-### Features
-
-* logging class ([caf2745](https://github.com/revanced/revanced-patcher/commit/caf2745805ffd4b59fa81e79cc489b1a1a5c5d89))
-
-## [1.7.2](https://github.com/revanced/revanced-patcher/compare/v1.7.1...v1.7.2) (2022-06-22)
-
-
-### Bug Fixes
-
-* add execute permission to `./gradlew` file ([#46](https://github.com/revanced/revanced-patcher/issues/46)) ([34f607a](https://github.com/revanced/revanced-patcher/commit/34f607aa24d89a777d906cc887203f343ce3fd07))
-
-## [1.7.1](https://github.com/revanced/revanced-patcher/compare/v1.7.0...v1.7.1) (2022-06-22)
-
-
-### Reverts
-
-* revert "feat: use of `java.util.logging.Logger`" ([e8488b3](https://github.com/revanced/revanced-patcher/commit/e8488b3e86e0132011824f8ecba29e64f8db0573))
-
-# [1.7.0](https://github.com/revanced/revanced-patcher/compare/v1.6.0...v1.7.0) (2022-06-22)
-
-
-### Features
-
-* migrate logger to `slf4j` ([8f66f9f](https://github.com/revanced/revanced-patcher/commit/8f66f9f606a785ac947b0e553822877f211d82df))
-
-# [1.6.0](https://github.com/revanced/revanced-patcher/compare/v1.5.0...v1.6.0) (2022-06-22)
-
-
-### Features
-
-* use of `java.util.logging.Logger` ([9c39c9e](https://github.com/revanced/revanced-patcher/commit/9c39c9efdb5d48ddaffce7f711c275e732b0b2d9))
-
-# [1.5.0](https://github.com/revanced/revanced-patcher/compare/v1.4.0...v1.5.0) (2022-06-22)
-
-
-### Features
-
-* use streams to write the dex files ([64bae88](https://github.com/revanced/revanced-patcher/commit/64bae884dcb72550a3218e149f3ca0fd0ca03aaf))
-
-# [1.4.0](https://github.com/revanced/revanced-patcher/compare/v1.3.4...v1.4.0) (2022-06-22)
-
-
-### Features
-
-* return a `File` instance instead of `ExtFile` ([68174bb](https://github.com/revanced/revanced-patcher/commit/68174bbd6b4df47a91b610c2b97dbae55b594163))
-
-## [1.3.4](https://github.com/revanced/revanced-patcher/compare/v1.3.3...v1.3.4) (2022-06-21)
-
-
-### Bug Fixes
-
-* `String.toInstructions` defaulting `forStaticMethod` to `false` ([5a2f02b](https://github.com/revanced/revanced-patcher/commit/5a2f02b97dcde95dbe901fa68cca6c6c0219cb82)), closes [revanced/revanced-patches#46](https://github.com/revanced/revanced-patches/issues/46)
-
-## [1.3.3](https://github.com/revanced/revanced-patcher/compare/v1.3.2...v1.3.3) (2022-06-21)
-
-
-### Bug Fixes
-
-* add docs (trigger release) ([6628b78](https://github.com/revanced/revanced-patcher/commit/6628b7870fc052da40be0d50a7e2b0b6c57743cc))
-
-
-### Reverts
-
-* propagate dependencies ([365e1d7](https://github.com/revanced/revanced-patcher/commit/365e1d7a4507b918a4c8170ce2c88f6c8ff1d474))
-
-## [1.3.2](https://github.com/revanced/revanced-patcher/compare/v1.3.1...v1.3.2) (2022-06-21)
-
-
-### Bug Fixes
-
-* return resourceFile to caller ([1f75777](https://github.com/revanced/revanced-patcher/commit/1f75777cf985bf08483033ec541937d3e733347b))
-
-## [1.3.1](https://github.com/revanced/revanced-patcher/compare/v1.3.0...v1.3.1) (2022-06-21)
-
-
-### Bug Fixes
-
-* `InlineSmaliCompiler.compile` using 0 registers instead of 1 by default ([835a421](https://github.com/revanced/revanced-patcher/commit/835a421cc0588b92c2995e9d74727069d14b1750))
-
-# [1.3.0](https://github.com/revanced/revanced-patcher/compare/v1.2.9...v1.3.0) (2022-06-20)
-
-
-### Features
-
-* `parametersCount` for `InlineSmaliCompiler` instead of `parameters` ([ad6c5c8](https://github.com/revanced/revanced-patcher/commit/ad6c5c827389d10eae473dc66557a699df8c3280))
-* simplify adding instructions ([e47b67d](https://github.com/revanced/revanced-patcher/commit/e47b67d7ec521f288644afb89baf4146dc9bc87d))
-
-## [1.2.9](https://github.com/revanced/revanced-patcher/compare/v1.2.8...v1.2.9) (2022-06-20)
-
-
-### Bug Fixes
-
-* update apktool ([ab866bb](https://github.com/revanced/revanced-patcher/commit/ab866bb8ef4792d8f2a51edc79e687b5b636c621))
-
-## [1.2.8](https://github.com/revanced/revanced-patcher/compare/v1.2.7...v1.2.8) (2022-06-18)
-
-
-### Bug Fixes
-
-* update apktool ([051afd9](https://github.com/revanced/revanced-patcher/commit/051afd98d065f71556392139d77c20b4c2dc7dd1))
-
-## [1.2.7](https://github.com/revanced/revanced-patcher/compare/v1.2.6...v1.2.7) (2022-06-18)
-
-
-### Bug Fixes
-
-* version not working with apktool due to cache ([03f5ee0](https://github.com/revanced/revanced-patcher/commit/03f5ee088b1b96b88cb7aeb323443b6209a13950))
-
-## [1.2.6](https://github.com/revanced/revanced-patcher/compare/v1.2.5...v1.2.6) (2022-06-18)
-
-
-### Bug Fixes
-
-* remove javadoc jar (also trigger release) ([56f6ca3](https://github.com/revanced/revanced-patcher/commit/56f6ca38919b522c0d5558eabffa4aee41cc0b0b))
-
-## [1.2.5](https://github.com/revanced/revanced-patcher/compare/v1.2.4...v1.2.5) (2022-06-17)
-
-
-### Bug Fixes
-
-* goodbye security ([8f3ac77](https://github.com/revanced/revanced-patcher/commit/8f3ac7702a2b3ee98c55aeac6a1b9972f99664cc))
-
-## [1.2.4](https://github.com/revanced/revanced-patcher/compare/v1.2.3...v1.2.4) (2022-06-15)
-
-
-### Reverts
-
-* "fix: enforce aapt v1" ([dfd8a24](https://github.com/revanced/revanced-patcher/commit/dfd8a245124f85b1b028bbba197c70c8dca689b6))
-
-## [1.2.3](https://github.com/revanced/revanced-patcher/compare/v1.2.2...v1.2.3) (2022-06-14)
-
-
-### Bug Fixes
-
-* enforce aapt v1 ([cff87ff](https://github.com/revanced/revanced-patcher/commit/cff87ff0770d774d7ef79eec5a22462eadbcb9c5))
-
-## [1.2.2](https://github.com/revanced/revanced-patcher/compare/v1.2.1...v1.2.2) (2022-06-14)
-
-
-### Bug Fixes
-
-* enforce aapt v2 ([b68b0bf](https://github.com/revanced/revanced-patcher/commit/b68b0bf3d735f54b92ad7dad8132f77e9007063f))
-
-## [1.2.1](https://github.com/revanced/revanced-patcher/compare/v1.2.0...v1.2.1) (2022-06-14)
-
-
-### Bug Fixes
-
-* Patcher setting BuildOptions too late ([6a5c873](https://github.com/revanced/revanced-patcher/commit/6a5c8735fb8a5d6f7e9c606734b6684c7fa99e7f))
-
-# [1.2.0](https://github.com/revanced/revanced-patcher/compare/v1.1.0...v1.2.0) (2022-06-14)
-
-
-### Features
-
-* allow custom framework path to be specified ([d3a580e](https://github.com/revanced/revanced-patcher/commit/d3a580ea19d7c2d5d8c97650b1e6396ea0a7fc25))
-
-# [1.1.0](https://github.com/revanced/revanced-patcher/compare/v1.0.0...v1.1.0) (2022-06-11)
-
-
-### Bug Fixes
-
-* resource patcher ([31815ca](https://github.com/revanced/revanced-patcher/commit/31815ca9ea990f16b3600d61fd570c1805be1c82))
-* update apktool to fork ([566ecef](https://github.com/revanced/revanced-patcher/commit/566ecefa2bd4cde5ebfb2b22dc56cd8bf9f396bd))
-
-
-### Features
-
-* allow custom aapt path to be specified ([8eb4a8f](https://github.com/revanced/revanced-patcher/commit/8eb4a8f87ae7679a272f3224273a37a31d4bb121))
-
-# 1.0.0 (2022-06-05)
-
-
-### Bug Fixes
-
-* `compareSignatureToMethod` not matching correctly in case opcodes are null ([cca12aa](https://github.com/revanced/revanced-patcher/commit/cca12aa34a60d766c02e55241df847f7d230d4d7))
-* `ConcurrentModificationException` while iterating through `proxies` and modifying it ([6cb7cdb](https://github.com/revanced/revanced-patcher/commit/6cb7cdb0b2a2b954adb04033e0f2d3ccb4604545))
-* `JarPatchBundle` loading non-class files to class loader ([849616d](https://github.com/revanced/revanced-patcher/commit/849616dc2b6e30ec1fa1d8a8f9c1f881fc11676a))
-* `PackageMetadata` ([7399450](https://github.com/revanced/revanced-patcher/commit/739945013962fd80d2635fff126d84046870f956))
-* `replaceWith` not replacing classes with used class proxies ([4178a1e](https://github.com/revanced/revanced-patcher/commit/4178a1eedce1436ffeb3ddd6952ce0b6ec87d5a0))
-* adding existing classes to the patchers cache ([9659a61](https://github.com/revanced/revanced-patcher/commit/9659a61c5c3a84714160b78b32cc337a97c8caa9))
-* always return PatchResultSuccess on patch success ([996c4ac](https://github.com/revanced/revanced-patcher/commit/996c4acb2061db776430ad8b07bfdb3fe32861f6))
-* applying no patches throwing error ([5ca5a1c](https://github.com/revanced/revanced-patcher/commit/5ca5a1c29e087ce7e4b6d5e593b775365803151d))
-* applyPatches not returning successful patches ([f806cb3](https://github.com/revanced/revanced-patcher/commit/f806cb38c571cdd22016396ee1874ee18c91b79f))
-* avoid ignoring test resources (fixes [#1](https://github.com/revanced/revanced-patcher/issues/1)) ([d5a3c76](https://github.com/revanced/revanced-patcher/commit/d5a3c76389ba902c22ddc8b7ba1a110b7ff852df))
-* Classes not being written properly because of array shifting ([6e4db11](https://github.com/revanced/revanced-patcher/commit/6e4db110c8fdd16fb0c0ce81f427d84f2a3b6ee0))
-* current must be calculated after increment ([5f12bab](https://github.com/revanced/revanced-patcher/commit/5f12bab5df97fbe6e2e62c1bf2814a2e682ab4f3))
-* failing tests temporarily ([fc05fe7](https://github.com/revanced/revanced-patcher/commit/fc05fe79deec2486bb746d33e803ad052e68f8de))
-* fix classes having multiple instances of fields ([7cc8a7d](https://github.com/revanced/revanced-patcher/commit/7cc8a7dec321774c1d3f2f1a87ac91f952c4fb7e))
-* fix classes having multiple method instances ([398239d](https://github.com/revanced/revanced-patcher/commit/398239dc10a3ea04e46adb3be176c897876e5587))
-* Fixed writer & signature resolver, improved tests & speed, minor refactoring ([e6c2501](https://github.com/revanced/revanced-patcher/commit/e6c2501539540301d5b70014de460e5452a09b04))
-* fuzzy resolver warning params were turned around ([e5bea06](https://github.com/revanced/revanced-patcher/commit/e5bea06353805f004d607124a8ebed138f84d583))
-* give ClassWriter a ClassReader for symtable ([41749ba](https://github.com/revanced/revanced-patcher/commit/41749ba8290b2dec5dd2ab6e0bc9d714887a1a05))
-* **gradle:** publish source and javadocs ([c236ebe](https://github.com/revanced/revanced-patcher/commit/c236ebe0789f9c78d610769f0feda2b64fa4a128))
-* incorrect pattern offset ([f3b5f67](https://github.com/revanced/revanced-patcher/commit/f3b5f67b395167c1b9411b2374f3ef584b57b6cf))
-* **Io:** fix finding classes by name ([b957501](https://github.com/revanced/revanced-patcher/commit/b957501e709028005c4d6c7857022980205b6861))
-* **Io:** JAR loading and saving ([#8](https://github.com/revanced/revanced-patcher/issues/8)) ([310a7c4](https://github.com/revanced/revanced-patcher/commit/310a7c446b547d84b02c5da2161958e77ce69f0d))
-* make `methodMetadata` nullable in `MethodSignatureMetadata` ([4e56652](https://github.com/revanced/revanced-patcher/commit/4e566524299674426fb0344d09db3b0c1cb3d300))
-* make warnings nullable instead of lateinit ([8f1a629](https://github.com/revanced/revanced-patcher/commit/8f1a629191668e05917dc797e486647e55276d59))
-* match to correct signature method parameters ([1ee2e4b](https://github.com/revanced/revanced-patcher/commit/1ee2e4ba56097c5e06c93c9ce04cb5543f0e4a67))
-* **MethodResolver:** fix cd57a8c9a0db7e3ae5ad0bca202e5955930319ab ([cbd8df2](https://github.com/revanced/revanced-patcher/commit/cbd8df2df008ef37c6b43e2a8442c41f24be9358))
-* **MethodResolver:** strip labels and line numbers so opcode patterns match ([699c730](https://github.com/revanced/revanced-patcher/commit/699c730a7cecf31878827d645e845490a37de4cb))
-* **MethodResolver:** strip labels nodes so opcode patterns match ([82c5306](https://github.com/revanced/revanced-patcher/commit/82c530650f926dd026d263cfe23a7d67cb27bbf2))
-* MethodSignature#resolved throwing an exception ([c612676](https://github.com/revanced/revanced-patcher/commit/c612676543282155143471b71a095e26023806ea))
-* Move proxy package out of cache package ([ce21bd6](https://github.com/revanced/revanced-patcher/commit/ce21bd60f34d78b94d6d85f2c5375bc934ed4091))
-* null check causing an exception ([338bd9f](https://github.com/revanced/revanced-patcher/commit/338bd9f7394afd84e5e195a7f8155c813812cfb5))
-* nullable signature members ([#10](https://github.com/revanced/revanced-patcher/issues/10)) ([674461f](https://github.com/revanced/revanced-patcher/commit/674461f08daabbf92cb54e4eadb408226fac47af))
-* Patch should have access to the Cache ([4dd820f](https://github.com/revanced/revanced-patcher/commit/4dd820ffdf1b98fe41b50f7cb2670b89acfbb99d))
-* Patcher not writing resolved methods ([fac44a5](https://github.com/revanced/revanced-patcher/commit/fac44a50c39d8c102bd3e7ca4dd1bb86d29f7b57))
-* qualifying `Element` with wrong package ([024fa86](https://github.com/revanced/revanced-patcher/commit/024fa867e115f984cfa3e395b78f4f43aa81709b))
-* reaching all constructors not possible ([c459beb](https://github.com/revanced/revanced-patcher/commit/c459beb5f898d797f2f03ed36326bd9cfad03d31))
-* reformat (trigger release) ([bf48945](https://github.com/revanced/revanced-patcher/commit/bf4894592bf9ee9c6233abc91f538b7b8ef986a0))
-* remove broken code ([0e72a6e](https://github.com/revanced/revanced-patcher/commit/0e72a6e85ff9a6035510680fc5e33ab0cd14144f))
-* remove dependency to fork of Apktool ([11abc67](https://github.com/revanced/revanced-patcher/commit/11abc67d9ab7d7b273fd4cd4c53af54008a80585))
-* remove leftover debug code ([0f30eac](https://github.com/revanced/revanced-patcher/commit/0f30eac32ce66d8b90906c02ef7e7854feeecc33))
-* return mutable set of classes ([66a9b76](https://github.com/revanced/revanced-patcher/commit/66a9b768457e98fdde0b61f9a8d6aed4c1872027))
-* returning failure on success ([48c4ea2](https://github.com/revanced/revanced-patcher/commit/48c4ea2f6d9de319383a49ea2d4c6ffb4f687a2b))
-* Search method map for existing class proxy ([a1e909b](https://github.com/revanced/revanced-patcher/commit/a1e909b16337c538f8f8b475801d8b1804163bfe))
-* set index for insertAt to 0 by default ([d5b4c99](https://github.com/revanced/revanced-patcher/commit/d5b4c99c00272e3e5afec2fa0a489ba618f2a81a))
-* set marklimit to Integer.MAX_VALUE ([e6e468f](https://github.com/revanced/revanced-patcher/commit/e6e468fbb5c20b08c8bd59bafc794acea907e4b4))
-* string signature in `SignatureResolver` ([e5ae970](https://github.com/revanced/revanced-patcher/commit/e5ae9700096924e63b15a08079dce40ae07202d8))
-* Suppress unused for addFiles ([3d6a1d3](https://github.com/revanced/revanced-patcher/commit/3d6a1d38f339ce2c5d82b7ac46c208c6702d6d44))
-* throwing in case the opcode patterns do not match ([3144ec8](https://github.com/revanced/revanced-patcher/commit/3144ec872ac8651b8c0a9311ae508d5c3cc734ce))
-* use Array instead of Iterable for methodParameters ([dfac8f0](https://github.com/revanced/revanced-patcher/commit/dfac8f03a362fd273527f552d9eae121505fd4e0))
-* using old instance of `Androlib` when saving ([a4d8be2](https://github.com/revanced/revanced-patcher/commit/a4d8be20fcd444b08ec9c43f9f7029f8bacbbc41))
-* workflow on dev branch ([428f7f4](https://github.com/revanced/revanced-patcher/commit/428f7f4decb00d28c9bf137ef4cd1d5fd4a0821e))
-* write all classes ([f068fc8](https://github.com/revanced/revanced-patcher/commit/f068fc87ff8e204826639318af39e48e683254da))
-
-
-### Code Refactoring
-
-* bump multidexlib2 to 2.5.2.r2 ([a6c6b49](https://github.com/revanced/revanced-patcher/commit/a6c6b4979af42936cb26608541a4f7a66393b3f0))
-* Change all references from Array to Iterable ([72f3cad](https://github.com/revanced/revanced-patcher/commit/72f3cad3f98001b0109b07373ed9cc57a9001cfa))
-* convert Patch to abstract class ([cb9b1b9](https://github.com/revanced/revanced-patcher/commit/cb9b1b9416c699c68d0fca228d4f8ca6fb634cb5))
-* Optimize Signature class ([#11](https://github.com/revanced/revanced-patcher/issues/11)) ([7faa001](https://github.com/revanced/revanced-patcher/commit/7faa001406c1f28dc2182cf6d1ab19504f4e3eb9))
-* Rename `net.revanced` to `app.revanced` ([7087230](https://github.com/revanced/revanced-patcher/commit/70872307e33282b37dd5fb315b56022ab73bf582))
-
-
-### Features
-
-* `Dependencies` annotation ([893d4c6](https://github.com/revanced/revanced-patcher/commit/893d4c699bad4c70002fc691c261447d01948b5c))
-* `PatchLoader` ([ec9fd15](https://github.com/revanced/revanced-patcher/commit/ec9fd15f9b9b9968be7fb5cb384eb8ee2a0c9ba3))
-* Add `findParentMethod` utility method ([#4](https://github.com/revanced/revanced-patcher/issues/4)) ([bbb2c54](https://github.com/revanced/revanced-patcher/commit/bbb2c547aae8dd774a1a883de24fe45da463fa35))
-* add `MethodWalker` ([7755bbc](https://github.com/revanced/revanced-patcher/commit/7755bbc645773e49053fb9ad2b6fd18a7f488659))
-* add `p` naming scheme to smali compiler ([79909cf](https://github.com/revanced/revanced-patcher/commit/79909cf260c0578e88ad22d63397957dbaa91702))
-* add extensions for cloning methods ([01bfbd6](https://github.com/revanced/revanced-patcher/commit/01bfbd656ee06cb2cab951c43d7f76a465a40830))
-* add findClass method with className ([4087f49](https://github.com/revanced/revanced-patcher/commit/4087f498638ee88ba3eaca792039fe481f404732))
-* Add first tests ([544bcf7](https://github.com/revanced/revanced-patcher/commit/544bcf76bd8a8c790c2f799606ad8c9ac7d2aa82))
-* add fuzzy resolver ([7a56dca](https://github.com/revanced/revanced-patcher/commit/7a56dca004cd793121a59ea854c77f4c1a01bd6f))
-* add immutableMethod ([c63b20f](https://github.com/revanced/revanced-patcher/commit/c63b20fa65aba8bb060a4a7a652747cba7198c2b))
-* add inline smali compiler ([bfe4e3e](https://github.com/revanced/revanced-patcher/commit/bfe4e3e298ac963936ca9621e12aefbe56260826))
-* add missing test for fields ([6b8b057](https://github.com/revanced/revanced-patcher/commit/6b8b0573d479e227b45dc36a6abac622c3ccebdd))
-* add or extension for AccessFlags ([00c85b5](https://github.com/revanced/revanced-patcher/commit/00c85b5d750ccc8de69ad4101220b19eeaf99bcb))
-* Add patch metadata ([642e903](https://github.com/revanced/revanced-patcher/commit/642e9031eb3727ebdca22c75b7c5c602a8775da0)), closes [ReVancedTeam/revanced-patches#1](https://github.com/ReVancedTeam/revanced-patches/issues/1)
-* add SafeClassWriter ([6626014](https://github.com/revanced/revanced-patcher/commit/6626014ef3dde2f98a53f75d71eeb0de85189bf3))
-* Add warnings for Fuzzy resolver ([715a2ad](https://github.com/revanced/revanced-patcher/commit/715a2ad025d127b5a8225ce50202a859f53c7f50))
-* allow classes to be overwritten in addFiles and resolve signatures when applyPatches is called ([1db735b](https://github.com/revanced/revanced-patcher/commit/1db735b1e2b570bdb1ddce0b9cd724c580113a84))
-* Allow unknown opcodes using `null` ([0e5f4ba](https://github.com/revanced/revanced-patcher/commit/0e5f4ba2d55288415c4d1be70ab6a8ab8c1c0d10))
-* Finish first patcher test ([0d8d19e](https://github.com/revanced/revanced-patcher/commit/0d8d19e708a47315e28e7493618568ea40f1e062))
-* Improve `SignatureResolver` ([139a23b](https://github.com/revanced/revanced-patcher/commit/139a23b7500a2d2577df47caf3fd0c5ec891a8d8))
-* migrate to `DexPatchBundle` and `JarPatchBundle` ([8615798](https://github.com/revanced/revanced-patcher/commit/8615798711185b30ce622d9d09faba21f3a92f97))
-* migrate to dexlib ([3651981](https://github.com/revanced/revanced-patcher/commit/36519811610192e299834e9d00627a94faad56a9))
-* Minor refactor and return proxy, if class has been proxied already ([4b26305](https://github.com/revanced/revanced-patcher/commit/4b26305bd57ba9e3eb3e34218ffe10d6c5a2f598))
-* optional `forStaticMethod` parameter for `InlineSmaliCompiler.compileMethodInstructions` ([41e8860](https://github.com/revanced/revanced-patcher/commit/41e88605c33d1f0d9e7f5466cac03a3b339afb82))
-* patch dependencies annotation and `PatcherOptions` ([6c65952](https://github.com/revanced/revanced-patcher/commit/6c65952d80a795a3ef4a37877123e9375025d3ae))
-* properly manage `ClassProxy` & add `ProxyBackedClassList` ([6cb1fdf](https://github.com/revanced/revanced-patcher/commit/6cb1fdf6171e1ab75b7ee28163965eacc00cc5a0))
-* remaining mutable `EncodedValue` classes ([3f97cc8](https://github.com/revanced/revanced-patcher/commit/3f97cc8e1fa10546d7069e01e5e66a537b0d6f7e))
-* string signature ([#22](https://github.com/revanced/revanced-patcher/issues/22)) ([612515a](https://github.com/revanced/revanced-patcher/commit/612515acf8539febf952f258d30aa3d4b631e3b7))
-* use annotations instead of metadata objects ([d20f7fd](https://github.com/revanced/revanced-patcher/commit/d20f7fd6e1ede6ec7baccb1500ab3fc66d78df73))
-* utility functions to get metadata of patch & sigs ([54511a4](https://github.com/revanced/revanced-patcher/commit/54511a4fc6417d7fe0c868d441e7d6b0ec9e218d))
-
-
-### Performance Improvements
-
-* check type instead of class ([c7ef264](https://github.com/revanced/revanced-patcher/commit/c7ef2644d83e1d8e84decb0631a6549d394180fc))
-* decode manifest only when not using resource patcher ([4f60bea](https://github.com/revanced/revanced-patcher/commit/4f60bea81e0bbe85dc6c3150238980292a1e52ab))
-* depend on `androlib` instead of `ApkDecoder` ([cc9416d](https://github.com/revanced/revanced-patcher/commit/cc9416dd11b66140c2882021cbe5088659d85371))
-* do not resolve empty signatures list ([b1eebc9](https://github.com/revanced/revanced-patcher/commit/b1eebc99a71269df33c37f35c1f56ea20a9d6bc0))
-* lazy-ify all mutable clones ([d18a3b6](https://github.com/revanced/revanced-patcher/commit/d18a3b6a28cae4fcb1c4986903208298ee50b083))
-* optimize indexOf call away ([9991f39](https://github.com/revanced/revanced-patcher/commit/9991f39c9a4fa22a221aab0bbf9e08ca7f967fa9))
-* use Set instead of List since there are no dupes ([e65ebd2](https://github.com/revanced/revanced-patcher/commit/e65ebd27c250b1735acf73af0f6b03274b0137f6))
-* use String List and compare instead of any lambda ([5bd416b](https://github.com/revanced/revanced-patcher/commit/5bd416b409290906a6378344f70391e8692ae27f))
-
-
-### Reverts
-
-* AccessFlag extensions not working with IDE ([0bfb92a](https://github.com/revanced/revanced-patcher/commit/0bfb92a0cbd72df5ba513264efb583e201cfcf82))
-* previous commits check for dupes in dexFile, not cache ([e810197](https://github.com/revanced/revanced-patcher/commit/e810197e2aa64534f2e8637165d884cbefbce8ae))
-
-
-### BREAKING CHANGES
-
-* arrayOf has to be changed to listOf.
-* Method signature of Patcher#save() was changed to comply with the changes of multidexlib2.
-* Removed usage of ASM library
-* Array<Int> was changed to IntArray. This breaks existing patches.
-* Package name was changed from "net.revanced" to "app.revanced"
-* Method signature of execute() was changed to include the cache, this will break existing implementations of the Patch class.
-* Patch class is now an abstract class. You must implement it. You can use anonymous implements, like done in the tests.
-
-# [1.0.0-dev.18](https://github.com/revanced/revanced-patcher/compare/v1.0.0-dev.17...v1.0.0-dev.18) (2022-06-04)
-
-
-### Features
-
-* `Dependencies` annotation ([83d608a](https://github.com/revanced/revanced-patcher/commit/83d608ac06a7d5ceb31b6e0022b501d99edb63a3))
-* optional `forStaticMethod` parameter for `InlineSmaliCompiler.compileMethodInstructions` ([28b9847](https://github.com/revanced/revanced-patcher/commit/28b98478e4e8e8f238e82f7fa2307aeb1547955d))
-
 # [1.0.0-dev.17](https://github.com/revanced/revanced-patcher/compare/v1.0.0-dev.16...v1.0.0-dev.17) (2022-05-31)
 
 

README.md

@@ -1,2 +1 @@
 # Patcher
-Patcher framework used in the ReVanced project.

build.gradle.kts

@@ -1,32 +1,38 @@
 plugins {
-    kotlin("jvm") version "1.7.0"
+    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()
     maven {
         url = uri("https://maven.pkg.github.com/revanced/multidexlib2")
         credentials {
-            username = githubUsername
+            // DO NOT set these variables in the project's gradle.properties.
-            password = githubPassword
+            // 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(kotlin("stdlib"))
-    implementation("org.smali:smali:2.5.2")
+
-    implementation("app.revanced:multidexlib2:2.5.2.r2")
+    api("xpp3:xpp3:1.1.4c")
-    implementation("org.apktool:apktool-lib:2.7.0-SNAPSHOT")
+    api("org.apktool:apktool-lib:2.6.1")
+    api("app.revanced:multidexlib2:2.5.2.r2")
+    api("org.smali:smali:2.5.2")
 
     testImplementation(kotlin("test"))
+    implementation(kotlin("reflect"))
 }
 
 tasks {
@@ -40,11 +46,14 @@ tasks {
 
 java {
     withSourcesJar()
+    withJavadocJar()
 }
 
+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")
@@ -53,12 +62,13 @@ publishing {
                     password = System.getenv("GITHUB_TOKEN")
                 }
             }
-        else
+        } else {
             mavenLocal()
+        }
     }
     publications {
         register<MavenPublication>("gpr") {
             from(components["java"])
         }
     }
-}
+}

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 3.2.0
+version = 1.0.0-dev.17

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

@@ -1,28 +1,26 @@
 package app.revanced.patcher
 
-import app.revanced.patcher.data.Data
+import app.revanced.patcher.data.PatcherData
-import app.revanced.patcher.data.PackageMetadata
+import app.revanced.patcher.data.base.Data
-import app.revanced.patcher.data.impl.findIndexed
+import app.revanced.patcher.data.implementation.findIndexed
 import app.revanced.patcher.extensions.PatchExtensions.dependencies
 import app.revanced.patcher.extensions.PatchExtensions.patchName
 import app.revanced.patcher.extensions.nullOutputStream
-import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
+import app.revanced.patcher.patch.base.Patch
-import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.patch.implementation.BytecodePatch
-import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.implementation.ResourcePatch
-import app.revanced.patcher.patch.PatchResultError
+import app.revanced.patcher.patch.implementation.misc.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.implementation.misc.PatchResultError
-import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.patch.impl.ResourcePatch
+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.options.BuildOptions
 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 lanchon.multidexlib2.BasicDexFileNamer
 import lanchon.multidexlib2.DexIO
@@ -31,9 +29,7 @@ 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.Closeable
 import java.io.File
-import java.nio.file.Files
 
 val NAMER = BasicDexFileNamer()
 
@@ -41,45 +37,36 @@ val NAMER = BasicDexFileNamer()
  * The ReVanced Patcher.
  * @param options The options for the patcher.
  */
-class Patcher(private val options: PatcherOptions) {
+class Patcher(
-    private val logger = options.logger
+    private val options: PatcherOptions
+) {
+    val packageVersion: String
+    val packageName: String
+
+    private lateinit var usesFramework: UsesFramework
+    private val patcherData: PatcherData
     private val opcodes: Opcodes
 
-    val data: PatcherData
-
     init {
-        val extInputFile = ExtFile(options.inputFile)
+        val extFileInput = ExtFile(options.inputFile)
         val outDir = File(options.resourceCacheDirectory)
-        if (outDir.exists()) {
-            logger.info("Deleting existing resource cache directory")
-            outDir.deleteRecursively()
-        }
-        outDir.mkdirs()
 
-        val androlib = Androlib(BuildOptions().also { it.setBuildOptions(options) })
+        if (outDir.exists()) outDir.deleteRecursively()
-        val resourceTable = androlib.getResTable(extInputFile, true)
+        outDir.mkdir()
 
-        val packageMetadata = PackageMetadata()
+        // load the resource table from the input file
+        val androlib = Androlib()
+        val resourceTable = androlib.getResTable(extFileInput, true)
 
         if (options.patchResources) {
-            logger.info("Decoding resources")
+            // 1. decode resources to cache directory
-
+            androlib.decodeManifestWithResources(extFileInput, outDir, resourceTable)
-            // decode resources to cache directory
+            androlib.decodeResourcesFull(extFileInput, outDir, resourceTable)
-            androlib.decodeManifestWithResources(extInputFile, outDir, resourceTable)
-            androlib.decodeResourcesFull(extInputFile, outDir, resourceTable)
-
-            // read additional metadata from the resource table
-            packageMetadata.metaInfo.usesFramework = UsesFramework().also { framework ->
-                framework.ids = resourceTable.listFramePackages().map { it.id }.sorted()
-            }
-
-            packageMetadata.metaInfo.doNotCompress = buildList {
-                androlib.recordUncompressedFiles(extInputFile, this)
-            }
 
+            // 2. read framework ids from the resource table
+            usesFramework = UsesFramework()
+            usesFramework.ids = resourceTable.listFramePackages().map { it.id }.sorted()
         } else {
-            logger.info("Only decoding AndroidManifest.xml because resource patching is disabled")
-
             // create decoder for the resource table
             val decoder = ResAttrDecoder()
             decoder.currentPackage = ResPackage(resourceTable, 0, null)
@@ -93,26 +80,19 @@ class Patcher(private val options: PatcherOptions) {
             XmlPullStreamDecoder(
                 axmlParser, AndrolibResources().resXmlSerializer
             ).decodeManifest(
-                extInputFile.directory.getFileInput("AndroidManifest.xml"), nullOutputStream
+                extFileInput.directory.getFileInput("AndroidManifest.xml"), nullOutputStream
             )
         }
 
-        packageMetadata.packageName = resourceTable.currentResPackage.name
+        // set package information
-        packageMetadata.packageVersion = resourceTable.versionInfo.versionName
+        packageVersion = resourceTable.versionInfo.versionName
-        packageMetadata.metaInfo.versionInfo = resourceTable.versionInfo
+        packageName = resourceTable.currentResPackage.name
-        packageMetadata.metaInfo.sdkInfo = resourceTable.sdkInfo
-
-        logger.info("Reading dex files")
-
         // read dex files
         val dexFile = MultiDexIO.readDexFile(true, options.inputFile, NAMER, null, null)
-        // get the opcodes
         opcodes = dexFile.opcodes
 
-        // finally create patcher data
+        // save to patcher data
-        data = PatcherData(
+        patcherData = PatcherData(dexFile.classes.toMutableList(), options.resourceCacheDirectory)
-            dexFile.classes.toMutableList(), options.resourceCacheDirectory, packageMetadata
-        )
     }
 
     /**
@@ -122,93 +102,35 @@ class Patcher(private val options: PatcherOptions) {
      * @param throwOnDuplicates If this is set to true, the patcher will throw an exception if a duplicate class has been found.
      */
     fun addFiles(
-        files: List<File>,
+        files: Iterable<File>, allowedOverwrites: Iterable<String> = emptyList(), throwOnDuplicates: Boolean = false
-        allowedOverwrites: Iterable<String> = emptyList(),
-        throwOnDuplicates: Boolean = false,
-        callback: (File) -> Unit
     ) {
         for (file in files) {
-            var modified = false
+            val dexFile = MultiDexIO.readDexFile(true, file, NAMER, null, null)
-            for (classDef in MultiDexIO.readDexFile(true, file, NAMER, null, null).classes) {
+            for (classDef in dexFile.classes) {
-                val type = classDef.type
+                val e = patcherData.bytecodeData.classes.internalClasses.findIndexed { it.type == classDef.type }
-
+                if (e != null) {
-                val existingClass = data.bytecodeData.classes.internalClasses.findIndexed { it.type == type }
+                    if (throwOnDuplicates) {
-                if (existingClass == null) {
+                        throw Exception("Class ${classDef.type} has already been added to the patcher.")
-                    if (throwOnDuplicates) throw Exception("Class $type has already been added to the patcher")
+                    }
-
+                    val (_, idx) = e
-                    logger.trace("Merging $type")
+                    if (allowedOverwrites.contains(classDef.type)) {
-                    data.bytecodeData.classes.internalClasses.add(classDef)
+                        patcherData.bytecodeData.classes.internalClasses[idx] = classDef
-                    modified = true
+                    }
-
                     continue
                 }
-
+                patcherData.bytecodeData.classes.internalClasses.add(classDef)
-                if (!allowedOverwrites.contains(type)) continue
-
-                logger.trace("Overwriting $type")
-
-                val index = existingClass.second
-                data.bytecodeData.classes.internalClasses[index] = classDef
-                modified = true
             }
-            if (modified) callback(file)
         }
     }
 
     /**
      * Save the patched dex file.
      */
-    fun save(): PatcherResult {
+    fun save(): Map<String, MemoryDataStore> {
-        val packageMetadata = data.packageMetadata
-        val metaInfo = packageMetadata.metaInfo
-        var resourceFile: File? = null
-
-        if (options.patchResources) {
-            val cacheDirectory = ExtFile(options.resourceCacheDirectory)
-
-            val androlibResources = AndrolibResources().also { resources ->
-                resources.buildOptions = BuildOptions().also { buildOptions ->
-                    buildOptions.setBuildOptions(options)
-                    buildOptions.isFramework = metaInfo.isFrameworkApk
-                    buildOptions.resourcesAreCompressed = metaInfo.compressionType
-                    buildOptions.doNotCompress = metaInfo.doNotCompress
-                }
-
-                resources.setSdkInfo(metaInfo.sdkInfo)
-                resources.setVersionInfo(metaInfo.versionInfo)
-                resources.setSharedLibrary(metaInfo.sharedLibrary)
-                resources.setSparseResources(metaInfo.sparseResources)
-            }
-
-            val manifestFile = cacheDirectory.resolve("AndroidManifest.xml")
-
-            ResXmlPatcher.fixingPublicAttrsInProviderAttributes(manifestFile)
-
-            val aaptFile = cacheDirectory.resolve("aapt_temp_file")
-
-            // delete if it exists
-            Files.deleteIfExists(aaptFile.toPath())
-
-            val resDirectory = cacheDirectory.resolve("res")
-            val includedFiles = metaInfo.usesFramework.ids.map { id ->
-                androlibResources.getFrameworkApk(
-                    id, metaInfo.usesFramework.tag
-                )
-            }.toTypedArray()
-
-            logger.info("Compiling resources")
-            androlibResources.aaptPackage(
-                aaptFile, manifestFile, resDirectory, null, null, includedFiles
-            )
-
-            resourceFile = aaptFile
-        }
-
-        logger.trace("Creating new dex file")
         val newDexFile = object : DexFile {
             override fun getClasses(): Set<ClassDef> {
-                data.bytecodeData.classes.applyProxies()
+                patcherData.bytecodeData.classes.applyProxies()
-                return ListBackedSet(data.bytecodeData.classes.internalClasses)
+                return ListBackedSet(patcherData.bytecodeData.classes.internalClasses)
             }
 
             override fun getOpcodes(): Opcodes {
@@ -216,19 +138,21 @@ class Patcher(private val options: PatcherOptions) {
             }
         }
 
-        // write modified dex files
+        // build modified resources
-        logger.info("Writing modified dex files")
+        if (options.patchResources) {
-        val dexFiles = mutableMapOf<String, MemoryDataStore>()
+            val extDir = ExtFile(options.resourceCacheDirectory)
+
+            // 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
-            dexFiles, NAMER, newDexFile, DexIO.DEFAULT_MAX_DEX_POOL_SIZE, null
+            output, NAMER, newDexFile, DexIO.DEFAULT_MAX_DEX_POOL_SIZE, null
-        )
-
-        return PatcherResult(
-            dexFiles.map {
-                app.revanced.patcher.util.dex.DexFile(it.key, it.value.readAt(0))
-            }, metaInfo.doNotCompress?.toList(), resourceFile
         )
+        return output
     }
 
     /**
@@ -236,69 +160,54 @@ class Patcher(private val options: PatcherOptions) {
      * @param patches [Patch]es The patches to add.
      */
     fun addPatches(patches: Iterable<Class<out Patch<Data>>>) {
-        data.patches.addAll(patches)
+        patcherData.patches.addAll(patches)
     }
 
     /**
      * Apply a [patch] and its dependencies recursively.
      * @param patch The [patch] to apply.
-     * @param appliedPatches A map of [patch]es paired to a boolean indicating their success, to prevent infinite recursion.
+     * @param appliedPatches A list of [patch] names, to prevent applying [patch]es twice.
      * @return The result of executing the [patch].
      */
     private fun applyPatch(
-        patch: Class<out Patch<Data>>,
+        patch: Class<out Patch<Data>>, appliedPatches: MutableList<String>
-        appliedPatches: LinkedHashMap<String, AppliedPatch>
     ): PatchResult {
         val patchName = patch.patchName
 
         // if the patch has already applied silently skip it
-        if (appliedPatches.contains(patchName)) {
+        if (appliedPatches.contains(patchName)) return PatchResultSuccess()
-            if (!appliedPatches[patchName]!!.success)
+        appliedPatches.add(patchName)
-                return PatchResultError("'$patchName' did not succeed previously")
-
-            logger.trace("Skipping '$patchName' because it has already been applied")
-
-            return PatchResultSuccess()
-        }
 
         // recursively apply all dependency patches
-        patch.dependencies.forEach {
+        patch.dependencies?.forEach {
-            val dependency = it.patch.java
+            val patchDependency = it.java
 
-            val result = applyPatch(dependency, appliedPatches)
+            val result = applyPatch(patchDependency, appliedPatches)
             if (result.isSuccess()) return@forEach
 
-            val error = result.error()!!
+            val errorMessage = result.error()!!.message
-            val errorMessage = error.cause ?: error.message
+            return PatchResultError("$patchName depends on ${patchDependency.patchName} but the following error was raised: $errorMessage")
-
-            return PatchResultError("'$patchName' depends on '${dependency.patchName}' but the following error was raised: $errorMessage")
         }
 
         val patchInstance = patch.getDeclaredConstructor().newInstance()
 
         // if the current patch is a resource patch but resource patching is disabled, return an error
         val isResourcePatch = patchInstance is ResourcePatch
-        if (!options.patchResources && isResourcePatch) {
+        if (!options.patchResources && isResourcePatch) return PatchResultError("$patchName is a resource patch, but resource patching is disabled.")
-            return PatchResultError("'$patchName' is a resource patch, but resource patching is disabled")
-        }
 
         // TODO: find a solution for this
         val data = if (isResourcePatch) {
-            data.resourceData
+            patcherData.resourceData
         } else {
-            val bytecodeData = data.bytecodeData
+            MethodSignatureResolver(
-            (patchInstance as BytecodePatch).fingerprints?.resolve(bytecodeData, bytecodeData.classes.internalClasses)
+                patcherData.bytecodeData.classes.internalClasses, (patchInstance as BytecodePatch).signatures
-            bytecodeData
+            ).resolve(patcherData)
+            patcherData.bytecodeData
         }
 
-        logger.trace("Executing '$patchName' of type: ${if (isResourcePatch) "resource" else "bytecode"}")
-
         return try {
-            val result = patchInstance.execute(data)
+            patchInstance.execute(data)
-            appliedPatches[patchName] = AppliedPatch(patchInstance, result.isSuccess())
-            result
         } catch (e: Exception) {
-            appliedPatches[patchName] = AppliedPatch(patchInstance, false)
             PatchResultError(e)
         }
     }
@@ -306,47 +215,30 @@ class Patcher(private val options: PatcherOptions) {
     /**
      * 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 applyPatches(stopOnError: Boolean = false) = sequence {
+    fun applyPatches(
-        logger.trace("Applying all patches")
+        stopOnError: Boolean = false, callback: (String) -> Unit = {}
+    ): Map<String, Result<PatchResultSuccess>> {
+        val appliedPatches = mutableListOf<String>()
 
-        val appliedPatches = LinkedHashMap<String, AppliedPatch>() // first is name
+        return buildMap {
+            for (patch in patcherData.patches) {
+                val result = applyPatch(patch, appliedPatches)
 
-        try {
+                val name = patch.patchName
-            for (patch in data.patches) {
+                callback(name)
-                val patchResult = applyPatch(patch, appliedPatches)
 
-                val result = if (patchResult.isSuccess()) {
+                this[name] = if (result.isSuccess()) {
-                    Result.success(patchResult.success()!!)
+                    Result.success(result.success()!!)
                 } else {
-                    Result.failure(patchResult.error()!!)
+                    Result.failure(result.error()!!)
                 }
 
-                yield(patch.patchName to result)
+                if (stopOnError && result.isError()) break
-                if (stopOnError && patchResult.isError()) break
-            }
-        } finally {
-            // close all closeable patches in order
-            for ((patch, _) in appliedPatches.values.reversed()) {
-                if (patch !is Closeable) continue
-
-                patch.close()
             }
         }
     }
 }
-
-/**
- * A result of applying a [Patch].
- *
- * @param patchInstance The instance of the [Patch] that was applied.
- * @param success The result of the [Patch].
- */
-internal data class AppliedPatch(val patchInstance: Patch<Data>, val success: Boolean)
-
-private fun BuildOptions.setBuildOptions(options: PatcherOptions) {
-    this.aaptPath = options.aaptPath
-    this.useAapt2 = true
-    this.frameworkFolderLocation = options.frameworkFolderLocation
-}

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

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

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

@@ -1,23 +1,15 @@
 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 patchResources Weather to use the resource patcher. Resources will still need to be decoded.
- * @param aaptPath Optional path to a custom aapt binary.
- * @param frameworkFolderLocation Optional path to a custom framework folder.
- * @param logger Custom logger implementation for the [Patcher].
  */
 data class PatcherOptions(
     internal val inputFile: File,
+    // TODO: maybe a file system in memory is better. Could cause high memory usage.
     internal val resourceCacheDirectory: String,
-    internal val patchResources: Boolean = false,
+    internal val patchResources: Boolean = false
-    internal val aaptPath: String = "",
-    internal val frameworkFolderLocation: String? = null,
-    internal val logger: Logger = NopLogger
 )

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,11 +1,11 @@
 package app.revanced.patcher.annotation
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.patch.base.Patch
-import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.signature.implementation.method.MethodSignature
 
 /**
- * Annotation to constrain a [Patch] or [MethodFingerprint] to compatible packages.
+ * Annotation to constrain a [Patch] or [MethodSignature] to compatible packages.
- * @param compatiblePackages A list of packages a [Patch] or [MethodFingerprint] is compatible with.
+ * @param compatiblePackages A list of packages a [Patch] or [MethodSignature] is compatible with.
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
@@ -17,7 +17,7 @@ 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] or [MethodFingerprint]is compatible with.
+ * @param versions The versions of the package the [Patch] or [MethodSignature]is compatible with.
  */
 @Target()
 @Retention(AnnotationRetention.RUNTIME)

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

@@ -1,11 +1,11 @@
 package app.revanced.patcher.annotation
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.patch.base.Patch
-import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.signature.implementation.method.MethodSignature
 
 /**
- * Annotation to name a [Patch] or [MethodFingerprint].
+ * Annotation to name a [Patch] or [MethodSignature].
- * @param name A suggestive name for the [Patch] or [MethodFingerprint].
+ * @param name A suggestive name for the [Patch] or [MethodSignature].
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
@@ -15,8 +15,8 @@ annotation class Name(
 )
 
 /**
- * Annotation to describe a [Patch] or [MethodFingerprint].
+ * Annotation to describe a [Patch] or [MethodSignature].
- * @param description A description for the [Patch] or [MethodFingerprint].
+ * @param description A description for the [Patch] or [MethodSignature].
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
@@ -27,8 +27,8 @@ annotation class Description(
 
 
 /**
- * Annotation to version a [Patch] or [MethodFingerprint].
+ * Annotation to version a [Patch] or [MethodSignature].
- * @param version The version of a [Patch] or [MethodFingerprint].
+ * @param version The version of a [Patch] or [MethodSignature].
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)

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

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

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

@@ -1,13 +0,0 @@
-package app.revanced.patcher.data
-
-import brut.androlib.meta.MetaInfo
-
-/**
- * Metadata about a package.
- */
-class PackageMetadata {
-    lateinit var packageName: String
-    lateinit var packageVersion: String
-
-    internal val metaInfo: MetaInfo = MetaInfo()
-}

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<Class<out Patch<Data>>>()
+
+    internal val bytecodeData = BytecodeData(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/impl/ResourceData.kt

@@ -1,84 +0,0 @@
-package app.revanced.patcher.data.impl
-
-import app.revanced.patcher.data.Data
-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
-
-class ResourceData(private val resourceCacheDirectory: File) : Data, 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@ResourceData[path])
-        }
-
-    }
-}
-
-/**
- * DomFileEditor is a wrapper for a file that can be edited as a dom document.
- *
- * @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 not be written.
- */
-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
-
-    /**
-     * 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() }) {
-        filePath = file.path
-
-        // prevent sharing mutability of the same file between multiple instances of DomFileEditor
-        if (locks.contains(filePath))
-            throw IllegalStateException("Can not create a DomFileEditor for that file because it is already locked by another instance of DomFileEditor.")
-        locks.add(filePath!!)
-    }
-
-    override fun close() {
-        inputStream.close()
-
-        // if the output stream is not null, do not close it
-        outputStream?.let {
-            val result = StreamResult(it.value)
-            TransformerFactory.newInstance().newTransformer().transform(DOMSource(file), result)
-
-            it.value.close()
-        }
-
-        // remove the lock, if it exists
-        filePath?.let {
-            locks.remove(it)
-        }
-    }
-
-    private companion object {
-        // list of locked file paths
-        val locks = mutableListOf<String>()
-    }
-}

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

@@ -1,6 +1,6 @@
-package app.revanced.patcher.data.impl
+package app.revanced.patcher.data.implementation
 
-import app.revanced.patcher.data.Data
+import app.revanced.patcher.data.base.Data
 import app.revanced.patcher.util.ProxyBackedClassList
 import app.revanced.patcher.util.method.MethodWalker
 import org.jf.dexlib2.iface.ClassDef
@@ -28,15 +28,6 @@ class BytecodeData(
         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
-    }
 }
 
 internal class MethodNotFoundException(s: String) : Exception(s)
@@ -66,4 +57,13 @@ internal inline fun <T> Iterable<T>.findIndexed(predicate: (T) -> Boolean): Pair
         }
     }
     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.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

@@ -4,12 +4,11 @@ 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.Data
+import app.revanced.patcher.data.base.Data
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.patch.base.Patch
-import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.signature.implementation.method.MethodSignature
-import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.patch.annotations.DependencyType
+import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
-import app.revanced.patcher.patch.annotations.DependsOn
 import kotlin.reflect.KClass
 
 /**
@@ -38,35 +37,21 @@ private fun <T : Annotation> Class<*>.findAnnotationRecursively(
     return null
 }
 
-private typealias PatchClass = Class<out Patch<Data>>
-
 object PatchExtensions {
-    val PatchClass.patchName: String get() = recursiveAnnotation(Name::class)?.name ?: this.javaClass.simpleName
+    val Class<out Patch<Data>>.patchName: String
-    val PatchClass.version get() = recursiveAnnotation(Version::class)?.version
+        get() = recursiveAnnotation(Name::class)?.name ?: this.javaClass.simpleName
-    val PatchClass.include get() = recursiveAnnotation(app.revanced.patcher.patch.annotations.Patch::class)!!.include
+    val Class<out Patch<Data>>.version get() = recursiveAnnotation(Version::class)?.version
-    val PatchClass.description get() = recursiveAnnotation(Description::class)?.description
+    val Class<out Patch<Data>>.description get() = recursiveAnnotation(Description::class)?.description
-    val PatchClass.dependencies get() = buildList {
+    val Class<out Patch<Data>>.dependencies get() = recursiveAnnotation(app.revanced.patcher.patch.annotations.Patch::class)?.dependencies
-        recursiveAnnotation(DependsOn::class)?.let { add(PatchDependency(it.value, it.type)) }
+    val Class<out Patch<Data>>.compatiblePackages get() = recursiveAnnotation(Compatibility::class)?.compatiblePackages
-        recursiveAnnotation(Dependencies::class)?.dependencies?.forEach { add(PatchDependency(it, DependencyType.HARD)) }
-    }.toTypedArray()
-    val PatchClass.compatiblePackages get() = recursiveAnnotation(Compatibility::class)?.compatiblePackages
-
-    @JvmStatic
-    fun PatchClass.dependsOn(patch: PatchClass): Boolean {
-        if (this.patchName == patch.patchName) throw IllegalArgumentException("thisval and patch may not be the same")
-        return this.dependencies.any { it.patch.java.patchName == this@dependsOn.patchName }
-    }
-
-    class PatchDependency internal constructor(val patch: KClass<out Patch<Data>>, val type: DependencyType = DependencyType.HARD)
 }
 
-object MethodFingerprintExtensions {
+object MethodSignatureExtensions {
-    val MethodFingerprint.name: String
+    val MethodSignature.name get() = javaClass.recursiveAnnotation(Name::class)?.name ?: this.javaClass.simpleName
-        get() = javaClass.recursiveAnnotation(Name::class)?.name ?: this.javaClass.simpleName
+    val MethodSignature.version get() = javaClass.recursiveAnnotation(Version::class)?.version ?: "0.0.1"
-    val MethodFingerprint.version get() = javaClass.recursiveAnnotation(Version::class)?.version ?: "0.0.1"
+    val MethodSignature.description get() = javaClass.recursiveAnnotation(Description::class)?.description
-    val MethodFingerprint.description get() = javaClass.recursiveAnnotation(Description::class)?.description
+    val MethodSignature.compatiblePackages get() = javaClass.recursiveAnnotation(Compatibility::class)?.compatiblePackages
-    val MethodFingerprint.compatiblePackages get() = javaClass.recursiveAnnotation(Compatibility::class)?.compatiblePackages
+    val MethodSignature.matchingMethod get() = javaClass.recursiveAnnotation(MatchingMethod::class)
-    val MethodFingerprint.matchingMethod get() = javaClass.recursiveAnnotation(app.revanced.patcher.fingerprint.method.annotation.MatchingMethod::class)
+    val MethodSignature.fuzzyPatternScanMethod get() = javaClass.recursiveAnnotation(FuzzyPatternScanMethod::class)
-    val MethodFingerprint.fuzzyPatternScanMethod get() = javaClass.recursiveAnnotation(app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod::class)
+    val MethodSignature.fuzzyThreshold get() = fuzzyPatternScanMethod?.threshold ?: 0
-    val MethodFingerprint.fuzzyScanThreshold get() = fuzzyPatternScanMethod?.threshold ?: 0
 }

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

@@ -1,18 +1,10 @@
 package app.revanced.patcher.extensions
 
-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 app.revanced.patcher.util.smali.toInstruction
-import app.revanced.patcher.util.smali.toInstructions
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.builder.BuilderInstruction
-import org.jf.dexlib2.builder.BuilderOffsetInstruction
-import org.jf.dexlib2.builder.Label
 import org.jf.dexlib2.builder.MutableMethodImplementation
-import org.jf.dexlib2.builder.instruction.*
 import org.jf.dexlib2.iface.Method
-import org.jf.dexlib2.iface.instruction.Instruction
 import org.jf.dexlib2.iface.reference.MethodReference
 import org.jf.dexlib2.immutable.ImmutableMethod
 import org.jf.dexlib2.immutable.ImmutableMethodImplementation
@@ -28,34 +20,16 @@ fun MutableMethodImplementation.addInstructions(index: Int, instructions: List<B
     }
 }
 
-fun MutableMethodImplementation.addInstructions(instructions: List<BuilderInstruction>) {
-    for (instruction in instructions) {
-        this.addInstruction(instruction)
-    }
-}
-
-fun MutableMethodImplementation.replaceInstructions(index: Int, instructions: List<BuilderInstruction>) {
-    for (i in instructions.lastIndex downTo 0) {
-        this.replaceInstruction(index + i, instructions[i])
-    }
-}
-
-fun MutableMethodImplementation.removeInstructions(index: Int, count: Int) {
-    for (i in count downTo 0) {
-        this.removeInstruction(index + i)
-    }
-}
-
 /**
  * Compare a method to another, considering constructors and parameters.
  * @param otherMethod The method to compare against.
  * @return True if the methods match given the conditions.
  */
-fun Method.softCompareTo(otherMethod: MethodReference): Boolean {
+fun Method.softCompareTo(
-    if (MethodUtil.isConstructor(this) && !parametersEqual(
+    otherMethod: MethodReference
-            this.parameterTypes, otherMethod.parameterTypes
+): Boolean {
-        )
+    if (MethodUtil.isConstructor(this) && !parametersEqual(this.parameterTypes, otherMethod.parameterTypes))
-    ) return false
+        return false
     return this.name == otherMethod.name
 }
 
@@ -65,7 +39,9 @@ fun Method.softCompareTo(otherMethod: MethodReference): Boolean {
  * This may be a positive or negative number.
  * @return The **immutable** cloned method. Call [toMutable] or [cloneMutable] to get a **mutable** copy.
  */
-internal fun Method.clone(registerCount: Int = 0): ImmutableMethod {
+internal fun Method.clone(
+    registerCount: Int = 0,
+): ImmutableMethod {
     val clonedImplementation = implementation?.let {
         ImmutableMethodImplementation(
             it.registerCount + registerCount,
@@ -75,161 +51,31 @@ internal fun Method.clone(registerCount: Int = 0): ImmutableMethod {
         )
     }
     return ImmutableMethod(
-        returnType, name, parameters, returnType, accessFlags, annotations, hiddenApiRestrictions, clonedImplementation
+        returnType,
+        name,
+        parameters,
+        returnType,
+        accessFlags,
+        annotations,
+        hiddenApiRestrictions,
+        clonedImplementation
     )
 }
 
-/**
- * Add a smali instruction to the method.
- * @param instruction The smali instruction to add.
- */
-fun MutableMethod.addInstruction(instruction: String) =
-    this.implementation!!.addInstruction(instruction.toInstruction(this))
-
-/**
- * Add a smali instruction to the method.
- * @param index The index to insert the instruction at.
- * @param instruction The smali instruction to add.
- */
-fun MutableMethod.addInstruction(index: Int, instruction: String) =
-    this.implementation!!.addInstruction(index, instruction.toInstruction(this))
-
-/**
- * Replace a smali instruction within the method.
- * @param index The index to replace the instruction at.
- * @param instruction The smali instruction to place.
- */
-fun MutableMethod.replaceInstruction(index: Int, instruction: String) =
-    this.implementation!!.replaceInstruction(index, instruction.toInstruction(this))
-
-/**
- * Remove a smali instruction within the method.
- * @param index The index to delete the instruction at.
- */
-fun MutableMethod.removeInstruction(index: Int) = this.implementation!!.removeInstruction(index)
-
-/**
- * Create a label for the instruction at given index in the method's implementation.
- * @param index The index to create the label for the instruction at.
- * @return The label.
- */
-fun MutableMethod.label(index: Int) = this.implementation!!.newLabelForIndex(index)
-
-/**
- * Get the instruction at given index in the method's implementation.
- * @param index The index to get the instruction at.
- * @return The instruction.
- */
-fun MutableMethod.instruction(index: Int): BuilderInstruction = this.implementation!!.instructions[index]
-
-/**
- * Add smali instructions to the method.
- * @param index The index to insert the instructions at.
- * @param smali The smali instructions to add.
- * @param externalLabels A list of [ExternalLabel] representing a list of labels for instructions which are not in the method to compile.
- */
-
-fun MutableMethod.addInstructions(index: Int, smali: String, externalLabels: List<ExternalLabel> = emptyList()) {
-    // Create reference dummy instructions for the instructions.
-    val nopedSmali = StringBuilder(smali).also { builder ->
-        externalLabels.forEach { (name, _) ->
-            builder.append("\n:$name\nnop")
-        }
-    }.toString()
-
-    // Compile the instructions with the dummy labels
-    val compiledInstructions = nopedSmali.toInstructions(this)
-
-    // Add the compiled list of instructions to the method.
-    val methodImplementation = this.implementation!!
-    methodImplementation.addInstructions(index, compiledInstructions)
-
-    val methodInstructions = methodImplementation.instructions
-    methodInstructions.subList(index, index + compiledInstructions.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() {
-                // Create the final label.
-                val label = methodImplementation.newLabelForIndex(methodInstructions.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.
-                methodImplementation.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).
-                methodInstructions[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 line works because we created the dummy instructions in the same order as the externalLabels list.
-            val (_, instruction) = externalLabels[(compiledInstructions.size - 1) - labelIndex]
-            instruction.makeNewLabel()
-        }
-}
-
-/**
- * Add smali instructions to the end of the method.
- * @param instructions The smali instructions to add.
- */
-fun MutableMethod.addInstructions(instructions: String, labels: List<ExternalLabel> = emptyList()) =
-    this.addInstructions(this.implementation!!.instructions.size, instructions, labels)
-
-/**
- * Replace smali instructions within the method.
- * @param index The index to replace the instructions at.
- * @param instructions The smali instructions to place.
- */
-fun MutableMethod.replaceInstructions(index: Int, instructions: String) =
-    this.implementation!!.replaceInstructions(index, instructions.toInstructions(this))
-
-/**
- * Remove smali instructions from the method.
- * @param index The index to remove the instructions at.
- * @param count The amount of instructions to remove.
- */
-fun MutableMethod.removeInstructions(index: Int, count: Int) = this.implementation!!.removeInstructions(index, count)
-
-private 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!")
-    }
-}
-
 /**
  * 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.cloneMutable(
+    registerCount: Int = 0,
+) = clone(registerCount).toMutable()
 
 // FIXME: also check the order of parameters as different order equals different method overload
 internal fun parametersEqual(
-    parameters1: Iterable<CharSequence>, parameters2: Iterable<CharSequence>
+    parameters1: Iterable<CharSequence>,
+    parameters2: Iterable<CharSequence>
 ): Boolean {
     return parameters1.count() == parameters2.count() && parameters1.all { parameter ->
         parameters2.any {
@@ -240,23 +86,7 @@ internal fun parametersEqual(
     }
 }
 
-internal val nullOutputStream = object : OutputStream() {
+internal val nullOutputStream: OutputStream =
-    override fun write(b: Int) {}
+    object : OutputStream() {
-}
+        override fun write(b: Int) {}
-
+    }
-/**
- * Should be used to parse a list of parameters represented by their first letter,
- * or in the case of arrays prefixed with an unspecified amount of '[' character.
- */
-internal fun String.parseParameters(): List<String> {
-    val parameters = mutableListOf<String>()
-    var parameter = ""
-    for (char in this.toCharArray()) {
-        parameter += char
-        if (char == '[') continue
-
-        parameters.add(parameter)
-        parameter = ""
-    }
-    return parameters
-}

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/impl/MethodFingerprint.kt

@@ -1,98 +0,0 @@
-package app.revanced.patcher.fingerprint.method.impl
-
-import app.revanced.patcher.data.impl.BytecodeData
-import app.revanced.patcher.data.impl.MethodNotFoundException
-import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
-import app.revanced.patcher.extensions.softCompareTo
-import app.revanced.patcher.fingerprint.Fingerprint
-import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils
-import app.revanced.patcher.util.proxy.ClassProxy
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.ClassDef
-import org.jf.dexlib2.iface.Method
-
-/**
- * Represents the [MethodFingerprint] for a method.
- * @param returnType The return type of the method.
- * @param access The access flags of the method.
- * @param parameters The parameters of the method.
- * @param opcodes The list of opcodes of the method.
- * @param strings A list of strings which a method contains.
- * @param customFingerprint A custom condition for this fingerprint.
- * A `null` opcode is equals to an unknown opcode.
- */
-abstract class MethodFingerprint(
-    internal val returnType: String?,
-    internal val access: Int?,
-    internal val parameters: Iterable<String>?,
-    internal val opcodes: Iterable<Opcode?>?,
-    internal val strings: Iterable<String>? = null,
-    internal val customFingerprint: ((methodDef: Method) -> Boolean)? = null
-) : Fingerprint {
-    /**
-     * The result of the [MethodFingerprint] the [Method].
-     * @throws MethodNotFoundException If the resolution of the [Method] has not happened.
-     */
-    var result: MethodFingerprintResult? = null
-        get() = field ?: throw Exception("${this.name} has not been resolved yet.")
-}
-
-/**
- * Represents the result of a [MethodFingerprintUtils].
- * @param method The matching method.
- * @param classDef The [ClassDef] that contains the matching [method].
- * @param patternScanResult Opcodes pattern scan result.
- * @param data The [BytecodeData] this [MethodFingerprintResult] is attached to, to create proxies.
- */
-data class MethodFingerprintResult(
-    val method: Method,
-    val classDef: ClassDef,
-    val patternScanResult: PatternScanResult?,
-    internal val data: BytecodeData
-) {
-    /**
-     * Returns a mutable clone of [classDef]
-     *
-     * Please note, this method allocates a [ClassProxy].
-     * Use [classDef] where possible.
-     */
-    val mutableClass by lazy { data.proxy(classDef).resolve() }
-
-    /**
-     * Returns a mutable clone of [method]
-     *
-     * Please note, this method allocates a [ClassProxy].
-     * Use [method] where possible.
-     */
-    val mutableMethod by lazy {
-        mutableClass.methods.first {
-            it.softCompareTo(this.method)
-        }
-    }
-}
-
-/**
- * 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/fingerprint/method/utils/MethodFingerprintUtils.kt

@@ -1,158 +0,0 @@
-package app.revanced.patcher.fingerprint.method.utils
-
-import app.revanced.patcher.data.impl.BytecodeData
-import app.revanced.patcher.extensions.MethodFingerprintExtensions.fuzzyPatternScanMethod
-import app.revanced.patcher.extensions.MethodFingerprintExtensions.fuzzyScanThreshold
-import app.revanced.patcher.extensions.parametersEqual
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
-import app.revanced.patcher.fingerprint.method.impl.PatternScanResult
-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.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.StringReference
-
-/**
- * Utility class for [MethodFingerprint]
- */
-object MethodFingerprintUtils {
-    /**
-     * Resolve a list of [MethodFingerprint] against a list of [ClassDef].
-     * @param context The classes on which to resolve the [MethodFingerprint].
-     * @param forData The [BytecodeData] to host proxies.
-     * @return True if the resolution was successful, false otherwise.
-     */
-    fun Iterable<MethodFingerprint>.resolve(forData: BytecodeData, context: Iterable<ClassDef>) {
-        for (fingerprint in this) // For each fingerprint
-            classes@ for (classDef in context) // search through all classes for the fingerprint
-                if (fingerprint.resolve(forData, classDef))
-                    break@classes // if the resolution succeeded, continue with the next fingerprint
-    }
-
-    /**
-     * Resolve a [MethodFingerprint] against a [ClassDef].
-     * @param context The class on which to resolve the [MethodFingerprint].
-     * @param forData The [BytecodeData] to host proxies.
-     * @return True if the resolution was successful, false otherwise.
-     */
-    fun MethodFingerprint.resolve(forData: BytecodeData, context: ClassDef): Boolean {
-        for (method in context.methods)
-            if (this.resolve(forData, method, context))
-                return true
-        return false
-    }
-
-    /**
-     * Resolve a [MethodFingerprint] against a [Method].
-     * @param context The context on which to resolve the [MethodFingerprint].
-     * @param classDef The class of the matching [Method].
-     * @param forData The [BytecodeData] to host proxies.
-     * @return True if the resolution was successful, false otherwise.
-     */
-    fun MethodFingerprint.resolve(forData: BytecodeData, context: Method, classDef: ClassDef): Boolean {
-        val methodFingerprint = this
-
-        if (methodFingerprint.returnType != null && !context.returnType.startsWith(methodFingerprint.returnType))
-            return false
-
-        if (methodFingerprint.access != null && methodFingerprint.access != context.accessFlags)
-            return false
-
-
-        if (methodFingerprint.parameters != null && !parametersEqual(
-                methodFingerprint.parameters, // TODO: parseParameters()
-                context.parameterTypes
-            )
-        ) return false
-
-        if (methodFingerprint.customFingerprint != null && !methodFingerprint.customFingerprint!!(context))
-            return false
-
-        if (methodFingerprint.strings != null) {
-            val implementation = context.implementation ?: return false
-
-            val stringsList = methodFingerprint.strings.toMutableList()
-
-            implementation.instructions.forEach { instruction ->
-                if (instruction.opcode.ordinal != Opcode.CONST_STRING.ordinal) return@forEach
-
-                val string = ((instruction as ReferenceInstruction).reference as StringReference).string
-                val index = stringsList.indexOfFirst { it == string }
-                if (index != -1) stringsList.removeAt(index)
-            }
-
-            if (stringsList.isNotEmpty()) return false
-        }
-
-        val patternScanResult = if (methodFingerprint.opcodes != null) {
-            context.implementation?.instructions ?: return false
-
-            context.patternScan(methodFingerprint) ?: return false
-        } else null
-
-        methodFingerprint.result = MethodFingerprintResult(context, classDef, patternScanResult, forData)
-
-        return true
-    }
-
-    private fun Method.patternScan(
-        fingerprint: MethodFingerprint
-    ): PatternScanResult? {
-        val instructions = this.implementation!!.instructions
-        val fingerprintFuzzyPatternScanThreshold = fingerprint.fuzzyScanThreshold
-
-        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 = PatternScanResult(index, index + patternIndex)
-                if (fingerprint.fuzzyPatternScanMethod !is FuzzyPatternScanMethod) return result
-                result.warnings = result.createWarnings(pattern, instructions)
-
-                return result
-            }
-        }
-
-        return null
-    }
-}
-
-private fun 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(PatternScanResult.Warning(originalOpcode, patternOpcode, instructionIndex, patternIndex))
-    }
-}
-
-private operator fun ClassDef.component1() = this
-private operator fun ClassDef.component2() = this.methods

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/Patch.kt

@@ -1,25 +0,0 @@
-package app.revanced.patcher.patch
-
-import app.revanced.patcher.data.Data
-import app.revanced.patcher.patch.impl.BytecodePatch
-import app.revanced.patcher.patch.impl.ResourcePatch
-import java.io.Closeable
-
-/**
- * A ReVanced patch.
- *
- * Can either be a [ResourcePatch] or a [BytecodePatch].
- * If it implements [Closeable], it will be closed after all patches have been executed.
- * Closing will be done in reverse execution order.
- */
-abstract class Patch<out T : Data> {
-    /**
-     * The main function of the [Patch] which the patcher will call.
-     */
-    abstract fun execute(data: @UnsafeVariance T): PatchResult
-
-    /**
-     * A list of [PatchOption]s.
-     */
-    open val options = PatchOptions()
-}

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

@@ -1,167 +0,0 @@
-@file:Suppress("CanBeParameter", "MemberVisibilityCanBePrivate")
-
-package app.revanced.patcher.patch
-
-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")
-
-/**
- * A registry for an array of [PatchOption]s.
- * @param options An array of [PatchOption]s.
- */
-class PatchOptions(vararg val options: PatchOption<*>) : Iterable<PatchOption<*>> {
-    private val register = buildMap {
-        for (option in options) {
-            if (containsKey(option.key)) {
-                throw IllegalStateException("Multiple options found with the same key")
-            }
-            put(option.key, option)
-        }
-    }
-
-    /**
-     * Get a [PatchOption] by its key.
-     * @param key The key of the [PatchOption].
-     */
-    operator fun get(key: String) = register[key] ?: throw NoSuchOptionException(key)
-
-    /**
-     * 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) {
-        @Suppress("UNCHECKED_CAST") val opt = get(key) as PatchOption<T>
-        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() = options.iterator()
-}
-
-/**
- * A [Patch] option.
- * @param key Unique identifier of the option. Example: _`settings.microg.enabled`_
- * @param default The default value of the option.
- * @param title A human-readable title of the option. Example: _MicroG Settings_
- * @param description A human-readable description of the option. Example: _Settings integration for MicroG._
- * @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
-        set(value) {
-            if (!validator(value)) {
-                throw IllegalValueException(value)
-            }
-            field = value
-        }
-
-    /**
-     * 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 !in options) {
-                throw IllegalStateException("Default option must be an allowed options")
-            }
-        }
-    }
-
-    /**
-     * 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,47 +1,14 @@
 package app.revanced.patcher.patch.annotations
 
-import app.revanced.patcher.data.Data
+import app.revanced.patcher.data.base.Data
-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.
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 @MustBeDocumented
-annotation class Patch(val include: Boolean = true)
+annotation class Patch(
-
+    val dependencies: Array<KClass<out app.revanced.patcher.patch.base.Patch<Data>>> = []
-/**
- * Annotation for dependencies of [Patch]es .
- */
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-@MustBeDocumented
-@Deprecated(
-    "Does not support new parameter 'type'",
-    ReplaceWith("DependsOn")
 )
-annotation class Dependencies(
-    val dependencies: Array<KClass<out Patch<Data>>> = []
-)
-
-/**
- * Annotation for dependencies of [Patch]es .
- */
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.RUNTIME)
-@MustBeDocumented
-@Repeatable
-annotation class DependsOn(
-    val value: KClass<out Patch<Data>>,
-    val type: DependencyType = DependencyType.HARD
-)
-
-enum class DependencyType {
-    /**
-     * Enforces that the dependency is applied, even if it was not selected.
-     */
-    HARD
-}

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

@@ -0,0 +1,19 @@
+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
+}

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

@@ -1,13 +0,0 @@
-package app.revanced.patcher.patch.impl
-
-import app.revanced.patcher.data.impl.BytecodeData
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patcher.patch.Patch
-
-/**
- * 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<BytecodeData>()

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

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

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? {

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,33 @@
+package app.revanced.patcher.signature.implementation.method
+
+import app.revanced.patcher.data.implementation.MethodNotFoundException
+import app.revanced.patcher.extensions.MethodSignatureExtensions.name
+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
+        @Throws(MethodNotFoundException::class)
+        get() {
+            return field ?: throw MethodNotFoundException("Could not resolve required signature ${this.name}")
+        }
+}

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

@@ -1,11 +1,11 @@
-package app.revanced.patcher.fingerprint.method.annotation
+package app.revanced.patcher.signature.implementation.method.annotation
 
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.signature.implementation.method.MethodSignature
 
 /**
- * Annotations for a method which matches to a [MethodFingerprint].
+ * 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 [MethodFingerprint] was created for.
+ * @param name A suggestive name for the method which the [MethodSignature] was created for.
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
@@ -15,7 +15,7 @@ annotation class MatchingMethod(
 )
 
 /**
- * Annotations to scan a pattern [MethodFingerprint] with fuzzy algorithm.
+ * 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)
@@ -25,7 +25,7 @@ annotation class FuzzyPatternScanMethod(
 )
 
 /**
- * Annotations to scan a pattern [MethodFingerprint] directly.
+ * Annotations to scan a pattern [MethodSignature] directly.
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)

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

@@ -0,0 +1,164 @@
+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.MethodSignatureExtensions.fuzzyThreshold
+import app.revanced.patcher.extensions.parametersEqual
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+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.fuzzyThreshold
+
+            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/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 dexFileInputStream The dex file as [InputStream].
- */
-data class DexFile(val name: String, val dexFileInputStream: InputStream)

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

@@ -1,12 +1,14 @@
 package app.revanced.patcher.util.method
 
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.implementation.BytecodeData
-import app.revanced.patcher.data.impl.MethodNotFoundException
+import app.revanced.patcher.data.implementation.MethodNotFoundException
 import app.revanced.patcher.extensions.softCompareTo
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import org.jf.dexlib2.Format
 import org.jf.dexlib2.iface.Method
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 import org.jf.dexlib2.iface.reference.MethodReference
+import org.jf.dexlib2.util.Preconditions
 
 /**
  * Find a method from another method via instruction offsets.
@@ -35,7 +37,9 @@ class MethodWalker internal constructor(
         currentMethod.implementation?.instructions?.let { instructions ->
             val instruction = instructions.elementAt(offset)
 
-            val newMethod = (instruction as ReferenceInstruction).reference as MethodReference
+            Preconditions.checkFormat(instruction.opcode, Format.Format35c)
+
+            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

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

@@ -1,7 +1,7 @@
 package app.revanced.patcher.util.patch.base
 
-import app.revanced.patcher.data.Data
+import app.revanced.patcher.data.base.Data
-import app.revanced.patcher.patch.Patch
+import app.revanced.patcher.patch.base.Patch
 import java.io.File
 
 /**

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

@@ -1,10 +0,0 @@
-package app.revanced.patcher.util.smali
-
-import org.jf.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,10 +1,8 @@
 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 org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcodes
 import org.jf.dexlib2.builder.BuilderInstruction
 import org.jf.dexlib2.writer.builder.DexBuilder
@@ -15,31 +13,31 @@ import org.jf.smali.smaliTreeWalker
 import java.io.InputStreamReader
 
 private const val METHOD_TEMPLATE = """
-    .class LInlineCompiler;
+.class public Linlinecompiler;
-    .super Ljava/lang/Object;
+.super Ljava/lang/Object;
-    .method %s dummyMethod(%s)V
+.method public static compiler(%s)V
-        .registers %d
+    .registers %d
-        %s
+    %s
-    .end method
+.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
+         * p0, p1 etc. will only work correctly if the parameters and registers are passed.
-         * if the parameters and registers of the method 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(
+        fun compileMethodInstructions(
-            instructions: String, parameters: String, registers: Int, forStaticMethod: Boolean
+            instructions: String,
+            parameters: String,
+            registers: Int
         ): List<BuilderInstruction> {
-            val input = METHOD_TEMPLATE.format(
+            val input = METHOD_TEMPLATE.format(parameters, registers, instructions)
-                if (forStaticMethod) {
-                    "static"
-                } else {
-                    ""
-                }, 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() }
         }
     }
 }
 
-/**
+fun String.toInstructions(parameters: String = "", registers: Int = 1) =
- * Compile lines of Smali code to a list of instructions.
+    InlineSmaliCompiler.compileMethodInstructions(this, parameters, registers)
- *
- * 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.toInstruction(parameters: String = "", registers: Int = 1) =
- * Compile a line of Smali code to an instruction.
+    this.toInstructions(parameters, registers).first()
- * @param templateMethod The method to compile the instructions against.
- * @return The instruction.
- */
-fun String.toInstruction(templateMethod: MutableMethod? = null) = this.toInstructions(templateMethod).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/test/kotlin/app/revanced/patcher/patch/PatchOptionsTest.kt

@@ -1,68 +0,0 @@
-package app.revanced.patcher.patch
-
-import app.revanced.patcher.usage.bytecode.ExampleBytecodePatch
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.assertThrows
-
-internal class PatchOptionsTest {
-    private val options = ExampleBytecodePatch().options
-
-    @Test
-    fun `should not throw an exception`() {
-        for (option in options) {
-            when (option) {
-                is PatchOption.StringOption -> {
-                    option.value = "Hello World"
-                }
-                is PatchOption.BooleanOption -> {
-                    option.value = false
-                }
-                is PatchOption.StringListOption -> {
-                    option.value = option.options.first()
-                    for (choice in option.options) {
-                        println(choice)
-                    }
-                }
-                is PatchOption.IntListOption -> {
-                    option.value = option.options.first()
-                    for (choice in option.options) {
-                        println(choice)
-                    }
-                }
-            }
-        }
-        println(options["key1"].value)
-        options["key1"] = "Hello, world!"
-        println(options["key1"].value)
-    }
-
-    @Test
-    fun `should be able to set value to null`() {
-        // Sadly, doing:
-        // > options["key1"] = null
-        // is not possible because Kotlin
-        // cannot reify the type "Nothing?".
-        options.nullify("key1")
-    }
-
-    @Test
-    fun `should fail because the option does not exist`() {
-        assertThrows<NoSuchOptionException> {
-            options["this option does not exist"] = 123
-        }
-    }
-
-    @Test
-    fun `should fail because of invalid value type`() {
-        assertThrows<InvalidTypeException> {
-            options["key1"] = 123
-        }
-    }
-
-    @Test
-    fun `should fail because of an illegal value`() {
-        assertThrows<IllegalValueException> {
-            options["key3"] = "this value is not an allowed option"
-        }
-    }
-}

src/test/kotlin/app/revanced/patcher/usage/PatcherTest.kt

@@ -0,0 +1,46 @@
+package app.revanced.patcher.usage
+
+import org.junit.jupiter.api.Test
+
+internal class PatcherTest {
+    @Test
+    fun testPatcher() {
+        return // FIXME: create a proper resource to pass this test
+        /**
+        val patcher = Patcher(
+        File(PatcherTest::class.java.getResource("/example.apk")!!.toURI()),
+        "exampleCacheDirectory",
+        patchResources = true
+        )
+
+        patcher.addPatches(listOf(ExampleBytecodePatch(), ExampleResourcePatch()))
+
+        for (signature in patcher.resolveSignatures()) {
+        if (!signature.resolved) {
+        throw Exception("Signature ${signature.metadata.name} was not resolved!")
+        }
+        val patternScanMethod = signature.metadata.patternScanMethod
+        if (patternScanMethod is PatternScanMethod.Fuzzy) {
+        val warnings = patternScanMethod.warnings
+        if (warnings != null) {
+        println("Signature ${signature.metadata.name} had ${warnings.size} warnings!")
+        for (warning in warnings) {
+        println(warning.toString())
+        }
+        } else {
+        println("Signature ${signature.metadata.name} used the fuzzy resolver, but the warnings list is null!")
+        }
+        }
+        }
+        for ((metadata, result) in patcher.applyPatches()) {
+        if (result.isFailure) {
+        throw Exception("Patch ${metadata.shortName} failed", result.exceptionOrNull()!!)
+        } else {
+        println("Patch ${metadata.shortName} applied successfully!")
+        }
+        }
+        val out = patcher.save()
+        assertTrue(out.isNotEmpty(), "Expected the output of Patcher#save() to not be empty.")
+         */
+    }
+}

src/test/kotlin/app/revanced/patcher/usage/bytecode/annotation/ExampleBytecodeCompatibility.kt

@@ -1,4 +1,4 @@
-package app.revanced.patcher.usage.bytecode
+package app.revanced.patcher.usage.bytecode.annotation
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

src/test/kotlin/app/revanced/patcher/usage/bytecode/patch/ExampleBytecodePatch.kt

@@ -1,23 +1,21 @@
-package app.revanced.patcher.usage.bytecode
+package app.revanced.patcher.usage.bytecode.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.implementation.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.extensions.replaceInstruction
-import app.revanced.patcher.patch.PatchOption
-import app.revanced.patcher.patch.PatchOptions
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.DependencyType
-import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.implementation.misc.PatchResult
+import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patcher.usage.bytecode.signatures.ExampleSignature
 import app.revanced.patcher.usage.resource.annotation.ExampleResourceCompatibility
 import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMutable
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
+import app.revanced.patcher.util.smali.toInstruction
+import app.revanced.patcher.util.smali.toInstructions
 import com.google.common.collect.ImmutableList
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Format
@@ -39,34 +37,37 @@ import org.jf.dexlib2.util.Preconditions
 @Description("Example demonstration of a bytecode patch.")
 @ExampleResourceCompatibility
 @Version("0.0.1")
-@DependsOn(ExampleBytecodePatch::class, DependencyType.HARD)
+class ExampleBytecodePatch : BytecodePatch(
-class ExampleBytecodePatch : BytecodePatch(listOf(ExampleFingerprint)) {
+
+    listOf(
+        ExampleSignature
+    )
+) {
     // This function will be executed by the patcher.
     // You can treat it as a constructor
     override fun execute(data: BytecodeData): PatchResult {
-        // Get the resolved method by its fingerprint from the resolver cache
+        // Get the resolved method for the signature from the resolver cache
-        val result = ExampleFingerprint.result!!
+        val result = signatures.first().result!!
 
         // Get the implementation for the resolved method
-        val method = result.mutableMethod
+        val implementation = result.method.implementation!!
-        val implementation = method.implementation!!
 
         // Let's modify it, so it prints "Hello, ReVanced! Editing bytecode."
         // Get the start index of our opcode pattern.
         // This will be the index of the instruction with the opcode CONST_STRING.
-        val startIndex = result.patternScanResult!!.startIndex
+        val startIndex = result.scanResult.startIndex
 
         implementation.replaceStringAt(startIndex, "Hello, ReVanced! Editing bytecode.")
 
-        // Get the class in which the method matching our fingerprint is defined in.
+        // Get the class in which the method matching our signature is defined in.
         val mainClass = data.findClass {
-            it.type == result.classDef.type
+            it.type == result.definingClassProxy.immutableClass.type
         }!!.resolve()
 
         // Add a new method returning a string
         mainClass.methods.add(
             ImmutableMethod(
-                result.classDef.type,
+                result.definingClassProxy.immutableClass.type,
                 "returnHello",
                 null,
                 "Ljava/lang/String;",
@@ -111,21 +112,22 @@ class ExampleBytecodePatch : BytecodePatch(listOf(ExampleFingerprint)) {
         )
 
         // store the fields initial value into the first virtual register
-        method.replaceInstruction(0, "sget-object v0, LTestClass;->dummyField:Ljava/io/PrintStream;")
+        implementation.replaceInstruction(
+            0,
+            "sget-object v0, LTestClass;->dummyField:Ljava/io/PrintStream;".toInstruction()
+        )
 
         // Now let's create a new call to our method and print the return value!
         // You can also use the smali compiler to create instructions.
         // For this sake of example I reuse the TestClass field dummyField inside the virtual register 0.
         //
         // Control flow instructions are not supported as of now.
-        method.addInstructions(
+        val instructions = """
-            startIndex + 2,
+                        invoke-static { }, LTestClass;->returnHello()Ljava/lang/String;
-            """
+                        move-result-object v1
-                invoke-static { }, LTestClass;->returnHello()Ljava/lang/String;
+                        invoke-virtual { v0, v1 }, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
-                move-result-object v1
+                    """.trimIndent().toInstructions()
-                invoke-virtual { v0, v1 }, Ljava/io/PrintStream;->println(Ljava/lang/String;)V
+        implementation.addInstructions(startIndex + 2, instructions)
-                """
-        )
 
         // Finally, tell the patcher that this patch was a success.
         // You can also return PatchResultError with a message.
@@ -164,19 +166,4 @@ class ExampleBytecodePatch : BytecodePatch(listOf(ExampleFingerprint)) {
             )
         )
     }
-
-    override val options = PatchOptions(
-        PatchOption.StringOption(
-            "key1", "default", "title", "description", true
-        ),
-        PatchOption.BooleanOption(
-            "key2", true, "title", "description" // required defaults to false
-        ),
-        PatchOption.StringListOption(
-            "key3", "TEST", listOf("TEST", "TEST1", "TEST2"), "title", "description"
-        ),
-        PatchOption.IntListOption(
-            "key4", 1, listOf(1, 2, 3), "title", "description"
-        ),
-    )
 }

src/test/kotlin/app/revanced/patcher/usage/bytecode/signatures/ExampleSignature.kt

@@ -1,16 +1,16 @@
-package app.revanced.patcher.usage.bytecode
+package app.revanced.patcher.usage.bytecode.signatures
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.signature.implementation.method.MethodSignature
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
-import app.revanced.patcher.usage.bytecode.ExampleBytecodeCompatibility
+import app.revanced.patcher.usage.bytecode.annotation.ExampleBytecodeCompatibility
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 
-@Name("example-fingerprint")
+@Name("example-signature")
 @MatchingMethod(
     "LexampleClass;",
     "exampleMehod"
@@ -18,7 +18,7 @@ import org.jf.dexlib2.Opcode
 @FuzzyPatternScanMethod(2)
 @ExampleBytecodeCompatibility
 @Version("0.0.1")
-object ExampleFingerprint : MethodFingerprint(
+object ExampleSignature : MethodSignature(
     "V",
     AccessFlags.PUBLIC or AccessFlags.STATIC,
     listOf("[L"),

src/test/kotlin/app/revanced/patcher/usage/resource/patch/ExampleResourcePatch.kt

@@ -3,11 +3,11 @@ package app.revanced.patcher.usage.resource.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.impl.ResourceData
+import app.revanced.patcher.data.implementation.ResourceData
-import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patcher.patch.impl.ResourcePatch
+import app.revanced.patcher.patch.implementation.ResourcePatch
+import app.revanced.patcher.patch.implementation.misc.PatchResult
+import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
 import app.revanced.patcher.usage.resource.annotation.ExampleResourceCompatibility
 import org.w3c.dom.Element
 
@@ -18,8 +18,8 @@ import org.w3c.dom.Element
 @Version("0.0.1")
 class ExampleResourcePatch : ResourcePatch() {
     override fun execute(data: ResourceData): PatchResult {
-        data.xmlEditor["AndroidManifest.xml"].use { editor ->
+        data.getXmlEditor("AndroidManifest.xml").use { domFileEditor ->
-            val element = editor // regular DomFileEditor
+            val element = domFileEditor // regular DomFileEditor
                 .file
                 .getElementsByTagName("application")
                 .item(0) as Element
@@ -30,6 +30,18 @@ class ExampleResourcePatch : ResourcePatch() {
                 )
         }
 
+        // iterate through all available resources
+        data.forEach {
+            if (it.extension.lowercase() != "xml") return@forEach
+
+            data.replace(
+                it.path,
+                "\\ddip", // regex supported
+                "0dip",
+                true
+            )
+        }
+
         return PatchResultSuccess()
     }
 }

src/test/kotlin/app/revanced/patcher/util/smali/InlineSmaliCompilerTest.kt

@@ -1,104 +0,0 @@
-package app.revanced.patcher.util.smali
-
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.instruction
-import app.revanced.patcher.extensions.label
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.builder.BuilderInstruction
-import org.jf.dexlib2.builder.MutableMethodImplementation
-import org.jf.dexlib2.builder.instruction.BuilderInstruction21c
-import org.jf.dexlib2.builder.instruction.BuilderInstruction21t
-import org.jf.dexlib2.immutable.ImmutableMethod
-import org.jf.dexlib2.immutable.reference.ImmutableStringReference
-import java.util.*
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
-
-internal class InlineSmaliCompilerTest {
-    @Test
-    fun `compiler should output valid instruction`() {
-        val want = BuilderInstruction21c(Opcode.CONST_STRING, 0, ImmutableStringReference("Test")) as BuilderInstruction
-        val have = "const-string v0, \"Test\"".toInstruction()
-        instructionEquals(want, have)
-    }
-
-    @Test
-    fun `compiler should support branching with own branches`() {
-        val method = createMethod()
-        val insnAmount = 8
-        val insnIndex = insnAmount - 2
-        val targetIndex = insnIndex - 1
-
-        method.addInstructions(arrayOfNulls<String>(insnAmount).also {
-            Arrays.fill(it, "const/4 v0, 0x0")
-        }.joinToString("\n"))
-        method.addInstructions(
-            targetIndex,
-            """
-                :test
-                const/4 v0, 0x1
-                if-eqz v0, :test
-            """
-        )
-
-        val insn = method.instruction(insnIndex) as BuilderInstruction21t
-        assertEquals(targetIndex, insn.target.location.index)
-    }
-
-    @Test
-    fun `compiler should support branching to outside branches`() {
-        val method = createMethod()
-        val insnIndex = 3
-        val labelIndex = 1
-
-        method.addInstructions(
-            """
-                const/4 v0, 0x1
-                const/4 v0, 0x0
-            """
-        )
-
-        assertEquals(labelIndex, method.label(labelIndex).location.index)
-
-        method.addInstructions(
-            """
-                const/4 v0, 0x1
-                if-eqz v0, :test
-                return-void
-            """, listOf(
-                ExternalLabel("test",method.instruction(1))
-            )
-        )
-
-        val insn = method.instruction(insnIndex) as BuilderInstruction21t
-        assertTrue(insn.target.isPlaced, "Label was not placed")
-        assertEquals(labelIndex, insn.target.location.index)
-    }
-
-    companion object {
-        private fun createMethod(
-            name: String = "dummy",
-            returnType: String = "V",
-            accessFlags: Int = AccessFlags.STATIC.value,
-            registerCount: Int = 1,
-        ) = ImmutableMethod(
-            "Ldummy;",
-            name,
-            emptyList(), // parameters
-            returnType,
-            accessFlags,
-            emptySet(),
-            emptySet(),
-            MutableMethodImplementation(registerCount)
-        ).toMutable()
-
-        private fun instructionEquals(want: BuilderInstruction, have: BuilderInstruction) {
-            assertEquals(want.opcode, have.opcode)
-            assertEquals(want.format, have.format)
-            assertEquals(want.codeUnits, have.codeUnits)
-        }
-    }
-}