commit dd38d444f29d8e20f66dfde43e3466ecc587d763 parent e315760aa27e0831cf722ecf42e30717ae0d62d6 Author: Amb0s <ambos@disroot.org> Date: Wed, 13 Jul 2022 06:36:58 +0200 Ported to Babric Diffstat:
37 files changed, 270 insertions(+), 1538 deletions(-)
diff --git a/.gitignore b/.gitignore @@ -24,6 +24,11 @@ bin/ .classpath .project +# macos + +*.DS_Store + # fabric run/ +libs/*.jar +\ No newline at end of file diff --git a/COPYING b/COPYING @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <https://www.gnu.org/licenses/>. - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<https://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<https://www.gnu.org/licenses/why-not-lgpl.html>. diff --git a/COPYING.LESSER b/COPYING.LESSER @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - 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 that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU 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 as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/LICENSE b/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2020 Ambos + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +\ No newline at end of file diff --git a/README.md b/README.md @@ -1,29 +1,43 @@ # Vanilla Fixes -## Client side fixes - -* Skins -* Capes +## Fixes * Sounds -* Authentication -* Depth buffer * Jittering * Score display -* Block hit delay in multiplayer -* Tools -* Fences -* Stairs -* Boats -* Entity jittering in multiplayer +* Minimal main menu ## Installation -This mod doesn't need Cursed Legacy API or StationAPI. Only download the Cursed Fabric Loader [there](https://github.com/calmilamsy/Cursed-Fabric-MultiMC). -## Thanks -SparklingComet, for their [Java Mojang API](https://github.com/SparklingComet/java-mojang-api). +1. Install [MultiMC](https://multimc.org/) or [PolyMC](https://polymc.org/) +2. Install Babric [PolyMC/MultiMC instance](https://github.com/babric/polymc-instance) +3. Download the "Better than Adventure!" mod +4. Install it as a jar mod and make sure BTA is above Babric but below Minecraft +5. Select Fabric Loader and click "Edit" +6. Remove the whole "requires" block from the JSON, so intermediaries can be deleted +7. Save the JSON file and close it, then remove the intermediaries from the instance. +8. Download the "Vanilla Fixes" jar file +9. Copy it in your mods directory. + +## Development + +### Setup + +1. Grab a "Better than Adventure!" jar from the PolyMC/MultiMC instance and rename it to "bta.jar". +2. Place the jar in the "libs" folder in your project. +3. Build the mod with `./gradlew build` + +### Tips -cutezyash, for letting me use [Megamod](https://github.com/OldHaven-Network/MegaMod-Mixins) code under LGPL. +* Since BTA is distributed without obfuscation, all Mixin classes must set the "remap" option to false. +* To decompile the whole "bta.jar" file, use [RetroMCP-Java](https://github.com/MCPHackers/RetroMCP-Java). -Oldmana, for originally finding the entity jittering fix. +### Documentation +* [Fabric Wiki](https://fabricmc.net/wiki/doku.php) +* [Mixin javadoc](https://jenkins.liteloader.com/view/Other/job/Mixin/javadoc/index.html) +* [Mixin cheatsheet](https://github.com/2xsaiko/mixin-cheatsheet/blob/master/README.md) +* [Cursed Legacy Wiki](https://minecraft-cursed-legacy.github.io/wiki/index.html) -calmilamsy, for porting [it](https://github.com/calmilamsy/MPEntityPhysicsFix) to fabric. -\ No newline at end of file +### Example mods +* [BTA Example Mod for Babric](https://github.com/pkstDev/BTAExampleMod-babric) +* [Fabric Example Mod with StationAPI and BIN Mappings](https://github.com/calmilamsy/stationapi-example-mod/tree/dev/12) +* [Minecraft Cursed Legacy Example Mod](https://github.com/minecraft-cursed-legacy/Example-Mod) +\ No newline at end of file diff --git a/build.gradle b/build.gradle @@ -1,161 +1,76 @@ -buildscript { - repositories { - mavenCentral() - jcenter() - maven { - name = "Fabric" - url = "https://maven.fabricmc.net/" - } - maven { - name = "Jitpack" - url 'https://jitpack.io/' - } - } - dependencies { - classpath 'com.github.Chocohead:Fabric-Loom:e3d1762' - } -} - plugins { - id 'maven-publish' + id 'com.github.johnrengelman.shadow' version '7.1.2' + id 'java' } +// No babric loom here -apply plugin: "fabric-loom" - -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 - -archivesBaseName = project.archives_base_name +group = project.mod_group +archivesBaseName = project.mod_name version = project.mod_version -group = project.maven_group - -idea { - module { - downloadJavadoc = true - } -} - -eclipse { - classpath { - downloadJavadoc = true - } -} repositories { - maven { - name = "Jitpack" - url "https://jitpack.io/" - } -} - -minecraft { + mavenCentral() + maven { + name = 'Babric' + url = 'https://maven.glass-launcher.net/babric' + } + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } } +// We use shadow here to avoid the following dependencies being shadowed. +// If you want to add your own dependency, you should also use 'shadow' most of the time. +// Yet, if you want to include your dependency, use normal 'implementation' instead. dependencies { - // fabric loader requires log4j, guava, and gson - implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.8.1' - implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.8.1' - annotationProcessor group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.8.1' - annotationProcessor group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.8.1' - implementation 'com.google.guava:guava:28.0-jre' - implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6' - - // mixin and fabric loader need asm 9 - implementation 'org.ow2.asm:asm:9.0' - implementation 'org.ow2.asm:asm-analysis:9.0' - implementation 'org.ow2.asm:asm-commons:9.0' - implementation 'org.ow2.asm:asm-tree:9.0' - implementation 'org.ow2.asm:asm-util:9.0' - - // java mojang API - include group: 'commons-codec', name: 'commons-codec', version: '1.14' - include group: 'commons-logging', name: 'commons-logging', version: '1.2' - include group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1.4' - include group: 'org.apache.httpcomponents', name: 'httpcore-nio', version: '4.4.13' - include group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.13' - include group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.8' - include group: 'com.mashape.unirest', name: 'unirest-java', version: '1.4.9' - include group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1' - implementation 'com.github.SparklingComet:java-mojang-api:-SNAPSHOT' - include 'com.github.SparklingComet:java-mojang-api:-SNAPSHOT' + shadow "org.ow2.asm:asm:${project.asm_version}" + shadow "org.ow2.asm:asm-analysis:${project.asm_version}" + shadow "org.ow2.asm:asm-commons:${project.asm_version}" + shadow "org.ow2.asm:asm-tree:${project.asm_version}" + shadow "org.ow2.asm:asm-util:${project.asm_version}" - // to change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" + shadow("net.fabricmc:sponge-mixin:${project.mixin_version}") { + exclude module: 'launchwrapper' + exclude module: 'guava' + } - mappings loom.fromCommit("calmilamsy/BIN-Mappings", "${project.yarn_mappings}") {spec -> - spec.version = "b1.7.3-${project.yarn_mappings}" - } + shadow "babric:fabric-loader:${project.loader_version}" - // convenience stuff - // adds some useful annotations for data classes. does not add any dependencies - compileOnly 'org.projectlombok:lombok:1.18.16' - annotationProcessor 'org.projectlombok:lombok:1.18.16' + shadow files('libs/bta.jar') - // adds some useful annotations for miscellaneous uses. does not add any dependencies, though people without the lib will be missing some useful context hints. - compile 'org.jetbrains:annotations:16.0.2' - - modImplementation "com.github.minecraft-cursed-legacy:cursed-fabric-loader:${project.loader_version}" + shadow "org.slf4j:slf4j-api:1.8.0-beta4" + shadow 'org.apache.logging.log4j:log4j-slf4j18-impl:2.17.2' } -processResources { - inputs.property "version", project.version - - from(sourceSets.main.resources.srcDirs) { - include "fabric.mod.json" - expand "version": project.version - } - - from(sourceSets.main.resources.srcDirs) { - exclude "fabric.mod.json" - } +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + withSourcesJar() } -// ensure that the encoding is set to UTF-8, no matter what the system default is -// this fixes some edge cases with special characters not displaying correctly -// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html tasks.withType(JavaCompile) { - options.encoding = "UTF-8" + options.release.set 8 } -// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task -// if it is present. -// If you remove this task, sources will not be generated. -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = "sources" - from sourceSets.main.allSource +jar { + from("LICENSE") { + rename { "${it}_${project.archivesBaseName}" } + } } -task javadocJar(type: Jar) { - from javadoc - classifier = 'javadoc' +shadowJar { + from("LICENSE") { + rename { "${it}_${project.archivesBaseName}" } + } } -tasks.publishToMavenLocal.dependsOn(tasks.remapJar) +jar.finalizedBy tasks.shadowJar -publishing { - repositories { - mavenLocal() - } - - publications { - mavenJava(MavenPublication) { - artifactId project.archives_base_name - artifact ("${project.buildDir.absolutePath}/libs/${archivesBaseName}-${project.version}.jar") { - classifier null - builtBy remapJar - } +processResources { + inputs.property "version", project.version - artifact ("${project.buildDir.absolutePath}/libs/${archivesBaseName}-${project.version}-dev.jar") { - classifier 'dev' - builtBy remapJar - } - pom.withXml { - asNode().dependencies.dependency.each { dep -> - if(dep.artifactId.last().value().last().toLowerCase() in ["cursed-fabric-loader", "stationapi"]) { - assert dep.parent().remove(dep) - } - } - } - } - } + filesMatching("fabric.mod.json") { + expand "version": project.version + } } diff --git a/gradle.properties b/gradle.properties @@ -1,16 +1,13 @@ -# Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx1G -# Disables gradle's buggy (in minecraft's case) daemon. -# Also makes builds more reliable and less likely to randomly fail. -org.gradle.daemon=false +org.gradle.jvmargs=-Xmx2G -# Fabric Properties - # check these on https://fabricmc.net/use - minecraft_version=b1.7.3 - yarn_mappings=00548e7 - loader_version=671a1bb +# Loader Dependencies +asm_version=9.3 +mixin_version=0.11.4+mixin.0.8.5 -# Mod Properties - mod_version = 1.0.3 - maven_group = ambos - archives_base_name = vanilla-fixes +# Loader +loader_version=0.14.6-babric.1 + +# Mod +mod_version=2.0.0 +mod_group=ambos +mod_name=vanilla-fixes diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differ. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Sun Jun 14 19:21:24 BST 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew @@ -72,7 +72,7 @@ case "`uname`" in Darwin* ) darwin=true ;; - MINGW* ) + MSYS* | MINGW* ) msys=true ;; NONSTOP* ) @@ -82,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -129,6 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath diff --git a/gradlew.bat b/gradlew.bat @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/libs/important.txt b/libs/important.txt @@ -0,0 +1 @@ +Put a "Better than Adventure!" jar named "bta.jar" here. diff --git a/settings.gradle b/settings.gradle @@ -0,0 +1,17 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + maven { + name = 'Jitpack' + url = 'https://jitpack.io' + } + maven { + name = 'Babric' + url = 'https://maven.glass-launcher.net/babric' + } + } +} +\ No newline at end of file diff --git a/src/main/java/ambos/vanillafixes/MinecraftUtil.java b/src/main/java/ambos/vanillafixes/MinecraftUtil.java @@ -1,113 +0,0 @@ -package ambos.vanillafixes; - -import org.apache.commons.codec.binary.Base64; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.json.simple.JSONObject; -import org.json.simple.parser.JSONParser; -import org.json.simple.parser.ParseException; -import org.shanerx.mojang.Mojang; -import org.shanerx.mojang.PlayerProfile; -import java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Optional; - -public final class MinecraftUtil { - private final static ArrayList<String> PROXY_URLs = new ArrayList<>(Arrays.asList( - "http://resourceproxy.pymcl.net/MinecraftResources/", - "http://mcresources.modification-station.net/MinecraftResources/", - "https://betacraft.pl/MinecraftResources/" - )); - - private static final Logger logger = LogManager.getLogger(MinecraftUtil.class); - - private MinecraftUtil() {} - - private static boolean isDown(String url) { - try { - URL urlObject = new URL(url); - HttpURLConnection httpURLConnection = (HttpURLConnection) urlObject.openConnection(); - httpURLConnection.connect(); - - int statusCode = httpURLConnection.getResponseCode(); - if (!(statusCode == 404)) { - return false; - } - } catch (IOException ignored) { - - } - - return true; - } - - private static boolean isSlim(PlayerProfile playerProfile) { - JSONObject value = null; - - try { - Optional<PlayerProfile.Property> property = playerProfile.getProperties().stream().findFirst(); - - if (property.isPresent()) { - value = (JSONObject) new JSONParser() - .parse(new String(Base64.decodeBase64(property.get().getValue()))); - } - - } catch (ParseException e) { - return true; - } - - return value != null && value.toJSONString().contains(Mojang.SkinType.SLIM.toString()); - } - - private static PlayerProfile getPlayerProfile(String username) { - Mojang mojang = new Mojang(); - String uuid = mojang.getUUIDOfUsername(username); - - return mojang.getPlayerProfile(uuid); - } - - public static String getPlayerSkin(String username) { - try { - PlayerProfile playerProfile = getPlayerProfile(username); - Optional<URL> playerSkin = playerProfile.getTextures().flatMap(PlayerProfile.TexturesProperty::getSkin); - - if (playerSkin.isPresent() && !isSlim(playerProfile)) { - logger.info("Getting player skin: " + playerSkin.get().toString()); - return playerSkin.get().toString(); - } - } catch (RuntimeException ignored) { - - } - - return null; - } - - public static String getPlayerCape(String username) { - try { - PlayerProfile playerProfile = getPlayerProfile(username); - Optional<URL> playerCape = playerProfile.getTextures().flatMap(PlayerProfile.TexturesProperty::getCape); - - if (playerCape.isPresent()) { - logger.info("Getting player cape: " + playerCape.get().toString()); - return playerCape.get().toString(); - } - } catch (RuntimeException ignored) { - - } - - return null; - } - - public static String getResources() { - for (String url : PROXY_URLs) { - if (!isDown(url)) { - logger.info("Resources proxy found: " + url); - return url; - } - } - - return null; - } -} -\ No newline at end of file diff --git a/src/main/java/ambos/vanillafixes/mixin/AbstractClientPlayerMixin.java b/src/main/java/ambos/vanillafixes/mixin/AbstractClientPlayerMixin.java @@ -1,32 +0,0 @@ -package ambos.vanillafixes.mixin; - -import ambos.vanillafixes.MinecraftUtil; -import net.minecraft.client.Minecraft; -import net.minecraft.client.util.Session; -import net.minecraft.entity.player.AbstractClientPlayer; -import net.minecraft.entity.player.PlayerBase; -import net.minecraft.level.Level; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.Redirect; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(AbstractClientPlayer.class) -abstract class AbstractClientPlayerMixin extends PlayerBase { - private AbstractClientPlayerMixin(Level level) { - super(level); - } - - @Redirect(method = "<init>", at = @At(value = "INVOKE", target = "Ljava/lang/StringBuilder;toString()Ljava/lang/String;"), require = 0) - private String changeSkin(StringBuilder builder, Minecraft minecraft, Level level, Session session, int integer) { - return MinecraftUtil.getPlayerSkin(session.username); - } - - @Inject(method = "<init>", at = @At("RETURN"), require = 0) - private void AbstractClientPlayer(Minecraft minecraft, Level level, Session session, int integer, CallbackInfo ci) { - if (session != null && session.username != null && session.username.length() > 0) { - cloakUrl = MinecraftUtil.getPlayerCape(session.username); - } - } -} diff --git a/src/main/java/ambos/vanillafixes/mixin/BoatMixin.java b/src/main/java/ambos/vanillafixes/mixin/BoatMixin.java @@ -1,37 +0,0 @@ -package ambos.vanillafixes.mixin; - -import net.minecraft.entity.Boat; -import net.minecraft.entity.EntityBase; -import net.minecraft.entity.Item; -import net.minecraft.item.ItemBase; -import net.minecraft.level.Level; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.Redirect; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(Boat.class) -abstract class BoatMixin extends EntityBase { - public boolean field_1624; - - public BoatMixin(Level level) { - super(level); - } - - @Inject(method = "<init>", at = @At("RETURN"), require = 0) - private void onInit(CallbackInfo ci) { - field_1624 = false; - } - - @Redirect(method = "damage", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Boat;dropItem(IIF)Lnet/minecraft/entity/Item;"), require = 0) - private Item onDropItem(Boat boat, int i, int j, float f) { - return null; - } - - @Inject(method = "damage", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Boat;remove()V"), cancellable = true, require = 0) - private void dropBoat(CallbackInfoReturnable<Boolean> ci) { - this.dropItem(ItemBase.boat.id, 1, 0.0F); - } -} diff --git a/src/main/java/ambos/vanillafixes/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/ambos/vanillafixes/mixin/ClientPlayNetworkHandlerMixin.java @@ -1,14 +0,0 @@ -package ambos.vanillafixes.mixin; - -import net.minecraft.network.ClientPlayNetworkHandler; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.Constant; -import org.spongepowered.asm.mixin.injection.ModifyConstant; - -@Mixin(ClientPlayNetworkHandler.class) -final class ClientPlayNetworkHandlerMixin { - @ModifyConstant(method = "method_1471", constant = @Constant(stringValue = "http://www.minecraft.net/game/joinserver.jsp?user="), require = 0) - private String changeURL(String url) { - return "http://session.minecraft.net/game/joinserver.jsp?user="; - } -} diff --git a/src/main/java/ambos/vanillafixes/mixin/DeathMixin.java b/src/main/java/ambos/vanillafixes/mixin/DeathMixin.java @@ -1,18 +0,0 @@ -package ambos.vanillafixes.mixin; - -import net.minecraft.client.gui.screen.ScreenBase; -import net.minecraft.client.gui.screen.ingame.Death; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.ModifyArgs; -import org.spongepowered.asm.mixin.injection.invoke.arg.Args; - -@Mixin(Death.class) -final class DeathMixin extends ScreenBase { - @ModifyArgs(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/ingame/Death;drawTextWithShadowCentred(Lnet/minecraft/client/render/TextRenderer;Ljava/lang/String;III)V"), require = 0) - private void changeDeathMessage(Args args) { - if (args.get(1) != "Game over!") { - args.set(1, "Score: §e" + minecraft.player.getScore()); - } - } -} diff --git a/src/main/java/ambos/vanillafixes/mixin/EntityBaseMixin.java b/src/main/java/ambos/vanillafixes/mixin/EntityBaseMixin.java @@ -1,30 +0,0 @@ -package ambos.vanillafixes.mixin; - -import net.minecraft.entity.EntityBase; -import net.minecraft.entity.Living; -import net.minecraft.entity.player.PlayerBase; -import org.objectweb.asm.Opcodes; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(EntityBase.class) -final class EntityBaseMixin { - @Redirect(method = "move", at = @At(value = "FIELD", target = "Lnet/minecraft/entity/EntityBase;x:D", opcode = Opcodes.PUTFIELD), require = 0) - private void fixX(EntityBase entityBase, double value) { - if (!entityBase.level.isClient || entityBase instanceof PlayerBase || !(entityBase instanceof Living)) - entityBase.x = value; - } - - @Redirect(method = "move", at = @At(value = "FIELD", target = "Lnet/minecraft/entity/EntityBase;y:D", opcode = Opcodes.PUTFIELD), require = 0) - private void fixY(EntityBase entityBase, double value) { - if (!entityBase.level.isClient || entityBase instanceof PlayerBase || !(entityBase instanceof Living)) - entityBase.y = value; - } - - @Redirect(method = "move", at = @At(value = "FIELD", target = "Lnet/minecraft/entity/EntityBase;z:D", opcode = Opcodes.PUTFIELD), require = 0) - private void fixZ(EntityBase entityBase, double value) { - if (!entityBase.level.isClient || entityBase instanceof PlayerBase || !(entityBase instanceof Living)) - entityBase.z = value; - } -} diff --git a/src/main/java/ambos/vanillafixes/mixin/FenceMixin.java b/src/main/java/ambos/vanillafixes/mixin/FenceMixin.java @@ -1,16 +0,0 @@ -package ambos.vanillafixes.mixin; - -import net.minecraft.level.Level; -import net.minecraft.block.Fence; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(Fence.class) -final class FenceMixin { - @Inject(method = "canPlaceAt", at = @At("RETURN"), cancellable = true, require = 0) - private void onCanPlaceAt(Level level, int x, int y, int z, CallbackInfoReturnable cir) { - cir.setReturnValue(true); - } -} diff --git a/src/main/java/ambos/vanillafixes/mixin/GuiGameOverMixin.java b/src/main/java/ambos/vanillafixes/mixin/GuiGameOverMixin.java @@ -0,0 +1,21 @@ +package ambos.vanillafixes.mixin; + +import net.minecraft.src.GuiGameOver; +import net.minecraft.src.GuiScreen; +import net.minecraft.src.command.ChatColor; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyArgs; +import org.spongepowered.asm.mixin.injection.invoke.arg.Args; + +@Mixin(value = GuiGameOver.class, remap = false) +final class GuiGameOverMixin extends GuiScreen { + @ModifyArgs(method = "drawScreen", at = @At(value = "INVOKE", + target = "Lnet/minecraft/src/GuiGameOver;drawCenteredString(Lnet/minecraft/src/FontRenderer;Ljava/lang/String;III)V"), + require = 0) + private void changeGameOverMessage(Args args) { + if (args.get(1) != "Game over!") { + args.set(1, "Score: " + ChatColor.yellow + this.mc.thePlayer.getScore()); + } + } +} diff --git a/src/main/java/ambos/vanillafixes/mixin/GuiMainMenuMixin.java b/src/main/java/ambos/vanillafixes/mixin/GuiMainMenuMixin.java @@ -0,0 +1,18 @@ +package ambos.vanillafixes.mixin; + +import net.minecraft.src.GuiMainMenu; +import net.minecraft.src.GuiScreen; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(value = GuiMainMenu.class, remap = false) +final class GuiMainMenuMixin extends GuiScreen { + @Inject(method = "initGui", at = @At("RETURN"), cancellable = true, require = 0) + private void removeLinks(CallbackInfo ci) { + for (int i = 1; i <= 3; i++) { // Removes the last 3 buttons (links) from the main menu. + this.controlList.remove(this.controlList.size() - 1); + } + } +} diff --git a/src/main/java/ambos/vanillafixes/mixin/HatchetMixin.java b/src/main/java/ambos/vanillafixes/mixin/HatchetMixin.java @@ -1,17 +0,0 @@ -package ambos.vanillafixes.mixin; - -import net.minecraft.item.tool.Hatchet; -import net.minecraft.block.BlockBase; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; - -@Mixin(Hatchet.class) -final class HatchetMixin { - @Shadow - private static BlockBase[] effectiveBlocks = new BlockBase[]{ - BlockBase.WOOD, BlockBase.BOOKSHELF, BlockBase.LOG, BlockBase.CHEST, BlockBase.WORKBENCH, - BlockBase.WOOD_DOOR, BlockBase.WOOD_STAIRS, BlockBase.WOODEN_PRESSURE_PLATE, BlockBase.FENCE, - BlockBase.TRAPDOOR, BlockBase.JUKEBOX, BlockBase.PUMPKIN, BlockBase.JACK_O_LANTERN, BlockBase.STANDING_SIGN, - BlockBase.WALL_SIGN, BlockBase.NOTEBLOCK, BlockBase.LADDER - }; -} diff --git a/src/main/java/ambos/vanillafixes/mixin/LoginThreadMixin.java b/src/main/java/ambos/vanillafixes/mixin/LoginThreadMixin.java @@ -1,15 +0,0 @@ -package ambos.vanillafixes.mixin; - -import net.minecraft.client.Minecraft; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(Minecraft.LoginThread.class) -final class LoginThreadMixin { - @Inject(method = "run", at = @At("HEAD"), cancellable = true, remap = false, require = 0) - private void onRun(CallbackInfo ci) { - ci.cancel(); - } -} -\ No newline at end of file diff --git a/src/main/java/ambos/vanillafixes/mixin/MainMenuMixin.java b/src/main/java/ambos/vanillafixes/mixin/MainMenuMixin.java @@ -1,16 +0,0 @@ -package ambos.vanillafixes.mixin; - -import net.minecraft.client.gui.screen.ScreenBase; -import net.minecraft.client.gui.screen.menu.MainMenu; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(MainMenu.class) -final class MainMenuMixin extends ScreenBase { - @Inject(method = "init", at = @At("HEAD"), require = 0) - private void onInit(CallbackInfo ci) { - minecraft.isApplet = false; - } -} diff --git a/src/main/java/ambos/vanillafixes/mixin/MinecraftMixin.java b/src/main/java/ambos/vanillafixes/mixin/MinecraftMixin.java @@ -1,23 +0,0 @@ -package ambos.vanillafixes.mixin; - -import net.minecraft.client.Minecraft; -import org.lwjgl.LWJGLException; -import org.lwjgl.opengl.Display; -import org.lwjgl.opengl.PixelFormat; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(Minecraft.class) -final class MinecraftMixin { - @Redirect(method = "init", at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/Display;create()V"), remap = false, require = 0) - private void changeDepthBuffer() { - PixelFormat pixelformat = new PixelFormat(); - pixelformat = pixelformat.withDepthBits(24); - try { - Display.create(pixelformat); - } catch (LWJGLException e) { - e.printStackTrace(); - } - } -} diff --git a/src/main/java/ambos/vanillafixes/mixin/PickaxeMixin.java b/src/main/java/ambos/vanillafixes/mixin/PickaxeMixin.java @@ -1,20 +0,0 @@ -package ambos.vanillafixes.mixin; - -import net.minecraft.item.tool.Pickaxe; -import net.minecraft.block.BlockBase; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; - -@Mixin(Pickaxe.class) -final class PickaxeMixin { - @Shadow - private static BlockBase[] effectiveBlocks = new BlockBase[]{ - BlockBase.BRICKS, BlockBase.DOUBLE_STONE_SLAB, BlockBase.STONE_SLAB, - BlockBase.STONE, BlockBase.SANDSTONE, BlockBase.MOSSY_COBBLESTONE, BlockBase.IRON_ORE, BlockBase.IRON_BLOCK, - BlockBase.COAL_ORE, BlockBase.GOLD_BLOCK, BlockBase.GOLD_ORE, BlockBase.DIAMOND_ORE, BlockBase.DIAMOND_BLOCK, - BlockBase.ICE, BlockBase.NETHERRACK, BlockBase.LAPIS_LAZULI_ORE, BlockBase.LAPIS_LAZULI_BLOCK, - BlockBase.REDSTONE_ORE, BlockBase.REDSTONE_ORE_LIT, BlockBase.COBBLESTONE_STAIRS, BlockBase.IRON_DOOR, - BlockBase.COBBLESTONE, BlockBase.FURNACE, BlockBase.FURNACE_LIT, BlockBase.DISPENSER, - BlockBase.STONE_PRESSURE_PLATE, BlockBase.RAIL, BlockBase.DETECTOR_RAIL, BlockBase.GOLDEN_RAIL - }; -} diff --git a/src/main/java/ambos/vanillafixes/mixin/PlayerBaseMixin.java b/src/main/java/ambos/vanillafixes/mixin/PlayerBaseMixin.java @@ -1,30 +0,0 @@ -package ambos.vanillafixes.mixin; - -import ambos.vanillafixes.MinecraftUtil; -import net.minecraft.entity.Living; -import net.minecraft.entity.player.PlayerBase; -import net.minecraft.level.Level; -import org.spongepowered.asm.mixin.Mixin; -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; - -@Mixin(PlayerBase.class) -final class PlayerBaseMixin extends Living { - @Shadow - public String playerCloakUrl; - - @Shadow - public String name; - - private PlayerBaseMixin(Level level) { - super(level); - } - - @Inject(method = "initCloak", at = @At("RETURN"), require = 0) - private void onInitCloak(CallbackInfo ci) { - playerCloakUrl = MinecraftUtil.getPlayerCape(name); - cloakUrl = playerCloakUrl; - } -} diff --git a/src/main/java/ambos/vanillafixes/mixin/RemoteClientInteractionManagerMixin.java b/src/main/java/ambos/vanillafixes/mixin/RemoteClientInteractionManagerMixin.java @@ -1,19 +0,0 @@ -package ambos.vanillafixes.mixin; - -import net.minecraft.client.RemoteClientInteractionManager; -import org.spongepowered.asm.mixin.Mixin; -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; - -@Mixin(RemoteClientInteractionManager.class) -final class RemoteClientInteractionManagerMixin { - @Shadow - private int hitDelay; - - @Inject(method = "method_1721", at = @At("RETURN"), require = 0) - private void changeHitDelay(CallbackInfo ci) { - hitDelay = 0; - } -} diff --git a/src/main/java/ambos/vanillafixes/mixin/RemoteClientPlayerMixin.java b/src/main/java/ambos/vanillafixes/mixin/RemoteClientPlayerMixin.java @@ -1,30 +0,0 @@ -package ambos.vanillafixes.mixin; - -import ambos.vanillafixes.MinecraftUtil; -import net.minecraft.entity.player.PlayerBase; -import net.minecraft.entity.player.RemoteClientPlayer; -import net.minecraft.level.Level; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.Redirect; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(RemoteClientPlayer.class) -abstract class RemoteClientPlayerMixin extends PlayerBase { - private RemoteClientPlayerMixin(Level level) { - super(level); - } - - @Redirect(method = "<init>", at = @At(value = "INVOKE", target = "Ljava/lang/StringBuilder;toString()Ljava/lang/String;"), require = 0) - private String toStr(StringBuilder builder, Level level, String username) { - return MinecraftUtil.getPlayerSkin(username); - } - - @Inject(method = "<init>", at = @At("RETURN"), require = 0) - private void RemoteClientPlayer(Level level, String username, CallbackInfo ci) { - if (username != null && username.length() > 0) { - cloakUrl = MinecraftUtil.getPlayerCape(username); - } - } -} diff --git a/src/main/java/ambos/vanillafixes/mixin/RenderListMixin.java b/src/main/java/ambos/vanillafixes/mixin/RenderListMixin.java @@ -1,6 +1,6 @@ package ambos.vanillafixes.mixin; -import net.minecraft.client.render.RenderList; +import net.minecraft.src.RenderList; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @@ -9,32 +9,33 @@ import org.spongepowered.asm.mixin.injection.ModifyArgs; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.invoke.arg.Args; -@Mixin(RenderList.class) -final class RenderListMixin { - private double field_2483_proxy; - private double field_2484_proxy; - private double field_2485_proxy; +@Mixin(value = RenderList.class, remap = false) +public class RenderListMixin { + private double field_1239_d_store; + private double field_1238_e_store; + private double field_1237_f_store; @Shadow - private int field_2480; + private int field_1242_a; @Shadow - private int field_2481; + private int field_1241_b; @Shadow - private int field_2482; + private int field_1240_c; - @Inject(method = "method_1912", at = @At("RETURN"), require = 0) - private void onMethod_1912(int var1, int var2, int var3, double var4, double var6, double var8, CallbackInfo ci) { - this.field_2483_proxy = var4; - this.field_2484_proxy = var6; - this.field_2485_proxy = var8; + @Inject(method = "func_861_a", at = @At("RETURN"), cancellable = true, require = 0) + private void onFunc_861_a(int i, int j, int k, double d, double d1, double d2, CallbackInfo ci) { + this.field_1239_d_store = d; + this.field_1238_e_store = d1; + this.field_1237_f_store = d2; } - @ModifyArgs(method = "method_1909", at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glTranslatef(FFF)V"), remap = false, require = 0) + @ModifyArgs(method = "func_860_a", at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glTranslatef(FFF)V"), + require = 0) private void changeType(Args args) { - args.set(0, (float) ((double) this.field_2480 - this.field_2483_proxy)); - args.set(1, (float) ((double) this.field_2481 - this.field_2484_proxy)); - args.set(2, (float) ((double) this.field_2482 - this.field_2485_proxy)); + args.set(0, (float) ((double) this.field_1242_a - this.field_1239_d_store)); + args.set(1, (float) ((double) this.field_1241_b - this.field_1238_e_store)); + args.set(2, (float) ((double) this.field_1240_c - this.field_1237_f_store)); } } diff --git a/src/main/java/ambos/vanillafixes/mixin/StairsMixin.java b/src/main/java/ambos/vanillafixes/mixin/StairsMixin.java @@ -1,31 +0,0 @@ -package ambos.vanillafixes.mixin; - -import net.minecraft.level.Level; -import net.minecraft.block.Stairs; -import net.minecraft.block.BlockBase; -import net.minecraft.block.material.Material; -import org.spongepowered.asm.mixin.Mixin; -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.injection.callback.CallbackInfoReturnable; - -import java.util.Random; - -@Mixin(Stairs.class) -final class StairsMixin extends BlockBase { - private StairsMixin(int id, Material material) { - super(id, material); - } - - @Inject(method = "getDropId", at = @At("RETURN"), cancellable = true, require = 0) - private void onGetDropId(int meta, Random rand, CallbackInfoReturnable cir) { - cir.setReturnValue(id); - } - - @Inject(method = "beforeDestroyedByExplosion", at = @At("HEAD"), cancellable = true, require = 0) - private void onBeforeDestroyedByExplosion(Level level, int x, int y, int z, int meta, float dropChance, CallbackInfo ci) { - super.beforeDestroyedByExplosion(level, x, y, z, meta, dropChance); - ci.cancel(); - } -} diff --git a/src/main/java/ambos/vanillafixes/mixin/ThreadCheckHasPaidMixin.java b/src/main/java/ambos/vanillafixes/mixin/ThreadCheckHasPaidMixin.java @@ -0,0 +1,15 @@ +package ambos.vanillafixes.mixin; + +import net.minecraft.src.ThreadCheckHasPaid; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(value = ThreadCheckHasPaid.class, remap = false) +final class ThreadCheckHasPaidMixin { + @Inject(method = "run", at = @At("HEAD"), cancellable = true, require = 0) + private void onRun(CallbackInfo ci) { + ci.cancel(); + } +} diff --git a/src/main/java/ambos/vanillafixes/mixin/ThreadDownloadResourcesMixin.java b/src/main/java/ambos/vanillafixes/mixin/ThreadDownloadResourcesMixin.java @@ -1,15 +1,48 @@ package ambos.vanillafixes.mixin; -import ambos.vanillafixes.MinecraftUtil; -import net.minecraft.client.util.ThreadDownloadResources; +import net.minecraft.src.ThreadDownloadResources; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.Constant; -import org.spongepowered.asm.mixin.injection.ModifyConstant; +import org.spongepowered.asm.mixin.Shadow; -@Mixin(ThreadDownloadResources.class) +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; + +@Mixin(value = ThreadDownloadResources.class, remap = false) final class ThreadDownloadResourcesMixin { - @ModifyConstant(method = "run", constant = @Constant(stringValue = "http://s3.amazonaws.com/MinecraftResources/"), remap = false, require = 0) - private String changeURL(String url) { - return MinecraftUtil.getResources(); + private final static ArrayList<String> RESOURCES_DOMAINS = new ArrayList<>(Arrays.asList( + "http://mcresources.modification-station.net/MinecraftResources/", + "http://resourceproxy.pymcl.net/MinecraftResources/" + )); + + private static boolean isDown(String url) { + try { + URL urlObject = new URL(url); + HttpURLConnection httpURLConnection = (HttpURLConnection) urlObject.openConnection(); + httpURLConnection.connect(); + + int statusCode = httpURLConnection.getResponseCode(); + if (!(statusCode == 404)) { + return false; + } + } catch (Exception ignored) { + + } + + return true; } + + private static String getResources() { + for (String url : RESOURCES_DOMAINS) { + if (!isDown(url)) { + return url; + } + } + + return null; + } + + @Shadow + public static String resourceDomain = getResources(); } diff --git a/src/main/resources/assets/vanillafixes/icon.png b/src/main/resources/assets/vanillafixes/icon.png Binary files differ. diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json @@ -8,17 +8,17 @@ "Ambos" ], "contact": { - "issues": "https://github.com/Amb0s/vanilla-fixes/issues", - "sources": "https://github.com/Amb0s/vanilla-fixes" + "homepage": "https://github.com/Amb0s/vanilla-fixes", + "sources": "https://github.com/Amb0s/vanilla-fixes", + "issues": "https://github.com/Amb0s/vanilla-fixes/issues" }, - "license": "LGPL-3.0-only", + "license": "MIT", "icon": "assets/vanillafixes/icon.png", "environment": "*", "mixins": [ "vanillafixes.mixins.json" ], "depends": { - "fabricloader": "*", - "minecraft": "1.0.0-beta.7.3" + "fabricloader": ">=0.13.3" } } diff --git a/src/main/resources/vanillafixes.mixins.json b/src/main/resources/vanillafixes.mixins.json @@ -1,27 +1,15 @@ { "required": true, + "minVersion": "0.8", "package": "ambos.vanillafixes.mixin", "compatibilityLevel": "JAVA_8", "mixins": [ - "StairsMixin" ], "client": [ - "AbstractClientPlayerMixin", - "BoatMixin", - "ClientPlayNetworkHandlerMixin", - "DeathMixin", - "EntityBaseMixin", - "FenceMixin", - "HatchetMixin", - "LoginThreadMixin", - "MainMenuMixin", - "MinecraftMixin", - "PickaxeMixin", - "PlayerBaseMixin", - "RemoteClientInteractionManagerMixin", - "RemoteClientPlayerMixin", + "GuiGameOverMixin", + "GuiMainMenuMixin", "RenderListMixin", - "StairsMixin", + "ThreadCheckHasPaidMixin", "ThreadDownloadResourcesMixin" ], "injectors": {
