From 6177706c364e7869cc1181f7a368308a675a5815 Mon Sep 17 00:00:00 2001 From: therealunull Date: Mon, 14 Dec 2020 11:44:08 -0500 Subject: [PATCH] project: bundle injector --- build.gradle.kts | 2 +- gradle.properties | 2 +- openosrs-injector/.gitignore | 3 + openosrs-injector/LICENSE | 674 ++++++++++++++++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 58910 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + openosrs-injector/gradlew | 185 +++++ openosrs-injector/gradlew.bat | 104 +++ openosrs-injector/jitpack.yml | 6 + .../openosrs-injector.gradle.kts | 82 ++ .../openosrs/injector/InjectException.java | 26 + .../com/openosrs/injector/InjectUtil.java | 480 ++++++++++++ .../java/com/openosrs/injector/Injection.java | 138 ++++ .../openosrs/injector/InjectorValidator.java | 78 ++ .../java/com/openosrs/injector/Validator.java | 20 + .../injector/injection/InjectData.java | 161 ++++ .../injector/injection/InjectTaskHandler.java | 27 + .../injector/injectors/AbstractInjector.java | 32 + .../injector/injectors/CreateAnnotations.java | 79 ++ .../injector/injectors/InjectConstruct.java | 145 ++++ .../injector/injectors/InjectHook.java | 368 +++++++++ .../injector/injectors/InjectHookMethod.java | 173 +++++ .../openosrs/injector/injectors/Injector.java | 36 + .../injector/injectors/InterfaceInjector.java | 58 ++ .../injector/injectors/MixinInjector.java | 726 ++++++++++++++++++ .../injector/injectors/RSApiInjector.java | 291 +++++++ .../injectors/raw/AddPlayerToMenu.java | 281 +++++++ .../injectors/raw/ClearColorBuffer.java | 91 +++ .../injectors/raw/DrawAfterWidgets.java | 260 +++++++ .../injector/injectors/raw/DrawMenu.java | 131 ++++ .../injector/injectors/raw/Occluder.java | 69 ++ .../injectors/raw/RasterizerAlpha.java | 252 ++++++ .../injector/injectors/raw/RenderDraw.java | 69 ++ .../injector/injectors/raw/ScriptVM.java | 304 ++++++++ .../injectors/rsapi/InjectGetter.java | 84 ++ .../injectors/rsapi/InjectInvoke.java | 143 ++++ .../injectors/rsapi/InjectSetter.java | 99 +++ .../com/openosrs/injector/rsapi/RSApi.java | 136 ++++ .../openosrs/injector/rsapi/RSApiClass.java | 105 +++ .../openosrs/injector/rsapi/RSApiMethod.java | 74 ++ .../transformers/InjectTransformer.java | 42 + .../injector/transformers/SourceChanger.java | 39 + .../kotlin/com/openosrs/injector/Inject.kt | 39 + .../com/openosrs/injector/InjectExtension.kt | 25 + .../com/openosrs/injector/InjectPlugin.kt | 28 + .../com/openosrs/injector/TestInjection.java | 27 + .../injector/injectors/MixinInjectorTest.java | 310 ++++++++ .../injectors/raw/DrawAfterWidgetsTest.java | 83 ++ .../injector/injectors/raw/DrawMenuTest.java | 54 ++ .../transformers/SourceChangerTest.java | 65 ++ .../srcchangeclasses/NewName.java | 16 + .../srcchangeclasses/OldName.java | 16 + .../drawafterwidgets/Client_deob160.class | Bin 0 -> 117018 bytes .../drawafterwidgets/Client_deob180.class | Bin 0 -> 111525 bytes .../drawafterwidgets/Client_ob160.class | Bin 0 -> 691347 bytes .../drawafterwidgets/Client_ob180.class | Bin 0 -> 705618 bytes .../Rasterizer2D_deob160.class | Bin 0 -> 12934 bytes .../Rasterizer2D_deob180.class | Bin 0 -> 11866 bytes .../drawafterwidgets/Rasterizer2D_ob160.class | Bin 0 -> 50268 bytes .../drawafterwidgets/Rasterizer2D_ob180.class | Bin 0 -> 43336 bytes settings.gradle.kts | 1 + 61 files changed, 6742 insertions(+), 2 deletions(-) create mode 100644 openosrs-injector/.gitignore create mode 100644 openosrs-injector/LICENSE create mode 100644 openosrs-injector/gradle/wrapper/gradle-wrapper.jar create mode 100644 openosrs-injector/gradle/wrapper/gradle-wrapper.properties create mode 100644 openosrs-injector/gradlew create mode 100644 openosrs-injector/gradlew.bat create mode 100644 openosrs-injector/jitpack.yml create mode 100644 openosrs-injector/openosrs-injector.gradle.kts create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/InjectException.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/InjectUtil.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/Injection.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/InjectorValidator.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/Validator.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/injection/InjectData.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/injection/InjectTaskHandler.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/injectors/AbstractInjector.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/injectors/CreateAnnotations.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/injectors/InjectConstruct.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/injectors/InjectHook.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/injectors/InjectHookMethod.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/injectors/Injector.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/injectors/InterfaceInjector.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/injectors/MixinInjector.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/AddPlayerToMenu.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/ClearColorBuffer.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/DrawAfterWidgets.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/DrawMenu.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/Occluder.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/RasterizerAlpha.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/RenderDraw.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/ScriptVM.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectGetter.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectInvoke.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectSetter.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/rsapi/RSApi.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/rsapi/RSApiClass.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/rsapi/RSApiMethod.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/transformers/InjectTransformer.java create mode 100644 openosrs-injector/src/main/java/com/openosrs/injector/transformers/SourceChanger.java create mode 100644 openosrs-injector/src/main/kotlin/com/openosrs/injector/Inject.kt create mode 100644 openosrs-injector/src/main/kotlin/com/openosrs/injector/InjectExtension.kt create mode 100644 openosrs-injector/src/main/kotlin/com/openosrs/injector/InjectPlugin.kt create mode 100644 openosrs-injector/src/test/java/com/openosrs/injector/TestInjection.java create mode 100644 openosrs-injector/src/test/java/com/openosrs/injector/injectors/MixinInjectorTest.java create mode 100644 openosrs-injector/src/test/java/com/openosrs/injector/injectors/raw/DrawAfterWidgetsTest.java create mode 100644 openosrs-injector/src/test/java/com/openosrs/injector/injectors/raw/DrawMenuTest.java create mode 100644 openosrs-injector/src/test/java/com/openosrs/injector/transformers/SourceChangerTest.java create mode 100644 openosrs-injector/src/test/java/com/openosrs/injector/transformers/srcchangeclasses/NewName.java create mode 100644 openosrs-injector/src/test/java/com/openosrs/injector/transformers/srcchangeclasses/OldName.java create mode 100644 openosrs-injector/src/test/resources/drawafterwidgets/Client_deob160.class create mode 100644 openosrs-injector/src/test/resources/drawafterwidgets/Client_deob180.class create mode 100644 openosrs-injector/src/test/resources/drawafterwidgets/Client_ob160.class create mode 100644 openosrs-injector/src/test/resources/drawafterwidgets/Client_ob180.class create mode 100644 openosrs-injector/src/test/resources/drawafterwidgets/Rasterizer2D_deob160.class create mode 100644 openosrs-injector/src/test/resources/drawafterwidgets/Rasterizer2D_deob180.class create mode 100644 openosrs-injector/src/test/resources/drawafterwidgets/Rasterizer2D_ob160.class create mode 100644 openosrs-injector/src/test/resources/drawafterwidgets/Rasterizer2D_ob180.class diff --git a/build.gradle.kts b/build.gradle.kts index d9da869564..d610b5df85 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -36,7 +36,7 @@ buildscript { dependencies { classpath("org.ajoberstar.grgit:grgit-core:4.1.0") classpath("com.github.ben-manes:gradle-versions-plugin:0.36.0") - classpath("com.openosrs:injector-plugin:1.2.0") + classpath("com.openosrs:openosrs-injector:1.3.0") } } diff --git a/gradle.properties b/gradle.properties index dbf57649ed..d34c6d562c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -org.gradle.caching=true +org.gradle.caching=false org.gradle.warning.mode=all org.gradle.parallel=true org.gradle.console=rich diff --git a/openosrs-injector/.gitignore b/openosrs-injector/.gitignore new file mode 100644 index 0000000000..883f2555e2 --- /dev/null +++ b/openosrs-injector/.gitignore @@ -0,0 +1,3 @@ +/build/ +/.gradle/ +/.idea/ diff --git a/openosrs-injector/LICENSE b/openosrs-injector/LICENSE new file mode 100644 index 0000000000..f288702d2f --- /dev/null +++ b/openosrs-injector/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/openosrs-injector/gradle/wrapper/gradle-wrapper.jar b/openosrs-injector/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..62d4c053550b91381bbd28b1afc82d634bf73a8a GIT binary patch literal 58910 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 literal 0 HcmV?d00001 diff --git a/openosrs-injector/gradle/wrapper/gradle-wrapper.properties b/openosrs-injector/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..622ab64a3c --- /dev/null +++ b/openosrs-injector/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/openosrs-injector/gradlew b/openosrs-injector/gradlew new file mode 100644 index 0000000000..fbd7c51583 --- /dev/null +++ b/openosrs-injector/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/openosrs-injector/gradlew.bat b/openosrs-injector/gradlew.bat new file mode 100644 index 0000000000..5093609d51 --- /dev/null +++ b/openosrs-injector/gradlew.bat @@ -0,0 +1,104 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/openosrs-injector/jitpack.yml b/openosrs-injector/jitpack.yml new file mode 100644 index 0000000000..848b36414a --- /dev/null +++ b/openosrs-injector/jitpack.yml @@ -0,0 +1,6 @@ +# JitPack publishing yml - used for CI and externals +jdk: + - openjdk11 +install: + - chmod a+x ./gradlew + - ./gradlew clean build publishToMavenLocal -x test --console=plain diff --git a/openosrs-injector/openosrs-injector.gradle.kts b/openosrs-injector/openosrs-injector.gradle.kts new file mode 100644 index 0000000000..c9c7a0e938 --- /dev/null +++ b/openosrs-injector/openosrs-injector.gradle.kts @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2019, Lucas + * All rights reserved. + * + * This code is licensed under GPL3, see the complete license in + * the LICENSE file in the root directory of this source tree. + */ + +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +plugins { + id("java-gradle-plugin") + kotlin("jvm") version "1.3.72" + `maven-publish` + id("se.patrikerdes.use-latest-versions") +} + +val oprsver = "3.5.1" + +group = "com.openosrs" +version = "1.3.0" + +repositories { + mavenCentral() + mavenLocal() + maven { + url = uri("https://repo.runelite.net") + url = uri("https://raw.githubusercontent.com/open-osrs/hosting/master") + url = uri("https://repo.openosrs.com/repository/maven") + } +} + +dependencies { + annotationProcessor("org.projectlombok:lombok:1.18.12") + compileOnly("org.projectlombok:lombok:1.18.12") + + implementation("org.ow2.asm:asm:8.0.1") + implementation("org.ow2.asm:asm-util:8.0.1") + implementation("org.jetbrains:annotations:19.0.0") + implementation("com.google.guava:guava:29.0-jre") + implementation("com.openosrs:deobfuscator:${oprsver}") { + isTransitive = false + } + + testCompileOnly("com.openosrs:injection-annotations:1.0") + testImplementation("junit:junit:4.13") +} + +gradlePlugin { + plugins { + create("injectorPlugin") { + id = "com.openosrs.injector" + implementationClass = "com.openosrs.injector.InjectPlugin" + } + } +} + +configure { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 +} + +val compileKotlin: KotlinCompile by tasks +compileKotlin.kotlinOptions { + jvmTarget = "1.8" +} + +val compileTestKotlin: KotlinCompile by tasks +compileTestKotlin.kotlinOptions { + jvmTarget = "1.8" +} + +val sourcesJar by tasks.registering(Jar::class) { + archiveClassifier.set("sources") + from(sourceSets.main.get().allSource) +} + +publishing { + repositories { + mavenLocal() + } +} diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/InjectException.java b/openosrs-injector/src/main/java/com/openosrs/injector/InjectException.java new file mode 100644 index 0000000000..aa1a352a0d --- /dev/null +++ b/openosrs-injector/src/main/java/com/openosrs/injector/InjectException.java @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2019, Lucas + * All rights reserved. + * + * This code is licensed under GPL3, see the complete license in + * the LICENSE file in the root directory of this source tree. + */ +package com.openosrs.injector; + +public class InjectException extends RuntimeException +{ + public InjectException(String message) + { + super(message); + } + + public InjectException(Throwable cause) + { + super(cause); + } + + public InjectException(String message, Throwable cause) + { + super(message, cause); + } +} diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/InjectUtil.java b/openosrs-injector/src/main/java/com/openosrs/injector/InjectUtil.java new file mode 100644 index 0000000000..b924d035e6 --- /dev/null +++ b/openosrs-injector/src/main/java/com/openosrs/injector/InjectUtil.java @@ -0,0 +1,480 @@ +/* + * Copyright (c) 2019, Lucas + * All rights reserved. + * + * This code is licensed under GPL3, see the complete license in + * the LICENSE file in the root directory of this source tree. + */ +package com.openosrs.injector; + +import com.openosrs.injector.injection.InjectData; +import com.openosrs.injector.rsapi.RSApiClass; +import com.openosrs.injector.rsapi.RSApiMethod; +import java.util.List; +import java.util.function.Consumer; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import net.runelite.asm.Annotation; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; +import net.runelite.asm.Field; +import net.runelite.asm.Method; +import net.runelite.asm.Named; +import net.runelite.asm.Type; +import net.runelite.asm.attributes.Annotated; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instructions.ALoad; +import net.runelite.asm.attributes.code.instructions.DLoad; +import net.runelite.asm.attributes.code.instructions.FLoad; +import net.runelite.asm.attributes.code.instructions.ILoad; +import net.runelite.asm.attributes.code.instructions.IMul; +import net.runelite.asm.attributes.code.instructions.InvokeStatic; +import net.runelite.asm.attributes.code.instructions.InvokeVirtual; +import net.runelite.asm.attributes.code.instructions.LDC; +import net.runelite.asm.attributes.code.instructions.LLoad; +import net.runelite.asm.attributes.code.instructions.LMul; +import net.runelite.asm.attributes.code.instructions.Return; +import net.runelite.asm.attributes.code.instructions.VReturn; +import net.runelite.asm.pool.Class; +import net.runelite.asm.signature.Signature; +import net.runelite.deob.DeobAnnotations; +import net.runelite.deob.deobfuscators.arithmetic.DMath; +import org.jetbrains.annotations.Nullable; +import static com.openosrs.injector.rsapi.RSApi.API_BASE; +import static com.openosrs.injector.rsapi.RSApi.RL_API_BASE; + +public interface InjectUtil +{ + /** + * Finds a static method in deob and converts it to ob + * + * @param data InjectData instance + * @param name The name of the method you want to find + * @return The obfuscated version of the found method + */ + static Method findMethod(InjectData data, String name) + { + return findMethod(data, name, null, null); + } + + /** + * Finds a static method in deob and converts it to ob + * + * @param data InjectData instance + * @param name The name of the method you want to find + * @param classHint The name of the class you expect the method to be in, or null + * @param sig The signature the method has in deob, or null + * + * @return The obfuscated version of the found method + */ + static Method findMethod( + InjectData data, + String name, + String classHint, + @Nullable Predicate sig) + { + return findMethod(data, name, classHint, sig, false, false); + } + + /** + * Finds a method in injectData's deobfuscated classes. + * + * @param data InjectData instance + * @param name (Exported) method name + * @param classHint The (exported) name of a class you expect (or know) the method to be in, or null, if you're not sure + * @throws InjectException If the hint class couldn't be found, or no method matching the settings was found + */ + static Method findMethod( + InjectData data, + String name, + @Nullable String classHint) + throws InjectException + { + return findMethod(data, name, classHint, null, false, false); + } + + /** + * Finds a method in injectData's deobfuscated classes. + * + * @param data InjectData instance + * @param name (Exported) method name + * @param classHint The (exported) name of a class you expect (or know) the method to be in, or null, if you're not sure + * @param sig The deobfuscated methods' signature, or null, if you're unsure + * @param notStatic If this is true, only check non-static methods. If classHint isn't null, check only subclasses + * @param returnDeob If this is true, this method will return the deobfuscated method, instead of turning it into vanilla first + * + * @throws InjectException If the hint class couldn't be found, or no method matching the settings was found + */ + static Method findMethod( + InjectData data, + String name, + @Nullable String classHint, + @Nullable Predicate sig, + boolean notStatic, + boolean returnDeob) + throws InjectException + { + final ClassGroup deob = data.getDeobfuscated(); + if (classHint != null) + { + ClassFile cf; + Method m; + cf = findClassOrThrow(deob, classHint); + if (notStatic) + { + if (sig == null) + m = InjectUtil.findMethodDeep(cf, name, s -> true); + else + m = InjectUtil.findMethodDeep(cf, name, sig); + } + else + m = cf.findMethod(name); + + if (m != null) + return returnDeob ? m : data.toVanilla(m); + } + + for (ClassFile cf : deob) + for (Method m : cf.getMethods()) + if (m.getName().equals(name)) + if (!notStatic || !m.isStatic()) + if (sig == null || sig.test(m.getDescriptor())) + return returnDeob ? m : data.toVanilla(m); + + throw new InjectException(String.format("Couldn't find %s", name)); + } + + static ClassFile findClassOrThrow(ClassGroup group, String name) + { + ClassFile clazz = group.findClass(name); + if (clazz == null) + throw new InjectException("Hint class " + name + " doesn't exist"); + + return clazz; + } + + /** + * Fail-fast implementation of ClassFile.findMethodDeep, using a predicate for signature + */ + static Method findMethodDeep(ClassFile clazz, String name, Predicate type) + { + do + for (Method method : clazz.getMethods()) + if (method.getName().equals(name)) + if (type.test(method.getDescriptor())) + return method; + while ((clazz = clazz.getParent()) != null); + + throw new InjectException(String.format("Method %s couldn't be found", name + type.toString())); + } + + /** + * Fail-fast implementation of ClassGroup.findStaticField + * + * well... + */ + static Field findStaticField(ClassGroup group, String name) + { + for (ClassFile clazz : group) + { + Field f = clazz.findField(name); + if (f != null && f.isStatic()) + return f; + } + + throw new InjectException("Couldn't find static field " + name); + } + + /** + * Finds a static field in deob and converts it to ob + * + * @param data InjectData instance + * @param name The name of the field you want to find + * @param classHint The name of the class you expect the field to be in, or null + * @param type The type the method has in deob, or null + * + * @return The obfuscated version of the found field + */ + static Field findStaticField(InjectData data, String name, String classHint, Type type) + { + final ClassGroup deob = data.getDeobfuscated(); + Field field; + + if (classHint != null) + { + ClassFile clazz = findClassOrThrow(deob, classHint); + + if (type == null) + field = clazz.findField(name); + else + field = clazz.findField(name, type); + + if (field != null) + return field; + } + + for (ClassFile clazz : deob) + { + if (type == null) + field = clazz.findField(name); + else + field = clazz.findField(name, type); + + if (field != null) + return field; + } + + throw new InjectException(String.format("Static field %s doesn't exist", (type != null ? type + " " : "") + name)); + } + + /** + * Fail-fast implementation of ClassGroup.findFieldDeep + */ + static Field findFieldDeep(ClassFile clazz, String name) + { + Field f; + + do + if ((f = clazz.findField(name)) != null) + return f; + while ((clazz = clazz.getParent()) != null); + + throw new InjectException("Couldn't find field " + name); + } + + static Field findField(InjectData data, String name, String hintClass) + { + final ClassGroup deob = data.getDeobfuscated(); + return data.toVanilla(findField(deob, name, hintClass)); + } + + static Field findField(ClassGroup group, String name, String hintClass) + { + Field field; + if (hintClass != null) + { + ClassFile clazz = findClassOrThrow(group, hintClass); + + field = clazz.findField(name); + if (field != null) + return field; + } + + for (ClassFile clazz : group) + if ((field = clazz.findField(name)) != null) + return field; + + throw new InjectException("Field " + name + " doesn't exist"); + } + + static ClassFile deobFromApiMethod(InjectData data, RSApiMethod apiMethod) + { + return data.toDeob(apiMethod.getClazz().getName()); + } + + static ClassFile vanillaFromApiMethod(InjectData data, RSApiMethod apiMethod) + { + return data.toVanilla(deobFromApiMethod(data, apiMethod)); + } + + static Signature apiToDeob(InjectData data, Signature api) + { + return new Signature.Builder() + .setReturnType(apiToDeob(data, api.getReturnValue())) + .addArguments( + api.getArguments().stream() + .map(type -> apiToDeob(data, type)) + .collect(Collectors.toList()) + ).build(); + } + + static Type apiToDeob(InjectData data, Type api) + { + if (api.isPrimitive()) + return api; + + final String internalName = api.getInternalName(); + if (internalName.startsWith(API_BASE)) + return Type.getType("L" + api.getInternalName().substring(API_BASE.length()) + ";", api.getDimensions()); + else if (internalName.startsWith(RL_API_BASE)) + { + Class rlApiC = new Class(internalName); + RSApiClass highestKnown = data.getRsApi().withInterface(rlApiC); + + // Cheeky unchecked exception + assert highestKnown != null : "No rs api class implements rl api class " + rlApiC.toString(); + + boolean changed; + do + { + changed = false; + + for (RSApiClass interf : highestKnown.getApiInterfaces()) + { + if (interf.getInterfaces().contains(rlApiC)) + { + highestKnown = interf; + changed = true; + break; + } + } + } + while (changed); + + return apiToDeob(data, Type.getType(highestKnown.getName(), api.getDimensions())); + } + + return api; + } + + static Type deobToVanilla(InjectData data, Type deobT) + { + if (deobT.isPrimitive()) + return deobT; + + final ClassFile deobClass = data.getDeobfuscated().findClass(deobT.getInternalName()); + if (deobClass == null) + return deobT; + + return Type.getType("L" + data.toVanilla(deobClass).getName() + ";", deobT.getDimensions()); + } + + static boolean apiToDeobSigEquals(InjectData data, Signature deobSig, Signature apiSig) + { + return deobSig.equals(apiToDeob(data, apiSig)); + } + + static boolean argsMatch(Signature a, Signature b) + { + List aa = a.getArguments(); + List bb = b.getArguments(); + + if (aa.size() != bb.size()) + return false; + + for (int i = 0; i < aa.size(); i++) + if (!aa.get(i).equals(bb.get(i))) + return false; + + return true; + } + + /** + * Gets the obfuscated name from something's annotations. + * + * If the annotation doesn't exist return the current name instead. + */ + static String getObfuscatedName(T from) + { + Annotation name = from.findAnnotation(DeobAnnotations.OBFUSCATED_NAME); + return name == null ? from.getName() : name.getValueString(); + } + + /** + * Gets the value of the @Export annotation on the object. + */ + static String getExportedName(Annotated from) + { + Annotation export = from.findAnnotation(DeobAnnotations.EXPORT); + return export == null ? null : export.getValueString(); + } + + /** + * Creates the correct load instruction for the variable with Type type and var index index. + */ + static Instruction createLoadForTypeIndex(Instructions instructions, Type type, int index) + { + if (type.getDimensions() > 0 || !type.isPrimitive()) + return new ALoad(instructions, index); + + switch (type.toString()) + { + case "B": + case "C": + case "I": + case "S": + case "Z": + return new ILoad(instructions, index); + case "D": + return new DLoad(instructions, index); + case "F": + return new FLoad(instructions, index); + case "J": + return new LLoad(instructions, index); + default: + throw new IllegalStateException("Unknown type"); + } + } + + /** + * Creates the right return instruction for an object with Type type + */ + static Instruction createReturnForType(Instructions instructions, Type type) + { + if (!type.isPrimitive()) + return new Return(instructions, InstructionType.ARETURN); + + switch (type.toString()) + { + case "B": + case "C": + case "I": + case "S": + case "Z": + return new Return(instructions, InstructionType.IRETURN); + case "D": + return new Return(instructions, InstructionType.DRETURN); + case "F": + return new Return(instructions, InstructionType.FRETURN); + case "J": + return new Return(instructions, InstructionType.LRETURN); + case "V": + return new VReturn(instructions); + default: + throw new IllegalStateException("Unknown type"); + } + } + + static Instruction createInvokeFor(Instructions instructions, net.runelite.asm.pool.Method method, boolean isStatic) + { + if (isStatic) + return new InvokeStatic(instructions, method); + else + return new InvokeVirtual(instructions, method); + } + + /** + * Legit fuck annotations + */ + static ClassFile getVanillaClassFromAnnotationString(InjectData data, Annotation annotation) + { + Object v = annotation.getValue(); + String str = ((org.objectweb.asm.Type) v).getInternalName(); + return data.toVanilla(data.toDeob(str)); + } + + /** + * Add after the get + */ + static void injectObfuscatedGetter(Number getter, Instructions instrs, Consumer into) + { + into.accept(new LDC(instrs, getter)); + + if (getter instanceof Integer) + into.accept(new IMul(instrs)); + else if (getter instanceof Long) + into.accept(new LMul(instrs)); + } + + /** + * Add IN FRONT of the put + * + * @param getter should be the same value as for the getter (straight from ObfuscatedGetter) + */ + static void injectObfuscatedSetter(Number getter, Instructions instrs, Consumer into) + { + injectObfuscatedGetter(DMath.modInverse(getter), instrs, into); + } +} diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/Injection.java b/openosrs-injector/src/main/java/com/openosrs/injector/Injection.java new file mode 100644 index 0000000000..76d58daa86 --- /dev/null +++ b/openosrs-injector/src/main/java/com/openosrs/injector/Injection.java @@ -0,0 +1,138 @@ +/* + * Copyright (c) 2019, Lucas + * All rights reserved. + * + * This code is licensed under GPL3, see the complete license in + * the LICENSE file in the root directory of this source tree. + */ +package com.openosrs.injector; + +import com.openosrs.injector.injection.InjectData; +import com.openosrs.injector.injection.InjectTaskHandler; +import com.openosrs.injector.injectors.CreateAnnotations; +import com.openosrs.injector.injectors.InjectConstruct; +import com.openosrs.injector.injectors.Injector; +import com.openosrs.injector.injectors.InterfaceInjector; +import com.openosrs.injector.injectors.MixinInjector; +import com.openosrs.injector.injectors.RSApiInjector; +import com.openosrs.injector.injectors.raw.AddPlayerToMenu; +import com.openosrs.injector.injectors.raw.ClearColorBuffer; +import com.openosrs.injector.injectors.raw.DrawAfterWidgets; +import com.openosrs.injector.injectors.raw.DrawMenu; +import com.openosrs.injector.injectors.raw.Occluder; +import com.openosrs.injector.injectors.raw.RasterizerAlpha; +import com.openosrs.injector.injectors.raw.RenderDraw; +import com.openosrs.injector.injectors.raw.ScriptVM; +import com.openosrs.injector.rsapi.RSApi; +import com.openosrs.injector.transformers.InjectTransformer; +import com.openosrs.injector.transformers.SourceChanger; +import java.io.File; +import java.io.IOException; +import net.runelite.deob.util.JarUtil; +import org.gradle.api.file.FileTree; +import org.gradle.api.logging.Logger; +import org.gradle.api.logging.Logging; + +public class Injection extends InjectData implements InjectTaskHandler +{ + private static final Logger log = Logging.getLogger(Injection.class); + + public Injection(File vanilla, File rsclient, File mixins, FileTree rsapi) throws IOException + { + super( + JarUtil.loadJar(vanilla), + JarUtil.loadJar(rsclient), + JarUtil.loadJar(mixins), + new RSApi(rsapi) + ); + } + + public void inject() + { + log.debug("[DEBUG] Starting injection"); + + inject(new CreateAnnotations(this)); + + inject(new InterfaceInjector(this)); + + inject(new RasterizerAlpha(this)); + + inject(new MixinInjector(this)); + + // This is where field hooks runs + + // This is where method hooks runs + + inject(new InjectConstruct(this)); + + inject(new RSApiInjector(this)); + + //inject(new DrawAfterWidgets(this)); + + inject(new ScriptVM(this)); + + // All GPU raw injectors should probably be combined, especially RenderDraw and Occluder + inject(new ClearColorBuffer(this)); + + inject(new RenderDraw(this)); + + inject(new Occluder(this)); + + inject(new DrawMenu(this)); + + inject(new AddPlayerToMenu(this)); + + validate(new InjectorValidator(this)); + + transform(new SourceChanger(this)); + } + + public void save(File outputJar) throws IOException + { + log.info("[INFO] Saving jar to {}", outputJar.toString()); + + JarUtil.saveJar(this.getVanilla(), outputJar); + } + + private void inject(Injector injector) + { + final String name = injector.getName(); + + log.info("[INFO] Starting {}", name); + + injector.start(); + + injector.inject(); + + log.lifecycle("{} {}", name, injector.getCompletionMsg()); + + if (injector instanceof Validator) + validate((Validator) injector); + } + + private void validate(Validator validator) + { + final String name = validator.getName(); + + if (!validator.validate()) + { + throw new InjectException(name + " failed validation"); + } + } + + private void transform(InjectTransformer transformer) + { + final String name = transformer.getName(); + + log.info("[INFO] Starting {}", name); + + transformer.transform(); + + log.lifecycle("{} {}", name, transformer.getCompletionMsg()); + } + + public void runChildInjector(Injector injector) + { + inject(injector); + } +} diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/InjectorValidator.java b/openosrs-injector/src/main/java/com/openosrs/injector/InjectorValidator.java new file mode 100644 index 0000000000..4a606a4a22 --- /dev/null +++ b/openosrs-injector/src/main/java/com/openosrs/injector/InjectorValidator.java @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2019, Lucas + * All rights reserved. + * + * This code is licensed under GPL3, see the complete license in + * the LICENSE file in the root directory of this source tree. + */ +package com.openosrs.injector; + +import com.openosrs.injector.injection.InjectData; +import com.openosrs.injector.rsapi.RSApi; +import com.openosrs.injector.rsapi.RSApiClass; +import com.openosrs.injector.rsapi.RSApiMethod; +import lombok.RequiredArgsConstructor; +import net.runelite.asm.ClassFile; +import net.runelite.asm.pool.Class; +import org.gradle.api.logging.Logger; +import org.gradle.api.logging.Logging; +import static com.openosrs.injector.rsapi.RSApi.API_BASE; + +@RequiredArgsConstructor +public class InjectorValidator implements Validator +{ + private static final Logger log = Logging.getLogger(InjectorValidator.class); + private static final String OK = "OK", ERROR = "ERROR", WTF = "WTF"; + private final InjectData inject; + + private int missing = 0, okay = 0, wtf = 0; + + public boolean validate() + { + final RSApi rsApi = inject.getRsApi(); + for (ClassFile cf : inject.getVanilla()) + { + for (Class intf : cf.getInterfaces()) + { + if (!intf.getName().startsWith(API_BASE)) + continue; + + RSApiClass apiC = rsApi.findClass(intf.getName()); + if (apiC == null) + { + log.error("{} is rs api type implemented by {} but it doesn't exist in rsapi. wtf", intf, cf.getPoolClass()); + ++wtf; + continue; + } + + check(cf, apiC); + } + } + + String status = wtf > 0 ? WTF : missing > 0 ? ERROR : OK; + log.info("[INFO] RSApiValidator completed. Status [{}] {} overridden methods, {} missing", status, okay, missing); + + // valid, ref to static final field + return status == OK; + } + + private void check(ClassFile clazz, RSApiClass apiClass) + { + for (RSApiMethod apiMethod : apiClass) + { + if (apiMethod.isSynthetic() || apiMethod.isDefault()) + continue; + + if (clazz.findMethodDeep(apiMethod.getName(), apiMethod.getSignature()) == null) + { + log.warn("[WARN] Class {} implements interface {} but doesn't implement {}", + clazz.getPoolClass(), apiClass.getClazz(), apiMethod.getMethod()); + ++missing; + } + else + { + ++okay; + } + } + } +} diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/Validator.java b/openosrs-injector/src/main/java/com/openosrs/injector/Validator.java new file mode 100644 index 0000000000..ba3b7ef037 --- /dev/null +++ b/openosrs-injector/src/main/java/com/openosrs/injector/Validator.java @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2019, Lucas + * All rights reserved. + * + * This code is licensed under GPL3, see the complete license in + * the LICENSE file in the root directory of this source tree. + */ +package com.openosrs.injector; + +import net.runelite.asm.Named; + +public interface Validator extends Named +{ + boolean validate(); + + default String getName() + { + return this.getClass().getSimpleName(); + } +} diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injection/InjectData.java b/openosrs-injector/src/main/java/com/openosrs/injector/injection/InjectData.java new file mode 100644 index 0000000000..3f47bf12ef --- /dev/null +++ b/openosrs-injector/src/main/java/com/openosrs/injector/injection/InjectData.java @@ -0,0 +1,161 @@ +/* + * Copyright (c) 2019, Lucas + * All rights reserved. + * + * This code is licensed under GPL3, see the complete license in + * the LICENSE file in the root directory of this source tree. + */ +package com.openosrs.injector.injection; + +import com.google.common.collect.ImmutableMap; +import com.openosrs.injector.InjectUtil; +import com.openosrs.injector.injectors.Injector; +import com.openosrs.injector.rsapi.RSApi; +import java.util.HashMap; +import java.util.Map; +import java.util.function.BiConsumer; +import lombok.Getter; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; +import net.runelite.asm.Field; +import net.runelite.asm.Method; +import net.runelite.asm.Type; +import net.runelite.asm.signature.Signature; + +/** + * Abstract class meant as the interface of {@link com.openosrs.injector.Injection injection} for injectors + */ +public abstract class InjectData +{ + public static final String HOOKS = "net/runelite/client/callback/Hooks"; + + @Getter + private final ClassGroup vanilla; + + @Getter + private final ClassGroup deobfuscated; + + @Getter + private final ClassGroup mixins; + + @Getter + private final RSApi rsApi; + + /** + * Deobfuscated ClassFiles -> Vanilla ClassFiles + */ + private final Map toVanilla; + + /** + * Strings -> Deobfuscated ClassFiles + * keys: + * - Obfuscated name + * - RSApi implementing name + */ + private final Map toDeob = new HashMap<>(); + + public InjectData(ClassGroup vanilla, ClassGroup deobfuscated, ClassGroup mixins, RSApi rsApi) + { + this.vanilla = vanilla; + this.deobfuscated = deobfuscated; + this.rsApi = rsApi; + this.mixins = mixins; + this.toVanilla = initToVanilla(); + } + + public abstract void runChildInjector(Injector injector); + + private Map initToVanilla() + { + ImmutableMap.Builder toVanillaB = ImmutableMap.builder(); + + for (final ClassFile deobClass : deobfuscated) + { + if (deobClass.getName().startsWith("net/runelite/")) + { + continue; + } + + final String obName = InjectUtil.getObfuscatedName(deobClass); + if (obName != null) + { + toDeob.put(obName, deobClass); + + // Can't be null + final ClassFile obClass = this.vanilla.findClass(obName); + toVanillaB.put(deobClass, obClass); + } + } + + return toVanillaB.build(); + } + + /** + * Deobfuscated ClassFile -> Vanilla ClassFile + */ + public ClassFile toVanilla(ClassFile deobClass) + { + return toVanilla.get(deobClass); + } + + /** + * Deobfuscated Method -> Vanilla Method + */ + public Method toVanilla(Method deobMeth) + { + final ClassFile obC = toVanilla(deobMeth.getClassFile()); + + String name = InjectUtil.getObfuscatedName(deobMeth); + + Signature sig = deobMeth.getObfuscatedSignature(); + if (sig == null) + { + sig = deobMeth.getDescriptor(); + } + + return obC.findMethod(name, sig); + } + + /** + * Deobfuscated Field -> Vanilla Field + */ + public Field toVanilla(Field deobField) + { + final ClassFile obC = toVanilla(deobField.getClassFile()); + + String name = InjectUtil.getObfuscatedName(deobField); + + Type type = deobField.getObfuscatedType(); + + return obC.findField(name, type); + } + + /** + * Vanilla ClassFile -> Deobfuscated ClassFile + */ + public ClassFile toDeob(String str) + { + return this.toDeob.get(str); + } + + /** + * Adds a string mapping for a deobfuscated class + */ + public void addToDeob(String key, ClassFile value) + { + toDeob.put(key, value); + } + + /** + * Do something with all paired classes. + * + * Key = deobfuscated, Value = vanilla + */ + public void forEachPair(BiConsumer action) + { + for (Map.Entry pair : toVanilla.entrySet()) + { + action.accept(pair.getKey(), pair.getValue()); + } + } +} diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injection/InjectTaskHandler.java b/openosrs-injector/src/main/java/com/openosrs/injector/injection/InjectTaskHandler.java new file mode 100644 index 0000000000..4f7fad4586 --- /dev/null +++ b/openosrs-injector/src/main/java/com/openosrs/injector/injection/InjectTaskHandler.java @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2019, Lucas + * All rights reserved. + * + * This code is licensed under GPL3, see the complete license in + * the LICENSE file in the root directory of this source tree. + */ +package com.openosrs.injector.injection; + +import java.io.File; +import java.io.IOException; + +/** + * Interface containing all the methods gradle needs to know about + */ +public interface InjectTaskHandler +{ + /** + * The actual method that does all the work + */ + void inject(); + + /** + * Call this to save the injected jar to outputJar + */ + void save(File outputJar) throws IOException; +} diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/AbstractInjector.java b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/AbstractInjector.java new file mode 100644 index 0000000000..b1c645c544 --- /dev/null +++ b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/AbstractInjector.java @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2019, Lucas + * All rights reserved. + * + * This code is licensed under GPL3, see the complete license in + * the LICENSE file in the root directory of this source tree. + */ +package com.openosrs.injector.injectors; + +import com.google.common.base.Stopwatch; +import com.openosrs.injector.injection.InjectData; +import lombok.RequiredArgsConstructor; +import org.gradle.api.logging.Logger; +import org.gradle.api.logging.Logging; + +@RequiredArgsConstructor +public abstract class AbstractInjector implements Injector +{ + protected final InjectData inject; + protected final Logger log = Logging.getLogger(this.getClass()); + private Stopwatch stopwatch; + + public void start() + { + stopwatch = Stopwatch.createStarted(); + } + + public final String getCompletionMsg() + { + return "finished in " + stopwatch.toString(); + } +} diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/CreateAnnotations.java b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/CreateAnnotations.java new file mode 100644 index 0000000000..bfabccdd20 --- /dev/null +++ b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/CreateAnnotations.java @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2019, Lucas + * All rights reserved. + * + * This code is licensed under GPL3, see the complete license in + * the LICENSE file in the root directory of this source tree. + * + * Copyright (c) 2016-2017, Adam + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package com.openosrs.injector.injectors; + +import com.openosrs.injector.injection.InjectData; +import net.runelite.asm.ClassFile; +import net.runelite.asm.Field; +import net.runelite.asm.Method; +import net.runelite.deob.DeobAnnotations; + +/* + * This handles creating "virtual" annotations to clean up rs-client in the main project + */ +public class CreateAnnotations extends AbstractInjector +{ + + public CreateAnnotations(InjectData inject) + { + super(inject); + } + + public void inject() + { + for (final ClassFile deobClass : inject.getDeobfuscated()) + { + injectFields(deobClass); + injectMethods(deobClass); + + if (deobClass.getName().startsWith("class")) + continue; + + deobClass.addAnnotation(DeobAnnotations.IMPLEMENTS, deobClass.getName()); + } + } + + private void injectFields(ClassFile deobClass) + { + for (Field deobField : deobClass.getFields()) + { + deobField.addAnnotation(DeobAnnotations.EXPORT, deobField.getName()); + } + } + + private void injectMethods(ClassFile deobClass) + { + for (Method deobMethod : deobClass.getMethods()) + { + deobMethod.addAnnotation(DeobAnnotations.EXPORT, deobMethod.getName()); + } + } +} diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/InjectConstruct.java b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/InjectConstruct.java new file mode 100644 index 0000000000..ef1b8e7db0 --- /dev/null +++ b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/InjectConstruct.java @@ -0,0 +1,145 @@ +/* + * Copyright (c) 2019, Lucas + * All rights reserved. + * + * This code is licensed under GPL3, see the complete license in + * the LICENSE file in the root directory of this source tree. + * + * Copyright (c) 2016-2017, Adam + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package com.openosrs.injector.injectors; + +import com.openosrs.injector.InjectException; +import com.openosrs.injector.InjectUtil; +import com.openosrs.injector.injection.InjectData; +import com.openosrs.injector.rsapi.RSApiMethod; +import java.util.List; +import java.util.stream.Collectors; +import net.runelite.asm.Annotation; +import net.runelite.asm.ClassFile; +import net.runelite.asm.Type; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instructions.CheckCast; +import net.runelite.asm.attributes.code.instructions.Dup; +import net.runelite.asm.attributes.code.instructions.InvokeSpecial; +import net.runelite.asm.attributes.code.instructions.New; +import net.runelite.asm.attributes.code.instructions.Return; +import net.runelite.asm.pool.Class; +import net.runelite.asm.pool.Method; +import net.runelite.asm.signature.Signature; +import static com.openosrs.injector.rsapi.RSApi.CONSTRUCT; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; + +public class InjectConstruct extends AbstractInjector +{ + private int injected = 0; + + public InjectConstruct(InjectData inject) + { + super(inject); + } + + @Override + public void inject() + { + for (RSApiMethod apiMethod : inject.getRsApi().getConstructs()) + { + Annotation construct = apiMethod.findAnnotation(CONSTRUCT); + if (construct == null) + continue; + + final Method method = apiMethod.getMethod(); + final Class clazz = method.getClazz(); + final ClassFile deobClass = inject.toDeob(clazz.getName()); + final ClassFile vanillaClass = inject.toVanilla(deobClass); + + injectConstruct(vanillaClass, method); + apiMethod.setInjected(true); + injected++; + } + + log.info("[INFO] Injected {} constructors", injected); + } + + private void injectConstruct(ClassFile targetClass, Method apiMethod) + { + log.debug("[DEBUG] Injecting constructor for {} into {}", apiMethod, targetClass.getPoolClass()); + + final Type returnval = apiMethod.getType().getReturnValue(); + + final ClassFile deobClass = inject.toDeob(returnval.getInternalName()); + final ClassFile classToConstruct = inject.toVanilla(deobClass); + + Signature constr = new Signature.Builder() + .addArguments(apiMethod.getType().getArguments().stream() + .map(t -> InjectUtil.apiToDeob(inject, t)) + .map(t -> InjectUtil.deobToVanilla(inject, t)) + .collect(Collectors.toList())) + .setReturnType(Type.VOID) + .build(); + + final net.runelite.asm.Method constructor = classToConstruct.findMethod("", constr); + if (constructor == null) + throw new InjectException("Unable to find constructor for " + classToConstruct.getName() + "." + constr); + + + net.runelite.asm.Method setterMethod = new net.runelite.asm.Method(targetClass, apiMethod.getName(), apiMethod.getType()); + setterMethod.setAccessFlags(ACC_PUBLIC); + targetClass.addMethod(setterMethod); + + final Code code = new Code(setterMethod); + setterMethod.setCode(code); + + final Instructions instructions = code.getInstructions(); + final List ins = instructions.getInstructions(); + + ins.add(new New(instructions, classToConstruct.getPoolClass())); + ins.add(new Dup(instructions)); + + int idx = 1; + int parameter = 0; + + for (Type type : constructor.getDescriptor().getArguments()) + { + Instruction load = InjectUtil.createLoadForTypeIndex(instructions, type, idx); + idx += type.getSize(); + ins.add(load); + + Type paramType = apiMethod.getType().getTypeOfArg(parameter); + if (!type.equals(paramType)) + { + CheckCast checkCast = new CheckCast(instructions); + checkCast.setType(type); + ins.add(checkCast); + } + + ++parameter; + } + + ins.add(new InvokeSpecial(instructions, constructor.getPoolMethod())); + ins.add(new Return(instructions)); + } +} diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/InjectHook.java b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/InjectHook.java new file mode 100644 index 0000000000..c2d8cde855 --- /dev/null +++ b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/InjectHook.java @@ -0,0 +1,368 @@ +/* + * Copyright (c) 2019, Lucas + * All rights reserved. + * + * This code is licensed under GPL3, see the complete license in + * the LICENSE file in the root directory of this source tree. + * * Copyright (c) 2017, Adam + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package com.openosrs.injector.injectors; + +import com.google.common.collect.Lists; +import com.openosrs.injector.InjectException; +import com.openosrs.injector.InjectUtil; +import com.openosrs.injector.injection.InjectData; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.inject.Provider; +import lombok.AllArgsConstructor; +import net.runelite.asm.Annotation; +import net.runelite.asm.ClassFile; +import net.runelite.asm.Field; +import net.runelite.asm.Method; +import net.runelite.asm.Type; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instruction.types.DupInstruction; +import net.runelite.asm.attributes.code.instruction.types.SetFieldInstruction; +import net.runelite.asm.attributes.code.instructions.ArrayStore; +import net.runelite.asm.attributes.code.instructions.CheckCast; +import net.runelite.asm.attributes.code.instructions.Dup; +import net.runelite.asm.attributes.code.instructions.IMul; +import net.runelite.asm.attributes.code.instructions.LDC; +import net.runelite.asm.attributes.code.instructions.LMul; +import net.runelite.asm.attributes.code.instructions.PutField; +import net.runelite.asm.attributes.code.instructions.Swap; +import net.runelite.asm.execution.Execution; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.pool.Class; +import net.runelite.asm.signature.Signature; +import net.runelite.deob.DeobAnnotations; + +public class InjectHook extends AbstractInjector +{ + private static final String CLINIT = ""; + private static final Type FIELDHOOK = new Type("Lnet/runelite/api/mixins/FieldHook;"); + + private final Map hooked = new HashMap<>(); + private final Map, List> mixinTargets; + + private int injectedHooks; + + InjectHook(final InjectData inject, final Map, List> mixinTargets) + { + super(inject); + this.mixinTargets = mixinTargets; + } + + @Override + public void inject() + { + for (Map.Entry, List> entry : mixinTargets.entrySet()) + injectMethods(entry.getKey(), entry.getValue()); + + injectHooks(); + + log.info("[INFO] Injected {} field hooks.", injectedHooks); + } + + private void injectMethods(Provider mixinProvider, List targetClasses) + { + final ClassFile mixinClass = mixinProvider.get(); + + for (ClassFile targetClass : targetClasses) + { + for (Method mixinMethod : mixinClass.getMethods()) + { + final Annotation fieldHook = mixinMethod.findAnnotation(FIELDHOOK); + if (fieldHook == null) + continue; + + final String hookName = fieldHook.getValueString(); + final boolean before = isBefore(fieldHook); + + final ClassFile deobTarget = inject.toDeob(targetClass.getName()); + final Field deobField; + + if (mixinMethod.isStatic()) + { + deobField = InjectUtil.findStaticField(deobTarget.getGroup(), hookName); + } + else + { + deobField = InjectUtil.findFieldDeep(deobTarget, hookName); + } + + assert mixinMethod.isStatic() == deobField.isStatic() : "Mixin method isn't static but deob has a static method named the same as the hook, and I was too lazy to do something about this bug"; + + final Number getter = DeobAnnotations.getObfuscatedGetter(deobField); + final Field obField = inject.toVanilla(deobField); + + final HookInfo info = new HookInfo(targetClass.getPoolClass(), mixinMethod, before, getter); + + hooked.put(obField, info); + } + } + } + + private void injectHooks() + { + Execution e = new Execution(inject.getVanilla()); + e.populateInitialMethods(); + + Set done = new HashSet<>(); + Set doneIh = new HashSet<>(); + + e.addExecutionVisitor(( + InstructionContext ic) -> + { + Instruction i = ic.getInstruction(); + Instructions ins = i.getInstructions(); + Code code = ins.getCode(); + Method method = code.getMethod(); + + if (method.getName().equals(CLINIT)) + return; + + if (!(i instanceof SetFieldInstruction)) + return; + + if (!done.add(i)) + return; + + SetFieldInstruction sfi = (SetFieldInstruction) i; + Field fieldBeingSet = sfi.getMyField(); + + if (fieldBeingSet == null) + return; + + HookInfo hookInfo = hooked.get(fieldBeingSet); + if (hookInfo == null) + return; + + log.trace("Found injection location for hook {} at instruction {}", hookInfo.method.getName(), sfi); + ++injectedHooks; + + StackContext value = ic.getPops().get(0); + + StackContext objectStackContext = null; + if (sfi instanceof PutField) + objectStackContext = ic.getPops().get(1); + + int idx = ins.getInstructions().indexOf(sfi); + assert idx != -1; + + try + { + if (hookInfo.before) + injectCallbackBefore(ins, idx, hookInfo, null, objectStackContext, value); + else + // idx + 1 to insert after the set + injectCallback(ins, idx + 1, hookInfo, null, objectStackContext); + } + catch (InjectException ex) + { + throw new RuntimeException(ex); + } + }); + + // these look like: + // getfield + // iload_0 + // iconst_0 + // iastore + e.addExecutionVisitor((InstructionContext ic) -> + { + Instruction i = ic.getInstruction(); + Instructions ins = i.getInstructions(); + Code code = ins.getCode(); + Method method = code.getMethod(); + + if (method.getName().equals(CLINIT)) + return; + + if (!(i instanceof ArrayStore)) + return; + + if (!doneIh.add(i)) + return; + + ArrayStore as = (ArrayStore) i; + + Field fieldBeingSet = as.getMyField(ic); + if (fieldBeingSet == null) + return; + + HookInfo hookInfo = hooked.get(fieldBeingSet); + if (hookInfo == null) + return; + + StackContext value = ic.getPops().get(0); + StackContext index = ic.getPops().get(1); + + StackContext arrayReference = ic.getPops().get(2); + InstructionContext arrayReferencePushed = arrayReference.getPushed(); + + StackContext objectStackContext = null; + if (arrayReferencePushed.getInstruction().getType() == InstructionType.GETFIELD) + objectStackContext = arrayReferencePushed.getPops().get(0); + + // inject hook after 'i' + log.debug("[DEBUG] Found array injection location for hook {} at instruction {}", hookInfo.method.getName(), i); + ++injectedHooks; + + int idx = ins.getInstructions().indexOf(i); + assert idx != -1; + + try + { + if (hookInfo.before) + injectCallbackBefore(ins, idx, hookInfo, index, objectStackContext, value); + else + injectCallback(ins, idx + 1, hookInfo, index, objectStackContext); + } + catch (InjectException ex) + { + throw new RuntimeException(ex); + } + }); + + e.run(); + } + + private void injectCallbackBefore(Instructions ins, int idx, HookInfo hookInfo, StackContext index, StackContext object, StackContext value) + { + Signature signature = hookInfo.method.getDescriptor(); + Type methodArgumentType = signature.getTypeOfArg(0); + + if (!hookInfo.method.isStatic()) + { + if (object == null) + throw new InjectException("null object"); + + ins.getInstructions().add(idx++, new Dup(ins)); // dup value + idx = recursivelyPush(ins, idx, object); + ins.getInstructions().add(idx++, new Swap(ins)); + + if (hookInfo.getter instanceof Integer) + { + ins.getInstructions().add(idx++, new LDC(ins, hookInfo.getter)); + ins.getInstructions().add(idx++, new IMul(ins)); + } + else if (hookInfo.getter instanceof Long) + { + ins.getInstructions().add(idx++, new LDC(ins, hookInfo.getter)); + ins.getInstructions().add(idx++, new LMul(ins)); + } + } + else + { + ins.getInstructions().add(idx++, new Dup(ins)); // dup value + } + + if (!value.type.equals(methodArgumentType)) + { + CheckCast checkCast = new CheckCast(ins); + checkCast.setType(methodArgumentType); + ins.getInstructions().add(idx++, checkCast); + } + if (index != null) + { + idx = recursivelyPush(ins, idx, index); + } + + Instruction invoke = hookInfo.getInvoke(ins); + ins.getInstructions().add(idx, invoke); + } + + private int recursivelyPush(Instructions ins, int idx, StackContext sctx) + { + InstructionContext ctx = sctx.getPushed(); + if (ctx.getInstruction() instanceof DupInstruction) + { + DupInstruction dupInstruction = (DupInstruction) ctx.getInstruction(); + sctx = dupInstruction.getOriginal(sctx); + ctx = sctx.getPushed(); + } + + for (StackContext s : Lists.reverse(ctx.getPops())) + idx = recursivelyPush(ins, idx, s); + + ins.getInstructions().add(idx++, ctx.getInstruction().clone()); + return idx; + } + + private void injectCallback(Instructions ins, int idx, HookInfo hookInfo, StackContext index, StackContext objectPusher) + { + if (!hookInfo.method.isStatic()) + { + if (objectPusher == null) + throw new InjectException("Null object pusher"); + + idx = recursivelyPush(ins, idx, objectPusher); + } + + if (index != null) + idx = recursivelyPush(ins, idx, index); + else + ins.getInstructions().add(idx++, new LDC(ins, -1)); + + Instruction invoke = hookInfo.getInvoke(ins); + ins.getInstructions().add(idx, invoke); + } + + @AllArgsConstructor + static class HookInfo + { + final Class targetClass; + final Method method; + final boolean before; + final Number getter; + + Instruction getInvoke(Instructions instructions) + { + return InjectUtil.createInvokeFor( + instructions, + new net.runelite.asm.pool.Method( + targetClass, + method.getName(), + method.getDescriptor() + ), + method.isStatic() + ); + } + } + + private static boolean isBefore(Annotation a) + { + Object val = a.get("before"); + return val instanceof Boolean && (Boolean) val; + } +} diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/InjectHookMethod.java b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/InjectHookMethod.java new file mode 100644 index 0000000000..1ca49ac707 --- /dev/null +++ b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/InjectHookMethod.java @@ -0,0 +1,173 @@ +/* + * Copyright (c) 2019, Lucas + * All rights reserved. + * + * This code is licensed under GPL3, see the complete license in + * the LICENSE file in the root directory of this source tree. + * + * Copyright (c) 2017, Adam + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package com.openosrs.injector.injectors; + +import com.openosrs.injector.InjectException; +import com.openosrs.injector.InjectUtil; +import com.openosrs.injector.injection.InjectData; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import javax.inject.Provider; +import net.runelite.asm.Annotation; +import net.runelite.asm.ClassFile; +import net.runelite.asm.Method; +import net.runelite.asm.Type; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instruction.types.ReturnInstruction; +import net.runelite.asm.attributes.code.instructions.ALoad; +import net.runelite.asm.attributes.code.instructions.InvokeSpecial; +import net.runelite.asm.signature.Signature; + +public class InjectHookMethod extends AbstractInjector +{ + private static final Type METHODHOOK = new Type("Lnet/runelite/api/mixins/MethodHook;"); + private final Map, List> mixinTargets; + + private int injected = 0; + + InjectHookMethod(final InjectData inject, final Map, List> mixinTargets) + { + super(inject); + this.mixinTargets = mixinTargets; + } + + @Override + public void inject() + { + for (Map.Entry, List> entry : mixinTargets.entrySet()) + injectMethods(entry.getKey(), entry.getValue()); + + log.info("[INFO] Injected {} method hooks", injected); + } + + private void injectMethods(Provider mixinProvider, List targetClasses) + { + final ClassFile mixinClass = mixinProvider.get(); + + for (ClassFile targetClass : targetClasses) + { + for (Method mixinMethod : mixinClass.getMethods()) + { + final Annotation methodHook = mixinMethod.findAnnotation(METHODHOOK); + if (methodHook == null) + continue; + + if (!mixinMethod.getDescriptor().isVoid()) + throw new InjectException("Method hook " + mixinMethod.getPoolMethod() + " doesn't have void return type"); + + final String hookName = methodHook.getValueString(); + final boolean end = isEnd(methodHook); + + final ClassFile deobTarget = inject.toDeob(targetClass.getName()); + final Signature deobSig = InjectUtil.apiToDeob(inject, mixinMethod.getDescriptor()); + final boolean notStatic = !mixinMethod.isStatic(); + final Method targetMethod = InjectUtil.findMethod(inject, hookName, deobTarget.getName(), sig -> InjectUtil.argsMatch(sig, deobSig), notStatic, false); + + final net.runelite.asm.pool.Method hookMethod = new net.runelite.asm.pool.Method( + targetClass.getPoolClass(), + mixinMethod.getName(), + mixinMethod.getDescriptor() + ); + + inject(targetMethod, hookMethod, end); + + log.debug("[DEBUG] Injected method hook {} in {}", hookMethod, targetMethod); + ++injected; + } + } + } + + private void inject(final Method method, final net.runelite.asm.pool.Method hookMethod, boolean end) + { + final Instructions ins = method.getCode().getInstructions(); + final ListIterator it; + + if (end) + { + it = ins.listIterator(ins.size()); + while (it.hasPrevious()) + if (it.previous() instanceof ReturnInstruction) + insertVoke(method, hookMethod, it); + + return; + } + + it = ins.listIterator(); + if (method.getName().equals("")) + { + while (it.hasNext()) + if (it.next() instanceof InvokeSpecial) + break; + + assert it.hasNext() : "Constructor without invokespecial"; + } + + insertVoke(method, hookMethod, it); + } + + private void insertVoke(final Method method, final net.runelite.asm.pool.Method hookMethod, ListIterator iterator) + { + final Instructions instructions = method.getCode().getInstructions(); + int varIdx = 0; + + if (!method.isStatic()) + iterator.add(new ALoad(instructions, varIdx++)); + + for (Type type : hookMethod.getType().getArguments()) + { + iterator.add( + InjectUtil.createLoadForTypeIndex( + instructions, + type, + varIdx + ) + ); + + varIdx += type.getSize(); + } + + iterator.add( + InjectUtil.createInvokeFor( + instructions, + hookMethod, + method.isStatic() + ) + ); + } + + private static boolean isEnd(Annotation annotation) + { + Object val = annotation.get("end"); + return val instanceof Boolean && (Boolean) val; + } +} diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/Injector.java b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/Injector.java new file mode 100644 index 0000000000..a3d9048e47 --- /dev/null +++ b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/Injector.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2019, Lucas + * All rights reserved. + * + * This code is licensed under GPL3, see the complete license in + * the LICENSE file in the root directory of this source tree. + */ +package com.openosrs.injector.injectors; + +import net.runelite.asm.Named; + +public interface Injector extends Named +{ + /** + * Where all the injection should be done + */ + void inject(); + + /** + * Get a name the injector is going to be referred to in logging + */ + default String getName() + { + return this.getClass().getSimpleName(); + } + + /** + * Called before inject, AbstractInjector currently uses it to start a stopwatch + */ + void start(); + + /** + * Gets a message logged at quiet level when the injector ends + */ + String getCompletionMsg(); +} diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/InterfaceInjector.java b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/InterfaceInjector.java new file mode 100644 index 0000000000..e96c0393cd --- /dev/null +++ b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/InterfaceInjector.java @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2019, Lucas + * All rights reserved. + * + * This code is licensed under GPL3, see the complete license in + * the LICENSE file in the root directory of this source tree. + */ +package com.openosrs.injector.injectors; + +import com.openosrs.injector.injection.InjectData; +import net.runelite.asm.ClassFile; +import net.runelite.asm.Interfaces; +import net.runelite.asm.pool.Class; +import net.runelite.deob.DeobAnnotations; +import static com.openosrs.injector.rsapi.RSApi.API_BASE; + +public class InterfaceInjector extends AbstractInjector +{ + private int implemented = 0; + + public InterfaceInjector(InjectData inject) + { + super(inject); + } + + public void inject() + { + // forEachPair performs actions on a deob-vanilla pair, which is what's needed here + inject.forEachPair(this::injectInterface); + + log.info("[INFO] Injected {} interfaces", implemented); + } + + private void injectInterface(final ClassFile deobCf, final ClassFile vanillaCf) + { + final String impls = DeobAnnotations.getImplements(deobCf); + + if (impls == null) + return; + + final String fullName = API_BASE + impls; + if (!inject.getRsApi().hasClass(fullName)) + { + log.debug("[DEBUG] Class {} implements nonexistent interface {}, skipping interface injection", + deobCf.getName(), + fullName + ); + + return; + } + + final Interfaces interfaces = vanillaCf.getInterfaces(); + interfaces.addInterface(new Class(fullName)); + implemented++; + + inject.addToDeob(fullName, deobCf); + } +} diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/MixinInjector.java b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/MixinInjector.java new file mode 100644 index 0000000000..502d09f67d --- /dev/null +++ b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/MixinInjector.java @@ -0,0 +1,726 @@ +/* + * Copyright (c) 2019, Lucas + * All rights reserved. + * + * This code is licensed under GPL3, see the complete license in + * the LICENSE file in the root directory of this source tree. + * + * Copyright (c) 2017, Adam + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package com.openosrs.injector.injectors; + +import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableMap; +import com.openosrs.injector.InjectException; +import com.openosrs.injector.InjectUtil; +import com.openosrs.injector.injection.InjectData; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.stream.Collectors; +import javax.annotation.Nonnull; +import javax.inject.Provider; +import lombok.Value; +import net.runelite.asm.Annotation; +import net.runelite.asm.ClassFile; +import net.runelite.asm.Field; +import net.runelite.asm.Method; +import net.runelite.asm.Type; +import net.runelite.asm.attributes.Annotated; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instruction.types.FieldInstruction; +import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; +import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; +import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; +import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; +import net.runelite.asm.attributes.code.instruction.types.ReturnInstruction; +import net.runelite.asm.attributes.code.instruction.types.SetFieldInstruction; +import net.runelite.asm.attributes.code.instructions.ALoad; +import net.runelite.asm.attributes.code.instructions.ANewArray; +import net.runelite.asm.attributes.code.instructions.CheckCast; +import net.runelite.asm.attributes.code.instructions.GetField; +import net.runelite.asm.attributes.code.instructions.InvokeDynamic; +import net.runelite.asm.attributes.code.instructions.InvokeSpecial; +import net.runelite.asm.attributes.code.instructions.InvokeStatic; +import net.runelite.asm.attributes.code.instructions.LDC; +import net.runelite.asm.attributes.code.instructions.Pop; +import net.runelite.asm.attributes.code.instructions.PutField; +import net.runelite.asm.signature.Signature; +import net.runelite.deob.DeobAnnotations; +import net.runelite.deob.util.JarUtil; +import org.jetbrains.annotations.Nullable; +import org.objectweb.asm.Opcodes; + +public class MixinInjector extends AbstractInjector +{ + private static final Type COPY = new Type("Lnet/runelite/api/mixins/Copy;"); + private static final Type INJECT = new Type("Lnet/runelite/api/mixins/Inject;"); + private static final Type MIXIN = new Type("Lnet/runelite/api/mixins/Mixin;"); + private static final Type MIXINS = new Type("Lnet/runelite/api/mixins/Mixins;"); + private static final Type REPLACE = new Type("Lnet/runelite/api/mixins/Replace;"); + private static final Type SHADOW = new Type("Lnet/runelite/api/mixins/Shadow;"); + private static final String ASSERTION_FIELD = "$assertionsDisabled"; + private static final String MIXIN_BASE = "net/runelite/mixins/"; + + private final Map injectedFields = new HashMap<>(); + private final Map shadowFields = new HashMap<>(); + private int copied = 0, replaced = 0, injected = 0; + + public MixinInjector(InjectData inject) + { + super(inject); + } + + @Override + public void inject() + { + final Map, List> mixinTargets = initTargets(); + inject(mixinTargets); + } + + @VisibleForTesting + void inject(Map, List> mixinTargets) + { + for (Map.Entry, List> entry : mixinTargets.entrySet()) + { + System.out.println(entry.getKey().get().getName()); + injectFields(entry.getKey(), entry.getValue()); + } + + log.info("[INFO] Injected {} fields", injectedFields.size()); + + for (Map.Entry, List> entry : mixinTargets.entrySet()) + { + findShadowFields(entry.getKey()); + } + + log.info("[INFO] Shadowed {} fields", shadowFields.size()); + + for (Map.Entry, List> entry : mixinTargets.entrySet()) + { + injectMethods(entry.getKey(), entry.getValue()); + } + + log.info("[INFO] Injected {}, copied {}, replaced {} methods", injected, copied, replaced); + + inject.runChildInjector(new InjectHook(inject, mixinTargets)); + + inject.runChildInjector(new InjectHookMethod(inject, mixinTargets)); + } + + private Map, List> initTargets() + { + ImmutableMap.Builder, List> builder = ImmutableMap.builder(); + + try + { + for (ClassFile mixinClass : inject.getMixins()) + { + System.out.println(mixinClass.getName()); + final List ret = getMixins(mixinClass); + builder.put( + (ret.size() > 1 ? mixinProvider(mixinClass) : () -> mixinClass), + ret + ); + } + } + catch (Exception e) + { + e.printStackTrace(); + } + + return builder.build(); + } + + private void injectFields(Provider mixinProvider, List targetClasses) + { + try + { + final ClassFile mixinClass = mixinProvider.get(); + + for (final ClassFile targetClass : targetClasses) + { + for (Field field : mixinClass.getFields()) + { + if (field.findAnnotation(INJECT) == null && + (!ASSERTION_FIELD.equals(field.getName()) || targetClass.findField(ASSERTION_FIELD, Type.BOOLEAN) != null)) + { + continue; + } + + Field copy = new Field(targetClass, field.getName(), field.getType()); + copy.setAccessFlags(field.getAccessFlags()); + copy.setPublic(); + copy.setValue(field.getValue()); + + for (Map.Entry e : field.getAnnotations().entrySet()) + if (!e.getKey().toString().startsWith("Lnet/runelite/api/mixins")) + copy.addAnnotation(e.getValue()); + + targetClass.addField(copy); + + if (injectedFields.containsKey(field.getName()) && !ASSERTION_FIELD.equals(field.getName())) + throw new InjectException("Duplicate field: " + field.getName()); + + injectedFields.put(field.getName(), copy); + } + } + } + catch (Exception e) + { + e.printStackTrace(); + } + + } + + private void findShadowFields(Provider mixinProvider) + { + final ClassFile mixinClass = mixinProvider.get(); + + for (final Field field : mixinClass.getFields()) + { + Annotation shadow = field.findAnnotation(SHADOW); + + if (shadow == null) + continue; + + if (!field.isStatic()) + throw new InjectException("Shadowed fields must be static"); + + String shadowed = shadow.getValueString(); + + Field targetField = injectedFields.get(shadowed); + Number getter = null; + + if (targetField == null) + { + final Field deobTargetField = InjectUtil.findStaticField(inject, shadowed, null, InjectUtil.apiToDeob(inject, field.getType())); + targetField = inject.toVanilla(deobTargetField); + + getter = DeobAnnotations.getObfuscatedGetter(deobTargetField); + } + + if ((targetField.getAccessFlags() & Opcodes.ACC_PRIVATE) != 0) + throw new InjectException("Shadowed fields can't be private"); + + shadowFields.put( + field.getPoolField(), + new ShadowField(targetField, getter) + ); + } + } + + private void injectMethods(Provider mixinProvider, List targetClasses) + { + for (ClassFile targetClass : targetClasses) + { + final ClassFile mixinClass = mixinProvider.get(); + + // Keeps mappings between methods annotated with @Copy -> the copied method within the vanilla pack + Map copiedMethods = new HashMap<>(); + + // Handle the copy mixins first, so all other mixins know of the copies + for (Method mixinMethod : mixinClass.getMethods()) + { + Annotation copyA = mixinMethod.findAnnotation(COPY); + if (copyA == null) + continue; + String copiedName = copyA.getValueString(); + + Signature deobSig = InjectUtil.apiToDeob(inject, mixinMethod.getDescriptor()); + boolean notStat = !mixinMethod.isStatic(); + + Method deobSourceMethod = InjectUtil.findMethod(inject, copiedName, inject.toDeob(targetClass.getName()).getName(), deobSig::equals, notStat, true); + + if (mixinMethod.isStatic() != deobSourceMethod.isStatic()) + throw new InjectException("Mixin method " + mixinMethod + " should be " + (deobSourceMethod.isStatic() ? "static" : "non-static")); + + // The actual method we're copying, including code etc + Method sourceMethod = inject.toVanilla(deobSourceMethod); + + if (mixinMethod.getDescriptor().size() > sourceMethod.getDescriptor().size()) + throw new InjectException("Mixin methods cannot have more parameters than their corresponding ob method"); + + Method copy = new Method(targetClass, "copy$" + copiedName, sourceMethod.getDescriptor()); + moveCode(copy, sourceMethod.getCode()); + copy.setAccessFlags(sourceMethod.getAccessFlags()); + copy.setPublic(); + copy.getExceptions().getExceptions().addAll(sourceMethod.getExceptions().getExceptions()); + for (var a : sourceMethod.getAnnotations().values()) + copy.addAnnotation(a); + targetClass.addMethod(copy); + ++copied; + + /* + * If the desc for the mixin method and the desc for the ob method + * are the same in length, assume that the mixin method is taking + * care of the garbage parameter itself. + */ + boolean hasGarbageValue = mixinMethod.getDescriptor().size() != sourceMethod.getDescriptor().size() + && deobSourceMethod.getDescriptor().size() < copy.getDescriptor().size(); + + copiedMethods.put(mixinMethod.getPoolMethod(), new CopiedMethod(copy, !hasGarbageValue ? null : Integer.valueOf(DeobAnnotations.getDecoder(deobSourceMethod)))); + } + + // Handle the rest of the mixin types + for (Method mixinMethod : mixinClass.getMethods()) + { + boolean isClinit = "".equals(mixinMethod.getName()); + boolean isInit = "".equals(mixinMethod.getName()); + boolean hasInject = mixinMethod.findAnnotation(INJECT) != null; + + // You can't annotate clinit, so its always injected + if ((hasInject && isInit) || isClinit) + { + if (!"()V".equals(mixinMethod.getDescriptor().toString())) + throw new InjectException("Injected constructors cannot have arguments"); + + Method[] originalMethods = targetClass.getMethods().stream() + .filter(m -> m.getName().equals(mixinMethod.getName())) + .toArray(Method[]::new); + + String name = mixinMethod.getName(); + + // If there isn't a already just inject ours, otherwise rename it + // This is always true for + if (originalMethods.length > 0) + name = "rl$$" + (isInit ? "init" : "clinit"); + + String numberlessName = name; + for (int i = 1; targetClass.findMethod(name, mixinMethod.getDescriptor()) != null; i++) + name = numberlessName + i; + + Method copy = new Method(targetClass, name, mixinMethod.getDescriptor()); + moveCode(copy, mixinMethod.getCode()); + copy.setAccessFlags(mixinMethod.getAccessFlags()); + copy.setPrivate(); + assert mixinMethod.getExceptions().getExceptions().isEmpty(); + + // Remove the call to the superclass's ctor + if (isInit) + { + Instructions instructions = copy.getCode().getInstructions(); + ListIterator listIter = instructions.listIterator(); + while (listIter.hasNext()) + { + Instruction instr = listIter.next(); + if (instr instanceof InvokeSpecial) + { + InvokeSpecial invoke = (InvokeSpecial) instr; + assert invoke.getMethod().getName().equals(""); + listIter.remove(); + int pops = invoke.getMethod().getType().getArguments().size() + 1; + + for (int i = 0; i < pops; i++) + listIter.add(new Pop(instructions)); + + break; + } + } + } + + setOwnersToTargetClass(mixinClass, targetClass, copy, copiedMethods); + targetClass.addMethod(copy); + + // Call our method at the return point of the matching method(s) + for (Method om : originalMethods) + { + Instructions instructions = om.getCode().getInstructions(); + ListIterator listIter = instructions.listIterator(); + + while (listIter.hasNext()) + { + Instruction instr = listIter.next(); + if (instr instanceof ReturnInstruction) + { + listIter.previous(); + if (isInit) + { + listIter.add(new ALoad(instructions, 0)); + listIter.add(new InvokeSpecial(instructions, copy.getPoolMethod())); + } + else if (isClinit) + { + listIter.add(new InvokeStatic(instructions, copy.getPoolMethod())); + } + listIter.next(); + } + } + } + + log.debug("[DEBUG] Injected mixin method {} to {}", copy, targetClass); + ++injected; + } + else if (hasInject) + { + // Make sure the method doesn't invoke copied methods + for (Instruction i : mixinMethod.getCode().getInstructions()) + { + if (i instanceof InvokeInstruction) + { + InvokeInstruction ii = (InvokeInstruction) i; + + if (copiedMethods.containsKey(ii.getMethod())) + { + throw new InjectException("Injected methods cannot invoke copied methods"); + } + } + } + + Method copy = new Method(targetClass, mixinMethod.getName(), mixinMethod.getDescriptor()); + moveCode(copy, mixinMethod.getCode()); + copy.setAccessFlags(mixinMethod.getAccessFlags()); + copy.setPublic(); + assert mixinMethod.getExceptions().getExceptions().isEmpty(); + + setOwnersToTargetClass(mixinClass, targetClass, copy, copiedMethods); + + targetClass.addMethod(copy); + + log.debug("[DEBUG] Injected mixin method {} to {}", copy, targetClass); + ++injected; + } + else if (mixinMethod.findAnnotation(REPLACE) != null) + { + Annotation replaceAnnotation = mixinMethod.findAnnotation(REPLACE); + String replacedName = replaceAnnotation.getValueString(); + + ClassFile deobClass = inject.toDeob(targetClass.getName()); + Method deobMethod = findDeobMatching(deobClass, mixinMethod, replacedName); + + if (deobMethod == null) + { + throw new InjectException("Failed to find the deob method " + replacedName + " for mixin " + mixinClass); + } + + if (mixinMethod.isStatic() != deobMethod.isStatic()) + { + throw new InjectException("Mixin method " + mixinMethod + " should be " + + (deobMethod.isStatic() ? "static" : "non-static")); + } + + String obReplacedName = InjectUtil.getObfuscatedName(deobMethod); + Signature obMethodSignature = deobMethod.getObfuscatedSignature(); + + // Find the vanilla class where the method to copy is in + ClassFile obCf = inject.toVanilla(deobMethod.getClassFile()); + + Method obMethod = obCf.findMethod(obReplacedName, obMethodSignature); + assert obMethod != null : "obfuscated method " + obReplacedName + obMethodSignature + " does not exist"; + + if (mixinMethod.getDescriptor().size() > obMethod.getDescriptor().size()) + { + throw new InjectException("Mixin methods cannot have more parameters than their corresponding ob method"); + } + + Type returnType = mixinMethod.getDescriptor().getReturnValue(); + Type deobReturnType = InjectUtil.apiToDeob(inject, returnType); + if (!returnType.equals(deobReturnType)) + { + ClassFile deobReturnTypeClassFile = inject.getDeobfuscated() + .findClass(deobReturnType.getInternalName()); + if (deobReturnTypeClassFile != null) + { + ClassFile obReturnTypeClass = inject.toVanilla(deobReturnTypeClassFile); + + Instructions instructions = mixinMethod.getCode().getInstructions(); + ListIterator listIter = instructions.listIterator(); + while (listIter.hasNext()) + { + Instruction instr = listIter.next(); + if (instr instanceof ReturnInstruction) + { + listIter.previous(); + CheckCast checkCast = new CheckCast(instructions); + checkCast.setType(new Type(obReturnTypeClass.getName())); + listIter.add(checkCast); + listIter.next(); + } + } + } + } + + moveCode(obMethod, mixinMethod.getCode()); + + boolean hasGarbageValue = mixinMethod.getDescriptor().size() != obMethod.getDescriptor().size() + && deobMethod.getDescriptor().size() < obMethodSignature.size(); + + if (hasGarbageValue) + { + int garbageIndex = obMethod.isStatic() + ? obMethod.getDescriptor().size() - 1 + : obMethod.getDescriptor().size(); + + /* + If the mixin method doesn't have the garbage parameter, + the compiler will have produced code that uses the garbage + parameter's local variable index for other things, + so we'll have to add 1 to all loads/stores to indices + that are >= garbageIndex. + */ + shiftLocalIndices(obMethod.getCode().getInstructions(), garbageIndex); + } + + setOwnersToTargetClass(mixinClass, targetClass, obMethod, copiedMethods); + + log.debug("[DEBUG] Replaced method {} with mixin method {}", obMethod, mixinMethod); + replaced++; + } + } + } + } + + private void moveCode(Method targetMethod, Code sourceCode) + { + Code newCode = new Code(targetMethod); + newCode.setMaxStack(sourceCode.getMaxStack()); + newCode.getInstructions().getInstructions().addAll(sourceCode.getInstructions().getInstructions()); + + // Update instructions for each instruction + for (Instruction i : newCode.getInstructions()) + i.setInstructions(newCode.getInstructions()); + + newCode.getExceptions().getExceptions().addAll(sourceCode.getExceptions().getExceptions()); + for (net.runelite.asm.attributes.code.Exception e : newCode.getExceptions().getExceptions()) + e.setExceptions(newCode.getExceptions()); + + targetMethod.setCode(newCode); + } + + private void setOwnersToTargetClass(ClassFile mixinCf, ClassFile cf, Method method, Map copiedMethods) + { + ListIterator iterator = method.getCode().getInstructions().listIterator(); + + while (iterator.hasNext()) + { + Instruction i = iterator.next(); + + if (i instanceof ANewArray) + { + Type type = ((ANewArray) i).getType_(); + ClassFile deobTypeClass = inject.toDeob(type.getInternalName()); + + if (deobTypeClass != null) + { + Type newType = new Type("L" + inject.toVanilla(deobTypeClass).getName() + ";"); + + ((ANewArray) i).setType(newType); + log.debug("[DEBUG] Replaced {} type {} with type {}", i, type, newType); + } + } + else if (i instanceof InvokeInstruction) + { + InvokeInstruction ii = (InvokeInstruction) i; + + CopiedMethod copiedMethod = copiedMethods.get(ii.getMethod()); + if (copiedMethod != null) + { + ii.setMethod(copiedMethod.copy.getPoolMethod()); + + // Pass through garbage value if the method has one + if (copiedMethod.garbage != null) + { + iterator.previous(); + iterator.add(new LDC(method.getCode().getInstructions(), copiedMethod.garbage)); + iterator.next(); + } + } + else if (ii.getMethod().getClazz().getName().equals(mixinCf.getName())) + { + ii.setMethod(new net.runelite.asm.pool.Method( + new net.runelite.asm.pool.Class(cf.getName()), + ii.getMethod().getName(), + ii.getMethod().getType() + )); + } + } + else if (i instanceof FieldInstruction) + { + FieldInstruction fi = (FieldInstruction) i; + + ShadowField shadowField = shadowFields.get(fi.getField()); + + if (shadowField != null) + { + Field shadowed = shadowField.targetField; + if (shadowField.obfuscatedGetter != null) + { + if (i instanceof SetFieldInstruction) + { + iterator.previous(); + InjectUtil.injectObfuscatedSetter(shadowField.obfuscatedGetter, i.getInstructions(), iterator::add); + iterator.next(); + } + else if (i instanceof GetFieldInstruction) + { + InjectUtil.injectObfuscatedGetter(shadowField.obfuscatedGetter, i.getInstructions(), iterator::add); + } + } + + fi.setField(shadowed.getPoolField()); + } + else if (fi.getField().getClazz().getName().equals(mixinCf.getName())) + { + fi.setField(new net.runelite.asm.pool.Field( + new net.runelite.asm.pool.Class(cf.getName()), + fi.getField().getName(), + fi.getField().getType() + )); + } + } + else if (i instanceof PushConstantInstruction) + { + PushConstantInstruction pi = (PushConstantInstruction) i; + + if (mixinCf.getPoolClass().equals(pi.getConstant())) + pi.setConstant(cf.getPoolClass()); + } + + verify(mixinCf, i); + } + } + + private void verify(ClassFile mixinCf, Instruction i) + { + if (i instanceof FieldInstruction) + { + FieldInstruction fi = (FieldInstruction) i; + + if (fi.getField().getClazz().getName().equals(mixinCf.getName())) + { + if (i instanceof PutField || i instanceof GetField) + throw new InjectException("Access to non static member field of mixin"); + + Field field = fi.getMyField(); + if (field != null && !field.isPublic()) + throw new InjectException("Static access to non public field " + field); + } + } + else if (i instanceof InvokeStatic) + { + InvokeStatic is = (InvokeStatic) i; + + if (is.getMethod().getClazz() != mixinCf.getPoolClass() + && is.getMethod().getClazz().getName().startsWith(MIXIN_BASE)) + throw new InjectException("Invoking static methods of other mixins is not supported"); + } + else if (i instanceof InvokeDynamic) + // RS classes don't verify under java 7+ due to the + // super() invokespecial being inside of a try{} + throw new InjectException("Injected bytecode must be Java 6 compatible"); + } + + private Method findDeobMatching(ClassFile deobClass, Method mixinMethod, String deobName) + { + List matching = new ArrayList<>(); + + for (Method method : deobClass.getMethods()) + { + if (!deobName.equals(method.getName())) + continue; + + if (InjectUtil.apiToDeobSigEquals(inject, method.getDescriptor(), mixinMethod.getDescriptor())) + matching.add(method); + } + + if (matching.size() > 1) + // this happens when it has found several deob methods for some mixin method, + // to get rid of the error, refine your search by making your mixin method have more parameters + throw new InjectException("There are several matching methods when there should only be one"); + else if (matching.size() == 1) + return matching.get(0); + + return inject.getDeobfuscated().findStaticMethod(deobName); + } + + private void shiftLocalIndices(Instructions instructions, int startIdx) + { + for (Instruction i : instructions) + { + if (i instanceof LVTInstruction) + { + LVTInstruction lvti = (LVTInstruction) i; + + if (lvti.getVariableIndex() >= startIdx) + { + lvti.setVariableIndex(lvti.getVariableIndex() + 1); + } + } + } + } + + @SuppressWarnings("unchecked") + private List getMixins(Annotated from) + { + final Annotation mixin = from.findAnnotation(MIXIN); + if (mixin != null) + { + return List.of(InjectUtil.getVanillaClassFromAnnotationString(inject, mixin)); + } + final Annotation mixins = from.findAnnotation(MIXINS); + if (mixins != null) + { + return ((List) mixins.getValue()).stream() + .map(mix -> InjectUtil.getVanillaClassFromAnnotationString(inject, mix)) + .collect(Collectors.toUnmodifiableList()); + } + throw new IllegalArgumentException("No MIXIN or MIXINS found on " + from.toString()); + } + + @Value + private static class CopiedMethod + { + @Nonnull Method copy; + @Nullable Integer garbage; + } + + @Value + private static class ShadowField + { + @Nonnull Field targetField; + @Nullable Number obfuscatedGetter; + } + + private static Provider mixinProvider(ClassFile mixin) + { + return new Provider<>() + { + byte[] bytes = null; + + @Override + public ClassFile get() + { + if (bytes != null) + return JarUtil.loadClass(bytes); + + bytes = JarUtil.writeClass(mixin.getGroup(), mixin); + return mixin; + } + }; + } +} diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java new file mode 100644 index 0000000000..e5a9c4e0d9 --- /dev/null +++ b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java @@ -0,0 +1,291 @@ +/* + * Copyright (c) 2019, Lucas + * All rights reserved. + * + * This code is licensed under GPL3, see the complete license in + * the LICENSE file in the root directory of this source tree. + * + * Copyright (c) 2016-2017, Adam + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package com.openosrs.injector.injectors; + +import com.openosrs.injector.InjectException; +import com.openosrs.injector.InjectUtil; +import com.openosrs.injector.injection.InjectData; +import com.openosrs.injector.injectors.rsapi.InjectGetter; +import com.openosrs.injector.injectors.rsapi.InjectInvoke; +import com.openosrs.injector.injectors.rsapi.InjectSetter; +import com.openosrs.injector.rsapi.RSApiClass; +import com.openosrs.injector.rsapi.RSApiMethod; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import net.runelite.asm.ClassFile; +import net.runelite.asm.Field; +import net.runelite.asm.Method; +import net.runelite.asm.Type; +import net.runelite.asm.attributes.Annotated; +import net.runelite.asm.signature.Signature; +import net.runelite.deob.DeobAnnotations; +import static com.openosrs.injector.rsapi.RSApi.API_BASE; + +public class RSApiInjector extends AbstractInjector +{ + private final Map> retryFields = new HashMap<>(); + private int get = 0, set = 0, voke = 0; + + public RSApiInjector(InjectData inject) + { + super(inject); + } + + public void inject() + { + for (final ClassFile deobClass : inject.getDeobfuscated()) + { + final RSApiClass implementingClass = inject.getRsApi().findClass(API_BASE + deobClass.getName()); + + injectFields(deobClass, implementingClass); + injectMethods(deobClass, implementingClass); + } + + retryFailures(); + + log.info("[INFO] Injected {} getters, {} setters, and {} invokers", get, set, voke); + } + + private void injectFields(ClassFile deobClass, RSApiClass implementingClass) + { + for (Field deobField : deobClass.getFields()) + { + final List matching = findImportsFor(deobField, deobField.isStatic(), implementingClass); + + if (matching == null) + continue; + + final Type deobType = deobField.getType(); + + // We're dealing with a field here, so only getter/setter methods match + ListIterator it = matching.listIterator(); + while (it.hasNext()) + { + RSApiMethod apiMethod = it.next(); + + if (apiMethod.isInjected()) + { + it.remove(); + continue; + } + + // Check if there's a field with the same exported name on the api target class itself, + // as that should come before random static fields. + if (deobField.isStatic()) + { + ClassFile deobApiTarget = InjectUtil.deobFromApiMethod(inject, apiMethod); + + if (deobApiTarget != deobClass && + deobApiTarget.findField(deobField.getName()) != null) + { + it.remove(); + continue; + } + } + + final Signature sig = apiMethod.getSignature(); + + if (sig.isVoid()) + { + if (sig.size() == 1) + { + Type type = InjectUtil.apiToDeob(inject, sig.getTypeOfArg(0)); + if (deobType.equals(type)) + { + continue; + } + } + } + else if (sig.size() == 0) + { + Type type = InjectUtil.apiToDeob(inject, sig.getReturnValue()); + if (deobType.equals(type)) + { + continue; + } + } + + it.remove(); + } + + if (matching.size() == 0) + { + continue; + } + else if (matching.size() > 2) + { + retryFields.put(deobField, new ArrayList<>(matching)); + continue; + } + + final Field vanillaField = inject.toVanilla(deobField); + final Number getter = DeobAnnotations.getObfuscatedGetter(deobField); + + if (deobField.isStatic() != vanillaField.isStatic()) // Can this even happen + throw new InjectException("Something went horribly wrong, and this should honestly never happen, but you never know. Btw it's the static-ness"); + + inject(matching, deobField, vanillaField, getter); + } + } + + private void injectMethods(ClassFile deobClass, RSApiClass implementingClass) + { + for (Method deobMethod : deobClass.getMethods()) + { + final List matching = findImportsFor(deobMethod, deobMethod.isStatic(), implementingClass); + + if (matching == null) + continue; + + final Signature deobSig = deobMethod.getDescriptor(); + + ListIterator it = matching.listIterator(); + while (it.hasNext()) + { + final RSApiMethod apiMethod = it.next(); + + // Check if there's a method with the same exported name on the api target class itself, + // as that should come before random static methods. + if (deobMethod.isStatic()) + { + ClassFile deobApiTarget = InjectUtil.deobFromApiMethod(inject, apiMethod); + + if (deobApiTarget != deobClass && + deobApiTarget.findMethod(deobMethod.getName()) != null) + { + it.remove(); + continue; + } + } + + final Signature apiSig = apiMethod.getSignature(); + + if (apiMethod.isInjected() + || !InjectUtil.apiToDeobSigEquals(inject, deobSig, apiSig)) + { + it.remove(); + } + } + + if (matching.size() == 1) + { + final RSApiMethod apiMethod = matching.get(0); + + final ClassFile targetClass = InjectUtil.vanillaFromApiMethod(inject, apiMethod); + final Method vanillaMethod = inject.toVanilla(deobMethod); + final String garbage = DeobAnnotations.getDecoder(deobMethod); + log.debug("[DEBUG] Injecting invoker {} for {} into {}", apiMethod.getMethod(), vanillaMethod.getPoolMethod(), targetClass.getPoolClass()); + InjectInvoke.inject(targetClass, apiMethod, vanillaMethod, garbage); + ++voke; + apiMethod.setInjected(true); + } + else if (matching.size() != 0) + throw new InjectException("Multiple api imports matching method " + deobMethod.getPoolMethod()); + } + } + + private void retryFailures() + { + for (Map.Entry> entry : retryFields.entrySet()) + { + final List matched = entry.getValue(); + final Field deobField = entry.getKey(); + + matched.removeIf(RSApiMethod::isInjected); + + if (matched.size() > 2) + throw new InjectException("More than 2 imported api methods for field " + deobField.getPoolField()); + + final Field vanillaField = inject.toVanilla(deobField); + final Number getter = DeobAnnotations.getObfuscatedGetter(deobField); + + inject(matched, deobField, vanillaField, getter); + } + } + + private List findImportsFor(Annotated object, boolean statik, RSApiClass implemented) + { + final String exportedName = InjectUtil.getExportedName(object); + if (exportedName == null) + return null; + + final List matching = new ArrayList<>(); + + if (statik) + { + for (RSApiClass api : inject.getRsApi()) + { + api.fetchImported(matching, exportedName); + } + } + else if (implemented != null) + { + implemented.fetchImported(matching, exportedName); + } + + return matching; + } + + private void inject(List matched, Field field, Field targetField, Number getter) + { + for (RSApiMethod apiMethod : matched) + { + final ClassFile targetClass = InjectUtil.vanillaFromApiMethod(inject, apiMethod); + apiMethod.setInjected(true); + + if (apiMethod.getSignature().isVoid()) + { + ++set; + log.debug("[DEBUG] Injecting setter {} for {} into {}", apiMethod.getMethod(), field.getPoolField(), targetClass.getPoolClass()); + InjectSetter.inject( + targetClass, + apiMethod, + targetField, + getter + ); + } + else + { + ++get; + log.debug("[DEBUG] Injecting getter {} for {} into {}", apiMethod.getMethod(), field.getPoolField(), targetClass.getPoolClass()); + InjectGetter.inject( + targetClass, + apiMethod, + targetField, + getter + ); + } + } + } +} diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/AddPlayerToMenu.java b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/AddPlayerToMenu.java new file mode 100644 index 0000000000..578b30b005 --- /dev/null +++ b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/AddPlayerToMenu.java @@ -0,0 +1,281 @@ +/* + * Copyright (c) 2019, Lucas + * Copyright (c) 2020, ThatGamerBlue + * All rights reserved. + * + * This code is licensed under GPL3, see the complete license in + * the LICENSE file in the root directory of this source tree. + */ +package com.openosrs.injector.injectors.raw; + +import com.openosrs.injector.InjectException; +import com.openosrs.injector.InjectUtil; +import com.openosrs.injector.injection.InjectData; +import com.openosrs.injector.injectors.AbstractInjector; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.Label; +import net.runelite.asm.attributes.code.instruction.types.ComparisonInstruction; +import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; +import net.runelite.asm.attributes.code.instructions.ALoad; +import net.runelite.asm.attributes.code.instructions.BiPush; +import net.runelite.asm.attributes.code.instructions.GetStatic; +import net.runelite.asm.attributes.code.instructions.IAnd; +import net.runelite.asm.attributes.code.instructions.IfACmpEq; +import net.runelite.asm.attributes.code.instructions.IfACmpNe; +import net.runelite.asm.attributes.code.instructions.IfICmpNe; +import net.runelite.asm.attributes.code.instructions.IfNe; +import net.runelite.asm.attributes.code.instructions.InvokeStatic; +import net.runelite.asm.attributes.code.instructions.LDC; +import net.runelite.asm.attributes.code.instructions.Return; +import net.runelite.asm.pool.Field; + +public class AddPlayerToMenu extends AbstractInjector +{ + public AddPlayerToMenu(InjectData inject) + { + super(inject); + } + + public void inject() + { + final Method addPlayerOptions = InjectUtil.findMethod(inject, "addPlayerToMenu"); + final net.runelite.asm.pool.Method shouldHideAttackOptionFor = + inject.getVanilla().findClass("client").findMethod("shouldHideAttackOptionFor").getPoolMethod(); + final net.runelite.asm.pool.Method shouldDrawMethod = + inject.getVanilla().findStaticMethod("shouldDraw").getPoolMethod(); + + try + { + injectSameTileFix(addPlayerOptions, shouldDrawMethod); + injectHideAttack(addPlayerOptions, shouldHideAttackOptionFor); + injectHideCast(addPlayerOptions, shouldHideAttackOptionFor); + } + catch (InjectException | AssertionError e) + { + log.warn("[WARN] HidePlayerAttacks failed, but as this doesn't mess up anything other than that functionality, we're carrying on", e); + } + } + + private void injectSameTileFix(Method addPlayerOptions, net.runelite.asm.pool.Method shouldDrawMethod) + { + // ALOAD 0 + // ICONST_0 + // INVOKESTATIC Scene.shouldDraw + // IFNE CONTINUE_LABEL if returned true then jump to continue + // RETURN + // CONTINUE_LABEL + // REST OF METHOD GOES HERE + Instructions insns = addPlayerOptions.getCode().getInstructions(); + Label CONTINUE_LABEL = new Label(insns); + List prependList = new ArrayList<>() + {{ + add(new ALoad(insns, 0)); + add(new LDC(insns, 0)); + add(new InvokeStatic(insns, shouldDrawMethod)); + add(new IfNe(insns, CONTINUE_LABEL)); + add(new Return(insns, InstructionType.RETURN)); + add(CONTINUE_LABEL); + }}; + int i = 0; + for (Instruction instruction : prependList) + { + insns.addInstruction(i++, instruction); + } + } + + private void injectHideAttack(Method addPlayerOptions, net.runelite.asm.pool.Method shouldHideAttackOptionFor) + { + final Field AttackOption_hidden = + InjectUtil.findField(inject, "AttackOption_hidden", "AttackOption").getPoolField(); + final Field attackOption = InjectUtil.findField(inject, "playerAttackOption", "Client").getPoolField(); + + // GETSTATIC GETSTATIC + // GETSTATIC GETSTATIC + // IFACMPEQ -> label continue IFACMPNE -> label whatever lets carry on + // MORE OBFUSCATION + + int injectIdx = -1; + Instruction labelIns = null; + Label label = null; + + Instructions ins = addPlayerOptions.getCode().getInstructions(); + Iterator iterator = ins.getInstructions().iterator(); + while (iterator.hasNext()) + { + Instruction i = iterator.next(); + if (!(i instanceof GetStatic)) + { + continue; + } + + Field field = ((GetStatic) i).getField(); + if (!field.equals(AttackOption_hidden) && !field.equals(attackOption)) + { + continue; + } + + i = iterator.next(); + if (!(i instanceof GetStatic)) + { + continue; + } + + field = ((GetStatic) i).getField(); + if (!field.equals(AttackOption_hidden) && !field.equals(attackOption)) + { + continue; + } + + i = iterator.next(); + if (!(i instanceof ComparisonInstruction && i instanceof JumpingInstruction)) + { + log.info("[INFO] You're not supposed to see this lol"); + continue; + } + + if (i instanceof IfACmpEq) + { + injectIdx = ins.getInstructions().indexOf(i) + 1; + label = ((IfACmpEq) i).getJumps().get(0); + } + else if (i instanceof IfACmpNe) + { + injectIdx = ins.getInstructions().indexOf(((IfACmpNe) i).getJumps().get(0)) + 1; + // We're gonna have to inject a extra label + labelIns = iterator.next(); + } + + break; + } + + if (injectIdx <= 0 || label == null && labelIns == null) + { + throw new InjectException("HidePlayerAttacks failed"); + } + + // Load the player + ALoad i1 = new ALoad(ins, 0); + // Get the boolean + InvokeStatic i2 = new InvokeStatic(ins, shouldHideAttackOptionFor); + + ins.addInstruction(injectIdx, i1); + ins.addInstruction(injectIdx + 1, i2); + + if (label == null) + { + label = ins.createLabelFor(labelIns); + ins.rebuildLabels(); + injectIdx = ins.getInstructions().indexOf(i2) + 1; + } + + // Compare n such + IfNe i3 = new IfNe(ins, label); + + ins.addInstruction(injectIdx, i3); + } + + private void injectHideCast(Method addPlayerOptions, net.runelite.asm.pool.Method shouldHideAttackOptionFor) + { + // LABEL before + // BIPUSH 8 + // LDC (garbage) + // GETSTATIC selectedSpellFlags + // IMUL + // BIPUSH 8 + // IAND + // IF_ICMPNE -> skip adding option + // + // <--- Inject call here + // <--- Inject comparison here (duh) + // + // add option n such + final Field flags = InjectUtil.findField(inject, "selectedSpellFlags", "Client").getPoolField(); + Instructions ins = addPlayerOptions.getCode().getInstructions(); + ListIterator iterator = ins.getInstructions().listIterator(); + boolean b1, b2, iAnd, getstatic; + b1 = b2 = iAnd = getstatic = false; + while (iterator.hasNext()) + { + Instruction i = iterator.next(); + + if (i instanceof Label) + { + b1 = b2 = iAnd = getstatic = false; + continue; + } + + if ((i instanceof BiPush) && (byte) ((BiPush) i).getConstant() == 8) + { + if (!b1) + { + b1 = true; + } + else if (!b2) + { + b2 = true; + } + else + { + throw new InjectException("3 bipushes? fucking mental, Hide spells failed btw"); + } + + continue; + } + + if (i instanceof IAnd) + { + iAnd = true; + continue; + } + + if (i instanceof GetStatic && ((GetStatic) i).getField().equals(flags)) + { + getstatic = true; + continue; + } + + if (!(i instanceof JumpingInstruction)) + { + if (b1 && b2 && iAnd && getstatic) + { + throw new InjectException("@ me in discord if this shit is broken lol, hide spells failed btw"); + } + continue; + } + + if (!(b1 && b2 && iAnd && getstatic)) + { + continue; + } + + Label target; + if (i instanceof IfICmpNe) + { + target = ((IfICmpNe) i).getJumps().get(0); + } + else + { + throw new InjectException("@ me in discord if this shit is broken lol, hide spells failed btw"); + } + + // Load the player + ALoad i1 = new ALoad(ins, 0); + // Get the boolean + InvokeStatic i2 = new InvokeStatic(ins, shouldHideAttackOptionFor); + // Compare n such + IfNe i3 = new IfNe(ins, target); + + iterator.add(i1); + iterator.add(i2); + iterator.add(i3); + return; + } + } +} diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/ClearColorBuffer.java b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/ClearColorBuffer.java new file mode 100644 index 0000000000..762e269613 --- /dev/null +++ b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/ClearColorBuffer.java @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2019, Lucas + * All rights reserved. + * + * This code is licensed under GPL3, see the complete license in + * the LICENSE file in the root directory of this source tree. + */ +package com.openosrs.injector.injectors.raw; + +import com.openosrs.injector.InjectUtil; +import com.openosrs.injector.injection.InjectData; +import com.openosrs.injector.injectors.AbstractInjector; +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; +import net.runelite.asm.attributes.code.instructions.ILoad; +import net.runelite.asm.attributes.code.instructions.InvokeStatic; +import net.runelite.asm.execution.Execution; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.MethodContext; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.signature.Signature; +import static com.openosrs.injector.injection.InjectData.HOOKS; + +public class ClearColorBuffer extends AbstractInjector +{ + private static final net.runelite.asm.pool.Method CLEARBUFFER = new net.runelite.asm.pool.Method( + new net.runelite.asm.pool.Class(HOOKS), + "clearColorBuffer", + new Signature("(IIIII)V") + ); + + public ClearColorBuffer(InjectData inject) + { + super(inject); + } + + public void inject() + { + /* + * This class stops the client from basically painting everything black before the scene is drawn + */ + final Execution exec = new Execution(inject.getVanilla()); + + final net.runelite.asm.pool.Method fillRectPool = InjectUtil.findMethod(inject, "Rasterizer2D_fillRectangle", "Rasterizer2D", null).getPoolMethod(); + final Method drawEntities = InjectUtil.findMethod(inject, "drawEntities"); // XXX: should prob be called drawViewport? + + exec.addMethod(drawEntities); + exec.noInvoke = true; + + final AtomicReference pcontext = new AtomicReference<>(null); + + exec.addMethodContextVisitor(pcontext::set); + exec.run(); + + final MethodContext methodContext = pcontext.get(); + for (InstructionContext ic : methodContext.getInstructionContexts()) + { + final Instruction instr = ic.getInstruction(); + if (!(instr instanceof InvokeStatic)) + { + continue; + } + + if (fillRectPool.equals(((InvokeStatic) instr).getMethod())) + { + List pops = ic.getPops(); + + // Last pop is constant value 0, before that are vars in order + assert pops.size() == 5 : "If this fails cause of this add in 1 for obfuscation, I don't think that happens here though"; + + int i = 0; + Instruction pushed = pops.get(i++).getPushed().getInstruction(); + assert (pushed instanceof PushConstantInstruction) && ((PushConstantInstruction) pushed).getConstant().equals(0); + + for (int varI = 3; i < 5; i++, varI--) + { + pushed = pops.get(i).getPushed().getInstruction(); + assert (pushed instanceof ILoad) && ((ILoad) pushed).getVariableIndex() == varI; + } + + Instructions ins = instr.getInstructions(); + ins.replace(instr, new InvokeStatic(ins, CLEARBUFFER)); + log.debug("[DEBUG] Injected drawRectangle at {}", methodContext.getMethod().getPoolMethod()); + } + } + } +} diff --git a/openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/DrawAfterWidgets.java b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/DrawAfterWidgets.java new file mode 100644 index 0000000000..218b618320 --- /dev/null +++ b/openosrs-injector/src/main/java/com/openosrs/injector/injectors/raw/DrawAfterWidgets.java @@ -0,0 +1,260 @@ +/* + * Copyright (c) 2019, Lucas + * All rights reserved. + * + * This code is licensed under GPL3, see the complete license in + * the LICENSE file in the root directory of this source tree. + * + * Copyright (c) 2016-2017, Adam + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package com.openosrs.injector.injectors.raw; + +import com.openosrs.injector.InjectException; +import com.openosrs.injector.InjectUtil; +import com.openosrs.injector.injection.InjectData; +import com.openosrs.injector.injectors.AbstractInjector; +import java.util.HashSet; +import java.util.ListIterator; +import java.util.Set; +import net.runelite.asm.ClassFile; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.Label; +import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; +import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; +import net.runelite.asm.attributes.code.instructions.GetStatic; +import net.runelite.asm.attributes.code.instructions.IMul; +import net.runelite.asm.attributes.code.instructions.InvokeStatic; +import net.runelite.asm.signature.Signature; +import static com.openosrs.injector.injection.InjectData.HOOKS; + +public class DrawAfterWidgets extends AbstractInjector +{ + public DrawAfterWidgets(InjectData inject) + { + super(inject); + } + + public void inject() + { + /* + * This call has to be injected using raw injection because the + * drawWidgets method gets inlined in some revisions. If it wouldn't be, + * mixins would be used to add the call to the end of drawWidgets. + + * --> This hook depends on the positions of "if (535573958 * kl != -1)" and "jz.db();". + + + * Revision 180 - client.gs(): + * ______________________________________________________ + + * @Export("drawLoggedIn") + * final void drawLoggedIn() { + * if(rootInterface != -1) { + * ClientPreferences.method1809(rootInterface); + * } + + * int var1; + * for(var1 = 0; var1 < rootWidgetCount; ++var1) { + * if(__client_od[var1]) { + * __client_ot[var1] = true; + * } + + * __client_oq[var1] = __client_od[var1]; + * __client_od[var1] = false; + * } + + * __client_oo = cycle; + * __client_lq = -1; + * __client_ln = -1; + * UserComparator6.__fg_jh = null; + * if(rootInterface != -1) { + * rootWidgetCount = 0; + * Interpreter.drawWidgets(rootInterface, 0, 0, SoundCache.canvasWidth, Huffman.canvasHeight, 0, 0, -1); + * } + + * <-- here + + * Rasterizer2D.Rasterizer2D_resetClip(); + * ______________________________________________________ + */ + + boolean injected = false; + + Method noClip = InjectUtil.findMethod(inject, "Rasterizer2D_resetClip", "Rasterizer2D", null); // !!!!! + + if (noClip == null) + { + throw new InjectException("Mapped method \"Rasterizer2D_resetClip\" could not be found."); + } + + net.runelite.asm.pool.Method poolNoClip = noClip.getPoolMethod(); + + for (ClassFile c : inject.getVanilla()) + { + for (Method m : c.getMethods()) + { + if (m.getCode() == null) + { + continue; + } + + Instructions instructions = m.getCode().getInstructions(); + + Set