From d5b234fe618a2d6cbbcd8bba67a461f2581bef8d Mon Sep 17 00:00:00 2001 From: makamys Date: Sat, 4 Feb 2023 17:50:19 +0100 Subject: [PATCH] Add MixinBooterLegacy module --- CREDITS | 14 + LICENSE.LGPLv2.1 | 504 ++++++++++++++++++ module-all/build.gradle | 2 +- module-mixin/build.gradle | 2 +- module-mixinbooterlegacy/build.gradle | 83 +++ .../mixinbooterlegacy/IEarlyMixinLoader.java | 38 ++ .../mixinbooterlegacy/ILateMixinLoader.java | 40 ++ .../tox1cozz/mixinbooterlegacy/LateMixin.java | 11 + .../MixinBooterLegacyPlugin.java | 83 +++ .../loader/mixin/LoadControllerMixin.java | 101 ++++ .../io/github/tox1cozz/mixinextras/LICENSE | 504 ++++++++++++++++++ .../MixinExtrasAnnotationProcessor.java | 36 ++ .../mixinextras/MixinExtrasBootstrap.java | 35 ++ .../injector/ModifyExpressionValue.java | 28 + .../ModifyExpressionValueInjectionInfo.java | 23 + .../ModifyExpressionValueInjector.java | 98 ++++ .../mixinextras/injector/ModifyReceiver.java | 28 + .../injector/ModifyReceiverInjectionInfo.java | 23 + .../injector/ModifyReceiverInjector.java | 90 ++++ .../injector/ModifyReturnValue.java | 28 + .../ModifyReturnValueInjectionInfo.java | 23 + .../injector/ModifyReturnValueInjector.java | 52 ++ .../injector/WrapWithCondition.java | 28 + .../WrapWithConditionInjectionInfo.java | 59 ++ .../injector/WrapWithConditionInjector.java | 140 +++++ .../utils/CompatibilityHelper.java | 34 ++ .../mixinextras/utils/InjectorUtils.java | 11 + .../javax.annotation.processing.Processor | 1 + .../src/main/resources/mcmod.info | 18 + .../resources/mixin.mixinbooterlegacy.json | 14 + module-mixingasm/build.gradle | 2 +- .../src/main/resources/mcmod.info | 2 +- settings.gradle | 1 + 33 files changed, 2152 insertions(+), 4 deletions(-) create mode 100644 LICENSE.LGPLv2.1 create mode 100644 module-mixinbooterlegacy/build.gradle create mode 100644 module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/IEarlyMixinLoader.java create mode 100644 module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/ILateMixinLoader.java create mode 100644 module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/LateMixin.java create mode 100644 module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/MixinBooterLegacyPlugin.java create mode 100644 module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/loader/mixin/LoadControllerMixin.java create mode 100644 module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/LICENSE create mode 100644 module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/MixinExtrasAnnotationProcessor.java create mode 100644 module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/MixinExtrasBootstrap.java create mode 100644 module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyExpressionValue.java create mode 100644 module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyExpressionValueInjectionInfo.java create mode 100644 module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyExpressionValueInjector.java create mode 100644 module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReceiver.java create mode 100644 module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReceiverInjectionInfo.java create mode 100644 module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReceiverInjector.java create mode 100644 module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReturnValue.java create mode 100644 module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReturnValueInjectionInfo.java create mode 100644 module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReturnValueInjector.java create mode 100644 module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/WrapWithCondition.java create mode 100644 module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/WrapWithConditionInjectionInfo.java create mode 100644 module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/WrapWithConditionInjector.java create mode 100644 module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/utils/CompatibilityHelper.java create mode 100644 module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/utils/InjectorUtils.java create mode 100644 module-mixinbooterlegacy/src/main/resources/META-INF/services/javax.annotation.processing.Processor create mode 100644 module-mixinbooterlegacy/src/main/resources/mcmod.info create mode 100644 module-mixinbooterlegacy/src/main/resources/mixin.mixinbooterlegacy.json diff --git a/CREDITS b/CREDITS index 5009298..7643da2 100644 --- a/CREDITS +++ b/CREDITS @@ -39,3 +39,17 @@ Modifications: - removed update check in MixingasmMod License: Unlicense (see LICENSE.UNLICENSE) + +## module-mixinbooterlegacy + +Source: https://github.com/tox1cozZ/mixin-booter-legacy/tree/1.2.0 + +Classes used: + +* + +Modifications: +- Replaced mod container with a @Mod annotation +- Changed shaded ASM package name to legacy one + +License: LGPL 2.1 (see LICENSE.LGPLv2.1) diff --git a/LICENSE.LGPLv2.1 b/LICENSE.LGPLv2.1 new file mode 100644 index 0000000..8000a6f --- /dev/null +++ b/LICENSE.LGPLv2.1 @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +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 this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser 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 Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "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 +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY 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 +LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey 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 library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random + Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/module-all/build.gradle b/module-all/build.gradle index 7a1e0a7..fa169a7 100644 --- a/module-all/build.gradle +++ b/module-all/build.gradle @@ -1,7 +1,7 @@ archivesBaseName = archivesBaseName.replace("-1.7.10", "-all-1.7.10") // The order of these determines the order embedded core plugins get initialized in -ext.moduleNames = ["module-mixin", "module-compat", "module-mixingam", "module-spongemixins", "module-gtnhmixins"] +ext.moduleNames = ["module-mixin", "module-compat", "module-mixingasm", "module-spongemixins", "module-mixinbooterlegacy", "module-gtnhmixins"] def getModuleJars() { return moduleNames.collect { it -> tasks.getByPath(":$it:jar").getOutputs().getFiles().getSingleFile() } diff --git a/module-mixin/build.gradle b/module-mixin/build.gradle index 1f516d2..dddd172 100644 --- a/module-mixin/build.gradle +++ b/module-mixin/build.gradle @@ -33,7 +33,7 @@ ext.mixinSource = project.findProperty("mixinSource") ?: "unimix" if(mixinSource == "fabric" || mixinSource == "unimix"){ def mixinVersion = mixinSource == "fabric" ? "0.11.4+mixin.0.8.5" : "0.11.5+mixin.0.8.5" - if(project.hasProperty("local")) { + if(project.hasProperty("local") || true) { mixinVersion += "-local" } def mixinGroup = mixinSource == "fabric" ? "net.fabricmc" : "io.github.legacymoddingmc" diff --git a/module-mixinbooterlegacy/build.gradle b/module-mixinbooterlegacy/build.gradle new file mode 100644 index 0000000..a1b181c --- /dev/null +++ b/module-mixinbooterlegacy/build.gradle @@ -0,0 +1,83 @@ +buildscript { + repositories { + gradlePluginPortal() + } + dependencies { + classpath 'com.github.jengelman.gradle.plugins:shadow:6.1.0' + } +} + +repositories { + maven { + name = 'sponge' + url = 'https://repo.spongepowered.org/maven/' + } +} + +repositories { + mavenLocal() + maven { + // GTNH ForgeGradle Fork + name = "GTNH Maven" + url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" + } + maven { + name 'Overmind forge repo mirror' + url 'https://gregtech.overminddl1.com/' + } + maven { + url = "https://mvn.falsepattern.com/releases" + } +} + +dependencies { + compileOnly('org.spongepowered:mixin:0.8.5-gasstation_7') + //compileOnly('com.github.LlamaLad7:MixinExtras:0.1.1') + //shadow('com.github.LlamaLad7:MixinExtras:0.1.1') +} + +archivesBaseName = archivesBaseName.replace("-1.7.10", "-mixinbooterlegacy-1.7.10") + +apply plugin: "com.github.johnrengelman.shadow" + +/*shadowJar { + classifier = '' + configurations = [project.configurations.shadow] + + relocate 'com.llamalad7.mixinextras', 'com.gtnewhorizon.mixinextras' + relocate 'org.objectweb.asm', 'org.spongepowered.asm.lib' + + manifest { + attributes ( + 'TweakClass': 'org.spongepowered.asm.launch.MixinTweaker', + 'FMLCorePluginContainsFMLMod': true, + 'ForceLoadAsMod': true, + 'MixinConfigs': 'mixins.gtnhmixins.json', + 'FMLCorePlugin': 'com.gtnewhorizon.gtnhmixins.core.GTNHMixinsCore' + ) + } +} + +jar { + dependsOn shadowJar + enabled = false +}*/ + +jar { + manifest { + attributes ( + 'TweakClass': 'org.spongepowered.asm.launch.MixinTweaker', + 'FMLCorePluginContainsFMLMod': true, + 'ForceLoadAsMod': true, + 'FMLCorePlugin': 'io.github.tox1cozz.mixinbooterlegacy.MixinBooterLegacyPlugin', + //'MixinConfigs': 'mixin.mixinbooterlegacy.json', + ) + } +} + +ext.extraVersion = "1.2.0" +ext.mcversion = "1.7.10" + +minecraft { + replace("@VERSION@", extraVersion) +} diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/IEarlyMixinLoader.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/IEarlyMixinLoader.java new file mode 100644 index 0000000..ae8f346 --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/IEarlyMixinLoader.java @@ -0,0 +1,38 @@ +package io.github.tox1cozz.mixinbooterlegacy; + +import java.util.List; + +/** + * Early mixins are defined as mixins that affects vanilla or forge classes. + * Or technically, classes that can be queried via the current state of {@link net.minecraft.launchwrapper.LaunchClassLoader} + *

