diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..dfe07704 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Auto detect text files and perform LF normalization +* text=auto diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..7a0dc980 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,45 @@ +# This workflow will build a Java project with Gradle +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle + +name: Java CI with Gradle + +on: + push: + paths: + - "src/**" + - ".github/**" + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + + - name: Cache gradle files + uses: actions/cache@v2 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + ./.gradle/loom-cache + key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle', 'gradle.properties', '**/*.accesswidener') }} + restore-keys: | + ${{ runner.os }}-gradle- + - name: Display build number + run: echo Tweak My Client \#$GITHUB_RUN_NUMBER + - name: Set build number in codes + run: sed -i "s/build.undefined/build.$GITHUB_RUN_NUMBER/g" src/main/java/top/hendrixshen/TweakMyClient/Reference.java build.properties + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build + - uses: actions/upload-artifact@v2 + with: + name: build-artifacts + path: build/libs/ diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 00000000..58e9a519 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,40 @@ +name: Publish Release +on: + release: + types: + - published + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + + - name: Cache gradle files + uses: actions/cache@v2 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + ./.gradle/loom-cache + key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle', 'gradle.properties', '**/*.accesswidener') }} + restore-keys: | + ${{ runner.os }}-gradle- + - name: Display build number + run: echo Tweak My Client \#$GITHUB_RUN_NUMBER + - name: Set build number in codes + run: sed -i "s/build.undefined/build.$GITHUB_RUN_NUMBER/g" src/main/java/top/hendrixshen/TweakMyClient/Reference.java build.properties + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build + - name: Upload assets to GitHub + uses: AButler/upload-release-assets@v2.0 + with: + files: 'build/libs/*' + repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..e62ec04c --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ +GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md new file mode 100644 index 00000000..2a6ef893 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# Tweak-My-Client + Add something interesting <3 diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..bdcfc2f1 --- /dev/null +++ b/build.gradle @@ -0,0 +1,132 @@ +buildscript { + repositories { + jcenter() + maven { + name = "Fabric" + url = "https://maven.fabricmc.net/" + } + } + dependencies { + classpath 'net.fabricmc:fabric-loom:0.5-SNAPSHOT' + } +} + +plugins { + id 'fabric-loom' version '0.7-SNAPSHOT' + id 'maven-publish' +} + +repositories { + maven { + url 'https://masa.dy.fi/maven' + } +} + +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 + +ext.configFile = file "build.properties" + +compileJava { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + options.encoding = 'UTF-8' +} + +configFile.withReader { + def prop = new Properties() + prop.load(it) + project.ext.config = new ConfigSlurper().parse prop +} + +dependencies { + minecraft "com.mojang:minecraft:${config.minecraft_version}" + mappings "net.fabricmc:yarn:${config.mappings_version}:v2" + modCompile "net.fabricmc:fabric-loader:${config.fabric_loader_version}" + compile "com.google.code.findbugs:jsr305:3+" + + modCompile "fi.dy.masa.malilib:malilib-fabric-${config.minecraft_version_masa}:${config.malilib_version}" + + // Fabric API. This is technically optional, but you probably want it anyway. + //modCompile "net.fabricmc.fabric-api:fabric-api:" + config.fabric_version + + modCompileOnly "io.github.prospector:modmenu:" + config.mod_menu_version +} + +minecraft { + ext.mod_version = config.mod_version + ext.mod_version_detail = config.mod_version_detail + + mod_version = mod_version + "-" + mod_version_detail +} + +compileJava { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + options.encoding = 'UTF-8' +} + +group = config.group + "." + config.mod_id +archivesBaseName = config.mod_file_name + '-' + config.minecraft_version_out +version = project.minecraft.mod_version_detail + +processResources +{ + // Exclude the GIMP image files + exclude '**/*.xcf' + exclude '**/xcf' + + // this will ensure that this task is redone when the versions change. + //inputs.property "mod_version", project.minecraft.mod_version + //inputs.property "minecraft_version", project.config.minecraft_version + + inputs.property "mod_version", project.minecraft.mod_version + + from(sourceSets.main.resources.srcDirs) { + include "fabric.mod.json" + expand "mod_version": project.minecraft.mod_version + } + + from(sourceSets.main.resources.srcDirs) { + exclude "fabric.mod.json" + } +} + +// 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" +} + + +// 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" +} + +tasks.publish.dependsOn build +publishing { + publications { + mavenJava(MavenPublication) { + // add all the jars that should be included when publishing to maven + artifact(jar) { + builtBy remapJar + } + artifact(sourcesJar) { + builtBy remapSourcesJar + } + } + } + + repositories { + } +} + diff --git a/build.properties b/build.properties new file mode 100644 index 00000000..539f022a --- /dev/null +++ b/build.properties @@ -0,0 +1,22 @@ +# Thu Jan 14 08:33:00 EET 2016 +group = top.hendrixshen +mod_id = tweak-my-client +mod_name = Tweak My Client +author = Hendrix_Shen +mod_file_name = TweakMyClient-fabric + +# Current mod version +mod_version_detail = 1.0.0+build.undefined +mod_version = 1.0.0 + +# Required malilib version +malilib_version = 0.10.0-dev.21+arne.1 + +# Minecraft, Fabric and mappings versions +minecraft_version_masa = 1.16.4 +minecraft_version_out = 1.16.5 +minecraft_version = 1.16.5 +mappings_version = 1.16.5+build.8 + +fabric_loader_version = 0.11.3 +mod_menu_version = 1.14.6+build.31 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..29953ea1 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..beda899f --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Aug 22 17:36:22 EDT 2016 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..cccdd3d5 --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..f9553162 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..5b60df3d --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + jcenter() + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/top/hendrixshen/TweakMyClient/Reference.java b/src/main/java/top/hendrixshen/TweakMyClient/Reference.java new file mode 100644 index 00000000..3fd6288d --- /dev/null +++ b/src/main/java/top/hendrixshen/TweakMyClient/Reference.java @@ -0,0 +1,12 @@ +package top.hendrixshen.TweakMyClient; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class Reference +{ + public static final String MOD_ID = "tweakmyclient"; + public static final String MOD_NAME = "TweakMyClient"; + public static final String MOD_VERSION = "1.0.0-build.undefined"; + public static final Logger LOGGER = LogManager.getLogger(MOD_ID); +} diff --git a/src/main/java/top/hendrixshen/TweakMyClient/TweakMyClient.java b/src/main/java/top/hendrixshen/TweakMyClient/TweakMyClient.java new file mode 100644 index 00000000..23baa448 --- /dev/null +++ b/src/main/java/top/hendrixshen/TweakMyClient/TweakMyClient.java @@ -0,0 +1,20 @@ +package top.hendrixshen.TweakMyClient; + +import fi.dy.masa.malilib.config.ConfigManager; +import fi.dy.masa.malilib.event.InputEventHandler; +import net.fabricmc.api.ModInitializer; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import top.hendrixshen.TweakMyClient.config.Configs; +import top.hendrixshen.TweakMyClient.event.InputHandler; + +public class TweakMyClient implements ModInitializer { + public static Logger LOGGER; + @Override + public void onInitialize() { + ConfigManager.getInstance().registerConfigHandler(Reference.MOD_ID, new Configs()); + LOGGER = Reference.LOGGER; + InputEventHandler.getKeybindManager().registerKeybindProvider(InputHandler.getInstance()); + LOGGER.info(Reference.MOD_NAME + "-" + Reference.MOD_VERSION + " initialized."); + } +} diff --git a/src/main/java/top/hendrixshen/TweakMyClient/compat/modmenu/ModMenuApiImpl.java b/src/main/java/top/hendrixshen/TweakMyClient/compat/modmenu/ModMenuApiImpl.java new file mode 100644 index 00000000..f08641d5 --- /dev/null +++ b/src/main/java/top/hendrixshen/TweakMyClient/compat/modmenu/ModMenuApiImpl.java @@ -0,0 +1,17 @@ +package top.hendrixshen.TweakMyClient.compat.modmenu; + +import io.github.prospector.modmenu.api.ConfigScreenFactory; +import io.github.prospector.modmenu.api.ModMenuApi; +import top.hendrixshen.TweakMyClient.gui.GuiConfigs; + +public class ModMenuApiImpl implements ModMenuApi { + @Override + public ConfigScreenFactory getModConfigScreenFactory() { + + return (screen) -> { + GuiConfigs gui = new GuiConfigs(); + gui.setParent(screen); + return gui; + }; + } +} diff --git a/src/main/java/top/hendrixshen/TweakMyClient/config/Configs.java b/src/main/java/top/hendrixshen/TweakMyClient/config/Configs.java new file mode 100644 index 00000000..3d448d79 --- /dev/null +++ b/src/main/java/top/hendrixshen/TweakMyClient/config/Configs.java @@ -0,0 +1,99 @@ +package top.hendrixshen.TweakMyClient.config; + +import com.google.common.collect.ImmutableList; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import fi.dy.masa.malilib.config.ConfigUtils; +import fi.dy.masa.malilib.config.IConfigBase; +import fi.dy.masa.malilib.config.IConfigHandler; +import fi.dy.masa.malilib.config.options.ConfigBooleanHotkeyed; +import fi.dy.masa.malilib.config.options.ConfigHotkey; +import fi.dy.masa.malilib.util.FileUtils; +import fi.dy.masa.malilib.util.JsonUtils; +import top.hendrixshen.TweakMyClient.Reference; +import top.hendrixshen.TweakMyClient.gui.GuiConfigs; + +import java.io.File; + +public class Configs implements IConfigHandler { + private static final String CONFIG_FILE_NAME = Reference.MOD_ID + ".json"; + public static class Generic { + private static final String PREFIX = String.format("%s.config.generic", Reference.MOD_ID); + public static final ConfigHotkey OPEN_CONFIG_GUI = new TranslatableConfigHotkey(PREFIX, "openConfigGui", "T,C"); + public static final ImmutableList OPTIONS = ImmutableList.of( + OPEN_CONFIG_GUI + ); + + public static final ImmutableList HOTKEYS = ImmutableList.of( + OPEN_CONFIG_GUI + ); + + static { + OPEN_CONFIG_GUI.getKeybind().setCallback((keyAction, iKeybind) -> { + GuiConfigs.openGui(new GuiConfigs()); + return true; + }); + } + } + + + public static class Disable { + private static final String PREFIX = String.format("%s.config.disable_toggle", Reference.MOD_ID); + public static final ConfigBooleanHotkeyed DISABLE_CLIENT_ENTITY_TNT_UPDATES = new TranslatableConfigBooleanHotkeyed(PREFIX, "disableClientEntityTNTUpdates", false, ""); + public static final ConfigBooleanHotkeyed DISABLE_CLIENT_ENTITY_WITHER_UPDATES = new TranslatableConfigBooleanHotkeyed(PREFIX, "disableClientEntityWitherUpdates", false, ""); + public static final ConfigBooleanHotkeyed DISABLE_CLIENT_ENTITY_ZOMBIE_VILLAGER_UPDATES = new TranslatableConfigBooleanHotkeyed(PREFIX, "disableClientEntityZombieVillagerUpdates", false, ""); + public static final ConfigBooleanHotkeyed DISABLE_ENTITY_TNT_RENDERING = new TranslatableConfigBooleanHotkeyed(PREFIX, "disableEntityTNTRendering", false, ""); + public static final ConfigBooleanHotkeyed DISABLE_ENTITY_WITHER_RENDERING = new TranslatableConfigBooleanHotkeyed(PREFIX, "disableEntityWitherRendering", false, ""); + public static final ConfigBooleanHotkeyed DISABLE_ENTITY_ZOMBIE_VILLAGER_RENDERING = new TranslatableConfigBooleanHotkeyed(PREFIX, "disableEntityZombieVillagerRendering", false, ""); + public static final ConfigBooleanHotkeyed DISABLE_RENDER_FOG_LAVA = new TranslatableConfigBooleanHotkeyed(PREFIX, "disableRenderFogLava", false, ""); + public static final ConfigBooleanHotkeyed DISABLE_RENDER_OVERLAY_FIRE = new TranslatableConfigBooleanHotkeyed(PREFIX, "disableRenderOverlayFire", false, ""); + public static final ConfigBooleanHotkeyed DISABLE_SCOREBOARD_RENDERING = new TranslatableConfigBooleanHotkeyed(PREFIX, "disableScoreboardRendering", false, ""); + + public static final ImmutableList OPTIONS = ImmutableList.of( + DISABLE_CLIENT_ENTITY_TNT_UPDATES, + DISABLE_CLIENT_ENTITY_WITHER_UPDATES, + DISABLE_CLIENT_ENTITY_ZOMBIE_VILLAGER_UPDATES, + DISABLE_ENTITY_TNT_RENDERING, + DISABLE_ENTITY_ZOMBIE_VILLAGER_RENDERING, + DISABLE_ENTITY_WITHER_RENDERING, + //DISABLE_RENDER_FOG_LAVA, + DISABLE_RENDER_OVERLAY_FIRE, + DISABLE_SCOREBOARD_RENDERING + ); + } + + public static void loadFromFile() { + File configFile = new File(FileUtils.getConfigDirectory(), CONFIG_FILE_NAME); + + if (configFile.exists() && configFile.isFile() && configFile.canRead()) { + JsonElement element = JsonUtils.parseJsonFile(configFile); + + if (element != null && element.isJsonObject()) { + JsonObject root = element.getAsJsonObject(); + ConfigUtils.readConfigBase(root, "Generic", Generic.OPTIONS); + ConfigUtils.readHotkeyToggleOptions(root, "DisableHotkey", "Disable", Disable.OPTIONS); + } + } + } + + public static void saveToFile() { + File dir = FileUtils.getConfigDirectory(); + + if ((dir.exists() && dir.isDirectory()) || dir.mkdirs()) { + JsonObject root = new JsonObject(); + ConfigUtils.writeConfigBase(root, "Generic", Generic.OPTIONS); + ConfigUtils.writeHotkeyToggleOptions(root, "DisableHotkey", "Disable", Disable.OPTIONS); + JsonUtils.writeJsonToFile(root, new File(dir, CONFIG_FILE_NAME)); + } + } + + @Override + public void load() { + loadFromFile(); + } + + @Override + public void save() { + saveToFile(); + } +} diff --git a/src/main/java/top/hendrixshen/TweakMyClient/config/TranslatableConfigBoolean.java b/src/main/java/top/hendrixshen/TweakMyClient/config/TranslatableConfigBoolean.java new file mode 100644 index 00000000..603ad0e3 --- /dev/null +++ b/src/main/java/top/hendrixshen/TweakMyClient/config/TranslatableConfigBoolean.java @@ -0,0 +1,28 @@ +package top.hendrixshen.TweakMyClient.config; + +import fi.dy.masa.malilib.config.options.ConfigBoolean; +import fi.dy.masa.malilib.util.StringUtils; + +public class TranslatableConfigBoolean extends ConfigBoolean { + private final String guiDisplayName; + + public TranslatableConfigBoolean(String prefix, String name, boolean defaultValue) { + super(name, defaultValue, String.format("%s.%s.comment", prefix, name), + String.format("%s.%s.pretty_name", prefix, name)); + this.guiDisplayName = String.format("%s.%s.name", prefix, name); + } + + @Override + public String getPrettyName() { + String ret = super.getPrettyName(); + if (ret.contains("pretty_name")) { + ret = StringUtils.splitCamelCase(this.getConfigGuiDisplayName()); + } + return ret; + } + + @Override + public String getConfigGuiDisplayName() { + return StringUtils.translate(this.guiDisplayName); + } +} \ No newline at end of file diff --git a/src/main/java/top/hendrixshen/TweakMyClient/config/TranslatableConfigBooleanHotkeyed.java b/src/main/java/top/hendrixshen/TweakMyClient/config/TranslatableConfigBooleanHotkeyed.java new file mode 100644 index 00000000..ca0fcfdb --- /dev/null +++ b/src/main/java/top/hendrixshen/TweakMyClient/config/TranslatableConfigBooleanHotkeyed.java @@ -0,0 +1,35 @@ +package top.hendrixshen.TweakMyClient.config; + +import fi.dy.masa.malilib.config.options.ConfigBooleanHotkeyed; +import fi.dy.masa.malilib.hotkeys.KeybindSettings; +import fi.dy.masa.malilib.util.StringUtils; + +public class TranslatableConfigBooleanHotkeyed extends ConfigBooleanHotkeyed { + private final String guiDisplayName; + + public TranslatableConfigBooleanHotkeyed(String prefix, String name, boolean defaultValue, String defaultHotkey) { + super(name, defaultValue, defaultHotkey, String.format("%s.%s.comment", prefix, name), + String.format("%s.%s.pretty_name", prefix, name)); + this.guiDisplayName = String.format("%s.%s.name", prefix, name); + } + + public TranslatableConfigBooleanHotkeyed(String prefix, String name, boolean defaultValue, String defaultHotkey, KeybindSettings settings) { + super(name, defaultValue, defaultHotkey, settings, String.format("%s.%s.comment", prefix, name), + String.format("%s.%s.pretty_name", prefix, name)); + this.guiDisplayName = String.format("%s.%s.name", prefix, name); + } + + @Override + public String getPrettyName() { + String ret = super.getPrettyName(); + if (ret.contains("pretty_name")) { + ret = StringUtils.splitCamelCase(this.getConfigGuiDisplayName()); + } + return ret; + } + + @Override + public String getConfigGuiDisplayName() { + return StringUtils.translate(this.guiDisplayName); + } +} \ No newline at end of file diff --git a/src/main/java/top/hendrixshen/TweakMyClient/config/TranslatableConfigHotkey.java b/src/main/java/top/hendrixshen/TweakMyClient/config/TranslatableConfigHotkey.java new file mode 100644 index 00000000..181bad2e --- /dev/null +++ b/src/main/java/top/hendrixshen/TweakMyClient/config/TranslatableConfigHotkey.java @@ -0,0 +1,37 @@ +package top.hendrixshen.TweakMyClient.config; + +import fi.dy.masa.malilib.config.options.ConfigHotkey; +import fi.dy.masa.malilib.hotkeys.KeybindSettings; +import fi.dy.masa.malilib.util.StringUtils; + +public class TranslatableConfigHotkey extends ConfigHotkey { + private final String guiDisplayName; + + public TranslatableConfigHotkey(String prefix, String name, String defaultStorageString) { + super(name, defaultStorageString, String.format("%s.%s.comment", prefix, name), + String.format("%s.%s.pretty_name", prefix, name)); + this.guiDisplayName = String.format("%s.%s.name", prefix, name); + + } + + public TranslatableConfigHotkey(String prefix, String name, String defaultStorageString, KeybindSettings settings) { + super(name, defaultStorageString, settings, String.format("%s.%s.comment", prefix, name), + String.format("%s.%s.pretty_name", prefix, name)); + this.guiDisplayName = String.format("%s.%s.name", prefix, name); + } + + + @Override + public String getPrettyName() { + String ret = super.getPrettyName(); + if (ret.contains("pretty_name")) { + ret = StringUtils.splitCamelCase(this.getConfigGuiDisplayName()); + } + return ret; + } + + @Override + public String getConfigGuiDisplayName() { + return StringUtils.translate(this.guiDisplayName); + } +} diff --git a/src/main/java/top/hendrixshen/TweakMyClient/config/TranslatableConfigStringList.java b/src/main/java/top/hendrixshen/TweakMyClient/config/TranslatableConfigStringList.java new file mode 100644 index 00000000..f5d4aa45 --- /dev/null +++ b/src/main/java/top/hendrixshen/TweakMyClient/config/TranslatableConfigStringList.java @@ -0,0 +1,19 @@ +package top.hendrixshen.TweakMyClient.config; + +import com.google.common.collect.ImmutableList; +import fi.dy.masa.malilib.config.options.ConfigStringList; +import fi.dy.masa.malilib.util.StringUtils; + +public class TranslatableConfigStringList extends ConfigStringList { + private final String guiDisplayName; + + public TranslatableConfigStringList(String prefix, String name, ImmutableList defaultValue) { + super(name, defaultValue, String.format("%s.%s.comment", prefix, name)); + this.guiDisplayName = String.format("%s.%s.name", prefix, name); + } + + @Override + public String getConfigGuiDisplayName() { + return StringUtils.translate(this.guiDisplayName); + } +} diff --git a/src/main/java/top/hendrixshen/TweakMyClient/event/InputHandler.java b/src/main/java/top/hendrixshen/TweakMyClient/event/InputHandler.java new file mode 100644 index 00000000..efa9f76a --- /dev/null +++ b/src/main/java/top/hendrixshen/TweakMyClient/event/InputHandler.java @@ -0,0 +1,28 @@ +package top.hendrixshen.TweakMyClient.event; + +import fi.dy.masa.malilib.config.options.ConfigHotkey; +import fi.dy.masa.malilib.hotkeys.IHotkey; +import fi.dy.masa.malilib.hotkeys.IKeybindManager; +import fi.dy.masa.malilib.hotkeys.IKeybindProvider; +import top.hendrixshen.TweakMyClient.config.Configs; + +public class InputHandler implements IKeybindProvider { + private static final InputHandler INSTANCE = new InputHandler(); + + private InputHandler() { + } + + public static InputHandler getInstance() { + return INSTANCE; + } + + @Override + public void addKeysToMap(IKeybindManager manager) { + for (ConfigHotkey configHotkey : Configs.Generic.HOTKEYS) manager.addKeybindToMap(configHotkey.getKeybind()); + for (IHotkey configHotkey : Configs.Disable.OPTIONS) manager.addKeybindToMap(configHotkey.getKeybind()); + } + + @Override + public void addHotkeys(IKeybindManager manager) { + } +} \ No newline at end of file diff --git a/src/main/java/top/hendrixshen/TweakMyClient/gui/GuiConfigs.java b/src/main/java/top/hendrixshen/TweakMyClient/gui/GuiConfigs.java new file mode 100644 index 00000000..03e286c2 --- /dev/null +++ b/src/main/java/top/hendrixshen/TweakMyClient/gui/GuiConfigs.java @@ -0,0 +1,137 @@ +package top.hendrixshen.TweakMyClient.gui; + +import com.google.common.collect.ImmutableList; +import fi.dy.masa.malilib.config.ConfigType; +import fi.dy.masa.malilib.config.ConfigUtils; +import fi.dy.masa.malilib.config.IConfigBase; +import fi.dy.masa.malilib.gui.GuiConfigsBase; +import fi.dy.masa.malilib.gui.button.ButtonBase; +import fi.dy.masa.malilib.gui.button.ButtonGeneric; +import fi.dy.masa.malilib.gui.button.IButtonActionListener; +import fi.dy.masa.malilib.util.StringUtils; +import top.hendrixshen.TweakMyClient.Reference; +import top.hendrixshen.TweakMyClient.config.Configs; + +import java.util.Collections; +import java.util.List; + +public class GuiConfigs extends GuiConfigsBase +{ + private static ConfigGuiTab tab = ConfigGuiTab.DISABLE_TOGGLES; + + public GuiConfigs() + { + super(10, 50, Reference.MOD_ID, null, String.format("%s.gui.title.configs", Reference.MOD_ID)); + } + + @Override + public void initGui() + { + super.initGui(); + this.clearOptions(); + + int x = 10; + int y = 26; + + for (ConfigGuiTab tab : ConfigGuiTab.values()) + { + x += this.createButton(x, y, -1, tab); + } + } + + private int createButton(int x, int y, int width, ConfigGuiTab tab) + { + ButtonGeneric button = new ButtonGeneric(x, y, width, 20, tab.getDisplayName()); + button.setEnabled(GuiConfigs.tab != tab); + this.addButton(button, new GuiConfigs.ButtonListener(tab, this)); + + return button.getWidth() + 2; + } + + @Override + protected int getConfigWidth() + { + ConfigGuiTab tab = GuiConfigs.tab; + + if (tab == ConfigGuiTab.GENERIC) + { + return 120; + } + else if (tab == ConfigGuiTab.DISABLE_TOGGLES) + { + return 80; + } + + return super.getConfigWidth(); + } + + @Override + protected boolean useKeybindSearch() + { + return GuiConfigs.tab == ConfigGuiTab.DISABLE_HOTKEYS; + } + + @Override + public List getConfigs() + { + List configs; + ConfigGuiTab tab = GuiConfigs.tab; + + if (tab == ConfigGuiTab.GENERIC) + { + configs = Configs.Generic.OPTIONS; + } + else if (tab == ConfigGuiTab.DISABLE_TOGGLES) + { + configs = ConfigUtils.createConfigWrapperForType(ConfigType.BOOLEAN, ImmutableList.copyOf(Configs.Disable.OPTIONS)); + } + else if (tab == ConfigGuiTab.DISABLE_HOTKEYS) + { + configs = ConfigUtils.createConfigWrapperForType(ConfigType.HOTKEY, ImmutableList.copyOf(Configs.Disable.OPTIONS)); + } + else + { + return Collections.emptyList(); + } + + return ConfigOptionWrapper.createFor(configs); + } + + private static class ButtonListener implements IButtonActionListener + { + private final GuiConfigs parent; + private final ConfigGuiTab tab; + + public ButtonListener(ConfigGuiTab tab, GuiConfigs parent) + { + this.tab = tab; + this.parent = parent; + } + + @Override + public void actionPerformedWithButton(ButtonBase button, int mouseButton) + { + GuiConfigs.tab = this.tab; + this.parent.reCreateListWidget(); // apply the new config width + this.parent.getListWidget().resetScrollbarPosition(); + this.parent.initGui(); + } + } + + public enum ConfigGuiTab + { + GENERIC ("generic"), + DISABLE_TOGGLES ("disable_toggle"), + DISABLE_HOTKEYS ("disable_hotkeys"); + + private final String name; + + ConfigGuiTab(String name) { + this.name = name; + } + + public String getDisplayName() { + return StringUtils.translate(String.format("%s.gui.button.config_gui.%s", Reference.MOD_ID, name)); + } + } +} diff --git a/src/main/java/top/hendrixshen/TweakMyClient/mixin/IMixinInGameOverlayRenderer.java b/src/main/java/top/hendrixshen/TweakMyClient/mixin/IMixinInGameOverlayRenderer.java new file mode 100644 index 00000000..ff3b6048 --- /dev/null +++ b/src/main/java/top/hendrixshen/TweakMyClient/mixin/IMixinInGameOverlayRenderer.java @@ -0,0 +1,15 @@ +package top.hendrixshen.TweakMyClient.mixin; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.hud.InGameOverlayRenderer; +import net.minecraft.client.util.math.MatrixStack; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + +@Mixin(InGameOverlayRenderer.class) +public interface IMixinInGameOverlayRenderer { + @Invoker("renderFireOverlay") + static void invokeRenderFireOverlay(MinecraftClient minecraftClient, MatrixStack matrixStack) { + throw new AssertionError(); + } +} diff --git a/src/main/java/top/hendrixshen/TweakMyClient/mixin/MixinBackgroundRenderer.java b/src/main/java/top/hendrixshen/TweakMyClient/mixin/MixinBackgroundRenderer.java new file mode 100644 index 00000000..aed3a6a9 --- /dev/null +++ b/src/main/java/top/hendrixshen/TweakMyClient/mixin/MixinBackgroundRenderer.java @@ -0,0 +1,71 @@ +package top.hendrixshen.TweakMyClient.mixin; + +import net.minecraft.client.render.BackgroundRenderer; +import net.minecraft.client.render.Camera; +import net.minecraft.client.world.ClientWorld; +import net.minecraft.tag.FluidTags; +import org.objectweb.asm.*; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.*; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import top.hendrixshen.TweakMyClient.config.Configs; + +import static org.objectweb.asm.Opcodes.*; + +@Mixin(value = BackgroundRenderer.class, priority = 500) +public class MixinBackgroundRenderer { + @Inject( + method = "applyFog", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/fluid/FluidState;isIn(Lnet/minecraft/tag/Tag;)Z" + ), + cancellable = true + ) + private static void adjustLavaFog1(Camera camera, BackgroundRenderer.FogType fogType, float viewDistance, boolean thickFog, CallbackInfo ci) { + if (Configs.Disable.DISABLE_RENDER_FOG_LAVA.getBooleanValue() && camera.getSubmergedFluidState().isIn(FluidTags.LAVA)) { + } + //ci.cancel(); + } + @Inject( + method = "render", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/fluid/FluidState;isIn(Lnet/minecraft/tag/Tag;)Z" + ), + cancellable = true + ) + private static void adjustLavaFog2(Camera camera, float tickDelta, ClientWorld world, int i, float f, CallbackInfo ci) { + if (Configs.Disable.DISABLE_RENDER_FOG_LAVA.getBooleanValue() && camera.getSubmergedFluidState().isIn(FluidTags.LAVA)) { + } + //ci.cancel(); + } + @ModifyVariable( + method = "applyFog", + slice = @Slice( + from = @At( + value = "FIELD", + target = "Lnet/minecraft/entity/effect/StatusEffects;FIRE_RESISTANCE:Lnet/minecraft/entity/effect/StatusEffect;" + ), + to = @At( + value = "FIELD", + target = "Lnet/minecraft/entity/effect/StatusEffects;BLINDNESS:Lnet/minecraft/entity/effect/StatusEffect;" + ) + ), + at = @At( + value = "STORE" + ) + ) + private static float adjustLavaFog3(float x) { + return 100.0F; + } + @ModifyVariable( + method = "applyFog", + at = @At( + value = "STORE" + ) + ) + private static float adjustLavaFog4(float x) { + return x; + } +} diff --git a/src/main/java/top/hendrixshen/TweakMyClient/mixin/MixinClientWorld.java b/src/main/java/top/hendrixshen/TweakMyClient/mixin/MixinClientWorld.java new file mode 100644 index 00000000..7e9c1b81 --- /dev/null +++ b/src/main/java/top/hendrixshen/TweakMyClient/mixin/MixinClientWorld.java @@ -0,0 +1,36 @@ +package top.hendrixshen.TweakMyClient.mixin; + +import net.minecraft.client.world.ClientWorld; +import net.minecraft.entity.Entity; +import net.minecraft.entity.TntEntity; +import net.minecraft.entity.boss.WitherEntity; +import net.minecraft.entity.mob.ZombieVillagerEntity; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; +import top.hendrixshen.TweakMyClient.config.Configs; + +import java.util.function.Consumer; + +@Mixin(ClientWorld.class) +public class MixinClientWorld { + @Redirect( + method = "tickEntities", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/client/world/ClientWorld;tickEntity(Ljava/util/function/Consumer;Lnet/minecraft/entity/Entity;)V" + ) + ) + private void onTickEntity(ClientWorld clientWorld, Consumer tickConsumer, Entity entity) { + if (Configs.Disable.DISABLE_CLIENT_ENTITY_TNT_UPDATES.getBooleanValue() && entity instanceof TntEntity) { + return; + } + if (Configs.Disable.DISABLE_CLIENT_ENTITY_WITHER_UPDATES.getBooleanValue() && entity instanceof WitherEntity) { + return; + } + if (Configs.Disable.DISABLE_CLIENT_ENTITY_ZOMBIE_VILLAGER_UPDATES.getBooleanValue() && entity instanceof ZombieVillagerEntity) { + return; + } + clientWorld.tickEntity(tickConsumer, entity); + } +} diff --git a/src/main/java/top/hendrixshen/TweakMyClient/mixin/MixinEntityRenderDispatcher.java b/src/main/java/top/hendrixshen/TweakMyClient/mixin/MixinEntityRenderDispatcher.java new file mode 100644 index 00000000..0f6e6ef7 --- /dev/null +++ b/src/main/java/top/hendrixshen/TweakMyClient/mixin/MixinEntityRenderDispatcher.java @@ -0,0 +1,41 @@ +package top.hendrixshen.TweakMyClient.mixin; + +import net.minecraft.client.render.Frustum; +import net.minecraft.client.render.entity.EntityRenderDispatcher; +import net.minecraft.entity.Entity; +import net.minecraft.entity.TntEntity; +import net.minecraft.entity.mob.WitchEntity; +import net.minecraft.entity.mob.ZombieEntity; +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; +import top.hendrixshen.TweakMyClient.config.Configs; + +@Mixin(EntityRenderDispatcher.class) +public abstract class MixinEntityRenderDispatcher +{ + @Inject( + method = "shouldRender", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/client/render/entity/EntityRenderDispatcher;getRenderer(Lnet/minecraft/entity/Entity;)Lnet/minecraft/client/render/entity/EntityRenderer;", + shift = At.Shift.BEFORE + ), + + cancellable = true + ) + private void onShouldRender(Entity entity, Frustum frustum, double x, double y, double z, CallbackInfoReturnable cir) + { + if (Configs.Disable.DISABLE_ENTITY_TNT_RENDERING.getBooleanValue() && entity instanceof TntEntity) { + cir.setReturnValue(false); + } + if (Configs.Disable.DISABLE_ENTITY_WITHER_RENDERING.getBooleanValue() && entity instanceof WitchEntity) { + cir.setReturnValue(false); + } + if (Configs.Disable.DISABLE_ENTITY_ZOMBIE_VILLAGER_RENDERING.getBooleanValue() && entity instanceof ZombieEntity) + { + cir.setReturnValue(false); + } + } +} diff --git a/src/main/java/top/hendrixshen/TweakMyClient/mixin/MixinInGameHud.java b/src/main/java/top/hendrixshen/TweakMyClient/mixin/MixinInGameHud.java new file mode 100644 index 00000000..3e76df92 --- /dev/null +++ b/src/main/java/top/hendrixshen/TweakMyClient/mixin/MixinInGameHud.java @@ -0,0 +1,26 @@ +package top.hendrixshen.TweakMyClient.mixin; + +import net.minecraft.client.gui.hud.InGameHud; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.scoreboard.ScoreboardObjective; +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 top.hendrixshen.TweakMyClient.config.Configs; + +@Mixin(InGameHud.class) +public class MixinInGameHud { + @Inject( + method = "renderScoreboardSidebar", + at = @At( + value = "HEAD" + ), + cancellable = true + ) + private void onRenderScoreboardSidebar(MatrixStack matrices, ScoreboardObjective objective, CallbackInfo ci) { + if(Configs.Disable.DISABLE_SCOREBOARD_RENDERING.getBooleanValue()) { + ci.cancel(); + } + } +} diff --git a/src/main/java/top/hendrixshen/TweakMyClient/mixin/MixinInGameOverlayRenderer.java b/src/main/java/top/hendrixshen/TweakMyClient/mixin/MixinInGameOverlayRenderer.java new file mode 100644 index 00000000..10ba616b --- /dev/null +++ b/src/main/java/top/hendrixshen/TweakMyClient/mixin/MixinInGameOverlayRenderer.java @@ -0,0 +1,25 @@ +package top.hendrixshen.TweakMyClient.mixin; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.hud.InGameOverlayRenderer; +import net.minecraft.client.util.math.MatrixStack; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; +import top.hendrixshen.TweakMyClient.config.Configs; + +@Mixin(InGameOverlayRenderer.class) +public abstract class MixinInGameOverlayRenderer { + @Redirect( + method = "renderOverlays", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/client/gui/hud/InGameOverlayRenderer;renderFireOverlay(Lnet/minecraft/client/MinecraftClient;Lnet/minecraft/client/util/math/MatrixStack;)V" + ) + ) + private static void onRenderFireOverlay(MinecraftClient minecraftClient, MatrixStack matrixStack) { + if(!Configs.Disable.DISABLE_RENDER_OVERLAY_FIRE.getBooleanValue()) { + IMixinInGameOverlayRenderer.invokeRenderFireOverlay(minecraftClient, matrixStack); + } + } +} diff --git a/src/main/resources/assets/tweakmyclient/icon.png b/src/main/resources/assets/tweakmyclient/icon.png new file mode 100644 index 00000000..519c98bb Binary files /dev/null and b/src/main/resources/assets/tweakmyclient/icon.png differ diff --git a/src/main/resources/assets/tweakmyclient/lang/en_us.json b/src/main/resources/assets/tweakmyclient/lang/en_us.json new file mode 100644 index 00000000..95ff9b77 --- /dev/null +++ b/src/main/resources/assets/tweakmyclient/lang/en_us.json @@ -0,0 +1,26 @@ +{ + "tweakmyclient.gui.title.configs": "Tweak My Client Config", + "tweakmyclient.gui.button.config_gui.generic": "Generic", + "tweakmyclient.gui.button.config_gui.disable_toggle": "Disable Toggle", + "tweakmyclient.gui.button.config_gui.disable_hotkeys": "Disable Hotkey", + + "tweakmyclient.config.generic.openConfigGui.name": "openConfigGui", + "tweakmyclient.config.generic.openConfigGui.comment": "A hotkey to open the in-game Config GUI", + + "tweakmyclient.config.disable_toggle.disableClientEntityTNTUpdates.name": "disableClientEntityTNTUpdates", + "tweakmyclient.config.disable_toggle.disableClientEntityTNTUpdates.comment": "Disables TNT entity updates on the client.\nMaybe useful for TNT related machines.", + "tweakmyclient.config.disable_toggle.disableClientEntityWitherUpdates.name": "disableClientEntityWitherUpdates", + "tweakmyclient.config.disable_toggle.disableClientEntityWitherUpdates.comment": "Disables wither entity updates on the client.\nMaybe it's useful for fake peace.", + "tweakmyclient.config.disable_toggle.disableClientEntityZombieVillagerUpdates.name": "disableClientEntityZombieVillagerUpdates", + "tweakmyclient.config.disable_toggle.disableClientEntityZombieVillagerUpdates.comment": "Disables zombie villager entity updates on the client.\nMaybe it's useful for fake peace.", + "tweakmyclient.config.disable_toggle.disableEntityTNTRendering.name": "disableEntityTNTRendering", + "tweakmyclient.config.disable_toggle.disableEntityTNTRendering.comment": "Disables TNT entity rendering.\nMaybe it's useful for fake peace.", + "tweakmyclient.config.disable_toggle.disableEntityWitherRendering.name": "disableEntityWitherRendering", + "tweakmyclient.config.disable_toggle.disableEntityWitherRendering.comment": "Disables wither entity rendering.\nMaybe it's useful for fake peace.", + "tweakmyclient.config.disable_toggle.disableEntityZombieVillagerRendering.name": "disableEntityZombieVillagerRendering", + "tweakmyclient.config.disable_toggle.disableEntityZombieVillagerRendering.comment": "Disables zombie villager entity rendering.\nMaybe it's useful for fake peace.", + "tweakmyclient.config.disable_toggle.disableRenderOverlayFire.name": "disableRenderOverlayFire", + "tweakmyclient.config.disable_toggle.disableRenderOverlayFire.comment": "Disables fire overlay rendering.\nYou will gain a broader view.", + "tweakmyclient.config.disable_toggle.disableScoreboardRendering.name": "disableScoreboardRendering", + "tweakmyclient.config.disable_toggle.disableScoreboardRendering.comment": "Disables Scoreboard rendering.\nYou will gain a broader view." +} diff --git a/src/main/resources/assets/tweakmyclient/lang/zh_cn.json b/src/main/resources/assets/tweakmyclient/lang/zh_cn.json new file mode 100644 index 00000000..56af8a65 --- /dev/null +++ b/src/main/resources/assets/tweakmyclient/lang/zh_cn.json @@ -0,0 +1,26 @@ +{ + "tweakmyclient.gui.title.configs": "Tweak My Client 设置", + "tweakmyclient.gui.button.config_gui.generic": "全局", + "tweakmyclient.gui.button.config_gui.disable_toggle": "禁用开关", + "tweakmyclient.gui.button.config_gui.disable_hotkeys": "禁用快捷键", + + "tweakmyclient.config.generic.openConfigGui.name": "打开设置界面", + "tweakmyclient.config.generic.openConfigGui.comment": "打开设置界面的快捷键", + + "tweakmyclient.config.disable_toggle.disableClientEntityTNTUpdates.name": "禁用客户端侧TNT运算", + "tweakmyclient.config.disable_toggle.disableClientEntityTNTUpdates.comment": "关闭客户端对TNT实体的运算.\n也许对与TNT有关的机器有帮助.", + "tweakmyclient.config.disable_toggle.disableClientEntityWitherUpdates.name": "禁用客户端侧凋零实体运算", + "tweakmyclient.config.disable_toggle.disableClientEntityWitherUpdates.comment": "关闭客户端对凋零实体的运算.\n也许对伪和平有帮助.", + "tweakmyclient.config.disable_toggle.disableClientEntityZombieVillagerUpdates.name": "禁用客户端侧僵尸村民实体运算", + "tweakmyclient.config.disable_toggle.disableClientEntityZombieVillagerUpdates.comment": "关闭客户端对僵尸村民实体的运算.\n也许对伪和平有帮助.", + "tweakmyclient.config.disable_toggle.disableEntityTNTRendering.name": "禁用TNT实体渲染", + "tweakmyclient.config.disable_toggle.disableEntityTNTRendering.comment": "关闭游戏对TNT实体的渲染.\n也许对与TNT有关的机器有帮助.", + "tweakmyclient.config.disable_toggle.disableEntityWitherRendering.name": "禁用凋零实体渲染", + "tweakmyclient.config.disable_toggle.disableEntityWitherRendering.comment": "关闭游戏对凋零实体的渲染.\n也许对伪和平有帮助.", + "tweakmyclient.config.disable_toggle.disableEntityZombieVillagerRendering.name": "禁用僵尸村民实体渲染", + "tweakmyclient.config.disable_toggle.disableEntityZombieVillagerRendering.comment": "关闭游戏对僵尸村民实体的渲染.\n也许对伪和平有帮助.", + "tweakmyclient.config.disable_toggle.disableRenderOverlayFire.name": "禁用火焰渲染层", + "tweakmyclient.config.disable_toggle.disableRenderOverlayFire.comment": "关闭在玩家实体着火时的第一视角特效.\n你将获得更广阔的视野.", + "tweakmyclient.config.disable_toggle.disableScoreboardRendering.name": "禁用计分板渲染", + "tweakmyclient.config.disable_toggle.disableScoreboardRendering.comment": "关闭游戏对计分板的UI渲染.\n你将获得更广阔的视野." +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 00000000..a26066b5 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,41 @@ +{ + "schemaVersion": 1, + "id": "tweak-my-client", + "name": "TweakMyClient", + "version": "${mod_version}", + "icon": "assets/tweakmyclient/icon.png", + + "description": "Add something interesting <3", + "authors": [ + { + "name": "Hendrix_Shen", + "contact": { + "homepage": "https://github.com/Hendrix-Shen" + } + } + ], + "contact": { + "homepage": "https://github.com/Hendrix-Shen", + "issues": "https://github.com/Hendrix-Shen/Tweak-My-Client/issues", + "sources": "https://github.com/Hendrix-Shen/Tweak-My-Client" + }, + + "license": "GPLv3", + "environment": "client", + "entrypoints": { + "main": [ + "top.hendrixshen.TweakMyClient.TweakMyClient" + ], + "modmenu": [ + "top.hendrixshen.TweakMyClient.compat.modmenu.ModMenuApiImpl" + ] + }, + + "mixins": [ + "mixins.TweakMyClient.json" + ], + + "depends": { + "malilib": ">=0.10.0-dev.21" + } +} diff --git a/src/main/resources/mixins.TweakMyClient.json b/src/main/resources/mixins.TweakMyClient.json new file mode 100644 index 00000000..fd93cf90 --- /dev/null +++ b/src/main/resources/mixins.TweakMyClient.json @@ -0,0 +1,19 @@ +{ + "required": true, + "package": "top.hendrixshen.TweakMyClient.mixin", + "minVersion": "0.7", + "compatibilityLevel": "JAVA_8", + "client": [ + ], + "injectors": { + "defaultRequire": 0 + }, + "mixins": [ + "IMixinInGameOverlayRenderer", + "MixinBackgroundRenderer", + "MixinClientWorld", + "MixinEntityRenderDispatcher", + "MixinInGameHud", + "MixinInGameOverlayRenderer" + ] +}