From 76c723ae8e92e0c585d0c63d5d9c2808f65372bc Mon Sep 17 00:00:00 2001 From: Marton Csutora Date: Sat, 15 Jul 2023 02:38:13 +0200 Subject: [PATCH 01/10] Delete LICENSE --- LICENSE | 674 -------------------------------------------------------- 1 file changed, 674 deletions(-) delete mode 100644 LICENSE diff --git a/LICENSE b/LICENSE deleted file mode 100644 index f288702..0000000 --- a/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - 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 -. From 06e0ef1a10f01608891e67e810506b66d41d4b16 Mon Sep 17 00:00:00 2001 From: Marton Csutora Date: Sat, 15 Jul 2023 02:38:24 +0200 Subject: [PATCH 02/10] Delete README.md --- README.md | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index f223b27..0000000 --- a/README.md +++ /dev/null @@ -1,20 +0,0 @@ -# segmented - - -A mod that splits your hotbar into 3 segments, and removes the need to move your hand across the atlantic ocean every time you want to hotkey to later slots.
-The way it works is instead of using keys 1-9 to select a slot, you first select a segment using 1-3, and then select a slot in that segment using 1-3 again. This makes it possible to quickly navigate the hotbar without ever moving your hand. - -Supports custom, and if you'd like, even different textures for each segment, slot and selector. Finally! Your custom 3D hotbar can have a selector that works well with it! - -Segmented is available for Fabric only. No Forge support is planned, and please don't ask for it or else I'll have to [steal your kneecaps](https://www.youtube.com/watch?v=dQw4w9WgXcQ).
- -*segmented is heavily inspired by a feature of [Inventorio](https://curseforge.com/minecraft/mc-mods/inventorio), go check it out! (yes, now)* - -### Dependencies -- [Fabric API](https://github.com/FabricMC/fabric) - required -- [Cloth Config](https://github.com/shedaniel/ClothConfig/) - required -- [ModMenu](https://github.com/TerraformersMC/ModMenu) - optional, lets you configure the mod at runtime. - -### Mod compat - - [Auto HUD](https://github.com/Crendgrim/AutoHUD) - reveals the hotbar on segment change, and the default selection cancel timer is just shorter than Auto HUD's hide, so it's really satisfying. - - [Raised](https://github.com/yurisuika/Raised) - works perfectly through their ObjectShare feature. From 9c7ae787da3f5610b1211d6e3f0fc214435677dd Mon Sep 17 00:00:00 2001 From: Marton Csutora Date: Sat, 15 Jul 2023 02:44:43 +0200 Subject: [PATCH 03/10] Delete .github/workflows directory --- .github/workflows/build.yml | 39 ------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 1fc365f..0000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,39 +0,0 @@ -# Automatically build the project and run any configured tests for every push -# and submitted pull request. This can help catch issues that only occur on -# certain platforms or Java versions, and provides a first line of defence -# against bad commits. - -name: build -on: [pull_request, push] - -jobs: - build: - strategy: - matrix: - # Use these Java versions - java: [ - 17, # Current Java LTS & minimum supported by Minecraft - ] - # and run on both Linux and Windows - os: [ubuntu-20.04, windows-2022] - runs-on: ${{ matrix.os }} - steps: - - name: checkout repository - uses: actions/checkout@v2 - - name: validate gradle wrapper - uses: gradle/wrapper-validation-action@v1 - - name: setup jdk ${{ matrix.java }} - uses: actions/setup-java@v1 - with: - java-version: ${{ matrix.java }} - - name: make gradle wrapper executable - if: ${{ runner.os != 'Windows' }} - run: chmod +x ./gradlew - - name: build - run: ./gradlew build - - name: capture build artifacts - if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS - uses: actions/upload-artifact@v2 - with: - name: Artifacts - path: build/libs/ From 45ae8862b3389d89cb4720e340fae9ede12ca806 Mon Sep 17 00:00:00 2001 From: Marton Csutora Date: Sat, 15 Jul 2023 02:44:56 +0200 Subject: [PATCH 04/10] Delete remappedSrc/io/csum/segmented directory --- .../io/csum/segmented/SegmentedMod.java | 17 -- .../client/control/SegmentedKeyHandler.java | 39 ----- .../client/gui/SegmentedHotbarRenderer.java | 148 ------------------ .../csum/segmented/client/util/Constants.java | 29 ---- .../segmented/config/SegmentedConfig.java | 36 ----- .../integration/ModMenuIntegration.java | 17 -- .../mixin/client/InGameHudMixin.java | 91 ----------- .../mixin/client/MinecraftClientMixin.java | 51 ------ .../segmented/mixin/client/MouseMixin.java | 28 ---- .../mixin/client/PlayerInventoryMixin.java | 24 --- 10 files changed, 480 deletions(-) delete mode 100644 remappedSrc/io/csum/segmented/SegmentedMod.java delete mode 100644 remappedSrc/io/csum/segmented/client/control/SegmentedKeyHandler.java delete mode 100644 remappedSrc/io/csum/segmented/client/gui/SegmentedHotbarRenderer.java delete mode 100644 remappedSrc/io/csum/segmented/client/util/Constants.java delete mode 100644 remappedSrc/io/csum/segmented/config/SegmentedConfig.java delete mode 100644 remappedSrc/io/csum/segmented/integration/ModMenuIntegration.java delete mode 100644 remappedSrc/io/csum/segmented/mixin/client/InGameHudMixin.java delete mode 100644 remappedSrc/io/csum/segmented/mixin/client/MinecraftClientMixin.java delete mode 100644 remappedSrc/io/csum/segmented/mixin/client/MouseMixin.java delete mode 100644 remappedSrc/io/csum/segmented/mixin/client/PlayerInventoryMixin.java diff --git a/remappedSrc/io/csum/segmented/SegmentedMod.java b/remappedSrc/io/csum/segmented/SegmentedMod.java deleted file mode 100644 index d959431..0000000 --- a/remappedSrc/io/csum/segmented/SegmentedMod.java +++ /dev/null @@ -1,17 +0,0 @@ -package io.csum.segmented; - -import io.csum.segmented.config.SegmentedConfig; -import me.shedaniel.autoconfig.AutoConfig; -import me.shedaniel.autoconfig.serializer.JanksonConfigSerializer; -import net.fabricmc.api.ModInitializer; - -public class SegmentedMod implements ModInitializer { - public static int selectedHotbarSegment = -1; - public static float cancelTimer = 0; - public static int raiseAmount = -2; - - @Override - public void onInitialize() { - AutoConfig.register(SegmentedConfig.class, JanksonConfigSerializer::new); - } -} diff --git a/remappedSrc/io/csum/segmented/client/control/SegmentedKeyHandler.java b/remappedSrc/io/csum/segmented/client/control/SegmentedKeyHandler.java deleted file mode 100644 index 83a70c4..0000000 --- a/remappedSrc/io/csum/segmented/client/control/SegmentedKeyHandler.java +++ /dev/null @@ -1,39 +0,0 @@ -package io.csum.segmented.client.control; - -import io.csum.segmented.SegmentedMod; -import io.csum.segmented.config.SegmentedConfig; -import me.shedaniel.autoconfig.AutoConfig; -import mod.crend.autohud.component.Component; -import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.entity.player.PlayerInventory; - -public class SegmentedKeyHandler { - - private final SegmentedConfig config = AutoConfig.getConfigHolder(SegmentedConfig.class).getConfig(); - public boolean handleSegmentedHotbarSlotSelection(PlayerInventory inventory, int slot) { - - if (!config.enabled) { return false; } - - if (slot > 2) { - inventory.selectedSlot = slot; - SegmentedMod.selectedHotbarSegment = -1; - SegmentedMod.cancelTimer = 0; - } else { - if (SegmentedMod.selectedHotbarSegment == -1) { - SegmentedMod.selectedHotbarSegment = slot; - SegmentedMod.cancelTimer = config.timerreset * 20; - } else { - inventory.selectedSlot = slot + 3 * SegmentedMod.selectedHotbarSegment; - SegmentedMod.selectedHotbarSegment = -1; - SegmentedMod.cancelTimer = 0; - } - } - - // compatibility with autohud - reveal the hotbar even when selecting a segment - if(FabricLoader.getInstance().isModLoaded("autohud")) { - Component.Hotbar.revealCombined(); - } - - return true; - } -} diff --git a/remappedSrc/io/csum/segmented/client/gui/SegmentedHotbarRenderer.java b/remappedSrc/io/csum/segmented/client/gui/SegmentedHotbarRenderer.java deleted file mode 100644 index 9788fd8..0000000 --- a/remappedSrc/io/csum/segmented/client/gui/SegmentedHotbarRenderer.java +++ /dev/null @@ -1,148 +0,0 @@ -package io.csum.segmented.client.gui; - -import com.mojang.blaze3d.systems.RenderSystem; -import io.csum.segmented.SegmentedMod; -import io.csum.segmented.config.SegmentedConfig; -import me.shedaniel.autoconfig.AutoConfig; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.DrawableHelper; -import net.minecraft.client.option.AttackIndicator; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Arm; -import net.minecraft.util.Identifier; -import java.awt.geom.Point2D; - -import static io.csum.segmented.client.util.Constants.*; - -@Environment(EnvType.CLIENT) -public class SegmentedHotbarRenderer extends DrawableHelper { - private final Identifier WIDGETS_TEXTURE = new Identifier("segmented", "textures/gui/widgets.png"); - private final MinecraftClient client = MinecraftClient.getInstance(); - - private final SegmentedConfig config = AutoConfig.getConfigHolder(SegmentedConfig.class).getConfig(); - - public boolean renderSegmentedHotbar(MatrixStack matrices) { - - if (isHidden() || !config.enabled || config.onlyselector) { return false; } - - PlayerEntity player = (PlayerEntity)client.cameraEntity; - if (player == null) { return false; } - PlayerInventory inventory = player.getInventory(); - - // integration with raised - if (FabricLoader.getInstance().getObjectShare().get("raised:hud") instanceof Integer hud) { - SegmentedMod.raiseAmount = hud - 2; - } - - int scaledWidthHalved = client.getWindow().getScaledWidth() / 2; - int scaledHeight = client.getWindow().getScaledHeight(); - - Point2D.Float hotbar = new Point2D.Float(scaledWidthHalved + HOTBAR_OFFSET_FROM_BOTTOM_CENTER.x, - scaledHeight + HOTBAR_OFFSET_FROM_BOTTOM_CENTER.y - SegmentedMod.raiseAmount); - - RenderSystem.setShaderTexture(0, WIDGETS_TEXTURE); - - // draw the hotbar itself - DrawableHelper.drawTexture(matrices, - (int) hotbar.x, - (int) hotbar.y, - (float) HOTBAR_BOUNDING_BOX.x, - (float) HOTBAR_BOUNDING_BOX.y, - HOTBAR_BOUNDING_BOX.width, - HOTBAR_BOUNDING_BOX.height, - TEXTURE_SIZE.width, - TEXTURE_SIZE.height); - - if (SegmentedMod.selectedHotbarSegment == -1) { - // draw slot selection box - DrawableHelper.drawTexture(matrices, - (int) hotbar.x + (inventory.selectedSlot * SLOT_OFFSET) + (HOTBAR_GAP * (inventory.selectedSlot / 3)), - (int) hotbar.y, - (float) SLOT_SELECTOR.x + (inventory.selectedSlot * (SLOT_SELECTOR.width + 1)), - (float) SLOT_SELECTOR.y, - SLOT_SELECTOR.width, - SLOT_SELECTOR.height, - TEXTURE_SIZE.width, - TEXTURE_SIZE.height); - - } else { - // draw segment selection box - drawTexture(matrices, - (int) hotbar.x + (SegmentedMod.selectedHotbarSegment * SEGMENT_OFFSET), - (int) hotbar.y, - (float) SEGMENT_SELECTOR.x + (SegmentedMod.selectedHotbarSegment * (SEGMENT_SELECTOR.width + 1)), - (float) SEGMENT_SELECTOR.y, - SEGMENT_SELECTOR.width, - SEGMENT_SELECTOR.height, - TEXTURE_SIZE.width, - TEXTURE_SIZE.height); - } - - // render offhand on the proper side - if (!player.getOffHandStack().isEmpty()) { - int offHandX = (int) hotbar.x + HOTBAR_BOUNDING_BOX.width - (HOTBAR_GAP - 2); - if (player.getMainArm().getOpposite() == Arm.LEFT) { - offHandX = (int) hotbar.x - OFFHAND_SLOT.width + (HOTBAR_GAP - 2); - } - - drawTexture(matrices, - offHandX, - (int) hotbar.y, - (float) OFFHAND_SLOT.x, - (float) OFFHAND_SLOT.y, - OFFHAND_SLOT.width, - OFFHAND_SLOT.height, - TEXTURE_SIZE.width, - TEXTURE_SIZE.height); - - // render offhand item - ItemStack itemStack = player.getOffHandStack(); - client.getItemRenderer().renderInGuiWithOverrides(itemStack, offHandX + ITEM_INSET, (int) hotbar.y + ITEM_INSET); - client.getItemRenderer().renderGuiItemOverlay(client.textRenderer, itemStack, offHandX + ITEM_INSET, (int) hotbar.y + ITEM_INSET); - } - - // render items - for (int currSlot = 0; currSlot < SLOT_COUNT; currSlot++) { - int x = (int) hotbar.x + ITEM_INSET + (currSlot * SLOT_OFFSET) + (HOTBAR_GAP * (currSlot / 3)); - int y = (int) hotbar.y + ITEM_INSET; - ItemStack itemStack = inventory.getStack(currSlot); - client.getItemRenderer().renderInGuiWithOverrides(itemStack, x, y); - client.getItemRenderer().renderGuiItemOverlay(client.textRenderer, itemStack, x, y); - } - - - // render attack indicator, this part is pretty much equivalent to the game's original code for this except x,y - if (client.options.getAttackIndicator().getValue() == AttackIndicator.HOTBAR) { - float cooldownProgress = player.getAttackCooldownProgress(0.0F); - if (cooldownProgress < 1.0F) { - int y = (int) hotbar.y + (HOTBAR_BOUNDING_BOX.height - 18)/2; - int x = (int) hotbar.x + HOTBAR_BOUNDING_BOX.width + 2; - if (player.getMainArm() == Arm.LEFT) { - x = (int) hotbar.x - 2 - 18; - } - - RenderSystem.setShaderTexture(0, DrawableHelper.GUI_ICONS_TEXTURE); - int dy = (int)(cooldownProgress * 19.0F); - RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - drawTexture(matrices, x, y, 0, 94, 18, 18); - drawTexture(matrices, x, y + 18 - dy, 18, 112 - dy, 18, dy); - } - } - - return true; - } - - public boolean isHidden() { - if (client.interactionManager == null || client.options.hudHidden) { return true; } - - PlayerEntity player = client.player; - return (player == null || !player.isAlive() || player.playerScreenHandler == null); - } - -} \ No newline at end of file diff --git a/remappedSrc/io/csum/segmented/client/util/Constants.java b/remappedSrc/io/csum/segmented/client/util/Constants.java deleted file mode 100644 index 7d4f4cc..0000000 --- a/remappedSrc/io/csum/segmented/client/util/Constants.java +++ /dev/null @@ -1,29 +0,0 @@ -package io.csum.segmented.client.util; - - -import java.awt.*; -import java.awt.geom.Point2D; - -public class Constants { - - public static final Rectangle TEXTURE_SIZE = new Rectangle(256, 128); - - // coordinates of the top left corner of- and sizes of the bounding boxes in the texture - public static final Rectangle HOTBAR_BOUNDING_BOX = new Rectangle(3, 3, 194, 26); - public static final Rectangle SLOT_SELECTOR = new Rectangle(3, 67, 26, 26); - public static final Rectangle SEGMENT_SELECTOR = new Rectangle(3, 35, 66, 26); - public static final Rectangle OFFHAND_SLOT = new Rectangle(198, 3, 26, 26); - - public static final Point2D.Float HOTBAR_OFFSET_FROM_BOTTOM_CENTER = new Point2D.Float(-97f, -26f); - - // the inset of an item sprite in a slot - public static final int ITEM_INSET = 5; - - // segment and slot offset, hotbar gap size on actual hud - public static final int SEGMENT_OFFSET = 64; - public static final int SLOT_OFFSET = 20; - public static final int HOTBAR_GAP = 4; - - public static final int SLOT_COUNT = 9; - -} \ No newline at end of file diff --git a/remappedSrc/io/csum/segmented/config/SegmentedConfig.java b/remappedSrc/io/csum/segmented/config/SegmentedConfig.java deleted file mode 100644 index 0b0c8f0..0000000 --- a/remappedSrc/io/csum/segmented/config/SegmentedConfig.java +++ /dev/null @@ -1,36 +0,0 @@ -package io.csum.segmented.config; - -import me.shedaniel.autoconfig.ConfigData; -import me.shedaniel.autoconfig.annotation.Config; -import me.shedaniel.autoconfig.annotation.ConfigEntry; -import me.shedaniel.cloth.clothconfig.shadowed.blue.endless.jankson.Comment; - -@Config(name = "segmented") -public class SegmentedConfig implements ConfigData { - - @ConfigEntry.Gui.Tooltip - @Comment("Enables or disables the segmented hotbar") - public boolean enabled = true; - - @ConfigEntry.Gui.Tooltip - @Comment("If true, disables the segmentation of the hotbar but keeps the selection mechanics and rendering") - public boolean onlyselector = false; - - @ConfigEntry.Gui.Tooltip - @Comment("Enables or disables the mechanic where scrolling clears the segment selection") - public boolean scrollreset = true; - - @ConfigEntry.Gui.Tooltip - @Comment("Enables or disables the mechanic where using an item clears the segment selection") - public boolean usereset = true; - - @ConfigEntry.Gui.Tooltip - @Comment("Sets the time in seconds after which the segment selection gets cleared, 0 disables this feature") - public float timerreset = 5; - -// this will be used for a mode i want to add later on, -// when it's turned on the textures will be stitched together from the minecraft widgets texture, -// allowing for easier resource pack compatibility. might not be possible to implement this, we'll see. -// public boolean getTextureFromNormalHotbar = false; - -} diff --git a/remappedSrc/io/csum/segmented/integration/ModMenuIntegration.java b/remappedSrc/io/csum/segmented/integration/ModMenuIntegration.java deleted file mode 100644 index ba1b2ca..0000000 --- a/remappedSrc/io/csum/segmented/integration/ModMenuIntegration.java +++ /dev/null @@ -1,17 +0,0 @@ -package io.csum.segmented.integration; - -import com.terraformersmc.modmenu.api.ConfigScreenFactory; -import com.terraformersmc.modmenu.api.ModMenuApi; -import io.csum.segmented.config.SegmentedConfig; -import me.shedaniel.autoconfig.AutoConfig; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; - -@Environment(EnvType.CLIENT) -public class ModMenuIntegration implements ModMenuApi { - - @Override - public ConfigScreenFactory getModConfigScreenFactory() { - return parent -> AutoConfig.getConfigScreen(SegmentedConfig.class, parent).get(); - } -} diff --git a/remappedSrc/io/csum/segmented/mixin/client/InGameHudMixin.java b/remappedSrc/io/csum/segmented/mixin/client/InGameHudMixin.java deleted file mode 100644 index 4d35476..0000000 --- a/remappedSrc/io/csum/segmented/mixin/client/InGameHudMixin.java +++ /dev/null @@ -1,91 +0,0 @@ -package io.csum.segmented.mixin.client; - -import com.mojang.blaze3d.systems.RenderSystem; -import io.csum.segmented.SegmentedMod; -import io.csum.segmented.client.gui.SegmentedHotbarRenderer; -import io.csum.segmented.config.SegmentedConfig; -import me.shedaniel.autoconfig.AutoConfig; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.DrawableHelper; -import net.minecraft.client.gui.hud.InGameHud; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.Identifier; -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 java.awt.geom.Point2D; - -import static io.csum.segmented.client.util.Constants.*; -import static io.csum.segmented.client.util.Constants.TEXTURE_SIZE; - -@Mixin(InGameHud.class) -@Environment(EnvType.CLIENT) -public abstract class InGameHudMixin extends DrawableHelper { - - private final Identifier SEGMENTED_WIDGETS_TEXTURE = new Identifier("segmented", "textures/gui/widgets.png"); - private final MinecraftClient client = MinecraftClient.getInstance(); - private final SegmentedConfig config = AutoConfig.getConfigHolder(SegmentedConfig.class).getConfig(); - - // rewrites the hotbar renderer so that it is segmented, and handles cancelling segment selection on a timer - @Inject(method = "renderHotbar", at = @At(value = "HEAD"), cancellable = true, require = 0) - private void renderSegmentedHotbar(float tickDelta, MatrixStack matrices, CallbackInfo ci) { - if (config.timerreset > 0) { - if (SegmentedMod.cancelTimer > 0) { - SegmentedMod.cancelTimer -= tickDelta; - } else { - SegmentedMod.cancelTimer = 0; - SegmentedMod.selectedHotbarSegment = -1; - } - } - - SegmentedHotbarRenderer segmentedHotbarRenderer = new SegmentedHotbarRenderer(); - if (segmentedHotbarRenderer.renderSegmentedHotbar(matrices)) { - ci.cancel(); - } - } - - // "only selector" mode - @Inject(method = "renderHotbar", at = @At(value = "TAIL"), require = 0) - private void renderSegmentedSelectorOnly(float tickDelta, MatrixStack matrices, CallbackInfo ci) { - if (config.onlyselector) { - - SegmentedHotbarRenderer segmentedHotbarRenderer = new SegmentedHotbarRenderer(); - if (segmentedHotbarRenderer.isHidden() || !config.enabled) { return; } - PlayerEntity player = (PlayerEntity)client.cameraEntity; - if (player == null) { return; } - - // integration with raised - if (FabricLoader.getInstance().getObjectShare().get("raised:hud") instanceof Integer hud) { - SegmentedMod.raiseAmount = hud - 2; - } - - int scaledWidthHalved = client.getWindow().getScaledWidth() / 2; - int scaledHeight = client.getWindow().getScaledHeight(); - Point2D.Float hotbar = new Point2D.Float(scaledWidthHalved - 93, scaledHeight - 24 - (SegmentedMod.raiseAmount + 2)); - - RenderSystem.setShaderTexture(0, SEGMENTED_WIDGETS_TEXTURE); - - // draw segment selection box if needed - if (SegmentedMod.selectedHotbarSegment != -1) { - drawTexture(matrices, - (int) hotbar.x + (SegmentedMod.selectedHotbarSegment * (SEGMENT_OFFSET - HOTBAR_GAP)), - (int) hotbar.y, - (float) SEGMENT_SELECTOR.x + (SegmentedMod.selectedHotbarSegment * (SEGMENT_SELECTOR.width + 1)), - (float) SEGMENT_SELECTOR.y, - SEGMENT_SELECTOR.width, - SEGMENT_SELECTOR.height, - TEXTURE_SIZE.width, - TEXTURE_SIZE.height); - } - } - } - -} - - diff --git a/remappedSrc/io/csum/segmented/mixin/client/MinecraftClientMixin.java b/remappedSrc/io/csum/segmented/mixin/client/MinecraftClientMixin.java deleted file mode 100644 index dd3ff6e..0000000 --- a/remappedSrc/io/csum/segmented/mixin/client/MinecraftClientMixin.java +++ /dev/null @@ -1,51 +0,0 @@ -package io.csum.segmented.mixin.client; - -import io.csum.segmented.client.control.SegmentedKeyHandler; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.hud.InGameHud; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.network.ClientPlayerEntity; -import net.minecraft.client.option.GameOptions; -import net.minecraft.client.option.KeyBinding; -import org.jetbrains.annotations.Nullable; -import org.spongepowered.asm.mixin.Final; -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.Redirect; - -@Mixin(value = MinecraftClient.class, priority = 9999) -@Environment(EnvType.CLIENT) -public abstract class MinecraftClientMixin { - - @Shadow - public ClientPlayerEntity player; - @Shadow @Final - public GameOptions options; - @Shadow @Nullable - public Screen currentScreen; - @Shadow @Final - public InGameHud inGameHud; - - @Redirect(method = "handleInputEvents", - at = @At(value = "INVOKE", - target = "Lnet/minecraft/client/option/KeyBinding;wasPressed()Z", - ordinal = 2)) - private boolean segmentedHandleHotbarSlotSelection(KeyBinding keyBinding) { - - if (!keyBinding.wasPressed()) { return false; } - - if (!player.isCreative() || currentScreen != null || (!options.saveToolbarActivatorKey.isPressed() && !options.loadToolbarActivatorKey.isPressed())) { - SegmentedKeyHandler segmentedKeyHandler = new SegmentedKeyHandler(); - for (int i = 0; i < 9; i++) { - if (keyBinding == options.hotbarKeys[i]) - if (player.isSpectator()) { this.inGameHud.getSpectatorHud().selectSlot(i); return false; } - else - return !segmentedKeyHandler.handleSegmentedHotbarSlotSelection(player.getInventory(), i); - } - } - return true; - } -} diff --git a/remappedSrc/io/csum/segmented/mixin/client/MouseMixin.java b/remappedSrc/io/csum/segmented/mixin/client/MouseMixin.java deleted file mode 100644 index 32dca62..0000000 --- a/remappedSrc/io/csum/segmented/mixin/client/MouseMixin.java +++ /dev/null @@ -1,28 +0,0 @@ -package io.csum.segmented.mixin.client; - -import io.csum.segmented.SegmentedMod; -import io.csum.segmented.config.SegmentedConfig; -import me.shedaniel.autoconfig.AutoConfig; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.Mouse; -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 = Mouse.class, priority = 9999) -@Environment(EnvType.CLIENT) -public abstract class MouseMixin { - - // clears segment selection on item use - @Inject(method = "onMouseButton", - at = @At(value = "INVOKE", - target = "Lnet/minecraft/client/option/KeyBinding;onKeyPressed(Lnet/minecraft/client/util/InputUtil$Key;)V")) - private void segmentedOnKeyPressed(long window, int button, int action, int mods, CallbackInfo ci) { - - SegmentedConfig config = AutoConfig.getConfigHolder(SegmentedConfig.class).getConfig(); - if (config.enabled && config.usereset) { SegmentedMod.selectedHotbarSegment = -1; } - - } -} diff --git a/remappedSrc/io/csum/segmented/mixin/client/PlayerInventoryMixin.java b/remappedSrc/io/csum/segmented/mixin/client/PlayerInventoryMixin.java deleted file mode 100644 index 88d8465..0000000 --- a/remappedSrc/io/csum/segmented/mixin/client/PlayerInventoryMixin.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.csum.segmented.mixin.client; - -import io.csum.segmented.SegmentedMod; -import io.csum.segmented.config.SegmentedConfig; -import me.shedaniel.autoconfig.AutoConfig; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.entity.player.PlayerInventory; -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 = PlayerInventory.class, priority = 9999) -@Environment(EnvType.CLIENT) -public abstract class PlayerInventoryMixin { - - @Inject(method = "scrollInHotbar", - at = @At(value = "HEAD")) - private void segmentedScrollInHotbar(double scrollAmount, CallbackInfo ci) { - SegmentedConfig config = AutoConfig.getConfigHolder(SegmentedConfig.class).getConfig(); - if (config.enabled && config.scrollreset) { SegmentedMod.selectedHotbarSegment = -1; } - } -} From d55895c6b394d2236535768701f5078619fff2f0 Mon Sep 17 00:00:00 2001 From: Marton Csutora Date: Sat, 15 Jul 2023 03:11:57 +0200 Subject: [PATCH 05/10] port to 1.20.1 --- build.gradle | 2 +- gradle.properties | 8 ++++---- src/main/resources/fabric.mod.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 64c7ffe..793bfaf 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" // ModMenu - modApi "com.terraformersmc:modmenu:7.0.1" + modApi "com.terraformersmc:modmenu:7.1.0" // Cloth Config modApi("me.shedaniel.cloth:cloth-config-fabric:11.1.106") { diff --git a/gradle.properties b/gradle.properties index 0cf785e..b1fdc75 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.20 - yarn_mappings=1.20+build.1 + minecraft_version=1.20.1 + yarn_mappings=1.20.1+build.9 loader_version=0.14.21 # Mod Properties - mod_version = 0.3.0-1.20 + mod_version = 0.3.0-1.20.1 maven_group = io.csum archives_base_name = segmented # Dependencies - fabric_version=0.83.0+1.20 + fabric_version=0.85.0+1.20.1 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 076cdbb..3d9bcd8 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -32,7 +32,7 @@ "depends": { "fabricloader": ">=0.14.21", - "minecraft": "~1.20", + "minecraft": "~1.20.1", "fabric": "*", "java": ">=17", "cloth-config2": "*" From 689a0562567990396c186f1d59d2535289794d25 Mon Sep 17 00:00:00 2001 From: Marton Csutora Date: Sat, 15 Jul 2023 03:24:00 +0200 Subject: [PATCH 06/10] fabric->fabric-api --- src/main/resources/fabric.mod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 3d9bcd8..3ac22e4 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -33,7 +33,7 @@ "depends": { "fabricloader": ">=0.14.21", "minecraft": "~1.20.1", - "fabric": "*", + "fabric-api": "*", "java": ">=17", "cloth-config2": "*" }, From d0c883c65ec116789c62bae664178e4472bc995b Mon Sep 17 00:00:00 2001 From: Marton Csutora Date: Sat, 15 Jul 2023 04:50:09 +0200 Subject: [PATCH 07/10] changed icon --- src/main/resources/assets/segmented/icon.png | Bin 4416 -> 1069 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/segmented/icon.png b/src/main/resources/assets/segmented/icon.png index 8433908526cd233ca5101f630d8cefbf40882c7b..1d7ba3110c75d1d32a3a6263e5d54668dc03a5d7 100644 GIT binary patch literal 1069 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 Date: Mon, 25 Nov 2024 20:13:03 -0800 Subject: [PATCH 08/10] update to 1.21.3 --- build.gradle | 8 +-- gradle.properties | 15 ++++-- gradle/wrapper/gradle-wrapper.properties | 4 +- .../client/gui/SegmentedHotbarRenderer.java | 52 +++++++++++++++---- .../mixin/client/InGameHudMixin.java | 15 ++++-- .../segmented/mixin/client/MouseMixin.java | 8 +++ src/main/resources/fabric.mod.json | 6 +-- src/main/resources/segmented.mixins.json | 3 +- 8 files changed, 79 insertions(+), 32 deletions(-) diff --git a/build.gradle b/build.gradle index 793bfaf..044a001 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.3-SNAPSHOT' + id 'fabric-loom' version '1.8-SNAPSHOT' id 'maven-publish' } @@ -42,14 +42,14 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" // ModMenu - modApi "com.terraformersmc:modmenu:7.1.0" + modApi "com.terraformersmc:modmenu:${project.modmenu_version}" // Cloth Config - modApi("me.shedaniel.cloth:cloth-config-fabric:11.1.106") { + modApi("me.shedaniel.cloth:cloth-config-fabric:${project.clothconfig_version}") { exclude(group: "net.fabricmc.fabric-api") } - modCompileOnly("maven.modrinth:autohud:6.1+1.20") + modCompileOnly("maven.modrinth:autohud:${project.autohud_version}") // Uncomment the following line to enable the deprecated Fabric API modules. // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time. diff --git a/gradle.properties b/gradle.properties index b1fdc75..3fd3f85 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,14 +3,19 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.20.1 - yarn_mappings=1.20.1+build.9 - loader_version=0.14.21 + minecraft_version=1.21.3 + yarn_mappings=1.21.3+build.2 + loader_version=0.16.9 + +# Fabric API + fabric_version=0.110.0+1.21.3 # Mod Properties mod_version = 0.3.0-1.20.1 maven_group = io.csum archives_base_name = segmented -# Dependencies - fabric_version=0.85.0+1.20.1 +# mod versions + modmenu_version = 12.0.0-beta.1 + autohud_version = 7.2.9+1.21.2-fabric + clothconfig_version = 16.0.141 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 17a8ddc..00746c1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ +#Mon Nov 25 17:20:04 PST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip -networkTimeout=10000 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/io/csum/segmented/client/gui/SegmentedHotbarRenderer.java b/src/main/java/io/csum/segmented/client/gui/SegmentedHotbarRenderer.java index 1ed9d8c..215f94a 100644 --- a/src/main/java/io/csum/segmented/client/gui/SegmentedHotbarRenderer.java +++ b/src/main/java/io/csum/segmented/client/gui/SegmentedHotbarRenderer.java @@ -10,10 +10,13 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.option.AttackIndicator; import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.render.RenderLayer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; import net.minecraft.util.Arm; +import net.minecraft.util.Hand; import net.minecraft.util.Identifier; import java.awt.geom.Point2D; @@ -21,8 +24,9 @@ @Environment(EnvType.CLIENT) public class SegmentedHotbarRenderer { - private final Identifier WIDGETS_TEXTURE = new Identifier("segmented", "textures/gui/widgets.png"); - private final Identifier VANILLA_ICONS_TEXTURE = new Identifier("minecraft", "textures/gui/icons.png"); + private final Identifier WIDGETS_TEXTURE = Identifier.of("segmented", "textures/gui/widgets.png"); + private final Identifier HOTBAR_ATTACK_INDICATOR_BACKGROUND_TEXTURE = Identifier.of("minecraft", "textures/gui/sprites/hud/hotbar_attack_indicator_background.png"); + private final Identifier HOTBAR_ATTACK_INDICATOR_PROGRESS_TEXTURE = Identifier.of("minecraft", "textures/gui/hotbar_attack_indicator_progress.png"); private final MinecraftClient client = MinecraftClient.getInstance(); private final SegmentedConfig config = AutoConfig.getConfigHolder(SegmentedConfig.class).getConfig(); @@ -47,7 +51,8 @@ public boolean renderSegmentedHotbar(DrawContext context) { scaledHeight + HOTBAR_OFFSET_FROM_BOTTOM_CENTER.y - SegmentedMod.raiseAmount); // draw the hotbar itself - context.drawTexture(WIDGETS_TEXTURE, + context.drawTexture(RenderLayer::getGuiTexturedOverlay, + WIDGETS_TEXTURE, (int) hotbar.x, (int) hotbar.y, (float) HOTBAR_BOUNDING_BOX.x, @@ -59,7 +64,8 @@ public boolean renderSegmentedHotbar(DrawContext context) { if (SegmentedMod.selectedHotbarSegment == -1) { // draw slot selection box - context.drawTexture(WIDGETS_TEXTURE, + context.drawTexture(RenderLayer::getGuiTexturedOverlay, + WIDGETS_TEXTURE, (int) hotbar.x + (inventory.selectedSlot * SLOT_OFFSET) + (HOTBAR_GAP * (inventory.selectedSlot / 3)), (int) hotbar.y, (float) SLOT_SELECTOR.x + (inventory.selectedSlot * (SLOT_SELECTOR.width + 1)), @@ -71,7 +77,8 @@ public boolean renderSegmentedHotbar(DrawContext context) { } else { // draw segment selection box - context.drawTexture(WIDGETS_TEXTURE, + context.drawTexture(RenderLayer::getGuiTexturedOverlay, + WIDGETS_TEXTURE, (int) hotbar.x + (SegmentedMod.selectedHotbarSegment * SEGMENT_OFFSET), (int) hotbar.y, (float) SEGMENT_SELECTOR.x + (SegmentedMod.selectedHotbarSegment * (SEGMENT_SELECTOR.width + 1)), @@ -83,13 +90,14 @@ public boolean renderSegmentedHotbar(DrawContext context) { } // render offhand on the proper side - if (!player.getOffHandStack().isEmpty()) { + if (inventory.offHand.isEmpty()) { int offHandX = (int) hotbar.x + HOTBAR_BOUNDING_BOX.width - (HOTBAR_GAP - 2); if (player.getMainArm().getOpposite() == Arm.LEFT) { offHandX = (int) hotbar.x - OFFHAND_SLOT.width + (HOTBAR_GAP - 2); } - context.drawTexture(WIDGETS_TEXTURE, + context.drawTexture(RenderLayer::getGuiTexturedOverlay, + WIDGETS_TEXTURE, offHandX, (int) hotbar.y, (float) OFFHAND_SLOT.x, @@ -102,7 +110,7 @@ public boolean renderSegmentedHotbar(DrawContext context) { // render offhand item ItemStack itemStack = player.getOffHandStack(); context.drawItem(itemStack, offHandX + ITEM_INSET, (int) hotbar.y + ITEM_INSET); - context.drawItemInSlot(client.textRenderer, itemStack, offHandX + ITEM_INSET, (int) hotbar.y + ITEM_INSET); + context.drawStackOverlay(client.textRenderer, itemStack, offHandX + ITEM_INSET, (int) hotbar.y + ITEM_INSET); } // render items @@ -111,7 +119,7 @@ public boolean renderSegmentedHotbar(DrawContext context) { int y = (int) hotbar.y + ITEM_INSET; ItemStack itemStack = inventory.getStack(currSlot); context.drawItem(itemStack, x, y); - context.drawItemInSlot(client.textRenderer, itemStack, x, y); + context.drawStackOverlay(client.textRenderer, itemStack, x, y); } @@ -127,8 +135,30 @@ public boolean renderSegmentedHotbar(DrawContext context) { } int dy = (int)(cooldownProgress * 19.0F); - context.drawTexture(VANILLA_ICONS_TEXTURE, x, y, 0, 94, 18, 18); - context.drawTexture(VANILLA_ICONS_TEXTURE, x, y + 18 - dy, 18, 112 - dy, 18, dy); + context.drawTexture( + RenderLayer::getGuiTexturedOverlay, + HOTBAR_ATTACK_INDICATOR_BACKGROUND_TEXTURE, + x, + y, + 0, + 0, + 18, + 18, + 18, + 18 + ); + context.drawTexture( + RenderLayer::getGuiTexturedOverlay, + HOTBAR_ATTACK_INDICATOR_PROGRESS_TEXTURE, + x, + y + 18 - dy, + 0, + -dy, + 18, + dy, + 18, + 18 + ); } } RenderSystem.disableBlend(); diff --git a/src/main/java/io/csum/segmented/mixin/client/InGameHudMixin.java b/src/main/java/io/csum/segmented/mixin/client/InGameHudMixin.java index 966b97b..912c4c8 100644 --- a/src/main/java/io/csum/segmented/mixin/client/InGameHudMixin.java +++ b/src/main/java/io/csum/segmented/mixin/client/InGameHudMixin.java @@ -10,9 +10,12 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.hud.InGameHud; +import net.minecraft.client.render.RenderLayer; +import net.minecraft.client.render.RenderTickCounter; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.Identifier; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @@ -26,17 +29,18 @@ @Environment(EnvType.CLIENT) public abstract class InGameHudMixin { - private final Identifier SEGMENTED_WIDGETS_TEXTURE = new Identifier("segmented", "textures/gui/widgets.png"); + @Unique + private final Identifier SEGMENTED_WIDGETS_TEXTURE = Identifier.of("segmented", "textures/gui/widgets.png"); private final MinecraftClient client = MinecraftClient.getInstance(); private final SegmentedConfig config = AutoConfig.getConfigHolder(SegmentedConfig.class).getConfig(); // rewrites the hotbar renderer so that it is segmented, and handles cancelling segment selection on a timer @Inject(method = "renderHotbar", at = @At(value = "HEAD"), cancellable = true, require = 0) - private void renderSegmentedHotbar(float tickDelta, DrawContext context, CallbackInfo ci) { + private void renderSegmentedHotbar(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci) { if (config.timerreset > 0) { if (SegmentedMod.cancelTimer > 0) { - SegmentedMod.cancelTimer -= tickDelta; + SegmentedMod.cancelTimer -= tickCounter.getTickDelta(true); } else { SegmentedMod.cancelTimer = 0; SegmentedMod.selectedHotbarSegment = -1; @@ -51,7 +55,7 @@ private void renderSegmentedHotbar(float tickDelta, DrawContext context, Callbac // "only selector" mode @Inject(method = "renderHotbar", at = @At(value = "TAIL"), require = 0) - private void renderSegmentedSelectorOnly(float tickDelta, DrawContext context, CallbackInfo ci) { + private void renderSegmentedSelectorOnly(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci) { if (config.onlyselector) { SegmentedHotbarRenderer segmentedHotbarRenderer = new SegmentedHotbarRenderer(); @@ -70,7 +74,8 @@ private void renderSegmentedSelectorOnly(float tickDelta, DrawContext context, C // draw segment selection box if needed if (SegmentedMod.selectedHotbarSegment != -1) { - context.drawTexture(SEGMENTED_WIDGETS_TEXTURE, + context.drawTexture(identifier -> RenderLayer.getGuiOverlay(), + SEGMENTED_WIDGETS_TEXTURE, (int) hotbar.x + (SegmentedMod.selectedHotbarSegment * (SEGMENT_OFFSET - HOTBAR_GAP)), (int) hotbar.y, (float) SEGMENT_SELECTOR.x + (SegmentedMod.selectedHotbarSegment * (SEGMENT_SELECTOR.width + 1)), diff --git a/src/main/java/io/csum/segmented/mixin/client/MouseMixin.java b/src/main/java/io/csum/segmented/mixin/client/MouseMixin.java index 32dca62..61fc097 100644 --- a/src/main/java/io/csum/segmented/mixin/client/MouseMixin.java +++ b/src/main/java/io/csum/segmented/mixin/client/MouseMixin.java @@ -25,4 +25,12 @@ private void segmentedOnKeyPressed(long window, int button, int action, int mods if (config.enabled && config.usereset) { SegmentedMod.selectedHotbarSegment = -1; } } + + @Inject(method = "onMouseScroll", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerInventory;setSelectedSlot(I)V")) + private void segmentedOnMouseScroll(long window, double horizontal, double vertical, CallbackInfo ci) { + SegmentedConfig config = AutoConfig.getConfigHolder(SegmentedConfig.class).getConfig(); + if (config.enabled && config.scrollreset) { + SegmentedMod.selectedHotbarSegment = -1; + } + } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 3ac22e4..fb4143b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -31,10 +31,10 @@ ], "depends": { - "fabricloader": ">=0.14.21", - "minecraft": "~1.20.1", + "fabricloader": ">=0.16.9", + "minecraft": "~1.21.3", "fabric-api": "*", - "java": ">=17", + "java": ">=21", "cloth-config2": "*" }, "suggests": { diff --git a/src/main/resources/segmented.mixins.json b/src/main/resources/segmented.mixins.json index 2a1104e..b16ec33 100644 --- a/src/main/resources/segmented.mixins.json +++ b/src/main/resources/segmented.mixins.json @@ -8,8 +8,7 @@ "client": [ "client.InGameHudMixin", "client.MouseMixin", - "client.MinecraftClientMixin", - "client.PlayerInventoryMixin" + "client.MinecraftClientMixin" ], "injectors": { "defaultRequire": 1 From 47da5b466cc480ca51074b52fd44933317173ab8 Mon Sep 17 00:00:00 2001 From: rae Date: Mon, 25 Nov 2024 20:13:45 -0800 Subject: [PATCH 09/10] remove mixin (moved to MouseMixin) --- .../mixin/client/PlayerInventoryMixin.java | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 src/main/java/io/csum/segmented/mixin/client/PlayerInventoryMixin.java diff --git a/src/main/java/io/csum/segmented/mixin/client/PlayerInventoryMixin.java b/src/main/java/io/csum/segmented/mixin/client/PlayerInventoryMixin.java deleted file mode 100644 index 88d8465..0000000 --- a/src/main/java/io/csum/segmented/mixin/client/PlayerInventoryMixin.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.csum.segmented.mixin.client; - -import io.csum.segmented.SegmentedMod; -import io.csum.segmented.config.SegmentedConfig; -import me.shedaniel.autoconfig.AutoConfig; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.entity.player.PlayerInventory; -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 = PlayerInventory.class, priority = 9999) -@Environment(EnvType.CLIENT) -public abstract class PlayerInventoryMixin { - - @Inject(method = "scrollInHotbar", - at = @At(value = "HEAD")) - private void segmentedScrollInHotbar(double scrollAmount, CallbackInfo ci) { - SegmentedConfig config = AutoConfig.getConfigHolder(SegmentedConfig.class).getConfig(); - if (config.enabled && config.scrollreset) { SegmentedMod.selectedHotbarSegment = -1; } - } -} From c4d9e20ed47177da9521c26f2c23cfe3a3bf20b3 Mon Sep 17 00:00:00 2001 From: rae Date: Mon, 25 Nov 2024 20:30:43 -0800 Subject: [PATCH 10/10] add author + up version num --- gradle.properties | 2 +- src/main/resources/fabric.mod.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3fd3f85..fa0eba5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ org.gradle.jvmargs=-Xmx1G fabric_version=0.110.0+1.21.3 # Mod Properties - mod_version = 0.3.0-1.20.1 + mod_version = 0.3.0-1.21.3 maven_group = io.csum archives_base_name = segmented diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index fb4143b..874135d 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -6,7 +6,8 @@ "name": "Segmented", "description": "Makes hotkeying to any slot easy, and looks great while doing it", "authors": [ - "csumpasd" + "csumpasd", + "Tors-0" ], "contact": { "homepage": "https://github.com/csumpasd/segmented",