+ * If you want to add mixins that affect mods, use {@link ILateMixinLoader} + *

+ * Implement this in your {@link cpw.mods.fml.relauncher.IFMLLoadingPlugin}. + * Return all early mixin configs you want MixinBooter to queue and send to Mixin library. + */ +public interface IEarlyMixinLoader { + + /** + * @return mixin configurations to be queued and sent to Mixin library. + */ + List getMixinConfigs(); + + /** + * Runs when a mixin config is successfully queued and sent to Mixin library. + * + * @param mixinConfig mixin config name, queried via {@link IEarlyMixinLoader#getMixinConfigs()}. + * @return true if the mixinConfig should be queued, false if it should not. + */ + default boolean shouldMixinConfigQueue(String mixinConfig) { + return true; + } + + /** + * Runs when a mixin config is successfully queued and sent to Mixin library. + * + * @param mixinConfig mixin config name, queried via {@link IEarlyMixinLoader#getMixinConfigs()}. + */ + default void onMixinConfigQueued(String mixinConfig) { + } +} \ No newline at end of file diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/ILateMixinLoader.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/ILateMixinLoader.java new file mode 100644 index 0000000..4f9b0b1 --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/ILateMixinLoader.java @@ -0,0 +1,40 @@ +package io.github.tox1cozz.mixinbooterlegacy; + +import java.util.List; + +/** + * Late mixins are defined as mixins that affects mod classes. + * Or technically, classes that can be queried via the current state of + * {@link net.minecraft.launchwrapper.LaunchClassLoader} + *

+ * Majority if not all vanilla and forge classes would have been loaded here. + * If you want to add mixins that affect vanilla or forge, use and consult {@link IEarlyMixinLoader} + *

+ * Implement this in any arbitrary class. Said class will be constructed when mixins are ready to be queued. + * Return all late mixin configs you want MixinBooter to queue and send to Mixin library. + */ +public interface ILateMixinLoader { + + /** + * @return mixin configurations to be queued and sent to Mixin library. + */ + List getMixinConfigs(); + + /** + * Runs when a mixin config is successfully queued and sent to Mixin library. + * + * @param mixinConfig mixin config name, queried via {@link ILateMixinLoader#getMixinConfigs()}. + * @return true if the mixinConfig should be queued, false if it should not. + */ + default boolean shouldMixinConfigQueue(String mixinConfig) { + return true; + } + + /** + * Runs when a mixin config is successfully queued and sent to Mixin library. + * + * @param mixinConfig mixin config name, queried via {@link ILateMixinLoader#getMixinConfigs()}. + */ + default void onMixinConfigQueued(String mixinConfig) { + } +} \ No newline at end of file diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/LateMixin.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/LateMixin.java new file mode 100644 index 0000000..5b145b6 --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/LateMixin.java @@ -0,0 +1,11 @@ +package io.github.tox1cozz.mixinbooterlegacy; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface LateMixin { +} \ No newline at end of file diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/MixinBooterLegacyPlugin.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/MixinBooterLegacyPlugin.java new file mode 100644 index 0000000..6679d07 --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/MixinBooterLegacyPlugin.java @@ -0,0 +1,83 @@ +package io.github.tox1cozz.mixinbooterlegacy; + +import cpw.mods.fml.common.DummyModContainer; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.relauncher.IFMLLoadingPlugin; +import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; +import cpw.mods.fml.relauncher.IFMLLoadingPlugin.Name; +import cpw.mods.fml.relauncher.IFMLLoadingPlugin.SortingIndex; +import io.github.tox1cozz.mixinextras.MixinExtrasBootstrap; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.spongepowered.asm.mixin.Mixins; + +import java.lang.reflect.Field; +import java.util.List; +import java.util.Map; + +@Name("MixinBooterLegacy") +@MCVersion("1.7.10") +@SortingIndex(Integer.MIN_VALUE + 1) +public final class MixinBooterLegacyPlugin implements IFMLLoadingPlugin { + + public static final Logger LOGGER = LogManager.getLogger("MixinBooter"); + + static { + LOGGER.info("MixinBootstrap Initializing..."); + // Initialize MixinExtras + MixinExtrasBootstrap.init(); + Mixins.addConfiguration("mixin.mixinbooterlegacy.json"); + } + + @Override + public String[] getASMTransformerClass() { + return new String[0]; + } + + @Override + public String getModContainerClass() { + return null; + } + + @Override + public String getSetupClass() { + return null; + } + + @Override + public void injectData(Map data) { + Object coremodList = data.get("coremodList"); + if (coremodList instanceof List) { + // noinspection rawtypes + for (Object coremod : (List)coremodList) { + try { + Field field = coremod.getClass().getField("coreModInstance"); + field.setAccessible(true); + Object theMod = field.get(coremod); + if (theMod instanceof IEarlyMixinLoader) { + IEarlyMixinLoader loader = (IEarlyMixinLoader)theMod; + for (String mixinConfig : loader.getMixinConfigs()) { + if (loader.shouldMixinConfigQueue(mixinConfig)) { + LOGGER.info("Adding {} mixin configuration.", mixinConfig); + Mixins.addConfiguration(mixinConfig); + loader.onMixinConfigQueued(mixinConfig); + } + } + } + } catch (Exception e) { + LOGGER.error("Unexpected error", e); + } + } + } + } + + @Override + public String getAccessTransformerClass() { + return null; + } + + @Mod(modid = "mixinbooterlegacy", name = "MixinBooterLegacy", version = "@VERSION@") + public static class Container { + + } +} \ No newline at end of file diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/loader/mixin/LoadControllerMixin.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/loader/mixin/LoadControllerMixin.java new file mode 100644 index 0000000..d39128a --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/loader/mixin/LoadControllerMixin.java @@ -0,0 +1,101 @@ +package io.github.tox1cozz.mixinbooterlegacy.loader.mixin; + +import cpw.mods.fml.common.*; +import cpw.mods.fml.common.discovery.ASMDataTable; +import io.github.tox1cozz.mixinbooterlegacy.LateMixin; +import io.github.tox1cozz.mixinbooterlegacy.MixinBooterLegacyPlugin; +import net.minecraft.launchwrapper.Launch; +import org.spongepowered.asm.launch.MixinInitialisationError; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.MixinEnvironment; +import org.spongepowered.asm.mixin.Mixins; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.transformer.Proxy; +import io.github.tox1cozz.mixinbooterlegacy.ILateMixinLoader; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; + +@Mixin(value = LoadController.class, remap = false) +public class LoadControllerMixin { + + @Shadow + private Loader loader; + + @Inject(method = "distributeStateMessage(Lcpw/mods/fml/common/LoaderState;[Ljava/lang/Object;)V", + at = @At("HEAD")) + private void beforeConstructing(LoaderState state, Object[] eventData, CallbackInfo ci) throws Throwable { + // This state is where Forge adds mod files to ModClassLoader + if (state != LoaderState.CONSTRUCTING) { + return; + } + + ModClassLoader modClassLoader = (ModClassLoader)eventData[0]; + ASMDataTable asmDataTable = (ASMDataTable)eventData[1]; + + MixinBooterLegacyPlugin.LOGGER.info("Instantiating all ILateMixinLoader implemented classes..."); + + for (ASMDataTable.ASMData asmData : asmDataTable.getAll(LateMixin.class.getName().replace('.', '/'))) { + modClassLoader.addFile(asmData.getCandidate().getModContainer()); // Add to path before `newInstance` + Class clazz = Class.forName(asmData.getClassName().replace('/', '.')); + MixinBooterLegacyPlugin.LOGGER.info("Instantiating {} for its mixins.", clazz); + + if (!clazz.isAssignableFrom(ILateMixinLoader.class)) { + throw new MixinInitialisationError(String.format("The class %s has the LateMixin annotation, but does not implement the ILateMixinLoader interface.", clazz.getName())); + } + + ILateMixinLoader loader = (ILateMixinLoader)clazz.newInstance(); + for (String mixinConfig : loader.getMixinConfigs()) { + if (loader.shouldMixinConfigQueue(mixinConfig)) { + MixinBooterLegacyPlugin.LOGGER.info("Adding {} mixin configuration.", mixinConfig); + Mixins.addConfiguration(mixinConfig); + loader.onMixinConfigQueued(mixinConfig); + } + } + } + + for (ModContainer container : loader.getActiveModList()) { + modClassLoader.addFile(container.getSource()); + } + + Field transformerField = Proxy.class.getDeclaredField("transformer"); + transformerField.setAccessible(true); + @SuppressWarnings("OptionalGetWithoutIsPresent") + Object transformer = transformerField.get(Launch.classLoader.getTransformers().stream().filter(Proxy.class::isInstance).findFirst().get()); + + Class mixinTransformerClass = Class.forName("org.spongepowered.asm.mixin.transformer.MixinTransformer"); + + Field processorField = mixinTransformerClass.getDeclaredField("processor"); + processorField.setAccessible(true); + Object processor = processorField.get(transformer); + + Class mixinProcessorClass = Class.forName("org.spongepowered.asm.mixin.transformer.MixinProcessor"); + + Method selectConfigsMethod = mixinProcessorClass.getDeclaredMethod("selectConfigs", MixinEnvironment.class); + selectConfigsMethod.setAccessible(true); + + MixinEnvironment env = MixinEnvironment.getCurrentEnvironment(); + selectConfigsMethod.invoke(processor, env); + + try { + Method prepareConfigsMethod = mixinProcessorClass.getDeclaredMethod("prepareConfigs", MixinEnvironment.class); + prepareConfigsMethod.setAccessible(true); + prepareConfigsMethod.invoke(processor, env); + } catch (NoSuchMethodException e) { // 0.8.3+ + Class extensionsClass = Class.forName("org.spongepowered.asm.mixin.transformer.ext.Extensions"); + @SuppressWarnings("JavaReflectionMemberAccess") + Method prepareConfigsMethod = mixinProcessorClass.getDeclaredMethod("prepareConfigs", MixinEnvironment.class, extensionsClass); + prepareConfigsMethod.setAccessible(true); + + Field extensionsField = mixinProcessorClass.getDeclaredField("extensions"); + extensionsField.setAccessible(true); + Object extensions = extensionsField.get(processor); + + //noinspection JavaReflectionInvocation + prepareConfigsMethod.invoke(processor, env, extensions); + } + } +} \ No newline at end of file diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/LICENSE b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/LICENSE new file mode 100644 index 0000000..8000a6f --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/LICENSE @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +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 this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser 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 Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "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 +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY 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 +LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey 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 library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random + Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/MixinExtrasAnnotationProcessor.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/MixinExtrasAnnotationProcessor.java new file mode 100644 index 0000000..ca1614b --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/MixinExtrasAnnotationProcessor.java @@ -0,0 +1,36 @@ +package io.github.tox1cozz.mixinextras; + +import org.spongepowered.asm.util.logging.MessageRouter; + +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.ProcessingEnvironment; +import javax.annotation.processing.RoundEnvironment; +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.lang.model.SourceVersion; +import javax.lang.model.element.TypeElement; +import java.util.Set; + +@SupportedAnnotationTypes({}) +public class MixinExtrasAnnotationProcessor extends AbstractProcessor { + + @Override + public boolean process(Set annotations, RoundEnvironment roundEnv) { + return false; + } + + @Override + public synchronized void init(ProcessingEnvironment processingEnv) { + super.init(processingEnv); + try { + MessageRouter.setMessager(processingEnv.getMessager()); + MixinExtrasBootstrap.init(); + } catch (NoClassDefFoundError e) { + // The Mixin AP probably isn't available, e.g. if loom has excluded it from IDEA. + } + } + + @Override + public SourceVersion getSupportedSourceVersion() { + return SourceVersion.latestSupported(); + } +} \ No newline at end of file diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/MixinExtrasBootstrap.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/MixinExtrasBootstrap.java new file mode 100644 index 0000000..c31b2e0 --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/MixinExtrasBootstrap.java @@ -0,0 +1,35 @@ +package io.github.tox1cozz.mixinextras; + +import io.github.tox1cozz.mixinextras.injector.ModifyExpressionValueInjectionInfo; +import io.github.tox1cozz.mixinextras.injector.ModifyReceiverInjectionInfo; +import io.github.tox1cozz.mixinextras.injector.ModifyReturnValueInjectionInfo; +import io.github.tox1cozz.mixinextras.injector.WrapWithConditionInjectionInfo; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; + +public class MixinExtrasBootstrap { + + private static boolean initialized = false; + + /** + * @deprecated As of 0.0.8, as the field becomes kind of pointless when it gets inlined at compile-time. + * Use {@link #getVersion()} instead. + */ + @Deprecated + @SuppressWarnings("DeprecatedIsStillUsed") + public static final String VERSION = "0.0.12"; + + public static synchronized void init() { + if (!initialized) { + initialized = true; + + InjectionInfo.register(ModifyExpressionValueInjectionInfo.class); + InjectionInfo.register(ModifyReceiverInjectionInfo.class); + InjectionInfo.register(ModifyReturnValueInjectionInfo.class); + InjectionInfo.register(WrapWithConditionInjectionInfo.class); + } + } + + public static String getVersion() { + return VERSION; + } +} \ No newline at end of file diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyExpressionValue.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyExpressionValue.java new file mode 100644 index 0000000..a8f765c --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyExpressionValue.java @@ -0,0 +1,28 @@ +package io.github.tox1cozz.mixinextras.injector; + +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Slice; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface ModifyExpressionValue { + + String[] method(); + + At[] at(); + + Slice[] slice() default {}; + + boolean remap() default true; + + int require() default -1; + + int expect() default 1; + + int allow() default -1; +} \ No newline at end of file diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyExpressionValueInjectionInfo.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyExpressionValueInjectionInfo.java new file mode 100644 index 0000000..9839337 --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyExpressionValueInjectionInfo.java @@ -0,0 +1,23 @@ +package io.github.tox1cozz.mixinextras.injector; + +import org.spongepowered.asm.mixin.injection.code.Injector; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo.AnnotationType; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo.HandlerPrefix; +import org.spongepowered.asm.mixin.transformer.MixinTargetContext; +import org.spongepowered.asm.lib.tree.AnnotationNode; +import org.spongepowered.asm.lib.tree.MethodNode; + +@AnnotationType(ModifyExpressionValue.class) +@HandlerPrefix("modifyExpressionValue") +public class ModifyExpressionValueInjectionInfo extends InjectionInfo { + + public ModifyExpressionValueInjectionInfo(MixinTargetContext mixin, MethodNode method, AnnotationNode annotation) { + super(mixin, method, annotation); + } + + @Override + protected Injector parseInjector(AnnotationNode injectAnnotation) { + return new ModifyExpressionValueInjector(this); + } +} \ No newline at end of file diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyExpressionValueInjector.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyExpressionValueInjector.java new file mode 100644 index 0000000..a5dc5d1 --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyExpressionValueInjector.java @@ -0,0 +1,98 @@ +package io.github.tox1cozz.mixinextras.injector; + +import io.github.tox1cozz.mixinextras.utils.CompatibilityHelper; +import org.spongepowered.asm.lib.Opcodes; +import org.spongepowered.asm.lib.Type; +import org.spongepowered.asm.lib.tree.*; +import org.spongepowered.asm.mixin.injection.code.Injector; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; +import org.spongepowered.asm.mixin.injection.struct.InjectionNodes.InjectionNode; +import org.spongepowered.asm.mixin.injection.struct.Target; +import org.spongepowered.asm.util.Bytecode; + +public class ModifyExpressionValueInjector extends Injector { + + public ModifyExpressionValueInjector(InjectionInfo info) { + super(info, "@ModifyExpressionValue"); + } + + @Override + protected void inject(Target target, InjectionNode node) { + checkTargetReturnsAValue(target, node); + checkTargetModifiers(target, false); + + AbstractInsnNode valueNode = node.getCurrentTarget(); + Type valueType = getReturnType(valueNode); + if (valueNode instanceof TypeInsnNode && valueNode.getOpcode() == Opcodes.NEW) { + valueNode = target.findInitNodeFor(((TypeInsnNode)valueNode)); + } + + injectValueModifier(target, valueNode, valueType); + } + + private void checkTargetReturnsAValue(Target target, InjectionNode node) { + Type returnType = getReturnType(node.getCurrentTarget()); + if (returnType == Type.VOID_TYPE) { + throw CompatibilityHelper.makeInvalidInjectionException(info, String.format("%s annotation is targeting an instruction with a return type of 'void' in %s in %s", annotationType, target, this)); + } + + if (returnType == null) { + throw CompatibilityHelper.makeInvalidInjectionException(info, String.format("%s annotation is targeting an invalid insn in %s in %s", annotationType, target, this)); + } + } + + private void injectValueModifier(Target target, AbstractInsnNode valueNode, Type valueType) { + Target.Extension extraStack = target.extendStack(); + InsnList after = new InsnList(); + invokeHandler(valueType, target, extraStack, after); + extraStack.apply(); + target.insns.insert(valueNode, after); + } + + private void invokeHandler(Type valueType, Target target, Target.Extension extraStack, InsnList after) { + InjectorData handler = new InjectorData(target, "expression value modifier"); + validateParams(handler, valueType, valueType); + + if (!isStatic) { + after.add(new VarInsnNode(Opcodes.ALOAD, 0)); + if (valueType.getSize() == 2) { + after.add(new InsnNode(Opcodes.DUP_X2)); + after.add(new InsnNode(Opcodes.POP)); + } else { + after.add(new InsnNode(Opcodes.SWAP)); + } + } + + if (handler.captureTargetArgs > 0) { + pushArgs(target.arguments, after, target.getArgIndices(), 0, handler.captureTargetArgs, extraStack); + } + + invokeHandler(after); + } + + private Type getReturnType(AbstractInsnNode node) { + if (node instanceof MethodInsnNode) { + MethodInsnNode methodInsnNode = (MethodInsnNode)node; + return Type.getReturnType(methodInsnNode.desc); + } + + if (node instanceof FieldInsnNode) { + FieldInsnNode fieldInsnNode = (FieldInsnNode)node; + if (fieldInsnNode.getOpcode() == Opcodes.GETFIELD || fieldInsnNode.getOpcode() == Opcodes.GETSTATIC) { + return Type.getType(fieldInsnNode.desc); + } + return Type.VOID_TYPE; + } + + if (Bytecode.isConstant(node)) { + return Bytecode.getConstantType(node); + } + + if (node instanceof TypeInsnNode && node.getOpcode() == Opcodes.NEW) { + TypeInsnNode typeInsnNode = ((TypeInsnNode)node); + return Type.getObjectType(typeInsnNode.desc); + } + + return null; + } +} \ No newline at end of file diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReceiver.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReceiver.java new file mode 100644 index 0000000..fbebf07 --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReceiver.java @@ -0,0 +1,28 @@ +package io.github.tox1cozz.mixinextras.injector; + +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Slice; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface ModifyReceiver { + + String[] method(); + + At[] at(); + + Slice[] slice() default {}; + + boolean remap() default true; + + int require() default -1; + + int expect() default 1; + + int allow() default -1; +} \ No newline at end of file diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReceiverInjectionInfo.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReceiverInjectionInfo.java new file mode 100644 index 0000000..f29260e --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReceiverInjectionInfo.java @@ -0,0 +1,23 @@ +package io.github.tox1cozz.mixinextras.injector; + +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo.AnnotationType; +import org.spongepowered.asm.lib.tree.AnnotationNode; +import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.injection.code.Injector; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo.HandlerPrefix; +import org.spongepowered.asm.mixin.transformer.MixinTargetContext; + +@AnnotationType(ModifyReceiver.class) +@HandlerPrefix("modifyReceiver") +public class ModifyReceiverInjectionInfo extends InjectionInfo { + + public ModifyReceiverInjectionInfo(MixinTargetContext mixin, MethodNode method, AnnotationNode annotation) { + super(mixin, method, annotation); + } + + @Override + protected Injector parseInjector(AnnotationNode injectAnnotation) { + return new ModifyReceiverInjector(this); + } +} \ No newline at end of file diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReceiverInjector.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReceiverInjector.java new file mode 100644 index 0000000..12fbd50 --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReceiverInjector.java @@ -0,0 +1,90 @@ +package io.github.tox1cozz.mixinextras.injector; + +import io.github.tox1cozz.mixinextras.utils.CompatibilityHelper; +import io.github.tox1cozz.mixinextras.utils.InjectorUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.spongepowered.asm.lib.Opcodes; +import org.spongepowered.asm.lib.Type; +import org.spongepowered.asm.lib.tree.*; +import org.spongepowered.asm.mixin.injection.code.Injector; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; +import org.spongepowered.asm.mixin.injection.struct.InjectionNodes.InjectionNode; +import org.spongepowered.asm.mixin.injection.struct.Target; + +public class ModifyReceiverInjector extends Injector { + + public ModifyReceiverInjector(InjectionInfo info) { + super(info, "@ModifyReceiver"); + } + + @Override + protected void inject(Target target, InjectionNode node) { + checkTargetIsValid(target, node); + checkTargetModifiers(target, false); + modifyReceiverOfTarget(target, node); + } + + private void checkTargetIsValid(Target target, InjectionNode node) { + AbstractInsnNode insn = node.getOriginalTarget(); + switch (insn.getOpcode()) { + case Opcodes.INVOKEVIRTUAL: + case Opcodes.INVOKESPECIAL: + case Opcodes.INVOKEINTERFACE: + case Opcodes.GETFIELD: + case Opcodes.PUTFIELD: + return; + default: + throw CompatibilityHelper.makeInvalidInjectionException(info, String.format("%s annotation is targeting an invalid insn in %s in %s", annotationType, target, this)); + } + } + + private void modifyReceiverOfTarget(Target target, InjectionNode node) { + AbstractInsnNode currentTarget = node.getCurrentTarget(); + Type[] originalArgTypes = getEffectiveArgTypes(node.getOriginalTarget()); + Type[] currentArgTypes = getEffectiveArgTypes(currentTarget); + InsnList insns = new InsnList(); + boolean isVirtualRedirect = InjectorUtils.isVirtualRedirect(node); + injectReceiverModifier(target, originalArgTypes, currentArgTypes, isVirtualRedirect, insns); + target.insertBefore(node, insns); + } + + private void injectReceiverModifier(Target target, Type[] originalArgTypes, Type[] currentArgTypes, boolean isVirtualRedirect, InsnList insns) { + InjectorData handler = new InjectorData(target, "receiver modifier"); + validateParams(handler, originalArgTypes[0], originalArgTypes); + + int[] argMap = storeArgs(target, currentArgTypes, insns, 0); + int[] handlerArgMap = ArrayUtils.addAll(argMap, target.getArgIndices()); + if (isVirtualRedirect) { + // We need to disregard the extra "this" which will be added for a virtual redirect. + handlerArgMap = ArrayUtils.remove(handlerArgMap, 0); + // We also need to ensure it remains on the stack before the receiver + insns.add(new VarInsnNode(Opcodes.ALOAD, 0)); + } + + invokeHandlerWithArgs(methodArgs, insns, handlerArgMap); + + // If this is a virtual redirect, both "this" and the receiver are already on the stack + pushArgs(currentArgTypes, insns, argMap, isVirtualRedirect ? 2 : 1, argMap.length); + } + + private Type[] getEffectiveArgTypes(AbstractInsnNode node) { + switch (node.getOpcode()) { + case Opcodes.INVOKEVIRTUAL: + case Opcodes.INVOKESPECIAL: + case Opcodes.INVOKEINTERFACE: { + MethodInsnNode methodInsnNode = ((MethodInsnNode)node); + return ArrayUtils.addAll(new Type[] {Type.getObjectType(methodInsnNode.owner)}, Type.getArgumentTypes(methodInsnNode.desc)); + } + case Opcodes.GETFIELD: { + FieldInsnNode fieldInsnNode = ((FieldInsnNode)node); + return new Type[] {Type.getObjectType(fieldInsnNode.owner)}; + } + case Opcodes.PUTFIELD: { + FieldInsnNode fieldInsnNode = ((FieldInsnNode)node); + return new Type[] {Type.getObjectType(fieldInsnNode.owner), Type.getType(fieldInsnNode.desc)}; + } + } + + throw new UnsupportedOperationException(); + } +} \ No newline at end of file diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReturnValue.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReturnValue.java new file mode 100644 index 0000000..81adda3 --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReturnValue.java @@ -0,0 +1,28 @@ +package io.github.tox1cozz.mixinextras.injector; + +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Slice; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface ModifyReturnValue { + + String[] method(); + + At[] at(); + + Slice[] slice() default {}; + + boolean remap() default true; + + int require() default -1; + + int expect() default 1; + + int allow() default -1; +} \ No newline at end of file diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReturnValueInjectionInfo.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReturnValueInjectionInfo.java new file mode 100644 index 0000000..eda511a --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReturnValueInjectionInfo.java @@ -0,0 +1,23 @@ +package io.github.tox1cozz.mixinextras.injector; + +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo.AnnotationType; +import org.spongepowered.asm.lib.tree.AnnotationNode; +import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.injection.code.Injector; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo.HandlerPrefix; +import org.spongepowered.asm.mixin.transformer.MixinTargetContext; + +@AnnotationType(ModifyReturnValue.class) +@HandlerPrefix("modifyReturnValue") +public class ModifyReturnValueInjectionInfo extends InjectionInfo { + + public ModifyReturnValueInjectionInfo(MixinTargetContext mixin, MethodNode method, AnnotationNode annotation) { + super(mixin, method, annotation); + } + + @Override + protected Injector parseInjector(AnnotationNode injectAnnotation) { + return new ModifyReturnValueInjector(this); + } +} \ No newline at end of file diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReturnValueInjector.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReturnValueInjector.java new file mode 100644 index 0000000..d726364 --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReturnValueInjector.java @@ -0,0 +1,52 @@ +package io.github.tox1cozz.mixinextras.injector; + +import io.github.tox1cozz.mixinextras.utils.CompatibilityHelper; +import org.spongepowered.asm.lib.Opcodes; +import org.spongepowered.asm.lib.tree.InsnList; +import org.spongepowered.asm.lib.tree.InsnNode; +import org.spongepowered.asm.lib.tree.VarInsnNode; +import org.spongepowered.asm.mixin.injection.code.Injector; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; +import org.spongepowered.asm.mixin.injection.struct.InjectionNodes.InjectionNode; +import org.spongepowered.asm.mixin.injection.struct.Target; + +public class ModifyReturnValueInjector extends Injector { + + public ModifyReturnValueInjector(InjectionInfo info) { + super(info, "@ModifyReturnValue"); + } + + @Override + protected void inject(Target target, InjectionNode node) { + int opcode = node.getCurrentTarget().getOpcode(); + if (opcode < Opcodes.IRETURN || opcode >= Opcodes.RETURN) { + throw CompatibilityHelper.makeInvalidInjectionException(info, String.format("%s annotation is targeting an invalid insn in %s in %s", annotationType, target, this)); + } + checkTargetModifiers(target, false); + injectReturnValueModifier(target, node); + } + + private void injectReturnValueModifier(Target target, InjectionNode node) { + InjectorData handler = new InjectorData(target, "return value modifier"); + InsnList insns = new InsnList(); + + validateParams(handler, target.returnType, target.returnType); + + if (!isStatic) { + insns.add(new VarInsnNode(Opcodes.ALOAD, 0)); + if (target.returnType.getSize() == 2) { + insns.add(new InsnNode(Opcodes.DUP_X2)); + insns.add(new InsnNode(Opcodes.POP)); + } else { + insns.add(new InsnNode(Opcodes.SWAP)); + } + } + + if (handler.captureTargetArgs > 0) { + pushArgs(target.arguments, insns, target.getArgIndices(), 0, handler.captureTargetArgs); + } + + invokeHandler(insns); + target.insertBefore(node, insns); + } +} \ No newline at end of file diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/WrapWithCondition.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/WrapWithCondition.java new file mode 100644 index 0000000..838e4c2 --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/WrapWithCondition.java @@ -0,0 +1,28 @@ +package io.github.tox1cozz.mixinextras.injector; + +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Slice; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface WrapWithCondition { + + String[] method(); + + At[] at(); + + Slice[] slice() default {}; + + boolean remap() default true; + + int require() default -1; + + int expect() default 1; + + int allow() default -1; +} \ No newline at end of file diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/WrapWithConditionInjectionInfo.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/WrapWithConditionInjectionInfo.java new file mode 100644 index 0000000..14a3a8b --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/WrapWithConditionInjectionInfo.java @@ -0,0 +1,59 @@ +package io.github.tox1cozz.mixinextras.injector; + +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo.AnnotationType; +import org.spongepowered.asm.lib.Opcodes; +import org.spongepowered.asm.lib.Type; +import org.spongepowered.asm.lib.tree.AbstractInsnNode; +import org.spongepowered.asm.lib.tree.AnnotationNode; +import org.spongepowered.asm.lib.tree.MethodInsnNode; +import org.spongepowered.asm.lib.tree.MethodNode; +import org.spongepowered.asm.mixin.injection.code.Injector; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo.HandlerPrefix; +import org.spongepowered.asm.mixin.injection.struct.InjectionNodes; +import org.spongepowered.asm.mixin.transformer.MixinTargetContext; + +import java.util.List; + +@AnnotationType(WrapWithCondition.class) +@HandlerPrefix("wrapWithCondition") +public class WrapWithConditionInjectionInfo extends InjectionInfo { + + static final String POPPED_OPERATION_DECORATOR = "mixinextras_operationIsImmediatelyPopped"; + + public WrapWithConditionInjectionInfo(MixinTargetContext mixin, MethodNode method, AnnotationNode annotation) { + super(mixin, method, annotation); + } + + @Override + protected Injector parseInjector(AnnotationNode injectAnnotation) { + return new WrapWithConditionInjector(this); + } + + @Override + public void prepare() { + super.prepare(); + for (List nodeList : targetNodes.values()) { + for (InjectionNodes.InjectionNode node : nodeList) { + AbstractInsnNode currentTarget = node.getCurrentTarget(); + if (currentTarget instanceof MethodInsnNode) { + Type returnType = Type.getReturnType(((MethodInsnNode)currentTarget).desc); + if (isTypePoppedByInstruction(returnType, currentTarget.getNext())) { + node.decorate(POPPED_OPERATION_DECORATOR, true); + } + } + } + } + } + + private boolean isTypePoppedByInstruction(Type type, AbstractInsnNode insn) { + switch (type.getSize()) { + case 2: + return insn.getOpcode() == Opcodes.POP2; + case 1: + return insn.getOpcode() == Opcodes.POP; + default: + return false; + } + } +} \ No newline at end of file diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/WrapWithConditionInjector.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/WrapWithConditionInjector.java new file mode 100644 index 0000000..7ee2262 --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/WrapWithConditionInjector.java @@ -0,0 +1,140 @@ +package io.github.tox1cozz.mixinextras.injector; + +import io.github.tox1cozz.mixinextras.utils.CompatibilityHelper; +import io.github.tox1cozz.mixinextras.utils.InjectorUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.spongepowered.asm.lib.Opcodes; +import org.spongepowered.asm.lib.Type; +import org.spongepowered.asm.lib.tree.*; +import org.spongepowered.asm.mixin.injection.code.Injector; +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; +import org.spongepowered.asm.mixin.injection.struct.InjectionNodes.InjectionNode; +import org.spongepowered.asm.mixin.injection.struct.Target; + +public class WrapWithConditionInjector extends Injector { + + public WrapWithConditionInjector(InjectionInfo info) { + super(info, "@WrapWithCondition"); + } + + @Override + protected void inject(Target target, InjectionNode node) { + checkTargetIsLogicallyVoid(target, node); + checkTargetModifiers(target, false); + wrapTargetWithCondition(target, node); + } + + private void checkTargetIsLogicallyVoid(Target target, InjectionNode node) { + if (node.hasDecoration(WrapWithConditionInjectionInfo.POPPED_OPERATION_DECORATOR)) { + // We have already checked that the operation's return value is immediately popped, therefore it is effectively void. + return; + } + + Type returnType = getReturnType(node.getCurrentTarget()); + if (returnType == null) { + throw CompatibilityHelper.makeInvalidInjectionException(info, String.format("%s annotation is targeting an invalid insn in %s in %s", annotationType, target, this)); + } + + if (returnType != Type.VOID_TYPE) { + throw CompatibilityHelper.makeInvalidInjectionException(info, String.format("%s annotation is targeting an instruction with a non-void return type in %s in %s", annotationType, target, this)); + } + } + + private void wrapTargetWithCondition(Target target, InjectionNode node) { + AbstractInsnNode currentTarget = node.getCurrentTarget(); + Type returnType = getReturnType(currentTarget); + Type[] originalArgTypes = getEffectiveArgTypes(node.getOriginalTarget()); + Type[] currentArgTypes = getEffectiveArgTypes(currentTarget); + InsnList before = new InsnList(); + InsnList after = new InsnList(); + boolean isVirtualRedirect = InjectorUtils.isVirtualRedirect(node); + invokeHandler(target, returnType, originalArgTypes, currentArgTypes, isVirtualRedirect, before, after); + target.wrapNode(currentTarget, currentTarget, before, after); + } + + private void invokeHandler(Target target, Type returnType, Type[] originalArgTypes, Type[] currentArgTypes, boolean isVirtualRedirect, InsnList before, InsnList after) { + InjectorData handler = new InjectorData(target, "condition wrapper"); + validateParams(handler, Type.BOOLEAN_TYPE, originalArgTypes); + + int[] argMap = storeArgs(target, currentArgTypes, before, 0); + int[] handlerArgMap = ArrayUtils.addAll(argMap, target.getArgIndices()); + if (isVirtualRedirect) { + // We need to disregard the extra "this" which will be added for a virtual redirect. + handlerArgMap = ArrayUtils.remove(handlerArgMap, 0); + } + + invokeHandlerWithArgs(methodArgs, before, handlerArgMap); + + LabelNode afterOperation = new LabelNode(); + LabelNode afterDummy = new LabelNode(); + before.add(new JumpInsnNode(Opcodes.IFEQ, afterOperation)); + + pushArgs(currentArgTypes, before, argMap, 0, argMap.length); + // Target instruction will be here + after.add(new JumpInsnNode(Opcodes.GOTO, afterDummy)); + after.add(afterOperation); + if (returnType != Type.VOID_TYPE) { + after.add(new InsnNode(getDummyOpcodeForType(returnType))); + } + after.add(afterDummy); + } + + private Type getReturnType(AbstractInsnNode node) { + if (node instanceof MethodInsnNode) { + MethodInsnNode methodInsnNode = (MethodInsnNode)node; + return Type.getReturnType(methodInsnNode.desc); + } + + if (node instanceof FieldInsnNode) { + FieldInsnNode fieldInsnNode = (FieldInsnNode)node; + if (fieldInsnNode.getOpcode() == Opcodes.GETFIELD || fieldInsnNode.getOpcode() == Opcodes.GETSTATIC) { + return Type.getType(fieldInsnNode.desc); + } + return Type.VOID_TYPE; + } + + return null; + } + + private Type[] getEffectiveArgTypes(AbstractInsnNode node) { + if (node instanceof MethodInsnNode) { + MethodInsnNode methodInsnNode = ((MethodInsnNode)node); + return node.getOpcode() == Opcodes.INVOKESTATIC ? + Type.getArgumentTypes(methodInsnNode.desc) : + ArrayUtils.addAll(new Type[] {Type.getObjectType(methodInsnNode.owner)}, Type.getArgumentTypes(methodInsnNode.desc)); + } + if (node instanceof FieldInsnNode) { + FieldInsnNode fieldInsnNode = ((FieldInsnNode)node); + if (fieldInsnNode.getOpcode() == Opcodes.PUTFIELD) { + return new Type[] {Type.getObjectType(fieldInsnNode.owner), Type.getType(fieldInsnNode.desc)}; + } + if (fieldInsnNode.getOpcode() == Opcodes.PUTSTATIC) { + return new Type[] {Type.getType(fieldInsnNode.desc)}; + } + } + + throw new UnsupportedOperationException(); + } + + private int getDummyOpcodeForType(Type type) { + switch (type.getSort()) { + case Type.BOOLEAN: + case Type.CHAR: + case Type.BYTE: + case Type.SHORT: + case Type.INT: + return Opcodes.ICONST_0; + case Type.FLOAT: + return Opcodes.FCONST_0; + case Type.LONG: + return Opcodes.LCONST_0; + case Type.DOUBLE: + return Opcodes.DCONST_0; + case Type.ARRAY: + case Type.OBJECT: + return Opcodes.ACONST_NULL; + default: + throw new UnsupportedOperationException(); + } + } +} \ No newline at end of file diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/utils/CompatibilityHelper.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/utils/CompatibilityHelper.java new file mode 100644 index 0000000..fc17984 --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/utils/CompatibilityHelper.java @@ -0,0 +1,34 @@ +package io.github.tox1cozz.mixinextras.utils; + +import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; +import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException; + +import java.lang.reflect.Constructor; +import java.util.Arrays; + +/** + * Helpers for writing code that is compatible with all variants of Mixin 0.8+ + */ +public class CompatibilityHelper { + + private static final Constructor INVALID_INJECTION_EXCEPTION_CONSTRUCTOR; + + static { + // noinspection unchecked + INVALID_INJECTION_EXCEPTION_CONSTRUCTOR = (Constructor)Arrays.stream(InvalidInjectionException.class.getConstructors()) + .filter(it -> { + Class[] parameters = it.getParameterTypes(); + return parameters.length == 2 && parameters[0].isAssignableFrom(InjectionInfo.class) && parameters[1] == String.class; + }) + .findAny() + .orElse(null); + } + + public static RuntimeException makeInvalidInjectionException(InjectionInfo info, String message) { + try { + return INVALID_INJECTION_EXCEPTION_CONSTRUCTOR.newInstance(info, message); + } catch (Throwable e) { + throw new RuntimeException(e); + } + } +} \ No newline at end of file diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/utils/InjectorUtils.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/utils/InjectorUtils.java new file mode 100644 index 0000000..512508d --- /dev/null +++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/utils/InjectorUtils.java @@ -0,0 +1,11 @@ +package io.github.tox1cozz.mixinextras.utils; + +import org.spongepowered.asm.lib.Opcodes; +import org.spongepowered.asm.mixin.injection.struct.InjectionNodes; + +public class InjectorUtils { + + public static boolean isVirtualRedirect(InjectionNodes.InjectionNode node) { + return node.isReplaced() && node.hasDecoration("redirector") && node.getCurrentTarget().getOpcode() != Opcodes.INVOKESTATIC; + } +} \ No newline at end of file diff --git a/module-mixinbooterlegacy/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/module-mixinbooterlegacy/src/main/resources/META-INF/services/javax.annotation.processing.Processor new file mode 100644 index 0000000..59b6c78 --- /dev/null +++ b/module-mixinbooterlegacy/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -0,0 +1 @@ +io.github.tox1cozz.mixinextras.MixinExtrasAnnotationProcessor diff --git a/module-mixinbooterlegacy/src/main/resources/mcmod.info b/module-mixinbooterlegacy/src/main/resources/mcmod.info new file mode 100644 index 0000000..6eeb4b2 --- /dev/null +++ b/module-mixinbooterlegacy/src/main/resources/mcmod.info @@ -0,0 +1,18 @@ +[ + { + "modid": "mixinbooterlegacy", + "name": "UniMixins: MixinBooterLegacy", + "description": "UniMixins module that provides MixinBooterLegacy extras and MixinExtras with MixinBooterLegacy's package name.", + "version": "${extraVersion}", + "mcversion": "${mcversion}", + "url": "https://github.com/tox1cozZ/mixin-booter-legacy", + "updateUrl": "", + "authorList": [ + "Rongmario", "tox1cozZ" + ], + "credits": "Thanks Rongmario for a MixinBooter on Minecraft 1.12.2.", + "logoFile": "/icon.png", + "screenshots": [], + "dependencies": [] + } +] diff --git a/module-mixinbooterlegacy/src/main/resources/mixin.mixinbooterlegacy.json b/module-mixinbooterlegacy/src/main/resources/mixin.mixinbooterlegacy.json new file mode 100644 index 0000000..06c785d --- /dev/null +++ b/module-mixinbooterlegacy/src/main/resources/mixin.mixinbooterlegacy.json @@ -0,0 +1,14 @@ +{ + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "required": true, + "target": "@env(DEFAULT)", + "package": "io.github.tox1cozz.mixinbooterlegacy.loader.mixin", + "refmap": "mixin.mixinbooterlegacy.refmap.json", + "injectors": { + "defaultRequire": 1 + }, + "mixins": [ + "LoadControllerMixin" + ] +} \ No newline at end of file diff --git a/module-mixingasm/build.gradle b/module-mixingasm/build.gradle index 23cc072..ebe6b9e 100644 --- a/module-mixingasm/build.gradle +++ b/module-mixingasm/build.gradle @@ -9,7 +9,7 @@ dependencies { compile('org.spongepowered:mixin:0.7.11-SNAPSHOT') } -archivesBaseName = archivesBaseName.replace("-1.7.10", "-spongemixins-1.7.10") +archivesBaseName = archivesBaseName.replace("-1.7.10", "-mixingasm-1.7.10") jar { manifest { diff --git a/module-mixingasm/src/main/resources/mcmod.info b/module-mixingasm/src/main/resources/mcmod.info index 187df37..61ad272 100644 --- a/module-mixingasm/src/main/resources/mcmod.info +++ b/module-mixingasm/src/main/resources/mcmod.info @@ -1,6 +1,6 @@ [ { - "modid": "spongemixins", + "modid": "mixingasm", "name": "UniMixins: Mixingasm", "description": "UniMixins module that implements Mixingasm (version: ${extraVersion}).", "version": "${extraVersion}", diff --git a/settings.gradle b/settings.gradle index 2b52692..6f1b508 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,5 +2,6 @@ include 'module-mixin' include 'module-compat' include 'module-mixingasm' include 'module-spongemixins' +include 'module-mixinbooterlegacy' include 'module-gtnhmixins' include 'module-all'