diff --git a/.gitignore b/.gitignore index 12f86447..03b47f8e 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ run # Files from Forge MDK forge*changelog.txt +*.log diff --git a/CREDITS.txt b/CREDITS.txt deleted file mode 100644 index a70c53d5..00000000 --- a/CREDITS.txt +++ /dev/null @@ -1,65 +0,0 @@ -Minecraft Forge: Credits/Thank You - -Forge is a set of tools and modifications to the Minecraft base game code to assist -mod developers in creating new and exciting content. It has been in development for -several years now, but I would like to take this time thank a few people who have -helped it along it's way. - -First, the people who originally created the Forge projects way back in Minecraft -alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance -of me taking over the project, who knows what Minecraft modding would be today. - -Secondly, someone who has worked with me, and developed some of the core features -that allow modding to be as functional, and as simple as it is, cpw. For developing -FML, which stabelized the client and server modding ecosystem. As well as the base -loading system that allows us to modify Minecraft's code as elegently as possible. - -Mezz, who has stepped up as the issue and pull request manager. Helping to keep me -sane as well as guiding the community into creating better additions to Forge. - -Searge, Bspks, Fesh0r, ProfMobious, and all the rest over on the MCP team {of which -I am a part}. For creating some of the core tools needed to make Minecraft modding -both possible, and as stable as can be. - On that note, here is some specific information of the MCP data we use: - * Minecraft Coder Pack (MCP) * - Forge Mod Loader and Minecraft Forge have permission to distribute and automatically - download components of MCP and distribute MCP data files. This permission is not - transitive and others wishing to redistribute the Minecraft Forge source independently - should seek permission of MCP or remove the MCP data files and request their users - to download MCP separately. - -And lastly, the countless community members who have spent time submitting bug reports, -pull requests, and just helping out the community in general. Thank you. - ---LexManos - -========================================================================= - -This is Forge Mod Loader. - -You can find the source code at all times at https://github.com/MinecraftForge/MinecraftForge/tree/1.12.x/src/main/java/net/minecraftforge/fml - -This minecraft mod is a clean open source implementation of a mod loader for minecraft servers -and minecraft clients. - -The code is authored by cpw. - -It began by partially implementing an API defined by the client side ModLoader, authored by Risugami. -http://www.minecraftforum.net/topic/75440- -This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader. - -It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge. -http://www.minecraftforge.net/ - -Additionally, it contains an implementation of topological sort based on that -published at http://keithschwarz.com/interesting/code/?dir=topological-sort - -It also contains code from the Maven project for performing versioned dependency -resolution. http://maven.apache.org/ - -It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/ -with credit to it's authors. - -Forge Mod Loader downloads components from the Minecraft Coder Pack -(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team. - diff --git a/LICENSE b/LICENSE index f288702d..b3dbff00 100644 --- a/LICENSE +++ b/LICENSE @@ -1,674 +1,22 @@ - 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 -. +This is free and unencumbered software released into the public domain. + +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. + +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index b0cbe2b3..00000000 --- a/LICENSE.txt +++ /dev/null @@ -1,520 +0,0 @@ -Unless noted below, Minecraft Forge, Forge Mod Loader, and all -parts herein are licensed under the terms of the LGPL 2.1 found -here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and -copied below. - -Homepage: http://minecraftforge.net/ - https://github.com/MinecraftForge/MinecraftForge - - -A note on authorship: -All source artifacts are property of their original author, with -the exclusion of the contents of the patches directory and others -copied from it from time to time. Authorship of the contents of -the patches directory is retained by the Minecraft Forge project. -This is because the patches are partially machine generated -artifacts, and are changed heavily due to the way forge works. -Individual attribution within them is impossible. - -Consent: -All contributions to Forge must consent to the release of any -patch content to the Forge project. - -A note on infectivity: -The LGPL is chosen specifically so that projects may depend on Forge -features without being infected with its license. That is the -purpose of the LGPL. Mods and others using this code via ordinary -Java mechanics for referencing libraries are specifically not bound -by Forge's license for the Mod code. - - -=== MCP Data === -This software includes data from the Minecraft Coder Pack (MCP), with kind permission -from them. The license to MCP data is not transitive - distribution of this data by -third parties requires independent licensing from the MCP team. This data is not -redistributable without permission from the MCP team. - -=== Sharing === -I grant permission for some parts of FML to be redistributed outside the terms of the LGPL, for the benefit of -the minecraft modding community. All contributions to these parts should be licensed under the same additional grant. - --- Runtime patcher -- -License is granted to redistribute the runtime patcher code (src/main/java/net/minecraftforge/fml/common/patcher -and subdirectories) under any alternative open source license as classified by the OSI (http://opensource.org/licenses) - --- ASM transformers -- -License is granted to redistribute the ASM transformer code (src/main/java/net/minecraftforge/common/asm/ and subdirectories) -under any alternative open source license as classified by the OSI (http://opensource.org/licenses) - -========================================================================= -This software includes portions from the Apache Maven project at -http://maven.apache.org/ specifically the ComparableVersion.java code. It is -included based on guidelines at -http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html -with notices intact. The only change is a non-functional change of package name. - -This software contains a partial repackaging of javaxdelta, a BSD licensed program for generating -binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/ -authored by genman, heikok, pivot. -The only changes are to replace some Trove collection types with standard Java collections, and repackaged. -========================================================================= - - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS diff --git a/README.md b/README.md index 2194af0a..995652b1 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# skillsapi -Temporary code storage for the skills part of magus. Hardest thing in the entire API, followed by rendering. +# Magus's Skills API +Temporary code storage for the skills API part of Magus. diff --git a/README.txt b/README.txt deleted file mode 100644 index 344bca75..00000000 --- a/README.txt +++ /dev/null @@ -1,46 +0,0 @@ - -Source installation information for modders -------------------------------------------- -This code follows the Minecraft Forge installation methodology. It will apply -some small patches to the vanilla MCP source code, giving you and it access -to some of the data and functions you need to build a successful mod. - -Note also that the patches are built against "un-renamed" MCP source code (aka -SRG Names) - this means that you will not be able to read them directly against -normal code. - -Setup Process: -============================== - -Step 1: Open your command-line and browse to the folder where you extracted the zip file. - -Step 2: You're left with a choice. -If you prefer to use Eclipse: -1. Run the following command: `gradlew genEclipseRuns` (`./gradlew genEclipseRuns` if you are on Mac/Linux) -2. Open Eclipse, Import > Existing Gradle Project > Select Folder - or run `gradlew eclipse` to generate the project. - -If you prefer to use IntelliJ: -1. Open IDEA, and import project. -2. Select your build.gradle file and have it import. -3. Run the following command: `gradlew genIntellijRuns` (`./gradlew genIntellijRuns` if you are on Mac/Linux) -4. Refresh the Gradle Project in IDEA if required. - -If at any point you are missing libraries in your IDE, or you've run into problems you can -run `gradlew --refresh-dependencies` to refresh the local cache. `gradlew clean` to reset everything -{this does not affect your code} and then start the process again. - -Mapping Names: -============================= -By default, the MDK is configured to use the official mapping names from Mojang for methods and fields -in the Minecraft codebase. These names are covered by a specific license. All modders should be aware of this -license, if you do not agree with it you can change your mapping names to other crowdsourced names in your -build.gradle. For the latest license text, refer to the mapping file itself, or the reference copy here: -https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md - -Additional Resources: -========================= -Community Documentation: http://mcforge.readthedocs.io/en/latest/gettingstarted/ -LexManos' Install Video: https://www.youtube.com/watch?v=8VEdtQLuLO0 -Forge Forum: https://forums.minecraftforge.net/ -Forge Discord: https://discord.gg/UvedJ9m \ No newline at end of file diff --git a/build.gradle b/build.gradle index ba28c489..80fce176 100644 --- a/build.gradle +++ b/build.gradle @@ -1,49 +1,70 @@ -buildscript { - repositories { - maven { url = 'https://maven.minecraftforge.net' } - mavenCentral() - } - dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true - } +plugins { + id 'eclipse' + id 'idea' + id 'maven-publish' + id 'net.minecraftforge.gradle' version '[6.0,6.2)' + id 'org.spongepowered.mixin' version '0.7.+' } -apply plugin: 'net.minecraftforge.gradle' -// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. -apply plugin: 'eclipse' -apply plugin: 'maven-publish' +apply plugin: 'org.spongepowered.mixin' +version = mod_version +group = mod_group_id -version = '1.0' -group = 'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = 'modid' +base { + archivesName = mod_id +} -java.toolchain.languageVersion = JavaLanguageVersion.of(8) // Mojang ships Java 8 to end users, so your mod should target Java 8. +// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. +java.toolchain.languageVersion = JavaLanguageVersion.of(17) -println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch')) +println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}" minecraft { - // The mappings can be changed at any time, and must be in the following format. + // The mappings can be changed at any time and must be in the following format. // Channel: Version: - // snapshot YYYYMMDD Snapshot are built nightly. - // stable # Stables are built at the discretion of the MCP team. - // official MCVersion Official field/method names from Mojang mapping files + // official MCVersion Official field/method names from Mojang mapping files + // parchment YYYY.MM.DD-MCVersion Open community-sourced parameter names and javadocs layered on top of official // - // You must be aware of the Mojang license when using the 'official' mappings. + // You must be aware of the Mojang license when using the 'official' or 'parchment' mappings. // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md // - // Use non-default mappings at your own risk. they may not always work. + // Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge + // Additional setup is needed to use their mappings: https://parchmentmc.org/docs/getting-started + // + // Use non-default mappings at your own risk. They may not always work. // Simply re-run your setup task after changing the mappings to update your workspace. - mappings channel: 'official', version: '1.16.5' - // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. - + mappings channel: mapping_channel, version: mapping_version + + // When true, this property will have all Eclipse/IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game. + // In most cases, it is not necessary to enable. + // enableEclipsePrepareRuns = true + // enableIdeaPrepareRuns = true + + // This property allows configuring Gradle's ProcessResources task(s) to run on IDE output locations before launching the game. + // It is REQUIRED to be set to true for this template to function. + // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html + copyIdeResources = true + + // When true, this property will add the folder name of all declared run configurations to generated IDE run configurations. + // The folder name can be set on a run configuration using the "folderName" property. + // By default, the folder name of a run configuration is the name of the Gradle project containing it. + // generateRunFolders = true + + // This property enables access transformers for use in development. + // They will be applied to the Minecraft artifact. + // The access transformer file can be anywhere in the project. + // However, it must be at "META-INF/accesstransformer.cfg" in the final mod jar to be loaded by Forge. + // This default location is a best practice to automatically put the file in the right place in the final jar. + // See https://docs.minecraftforge.net/en/latest/advanced/accesstransformers/ for more information. // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Default run configurations. // These can be tweaked, removed, or duplicated as needed. runs { - client { + // applies to all the run configs below + configureEach { workingDirectory project.file('run') // Recommended logging data for a userdev environment - // The markers can be changed as needed. + // The markers can be added/remove as needed separated by commas. // "SCAN": For mods scan. // "REGISTRIES": For firing of registry events. // "REGISTRYDUMP": For getting the contents of all registries. @@ -54,58 +75,41 @@ minecraft { // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels property 'forge.logging.console.level', 'debug' + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + property 'forge.enabledGameTestNamespaces', mod_id + mods { - examplemod { + "${mod_id}" { source sourceSets.main } } } - server { - workingDirectory project.file('run') - - // Recommended logging data for a userdev environment - // The markers can be changed as needed. - // "SCAN": For mods scan. - // "REGISTRIES": For firing of registry events. - // "REGISTRYDUMP": For getting the contents of all registries. - property 'forge.logging.markers', 'REGISTRIES' + client { + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + property 'forge.enabledGameTestNamespaces', mod_id + // Set custom username + args "--username", "Dev####" + } - // Recommended logging level for the console - // You can set various levels here. - // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels - property 'forge.logging.console.level', 'debug' + server { + property 'forge.enabledGameTestNamespaces', mod_id + args '--nogui' + } - mods { - examplemod { - source sourceSets.main - } - } + // This run config launches GameTestServer and runs all registered gametests, then exits. + // By default, the server will crash when no gametests are provided. + // The gametest system is also enabled by default for other run configs under the /test command. + gameTestServer { + property 'forge.enabledGameTestNamespaces', mod_id } data { - workingDirectory project.file('run') - - // Recommended logging data for a userdev environment - // The markers can be changed as needed. - // "SCAN": For mods scan. - // "REGISTRIES": For firing of registry events. - // "REGISTRYDUMP": For getting the contents of all registries. - property 'forge.logging.markers', 'REGISTRIES' - - // Recommended logging level for the console - // You can set various levels here. - // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels - property 'forge.logging.console.level', 'debug' + // example of overriding the workingDirectory set in configureEach above +// workingDirectory project.file('run-data') // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. - args '--mod', 'examplemod', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') - - mods { - examplemod { - source sourceSets.main - } - } + args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') } } } @@ -113,62 +117,109 @@ minecraft { // Include resources generated by data generators. sourceSets.main.resources { srcDir 'src/generated/resources' } -dependencies { - // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed - // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. - // The userdev artifact is a special name and will get all sorts of transformations applied to it. - minecraft 'net.minecraftforge:forge:1.16.5-36.2.20' - - // You may put jars on which you depend on in ./libs or you may define them like so.. - // compile "some.group:artifact:version:classifier" - // compile "some.group:artifact:version" - - // Real examples - // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env - // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env - - // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. - // provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' +repositories { + // Put repositories for dependencies here + // ForgeGradle automatically adds the Forge maven and Maven Central for you + maven { url = "https://maven.firstdarkdev.xyz/snapshots" } // LDLib, Photon + // If you have mod jar dependencies in ./libs, you can declare them as a repository like so. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver + // flatDir { + // dir 'libs' + // } +} - // These dependencies get remapped to your current MCP mappings - // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev' +dependencies { - // For more info... + // Specify the version of Minecraft to use. + // Any artifact can be supplied so long as it has a "userdev" classifier artifact and is a compatible patcher artifact. + // The "userdev" classifier will be requested and setup by ForgeGradle. + // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"], + // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository. + minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" + implementation fg.deobf("com.lowdragmc.photon:photon-forge-1.20.1:1.0.7.a") { transitive = false } + implementation fg.deobf("com.lowdragmc.ldlib:ldlib-forge-1.20.1:1.0.21.a") { transitive = false } + testImplementation(platform('org.junit:junit-bom:5.10.3')) + testImplementation('org.junit.jupiter:junit-jupiter') + // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings + // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime + // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}") + // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}") + // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}") + + // Example mod dependency using a mod jar from ./libs with a flat dir repository + // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar + // The group id is ignored when searching -- in this case, it is "blank" + // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}") + + // For more info: // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html // http://www.gradle.org/docs/current/userguide/dependency_management.html +} +// This block of code expands all declared replace properties in the specified resource targets. +// A missing property will result in an error. Properties are expanded using ${} Groovy notation. +// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments. +// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html +tasks.named('processResources', ProcessResources).configure { + var replaceProperties = [ + minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range, + forge_version: forge_version, forge_version_range: forge_version_range, + loader_version_range: loader_version_range, + mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, + mod_authors: mod_authors, mod_description: mod_description, + ] + inputs.properties replaceProperties + + filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) { + expand replaceProperties + [project: project] + } } -// Example for how to get properties into the manifest for reading by the runtime.. -jar { +// Example for how to get properties into the manifest for reading at runtime. +tasks.named('jar', Jar).configure { manifest { attributes([ - "Specification-Title": "examplemod", - "Specification-Vendor": "examplemodsareus", - "Specification-Version": "1", // We are version 1 of ourselves - "Implementation-Title": project.name, - "Implementation-Version": "${version}", - "Implementation-Vendor" :"examplemodsareus", - "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + 'Specification-Title' : mod_id, + 'Specification-Vendor' : "Omega Source", + 'Specification-Version' : '1', // We are version 1 of ourselves + 'Implementation-Title' : project.name, + 'Implementation-Version' : project.jar.archiveVersion, + 'Implementation-Vendor' : "omegasource", + 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") ]) } + + // This is the preferred method to reobfuscate your jar file + finalizedBy 'reobfJar' } -// Example configuration to allow publishing using the maven-publish task -// This is the preferred method to reobfuscate your jar file -jar.finalizedBy('reobfJar') -// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing -//publish.dependsOn('reobfJar') +// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing: +// tasks.named('publish').configure { +// dependsOn 'reobfJar' +// } +// Example configuration to allow publishing using the maven-publish plugin publishing { publications { - mavenJava(MavenPublication) { + register('mavenJava', MavenPublication) { artifact jar } } repositories { maven { - url "file:///${project.projectDir}/mcmodsrepo" + url "file://${project.projectDir}/mcmodsrepo" } } } + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation +} + + +test { + useJUnitPlatform() + testLogging { + events "passed", "skipped", "failed" + } +} \ No newline at end of file diff --git a/changelog.txt b/changelog.txt deleted file mode 100644 index 398f0b10..00000000 --- a/changelog.txt +++ /dev/null @@ -1,2515 +0,0 @@ -Build: 1.16.5-36.2.20 - Fri Dec 10 10:00:01 GMT 2021 - oriondevelopment: - [CVE-2021-44228]: Update Log4J to fix the security issue inside it (#8270) - -========= -Build: 1.16.5-36.2.19 - Wed Nov 24 02:14:10 GMT 2021 - daemonumbra: - Fix potential issue with BackgroundScanHandler for users with slow disc IO (#8211) - -========= -Build: 1.16.5-36.2.18 - Mon Nov 22 21:19:17 GMT 2021 - pupnewfster: - Backport #8207 to 1.16 (#8209) - -========= -Build: 1.16.5-36.2.17 - Mon Nov 22 20:46:52 GMT 2021 - xfacthd: - [1.16.x] Add ForgeSpawnEggItem to lazily handle EntityTypes (#8150) - - * Add ForgeSpawnEggItem to lazily handle EntityTypes - - * Remove OnlyIn - - * Surround EntityType#spawn() call with try/catch - -========= -Build: 1.16.5-36.2.16 - Sat Nov 20 15:45:11 GMT 2021 - Unbekannt1998: - change the AdvancementProvider to make it possabible for mods to hook into it (#7488) - - * back Port changes from #8120 - -========= -Build: 1.16.5-36.2.15 - Sat Nov 20 15:33:16 GMT 2021 - oriondevelopment: - Implements Lazy ItemStack Capabilities (#7879) - -========= -Build: 1.16.5-36.2.14 - Sat Nov 20 14:52:41 GMT 2021 - xfacthd: - Pass IModelData through IForgeBakedModel#getModelData() before asking the IBakedModel for the particle texture (#8107) - -========= -Build: 1.16.5-36.2.13 - Sat Nov 20 14:30:21 GMT 2021 - xfacthd: - [1.16.x] Fix blocks with flammable material catching fire from lava when they are marked as non-flammable (#8161) - -========= -Build: 1.16.5-36.2.12 - Sat Nov 20 14:17:06 GMT 2021 - xfacthd: - [1.16] Add accessor to an unmodifiable view of the fullPots map in FlowerPotBlock (#8109) - - * Add accessor to an unmodifiable view of the fullPots map in FlowerPotBlock - - * Fix non-empty pot check - - * Remove exception from getter and add test mod - -========= -Build: 1.16.5-36.2.11 - Sat Nov 20 13:56:21 GMT 2021 - championash5357: - Ensure that all render targets in a PostChain use the same format (#8138) - - Fixes #6995 - -========= -Build: 1.16.5-36.2.10 - Sat Nov 20 13:42:51 GMT 2021 - championash5357: - Make Broken Blocks Display Associated FluidState (#8129) - - Fixes #7253 for 1.16.x - -========= -Build: 1.16.5-36.2.9 - Thu Nov 04 07:09:52 GMT 2021 - gigaherz: - Implement GUI Stacking feature. (#6927) - - * Implement GUI Stacking feature. - You can now use `mc.pushGuiLayer` and `mc.popGuiLayer` to manage the layers. - mc.displayGuiScreen behaves such that if called with a non-null screen it replaces the entire stack, and if called with null it closes the entire stack. - - * Apply review comment fixes from 1.17 counterpart. - - * Revert unintended changes. - - * Missed these reverts. - -========= -Build: 1.16.5-36.2.8 - Sun Oct 03 16:51:54 GMT 2021 - sciwhiz12: - Add workaround for pairs of `'` being stripped (#8074) - - Backport of #8050 - - ititus: - Fix typo in FluidBlockWrapper (#7880) - -========= -Build: 1.16.5-36.2.6 - Mon Sep 27 20:24:54 GMT 2021 - brandon4261: - Backport MC-209819 (#7923) - - Backport fix for mc bug https://bugs.mojang.com/browse/MC-209819 - -========= -Build: 1.16.5-36.2.5 - Sun Sep 19 23:50:14 GMT 2021 - zml: - [1.16.5] Bump Mixin to 0.8.4 (#8098) - -========= -Build: 1.16.5-36.2.4 - Tue Aug 31 16:32:40 GMT 2021 - djbake101: - [1.16.5] Backport OnDatapackSyncEvent from 1.17.1 (#7985) - -========= -Build: 1.16.5-36.2.3 - Tue Aug 31 15:35:00 GMT 2021 - sciwhiz12: - [1.16.x] Fix all layers of ItemLayerModel being fullbright (#8040) - - * Fix all layers of ItemLayerModel being fullbright - - Backport of #8039 - - * Remove duplicate test resources - - These resources have corresponding equivalents in the generated tests - resources folder. - -========= -Build: 1.16.5-36.2.2 - Mon Jul 26 21:37:03 GMT 2021 - onelemonyboi: - Fix rounding related errors with small entity pathfinding. Closes #7730 - -========= -Build: 1.16.5-36.2.1 - Sat Jul 24 17:39:23 GMT 2021 - supermartijn642: - Pass the 'includeName' flag to the ItemTossEvent (#7758) - -========= -Build: 1.16.5-36.2.0 - Thu Jul 22 01:45:10 GMT 2021 - lexmanos: - New 1.16.5 RB. - -========= -Build: 1.16.5-36.1.66 - Wed Jul 21 21:21:25 GMT 2021 - sizableshrimp: - ForgeGradle 5.1 and Gradle 7, which allows development on J16. Runtime still targets J8. (#7877) - -========= -Build: 1.16.5-36.1.65 - Tue Jul 20 05:01:10 GMT 2021 - lexmanos: - Work around javac scoping issue. - - lexmanos: - Fix LAN worlds where registry entries have been removed. - -========= -Build: 1.16.5-36.1.63 - Mon Jul 19 19:54:59 GMT 2021 - william: - Fix FakePlayers having null `connection` and add FakePlayer test mod (#7733) - -========= -Build: - Sat Jul 17 16:23:44 GMT 2021 - ateranimavis: - Use '{assets_root}' rather than task output path for userdev config (#7873) - - Signed-off-by: AterAnimAvis - -========= -Build: 1.16.5-36.1.61 - Sat Jul 17 11:14:53 GMT 2021 - thelnfamous1: - Patch several mob classes to let them use modded versions of their ranged weapons (#7845) - - baileyholl: - Adds a damage float in Lightning Entity and patches Entity to use it. (#7849) - - thesilkminer: - Fix missing userdev config for datagen runs (#7871) - - Signed-off-by: TheSilkMiner - -========= -Build: 1.16.5-36.1.58 - Sat Jul 17 02:45:36 GMT 2021 - awsomesauce239: - Add Fishing bobber projectile impact event (#7842) - - onelemonyboi: - Removes misleading Nullable annotation from canCreatureSpawn (#7840) - - onelemonyboi: - Removes misapplied patch in Entity (#7841) - - onelemonyboi: - Updates MouseHelper to allow for Horizontal Scroll to be recognized as Vertical Scroll (#7834) - - onelemonyboi: - Corrects the assigning of mob kills, Fixes MC-121048 (#7836) - -========= -Build: 1.16.5-36.1.53 - Sat Jul 17 02:30:47 GMT 2021 - diesieben07: - Fix entities losing their scoreboard data when they are unloaded (#7826) - -========= -Build: 1.16.5-36.1.52 - Sat Jul 17 02:23:52 GMT 2021 - diesieben07: - [1.16] Allow blocks other than beds or respawn anchors to act as respawn points (#7824) - -========= -Build: 1.16.5-36.1.51 - Sat Jul 17 02:13:02 GMT 2021 - queekusme: - Changed AbstractFurnaceTileEntity's canBurn and burn functions to use IRecipe's 'assemble' instead of 'getResultItem' (#7756) - - judge40: - [1.16.x] Remove redundant mobgriefing check in SmallFireaballEntity. (#7761) - - judge40: - Use MobGriefingEvent for PiglinEntity when determining whether Piglins want to pick up items. (#7762) - - diesieben07: - Add IRecipeType parameter to burn time hooks (#7771) - - mike.kok: - Fixes tryFluidTransfer_Internal to respect the FluidStack drainable when draining fluidSource. (#7782) - - personthecat: - Synchronize `ResourcePackList#addPackFinder` (#7799) - - github: - Fix vanilla rotation/mirroring issues (#7803) - - Patch minecraft to fix MC-227255 and MC-134110, which are block - rotation and mirroring issues. I noticed this from problems with - Structurize, but this probably affects any other mods that allow - rotating or mirroring structures (as well as vanilla structure blocks). - - sekwah41: - Fix mod menu URL click bounds (#7804) - - thelnfamous1: - Adds knockback attribute to players and updated knockback calculation to PlayerEntity#attack (#7806) - - kinglemming: - Convenience change for potion enumeration - does not change patch size in any meaningful way! (#7811) - - cech12: - New hook to allow Trapdoors be climbable for custom ladders (#7816) - - won-ton: - Add AT entries for DimensionSettings to make them easier for mods to work with (#7817) - - lexmanos: - Regen patches - - daemonumbra: - Removed sidedness from PacketBuffer methods. (#7236) - - Affected methods: - * readLongArray (x2) - * readSectionPos - * readString (no-arg variant) - - covers1624: - Bypass chunk future chain when processing loads and getChunk called. (#7697) - -========= -Build: 1.16.5-36.1.36 - Sat Jul 17 00:24:32 GMT 2021 - thesilkminer: - Add data generators for sounds.json (#6982) - -========= -Build: 1.16.5-36.1.35 - Thu Jul 15 23:56:00 GMT 2021 - diesieben07: - Add custom TextureAtlasSprite loaders (#7822) - - Adds a system for mods to specify custom texture loaders which can be requested by the resource pack through a metadata section in the .mcmeta file. Due to technical reasons, png file is still required for MC to identify a texture as existing, even if the loader doesn't use it. - -========= -Build: 1.16.5-36.1.34 - Thu Jul 15 23:40:24 GMT 2021 - commoble: - Fix PlayerGameModeEventTest and ForgeWorldTypeTest so they don't crash the dedicated server when running forge_test_server in forgedev (#7869) - -========= -Build: 1.16.5-36.1.33 - Wed Jul 14 01:16:19 GMT 2021 - lexmanos: - Add userdev to run config. - -========= -Build: 1.16.5-36.1.32 - Thu Jun 17 02:23:34 GMT 2021 - diesieben07: - Add truncation to FMLStatusPing to work around protocol limits (#7818) - -========= -Build: 1.16.5-36.1.31 - Wed Jun 09 16:35:21 GMT 2021 - sizableshrimp: - Remove ModelResourceLocation patch for SAS entry (#7813) - -========= -Build: 1.16.5-36.1.30 - Tue Jun 08 20:34:06 GMT 2021 - diesieben07: - Fix jar file path detection if the path contains a "!" (#7790) - -========= -Build: 1.16.5-36.1.29 - Tue Jun 08 19:54:50 GMT 2021 - mrp-v2: - Add method to get the number of elements in a model builder (#7792) - -========= -Build: 1.16.5-36.1.28 - Tue Jun 08 19:47:54 GMT 2021 - diesieben07: - Fix vanilla packet splitter remote detection and add advancement packet splitting (#7802) - -========= -Build: 1.16.5-36.1.27 - Tue Jun 08 19:33:44 GMT 2021 - 17338378+nightenom: - Add option for linear filtering of text texture (#7645) - -========= -Build: 1.16.5-36.1.26 - Tue Jun 08 19:07:49 GMT 2021 - mrp-v2: - Use empty model instead of missing model for non-existant layers in multilayer models (#7750) - - Fixes issues when using multi-layer models as part of composite models - -========= -Build: 1.16.5-36.1.25 - Thu Jun 03 17:30:10 GMT 2021 - lexmanos: - Add debug logging to packet compression encoder. - Should make figuring out who is sending large packets easier. - Disable with -Pforge.disablePacketCompressionDebug=true - -========= -Build: 1.16.5-36.1.24 - Sun May 23 18:09:00 GMT 2021 - lexmanos: - Removed signature line from mod list screen. #7500 - -========= -Build: 1.16.5-36.1.23 - Mon May 17 20:56:15 GMT 2021 - curle: - Reinstate the MinecartCollisionHandler field to AbstractMinecartEntity (#7748) Closes #7506. - -========= -Build: 1.16.5-36.1.22 - Mon May 17 20:50:05 GMT 2021 - curle: - Fix PlayerEvent.BreakSpeed's pos being nullable. (#7747) Closes #7615. - -========= -Build: 1.16.5-36.1.21 - Mon May 17 20:43:50 GMT 2021 - curle: - Fix OBJ Loader data gen string (#7746) Closes #7616 - -========= -Build: 1.16.5-36.1.20 - Mon May 17 20:17:14 GMT 2021 - noeppi-noeppi: - Add an event similar to PlayerEvent.NameFormat but for the name shown in the tab list. (#7740) - -========= -Build: 1.16.5-36.1.19 - Mon May 17 20:10:45 GMT 2021 - curle: - Fix filling buckets with fluids without bucket items consuming the fluid (#7745) Closes #7670 - -========= -Build: 1.16.5-36.1.18 - Thu May 13 22:12:02 GMT 2021 - gigaherz: - Work around crash while loading flatworld with modded structures. (#7764) - - * Work around crash while loading flatworld with modded structures. - - * Maybe fix issue with gradle daemon leaking memory and slowing down CI builds. - -========= -Build: 1.16.5-36.1.17 - Wed May 12 21:33:59 GMT 2021 - gigaherz: - Update Forge to Gradle 6.9 - -========= -Build: 1.16.5-36.1.16 - Fri Apr 30 17:59:06 GMT 2021 - trikzon: - Add barrels and barrels/wooden block and item tag (#7676) - -========= -Build: 1.16.5-36.1.15 - Fri Apr 30 17:52:19 GMT 2021 - knightminer: - Fix shears not properly breaking tripwire (MC-129055) (#7718) - -========= -Build: 1.16.5-36.1.14 - Fri Apr 30 17:42:34 GMT 2021 - cpw: - try gradleVersion - - cpw: - trim? - - cpw: - toString? - - cpw: - fiddle - - cpw: - split ? - - cpw: - try better? - - cpw: - with - - cpw: - debug - - cpw: - debug - - cpw: - debug - - cpw: - debug - - cpw: - tokenize - - cpw: - map - - cpw: - trims - - cpw: - tidy - - cpw: - try passing in env - - cpw: - try passing in env - - s8johost: - Fix Line endings in tooltips not handled properly in multiplayer screen Closes #7738 (#7739) - -========= -Build: 1.16.5-36.1.13 - Fri Apr 23 20:28:12 GMT 2021 - shroomdog27: - Fix cats, phantoms and pillagers saying they're at BlockPos.ZERO during LivingSpawnEvent.CheckSpawn (#7722) - -========= -Build: 1.16.5-36.1.12 - Fri Apr 23 05:59:08 GMT 2021 - xfacthd: - Pass BlockPos to BlockParticleData used for "fall impact" particle (#7705) - - mrp-v2: - [1.16] Add missing Multipart Blockstate Builder feature: Nested condition groups (#7677) - -========= -Build: 1.16.5-36.1.10 - Fri Apr 23 05:52:41 GMT 2021 - sciwhiz12: - Check version ranges of optional dependencies when present (#7710) - - If an optional dependency is present, but it does not conform to the version range, - it will now error out in the same fashion as missing required dependencies, instead - of a more cryptic error down the line due to a missing method/class/field/etc. - - Implements and closes #7696 - -========= -Build: 1.16.5-36.1.9 - Fri Apr 23 05:45:51 GMT 2021 - diesieben07: - Fix ClientVisualization crashing on systems without monitors (#7719) - -========= -Build: 1.16.5-36.1.8 - Fri Apr 23 05:34:56 GMT 2021 - atkarimarton: - Fix Furnace Minecarts going faster then vanilla (#7725) - -========= -Build: 1.16.5-36.1.7 - Fri Apr 23 05:28:36 GMT 2021 - ateranimavis: - Update for Forge's new maven (#7723) - -========= -Build: 1.16.5-36.1.6 - Sun Apr 18 15:47:08 GMT 2021 - cpw: - A bloody quote FFS - - Signed-off-by: cpw - - cpw: - Update for new maven - - Signed-off-by: cpw - -========= -Build: 1.16.5-36.1.4 - Fri Apr 02 18:31:07 GMT 2021 - cpw: - Fix broken java9hacks for j16 handling.. - - Signed-off-by: cpw - -========= -Build: 1.16.5-36.1.3 - Tue Mar 30 01:05:30 GMT 2021 - sizableshrimp: - Add generic EntityTeleportEvent (#7694) - -========= -Build: 1.16.5-36.1.2 - Mon Mar 22 06:24:40 GMT 2021 - covers1624: - Restore SS version, fixes findFieldInstanceChecks - -========= -Build: 1.16.5-36.1.1 - Wed Mar 17 17:04:46 GMT 2021 - diesieben07: - Fix sign textures being stitched onto every texture atlas (#7690) - -========= -Build: 1.16.5-36.1.0 - Mon Mar 15 22:11:58 GMT 2021 - lexmanos: - Fix AT order, missed exec line and bump for RB. - -========= -Build: 1.16.5-36.0.63 - Mon Mar 15 21:08:56 GMT 2021 - diesieben07: - Fix wrong eye height when entity size changes (esp. baby animals) (#7628) - -========= -Build: 1.16.5-36.0.62 - Mon Mar 15 21:02:36 GMT 2021 - diesieben07: - Allow ITeleporter to override the vanilla teleport sound (#7682) - -========= -Build: 1.16.5-36.0.61 - Mon Mar 15 20:20:21 GMT 2021 - sizableshrimp: - Fix datapack exception related to EnumArgument with siblings (#7686) - - Invalid enum constants are now properly thrown as a CommandSyntaxException - -========= -Build: 1.16.5-36.0.60 - Mon Mar 15 19:29:01 GMT 2021 - 42383791+kaydogz: - Add support for custom WoodTypes (#7623) - -========= -Build: 1.16.5-36.0.59 - Mon Mar 15 19:19:16 GMT 2021 - lexmanos: - Use JGit instead of GrGit now that jcenter is going away. - Update missed mapped name in MDK. - -========= -Build: 1.16.5-36.0.58 - Sat Mar 13 19:07:24 GMT 2021 - diesieben07: - Fix incorrectly replaced SRG names - - gigaherz: - Fix yet another copypasta. - - gigaherz: - Bump nashorn wrapper version. - -========= -Build: 1.16.5-36.0.55 - Fri Mar 12 18:51:48 GMT 2021 - ateranimavis: - Fix potential Deadlock when using custom Item entities. (#7532) - - Be careful when adding Entities during Chunk Load (#7519) - -========= -Build: 1.16.5-36.0.54 - Fri Mar 12 02:04:32 GMT 2021 - gigaherz: - Fix copypasta. - -========= -Build: 1.16.5-36.0.53 - Fri Mar 12 00:11:22 GMT 2021 - curle: - Automatically fix some issues with configurations deemed invalid for simple reasons (#7671) - -========= -Build: 1.16.5-36.0.52 - Thu Mar 11 20:59:54 GMT 2021 - gigaherz: - Introduce a new feature that lets mods know if optional mods and optional network channels are present in the remote. - Allow connections from forge versions that don't have the vanilla splitter. - - gigaherz: - Bulk update license year, and use replacement variable so that the current year is always used. - - gigaherz: - Bump SpecialSource - - gigaherz: - Add coremod that injects bouncer methods to work around name conflicts with official names. - Fixes a binary break. - -========= -Build: 1.16.5-36.0.48 - Tue Mar 09 22:22:20 GMT 2021 - lexmanos: - Update to FG4, and Gradle 6.8. - - lexmanos: - Regenerate patches with relative headers. This should lower conflicts in future PRs. - Convert Forge to use Official mappings. - Mojang released their obfuscation mappings but we have not used them up until now due to wanting to get their license to be more explicitly permissive. - It is clear that their intent is to allow us to use their names for developing mods like this. - See the full wording, and our interpretation here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md - -========= -Build: 1.16.5-36.0.46 - Thu Mar 04 20:15:10 GMT 2021 - diesieben07: - Support splitting vanilla packets that are too large on forge<->forge connections (#7485) - - Currently only for SUpdateRecipesPacket and STagsListPacket that blow up with huge datapacks - -========= -Build: 1.16.5-36.0.45 - Wed Mar 03 20:50:47 GMT 2021 - pupnewfster: - Fix a few places where the vanilla method was being called instead of the forge one (#7535) - - Cleanup javadocs references slightly, fix a couple spots not using the proper forge hooks, and remove a couple unneeded patches - Update deprecation comment on isAir - -========= -Build: 1.16.5-36.0.44 - Wed Mar 03 05:29:04 GMT 2021 - firecontroller1847: - Add Opacity to ForgeHooksClient#renderMainMenu (#7660) - -========= -Build: 1.16.5-36.0.43 - Thu Feb 25 02:37:09 GMT 2021 - oriondevelopment: - Add support for caching of configuration values. (#7608) - -========= -Build: 1.16.5-36.0.42 - Tue Feb 16 02:43:01 GMT 2021 - kovac1066: - Added entity attribute setup and creation events - -========= -Build: 1.16.5-36.0.41 - Tue Feb 16 01:28:51 GMT 2021 - knightminer: - Fix updateItemStackNBT not properly being called (#7646) - - Re-added ItemStack delegate redirect transformer - -========= -Build: 1.16.5-36.0.40 - Tue Feb 16 01:08:21 GMT 2021 - pupnewfster: - Fix a few FluidUtil issues that were causing DispenseFluidContainer to not function properly (#7422) - -========= -Build: 1.16.5-36.0.39 - Tue Feb 16 00:49:27 GMT 2021 - daemonumbra: - Fixed Configs not correcting when hot-loaded from changes on disk (#7427) - - ichttt: - Add a way to specify a custom background texture with namespaces in the Creative GUI. (#7404) - -========= -Build: 1.16.5-36.0.37 - Tue Feb 16 00:39:15 GMT 2021 - xzk0701: - Reduce default logging markers in the MDK. Modders can re-enable these for better debugging. (#7432) - - Modders PLEASE read your damn log, and fix the errors we point out. Spamming modpacks with stack traces is just lazy programming. - -========= -Build: 1.16.5-36.0.36 - Tue Feb 16 00:19:30 GMT 2021 - sciwhiz12: - Deprecate Forge's setdimension command, vanilla execute command can do this now. (#7459) - -========= -Build: 1.16.5-36.0.35 - Mon Feb 15 23:38:35 GMT 2021 - spb.max2: - Fix ItemTextureQuadConverter.convertTexture generating wrong quads, fixes #7620 (#7650) - -========= -Build: 1.16.5-36.0.34 - Mon Feb 15 23:22:40 GMT 2021 - florian: - Added MultipartBakedModel.getModelData(). (#7595) - - This allows custom IBakedModel implementations to use the IModelData provided by their IBakedModel.getModelData() when used in the context of a multipart model. - -========= -Build: 1.16.5-36.0.33 - Mon Feb 15 23:15:50 GMT 2021 - cyborgmas: - fix global cache not being a block render type (#7648) - -========= -Build: 1.16.5-36.0.32 - Mon Feb 15 22:52:15 GMT 2021 - 35673674+alcatrazescapee: - Allow mods to use additional custom LootParameter when querying existing loot tables (#7515) - -========= -Build: 1.16.5-36.0.31 - Mon Feb 15 21:40:16 GMT 2021 - shroomdog27: - Add ForgeHooks.canEntitySpawn to Cat, Phantom, and Patrol spawners. (#7569) - -========= -Build: 1.16.5-36.0.30 - Mon Feb 15 21:26:11 GMT 2021 - dev: - Fix/Replace player visibility event (#7573) - -========= -Build: 1.16.5-36.0.29 - Mon Feb 15 21:16:26 GMT 2021 - ateranimavis: - Fix: Clear the last error from glfwInit to prevent vanilla from throwing an exception later in the chain when glfw errors. (#7587) - -========= -Build: 1.16.5-36.0.28 - Mon Feb 15 20:56:51 GMT 2021 - 55965249+seymourimadeit: - Fix MC-181464 persisting for modded shields (#7602) - -========= -Build: 1.16.5-36.0.27 - Mon Feb 15 20:11:46 GMT 2021 - malte0811: - FIx race condition in LazyOptional (#7611) - -========= -Build: 1.16.5-36.0.26 - Mon Feb 15 03:16:02 GMT 2021 - xfacthd: - [1.16.5] Fix shaders breaking almost every overlay that uses textures, fixes #7575 (#7624) - -========= -Build: 1.16.5-36.0.25 - Mon Feb 15 03:10:24 GMT 2021 - telepathicgrunt: - Disable syncing of Feature and Biome registries (#7639) - -========= -Build: 1.16.5-36.0.24 - Mon Feb 15 03:04:46 GMT 2021 - drullkus: - Add IExtensibleEnum to GrassColorModifier (#7641) - -========= -Build: 1.16.5-36.0.23 - Mon Feb 15 02:36:26 GMT 2021 - shroomdog27: - Log stacktraces in NettyPacketEncoder. (#7654) - -========= -Build: 1.16.5-36.0.22 - Wed Feb 10 19:05:16 GMT 2021 - xfacthd: - Lower logging level for datafixer warning to debug (#7636) - -========= -Build: 1.16.5-36.0.21 - Tue Feb 09 22:19:29 GMT 2021 - pupnewfster: - Reintroduce forge's chunk manager to allow mods to force chunks with either a block position or entity (UUID) "owner" and have them properly persist between restarts (#7642) - -========= -Build: 1.16.5-36.0.20 - Tue Feb 09 21:28:24 GMT 2021 - pupnewfster: - Fix two places where querying an object for the new "valid" capability from a capability invalidation listener could cause the object to return the old invalid capability. (#7643) - -========= -Build: 1.16.5-36.0.19 - Tue Feb 09 21:21:44 GMT 2021 - cyborgmas: - Fix config spec in cases of enum class discrepancies (#7635) - -========= -Build: 1.16.5-36.0.18 - Tue Feb 09 21:06:36 GMT 2021 - diesieben07: - Fix onBlockAdded being called twice for ItemEntity placing non-TE blocks (#7607) - -========= -Build: 1.16.5-36.0.17 - Tue Feb 09 21:00:57 GMT 2021 - lachney: - Prevent NullPointerException when adding new loot pool. (#7605) - -========= -Build: 1.16.5-36.0.16 - Tue Feb 09 20:53:48 GMT 2021 - brandon4261: - Added generic multi part entity API (#7554) - -========= -Build: 1.16.5-36.0.15 - Sun Feb 07 03:41:41 GMT 2021 - cyborgmas: - Fix IAngerable entities crashing when reading nbt on client (#7618) - -========= -Build: 1.16.5-36.0.14 - Tue Feb 02 20:28:08 GMT 2021 - thesilkminer: - [1.16.x] Add loot table ID in Global Loot Modifiers (#7428) - - thesilkminer: - [1.16.x] Add loot table ID in Global Loot Modifiers (#7428) - -========= -Build: 1.16.5-36.0.13 - Sat Jan 30 02:07:17 GMT 2021 - pupnewfster: - Add a block tag to allow mods to blacklist blocks endermen should not be able to place blocks on top of, similar to how vanilla hardcodes against them being able to place things on bedrock (#7548) - -========= -Build: 1.16.5-36.0.12 - Sat Jan 30 02:01:35 GMT 2021 - 7419378+hellfirepvp: - Fix translucent model parts of MultiLayerModels rendering as missing models due to differing rendertypes when rendering block model (#7579) - - Signed-off-by: HellFirePvP <7419378+HellFirePvP@users.noreply.github.com> - -========= -Build: 1.16.5-36.0.11 - Sat Jan 30 01:35:10 GMT 2021 - pupnewfster: - Fix existing file tag provider support looking in the wrong folder for custom tag types (#7576) - -========= -Build: 1.16.5-36.0.10 - Thu Jan 28 21:07:30 GMT 2021 - cyborgmas: - Propery re-encode registries (#7629) - -========= -Build: 1.16.5-36.0.9 - Thu Jan 28 01:23:13 GMT 2021 - cyborgmas: - Properly encode registries. (#7626) - -========= -Build: 1.16.5-36.0.8 - Thu Jan 28 00:00:43 GMT 2021 - cyborgmas: - Inject vanilla dimensions inside worlds missing them (#7599) - -========= -Build: 1.16.5-36.0.7 - Wed Jan 27 00:32:53 GMT 2021 - lexmanos: - Update Coremods, ASM, and include standalone Nashorn to load on J15. - - lexmanos: - Introduce a new field_to_instanceof transformer to reduce some simple patches. - -========= -Build: 1.16.5-36.0.4 - Tue Jan 26 02:53:10 GMT 2021 - lexmanos: - Fix broken build. - - dev: - Add modded biomes to overworld biome list (#7360) - -========= -Build: 1.16.5-36.0.2 - Tue Jan 26 02:25:10 GMT 2021 - lexmanos: - Fix dynamic registries not getting ids assigned correctly from old worlds in specific unordered value insertions. Closes #7586 - -========= -Build: 1.16.5-36.0.1 - Sun Jan 17 21:05:36 GMT 2021 - knightminer: - Optionally add a milk fluid to the vanilla bucket (#7294) - - Fixes the previous broken code that was supposed to make mod registered milk returned by the vanilla bucket by allowing mods to enable a milk fluid. - -========= -Build: 1.16.5-36.0.0 - Fri Jan 15 19:42:24 GMT 2021 - lexmanos: - 1.16.5 Initial Update. - -========= -Build: 1.16.4-35.1.37 - Thu Jan 14 23:58:35 GMT 2021 - lexmanos: - Update Coremods, ASM, and include standalone Nashorn to load on J15. - -========= -Build: 1.16.4-35.1.36 - Thu Jan 07 20:24:49 GMT 2021 - rehwinkel: - Added IWeatherParticleRenderHandler to allow a mod to take control over weather particles and sounds. (#7522) - -========= -Build: 1.16.4-35.1.35 - Thu Jan 07 20:16:03 GMT 2021 - covers1624: - Allow Chunk loading Tickets to opt-into forcing chunk ticks. (#7525) - -========= -Build: 1.16.4-35.1.34 - Thu Jan 07 20:10:18 GMT 2021 - malte0811: - Fix crash when mods add goals to skeleton horses (MC-206338) (#7509) - -========= -Build: 1.16.4-35.1.33 - Thu Jan 07 20:03:59 GMT 2021 - diesieben07: - Set WM_CLASS and WM_INSTANCE_NAME for early progress window (#7534) - -========= -Build: 1.16.4-35.1.32 - Wed Jan 06 03:17:35 GMT 2021 - 35673674+alcatrazescapee: - Make UnboundedMapCodec more lenient in decoding dimensions. Fixes MC-197860 (#7527) - -========= -Build: 1.16.4-35.1.31 - Tue Jan 05 19:59:52 GMT 2021 - lexmanos: - Prevent NPE and deprecated MissingMappings.getMappings function. Closes #6252 - - lexmanos: - Fix FML's Config Sync packet not allowing same length filenames in encoder and decoder. Closes #7584 - -========= -Build: 1.16.4-35.1.29 - Sun Jan 03 11:02:59 GMT 2021 - lexmanos: - Fix entities not correctly being able to be ridden under water. - -========= -Build: 1.16.4-35.1.28 - Mon Dec 28 21:56:51 GMT 2020 - git: - Fix crash when beehive is broken by fake player (#7566) - -========= -Build: 1.16.4-35.1.27 - Mon Dec 28 21:46:04 GMT 2020 - 35673674+alcatrazescapee: - Add supplier variant to `AbstractBlock.Properties#lootFrom` (#7563) - -========= -Build: 1.16.4-35.1.26 - Mon Dec 28 21:40:18 GMT 2020 - diesieben07: - Fix missing serializers when deserializing global loot modifiers (#7561) - - diesieben07: - Fix ModFileResourcePack.getAllResourceLocations ignoring resourceNamespace. (#7562) - - Fixes #7405 - -========= -Build: 1.16.4-35.1.24 - Mon Dec 28 21:34:39 GMT 2020 - diesieben07: - Fix VanillaConnectionNetworkFilter sending out invalid entity properties packets without an entity ID (#7560) - -========= -Build: 1.16.4-35.1.23 - Mon Dec 28 21:17:01 GMT 2020 - richard: - Make shear interactions extend to subclasses (#7544) - -========= -Build: 1.16.4-35.1.22 - Mon Dec 28 21:09:38 GMT 2020 - sciwhiz12: - Add a SoundType subclass that uses suppliers (#7538) - -========= -Build: 1.16.4-35.1.21 - Mon Dec 28 21:03:56 GMT 2020 - sciwhiz12: - Fix compound ingredient in shapeless recipes (#7537) Fixes #7530 - -========= -Build: 1.16.4-35.1.20 - Mon Dec 28 20:19:04 GMT 2020 - mrp-v2: - Fix modded PointOfInterestType's not populating blockstate map when registered (#7503) - - 35673674+alcatrazescapee: - Fix potential NPE in ForgeHooks.onItemPlaceIntoWorld when passing in null player. (#7505) - -========= -Build: 1.16.4-35.1.18 - Mon Dec 28 20:13:15 GMT 2020 - 48399898+poopoodice: - Add new LivingConversionEvent to control mobs turning into other mobs. (#7386) - -========= -Build: 1.16.4-35.1.17 - Mon Dec 28 20:01:42 GMT 2020 - knightminer: - Add ItemAttributeModifierEvent (#7484) - -========= -Build: 1.16.4-35.1.16 - Mon Dec 28 19:54:38 GMT 2020 - bward7864: - Fix RightClickBlock ALLOW not being implemented (#7426) - -========= -Build: 1.16.4-35.1.15 - Sat Dec 26 19:39:35 GMT 2020 - lexmanos: - Make mod data packs able to be disabled. It'll break things, but that's on you. Closes #6776 - - lexmanos: - Quiet down errors related to modders not changing their update urls from the default. - -========= -Build: 1.16.4-35.1.13 - Sat Dec 12 17:34:07 GMT 2020 - tterrag: - Add generated resource tracking to ExistingFileHelper - -========= -Build: 1.16.4-35.1.12 - Fri Dec 11 02:39:41 GMT 2020 - tterrag: - Fix BlockStateProvider item models not knowing about block models - - Add tests for this case - -========= -Build: 1.16.4-35.1.11 - Tue Dec 08 19:54:40 GMT 2020 - richard: - Override invalidateCaps instead of remove for vanilla TE capability invalidation (#7536) - - Properly invalidate patched in vanilla TE caps in invalidateCaps instead of remove so that they get invalidated on chunk unload - -========= -Build: 1.16.4-35.1.10 - Sat Dec 05 20:07:14 GMT 2020 - richard: - Make TEs invalidate capabilities when the chunk they are in unloads (#7529) - - Fixed LazyOptional potentially notifying invalidation listeners multiple times. - -========= -Build: 1.16.4-35.1.9 - Sat Dec 05 20:01:00 GMT 2020 - cordonfreeman: - Fixed entity navigation to stop entities spinning - MC-94054 (#7520) - -========= -Build: 1.16.4-35.1.8 - Sat Dec 05 19:52:56 GMT 2020 - Unbekannt1998: - Fix wrong function call in BlockStateProvider::horizontalFaceBlock (#7514) - -========= -Build: 1.16.4-35.1.7 - Sun Nov 29 02:11:08 GMT 2020 - tterrag: - Fix datagen order of multipart conditions being unstable - -========= -Build: 1.16.4-35.1.6 - Sat Nov 28 02:56:55 GMT 2020 - 35673674+alcatrazescapee: - Fix forge config option for default world type not applying unless you change the default world type (#7521) - -========= -Build: 1.16.4-35.1.5 - Fri Nov 27 23:57:23 GMT 2020 - gigaherz: - Implement feature for mods to define new world types (#7448) - - * Mods can now register world types via a new forge registry, and optionally register a settings screen to tweak them. - * The default world type for dedicated servers and singleplayer world creation is configurable via forge's common config. - -========= -Build: 1.16.4-35.1.4 - Tue Nov 24 17:14:21 GMT 2020 - csh2001331: - Fix dimType not encode to registries (#7513) - -========= -Build: 1.16.4-35.1.3 - Mon Nov 23 03:45:21 GMT 2020 - richard: - Add support for referencing forge's resources and specifying existing mods to data generators (#7456) - -========= -Build: 1.16.4-35.1.2 - Sun Nov 22 22:01:29 GMT 2020 - cpw: - Fix #6692 - - Thanks @AterAnimAvis for help and suggestions - - Signed-off-by: cpw - -========= -Build: 1.16.4-35.1.1 - Sat Nov 21 19:57:45 GMT 2020 - cyborgmas: - Fix translucent blocks not rendering properly when moved by pistons on fabulous (#7441) - -========= -Build: 1.16.4-35.1.0 - Fri Nov 20 20:54:30 GMT 2020 - lexmanos: - Bump version for RB. - -========= -Build: 1.16.4-35.0.22 - Fri Nov 20 18:24:46 GMT 2020 - 35673674+alcatrazescapee: - Fix MC-194811 - Removing structures causes chunk save errors. - - diesieben07: - Fix food bar not rendering when non-living entities are mounted (#7446) - -========= -Build: 1.16.4-35.0.20 - Fri Nov 20 18:18:37 GMT 2020 - diesieben07: - Fix concurrency issue in StartupMessageManager (#7483) - -========= -Build: 1.16.4-35.0.19 - Fri Nov 20 18:11:25 GMT 2020 - 35673674+alcatrazescapee: - Fix forge registry types that have private constructors (BlockStateProviderType, BlockPlacerType, FoliagePlacerType, TreeDecoratorType) (#7482) - -========= -Build: 1.16.4-35.0.18 - Sun Nov 15 16:08:55 GMT 2020 - cpw: - Fix problem where the absence of forge and MC in later loading triggered a weird crash. - - Signed-off-by: cpw - -========= -Build: 1.16.4-35.0.17 - Sat Nov 14 01:41:38 GMT 2020 - cpw: - Fix NPE problem when modid is mismatched. - - Signed-off-by: cpw - -========= -Build: 1.16.4-35.0.16 - Sat Nov 14 00:18:29 GMT 2020 - cpw: - Return the processed modlist data to the upstream system, not the raw unprocessed data. Should resolve the problem - that mixin complains about missing info when it's in a "crashed" situation. - - Signed-off-by: cpw - -========= -Build: 1.16.4-35.0.15 - Wed Nov 11 09:09:45 GMT 2020 - cyborgmas: - Fix dims on servers not loading the first run (#7445) - -========= -Build: 1.16.4-35.0.14 - Tue Nov 10 20:24:33 GMT 2020 - diesieben07: - Allow for custom argument types by filtering them on vanilla connections (#7463) - -========= -Build: 1.16.4-35.0.13 - Tue Nov 10 20:13:34 GMT 2020 - bward7864: - Add Player context to AnvilUpdateEvent (#7442) - -========= -Build: 1.16.4-35.0.12 - Tue Nov 10 20:02:33 GMT 2020 - git: - Don't overwrite PlayerAdvancement's player with a fake one (#7454) - - If a FakePlayer is constructed with the same UUID/GameProfile as a - currently active player, the player object within PlayerAdvancement is - set to the fake player. - - As fake players cannot receive advancements (see grantCriterion), this - prevents the actual player from receiving any advancements until they - change dimension/relog. - -========= -Build: 1.16.4-35.0.11 - Tue Nov 10 19:46:01 GMT 2020 - curle: - Add BannerBlock.forColor to SAS to fix banner.toItem() on servers. - -========= -Build: 1.16.4-35.0.10 - Tue Nov 10 19:36:40 GMT 2020 - boy132: - Call Harvest check event even if the block doesn't require any tool (#7414) - -========= -Build: 1.16.4-35.0.9 - Tue Nov 10 19:25:26 GMT 2020 - lexmanos: - Use linked collections to stabilize order when adding new registry entries. - - xfacthd: - Render local player when the renderViewEntity is not the local player (#7216) - -========= -Build: 1.16.4-35.0.7 - Sun Nov 08 04:12:02 GMT 2020 - cpw: - Some help in ExtensionPoint regarding DISPLAYTEST. Let's improve those tick rates! - - Signed-off-by: cpw - -========= -Build: 1.16.4-35.0.6 - Sun Nov 08 03:30:37 GMT 2020 - cpw: - Handle erroring during early mod construction phases, and actually report that into the error UI - by doing armslength exception handling and propagation. - - Signed-off-by: cpw - -========= -Build: 1.16.4-35.0.5 - Sun Nov 08 01:48:22 GMT 2020 - cpw: - Support backwards loading 1.16.3 mods in 1.16.4, because we are able to do that. Tweak loading a bit to be smarter about dependency errors of various kinds. - - Signed-off-by: cpw - -========= -Build: 1.16.4-35.0.4 - Sat Nov 07 20:10:44 GMT 2020 - gigaherz: - Add FluidStack codec, and a test mod that verifies its behaviour matches the existing write/read logic. - Add missing license headers. - -========= -Build: 1.16.4-35.0.3 - Sat Nov 07 02:11:47 GMT 2020 - cpw: - Update event bus version (should be 3.0.5) - - Tweak MDK to automatically populate recommended values for things like forge version, loader version and minecraft version. - - Signed-off-by: cpw - -========= -Build: 1.16.4-35.0.2 - Wed Nov 04 00:07:58 GMT 2020 - diesieben07: - Workaround for modded attributes on vanilla entities logging warnings on vanilla clients - - Switch to a handler-based approach per packet class, simplify patch, add some docs - - Add license header and docs - - Switch to a network handler based approach - - Switch to a network handler based approach - - revert build gradle change - - Simplify Packet patch - - Add license header to IForgePacket - - Revert ForgeHooks changes - - Less hacky and more generic way to filter packets for vanilla connections - - _Actually_ Order SAS. - It's early - - Order SAS - - simplify vanilla connection check - - Remove unneeded import change - -========= -Build: 1.16.4-35.0.1 - Mon Nov 02 19:57:45 GMT 2020 - cpw: - Fix early sorting bug that meant the file deduping was causing an error, to, well, not cause it, so we can get to an error screen. - - Signed-off-by: cpw - -========= -Build: 1.16.4-35.0.0 - Mon Nov 02 19:15:50 GMT 2020 - lexmanos: - 1.16.4 Initial Update - -========= -Build: 1.16.3-34.1.42 - Mon Nov 02 04:30:53 GMT 2020 - lexmanos: - Fix Biomes not properly copying over ids loaded from the save to the new Dynamic Registry. - -========= -Build: 1.16.3-34.1.41 - Mon Nov 02 01:09:57 GMT 2020 - gigaherz: - Introduce custom loader additions to the model data generators. (#7450) - - Currently implemented loaders: - * OBJ - * Composite - * Multi-layer - * Item layers (vanilla item/generated but with fullbright texture support) - * Bucket - * Separate Perspective - -========= -Build: 1.16.3-34.1.40 - Mon Nov 02 00:52:12 GMT 2020 - cpw: - actually rollback on error in registry events. - - Signed-off-by: cpw - -========= -Build: 1.16.3-34.1.39 - Sun Nov 01 22:09:32 GMT 2020 - cpw: - Update modlauncher. fixes #7452 - - Signed-off-by: cpw - - cpw: - Return client resources even if no data pack found on server. Closes #6225 (Pull request) - - Signed-off-by: cpw - - tobias.hotz: - Auto-detect ansi support for log4j2 - - move to fml.loading subpackage - - Add license header - - cpw: - Fix config parse failure causing crash in building exception message. fixes #7438 - - Signed-off-by: cpw - -========= -Build: 1.16.3-34.1.35 - Thu Oct 29 17:09:31 GMT 2020 - malte0811: - Fix (NonNull)Lazy.Concurrent using a global lock (#7403) - - * Fix Lazy.Concurrent using a global lock, thus preventing multiple threads from resolving independent Lazy's at the same time - * Use Lazy with an added null check to implement NonNullLazy - -========= -Build: 1.16.3-34.1.34 - Thu Oct 29 00:12:09 GMT 2020 - gigaherz: - Update forge mappings to 20201028-1.16.3 (#7435) - -========= -Build: 1.16.3-34.1.33 - Tue Oct 27 16:01:02 GMT 2020 - 35673674+alcatrazescapee: - Fix breaking changes from the Biome rename PR #7434 (#7439) - -========= -Build: 1.16.3-34.1.32 - Mon Oct 26 23:52:47 GMT 2020 - sciwhiz12: - Reimplement nametag distance attribute, fix attribute translation keys (#7387) - -========= -Build: 1.16.3-34.1.31 - Mon Oct 26 22:07:02 GMT 2020 - 35673674+alcatrazescapee: - Fix data pack biomes failing to load in SingleBiomeProvider (#7434) - -========= -Build: 1.16.3-34.1.30 - Mon Oct 26 22:00:28 GMT 2020 - cpw: - Add in proper handling of equals and hashcode for modjar urls. Fixes very slow loading on windows. - - Signed-off-by: cpw - -========= -Build: 1.16.3-34.1.29 - Mon Oct 26 12:51:24 GMT 2020 - cpw: - Force 8.0.5 ML - - Signed-off-by: cpw - -========= -Build: 1.16.3-34.1.28 - Mon Oct 26 11:32:40 GMT 2020 - cpw: - Restore FingerprintViolationEvent with appropriate THIS IS F*CKING DEAD DELET WARNINGS. - Also, notify in UI if using legacy JDK without capability to read out security data from mod jars. - - Signed-off-by: cpw - -========= -Build: 1.16.3-34.1.27 - Mon Oct 26 02:27:48 GMT 2020 - cpw: - Rollback registries to vanilla state if something happens during loading, so subsequent activities can still run and not generate false reports.. - - Signed-off-by: cpw - - cpw: - Add signature reporting for mods, using new signature capture from ModLauncher. Need to figure out - how to reflect Minecraft's JAR signatures into here. - - Signed-off-by: cpw - -========= -Build: 1.16.3-34.1.25 - Tue Oct 20 19:32:40 GMT 2020 - lexmanos: - Fix mcp_snapshot mapping issue causing unneeded patches. Closes #7424 - -========= -Build: 1.16.3-34.1.24 - Tue Oct 20 11:26:03 GMT 2020 - gigaherz: - Fix resource leak in the OBJ loader. - -========= -Build: 1.16.3-34.1.23 - Fri Oct 16 19:10:02 GMT 2020 - djbake101: - Fix issue with ITeleporter allowing easier use of vanilla logic. (#7317) - -========= -Build: 1.16.3-34.1.22 - Thu Oct 15 19:49:26 GMT 2020 - richard: - Adds tag support for Enchantments, Potions, and TileEntityTypes (#7379) - -========= -Build: 1.16.3-34.1.21 - Thu Oct 15 19:43:33 GMT 2020 - lexmanos: - Resuscitate BiomeDictionary using RegistryKeys instead of biome references. - -========= -Build: 1.16.3-34.1.20 - Thu Oct 15 17:15:15 GMT 2020 - ocelot5836: - Add event for player changing game mode (#7355) - -========= -Build: 1.16.3-34.1.19 - Mon Oct 12 18:11:22 GMT 2020 - cpw: - Fix RCON multipacket responses not actually understanding UTF8. - - Signed-off-by: cpw - -========= -Build: 1.16.3-34.1.18 - Mon Oct 12 01:49:09 GMT 2020 - cpw: - Fix RCON not sending newlines in output for multiline. Fixes https://bugs.mojang.com/browse/MC-7569, a very old bug that is really annoying if you use RCON. - - Signed-off-by: cpw - -========= -Build: 1.16.3-34.1.17 - Sat Oct 10 16:45:26 GMT 2020 - championash5357: - Fix Texture Presence String (#7408) - -========= -Build: 1.16.3-34.1.16 - Fri Oct 09 19:57:26 GMT 2020 - lexmanos: - Fix typo causing potential error in vine growth. Closes #7406 - Sort missing registry dumps by name, making it easier to read. - -========= -Build: 1.16.3-34.1.15 - Fri Oct 09 13:58:36 GMT 2020 - gigaherz: - Fixed conditional advancement loading when using the "advancements" array. - Added automatic generation of conditional advancements from the criteria in the conditional recipe entries. - Added advancement name calculation from the recipe ID. - -========= -Build: 1.16.3-34.1.14 - Thu Oct 08 21:08:45 GMT 2020 - 32142731+flanks255: - Additions to the mdk build.gradle to accommodate datagens. (#7398) - -========= -Build: 1.16.3-34.1.13 - Thu Oct 08 21:02:59 GMT 2020 - daemonumbra: - Added Basic Class-Level SAS Capability to checkSAS, added Vector4f to SAS (#7385) - -========= -Build: 1.16.3-34.1.12 - Wed Oct 07 20:04:11 GMT 2020 - richard: - Add hooks to allow modification of structures spawn lists (#7344) - -========= -Build: 1.16.3-34.1.11 - Tue Oct 06 19:38:36 GMT 2020 - richard: - Add back patches to Screen allowing for item tooltips to be auto wrapped again (#7378) - - Only deals with the methods receiving an ItemStack or ITextComponent(s), the methods that take IReorderingProcessor(s) are left alone. - -========= -Build: 1.16.3-34.1.10 - Mon Oct 05 14:34:56 GMT 2020 - adam: - Bump mixin version to 0.8.2 - -========= -Build: 1.16.3-34.1.9 - Mon Oct 05 10:30:12 GMT 2020 - cpw: - Remove redundant call to CrashReport generator - Vanilla is doing a crashreport for itself at startup now. - - Add a UUID into crashreport that is also logged in all channels at crash report generation time. This will allow to associate crash reports and the logs. - - Signed-off-by: cpw - - cpw: - Add in extra debug logging - - Signed-off-by: cpw - -========= -Build: 1.16.3-34.1.7 - Sun Oct 04 19:51:37 GMT 2020 - cpw: - Modify how ModLoadingStage handles dispatch to Registry Events. Stops the objectholder spam and generally improves performance on larger packs. - - Signed-off-by: cpw - - cpw: - Fix doc README and answer lex's question - - Signed-off-by: cpw - -========= -Build: 1.16.3-34.1.5 - Fri Oct 02 23:40:14 GMT 2020 - daemonumbra: - Added "Bukkit Plugin" to InvalidModIdentifier (#7384) - -========= -Build: 1.16.3-34.1.4 - Fri Oct 02 23:34:26 GMT 2020 - richard: - Fix vanilla Campfire smoke bug. MC-201374 (#7381) - -========= -Build: 1.16.3-34.1.3 - Fri Oct 02 23:28:31 GMT 2020 - sciwhiz12: - Fix toggleable keybindings still being active while in GUI Fixes #7370 (#7373) - -========= -Build: 1.16.3-34.1.2 - Fri Oct 02 22:06:59 GMT 2020 - dev: - Fix modded EntityClassifications not being useable in the codec. (#7337) - -========= -Build: 1.16.3-34.1.1 - Mon Sep 28 18:02:11 GMT 2020 - cech12: - Support effective materials of vanilla AxeItem (#7351) - -========= -Build: 1.16.3-34.1.0 - Thu Sep 24 07:05:13 GMT 2020 - lexmanos: - Prep new RB. - -========= -Build: 1.16.3-34.0.21 - Thu Sep 24 06:46:57 GMT 2020 - ichttt: - Fix grass disappearing when alwaysSetupTerrainOffThread is true (#7291) - -========= -Build: 1.16.3-34.0.20 - Thu Sep 24 06:41:41 GMT 2020 - 35673674+alcatrazescapee: - Accessors for inspecting and removal of biome generation settings. Fixed carvers still being immutable. (#7339) - -========= -Build: 1.16.3-34.0.19 - Thu Sep 24 06:36:25 GMT 2020 - lexmanos: - Revive BiomeManager and BiomeLayer hooks. - -========= -Build: 1.16.3-34.0.18 - Thu Sep 24 03:12:19 GMT 2020 - richard: - Fix a few minor issues with custom tag types and fix OptionalNamedTags (#7316) - -========= -Build: 1.16.3-34.0.17 - Wed Sep 23 22:10:11 GMT 2020 - diesieben07: - Fix ToggleableKeyBinding differences to vanilla. (#7338) - -========= -Build: 1.16.3-34.0.16 - Wed Sep 23 21:34:47 GMT 2020 - yunus1903: - Updated build badge versions to 1.16.3 in readme (#7325) - - diesieben07: - Fix forge light pipeline applying block offsets twice (#7323) - -========= -Build: 1.16.3-34.0.14 - Wed Sep 23 21:16:46 GMT 2020 - ichttt: - Add a better license error screen (#7350) - -========= -Build: 1.16.3-34.0.13 - Tue Sep 22 19:14:17 GMT 2020 - darklime: - Fixed container item being consumed in brewing stand. #7307 (#7314) - -========= -Build: 1.16.3-34.0.12 - Tue Sep 22 19:06:10 GMT 2020 - sciwhiz12: - Fix parse results of CommandEvent being disregarded (#7303) - -========= -Build: 1.16.3-34.0.11 - Tue Sep 22 18:58:28 GMT 2020 - 17338378+nightenom: - [1.16] Fix possible crash when using rendering regionCache (#7207) - -========= -Build: 1.16.3-34.0.10 - Tue Sep 22 18:41:16 GMT 2020 - 35673674+alcatrazescapee: - [1.16] Reimplement ICloudRenderHandler, ISkyRenderHandler and IWeatherRenderHandler (#6994) - -========= -Build: 1.16.3-34.0.9 - Fri Sep 18 00:58:08 GMT 2020 - 35673674+alcatrazescapee: - Make Biome.Climate and BiomeAmbiance fields accessible (#7336) - -========= -Build: 1.16.3-34.0.8 - Thu Sep 17 20:42:53 GMT 2020 - cpw: - Use mixin 0.8.1. Should fix problems with mixin not working properly with latest modlauncher. - - Signed-off-by: cpw - -========= -Build: 1.16.3-34.0.7 - Tue Sep 15 20:07:25 GMT 2020 - sebastian: - Sets the empty/fill sounds for vanilla fluids. - Use Fluid's fillSound rather than emptySound when filling buckets. - -========= -Build: 1.16.3-34.0.6 - Tue Sep 15 19:47:08 GMT 2020 - cyborgmas: - Add MatrixStack-aware alternatives to the methods in GuiUtils (#7127) - -========= -Build: 1.16.3-34.0.5 - Tue Sep 15 16:51:58 GMT 2020 - thelonedevil: - Fix json biomes not setting registry name correctly for the BiomeLoadingEvent. (#7329) - -========= -Build: 1.16.3-34.0.4 - Tue Sep 15 14:18:16 GMT 2020 - gigaherz: - Fix inconsistencies in how the values from the model are passed into the baked model. - This puts them in line with vanilla, as intended. - -========= -Build: 1.16.3-34.0.3 - Tue Sep 15 13:23:05 GMT 2020 - yunus1903: - Reimplemented drawHoveringText (#7268) - -========= -Build: 1.16.3-34.0.2 - Tue Sep 15 00:43:19 GMT 2020 - lexmanos: - New BiomeLoadingEvent that allows modders to edit biomes as they are being deserialized. - -========= -Build: 1.16.3-34.0.1 - Fri Sep 11 15:55:28 GMT 2020 - lexmanos: - Bump MCP version for lambda issue. - -========= -Build: 1.16.3-34.0.0 - Thu Sep 10 19:10:33 GMT 2020 - lexmanos: - 1.16.3 Update - Also included a bunch of warning cleanups. - -========= -Build: 1.16.2-33.0.61 - Thu Sep 10 18:54:56 GMT 2020 - redstonedubstep: - Fix tile entities being replaced when not needed. (#7318) - -========= -Build: 1.16.2-33.0.60 - Thu Sep 10 18:02:15 GMT 2020 - malte0811: - Fix exception when getting rendering box for tile entities with no collision boxes. (#7301) - -========= -Build: 1.16.2-33.0.59 - Wed Sep 09 23:05:21 GMT 2020 - cpw: - More crash reporting tweaks. Don't crash when trying to show warnings. Also, put the exception name in the error screen on the second line! - - Signed-off-by: cpw - -========= -Build: 1.16.2-33.0.58 - Wed Sep 09 17:09:09 GMT 2020 - diesieben07: - Fix Minecart speed cap on rail being initialized to 0 (#7315) - -========= -Build: 1.16.2-33.0.57 - Wed Sep 09 02:10:45 GMT 2020 - richard: - Add support for custom tag types (#7289) - -========= -Build: 1.16.2-33.0.56 - Wed Sep 09 00:06:22 GMT 2020 - cpw: - More crash report tweaks. Put a button to open the generated crash report on the error screen, tweak formatting of crash report, and add the enhanced stack trace data (transformers et al) - - Signed-off-by: cpw - -========= -Build: 1.16.2-33.0.55 - Tue Sep 08 21:00:19 GMT 2020 - championash5357: - New hook for better custom scaffolding movement (#7261) - -========= -Build: 1.16.2-33.0.54 - Tue Sep 08 20:47:48 GMT 2020 - mrtschipp: - Add partialTicks to RenderNameplateEvent (#7277) - - cyborgmas: - Prevent duplicate wrapper tags from crashing (#7283) - - mrp-v2: - Fix custom teleporters NPE (#7296) - - cyborgmas: - Fixed crash with zip paths (#7300) - -========= -Build: 1.16.2-33.0.50 - Tue Sep 08 20:23:27 GMT 2020 - nrbeech: - Fixing logic in getCurrentRailPosition to correctly identify the rail… (#7276) - -========= -Build: 1.16.2-33.0.49 - Tue Sep 08 20:14:58 GMT 2020 - sciwhiz12: - Remove dead ForgeHooks.canToolHarvestBlock function. (#7262) - - sciwhiz12: - Bump resource pack version to 6 (#7299) - - edwin.mindcraft: - [1.16.x] Fixes for Bamboo, Enchantments and Conduits, small adjustments to bring some patches closer to the vanilla code. (#7239) - -========= -Build: 1.16.2-33.0.46 - Tue Sep 08 19:50:14 GMT 2020 - championash5357: - Re-implement DrawHighlightEvent$HighlightEntity Firing (#7233) - -========= -Build: 1.16.2-33.0.45 - Tue Sep 08 19:25:58 GMT 2020 - ichttt: - Reimplement FarmlandWaterManager (#7213) - -========= -Build: 1.16.2-33.0.44 - Tue Sep 08 19:11:16 GMT 2020 - cyborgmas: - Add dataprovider for Global Loot Modifiers (#6960) - -========= -Build: 1.16.2-33.0.43 - Tue Sep 08 19:01:09 GMT 2020 - ichttt: - Fix crash when dumping crash report for an exception that has a null cause (#7308) - -========= -Build: 1.16.2-33.0.42 - Mon Sep 07 01:29:40 GMT 2020 - cpw: - Tweak crash report dump to visit all the causes up to the top. - - Signed-off-by: cpw - -========= -Build: 1.16.2-33.0.41 - Sun Sep 06 23:39:13 GMT 2020 - cpw: - Fix ExplodedDirectoryLocator visiting non-existent paths. Closes #7203 - - Also, bump modlauncher to 7.0.1 to fix resources. - - Signed-off-by: cpw - -========= -Build: 1.16.2-33.0.40 - Sun Sep 06 22:08:22 GMT 2020 - cpw: - Use new enumeration mechanism in ModLauncher, to allow getResources to work. This enables serviceloader-in-mods, and other stuff that might need to visit multiple mod jars. Also, tweaked the visitor code slightly, may result in a trivial performance change. Closing #7302 as it's not really relevant any more. - - Signed-off-by: cpw - - cpw: - Park the polling thread for a bit, if we're not the one driving the task list forwards. This allows for the actual driver to work on low cpu count machines. - - Signed-off-by: cpw - - cpw: - Fix some potential issues in crash dumping during mod loading - - Signed-off-by: cpw - -========= -Build: 1.16.2-33.0.37 - Thu Sep 03 16:37:38 GMT 2020 - cpw: - Fix compiler issue in eclipse properly - - Signed-off-by: cpw - -========= -Build: 1.16.2-33.0.36 - Thu Sep 03 12:40:52 GMT 2020 - sciwhiz12: - Fix crash caused by previous commit (#7298) - -========= -Build: 1.16.2-33.0.35 - Thu Sep 03 04:15:27 GMT 2020 - lexmanos: - Dirty casting hacks to fix eclipse compiler inference issue. I'm sorry cpw. - -========= -Build: 1.16.2-33.0.34 - Thu Sep 03 03:38:16 GMT 2020 - tterrag: - Fix broken ExistingFileHelper import - - Add licenses to some new files - - tterrag: - Add validation via resources for tag providers (#7271) - - BREAKING CHANGE: Moved ExistingFileHelper to common package - Remove various workarounds from forge tag providers - -========= -Build: 1.16.2-33.0.32 - Tue Sep 01 18:36:21 GMT 2020 - cpw: - Move the "modloading" thread activity onto _our_ worker pool. It turns out that the vanilla worker pool can deadlock during stitching if it's insufficiently large, if modloader "waitForTransition" is also a worker member of that pool. - - Closes #7293 (to reproduce issue easily, modify Util.func_240979_a_ and change the values in the MathHelper.clamp call). I've verified that 3 and below for "max" cause the problem. (I didn't test a whole range of values, just sufficient to reproduce problem and verify fix). Note that setting it to zero (and using the "direct executor" that's inaccessible in normal operation) works as well with this fix. - - Signed-off-by: cpw - -========= -Build: 1.16.2-33.0.31 - Tue Sep 01 02:27:07 GMT 2020 - cpw: - Fix missed debugging code. Read the config from the config. - - Signed-off-by: cpw - -========= -Build: 1.16.2-33.0.30 - Tue Sep 01 01:31:57 GMT 2020 - cpw: - Revert "Shut down all other mod handlers if the loading cycle errors. This prevents other mods from throwing errors and being blamed for initial cause. This is a temporary hack until cpw re-writes the mod event dispatcher." - - This reverts commit 7592bbe8 - - Signed-off-by: cpw - - cpw: - Revert "Properly shutdown FMLModContainer's event bus when an error in a lifecycle event is detected." - - This reverts commit 30bad1e2 - - Signed-off-by: cpw - - cpw: - Redo event dispatch, removes a bunch of nonsense, and tries to integrate with the vanilla CF system where possible - - Signed-off-by: cpw - - cpw: - Fix up all the things. Removed SidedProvider because it served no real purpose anymore. - - Signed-off-by: cpw - - cpw: - Fix up slight registry change and other 1.16.2 stuffs. - - Signed-off-by: cpw - -========= -Build: 1.16.2-33.0.23 - Sun Aug 30 23:05:24 GMT 2020 - ichttt: - Add particle culling (#6981) - -========= -Build: 1.16.2-33.0.22 - Wed Aug 26 16:50:02 GMT 2020 - lexmanos: - Wrap vanilla's 'default' biome registry in ForgeRegistry. - This should allow registering mod dimensions like in 1.16.1, while the data driven system is fleshed out. - -========= -Build: 1.16.2-33.0.21 - Tue Aug 25 01:11:38 GMT 2020 - gigaherz: - Clarify in the LazyOptional which methods carry the lazyness over to the returned value and which don't. (#6750) - - For consistency, this meant making a few changes: - - Renamed the existing lazy mapping method to lazyMap, to indicate that it doesn't run the mapping immediately. - - Added a new implementation of map(), which returns Optional, and resolves the value in the process. - - Changed filter() to return Optional, since there's no way to filter lazily. - - Added a new method resolve(), which helps convert the custom LazyOptional class into a standard Optional, for use - with library methods that expect Optional. - - * Update License headers. - -========= -Build: 1.16.2-33.0.20 - Fri Aug 21 21:27:21 GMT 2020 - sciwhiz12: - Add user-friendly exceptions when config loading fails (#7214) - -========= -Build: 1.16.2-33.0.19 - Fri Aug 21 18:53:46 GMT 2020 - dev: - Replace EntityHeight event with EntitySize event (#6858) - -========= -Build: 1.16.2-33.0.18 - Fri Aug 21 18:38:31 GMT 2020 - davide2910: - [1.16] ForgeEventFactory#canCreateFluidSource reintroduced (#7181) - -========= -Build: - Fri Aug 21 18:31:19 GMT 2020 - cyborgmas: - Cleanup and expand Forge tags (#7004) - -========= -Build: 1.16.2-33.0.16 - Fri Aug 21 18:25:49 GMT 2020 - sciwhiz12: - Fix modproperties property in mods.toml causing exception (#7192) - -========= -Build: 1.16.2-33.0.15 - Fri Aug 21 18:15:53 GMT 2020 - me: - Log info about server list warning (#7209) - - Make it easier to figure out what mods are missing or have to be marked as client/server side only. - -========= -Build: 1.16.2-33.0.14 - Fri Aug 21 18:06:47 GMT 2020 - goto.minecraft: - Fix ItemStack#isDamageable is not calling Item#isDamagable (#7221) - -========= -Build: 1.16.2-33.0.13 - Fri Aug 21 17:48:58 GMT 2020 - diesieben07: - Improve performance and cleanup code for DelegatingResourcePack (#7228) - -========= -Build: 1.16.2-33.0.12 - Fri Aug 21 17:29:33 GMT 2020 - cyborgmas: - Fix small logging issues with loading pack.png for mods (#7265) - -========= -Build: 1.16.2-33.0.11 - Fri Aug 21 17:23:30 GMT 2020 - diesieben07: - Fix config iteration order (#7230) - -========= -Build: 1.16.2-33.0.10 - Fri Aug 21 09:47:23 GMT 2020 - lexmanos: - Cleanup Forge's build script, fix some unneeded patches. - Add checkExcscheckAll tasks. - -========= -Build: 1.16.2-33.0.9 - Fri Aug 21 04:35:17 GMT 2020 - championash5357: - Readding DifficultyChangeEvent hooks (#7240) - -========= -Build: 1.16.2-33.0.8 - Fri Aug 21 04:29:10 GMT 2020 - malte0811: - Improve startup time by caching the manifest data for mod jars (#7256) - -========= -Build: 1.16.2-33.0.7 - Wed Aug 19 05:47:46 GMT 2020 - yunus1903: - Removed HarvestDropsEvent (#7193) - -========= -Build: 1.16.2-33.0.6 - Wed Aug 19 05:22:45 GMT 2020 - cyborgmas: - Remove forge optional tags in favor of Vanilla's new system. (#7246) - -========= -Build: 1.16.2-33.0.5 - Fri Aug 14 19:05:15 GMT 2020 - lexmanos: - Fix creating nether portals. - - lexmanos: - New method for creating modded tag references, fix connecting to vanilla servers. - -========= -Build: 1.16.2-33.0.3 - Fri Aug 14 02:17:01 GMT 2020 - 43609023+spnda: - Print mod file name on InvalidModFileException (#7241) - -========= -Build: 1.16.2-33.0.2 - Thu Aug 13 19:26:22 GMT 2020 - cyborgmas: - Fix server connection, misapplied patch (#7245) - - yunus1903: - Updated MDK and README for 1.16.2 (#7243) - -========= -Build: 1.16.2-33.0.0 - Thu Aug 13 07:37:04 GMT 2020 - lexmanos: - Initial 1.16.2 Update - -========= -Build: 1.16.1-32.0.108 - Sun Aug 09 20:05:01 GMT 2020 - gigaherz: - Fix ModelRegistryEvent firing every time resources reload instead of just once. - -========= -Build: 1.16.1-32.0.107 - Sat Aug 08 01:00:42 GMT 2020 - gigaherz: - Move ModelRegistryEvent invocation to when the model loading is about to start. - Freeze the ModelLoaderRegistry right after this event happens, just before model loading actually begins. - This means ModelRegistryEvent is now the correct place to register loaders, as it was intended. - This is a slight breaking change, but any mod that used FMLClientSetupEvent before will need to be updated regardless due to the existing race condition. - -========= -Build: 1.16.1-32.0.106 - Tue Aug 04 00:19:22 GMT 2020 - diesieben07: - Fix wrong BlockState param passed into canSustainPlant from FarmlandBlock (#7212) - -========= -Build: 1.16.1-32.0.105 - Tue Aug 04 00:06:45 GMT 2020 - sciwhiz12: - Add harvest levels for hoes and new 1.16 blocks for pickaxes Fixes #7187 (#7189) - -========= -Build: 1.16.1-32.0.104 - Tue Aug 04 00:00:40 GMT 2020 - sciwhiz12: - Fix debug world not generating modded blocks (#6926) - - championash5357: - New IForgeBlock#getToolModifiedState hook allow better control over tools interacting with blocks. (#7176) - - email.squishling: - Added new hook to allow Biomes to control their Edge biomes (#7000) - -========= -Build: 1.16.1-32.0.101 - Mon Aug 03 22:55:18 GMT 2020 - diesieben07: - Re-introduce "outdated" notification on Mods button in main menu (#7123) - - brandon4261: - Add support for custom elytra (#7202) - -========= -Build: 1.16.1-32.0.99 - Mon Aug 03 18:53:31 GMT 2020 - sciwhiz12: - Fix RenderTickEvent using wrong partial ticks value when game is paused. Fixes #6991 (#7208) - -========= -Build: 1.16.1-32.0.98 - Thu Jul 30 03:18:00 GMT 2020 - tterrag: - Implement forge IBakedModel methods in vanilla wrapper models - -========= -Build: 1.16.1-32.0.97 - Tue Jul 28 23:44:41 GMT 2020 - lexmanos: - Fix another case of swallowed errors not shutting down mods. - -========= -Build: 1.16.1-32.0.96 - Tue Jul 28 21:40:06 GMT 2020 - lexmanos: - Shut down all other mod handlers if the loading cycle errors. - This prevents other mods from throwing errors and being blamed for initial cause. - This is a temporary hack until cpw re-writes the mod event dispatcher. - -========= -Build: - Tue Jul 28 19:01:27 GMT 2020 - lexmanos: - Properly shutdown FMLModContainer's event bus when an error in a lifecycle event is detected. - - lexmanos: - Enable EventBus type check during ForgeDev, and add IModBusEvent marker to ModelRegistryEvent. - -========= -Build: 1.16.1-32.0.93 - Tue Jul 28 07:16:31 GMT 2020 - lexmanos: - Make license toml entry optional during 1.16.1 - There are to many existing mods to make this required. - Yes, we are technically before a RB and can do breaking changes. However this is too large. - -========= -Build: 1.16.1-32.0.92 - Tue Jul 28 01:14:20 GMT 2020 - cpw: - Missed one event. NewRegistry needs the marker. - - Signed-off-by: cpw - -========= -Build: 1.16.1-32.0.91 - Tue Jul 28 01:07:03 GMT 2020 - cpw: - Update MDK license to default to All rights reserved, and offer a link to chooseyourlicense.com as a place to research appropriate licenses. - - Note: the license field _is_ backwards compatible and will simply be ignored on older forge versions. - Signed-off-by: cpw - -========= -Build: 1.16.1-32.0.90 - Tue Jul 28 00:47:35 GMT 2020 - cpw: - Update modlauncher, eventbus, accesstransformers and more to use a newer mechanism for generating ASM. - - Introduced IModBusEvent as a marker interface for events on the ModBus. Expect exceptions if you use - the modbus for events not listened there. - - Signed-off-by: cpw - - cpw: - Update coremods and spi, include mandatory license field in metadata. Added at top level of mods.toml file. - - Signed-off-by: cpw - -========= -Build: 1.16.1-32.0.88 - Mon Jul 27 23:35:24 GMT 2020 - ray.neiheiser: - Fix rail 180 rotations (#7177) - - jmansfield: - Fire AnimalTameEvent for cats (#7172) Closes #7171 - -========= -Build: 1.16.1-32.0.86 - Mon Jul 27 22:56:16 GMT 2020 - lexmanos: - Fix Biome generation error. - -========= -Build: 1.16.1-32.0.85 - Mon Jul 27 21:36:07 GMT 2020 - dev: - Fix SleepingTimeCheckEvent not being fired in initial sleep test. (#7005) - -========= -Build: 1.16.1-32.0.84 - Mon Jul 27 21:30:24 GMT 2020 - yunus1903: - Fix ClimberPathNavigator spinning when width is small. Closes #6993 (#6997) - -========= -Build: 1.16.1-32.0.83 - Mon Jul 27 21:19:50 GMT 2020 - mrtschipp: - Re-added PlayerEvent.NameFormat (#6992) - -========= -Build: 1.16.1-32.0.82 - Mon Jul 27 21:14:02 GMT 2020 - email.squishling: - Fixed modded overworld biomes not spawning [1.16.x] (#6990) - -========= -Build: 1.16.1-32.0.81 - Mon Jul 27 21:08:23 GMT 2020 - christ.klinge: - Added EntityLeaveWorldEvent (#6984) - -========= -Build: 1.16.1-32.0.80 - Mon Jul 27 21:02:53 GMT 2020 - aqscode: - Re-implement moddable flammabilities (#6983) - -========= -Build: 1.16.1-32.0.79 - Mon Jul 27 20:46:11 GMT 2020 - diesieben07: - Re-add patch for PlayerSetSpawnEvent (#6977) - - yunus1903: - Updated versions in README and removed flocker.tv mentions (#6978) - -========= -Build: 1.16.1-32.0.77 - Mon Jul 27 20:40:33 GMT 2020 - sciwhiz12: - Fix ChunkDataEvents using different data tags (#6961) Fixes #6957 - -========= -Build: - Mon Jul 27 20:27:00 GMT 2020 - sm0keysa1m0n: - Post SoundLoadEvent on mod bus instead of forge bus (#6955) - -========= -Build: 1.16.1-32.0.75 - Wed Jul 22 01:26:19 GMT 2020 - cpw: - Remove startupquery. Currently wasn't functional, and 1.16 has out of band state loading in all cases, so the complex functionality there is no longer needed. Going to research using the Lifecycle indicator from DFU as a proxy/replacement. Probably with some codec FUN. - - Signed-off-by: cpw - -========= -Build: 1.16.1-32.0.74 - Wed Jul 22 00:34:43 GMT 2020 - lexmanos: - Run Forge's data generators to sync 1.16 vanilla changes. - -========= -Build: 1.16.1-32.0.73 - Wed Jul 22 00:13:48 GMT 2020 - cpw: - Don't show the early launcher GUI when running data. It's not needed and prevents use on automated builds. - - Need to investigate why a bunch of tags seem to be being blown away by rerunning on forge. - - Signed-off-by: cpw - -========= -Build: 1.16.1-32.0.72 - Tue Jul 21 23:56:54 GMT 2020 - cpw: - Add mixin - - Signed-off-by: cpw - -========= -Build: 1.16.1-32.0.71 - Mon Jul 20 22:56:31 GMT 2020 - cyborgmas: - Load Modded Datapacks in DatapackScreen, before world creation (#6913) - -========= -Build: 1.16.1-32.0.70 - Sat Jul 18 22:35:53 GMT 2020 - tterrag: - Fix inconsistencies with model/blockstate datagen - -========= -Build: 1.16.1-32.0.69 - Fri Jul 17 17:35:47 GMT 2020 - dev: - Filter duplicate mod files from mod file scan data (#6855) - -========= -Build: 1.16.1-32.0.68 - Thu Jul 16 21:56:30 GMT 2020 - lexmanos: - Fixed Forge commands. Closes #6973 Closes #6974 Closes #6976 - -========= -Build: 1.16.1-32.0.67 - Wed Jul 15 19:30:53 GMT 2020 - jaredlll08: - Added an event for registering commands. closes #6968 (#6969) - -========= -Build: 1.16.1-32.0.66 - Tue Jul 14 00:15:41 GMT 2020 - darklime: - Make all functions in Style common. (#6931) - -========= -Build: 1.16.1-32.0.65 - Mon Jul 13 22:44:53 GMT 2020 - 55965249+seymourimadeit: - Mark Raid.WaveMembers as an extensible enum. (#6878) - -========= -Build: 1.16.1-32.0.64 - Mon Jul 13 22:17:58 GMT 2020 - lexmanos: - Fix checkPatches task. Closes #6956 - Fix patched in method using srg name. Closes #6965 - Fix capabilities not being collected for ClientWorld. Closes #6966 - Fix TagEmptyCondition using client side copy of tags instead of server. Closes #6949 - Fix ExtendedButton using narrator text. Closes #6958, Closes #6959 - Fix misaligned patch in RepairContainer. Closes #6950, Closes #6953 - Fix LivingJumpEvent not being fired for players jumping horses. Closes #6929 - Remove extra getToughness method in ArmorItem. Closes #6970 - Remove GetCollisionBoxesEvent. Closes #6921 - -========= -Build: 1.16.1-32.0.63 - Fri Jul 10 22:28:22 GMT 2020 - richard: - Fix race condition with DeferredRegister for custom registries (#6951) - -========= -Build: 1.16.1-32.0.62 - Fri Jul 10 17:49:51 GMT 2020 - sciwhiz12: - Remove hooks into beacon base/payments. Vanilla uses tags now for extensibility. (#6948) - -========= -Build: 1.16.1-32.0.61 - Wed Jul 08 21:33:38 GMT 2020 - jaredlll08: - Expose the DataPackRegistries instance to the AddReloadListenerEvent (#6933) - -========= -Build: 1.16.1-32.0.60 - Wed Jul 08 21:13:18 GMT 2020 - sciwhiz12: - Fix canRepair not being set true as default (#6936) - - Closes #6934 and #6935 - -========= -Build: 1.16.1-32.0.59 - Wed Jul 08 14:56:39 GMT 2020 - gigaherz: - Fix particles sometimes "losing" the lightmap and drawing fullbright. - - gigaherz: - Fix misaligned patch causing LivingEquipmentChangeEvent to never be posted. - -========= -Build: 1.16.1-32.0.57 - Mon Jul 06 21:32:33 GMT 2020 - jdlogic: - Add simple patch checker and cleanup patches (#6851) - - * Add simple patch checker and cleanup patches - - * Address comments - * move task implementation - * genPatches is now finalized by checkPatches - * the S2S artifacts are automatically removed - * added class and method access checking - -========= -Build: 1.16.1-32.0.56 - Mon Jul 06 21:27:02 GMT 2020 - richard: - Fix the modifier combined name for keybinds displaying two pluses outside of forgedev #6901 (#6902) - -========= -Build: 1.16.1-32.0.55 - Mon Jul 06 21:12:45 GMT 2020 - richard: - Fix harvest level and tool type not actually getting set #6906 (#6922) - -========= -Build: 1.16.1-32.0.54 - Mon Jul 06 20:46:01 GMT 2020 - richard: - Reimplement ITeleporter Patches (#6886) - -========= -Build: 1.16.1-32.0.53 - Mon Jul 06 20:39:37 GMT 2020 - Mysterious-Dev: - Add function to add items with the same behavior as the pumpkin for enderman (#6890) - -========= -Build: 1.16.1-32.0.52 - Mon Jul 06 20:33:17 GMT 2020 - richard: - Custom Item integration with Piglins (#6914) - -========= -Build: 1.16.1-32.0.51 - Mon Jul 06 20:20:02 GMT 2020 - ichttt: - Some dead code cleanup, and re-implement some bed hooks. (#6903) - -========= -Build: 1.16.1-32.0.50 - Mon Jul 06 20:06:39 GMT 2020 - diesieben07: - Fix missing null checks in ForgeIngameGui (#6907) - -========= -Build: 1.16.1-32.0.49 - Mon Jul 06 19:50:02 GMT 2020 - sciwhiz12: - Fix swap offhand keybind not working in GUIs (#6920) - -========= -Build: 1.16.1-32.0.48 - Mon Jul 06 19:42:07 GMT 2020 - cyborgmas: - New AddReloadListenerEvent that gathers server side data reload handlers. (#6849) - -========= -Build: 1.16.1-32.0.47 - Fri Jul 03 12:40:42 GMT 2020 - gigaherz: - Attempt to use a more compatible method to initialize stencil support. - In case the separate attachments don't work for everyone, there's a new setting to choose the combined attachment. - -========= -Build: 1.16.1-32.0.46 - Fri Jul 03 04:00:22 GMT 2020 - gigaherz: - Update copyright year to 2020. - - gigaherz: - Fix multi-layer item rendering. - -========= -Build: 1.16.1-32.0.44 - Thu Jul 02 17:17:45 GMT 2020 - gigaherz: - Model system improvements: - - Port some things I did in 1.14 which I couldn't do in 1.15 due to breaking changes. - - Fix multi-layer block models not working (1.16 RenderType doesn't override toString the same way anymore) - - Implement multi-layer item rendering. - - Improve CompositeModel submodel data passing. - -========= -Build: 1.16.1-32.0.43 - Thu Jul 02 12:54:03 GMT 2020 - supermartijn642: - Include model data in getQuads call (#6884) - - The model data wasn't included when getting quads from specific sides, but was when getting quads for side = null. - - cyborgmas: - Pass matrixstack in tooltip render events (#6885) - -========= -Build: 1.16.1-32.0.41 - Thu Jul 02 05:54:25 GMT 2020 - tterrag: - Fix improper handling of baked lighting in forge light pipeline - - Closes #6812 - -========= -Build: 1.16.1-32.0.40 - Thu Jul 02 01:59:30 GMT 2020 - pupnewfster: - Fix FMLServerAboutToStartEvent being fired too late on the integrated server https://github.com/MinecraftForge/MinecraftForge/issues/6859 - -========= -Build: 1.16.1-32.0.39 - Wed Jul 01 18:14:25 GMT 2020 - ichttt: - Fix miss-aligned patch ItemEntity (#6895) - -========= -Build: 1.16.1-32.0.38 - Tue Jun 30 20:19:32 GMT 2020 - melanx: - Add hoe tool type (#6872) - -========= -Build: 1.16.1-32.0.36 - Tue Jun 30 20:09:21 GMT 2020 - curle: - Allow any armor to have custom knockback resistance (#6877) - -========= -Build: 1.16.1-32.0.35 - Tue Jun 30 19:57:32 GMT 2020 - diesieben07: - Add senderUUID to ClientChatReceivedEvent (#6881) - -========= -Build: 1.16.1-32.0.34 - Tue Jun 30 02:33:58 GMT 2020 - lexmanos: - Re-write checkATs function and automate making Items/Blocks public. - -========= -Build: 1.16.1-32.0.33 - Tue Jun 30 02:10:14 GMT 2020 - cpw: - Reorganize modloading on the dediserver. This removes the DedicatedServer parameter from the FMLDedicatedServerSetupEvent. - Code for customizing the server instance should be moved to the ServerAboutToStartEvent or similar, where the server instance - is available. - - This reorganization means that mods will load fully before the server is even constructed, or the server properties loaded. We also move the EULA right to the front so we don't have to wait for bootstrap. - - This should fix the problems with mods which customize world data and other things. - - Signed-off-by: cpw - -========= -Build: 1.16.1-32.0.32 - Mon Jun 29 23:43:01 GMT 2020 - cyborgmas: - Fix datagen resolving tags and exploding. (#6865) - -========= -Build: 1.16.1-32.0.31 - Mon Jun 29 23:37:30 GMT 2020 - mattmess1221: - Fix Language.javaLocale parsing (#6862) - -========= -Build: 1.16.1-32.0.30 - Mon Jun 29 22:58:30 GMT 2020 - diesieben07: - Fix IItemHandler wrappers for chests not updating both chests (#6875) - -========= -Build: 1.16.1-32.0.29 - Mon Jun 29 21:08:55 GMT 2020 - lexmanos: - Fix missed patch in PlayerList and EntitySelectioonContext. Closes #6846 Closes #6850 - -========= -Build: 1.16.1-32.0.27 - Mon Jun 29 20:09:12 GMT 2020 - richard: - Fix access levels being hardcoded to private via patch overriding AT entry (#6848) - -========= -Build: 1.16.1-32.0.26 - Mon Jun 29 19:42:50 GMT 2020 - lexmanos: - Fix tag related issues when connecting to a vanilla server. - -========= -Build: 1.16.1-32.0.25 - Sun Jun 28 22:08:15 GMT 2020 - lexmanos: - Fix Forge's internal handler being registered in wrong place. - Fix double call to loader end. - -========= -Build: 1.16.1-32.0.24 - Sat Jun 27 22:50:54 GMT 2020 - gigaherz: - Add a model loader that lets mods specify different models for different perspectives. - Allow custom models to reference vanilla item models as child models. - -========= -Build: 1.16.1-32.0.23 - Fri Jun 26 23:55:23 GMT 2020 - cyborgmas: - fix misapplied patch - - also sneak in an import patch removal - -========= -Build: 1.16.1-32.0.21 - Fri Jun 26 22:40:19 GMT 2020 - lexmanos: - Fix blocks being harvested with incorrect tools. - -========= -Build: 1.16.1-32.0.20 - Fri Jun 26 19:53:02 GMT 2020 - lexmanos: - Make installer use MCPConfig version to identify MC assets. - -========= -Build: 1.16.1-32.0.19 - Fri Jun 26 18:27:49 GMT 2020 - cpw: - Tweak the server startup a bit, make sure methods that can't work because they run before a server exists explode saying so. - Also fix other launch profiles. - - Signed-off-by: cpw - -========= -Build: 1.16.1-32.0.18 - Fri Jun 26 16:56:37 GMT 2020 - lexmanos: - Fix dedicated server loading by constructing mods before data packs are created. - -========= -Build: 1.16.1-32.0.17 - Fri Jun 26 15:20:37 GMT 2020 - gigaherz: - Fix create method. - Fix test mods not loading correctly. - -========= -Build: 1.16.1-32.0.16 - Fri Jun 26 14:43:19 GMT 2020 - gigaherz: - Reintroduce missed patch in EntityClassification. - -========= -Build: 1.16.1-32.0.15 - Fri Jun 26 13:55:42 GMT 2020 - cyborgmas: - Include a getter for the matrix stack in OverlayEvent (#6834) - -========= -Build: 1.16.1-32.0.14 - Fri Jun 26 13:23:07 GMT 2020 - cyborgmas: - Fix block render types not being properly applied to item entities (#6832) - -========= -Build: 1.16.1-32.0.13 - Fri Jun 26 13:05:18 GMT 2020 - mods.itsmeow: - [1.16.x] Allow GlobalEntityTypeAttributes' EntityType -> AttributeModifierMap to be added to (#6822) - - * Make GlobalEntityTypeAttributes map able to be added to - - * Split get patch into two lines - - * Favor Forge's map over vanilla - -========= -Build: 1.16.1-32.0.12 - Fri Jun 26 12:59:19 GMT 2020 - cyborgmas: - Fixed creative screen arrows (#6827) - - yunus1903: - Added call to method for tooltip with FontRenderer (#6831) - -========= -Build: 1.16.1-32.0.10 - Fri Jun 26 12:36:59 GMT 2020 - curle: - Retarget Block.Properties patch to the new AbstractBlock, reintroduce harvestLevel and harvestTool fields (#6819) - - * Retarget Block.Properties patch to the new AbstractBlock, reintroduces the harvestLevel and harvestTool fields. - - * Slight adjustment to fix the lootTableSupplier. - -========= -Build: 1.16.1-32.0.9 - Fri Jun 26 12:31:37 GMT 2020 - yunus1903: - Fixed sneaking while swimming (#6817) - -========= -Build: - Fri Jun 26 12:25:07 GMT 2020 - cyborgmas: - Fixed tooltip rendering issues (#6815) - -========= -Build: 1.16.1-32.0.7 - Fri Jun 26 02:30:54 GMT 2020 - cyborgmas: - Fixed villager trades having non-applicable enchants - - Also added an AT at lex's request - -========= -Build: 1.16.1-32.0.6 - Fri Jun 26 01:52:19 GMT 2020 - cyborgmas: - Fix locate command (#6811) - - cyborgmas: - Fix block drops (#6810) - - contact: - Add missing patch to ScreenShotHelper (#6809) - - Adds the missed patch back - - yunus1903: - Updated MDK mods.toml versions (#6808) - - cyborgmas: - Fix locate command (#6811) - - cyborgmas: - Fix block drops (#6810) - - contact: - Add missing patch to ScreenShotHelper (#6809) - - Adds the missed patch back - - yunus1903: - Updated MDK mods.toml versions (#6808) - - cyborgmas: - Fix locate command (#6811) - - cyborgmas: - Fix block drops (#6810) - - contact: - Add missing patch to ScreenShotHelper (#6809) - - Adds the missed patch back - - yunus1903: - Updated MDK mods.toml versions (#6808) - -========= -Build: 1.16.1-32.0.2 - Fri Jun 26 01:41:51 GMT 2020 - lexmanos: - Rework BlockSnapshot and fix client notifications. Closes #6807 - -========= -Build: 1.16.1-32.0.1 - Thu Jun 25 23:24:48 GMT 2020 - lexmanos: - Bump MCPConfig version. diff --git a/gradle.properties b/gradle.properties index 878bf1f7..8b5f77f1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,59 @@ # Sets default memory used for gradle commands. Can be overridden by user or command line properties. # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx3G -org.gradle.daemon=false \ No newline at end of file +org.gradle.daemon=false + + +## Environment Properties + +# The Minecraft version must agree with the Forge version to get a valid artifact +minecraft_version=1.20.1 +# The Minecraft version range can use any release version of Minecraft as bounds. +# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly +# as they do not follow standard versioning conventions. +minecraft_version_range=[1.20.1,1.21) +# The Forge version must agree with the Minecraft version to get a valid artifact +forge_version=47.3.0 +# The Forge version range can use any version of Forge as bounds or match the loader version range +forge_version_range=[47,) +# The loader version range can only use the major version of Forge/FML as bounds +loader_version_range=[47,) +# The mapping channel to use for mappings. +# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"]. +# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin. +# +# | Channel | Version | | +# |-----------|----------------------|--------------------------------------------------------------------------------| +# | official | MCVersion | Official field/method names from Mojang mapping files | +# | parchment | YYYY.MM.DD-MCVersion | Open community-sourced parameter names and javadocs layered on top of official | +# +# You must be aware of the Mojang license when using the 'official' or 'parchment' mappings. +# See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md +# +# Parchment is an unofficial project maintained by ParchmentMC, separate from Minecraft Forge. +# Additional setup is needed to use their mappings, see https://parchmentmc.org/docs/getting-started +mapping_channel=official +# The mapping version to query from the mapping channel. +# This must match the format required by the mapping channel. +mapping_version=1.20.1 + + +## Mod Properties + +# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} +# Must match the String constant located in the main mod class annotated with @Mod. +mod_id=magus +# The human-readable display name for the mod. +mod_name=Magus +# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. +mod_license=All Rights Reserved +# The mod version. See https://semver.org/ +mod_version=1.0.0 +# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. +# This should match the base package used for the mod sources. +# See https://maven.apache.org/guides/mini/guide-naming-conventions.html +mod_group_id=com.amuzil.omegasource +# The authors of the mod. This is a simple text string that is used for display purposes in the mod list. +mod_authors=FavouriteDragon, Caliburs, AidanDavis99, Mahtaran +# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. +mod_description=Skill API part of Magus. \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c0..c1962a79 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 05679dc3..2617362f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0c..aeb74cbb 100644 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,98 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # 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 +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # 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 - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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 @@ -106,80 +137,109 @@ 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 +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac 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 +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # 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\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg 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" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd32..93e3f59f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 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 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..93f1b806 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,13 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven { + name = 'MinecraftForge' + url = 'https://maven.minecraftforge.net/' + } + } +} + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0' +} \ No newline at end of file diff --git a/src/main/java/com/amuzil/omegasource/magus/Magus.java b/src/main/java/com/amuzil/omegasource/magus/Magus.java new file mode 100644 index 00000000..0aefc573 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/Magus.java @@ -0,0 +1,132 @@ +package com.amuzil.omegasource.magus; + +import com.amuzil.omegasource.magus.entity.AvatarEntities; +import com.amuzil.omegasource.magus.input.InputModule; +import com.amuzil.omegasource.magus.input.KeyboardMouseInputModule; +import com.amuzil.omegasource.magus.input.MouseMotionModule; +import com.amuzil.omegasource.magus.network.MagusNetwork; +import com.amuzil.omegasource.magus.registry.Registries; +import com.amuzil.omegasource.magus.skill.forms.FormDataRegistry; +import com.amuzil.omegasource.magus.skill.modifiers.ModifiersRegistry; +import com.amuzil.omegasource.magus.skill.skill.Skills; +import com.amuzil.omegasource.magus.skill.test.avatar.AvatarCommand; +import com.amuzil.omegasource.magus.skill.util.capability.CapabilityHandler; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.entity.EntityRenderers; +import net.minecraft.client.renderer.entity.ThrownItemRenderer; +import net.minecraft.world.entity.Entity; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.server.ServerStartingEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; +import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +// The value here should match an entry in the META-INF/mods.toml file + +/** + * Note! This is a separate repository for a feature of Magus. As such, + * this file will be condensed into Magus', the modid will be changed, e.t.c. + * This is so Mahtaran and I can work on features of Magus separately. + */ + +@Mod(Magus.MOD_ID) +public class Magus { + // MOD ID reference + public static final String MOD_ID = "magus"; + // Directly reference a log4j logger. + public static final Logger LOGGER = LogManager.getLogger(); + + //todo: move these to a better place + public static InputModule keyboardMouseInputModule; + public static InputModule mouseMotionModule; + + public Magus() { + // Register capabilities + FMLJavaModLoadingContext.get().getModEventBus().addListener(CapabilityHandler::registerCapabilities); + // attach capabilities + MinecraftForge.EVENT_BUS.addGenericListener(Entity.class, CapabilityHandler::attachEntityCapability); + // Register the setup method for mod loading + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); + // Register the enqueueIMC method for mod loading + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::enqueueIMC); + // Register the processIMC method for mod loading + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::processIMC); + // Register the doClientStuff method for mod loading + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::doClientStuff); + + // Register ourselves for server and other game events we are interested in + MinecraftForge.EVENT_BUS.register(this); + + // Register Testing Entities + // NOTE: This is strictly for testing and to be deleted later + AvatarEntities.register(FMLJavaModLoadingContext.get().getModEventBus()); + } + + private void setup(final FMLCommonSetupEvent event) { + // some pre init code + Registries.init(); + CapabilityHandler.initialiseCaps(); + MagusNetwork.registerMessages(); + ModifiersRegistry.init(); + Skills.registerSkills(); + } + + private void doClientStuff(final FMLClientSetupEvent event) { + // do something that can only be done on the client + // Register the input modules + keyboardMouseInputModule = new KeyboardMouseInputModule(); + mouseMotionModule = new MouseMotionModule(); + // TODO - call this anytime the key mappings are updated + // Assign input data to forms + FormDataRegistry.init(); + ModifiersRegistry.clientSetup(); + } + + private void enqueueIMC(final InterModEnqueueEvent event) {} + + private void processIMC(final InterModProcessEvent event) {} + + // You can use SubscribeEvent and let the Event Bus discover methods to call + @SubscribeEvent + public void onServerStarting(ServerStartingEvent event) { + // do something when the server starts + LOGGER.info("HELLO from server starting"); + LOGGER.info("Setting up Avatar commands..."); + AvatarCommand.register(event.getServer().getCommands().getDispatcher()); + } + + // You can use EventBusSubscriber to automatically subscribe events on the contained class (this is subscribing to the MOD + // Event bus for receiving Registry Events) +// @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) +// public static class RegistryEvents { +// @SubscribeEvent +// public static void onBlocksRegistry(final RegistryEvent.Register blockRegistryEvent) { +// // register a new block here +// LOGGER.info("HELLO from Register Block"); +// } +// } + + //Copied for 1.19 + @Mod.EventBusSubscriber(modid = MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) + public static class ClientModEvents { + @SubscribeEvent + public static void onClientSetup(FMLClientSetupEvent event) { + // Some client setup code + LOGGER.info("HELLO FROM CLIENT SETUP"); + + InputModule.determineMotionKeys(); + EntityRenderers.register(AvatarEntities.AIR_PROJECTILE_ENTITY_TYPE.get(), ThrownItemRenderer::new); + EntityRenderers.register(AvatarEntities.WATER_PROJECTILE_ENTITY_TYPE.get(), ThrownItemRenderer::new); + EntityRenderers.register(AvatarEntities.EARTH_PROJECTILE_ENTITY_TYPE.get(), ThrownItemRenderer::new); + EntityRenderers.register(AvatarEntities.FIRE_PROJECTILE_ENTITY_TYPE.get(), ThrownItemRenderer::new); + + LOGGER.info("MINECRAFT NAME >> {}", Minecraft.getInstance().getUser().getName()); + } + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/entity/AvatarEntities.java b/src/main/java/com/amuzil/omegasource/magus/entity/AvatarEntities.java new file mode 100644 index 00000000..29af4c55 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/entity/AvatarEntities.java @@ -0,0 +1,44 @@ +package com.amuzil.omegasource.magus.entity; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.entity.collision.ElementCollision; +import com.amuzil.omegasource.magus.entity.projectile.AirProjectile; +import com.amuzil.omegasource.magus.entity.projectile.EarthProjectile; +import com.amuzil.omegasource.magus.entity.projectile.FireProjectile; +import com.amuzil.omegasource.magus.entity.projectile.WaterProjectile; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.MobCategory; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + + +public class AvatarEntities { + public static final DeferredRegister> ENTITY_TYPES = + DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, Magus.MOD_ID); + + public static final RegistryObject> AIR_PROJECTILE_ENTITY_TYPE = + ENTITY_TYPES.register("air_projectile", () -> EntityType.Builder.of(AirProjectile::new, MobCategory.MISC) + .sized(0.5f, 0.5f).build("air_projectile")); + + public static final RegistryObject> WATER_PROJECTILE_ENTITY_TYPE = + ENTITY_TYPES.register("water_projectile", () -> EntityType.Builder.of(WaterProjectile::new, MobCategory.MISC) + .sized(0.5f, 0.5f).build("water_projectile")); + + public static final RegistryObject> EARTH_PROJECTILE_ENTITY_TYPE = + ENTITY_TYPES.register("earth_projectile", () -> EntityType.Builder.of(EarthProjectile::new, MobCategory.MISC) + .sized(0.5f, 0.5f).build("earth_projectile")); + + public static final RegistryObject> FIRE_PROJECTILE_ENTITY_TYPE = + ENTITY_TYPES.register("fire_projectile", () -> EntityType.Builder.of(FireProjectile::new, MobCategory.MISC) + .sized(0.5f, 0.5f).build("fire_projectile")); + + public static final RegistryObject> COLLISION_ENTITY_TYPE = + ENTITY_TYPES.register("element_collision", () -> EntityType.Builder.of(ElementCollision::new, MobCategory.MISC) + .sized(0.5f, 0.5f).build("element_collision")); + + public static void register(IEventBus eventBus) { + ENTITY_TYPES.register(eventBus); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/entity/ElementProjectile.java b/src/main/java/com/amuzil/omegasource/magus/entity/ElementProjectile.java new file mode 100644 index 00000000..92d84d35 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/entity/ElementProjectile.java @@ -0,0 +1,275 @@ +package com.amuzil.omegasource.magus.entity; + +import com.amuzil.omegasource.magus.entity.collision.ElementCollision; +import com.amuzil.omegasource.magus.entity.projectile.AirProjectile; +import com.amuzil.omegasource.magus.entity.projectile.EarthProjectile; +import com.amuzil.omegasource.magus.entity.projectile.FireProjectile; +import com.amuzil.omegasource.magus.entity.projectile.WaterProjectile; +import com.amuzil.omegasource.magus.skill.elements.Element; +import com.amuzil.omegasource.magus.skill.elements.Elements; +import com.amuzil.omegasource.magus.skill.forms.Form; +import com.amuzil.omegasource.magus.skill.forms.Forms; +import com.lowdragmc.photon.client.fx.EntityEffect; +import com.lowdragmc.photon.client.fx.FX; +import net.minecraft.client.Minecraft; +import net.minecraft.network.syncher.EntityDataAccessor; +import net.minecraft.network.syncher.EntityDataSerializers; +import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.monster.Blaze; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.projectile.ItemSupplier; +import net.minecraft.world.entity.projectile.Projectile; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.gameevent.GameEvent; +import net.minecraft.world.phys.*; + +import javax.annotation.Nullable; +import java.util.List; +import java.util.Optional; +import java.util.function.Predicate; + +import static com.amuzil.omegasource.magus.skill.test.avatar.AvatarFormRegistry.*; + + +public abstract class ElementProjectile extends Projectile implements ItemSupplier { + public static final ItemStack PROJECTILE_ITEM = new ItemStack(Blocks.AIR); + private static final EntityDataAccessor ID_FLAGS = SynchedEntityData.defineId(ElementProjectile.class, EntityDataSerializers.BYTE); + private static final EntityDataAccessor PIERCE_LEVEL = SynchedEntityData.defineId(ElementProjectile.class, EntityDataSerializers.BYTE); + protected boolean leftOwner; + protected boolean hasBeenShot; + private int life; + public int ttk = 100; + public boolean arcActive = false; + public boolean hasElement = false; + public Form form; + + public ElementProjectile(EntityType type, Level level) { + super(type, level); + } + + public ElementProjectile(EntityType entityType, double x, double y, double z, Level level, Form form) { + this(entityType, level); + this.setPos(x, y, z); + this.setNoGravity(true); + this.form = form; + } + + public ElementProjectile(EntityType entityType, LivingEntity livingEntity, Level level, Form form) { + this(entityType, livingEntity.getX(), livingEntity.getEyeY(), livingEntity.getZ(), level, form); + this.setOwner(livingEntity); + } + + public abstract Element getElement(); + + public void tick() { + if (!this.hasBeenShot) { + this.gameEvent(GameEvent.PROJECTILE_SHOOT, this.getOwner()); + this.hasBeenShot = true; + } + + if (!this.leftOwner) { + this.leftOwner = this.checkLeftOwner(); + } + + super.tick(); + } + + @Nullable + protected EntityHitResult findHitEntity(Vec3 pos, Vec3 delta) { + return getEntityHitResult(this.level(), this, pos, delta, + this.getBoundingBox().expandTowards(this.getDeltaMovement()).inflate(2.0D), + this::canHitEntity, 0.3F); + } + + @Nullable + public static EntityHitResult getEntityHitResult(Level level, Entity thisEntity, Vec3 pos, Vec3 delta, AABB thisAABB, Predicate canBeHit, float scale) { + double maxDist = Double.MAX_VALUE; + Entity entity = null; + + for(Entity otherEntity : level.getEntities(thisEntity, thisAABB, canBeHit)) { +// System.out.println("ENTITY NEARBY: " + otherEntity); + AABB aabb = otherEntity.getBoundingBox().inflate(scale); + Optional optional = aabb.clip(pos, delta); + if (optional.isPresent()) { + double dist = pos.distanceToSqr(optional.get()); + if (dist < maxDist) { + entity = otherEntity; + maxDist = dist; + } + } + } + + return entity == null ? null : new EntityHitResult(entity); + } + + public boolean canHitEntity(Entity otherEntity) { + if (!otherEntity.canBeHitByProjectile()) { + return false; + } else { + Entity entity = this.getOwner(); + if (entity != null) { + if (otherEntity instanceof ElementProjectile other) { +// System.out.println("arcActive: " + other.arcActive); + if (other.arcActive) + return true; + } + } + return entity == null || this.leftOwner || !entity.isPassengerOfSameVehicle(otherEntity); + } + } + + public void setTimeToKill(int ticks) { + this.ttk = ticks; + } + + protected void tickDespawn() { + ++life; + if (life >= ttk) { +// System.out.println("BYE BYE BBY " + life + " / " + ttk); + this.discard(); + } + } + + @Override + public boolean isPickable() { + return true; + } + + @Override + protected void defineSynchedData() { + this.entityData.define(ID_FLAGS, (byte)0); + this.entityData.define(PIERCE_LEVEL, (byte)0); + } + + public boolean checkLeftOwner() { + Entity owner = this.getOwner(); + if (owner != null) { + for(Entity entity1 : this.level().getEntities(this, this.getBoundingBox().expandTowards(this.getDeltaMovement()).inflate(1.0D), (entity) -> { + return !entity.isSpectator() && entity.isPickable(); + })) { + if (entity1.getRootVehicle() == owner.getRootVehicle()) { + return false; + } + } + } + return true; + } + + public boolean isNoPhysics() { + if (!this.level().isClientSide) { + return this.noPhysics; + } else { + return (this.entityData.get(ID_FLAGS) & 2) != 0; + } + } + +// public void handleEntityEvent(byte data) { +// if (data == 3) { +// System.out.println("HANDLE ENTITY EVENT"); +// for(int i = 0; i < 8; ++i) { +// this.level().addParticle(this.getParticle(), this.getX(), this.getY(), this.getZ(), 0.0D, 0.0D, 0.0D); +// } +// } +// } + + protected abstract void onHitEntity(EntityHitResult entityHitResult); + + protected void onHitBlock(BlockHitResult blockHitResult) { +// super.onHitBlock(blockHitResult); + this.discard(); + } + + protected void onHit(HitResult hitResult) { + super.onHit(hitResult); + if (!this.level().isClientSide) { + this.level().broadcastEntityEvent(this, (byte)3); +// this.discard(); + } + } + + public void control(float scale, Form form) { + this.arcActive = true; + if (form == Forms.NULL) { + this.hasElement = true; + this.setTimeToKill(2400); + } + Entity owner = this.getOwner(); + assert owner != null; + Vec3[] pose = new Vec3[]{owner.position(), owner.getLookAngle()}; + pose[1] = pose[1].scale((scale)).add((0), (owner.getEyeHeight()), (0)); + Vec3 newPos = pose[1].add(pose[0]); + this.setPos(newPos.x, newPos.y, newPos.z); + } + + @Override + public ItemStack getItem() { + return PROJECTILE_ITEM; + } + + public static ElementProjectile createElementEntity(Form form, Element element, ServerPlayer player, ServerLevel level) { + return switch (element.type()) { + case AIR -> new AirProjectile(player, level); + case WATER -> new WaterProjectile(player, level); + case EARTH -> new EarthProjectile(player, level); + case FIRE -> new FireProjectile(player, level); + }; + } + + // Method to start initial visual effect + public void startEffect(Form form, Player player) { + this.form = form; // NOTE: Need this to ensure form is set client-side before onHit event + FX fx = null; + if (getElement().equals(Elements.FIRE)) { + if (form.name().equals("strike")) + fx = fire_bloom_perma; + if (form.name().equals("force")) + fx = blue_fire_perma; + if (form.name().equals("arc")) { + fx = null; + arcActive = true; + } + if (form.name().equals("null")) { + fx = fire_bloom_perma; + arcActive = true; + hasElement = true; + this.setTimeToKill(2400); + } + if (form.name().equals("step")) + fx = blue_fire_perma; + } else if (getElement().equals(Elements.WATER)) { + if (form.name().equals("strike")) + fx = water; + if (form.name().equals("force")) + fx = water; + if (form.name().equals("arc")) { + fx = water; + arcActive = true; + } + if (form.name().equals("null")) { + fx = water; + arcActive = true; + hasElement = true; + this.setTimeToKill(2400); + } + if (form.name().equals("step")) + fx = blue_fire_perma; + } + if (fx != null) { + EntityEffect entityEffect = new EntityEffect(fx, this.level(), this); + entityEffect.start(); + } + } + + public static List getNearbyEntities(Entity entity, double blocksRadius) { + AABB aabb = entity.getBoundingBox().expandTowards(entity.getDeltaMovement()).inflate(blocksRadius); + assert Minecraft.getInstance().level != null; + return Minecraft.getInstance().level.getEntities(entity, aabb).stream().toList(); + } +} \ No newline at end of file diff --git a/src/main/java/com/amuzil/omegasource/magus/entity/collision/ElementCollision.java b/src/main/java/com/amuzil/omegasource/magus/entity/collision/ElementCollision.java new file mode 100644 index 00000000..3fcc0734 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/entity/collision/ElementCollision.java @@ -0,0 +1,247 @@ +package com.amuzil.omegasource.magus.entity.collision; + +import com.amuzil.omegasource.magus.entity.AvatarEntities; +import com.amuzil.omegasource.magus.entity.ElementProjectile; +import com.amuzil.omegasource.magus.skill.elements.Element; +import com.lowdragmc.photon.client.fx.EntityEffect; +import net.minecraft.core.BlockPos; +import net.minecraft.core.particles.ParticleOptions; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.network.syncher.EntityDataAccessor; +import net.minecraft.network.syncher.EntityDataSerializers; +import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.monster.Blaze; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.*; +import net.minecraft.world.phys.shapes.VoxelShape; + +import javax.annotation.Nullable; +import java.util.Optional; +import java.util.function.Predicate; + +import static com.amuzil.omegasource.magus.skill.test.avatar.AvatarFormRegistry.orb_bloom; + + +public class ElementCollision extends ElementProjectile { + private static final EntityDataAccessor ID_FLAGS = SynchedEntityData.defineId(ElementCollision.class, EntityDataSerializers.BYTE); + private static final EntityDataAccessor PIERCE_LEVEL = SynchedEntityData.defineId(ElementCollision.class, EntityDataSerializers.BYTE); + private int life; + private int ttk = 10; + + public ElementCollision(EntityType type, Level level) { + super(type, level); + } + + public ElementCollision(double x, double y, double z, Level level) { + this(AvatarEntities.COLLISION_ENTITY_TYPE.get(), level); + this.setPos(x, y, z); + } + + public ElementCollision(LivingEntity livingEntity, Level level) { + this(livingEntity.getX(), livingEntity.getEyeY(), livingEntity.getZ(), level); + this.setOwner(livingEntity); + this.setNoGravity(true); + } + + @Override + public Element getElement() { + return null; + } + + public void tick() { + super.tick(); + boolean flag = this.isNoPhysics(); + Vec3 deltaMovement = this.getDeltaMovement(); + if (this.xRotO == 0.0F && this.yRotO == 0.0F) { + double distance = deltaMovement.horizontalDistance(); + this.setYRot((float)(Mth.atan2(deltaMovement.x, deltaMovement.z) * (double)(180F / (float)Math.PI))); + this.setXRot((float)(Mth.atan2(deltaMovement.y, distance) * (double)(180F / (float)Math.PI))); + this.yRotO = this.getYRot(); + this.xRotO = this.getXRot(); + } + + BlockPos blockpos = this.blockPosition(); + BlockState blockstate = this.level().getBlockState(blockpos); + if (!blockstate.isAir() && !flag) { + VoxelShape voxelshape = blockstate.getCollisionShape(this.level(), blockpos); + if (!voxelshape.isEmpty()) { + Vec3 vec31 = this.position(); + + for(AABB aabb : voxelshape.toAabbs()) { + if (aabb.move(blockpos).contains(vec31)) { + break; + } + } + } + } + + if (this.isInWaterOrRain() || blockstate.is(Blocks.POWDER_SNOW) || this.isInFluidType((fluidType, height) -> this.canFluidExtinguish(fluidType))) { + this.clearFire(); + } + + Vec3 pos = this.position(); + Vec3 delta = pos.add(deltaMovement); + HitResult hitresult = this.level().clip(new ClipContext(pos, delta, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)); + if (hitresult.getType() != HitResult.Type.MISS) { + delta = hitresult.getLocation(); + } + + while(!this.isRemoved()) { + if (!this.level().isClientSide) { + this.tickDespawn(); + } + EntityHitResult entityhitresult = this.findHitEntity(pos, delta); + if (entityhitresult != null) { + hitresult = entityhitresult; + } + + if (hitresult != null && hitresult.getType() == HitResult.Type.ENTITY) { + assert hitresult instanceof EntityHitResult; + Entity entity = ((EntityHitResult)hitresult).getEntity(); + Entity owner = this.getOwner(); + if (entity instanceof Player && owner instanceof Player && !((Player)owner).canHarmPlayer((Player)entity)) { + hitresult = null; + entityhitresult = null; + } + } + + if (hitresult != null && hitresult.getType() != HitResult.Type.MISS && !flag) { + if (net.minecraftforge.event.ForgeEventFactory.onProjectileImpact(this, hitresult)) + break; + this.onHit(hitresult); + this.hasImpulse = true; + break; + } + + if (entityhitresult == null) { + break; + } + + hitresult = null; + } + deltaMovement = this.getDeltaMovement(); + double d5 = deltaMovement.x; + double d6 = deltaMovement.y; + double d1 = deltaMovement.z; + + double d7 = this.getX() + d5; + double d2 = this.getY() + d6; + double d3 = this.getZ() + d1; + double d4 = deltaMovement.horizontalDistance(); + if (flag) { + this.setYRot((float)(Mth.atan2(-d5, -d1) * (double)(180F / (float)Math.PI))); + } else { + this.setYRot((float)(Mth.atan2(d5, d1) * (double)(180F / (float)Math.PI))); + } + + this.setXRot((float)(Mth.atan2(d6, d4) * (double)(180F / (float)Math.PI))); + this.setXRot(lerpRotation(this.xRotO, this.getXRot())); + this.setYRot(lerpRotation(this.yRotO, this.getYRot())); + + float f = 0.99F; + this.setDeltaMovement(deltaMovement.scale((double)f)); + if (!this.isNoGravity() && !flag) { + Vec3 vec34 = this.getDeltaMovement(); + this.setDeltaMovement(vec34.x, vec34.y - (double)0.05F, vec34.z); + } + + this.setPos(d7, d2, d3); + this.checkInsideBlocks(); + } + + @Nullable + protected EntityHitResult findHitEntity(Vec3 pos, Vec3 delta) { + return getEntityHitResult(this.level(), this, pos, delta, + this.getBoundingBox().expandTowards(this.getDeltaMovement()).inflate(2.0D), + this::canHitEntity, 0.3F); + } + + @Nullable + public static EntityHitResult getEntityHitResult(Level level, Entity thisEntity, Vec3 pos, Vec3 delta, AABB thisAABB, Predicate canBeHit, float scale) { + double maxDist = Double.MAX_VALUE; + Entity entity = null; + + for(Entity otherEntity : level.getEntities(thisEntity, thisAABB, canBeHit)) { +// System.out.println("ENTITY NEARBY: " + otherEntity); + AABB aabb = otherEntity.getBoundingBox().inflate(scale); + Optional optional = aabb.clip(pos, delta); + if (optional.isPresent()) { + double dist = pos.distanceToSqr(optional.get()); + if (dist < maxDist) { + entity = otherEntity; + maxDist = dist; + } + } + } + + return entity == null ? null : new EntityHitResult(entity); + } + + public boolean canHitEntity(Entity otherEntity) { + if (!otherEntity.canBeHitByProjectile()) { + return false; + } else { + Entity entity = this.getOwner(); +// if (entity != null) { +// if (otherEntity instanceof TestProjectileEntity other) { +// System.out.println("THIS OWNER: " + entity + " | " + !entity.isPassengerOfSameVehicle(otherEntity)); +// System.out.println("THAT OWNER: " + other.getOwner()); +// } +// } + return entity == null || this.leftOwner || !entity.isPassengerOfSameVehicle(otherEntity); + } + } + + public void setTimeToKill(int ticks) { + this.ttk = ticks; + } + + protected void tickDespawn() { + ++this.life; + if (this.life >= ttk) { + this.discard(); + } + } + + @Override + protected void defineSynchedData() { + this.entityData.define(ID_FLAGS, (byte)0); + this.entityData.define(PIERCE_LEVEL, (byte)0); + } + + public boolean isNoPhysics() { + if (!this.level().isClientSide) { + return this.noPhysics; + } else { + return (this.entityData.get(ID_FLAGS) & 2) != 0; + } + } + + protected void onHitEntity(EntityHitResult entityHitResult) { + Entity entity = entityHitResult.getEntity(); + int i = 5; + entity.hurt(this.damageSources().thrown(this, this.getOwner()), (float)i); + this.discard(); + } + + protected void onHitBlock(BlockHitResult blockHitResult) { +// super.onHitBlock(blockHitResult); + this.discard(); + } + + protected void onHit(HitResult hitResult) { + super.onHit(hitResult); + if (!this.level().isClientSide) { + this.level().broadcastEntityEvent(this, (byte)3); +// this.discard(); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/amuzil/omegasource/magus/entity/projectile/AirProjectile.java b/src/main/java/com/amuzil/omegasource/magus/entity/projectile/AirProjectile.java new file mode 100644 index 00000000..ca5cf012 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/entity/projectile/AirProjectile.java @@ -0,0 +1,265 @@ +package com.amuzil.omegasource.magus.entity.projectile; + +import com.amuzil.omegasource.magus.entity.AvatarEntities; +import com.amuzil.omegasource.magus.entity.ElementProjectile; +import com.amuzil.omegasource.magus.entity.collision.ElementCollision; +import com.amuzil.omegasource.magus.skill.elements.Element; +import com.amuzil.omegasource.magus.skill.elements.Elements; +import com.lowdragmc.photon.client.fx.EntityEffect; +import net.minecraft.core.BlockPos; +import net.minecraft.network.syncher.EntityDataAccessor; +import net.minecraft.network.syncher.EntityDataSerializers; +import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.monster.Blaze; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.*; +import net.minecraft.world.phys.shapes.VoxelShape; + +import javax.annotation.Nullable; +import java.util.Optional; +import java.util.function.Predicate; + +import static com.amuzil.omegasource.magus.skill.test.avatar.AvatarFormRegistry.orb_bloom; + + +public class AirProjectile extends ElementProjectile { + private static final EntityDataAccessor ID_FLAGS = SynchedEntityData.defineId(AirProjectile.class, EntityDataSerializers.BYTE); + private static final EntityDataAccessor PIERCE_LEVEL = SynchedEntityData.defineId(AirProjectile.class, EntityDataSerializers.BYTE); + private int life; + private int ttk = 100; + + public AirProjectile(EntityType type, Level level) { + super(type, level); + } + + public AirProjectile(double x, double y, double z, Level level) { + this(AvatarEntities.AIR_PROJECTILE_ENTITY_TYPE.get(), level); + this.setPos(x, y, z); + } + + public AirProjectile(LivingEntity livingEntity, Level level) { + this(livingEntity.getX(), livingEntity.getEyeY(), livingEntity.getZ(), level); + this.setOwner(livingEntity); + this.setNoGravity(true); + } + + @Override + public Element getElement() { + return Elements.AIR; + } + + public void tick() { + super.tick(); + boolean flag = this.isNoPhysics(); + Vec3 deltaMovement = this.getDeltaMovement(); + if (this.xRotO == 0.0F && this.yRotO == 0.0F) { + double distance = deltaMovement.horizontalDistance(); + this.setYRot((float)(Mth.atan2(deltaMovement.x, deltaMovement.z) * (double)(180F / (float)Math.PI))); + this.setXRot((float)(Mth.atan2(deltaMovement.y, distance) * (double)(180F / (float)Math.PI))); + this.yRotO = this.getYRot(); + this.xRotO = this.getXRot(); + } + + BlockPos blockpos = this.blockPosition(); + BlockState blockstate = this.level().getBlockState(blockpos); + if (!blockstate.isAir() && !flag) { + VoxelShape voxelshape = blockstate.getCollisionShape(this.level(), blockpos); + if (!voxelshape.isEmpty()) { + Vec3 vec31 = this.position(); + + for(AABB aabb : voxelshape.toAabbs()) { + if (aabb.move(blockpos).contains(vec31)) { + break; + } + } + } + } + + if (this.isInWaterOrRain() || blockstate.is(Blocks.POWDER_SNOW) || this.isInFluidType((fluidType, height) -> this.canFluidExtinguish(fluidType))) { + this.clearFire(); + } + + Vec3 pos = this.position(); + Vec3 delta = pos.add(deltaMovement); + HitResult hitresult = this.level().clip(new ClipContext(pos, delta, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)); + if (hitresult.getType() != HitResult.Type.MISS) { + delta = hitresult.getLocation(); + } + + while(!this.isRemoved()) { + if (!this.level().isClientSide) { + this.tickDespawn(); + } + EntityHitResult entityhitresult = this.findHitEntity(pos, delta); + if (entityhitresult != null) { + hitresult = entityhitresult; + } + + if (hitresult != null && hitresult.getType() == HitResult.Type.ENTITY) { + assert hitresult instanceof EntityHitResult; + Entity entity = ((EntityHitResult)hitresult).getEntity(); + Entity owner = this.getOwner(); + if (entity instanceof Player && owner instanceof Player && !((Player)owner).canHarmPlayer((Player)entity)) { + hitresult = null; + entityhitresult = null; + } + } + + if (hitresult != null && hitresult.getType() != HitResult.Type.MISS && !flag) { + if (net.minecraftforge.event.ForgeEventFactory.onProjectileImpact(this, hitresult)) + break; + this.onHit(hitresult); + this.hasImpulse = true; + break; + } + + if (entityhitresult == null) { + break; + } + + hitresult = null; + } + deltaMovement = this.getDeltaMovement(); + double d5 = deltaMovement.x; + double d6 = deltaMovement.y; + double d1 = deltaMovement.z; + + double d7 = this.getX() + d5; + double d2 = this.getY() + d6; + double d3 = this.getZ() + d1; + double d4 = deltaMovement.horizontalDistance(); + if (flag) { + this.setYRot((float)(Mth.atan2(-d5, -d1) * (double)(180F / (float)Math.PI))); + } else { + this.setYRot((float)(Mth.atan2(d5, d1) * (double)(180F / (float)Math.PI))); + } + + this.setXRot((float)(Mth.atan2(d6, d4) * (double)(180F / (float)Math.PI))); + this.setXRot(lerpRotation(this.xRotO, this.getXRot())); + this.setYRot(lerpRotation(this.yRotO, this.getYRot())); + + float f = 0.99F; + this.setDeltaMovement(deltaMovement.scale((double)f)); + if (!this.isNoGravity() && !flag) { + Vec3 vec34 = this.getDeltaMovement(); + this.setDeltaMovement(vec34.x, vec34.y - (double)0.05F, vec34.z); + } + + this.setPos(d7, d2, d3); + this.checkInsideBlocks(); + } + + @Nullable + protected EntityHitResult findHitEntity(Vec3 pos, Vec3 delta) { + return getEntityHitResult(this.level(), this, pos, delta, + this.getBoundingBox().expandTowards(this.getDeltaMovement()).inflate(2.0D), + this::canHitEntity, 0.3F); + } + + @Nullable + public static EntityHitResult getEntityHitResult(Level level, Entity thisEntity, Vec3 pos, Vec3 delta, AABB thisAABB, Predicate canBeHit, float scale) { + double maxDist = Double.MAX_VALUE; + Entity entity = null; + + for(Entity otherEntity : level.getEntities(thisEntity, thisAABB, canBeHit)) { +// System.out.println("ENTITY NEARBY: " + otherEntity); + AABB aabb = otherEntity.getBoundingBox().inflate(scale); + Optional optional = aabb.clip(pos, delta); + if (optional.isPresent()) { + double dist = pos.distanceToSqr(optional.get()); + if (dist < maxDist) { + entity = otherEntity; + maxDist = dist; + } + } + } + + return entity == null ? null : new EntityHitResult(entity); + } + + public boolean canHitEntity(Entity otherEntity) { + if (!otherEntity.canBeHitByProjectile()) { + return false; + } else { + Entity entity = this.getOwner(); +// if (entity != null) { +// if (otherEntity instanceof TestProjectileEntity other) { +// System.out.println("THIS OWNER: " + entity + " | " + !entity.isPassengerOfSameVehicle(otherEntity)); +// System.out.println("THAT OWNER: " + other.getOwner()); +// } +// } + return entity == null || this.leftOwner || !entity.isPassengerOfSameVehicle(otherEntity); + } + } + + public void setTimeToKill(int ticks) { + this.ttk = ticks; + } + + protected void tickDespawn() { + ++this.life; + if (this.life >= ttk) { +// System.out.println("BYE BYE BBY"); + this.discard(); + } + } + + @Override + protected void defineSynchedData() { + this.entityData.define(ID_FLAGS, (byte)0); + this.entityData.define(PIERCE_LEVEL, (byte)0); + } + + public boolean isNoPhysics() { + if (!this.level().isClientSide) { + return this.noPhysics; + } else { + return (this.entityData.get(ID_FLAGS) & 2) != 0; + } + } + + protected void onHitEntity(EntityHitResult entityHitResult) { + Entity entity = entityHitResult.getEntity(); + if (entity instanceof Blaze) { + if (this.getOwner() != null) { + this.shoot(entity.getViewVector(1).x, entity.getViewVector(1).y+0.5, entity.getViewVector(1).z, 0.75F, 1); + } + } else if (entity instanceof ElementProjectile elementProjectile) { + if (this.getOwner() != null && this.level().isClientSide) { + ElementCollision collisionEntity = new ElementCollision(this.getX(), this.getY(), this.getZ(), this.level()); + collisionEntity.setTimeToKill(5); + this.level().addFreshEntity(collisionEntity); + EntityEffect entityEffect = new EntityEffect(orb_bloom, this.level(), collisionEntity); + entityEffect.start(); + System.out.println("SUCCESS COLLISION!!!"); + this.discard(); + elementProjectile.discard(); + } + } else { + int i = 10; // Deal 10 damage + entity.hurt(this.damageSources().thrown(this, this.getOwner()), (float)i); + this.discard(); + } + } + + protected void onHitBlock(BlockHitResult blockHitResult) { +// super.onHitBlock(blockHitResult); + this.discard(); + } + + protected void onHit(HitResult hitResult) { + super.onHit(hitResult); + if (!this.level().isClientSide) { + this.level().broadcastEntityEvent(this, (byte)3); +// this.discard(); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/amuzil/omegasource/magus/entity/projectile/EarthProjectile.java b/src/main/java/com/amuzil/omegasource/magus/entity/projectile/EarthProjectile.java new file mode 100644 index 00000000..c6d24aca --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/entity/projectile/EarthProjectile.java @@ -0,0 +1,266 @@ +package com.amuzil.omegasource.magus.entity.projectile; + +import com.amuzil.omegasource.magus.entity.AvatarEntities; +import com.amuzil.omegasource.magus.entity.ElementProjectile; +import com.amuzil.omegasource.magus.entity.collision.ElementCollision; +import com.amuzil.omegasource.magus.skill.elements.Element; +import com.amuzil.omegasource.magus.skill.elements.Elements; +import com.amuzil.omegasource.magus.skill.forms.Form; +import com.lowdragmc.photon.client.fx.EntityEffect; +import net.minecraft.core.BlockPos; +import net.minecraft.network.syncher.EntityDataAccessor; +import net.minecraft.network.syncher.EntityDataSerializers; +import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.monster.Blaze; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.*; +import net.minecraft.world.phys.shapes.VoxelShape; + +import javax.annotation.Nullable; +import java.util.Optional; +import java.util.function.Predicate; + +import static com.amuzil.omegasource.magus.skill.test.avatar.AvatarFormRegistry.orb_bloom; + + +public class EarthProjectile extends ElementProjectile { + private static final EntityDataAccessor ID_FLAGS = SynchedEntityData.defineId(EarthProjectile.class, EntityDataSerializers.BYTE); + private static final EntityDataAccessor PIERCE_LEVEL = SynchedEntityData.defineId(EarthProjectile.class, EntityDataSerializers.BYTE); + private int life; + private int ttk = 100; + + public EarthProjectile(EntityType type, Level level) { + super(type, level); + } + + public EarthProjectile(double x, double y, double z, Level level) { + this(AvatarEntities.EARTH_PROJECTILE_ENTITY_TYPE.get(), level); + this.setPos(x, y, z); + } + + public EarthProjectile(LivingEntity livingEntity, Level level) { + this(livingEntity.getX(), livingEntity.getEyeY(), livingEntity.getZ(), level); + this.setOwner(livingEntity); + this.setNoGravity(true); + } + + @Override + public Element getElement() { + return Elements.EARTH; + } + + public void tick() { + super.tick(); + boolean flag = this.isNoPhysics(); + Vec3 deltaMovement = this.getDeltaMovement(); + if (this.xRotO == 0.0F && this.yRotO == 0.0F) { + double distance = deltaMovement.horizontalDistance(); + this.setYRot((float)(Mth.atan2(deltaMovement.x, deltaMovement.z) * (double)(180F / (float)Math.PI))); + this.setXRot((float)(Mth.atan2(deltaMovement.y, distance) * (double)(180F / (float)Math.PI))); + this.yRotO = this.getYRot(); + this.xRotO = this.getXRot(); + } + + BlockPos blockpos = this.blockPosition(); + BlockState blockstate = this.level().getBlockState(blockpos); + if (!blockstate.isAir() && !flag) { + VoxelShape voxelshape = blockstate.getCollisionShape(this.level(), blockpos); + if (!voxelshape.isEmpty()) { + Vec3 vec31 = this.position(); + + for(AABB aabb : voxelshape.toAabbs()) { + if (aabb.move(blockpos).contains(vec31)) { + break; + } + } + } + } + + if (this.isInWaterOrRain() || blockstate.is(Blocks.POWDER_SNOW) || this.isInFluidType((fluidType, height) -> this.canFluidExtinguish(fluidType))) { + this.clearFire(); + } + + Vec3 pos = this.position(); + Vec3 delta = pos.add(deltaMovement); + HitResult hitresult = this.level().clip(new ClipContext(pos, delta, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)); + if (hitresult.getType() != HitResult.Type.MISS) { + delta = hitresult.getLocation(); + } + + while(!this.isRemoved()) { + if (!this.level().isClientSide) { + this.tickDespawn(); + } + EntityHitResult entityhitresult = this.findHitEntity(pos, delta); + if (entityhitresult != null) { + hitresult = entityhitresult; + } + + if (hitresult != null && hitresult.getType() == HitResult.Type.ENTITY) { + assert hitresult instanceof EntityHitResult; + Entity entity = ((EntityHitResult)hitresult).getEntity(); + Entity owner = this.getOwner(); + if (entity instanceof Player && owner instanceof Player && !((Player)owner).canHarmPlayer((Player)entity)) { + hitresult = null; + entityhitresult = null; + } + } + + if (hitresult != null && hitresult.getType() != HitResult.Type.MISS && !flag) { + if (net.minecraftforge.event.ForgeEventFactory.onProjectileImpact(this, hitresult)) + break; + this.onHit(hitresult); + this.hasImpulse = true; + break; + } + + if (entityhitresult == null) { + break; + } + + hitresult = null; + } + deltaMovement = this.getDeltaMovement(); + double d5 = deltaMovement.x; + double d6 = deltaMovement.y; + double d1 = deltaMovement.z; + + double d7 = this.getX() + d5; + double d2 = this.getY() + d6; + double d3 = this.getZ() + d1; + double d4 = deltaMovement.horizontalDistance(); + if (flag) { + this.setYRot((float)(Mth.atan2(-d5, -d1) * (double)(180F / (float)Math.PI))); + } else { + this.setYRot((float)(Mth.atan2(d5, d1) * (double)(180F / (float)Math.PI))); + } + + this.setXRot((float)(Mth.atan2(d6, d4) * (double)(180F / (float)Math.PI))); + this.setXRot(lerpRotation(this.xRotO, this.getXRot())); + this.setYRot(lerpRotation(this.yRotO, this.getYRot())); + + float f = 0.99F; + this.setDeltaMovement(deltaMovement.scale((double)f)); + if (!this.isNoGravity() && !flag) { + Vec3 vec34 = this.getDeltaMovement(); + this.setDeltaMovement(vec34.x, vec34.y - (double)0.05F, vec34.z); + } + + this.setPos(d7, d2, d3); + this.checkInsideBlocks(); + } + + @Nullable + protected EntityHitResult findHitEntity(Vec3 pos, Vec3 delta) { + return getEntityHitResult(this.level(), this, pos, delta, + this.getBoundingBox().expandTowards(this.getDeltaMovement()).inflate(2.0D), + this::canHitEntity, 0.3F); + } + + @Nullable + public static EntityHitResult getEntityHitResult(Level level, Entity thisEntity, Vec3 pos, Vec3 delta, AABB thisAABB, Predicate canBeHit, float scale) { + double maxDist = Double.MAX_VALUE; + Entity entity = null; + + for(Entity otherEntity : level.getEntities(thisEntity, thisAABB, canBeHit)) { +// System.out.println("ENTITY NEARBY: " + otherEntity); + AABB aabb = otherEntity.getBoundingBox().inflate(scale); + Optional optional = aabb.clip(pos, delta); + if (optional.isPresent()) { + double dist = pos.distanceToSqr(optional.get()); + if (dist < maxDist) { + entity = otherEntity; + maxDist = dist; + } + } + } + + return entity == null ? null : new EntityHitResult(entity); + } + + public boolean canHitEntity(Entity otherEntity) { + if (!otherEntity.canBeHitByProjectile()) { + return false; + } else { + Entity entity = this.getOwner(); +// if (entity != null) { +// if (otherEntity instanceof TestProjectileEntity other) { +// System.out.println("THIS OWNER: " + entity + " | " + !entity.isPassengerOfSameVehicle(otherEntity)); +// System.out.println("THAT OWNER: " + other.getOwner()); +// } +// } + return entity == null || this.leftOwner || !entity.isPassengerOfSameVehicle(otherEntity); + } + } + + public void setTimeToKill(int ticks) { + this.ttk = ticks; + } + + protected void tickDespawn() { + ++this.life; + if (this.life >= ttk) { +// System.out.println("BYE BYE BBY"); + this.discard(); + } + } + + @Override + protected void defineSynchedData() { + this.entityData.define(ID_FLAGS, (byte)0); + this.entityData.define(PIERCE_LEVEL, (byte)0); + } + + public boolean isNoPhysics() { + if (!this.level().isClientSide) { + return this.noPhysics; + } else { + return (this.entityData.get(ID_FLAGS) & 2) != 0; + } + } + + protected void onHitEntity(EntityHitResult entityHitResult) { + Entity entity = entityHitResult.getEntity(); + if (entity instanceof Blaze) { + if (this.getOwner() != null) { + this.shoot(entity.getViewVector(1).x, entity.getViewVector(1).y+0.5, entity.getViewVector(1).z, 0.75F, 1); + } + } else if (entity instanceof ElementProjectile elementProjectile) { + if (this.getOwner() != null && this.level().isClientSide) { + ElementCollision collisionEntity = new ElementCollision(this.getX(), this.getY(), this.getZ(), this.level()); + collisionEntity.setTimeToKill(5); + this.level().addFreshEntity(collisionEntity); + EntityEffect entityEffect = new EntityEffect(orb_bloom, this.level(), collisionEntity); + entityEffect.start(); + System.out.println("SUCCESS COLLISION!!!"); + this.discard(); + elementProjectile.discard(); + } + } else { + int i = 10; // Deal 10 damage + entity.hurt(this.damageSources().thrown(this, this.getOwner()), (float)i); + this.discard(); + } + } + + protected void onHitBlock(BlockHitResult blockHitResult) { +// super.onHitBlock(blockHitResult); + this.discard(); + } + + protected void onHit(HitResult hitResult) { + super.onHit(hitResult); + if (!this.level().isClientSide) { + this.level().broadcastEntityEvent(this, (byte)3); +// this.discard(); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/amuzil/omegasource/magus/entity/projectile/FireProjectile.java b/src/main/java/com/amuzil/omegasource/magus/entity/projectile/FireProjectile.java new file mode 100644 index 00000000..2bf79fcf --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/entity/projectile/FireProjectile.java @@ -0,0 +1,342 @@ +package com.amuzil.omegasource.magus.entity.projectile; + +import com.amuzil.omegasource.magus.entity.AvatarEntities; +import com.amuzil.omegasource.magus.entity.ElementProjectile; +import com.amuzil.omegasource.magus.entity.collision.ElementCollision; +import com.amuzil.omegasource.magus.level.event.FormActivatedEvent; +import com.amuzil.omegasource.magus.network.MagusNetwork; +import com.amuzil.omegasource.magus.network.packets.client_executed.FormActivatedPacket; +import com.amuzil.omegasource.magus.skill.elements.Element; +import com.amuzil.omegasource.magus.skill.elements.Elements; +import com.amuzil.omegasource.magus.skill.forms.Forms; +import com.lowdragmc.photon.client.fx.EntityEffect; +import net.minecraft.core.BlockPos; +import net.minecraft.network.syncher.EntityDataAccessor; +import net.minecraft.network.syncher.EntityDataSerializers; +import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.monster.Blaze; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.projectile.AbstractArrow; +import net.minecraft.world.entity.projectile.Fireball; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.*; +import net.minecraft.world.phys.shapes.VoxelShape; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.eventbus.api.SubscribeEvent; + +import static com.amuzil.omegasource.magus.skill.test.avatar.AvatarFormRegistry.orb_bloom; +import static com.amuzil.omegasource.magus.skill.test.avatar.AvatarFormRegistry.steam; + + +public class FireProjectile extends ElementProjectile { + private static final EntityDataAccessor ID_FLAGS = SynchedEntityData.defineId(FireProjectile.class, EntityDataSerializers.BYTE); + private static final EntityDataAccessor PIERCE_LEVEL = SynchedEntityData.defineId(FireProjectile.class, EntityDataSerializers.BYTE); + + public FireProjectile(EntityType type, Level level) { + super(type, level); + MinecraftForge.EVENT_BUS.register(this); + } + + public FireProjectile(double x, double y, double z, Level level) { + this(AvatarEntities.FIRE_PROJECTILE_ENTITY_TYPE.get(), level); + this.setPos(x, y, z); + } + + public FireProjectile(LivingEntity livingEntity, Level level) { + this(livingEntity.getX(), livingEntity.getEyeY(), livingEntity.getZ(), level); + this.setOwner(livingEntity); + this.setNoGravity(true); + } + + @Override + public Element getElement() { + return Elements.FIRE; + } + + @Override + public void remove(RemovalReason reason) { + super.remove(reason); + + // Unregister from the event bus + MinecraftForge.EVENT_BUS.unregister(this); + } + + public void tick() { + super.tick(); + boolean flag = this.isNoPhysics(); + Vec3 deltaMovement = this.getDeltaMovement(); + if (this.xRotO == 0.0F && this.yRotO == 0.0F) { + double distance = deltaMovement.horizontalDistance(); + this.setYRot((float)(Mth.atan2(deltaMovement.x, deltaMovement.z) * (double)(180F / (float)Math.PI))); + this.setXRot((float)(Mth.atan2(deltaMovement.y, distance) * (double)(180F / (float)Math.PI))); + this.yRotO = this.getYRot(); + this.xRotO = this.getXRot(); + } + + BlockPos blockpos = this.blockPosition(); + BlockState blockstate = this.level().getBlockState(blockpos); + if (!blockstate.isAir() && !flag) { + VoxelShape voxelshape = blockstate.getCollisionShape(this.level(), blockpos); + if (!voxelshape.isEmpty()) { + Vec3 vec31 = this.position(); + + for(AABB aabb : voxelshape.toAabbs()) { + if (aabb.move(blockpos).contains(vec31)) { + break; + } + } + } + } + + if (this.isInWaterOrRain() || blockstate.is(Blocks.POWDER_SNOW) || this.isInFluidType((fluidType, height) -> this.canFluidExtinguish(fluidType))) { + this.clearFire(); + } + + Vec3 pos = this.position(); + Vec3 delta = pos.add(deltaMovement); + HitResult hitresult = this.level().clip(new ClipContext(pos, delta, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)); + if (hitresult.getType() != HitResult.Type.MISS) { + delta = hitresult.getLocation(); + } + + while(!this.isRemoved()) { + if (!this.level().isClientSide) { + this.tickDespawn(); + } + EntityHitResult entityhitresult = this.findHitEntity(pos, delta); + if (entityhitresult != null) { + hitresult = entityhitresult; + } + + if (hitresult != null && hitresult.getType() == HitResult.Type.ENTITY) { + assert hitresult instanceof EntityHitResult; + Entity entity = ((EntityHitResult)hitresult).getEntity(); + Entity owner = this.getOwner(); + if (entity instanceof Player && owner instanceof Player && !((Player)owner).canHarmPlayer((Player)entity)) { + hitresult = null; + entityhitresult = null; + } + } + + if (hitresult != null && hitresult.getType() != HitResult.Type.MISS && !flag) { + if (net.minecraftforge.event.ForgeEventFactory.onProjectileImpact(this, hitresult)) + break; + this.onHit(hitresult); + this.hasImpulse = true; + break; + } + + if (entityhitresult == null) { + break; + } + + hitresult = null; + } + deltaMovement = this.getDeltaMovement(); + double x = deltaMovement.x; + double y = deltaMovement.y; + double z = deltaMovement.z; + + double finalX = this.getX() + x; + double finalY = this.getY() + y; + double finalZ = this.getZ() + z; + double d4 = deltaMovement.horizontalDistance(); + if (flag) { + this.setYRot((float)(Mth.atan2(-x, -z) * (double)(180F / (float)Math.PI))); + } else { + this.setYRot((float)(Mth.atan2(x, z) * (double)(180F / (float)Math.PI))); + } + + this.setXRot((float)(Mth.atan2(y, d4) * (double)(180F / (float)Math.PI))); + this.setXRot(lerpRotation(this.xRotO, this.getXRot())); + this.setYRot(lerpRotation(this.yRotO, this.getYRot())); + + float f = 0.49F; // Scale speed + this.setDeltaMovement(deltaMovement.scale(f)); + if (!this.isNoGravity() && !flag) { // Apply gravity + Vec3 vec34 = this.getDeltaMovement(); + this.setDeltaMovement(vec34.x, vec34.y - (double)0.05F, vec34.z); + } + + Entity owner = this.getOwner(); + if (arcActive) { + if (owner != null) { + Vec3[] pose = new Vec3[]{owner.position(), this.getOwner().getLookAngle()}; + pose[1] = pose[1].scale((1.5)).add((0), (this.getOwner().getEyeHeight()), (0)); + Vec3 newPos = pose[1].add(pose[0]); + this.setPos(newPos.x, newPos.y, newPos.z); + } + } else { + if (owner != null) { + Vec3 vec34 = this.getDeltaMovement(); + double rateOfControl = 0.4; // Control/curve the shot projectile + Vec3 aim = this.getOwner().getLookAngle().multiply(rateOfControl, rateOfControl, rateOfControl); + this.setDeltaMovement(vec34.add(aim)); + } + this.setPos(finalX, finalY, finalZ); + } + + this.checkInsideBlocks(); + } + + @SubscribeEvent + public void onFormEvent(FormActivatedEvent event) { + Entity owner = this.getOwner(); + if (owner != null && event.getEntity().getId() == owner.getId()) { + if (event.getForm().equals(Forms.STRIKE) && this.arcActive && this.hasElement) { + this.arcActive = false; + this.setTimeToKill(100); + if (!this.level().isClientSide()) { + this.shoot(owner.getViewVector(1).x, owner.getViewVector(1).y, owner.getViewVector(1).z, 0.75F, 1); + this.discard(); + } + } + } + } + +// @Nullable +// protected EntityHitResult findHitEntity(Vec3 pos, Vec3 delta) { +// return getEntityHitResult(this.level(), this, pos, delta, +// this.getBoundingBox().expandTowards(this.getDeltaMovement()).inflate(2.0D), +// this::canHitEntity, 0.3F); +// } + +// @Nullable +// public static EntityHitResult getEntityHitResult(Level level, Entity thisEntity, Vec3 pos, Vec3 delta, AABB thisAABB, Predicate canBeHit, float scale) { +// double maxDist = Double.MAX_VALUE; +// Entity entity = null; +// +// for(Entity otherEntity : level.getEntities(thisEntity, thisAABB, canBeHit)) { +//// System.out.println("ENTITY NEARBY: " + otherEntity); +// AABB aabb = otherEntity.getBoundingBox().inflate(scale); +// Optional optional = aabb.clip(pos, delta); +// if (optional.isPresent()) { +// double dist = pos.distanceToSqr(optional.get()); +// if (dist < maxDist) { +// entity = otherEntity; +// maxDist = dist; +// } +// } +// } +// +// return entity == null ? null : new EntityHitResult(entity); +// } + +// public boolean canHitEntity(Entity otherEntity) { +// if (!otherEntity.canBeHitByProjectile()) { +// return false; +// } else { +// Entity entity = this.getOwner(); +//// if (entity != null) { +//// if (otherEntity instanceof TestProjectileEntity other) { +//// System.out.println("THIS OWNER: " + entity + " | " + !entity.isPassengerOfSameVehicle(otherEntity)); +//// System.out.println("THAT OWNER: " + other.getOwner()); +//// } +//// } +// return entity == null || this.leftOwner || !entity.isPassengerOfSameVehicle(otherEntity); +// } +// } + + @Override + public boolean isPickable() { + return true; + } + + @Override + protected void defineSynchedData() { + this.entityData.define(ID_FLAGS, (byte)0); + this.entityData.define(PIERCE_LEVEL, (byte)0); + } + + public boolean isNoPhysics() { + if (!this.level().isClientSide) { + return this.noPhysics; + } else { + return (this.entityData.get(ID_FLAGS) & 2) != 0; + } + } + +// public void handleEntityEvent(byte data) { +// if (data == 3) { +// System.out.println("HANDLE ENTITY EVENT"); +// for(int i = 0; i < 8; ++i) { +// this.level().addParticle(this.getParticle(), this.getX(), this.getY(), this.getZ(), 0.0D, 0.0D, 0.0D); +// } +// } +// } + + protected void onHitEntity(EntityHitResult entityHitResult) { + Entity entity = entityHitResult.getEntity(); + if (entity instanceof Blaze) { + if (this.getOwner() != null) { +// this.setNoGravity(false); + this.setOwner(entity); + this.shoot(entity.getViewVector(1).x, entity.getViewVector(1).y, entity.getViewVector(1).z, 0.75F, 1); + this.leftOwner = true; + } + } else if (entity instanceof FireProjectile fireProjectile) { + if (this.getOwner() != null && this.level().isClientSide) { + if (fireProjectile.arcActive && !fireProjectile.hasElement && this.checkLeftOwner()) { +// this.setOwner(elementProjectile.getOwner()); // Give control to receiver +// this.setDeltaMovement(0,0,0); // Full stop +// this.arcActive = true; // Enable control of this shot projectile + this.discard(); + fireProjectile.hasElement = true; + MagusNetwork.sendToServer(new FormActivatedPacket(Forms.NULL, Elements.FIRE, fireProjectile.getId())); + } else { + if (!this.getOwner().equals(fireProjectile.getOwner())) { + ElementCollision collisionEntity = new ElementCollision(this.getX(), this.getY(), this.getZ(), this.level()); + collisionEntity.setTimeToKill(5); + this.level().addFreshEntity(collisionEntity); + EntityEffect entityEffect = new EntityEffect(orb_bloom, this.level(), collisionEntity); + entityEffect.start(); + this.discard(); + fireProjectile.discard(); + } + } + } + } else if (entity instanceof WaterProjectile waterProjectile) { + if (this.getOwner() != null && this.level().isClientSide) { + if (!this.getOwner().equals(waterProjectile.getOwner())) { + ElementCollision collisionEntity = new ElementCollision(this.getX(), this.getY(), this.getZ(), this.level()); + collisionEntity.setTimeToKill(5); + this.level().addFreshEntity(collisionEntity); + EntityEffect entityEffect = new EntityEffect(steam, this.level(), collisionEntity); + entityEffect.start(); + this.discard(); + waterProjectile.discard(); + } + } + } else if (entity instanceof Fireball fireBall) { + if (!this.getOwner().equals(fireBall.getOwner())) { + fireBall.discard(); + } + } else if (entity instanceof AbstractArrow arrow) { + if (!this.getOwner().equals(arrow.getOwner())) { + arrow.discard(); + } + } else { + float i = 10; // Deal 10 damage + entity.hurt(this.damageSources().thrown(this, this.getOwner()), i); +// this.discard(); + } + } + + protected void onHitBlock(BlockHitResult blockHitResult) { +// super.onHitBlock(blockHitResult); + this.discard(); + } + + protected void onHit(HitResult hitResult) { + super.onHit(hitResult); + if (!this.level().isClientSide) + this.level().broadcastEntityEvent(this, (byte)3); + } +} \ No newline at end of file diff --git a/src/main/java/com/amuzil/omegasource/magus/entity/projectile/WaterProjectile.java b/src/main/java/com/amuzil/omegasource/magus/entity/projectile/WaterProjectile.java new file mode 100644 index 00000000..e0479cac --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/entity/projectile/WaterProjectile.java @@ -0,0 +1,267 @@ +package com.amuzil.omegasource.magus.entity.projectile; + +import com.amuzil.omegasource.magus.entity.AvatarEntities; +import com.amuzil.omegasource.magus.entity.ElementProjectile; +import com.amuzil.omegasource.magus.entity.collision.ElementCollision; +import com.amuzil.omegasource.magus.skill.elements.Element; +import com.amuzil.omegasource.magus.skill.elements.Elements; +import com.lowdragmc.photon.client.fx.EntityEffect; +import net.minecraft.core.BlockPos; +import net.minecraft.network.syncher.EntityDataAccessor; +import net.minecraft.network.syncher.EntityDataSerializers; +import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.monster.Blaze; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.*; +import net.minecraft.world.phys.shapes.VoxelShape; + +import javax.annotation.Nullable; +import java.util.Optional; +import java.util.function.Predicate; + +import static com.amuzil.omegasource.magus.skill.test.avatar.AvatarFormRegistry.steam; + + +public class WaterProjectile extends ElementProjectile { + private static final EntityDataAccessor ID_FLAGS = SynchedEntityData.defineId(WaterProjectile.class, EntityDataSerializers.BYTE); + private static final EntityDataAccessor PIERCE_LEVEL = SynchedEntityData.defineId(WaterProjectile.class, EntityDataSerializers.BYTE); + + public WaterProjectile(EntityType type, Level level) { + super(type, level); + } + + public WaterProjectile(double x, double y, double z, Level level) { + this(AvatarEntities.WATER_PROJECTILE_ENTITY_TYPE.get(), level); + this.setPos(x, y, z); + } + + public WaterProjectile(LivingEntity livingEntity, Level level) { + this(livingEntity.getX(), livingEntity.getEyeY(), livingEntity.getZ(), level); + this.setOwner(livingEntity); + this.setNoGravity(true); + } + + @Override + public Element getElement() { + return Elements.WATER; + } + + public void tick() { + super.tick(); + boolean flag = this.isNoPhysics(); + Vec3 deltaMovement = this.getDeltaMovement(); + if (this.xRotO == 0.0F && this.yRotO == 0.0F) { + double distance = deltaMovement.horizontalDistance(); + this.setYRot((float)(Mth.atan2(deltaMovement.x, deltaMovement.z) * (double)(180F / (float)Math.PI))); + this.setXRot((float)(Mth.atan2(deltaMovement.y, distance) * (double)(180F / (float)Math.PI))); + this.yRotO = this.getYRot(); + this.xRotO = this.getXRot(); + } + + BlockPos blockpos = this.blockPosition(); + BlockState blockstate = this.level().getBlockState(blockpos); + if (!blockstate.isAir() && !flag) { + VoxelShape voxelshape = blockstate.getCollisionShape(this.level(), blockpos); + if (!voxelshape.isEmpty()) { + Vec3 vec31 = this.position(); + + for(AABB aabb : voxelshape.toAabbs()) { + if (aabb.move(blockpos).contains(vec31)) { + break; + } + } + } + } + + if (this.isInWaterOrRain() || blockstate.is(Blocks.POWDER_SNOW) || this.isInFluidType((fluidType, height) -> this.canFluidExtinguish(fluidType))) { + this.clearFire(); + } + + Vec3 pos = this.position(); + Vec3 delta = pos.add(deltaMovement); + HitResult hitresult = this.level().clip(new ClipContext(pos, delta, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)); + if (hitresult.getType() != HitResult.Type.MISS) { + delta = hitresult.getLocation(); + } + + while(!this.isRemoved()) { + if (!this.level().isClientSide) { + this.tickDespawn(); + } + EntityHitResult entityhitresult = this.findHitEntity(pos, delta); + if (entityhitresult != null) { + hitresult = entityhitresult; + } + + if (hitresult != null && hitresult.getType() == HitResult.Type.ENTITY) { + assert hitresult instanceof EntityHitResult; + Entity entity = ((EntityHitResult)hitresult).getEntity(); + Entity owner = this.getOwner(); + if (entity instanceof Player && owner instanceof Player && !((Player)owner).canHarmPlayer((Player)entity)) { + hitresult = null; + entityhitresult = null; + } + } + + if (hitresult != null && hitresult.getType() != HitResult.Type.MISS && !flag) { + if (net.minecraftforge.event.ForgeEventFactory.onProjectileImpact(this, hitresult)) + break; + this.onHit(hitresult); + this.hasImpulse = true; + break; + } + + if (entityhitresult == null) { + break; + } + + hitresult = null; + } + deltaMovement = this.getDeltaMovement(); + double x = deltaMovement.x; + double y = deltaMovement.y; + double z = deltaMovement.z; + + double finalX = this.getX() + x; + double finalY = this.getY() + y; + double finalZ = this.getZ() + z; + double d4 = deltaMovement.horizontalDistance(); + if (flag) { + this.setYRot((float)(Mth.atan2(-x, -z) * (double)(180F / (float)Math.PI))); + } else { + this.setYRot((float)(Mth.atan2(x, z) * (double)(180F / (float)Math.PI))); + } + + this.setXRot((float)(Mth.atan2(y, d4) * (double)(180F / (float)Math.PI))); + this.setXRot(lerpRotation(this.xRotO, this.getXRot())); + this.setYRot(lerpRotation(this.yRotO, this.getYRot())); + + float f = 0.49F; // Scale speed + this.setDeltaMovement(deltaMovement.scale(f)); + if (!this.isNoGravity() && !flag) { // Apply gravity + Vec3 vec34 = this.getDeltaMovement(); + this.setDeltaMovement(vec34.x, vec34.y - (double)0.05F, vec34.z); + } + + Entity owner = this.getOwner(); + if (arcActive) { + if (owner != null) { + Vec3[] pose = new Vec3[]{owner.position(), this.getOwner().getLookAngle()}; + pose[1] = pose[1].scale((1.5)).add((0), (this.getOwner().getEyeHeight()), (0)); + Vec3 newPos = pose[1].add(pose[0]); + this.setPos(newPos.x, newPos.y, newPos.z); + } + } else { + if (owner != null) { + Vec3 vec34 = this.getDeltaMovement(); + double rateOfControl = 0.4; // Control/curve the shot projectile + Vec3 aim = this.getOwner().getLookAngle().multiply(rateOfControl, rateOfControl, rateOfControl); + this.setDeltaMovement(vec34.add(aim)); + } + this.setPos(finalX, finalY, finalZ); + } + + this.checkInsideBlocks(); + } + + @Nullable + protected EntityHitResult findHitEntity(Vec3 pos, Vec3 delta) { + return getEntityHitResult(this.level(), this, pos, delta, + this.getBoundingBox().expandTowards(this.getDeltaMovement()).inflate(2.0D), + this::canHitEntity, 0.3F); + } + + @Nullable + public static EntityHitResult getEntityHitResult(Level level, Entity thisEntity, Vec3 pos, Vec3 delta, AABB thisAABB, Predicate canBeHit, float scale) { + double maxDist = Double.MAX_VALUE; + Entity entity = null; + + for(Entity otherEntity : level.getEntities(thisEntity, thisAABB, canBeHit)) { +// System.out.println("ENTITY NEARBY: " + otherEntity); + AABB aabb = otherEntity.getBoundingBox().inflate(scale); + Optional optional = aabb.clip(pos, delta); + if (optional.isPresent()) { + double dist = pos.distanceToSqr(optional.get()); + if (dist < maxDist) { + entity = otherEntity; + maxDist = dist; + } + } + } + + return entity == null ? null : new EntityHitResult(entity); + } + + public boolean canHitEntity(Entity otherEntity) { + if (!otherEntity.canBeHitByProjectile()) { + return false; + } else { + Entity entity = this.getOwner(); +// if (entity != null) { +// if (otherEntity instanceof TestProjectileEntity other) { +// System.out.println("THIS OWNER: " + entity + " | " + !entity.isPassengerOfSameVehicle(otherEntity)); +// System.out.println("THAT OWNER: " + other.getOwner()); +// } +// } + return entity == null || this.leftOwner || !entity.isPassengerOfSameVehicle(otherEntity); + } + } + + @Override + protected void defineSynchedData() { + this.entityData.define(ID_FLAGS, (byte)0); + this.entityData.define(PIERCE_LEVEL, (byte)0); + } + + public boolean isNoPhysics() { + if (!this.level().isClientSide) { + return this.noPhysics; + } else { + return (this.entityData.get(ID_FLAGS) & 2) != 0; + } + } + + protected void onHitEntity(EntityHitResult entityHitResult) { + Entity entity = entityHitResult.getEntity(); + if (entity instanceof Blaze) { + float i = 20; // Deal 20 damage + entity.hurt(this.damageSources().thrown(this, this.getOwner()), i); + this.discard(); + } else if (entity instanceof FireProjectile fireProjectile) { + if (this.getOwner() != null && this.level().isClientSide) { + ElementCollision collisionEntity = new ElementCollision(this.getX(), this.getY(), this.getZ(), this.level()); + collisionEntity.setTimeToKill(5); + this.level().addFreshEntity(collisionEntity); + EntityEffect entityEffect = new EntityEffect(steam, this.level(), collisionEntity); + entityEffect.start(); + this.discard(); + fireProjectile.discard(); + } + } else { + float i = 10; // Deal 10 damage + entity.hurt(this.damageSources().thrown(this, this.getOwner()), i); + this.discard(); + } + } + + protected void onHitBlock(BlockHitResult blockHitResult) { +// super.onHitBlock(blockHitResult); + this.discard(); + } + + protected void onHit(HitResult hitResult) { + super.onHit(hitResult); + if (!this.level().isClientSide) { + this.level().broadcastEntityEvent(this, (byte)3); +// this.discard(); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/amuzil/omegasource/magus/input/InputModule.java b/src/main/java/com/amuzil/omegasource/magus/input/InputModule.java new file mode 100644 index 00000000..88174f2b --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/input/InputModule.java @@ -0,0 +1,205 @@ +package com.amuzil.omegasource.magus.input; + +import com.amuzil.omegasource.magus.radix.Condition; +import com.amuzil.omegasource.magus.radix.Node; +import com.amuzil.omegasource.magus.radix.RadixTree; +import com.amuzil.omegasource.magus.radix.condition.minecraft.forge.EventCondition; +import com.amuzil.omegasource.magus.skill.conditionals.InputData; +import com.amuzil.omegasource.magus.skill.elements.Element; +import com.amuzil.omegasource.magus.skill.elements.Elements; +import com.amuzil.omegasource.magus.skill.forms.Form; +import com.amuzil.omegasource.magus.skill.forms.FormDataRegistry; +import com.amuzil.omegasource.magus.skill.forms.Forms; +import com.amuzil.omegasource.magus.skill.modifiers.ModifiersRegistry; +import com.amuzil.omegasource.magus.skill.modifiers.api.Modifier; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierListener; +import com.mojang.blaze3d.platform.InputConstants; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import net.minecraft.client.player.LocalPlayer; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +import net.minecraftforge.client.event.InputEvent; +import org.apache.logging.log4j.LogManager; +import org.jetbrains.annotations.Nullable; + +import java.util.*; +import java.util.concurrent.atomic.AtomicReference; + + +public abstract class InputModule { + protected static final List
activeFormInputs = new ArrayList<>(); + protected static final Map movementKeys = new HashMap<>(); + public static Element activeElement = Elements.FIRE; + protected static RadixTree formsTree = new RadixTree(); + protected static LinkedList activeForms = new LinkedList<>(); + protected final List activeConditions = Collections.synchronizedList(new LinkedList<>()); + protected final Map formInputs = new HashMap<>(); + protected final List modifierListeners = new ArrayList<>(); + protected final Map modifierQueue = new HashMap<>(); + public boolean resetScrolling; + protected AtomicReference lastActivatedForm = new AtomicReference<>(Forms.NULL); + + // Send a message to in-game chat + public static void sendDebugMsg(String msg) { + Minecraft minecraft = Minecraft.getInstance(); + minecraft.execute(() -> { + LocalPlayer player = minecraft.player; + if (player != null) { + Component text = Component.literal(msg); + player.sendSystemMessage(text); + } else { + System.err.println("sendDebugMsg failed: player is null"); + } + }); + } + + public static EventCondition keyToCondition(InputConstants.Key key, int actionCondition) { + if (key.getType().equals(InputConstants.Type.MOUSE)) { + return new EventCondition<>(InputEvent.MouseButton.class, + event -> event.getButton() == key.getValue() && + event.getAction() == actionCondition); + } else return new EventCondition<>(InputEvent.Key.class, + event -> event.getKey() == key.getValue() && event.getAction() + == actionCondition); + } + + public static void determineMotionKeys() { + Arrays.stream(Minecraft.getInstance().options.keyMappings).toList().forEach(keyMapping -> { + if (keyMapping.getCategory().equals(KeyMapping.CATEGORY_MOVEMENT)) { + movementKeys.put(keyMapping.getName(), keyMapping.getKey().getValue()); + } + }); + } + + public static Element getDiscipline() { + return activeElement; + } + + public static void setDiscipline(Element element) { + activeElement = element; + } + + public static Map getMovementKeys() { + return movementKeys; + } + + public static boolean isDirectionKey(int key) { + return movementKeys.containsValue(Integer.valueOf(key)); + } + + public static void resetFormsTree() { + FormDataRegistry.init(); // Re-initialize formData since it's a static field + formsTree = new RadixTree(); + // Default is air. + formsTree.setDiscipline(activeElement); + } + + public abstract void registerInputData(List formExecutionInputs, Form formToExecute, List conditions); + + public void registerModifiers() { +// registerModifierListener(ModifiersRegistry.CONTROL.listener(), Minecraft.getInstance().player.getPersistentData()); + // Need to register this to the player's compound tag... + CompoundTag listenerInstanceData = new CompoundTag(); + listenerInstanceData.putString("activeElement", activeElement.name()); + for (Modifier modifier : ModifiersRegistry.getModifiers()) { + if (modifier.listener() != null) + registerModifierListener(modifier.listener(), listenerInstanceData); + } + } + + public void registerModifierListener(ModifierListener listener, CompoundTag treeData) { + listener.setupListener(treeData); + listener.register(() -> { + queueModifierData(listener.getModifierData()); + }); + + modifierListeners.add(listener); + } + + public synchronized void queueModifierData(ModifierData data) { + synchronized (modifierQueue) { + if (modifierQueue.get(data.getName()) != null) { + ModifierData existingData = modifierQueue.get(data.getName()); + existingData.add(data); + modifierQueue.put(data.getName(), existingData); + } else { + modifierQueue.put(data.getName(), data); + } + } + } + + public void resetLastActivated() { + LogManager.getLogger().info("RESETTING LAST ACTIVATED FORM"); + this.lastActivatedForm.set(Forms.NULL); + } + + @Nullable + public Form getLastActivatedForm() { + if (lastActivatedForm != null) + return this.lastActivatedForm.get(); + return null; + } + + // Should be overridden.. + public Form getActiveForm() { + return this.lastActivatedForm.get(); + } + + public List getActiveConditions() { + return activeConditions; + } + + public RadixTree getFormsTree() { + return formsTree; + } + + public void resetTreeConditions() { + resetConditions(); + formsTree.resetTree(); + } + + public void resetConditions() { + if (!activeConditions.isEmpty()) { + for (Condition condition : activeConditions) + condition.reset(); + activeConditions.clear(); + } + } + + public void init() { + resetKeys(); + registerInputs(); + registerListeners(); + } + + public void terminate() { + resetKeys(); + unRegisterInputs(); + activeConditions.clear(); + } + + public void registerRunnables(RadixTree tree) { + registerRunnables(tree.getRoot()); + } + + public abstract void registerRunnables(Node current); + + public abstract void registerListeners(); + + public abstract void registerInputs(); + + public abstract void unRegisterInputs(); + + public void unregisterModifiers() { + modifierListeners.forEach(ModifierListener::unregister); + } + + public abstract void toggleListeners(); + + public abstract void resetKeys(); + + public abstract boolean keyPressed(int key); + +} diff --git a/src/main/java/com/amuzil/omegasource/magus/input/InputModuleData.java b/src/main/java/com/amuzil/omegasource/magus/input/InputModuleData.java new file mode 100644 index 00000000..0333a991 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/input/InputModuleData.java @@ -0,0 +1,68 @@ +package com.amuzil.omegasource.magus.input; + +import com.amuzil.omegasource.magus.radix.Condition; +import com.amuzil.omegasource.magus.radix.RadixTree; +import com.amuzil.omegasource.magus.radix.builders.InputConverter; +import com.amuzil.omegasource.magus.skill.conditionals.InputData; + +import java.util.HashMap; +import java.util.List; + +/** + * These exist per form. + */ +public class InputModuleData { + private final HashMap> inputs; + private final HashMap> conditions; + + public InputModuleData() { + this.inputs = new HashMap<>(); + this.conditions = new HashMap<>(); + } + + public void addTypeConditions(RadixTree.InputType type, List conditions) { + if (!this.conditions.containsKey(type)) { + this.conditions.put(type, conditions); + } else { + List existingConditions = this.conditions.get(type); + existingConditions.addAll(conditions); + this.conditions.put(type, existingConditions); + } + } + + public void addTypeInputs(RadixTree.InputType type, List inputs) { + if (!this.inputs.containsKey(type)) { + this.inputs.put(type, inputs); + } else { + List existingInputs = this.inputs.get(type); + existingInputs.addAll(this.inputs.get(type)); + this.inputs.put(type, existingInputs); + } + } + + /** + * Automatically fills out the type conditions based on its corresponding inputs. + * @param type What type of input module the inputs are for. + */ + public void fillConditions(RadixTree.InputType type) { + List inputs = getInputs(type); + List conditions = InputConverter.buildPathFrom(inputs); + addTypeConditions(type, conditions); + } + + public HashMap> getConditions() { + return conditions; + } + + public HashMap> getInputs() { + return inputs; + } + + public List getConditions(RadixTree.InputType type) { + return getConditions().get(type); + } + + public List getInputs(RadixTree.InputType type) { + return getInputs().get(type); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/input/KeyBindings.java b/src/main/java/com/amuzil/omegasource/magus/input/KeyBindings.java new file mode 100644 index 00000000..860e18df --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/input/KeyBindings.java @@ -0,0 +1,36 @@ +package com.amuzil.omegasource.magus.input; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.skill.test.avatar.AvatarFormRegistry; +import net.minecraft.client.KeyMapping; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.event.InputEvent; +import net.minecraftforge.client.event.RegisterKeyMappingsEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import org.lwjgl.glfw.GLFW; + + +// Need to denote this as client-side only +@Mod.EventBusSubscriber(modid = Magus.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT) +public class KeyBindings { + + // Grave. Found the key # in InputConstants. + public static final KeyMapping keyToggleTree = new KeyMapping("key.keyboard.grave.accent", 96, "key.categories.gameplay");; + + @SubscribeEvent + public static void registerBindings(RegisterKeyMappingsEvent event) { + event.register(keyToggleTree); + } + + @SubscribeEvent + public static void keyBindPress(InputEvent.Key press) { + if (press.getKey() == keyToggleTree.getKey().getValue()) { + if (press.getAction() == GLFW.GLFW_RELEASE) { + Magus.keyboardMouseInputModule.toggleListeners(); + AvatarFormRegistry.reloadFX(); + } + } + } + +} diff --git a/src/main/java/com/amuzil/omegasource/magus/input/KeyboardMouseInputModule.java b/src/main/java/com/amuzil/omegasource/magus/input/KeyboardMouseInputModule.java new file mode 100644 index 00000000..9a6703b4 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/input/KeyboardMouseInputModule.java @@ -0,0 +1,405 @@ +package com.amuzil.omegasource.magus.input; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.network.MagusNetwork; +import com.amuzil.omegasource.magus.network.packets.client_executed.FormActivatedPacket; +import com.amuzil.omegasource.magus.network.packets.server_executed.SendModifierDataPacket; +import com.amuzil.omegasource.magus.radix.*; +import com.amuzil.omegasource.magus.radix.condition.MultiClientCondition; +import com.amuzil.omegasource.magus.radix.condition.minecraft.forge.key.KeyHoldCondition; +import com.amuzil.omegasource.magus.skill.conditionals.InputData; +import com.amuzil.omegasource.magus.skill.elements.Element; +import com.amuzil.omegasource.magus.skill.forms.Form; +import com.amuzil.omegasource.magus.skill.forms.FormDataRegistry; +import com.amuzil.omegasource.magus.skill.forms.Forms; +import com.mojang.blaze3d.platform.InputConstants; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import net.minecraftforge.client.event.InputEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.TickEvent; +import net.minecraftforge.eventbus.api.EventPriority; +import org.apache.logging.log4j.LogManager; + +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Consumer; + + +public class KeyboardMouseInputModule extends InputModule { + private final Consumer tickEventConsumer; + private final Consumer keyboardListener; + private final Consumer mouseListener; + private final Consumer mouseScrollListener; + private final int tickActivationThreshold = 5; + private final int tickTimeoutThreshold = 15; + private final int modifierTickThreshold = 3; + private final AtomicInteger ticksSinceActivated; + private final AtomicReference activeForm; + private final AtomicInteger timeout; + private final List glfwKeysDown; + public int scrollTimeout = 0; + private int ticksSinceModifiersSent = 0; + private double mouseScrollDelta; + private int activationCounter = 0; + private boolean listen; + // Used for modifier data + private boolean checkForm = false; + + public int getActivationCounter() { + return this.activationCounter; + } + + public KeyboardMouseInputModule() { + formsTree.setDiscipline(activeElement); + + this.ticksSinceActivated = new AtomicInteger(0); + this.activeForm = new AtomicReference<>(Forms.NULL); + this.timeout = new AtomicInteger(0); + this.glfwKeysDown = new LinkedList<>(); + this.listen = true; + this.resetScrolling = false; + + this.keyboardListener = keyboardEvent -> { + int keyPressed = keyboardEvent.getKey(); + // NOTE: Minecraft's InputEvent.Key can only listen to the action InputConstants.REPEAT of one key at a time + // tldr: it only fires the repeat event for the last key + + switch (keyboardEvent.getAction()) { + case InputConstants.PRESS -> { + if (!glfwKeysDown.contains(keyPressed)) { + glfwKeysDown.add(keyPressed); + } + } + case InputConstants.RELEASE -> { + if (glfwKeysDown.contains(keyPressed)) { + glfwKeysDown.remove((Integer) keyPressed); + checkForm = true; + } + } + } + }; + + this.mouseListener = mouseEvent -> { + int keyPressed = mouseEvent.getButton(); + synchronized (glfwKeysDown) { + switch (mouseEvent.getAction()) { + case InputConstants.PRESS -> { + if (!glfwKeysDown.contains(keyPressed)) { + glfwKeysDown.add(keyPressed); + } + } + case InputConstants.RELEASE -> { + if (glfwKeysDown.contains(keyPressed)) { + glfwKeysDown.remove((Integer) keyPressed); + checkForm = true; + } + } + } + } + }; + + this.mouseScrollListener = mouseScrollingEvent -> { + this.scrollTimeout = 0; + // 1.0 = away from player, -1 = towards player + this.mouseScrollDelta = mouseScrollingEvent.getScrollDelta(); + + }; + + this.tickEventConsumer = tickEvent -> { + ticksSinceModifiersSent++; + scrollTimeout++; + + // Resets mouse scrolling delta + if (scrollTimeout >= tickActivationThreshold) { + this.mouseScrollDelta = 0; + this.scrollTimeout = 0; + this.resetScrolling = true; + } + + if (ticksSinceModifiersSent % modifierTickThreshold == 0 && !modifierQueue.isEmpty()) { + sendModifierData(); + } + + // Every tick... Yay... + // Needed so that key releases actually work. + if (checkForm) { + checkForForm(); + checkForm = false; + } + + // Check every couple of ticks + if (timeout.get() % 3 == 0) checkForForm(); + + + if (activeForm.get() != null && !activeForm.get().name().equals("null")) { + ticksSinceActivated.getAndIncrement(); + if (ticksSinceActivated.get() >= tickActivationThreshold) { + // Always to send modifier data right when the form is activated +// sendModifierData(); + + if (lastActivatedForm != null && lastActivatedForm.get().name().equals(activeForm.get().name())) { + // Send modifier data of it being multi. + activationCounter++; + } + else activationCounter = 0; +// else { +// // Send packet +// MagusNetwork.sendToServer(new ConditionActivatedPacket(activeForm)); +// } + + lastActivatedForm.set(activeForm.get()); +// sendModifierData(); + // Extra check for race conditions. Probably wont' help... + synchronized (lastActivatedForm.get()) { + if (!lastActivatedForm.get().name().equals("null")) { + if (Minecraft.getInstance().getConnection() != null) { + MagusNetwork.sendToServer(new FormActivatedPacket(activeForm.get(), activeElement, 0)); + } + sendDebugMsg("Form Activated: " + lastActivatedForm.get().name()); + } + } + + List keyCodes = getKeyCodes(activeForm.get(), RadixTree.InputType.KEYBOARD_MOUSE); + // Need an if statement to check whether key held modifier is increasing + if (!keyCodes.isEmpty()) { + boolean pressed = true; + // If all requisite keys aren't pressed, don't iterate modifier data + for (int key : keyCodes) { + if (!keyPressed(key)) { + + pressed = false; + break; + } + } +// LogManager.getLogger().debug("Found Held Modifier Data."); +// HeldModifierData data = (HeldModifierData) modifierQueue.get("HeldModifier"); + if (!pressed) { + activeForm.set(Forms.NULL); + ticksSinceActivated.set(0); + timeout.set(0); + resetTreeConditions(); + } else { + LogManager.getLogger().debug("Modifier Held Down."); + // Don't reset the currently active form + ticksSinceActivated.set(0); + timeout.set(0); + } + } else { + activeForm.set(Forms.NULL); + ticksSinceActivated.set(0); + timeout.set(0); + resetTreeConditions(); + } + } + + } else { + timeout.getAndIncrement(); + if (timeout.get() > tickTimeoutThreshold) { + resetTreeConditions(); + // Timed out enough where multi is no longer valid. + lastActivatedForm.set(Forms.NULL); + timeout.set(0); + activationCounter = 0; + } + } + }; + } + + public static List getKeyCodes(Form form, RadixTree.InputType type) { + // Creates a copy + List active = Magus.keyboardMouseInputModule.activeConditions.stream().toList(); + + List keyCodes = new ArrayList<>(); + + if (!active.isEmpty()) { + Condition last = active.get(active.size() - 1); + if (last instanceof MultiClientCondition) { + for (Condition cond : ((MultiClientCondition) last).getSubConditions()) { + if (cond instanceof KeyHoldCondition) { + keyCodes.add(((KeyHoldCondition) cond).getKey()); + } + } + } + if (last instanceof KeyHoldCondition) { + keyCodes.add(((KeyHoldCondition) last).getKey()); + } + } + return keyCodes; + } + + // module activating a form rather than relying on the raw input data for those forms. + // This way, the trees for different complex methods (such as VR and multikey) + // remain functionally the same, they just check different input modules for whether the same + // forms are activated. + + public static void setActiveDiscipline(Element element) { + activeElement = element; + formsTree.setDiscipline(element); + } + + @Override + public Form getActiveForm() { + if (activeForm != null) return this.activeForm.get(); + return null; + } + + private void checkForForm() { + synchronized (activeConditions) { + if (!activeConditions.isEmpty()) { + List conditions = activeConditions.stream().toList(); + List recognized = formsTree.search(conditions); +// System.out.println("activeConditions: " + conditions); +// System.out.println("recognized: " + recognized); + if (recognized != null) { + activeForm.set(FormDataRegistry.formsNamespace.get(recognized.hashCode())); + +// System.out.println("RECOGNIZED FORM: " + activeForm.name() + " " + recognized); +// sendDebugMsg("RECOGNIZED FORM: " + activeForm.name()); + } else { // Retry w/o movementConditions + List nonMovementConditions = new ArrayList<>(); + conditions.forEach(condition -> { + if (condition instanceof KeyHoldCondition keyHoldCondition) { + if (!getMovementKeys().containsValue(keyHoldCondition.getKey())) { + nonMovementConditions.add(condition); + } + } + }); + recognized = formsTree.search(nonMovementConditions); + if (recognized != null) { + activeForm.set(FormDataRegistry.formsNamespace.get(recognized.hashCode())); + } + } + } + } + + } + + private void sendModifierData() { +// LogManager.getLogger().info("SENDING MODIFIER DATA"); +// System.out.println("Modifier Listener Size: " + modifierListeners.size()); +// System.out.println("Modifier Data Size: " + modifierQueue.size()); +// for (ModifierData modData : modifierQueue.values()) +// modData.print(); + + synchronized (modifierQueue) { + if (Minecraft.getInstance().getConnection() != null) { + MagusNetwork.sendToServer(new SendModifierDataPacket(modifierQueue.values().stream().toList())); + } + ticksSinceModifiersSent = 0; + modifierQueue.clear(); + } + } + + public void resetKeys() { + glfwKeysDown.clear(); + } + + public void cleanMCKeys() { + // Fixes some weird mouse and other key issues. + for (KeyMapping key : Minecraft.getInstance().options.keyMappings) { + if (!key.isDown()) { + if (glfwKeysDown.contains(key.getKey().getValue())) + glfwKeysDown.remove((Integer) key.getKey().getValue()); + } + } + } + + @Override + public void registerInputData(List formExecutionInputs, Form formToExecute, List formConditions) { + ConditionPath path = formToExecute.createPath(formConditions); + System.out.println("Inserting " + formToExecute.name().toUpperCase() + " into tree with Conditions: " + formConditions + " | Inputs: " + formExecutionInputs); + formsTree.insert(path.conditions); + registerRunnables(formsTree); + } + + @Override + public void registerRunnables(Node current) { + for (RadixBranch branch : current.branches.values()) { +// if (!branch.next.branches.keySet().isEmpty()) +// System.out.println(branch.conditions() + " | THE KIDS: " + branch.next.branches.keySet()); + for (int i = 0; i < branch.conditions().size(); i++) { + Condition condition = branch.conditions().get(i); + Condition nextCondition; + + if (i + 1 < branch.conditions().size()) nextCondition = branch.conditions().get(i + 1); + else nextCondition = null; + + Runnable originalSuccess = condition.onSuccess(); + Runnable onSuccess = () -> { + synchronized (activeConditions) { + if (!activeConditions.contains(condition)) { + activeConditions.add(condition); + condition.unregister(); // unregister parent to give child nodes a shot to be heard + if (nextCondition != null) + nextCondition.register(); // register next condition in the path if it exists + List childConditions = branch.next.branches.keySet().stream().toList(); + RadixTree.registerConditions(childConditions); // register any next of kin children if they exist + } + this.timeout.set(0); + if (originalSuccess != null) originalSuccess.run(); + } + }; + + Runnable originalFailure = condition.onFailure(); + Runnable onFailure = () -> { + synchronized (activeConditions) { + activeConditions.remove(condition); + condition.reset(); + if (originalFailure != null) originalFailure.run(); + } + }; + condition.register(condition.name(), onSuccess, onFailure); + } + registerRunnables(branch.next); + } + } + + @Override + public void registerListeners() { + MinecraftForge.EVENT_BUS.addListener(EventPriority.NORMAL, false, TickEvent.ClientTickEvent.class, tickEventConsumer); + MinecraftForge.EVENT_BUS.addListener(EventPriority.NORMAL, false, InputEvent.Key.class, keyboardListener); + MinecraftForge.EVENT_BUS.addListener(EventPriority.NORMAL, false, InputEvent.MouseButton.class, mouseListener); + MinecraftForge.EVENT_BUS.addListener(EventPriority.NORMAL, false, InputEvent.MouseScrollingEvent.class, mouseScrollListener); + } + + @Override + public void unRegisterInputs() { + MinecraftForge.EVENT_BUS.unregister(tickEventConsumer); + MinecraftForge.EVENT_BUS.unregister(keyboardListener); + MinecraftForge.EVENT_BUS.unregister(mouseListener); + MinecraftForge.EVENT_BUS.unregister(mouseScrollListener); + formInputs.forEach((condition, form) -> condition.unregister()); + } + + @Override + public void registerInputs() { + formInputs.forEach((condition, form) -> condition.register()); + } + + @Override + public void toggleListeners() { + if (!listen) { + registerListeners(); + registerInputs(); + listen = true; + System.out.println("Enabled!"); + } else { + unRegisterInputs(); + listen = false; + System.out.println("Disabled!"); + } + } + + public boolean keyPressed(int key) { + return glfwKeysDown.contains(key); + } + + public double getMouseScrollDelta() { + return this.mouseScrollDelta; + } + +} diff --git a/src/main/java/com/amuzil/omegasource/magus/input/MouseMotionModule.java b/src/main/java/com/amuzil/omegasource/magus/input/MouseMotionModule.java new file mode 100644 index 00000000..b8f61bcc --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/input/MouseMotionModule.java @@ -0,0 +1,178 @@ +package com.amuzil.omegasource.magus.input; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.network.MagusNetwork; +import com.amuzil.omegasource.magus.network.packets.server_executed.SendModifierDataPacket; +import com.amuzil.omegasource.magus.radix.Condition; +import com.amuzil.omegasource.magus.radix.ConditionPath; +import com.amuzil.omegasource.magus.radix.Node; +import com.amuzil.omegasource.magus.skill.conditionals.InputData; +import com.amuzil.omegasource.magus.skill.conditionals.mouse.MousePointInput; +import com.amuzil.omegasource.magus.skill.conditionals.mouse.MouseVircle; +import com.amuzil.omegasource.magus.skill.forms.Form; +import net.minecraft.client.Minecraft; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.TickEvent; +import net.minecraftforge.eventbus.api.EventPriority; +import org.apache.logging.log4j.LogManager; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; + + +public class MouseMotionModule extends InputModule { + private final Consumer tickEventConsumer; + public List mouseGesture; + public MouseVircle vircle; + private Form activeForm = new Form(); + private int ticksSinceActivated = 0; + private int ticksSinceModifiersSent = 0; + + private final int tickActivationThreshold = 10; + private final int tickTimeoutThreshold = 30; + private final int modifierTickThreshold = 10; + private boolean listen; + + public MouseMotionModule() { + this.mouseGesture = new ArrayList<>(); + this.listen = true; + + this.tickEventConsumer = tickEvent -> { + + ticksSinceModifiersSent++; + if (ticksSinceModifiersSent > modifierTickThreshold && !modifierQueue.isEmpty()) { + sendModifierData(); + } + + if (Magus.keyboardMouseInputModule.keyPressed(Minecraft.getInstance().options.keyShift.getKey().getValue())) { + Minecraft mci = Minecraft.getInstance(); + assert mci.player != null; + double x = mci.mouseHandler.xpos(); + double y = mci.mouseHandler.ypos(); + Vec3 lookAngle = mci.player.getLookAngle(); + if (vircle == null) { + vircle = new MouseVircle(new MousePointInput(x, y, lookAngle)); + } else { + vircle.track(new MousePointInput(x, y, lookAngle)); + if (vircle.hasMotionDirection()) { + mouseGesture.add(vircle.popMotionDirection()); + } + } + } else { + if (!mouseGesture.isEmpty()) { +// System.out.println("Mouse Gesture: " + mouseGesture); + mouseGesture.clear(); + } + } + + if(activeForm.name() != null) { + ticksSinceActivated++; + if(ticksSinceActivated >= tickActivationThreshold) { +// if (lastActivatedForm != null) +// LogManager.getLogger().info("LAST FORM ACTIVATED: " + lastActivatedForm.name() + " | FORM ACTIVATED: " + activeForm.name()); +// else +// LogManager.getLogger().info("FORM ACTIVATED: " + activeForm.name()); +// MagusNetwork.sendToServer(new ConditionActivatedPacket(activeForm)); + lastActivatedForm.set(activeForm); + activeForm = new Form(); + ticksSinceActivated = 0; + } + } + else { + ticksSinceActivated++; + if (ticksSinceActivated >= tickTimeoutThreshold) { + lastActivatedForm = null; + ticksSinceActivated = 0; + } + } + }; + } + + private void sendModifierData() { +// LogManager.getLogger().info("SENDING MODIFIER DATA"); + synchronized (modifierQueue) { + MagusNetwork.sendToServer(new SendModifierDataPacket(modifierQueue.values().stream().toList())); + ticksSinceModifiersSent = 0; + modifierQueue.clear(); + } + } + + @Override + public void registerInputData(List formExecutionInputs, Form formToExecute, List formCondition) { + //generate condition from InputData. + ConditionPath path = formToExecute.createPath(formCondition); + formsTree.insert(path.conditions); +// Runnable onSuccess = () -> { +// if(mc.level != null) { +// //this section is to prevent re-activating +// // single condition forms when you hold the activation key for Held modifiers +// if(formToExecute != lastActivatedForm) { +// //LogManager.getLogger().info("FORM ACTIVATED: " + formToExecute.name()); +// activeForm = formToExecute; +// } +// ticksSinceActivated = 0; +// } +// }; +// Runnable onFailure = () -> { +// activeForm = new Form(); +// //reset conditions? +// // Magus.radixTree.burn(); +// }; +// +// if(conditions != null) { +// //Register listeners for condition created. +// conditions.register(formToExecute.name(), onSuccess, onFailure); +// //add condition to InputModule registry so that it can be tracked. +// formInputs.put(conditions, formToExecute); +// } else { +// //todo errors/logging +// } + } + + @Override + public void registerRunnables(Node current) { + + } + + @Override + public void registerListeners() { + MinecraftForge.EVENT_BUS.addListener(EventPriority.NORMAL, false, TickEvent.ClientTickEvent.class, tickEventConsumer); + } + + @Override + public void unRegisterInputs() { + MinecraftForge.EVENT_BUS.unregister(tickEventConsumer); + formInputs.forEach((condition, form) -> condition.unregister()); + } + + @Override + public void registerInputs() { + formInputs.forEach((condition, form) -> { + condition.register(); + }); + } + + @Override + public void toggleListeners() { + if (!listen) { + registerListeners(); + registerInputs(); + listen = true; + } else { + unRegisterInputs(); + listen = false; + } + } + + @Override + public void resetKeys() { + + } + + @Override + public boolean keyPressed(int key) { + return false; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/level/event/FormActivatedEvent.java b/src/main/java/com/amuzil/omegasource/magus/level/event/FormActivatedEvent.java new file mode 100644 index 00000000..1a2ce6d3 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/level/event/FormActivatedEvent.java @@ -0,0 +1,36 @@ +package com.amuzil.omegasource.magus.level.event; + +import com.amuzil.omegasource.magus.skill.forms.Form; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; +import net.minecraft.world.entity.LivingEntity; +import net.minecraftforge.eventbus.api.Event; + +import java.util.List; + + +public class FormActivatedEvent extends Event { + private final Form form; + private final LivingEntity entity; + private List modifiers; + + public FormActivatedEvent(Form form, LivingEntity entity) { + this.form = form; + this.entity = entity; + } + + public FormActivatedEvent(Form form, List modifierData, LivingEntity entity) { + this(form, entity); + this.modifiers = modifierData; + } + public Form getForm() { + return this.form; + } + + public LivingEntity getEntity() { + return this.entity; + } + + public List getModifierData() { + return this.modifiers; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/level/event/MagusEvents.java b/src/main/java/com/amuzil/omegasource/magus/level/event/MagusEvents.java new file mode 100644 index 00000000..f985ace5 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/level/event/MagusEvents.java @@ -0,0 +1,33 @@ +package com.amuzil.omegasource.magus.level.event; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.skill.util.capability.entity.Magi; +import net.minecraftforge.event.TickEvent; +import net.minecraftforge.event.entity.living.LivingDeathEvent; +import net.minecraftforge.event.entity.living.LivingEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; + +@Mod.EventBusSubscriber(modid = Magus.MOD_ID) +public class MagusEvents { + + @SubscribeEvent + public static void tickEvent(LivingEvent.LivingTickEvent event) { + if (event.getEntity() != null) { + Magi magi = Magi.get(event.getEntity()); + if (magi != null) { + magi.onUpdate(); + } + } + } + + @SubscribeEvent + public static void deathEvent(LivingDeathEvent event) { + if (event.getEntity() != null) { + Magi magi = Magi.get(event.getEntity()); + if (magi != null) { + magi.onDeath(); + } + } + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/network/ClientPacketHandler.java b/src/main/java/com/amuzil/omegasource/magus/network/ClientPacketHandler.java new file mode 100644 index 00000000..cd05e1fc --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/network/ClientPacketHandler.java @@ -0,0 +1,46 @@ +package com.amuzil.omegasource.magus.network; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.network.packets.client_executed.RegisterModifierListenersPacket; +import com.amuzil.omegasource.magus.network.packets.client_executed.SkillTriggeredPacket; +import com.amuzil.omegasource.magus.network.packets.client_executed.UnregisterModifierListenersPacket; +import com.amuzil.omegasource.magus.skill.modifiers.ModifiersRegistry; +import net.minecraftforge.network.NetworkEvent; +import org.apache.logging.log4j.LogManager; + +import java.util.function.Supplier; + +//this class is for handling packets specific to the clientside, +// otherwise any references to clientside only classes in packet handling causes us to crash. +public class ClientPacketHandler { + public static boolean handlePacket(SkillTriggeredPacket packet, Supplier ctx) { + + ctx.get().enqueueWork(() -> { + //todo handle activating a skill on the clientside + }); + + return true; + } + + public static boolean handlePacket(RegisterModifierListenersPacket packet, Supplier ctx) { + LogManager.getLogger().info("REGISTERING MODIFIERS"); + ctx.get().enqueueWork(() -> { + packet.modifierTypes.forEach(modifierType -> { + LogManager.getLogger().info("REGISTERING MODIFIER: " + modifierType); + if (ModifiersRegistry.fromName(modifierType).listener() != null) + Magus.keyboardMouseInputModule.registerModifierListener(ModifiersRegistry.fromName(modifierType).listener(), packet.treeData); + }); + }); + + return true; + } + + public static boolean handlePacket(UnregisterModifierListenersPacket packet, Supplier ctx) { + ctx.get().enqueueWork(() -> { + LogManager.getLogger().info("UNREGISTERING MODIFIERS"); + Magus.keyboardMouseInputModule.unregisterModifiers(); + }); + + return true; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/network/MagusNetwork.java b/src/main/java/com/amuzil/omegasource/magus/network/MagusNetwork.java new file mode 100644 index 00000000..c346e41b --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/network/MagusNetwork.java @@ -0,0 +1,92 @@ +package com.amuzil.omegasource.magus.network; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.network.packets.api.MagusPacket; +import com.amuzil.omegasource.magus.network.packets.client_executed.FormActivatedPacket; +import com.amuzil.omegasource.magus.network.packets.client_executed.RegisterModifierListenersPacket; +import com.amuzil.omegasource.magus.network.packets.client_executed.SkillTriggeredPacket; +import com.amuzil.omegasource.magus.network.packets.client_executed.UnregisterModifierListenersPacket; +import com.amuzil.omegasource.magus.network.packets.server_executed.ElementActivatedPacket; +import com.amuzil.omegasource.magus.network.packets.server_executed.ConditionActivatedPacket; +import com.amuzil.omegasource.magus.network.packets.server_executed.SendModifierDataPacket; +import com.amuzil.omegasource.magus.network.packets.server_executed.StartBendingPacket; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.level.ServerPlayer; +import net.minecraftforge.network.NetworkDirection; +import net.minecraftforge.network.NetworkRegistry; +import net.minecraftforge.network.simple.SimpleChannel; + + +public class MagusNetwork { + private static final String PROTOCOL_VERSION = "1.0.0"; + private static int packetId = 0; + public static final SimpleChannel CHANNEL = NetworkRegistry.newSimpleChannel( + new ResourceLocation(Magus.MOD_ID, "main"), + () -> PROTOCOL_VERSION, + PROTOCOL_VERSION::equals, + PROTOCOL_VERSION::equals + ); + + private static int nextID() { + return packetId++; + } + + public static void registerMessages() { + CHANNEL.messageBuilder(ElementActivatedPacket.class, nextID()) + .encoder(ElementActivatedPacket::toBytes) + .decoder(ElementActivatedPacket::fromBytes) + .consumerMainThread(ElementActivatedPacket::handle) + .add(); + + CHANNEL.messageBuilder(FormActivatedPacket.class, nextID()) + .encoder(FormActivatedPacket::toBytes) + .decoder(FormActivatedPacket::fromBytes) + .consumerMainThread(FormActivatedPacket::handle) + .add(); + + CHANNEL.messageBuilder(ConditionActivatedPacket.class, nextID()) + .encoder(ConditionActivatedPacket::toBytes) + .decoder(ConditionActivatedPacket::fromBytes) + .consumerMainThread(ConditionActivatedPacket::handle) + .add(); + + CHANNEL.messageBuilder(SkillTriggeredPacket.class, nextID()) + .encoder(SkillTriggeredPacket::toBytes) + .decoder(SkillTriggeredPacket::fromBytes) + .consumerMainThread(SkillTriggeredPacket::handle) + .add(); + + CHANNEL.messageBuilder(StartBendingPacket.class, nextID()) + .encoder(StartBendingPacket::toBytes) + .decoder(StartBendingPacket::fromBytes) + .consumerMainThread(StartBendingPacket::handle) + .add(); + + CHANNEL.messageBuilder(SendModifierDataPacket.class, nextID()) + .encoder(SendModifierDataPacket::toBytes) + .decoder(SendModifierDataPacket::fromBytes) + .consumerMainThread(SendModifierDataPacket::handle) + .add(); + + CHANNEL.messageBuilder(RegisterModifierListenersPacket.class, nextID()) + .encoder(RegisterModifierListenersPacket::toBytes) + .decoder(RegisterModifierListenersPacket::fromBytes) + .consumerMainThread(RegisterModifierListenersPacket::handle) + .add(); + + CHANNEL.messageBuilder(UnregisterModifierListenersPacket.class, nextID()) + .encoder(UnregisterModifierListenersPacket::toBytes) + .decoder(UnregisterModifierListenersPacket::fromBytes) + .consumerMainThread(UnregisterModifierListenersPacket::handle) + .add(); + } + + + public static void sendToClient(MagusPacket packet, ServerPlayer player) { + CHANNEL.sendTo(packet, player.connection.connection, NetworkDirection.PLAY_TO_CLIENT); + } + + public static void sendToServer(MagusPacket packet) { + CHANNEL.sendToServer(packet); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/network/packets/SyncDataSPacket.java b/src/main/java/com/amuzil/omegasource/magus/network/packets/SyncDataSPacket.java new file mode 100644 index 00000000..407a302f --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/network/packets/SyncDataSPacket.java @@ -0,0 +1,13 @@ +package com.amuzil.omegasource.magus.network.packets; + +import com.amuzil.omegasource.magus.skill.util.capability.entity.Data; + +public class SyncDataSPacket { + private Data data; + + public SyncDataSPacket(Data data) { + this.data = data; + } + + +} diff --git a/src/main/java/com/amuzil/omegasource/magus/network/packets/api/MagusPacket.java b/src/main/java/com/amuzil/omegasource/magus/network/packets/api/MagusPacket.java new file mode 100644 index 00000000..882ba598 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/network/packets/api/MagusPacket.java @@ -0,0 +1,16 @@ +package com.amuzil.omegasource.magus.network.packets.api; + +import net.minecraft.network.FriendlyByteBuf; +import net.minecraftforge.network.NetworkEvent; + +import java.util.function.Supplier; + +public interface MagusPacket { + void toBytes(FriendlyByteBuf buffer); + + static MagusPacket fromBytes(FriendlyByteBuf buffer) { return null; } + + static boolean handle(MagusPacket packet, Supplier context) { + return false; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/network/packets/client_executed/FormActivatedPacket.java b/src/main/java/com/amuzil/omegasource/magus/network/packets/client_executed/FormActivatedPacket.java new file mode 100644 index 00000000..94a6e28f --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/network/packets/client_executed/FormActivatedPacket.java @@ -0,0 +1,127 @@ +package com.amuzil.omegasource.magus.network.packets.client_executed; + +import com.amuzil.omegasource.magus.entity.ElementProjectile; +import com.amuzil.omegasource.magus.level.event.FormActivatedEvent; +import com.amuzil.omegasource.magus.network.MagusNetwork; +import com.amuzil.omegasource.magus.network.packets.api.MagusPacket; +import com.amuzil.omegasource.magus.registry.Registries; +import com.amuzil.omegasource.magus.skill.elements.Element; +import com.amuzil.omegasource.magus.skill.forms.Form; +import com.amuzil.omegasource.magus.skill.forms.Forms; +import net.minecraft.client.Minecraft; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.Level; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.DistExecutor; +import net.minecraftforge.network.NetworkEvent; +import net.minecraftforge.network.PacketDistributor; + +import java.util.Objects; +import java.util.function.Supplier; + +import static com.amuzil.omegasource.magus.Magus.MOD_ID; +import static com.amuzil.omegasource.magus.skill.forms.Forms.*; + + +public class FormActivatedPacket implements MagusPacket { + + private final Form form; + private final Element element; + private final int entityId; // Entity ID to send back to client for FX + + public FormActivatedPacket(Form form, Element element, int entityId) { + this.form = Objects.requireNonNullElseGet(form, Form::new); + this.element = element; + this.entityId = entityId; + } + + public void toBytes(FriendlyByteBuf buf) { + if (form != null) { + buf.writeUtf(form.name()); + buf.writeUtf(element.name()); + buf.writeInt(entityId); + } + } + + public static FormActivatedPacket fromBytes(FriendlyByteBuf buf) { + String formName = buf.readUtf(); + String elementName = buf.readUtf(); + int entityId = buf.readInt(); + Form form = Registries.FORMS.get().getValue(new ResourceLocation(MOD_ID, formName)); + Element element = (Element) Registries.SKILL_CATEGORIES.get().getValue(new ResourceLocation(MOD_ID, elementName)); + return new FormActivatedPacket(form, element, entityId); + } + + // Client-side handler + @OnlyIn(Dist.CLIENT) + private static void handleClientSide(Form form, int entityId) { + // Perform client-side particle effect or other rendering logic here + Player player = Minecraft.getInstance().player; + assert player != null; + ElementProjectile elementProjectile = (ElementProjectile) player.level().getEntity(entityId); + /** + NOTE: Need to ensure ElementProjectile's extra constructor args are set client-side. + @see ElementProjectile#ElementProjectile(EntityType, Level) This gets called first and server-side only. + Can't change this default constructor because it's needed to register entities. Add/use any extra args to Packet. + */ + assert elementProjectile != null; + elementProjectile.startEffect(form, player); + } + + // Server-side handler + public static void handleServerSide(Form form, Element element, int entityId, ServerPlayer player) { + // Perform server-side entity spawning and updating logic and fire Form Event here + MinecraftForge.EVENT_BUS.post(new FormActivatedEvent(form, player)); + ServerLevel level = player.serverLevel(); + // TODO - Create/perform certain entity updates based on form and element + // - All Skills/techniques should be determined and handled here + ElementProjectile entity; + if (entityId != 0) { // Update existing entity + entity = (ElementProjectile) player.level().getEntity(entityId); + } else { // Create new entity + entity = ElementProjectile.createElementEntity(form, element, player, level); + } + assert entity != null; + if (form.equals(ARC) || form.equals(NULL)) { + entity.control(1.5f, form); + } else if (form.equals(STRIKE) || form.equals(FORCE)) { + entity.shoot(player.getViewVector(1).x, player.getViewVector(1).y, player.getViewVector(1).z, 1, 1); + } else { + entity.discard(); + return; // Unhandled Form - Discard and print no effects + } + if (entityId == 0) + level.addFreshEntity(entity); + FormActivatedPacket packet = new FormActivatedPacket(form, element, entity.getId()); +// Predicate predicate = (serverPlayer) -> player.distanceToSqr(serverPlayer) < 2500; +// for (ServerPlayer nearbyPlayer: level.getPlayers(predicate.and(LivingEntity::isAlive))) { +// MagusNetwork.sendToClient(packet, nearbyPlayer); +// } // Keep this in case we want a more specific client packet distribution filter + + // Distribute packet to clients within 500 blocks + MagusNetwork.CHANNEL.send(PacketDistributor.NEAR.with( + () -> new PacketDistributor.TargetPoint(player.getX(), player.getY(), player.getZ(), + 500, level.dimension())), packet); + } + + public boolean handle(Supplier ctx) { + ctx.get().enqueueWork(() -> { + if (ctx.get().getDirection().getReceptionSide().isClient()) { + DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> handleClientSide(form, entityId)); + } else { + ServerPlayer player = ctx.get().getSender(); + assert player != null; + handleServerSide(form, element, entityId, player); + } + }); + return true; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/network/packets/client_executed/RegisterModifierListenersPacket.java b/src/main/java/com/amuzil/omegasource/magus/network/packets/client_executed/RegisterModifierListenersPacket.java new file mode 100644 index 00000000..03e40f51 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/network/packets/client_executed/RegisterModifierListenersPacket.java @@ -0,0 +1,54 @@ +package com.amuzil.omegasource.magus.network.packets.client_executed; + +import com.amuzil.omegasource.magus.network.ClientPacketHandler; +import com.amuzil.omegasource.magus.network.packets.api.MagusPacket; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.StringTag; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraftforge.network.NetworkEvent; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Supplier; + +public class RegisterModifierListenersPacket implements MagusPacket { + public CompoundTag treeData; + public List modifierTypes; + + public RegisterModifierListenersPacket(List modifierTypes, CompoundTag treeData) { + this.modifierTypes = modifierTypes; + this.treeData = treeData; + } + + public void toBytes(FriendlyByteBuf buf) { + CompoundTag object = new CompoundTag(); + object.put("treeData", treeData); + + ListTag list = new ListTag(); + modifierTypes.forEach(modifierType -> list.add(StringTag.valueOf(modifierType))); + + object.put("modifierTypes", list); + + buf.writeNbt(object); + } + + public static RegisterModifierListenersPacket fromBytes(FriendlyByteBuf buf) { + CompoundTag object = buf.readNbt(); + + List modifierTypes = new ArrayList<>(); + + ListTag list = (ListTag)object.get("modifierTypes"); + list.forEach(tag -> { + modifierTypes.add(tag.getAsString()); + }); + + CompoundTag treeData = object.getCompound("treeData"); + + return new RegisterModifierListenersPacket(modifierTypes, treeData); + } + + public boolean handle(Supplier ctx) { + return ClientPacketHandler.handlePacket(this, ctx); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/network/packets/client_executed/SkillTriggeredPacket.java b/src/main/java/com/amuzil/omegasource/magus/network/packets/client_executed/SkillTriggeredPacket.java new file mode 100644 index 00000000..d305ccfa --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/network/packets/client_executed/SkillTriggeredPacket.java @@ -0,0 +1,33 @@ +package com.amuzil.omegasource.magus.network.packets.client_executed; + +import com.amuzil.omegasource.magus.network.ClientPacketHandler; +import com.amuzil.omegasource.magus.network.packets.api.MagusPacket; +import com.amuzil.omegasource.magus.registry.Registries; +import com.amuzil.omegasource.magus.skill.skill.Skill; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraftforge.network.NetworkEvent; + +import java.util.function.Supplier; + +public class SkillTriggeredPacket implements MagusPacket { + + private final Skill skill; + + public SkillTriggeredPacket(Skill skill) { + this.skill = skill; + } + + public void toBytes(FriendlyByteBuf buf) { + if(skill != null) + buf.writeResourceLocation(skill.getId()); + + } + + public static SkillTriggeredPacket fromBytes(FriendlyByteBuf buf) { + return new SkillTriggeredPacket(Registries.SKILLS.get().getValue(buf.readResourceLocation())); + } + + public boolean handle(Supplier ctx) { + return ClientPacketHandler.handlePacket(this, ctx); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/network/packets/client_executed/UnregisterModifierListenersPacket.java b/src/main/java/com/amuzil/omegasource/magus/network/packets/client_executed/UnregisterModifierListenersPacket.java new file mode 100644 index 00000000..f056a974 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/network/packets/client_executed/UnregisterModifierListenersPacket.java @@ -0,0 +1,25 @@ +package com.amuzil.omegasource.magus.network.packets.client_executed; + +import com.amuzil.omegasource.magus.network.ClientPacketHandler; +import com.amuzil.omegasource.magus.network.packets.api.MagusPacket; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraftforge.network.NetworkEvent; + +import java.util.function.Supplier; + +public class UnregisterModifierListenersPacket implements MagusPacket { + + public UnregisterModifierListenersPacket() { + } + + public void toBytes(FriendlyByteBuf buf) { + } + + public static UnregisterModifierListenersPacket fromBytes(FriendlyByteBuf buf) { + return new UnregisterModifierListenersPacket(); + } + + public boolean handle(Supplier ctx) { + return ClientPacketHandler.handlePacket(this, ctx); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/network/packets/server_executed/ConditionActivatedPacket.java b/src/main/java/com/amuzil/omegasource/magus/network/packets/server_executed/ConditionActivatedPacket.java new file mode 100644 index 00000000..f2c60fcb --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/network/packets/server_executed/ConditionActivatedPacket.java @@ -0,0 +1,45 @@ +package com.amuzil.omegasource.magus.network.packets.server_executed; + +import com.amuzil.omegasource.magus.network.packets.api.MagusPacket; +import com.amuzil.omegasource.magus.radix.Condition; +import com.amuzil.omegasource.magus.radix.RadixUtil; +import com.amuzil.omegasource.magus.radix.condition.ConditionRegistry; +import com.amuzil.omegasource.magus.registry.Registries; +import com.amuzil.omegasource.magus.skill.util.capability.CapabilityHandler; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.network.NetworkEvent; + +import java.util.function.Supplier; + +public class ConditionActivatedPacket implements MagusPacket { + + private final Condition condition; + + public ConditionActivatedPacket(Condition condition) { + this.condition = condition; + } + + public void toBytes(FriendlyByteBuf buf) { + if (condition != null) { + buf.writeInt(ConditionRegistry.getID(condition)); + } + } + + public static ConditionActivatedPacket fromBytes(FriendlyByteBuf buf) { + int id = buf.readInt(); + Condition cond = ConditionRegistry.getCondition(id); + return new ConditionActivatedPacket(cond); + } + + public boolean handle(Supplier ctx) { + ctx.get().enqueueWork(() -> { + Player player = ctx.get().getSender(); + // Intentional crashing because I want to know why my packet isn't being received correctly... +// CapabilityHandler.getCapability(player, CapabilityHandler.LIVING_DATA).getTree().moveDown(condition); + }); + return true; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/network/packets/server_executed/ElementActivatedPacket.java b/src/main/java/com/amuzil/omegasource/magus/network/packets/server_executed/ElementActivatedPacket.java new file mode 100644 index 00000000..105bb959 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/network/packets/server_executed/ElementActivatedPacket.java @@ -0,0 +1,81 @@ +package com.amuzil.omegasource.magus.network.packets.server_executed; + +import com.amuzil.omegasource.magus.input.InputModule; +import com.amuzil.omegasource.magus.network.MagusNetwork; +import com.amuzil.omegasource.magus.network.packets.api.MagusPacket; +import com.amuzil.omegasource.magus.registry.Registries; +import com.amuzil.omegasource.magus.skill.elements.Element; +import net.minecraft.client.Minecraft; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.player.Player; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.fml.DistExecutor; +import net.minecraftforge.network.NetworkEvent; +import net.minecraftforge.network.PacketDistributor; + +import java.util.function.Supplier; + +import static com.amuzil.omegasource.magus.Magus.MOD_ID; + + +public class ElementActivatedPacket implements MagusPacket { + + private final Element element; + private final int entityId; // Entity ID to send back to client for FX + + public ElementActivatedPacket(Element element, int entityId) { + this.element = element; + this.entityId = entityId; + } + + public void toBytes(FriendlyByteBuf buf) { + buf.writeUtf(element.name()); + buf.writeInt(entityId); + } + + public static ElementActivatedPacket fromBytes(FriendlyByteBuf buf) { + String elementName = buf.readUtf(); + int entityId = buf.readInt(); + Element element = (Element) Registries.SKILL_CATEGORIES.get().getValue(new ResourceLocation(MOD_ID, elementName)); + return new ElementActivatedPacket(element, entityId); + } + + // Client-side handler + @OnlyIn(Dist.CLIENT) + private static void handleClientSide(Element element) { + // Update player's active element client-side + Player player = Minecraft.getInstance().player; + assert player != null; + InputModule.setDiscipline(element); + } + + // Server-side handler + public static void handleServerSide(Element element, int entityId, ServerPlayer serverPlayer) { + // Update player's active element server-side + ServerLevel level = serverPlayer.serverLevel(); + ElementActivatedPacket packet = new ElementActivatedPacket(element, entityId); + Entity entity = level.getEntity(entityId); // Retrieve the entity from the world by its ID + if (entity instanceof ServerPlayer player) { // Check if the entity is a ServerPlayer + // Send packet to client + MagusNetwork.CHANNEL.send(PacketDistributor.PLAYER.with(() -> player), packet); + } + } + + public boolean handle(Supplier ctx) { + ctx.get().enqueueWork(() -> { + if (ctx.get().getDirection().getReceptionSide().isClient()) { + DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> handleClientSide(element)); + } else { + ServerPlayer player = ctx.get().getSender(); + assert player != null; + handleServerSide(element, entityId, player); + } + }); + return true; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/network/packets/server_executed/SendModifierDataPacket.java b/src/main/java/com/amuzil/omegasource/magus/network/packets/server_executed/SendModifierDataPacket.java new file mode 100644 index 00000000..b8d04628 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/network/packets/server_executed/SendModifierDataPacket.java @@ -0,0 +1,50 @@ +package com.amuzil.omegasource.magus.network.packets.server_executed; + +import com.amuzil.omegasource.magus.network.packets.api.MagusPacket; +import com.amuzil.omegasource.magus.skill.modifiers.ModifiersRegistry; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; +import com.amuzil.omegasource.magus.skill.util.capability.CapabilityHandler; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.entity.player.Player; +import net.minecraftforge.network.NetworkEvent; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Supplier; + +public class SendModifierDataPacket implements MagusPacket { + + private List modifierData; + + public SendModifierDataPacket(List modifierData) { + this.modifierData = modifierData; + } + + public void toBytes(FriendlyByteBuf buf) { + CompoundTag data = new CompoundTag(); + ListTag listTag = new ListTag(); + if(modifierData != null && modifierData.size() > 0) { + modifierData.forEach(modifier -> listTag.add(modifier.serializeNBT())); + } + data.put("modifiers", listTag); + buf.writeNbt(data); + } + + public static SendModifierDataPacket fromBytes(FriendlyByteBuf buf) { + CompoundTag modifierTag = buf.readNbt(); + ListTag listTag = (ListTag) modifierTag.get("modifiers"); + List modifiers = new ArrayList<>(); + listTag.forEach(tag -> modifiers.add(ModifiersRegistry.fromCompoundTag((CompoundTag) tag))); + return new SendModifierDataPacket(modifiers); + } + + public boolean handle(Supplier ctx) { + ctx.get().enqueueWork(() -> { + Player player = ctx.get().getSender(); +// CapabilityHandler.getCapability(player, CapabilityHandler.LIVING_DATA).getTree().addModifierData(modifierData); + }); + return true; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/network/packets/server_executed/StartBendingPacket.java b/src/main/java/com/amuzil/omegasource/magus/network/packets/server_executed/StartBendingPacket.java new file mode 100644 index 00000000..f8959f9b --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/network/packets/server_executed/StartBendingPacket.java @@ -0,0 +1,27 @@ +package com.amuzil.omegasource.magus.network.packets.server_executed; + +import com.amuzil.omegasource.magus.network.packets.api.MagusPacket; +import com.amuzil.omegasource.magus.skill.forms.FormDataRegistry; +import com.amuzil.omegasource.magus.skill.util.capability.CapabilityHandler; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.entity.player.Player; +import net.minecraftforge.network.NetworkEvent; + +import java.util.function.Supplier; + +public class StartBendingPacket implements MagusPacket { + public void toBytes(FriendlyByteBuf buf) { + } + + public static StartBendingPacket fromBytes(FriendlyByteBuf buf) { + return new StartBendingPacket(); + } + + public boolean handle(Supplier ctx) { + ctx.get().enqueueWork(() -> { + Player player = ctx.get().getSender(); +// CapabilityHandler.getCapability(player, CapabilityHandler.LIVING_DATA).getTree().start(); + }); + return true; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/pseudo/DataTrait.pseudojava b/src/main/java/com/amuzil/omegasource/magus/pseudo/DataTrait.pseudojava new file mode 100644 index 00000000..3969c527 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/pseudo/DataTrait.pseudojava @@ -0,0 +1,5 @@ + + +public class DataTrait { + +} \ No newline at end of file diff --git a/src/main/java/com/amuzil/omegasource/magus/pseudo/Skill.pseudojava b/src/main/java/com/amuzil/omegasource/magus/pseudo/Skill.pseudojava new file mode 100644 index 00000000..b91fd0bb --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/pseudo/Skill.pseudojava @@ -0,0 +1,41 @@ + +public record Skill ( + String name, + SkillCategory category; + SkillTraits traits + ) { + + public boolean shouldStart(LivingEntity entity, RadixTree tree) { + } + + public void start(LivingEntity entity, RadixTree tree) { + if (shouldRun(entity, tree)) + run(entity, tree); + } + + public boolean shouldRun(LivingEntity entity, RadixTree tree) { + + } + + public void run(LivingEntity entity, RadixTree tree) { + if (shouldStop(entity, tree)) + stop(entity, tree); + //Code that does whatever + + if (shouldRun(entity, tree)) + run(entity, tree); + } + + public boolean shouldStop(LivingEntity entity, RadixTree tree) { + } + + public void stop(LivingEntity entity, RadixTree tree) { + } + + public SkillType getType() { + } + + + + +} \ No newline at end of file diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/Condition.java b/src/main/java/com/amuzil/omegasource/magus/radix/Condition.java new file mode 100644 index 00000000..f9a60d0e --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/Condition.java @@ -0,0 +1,106 @@ +package com.amuzil.omegasource.magus.radix; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.radix.condition.ConditionRegistry; +import com.amuzil.omegasource.magus.registry.Registries; + +import java.util.List; + +public abstract class Condition { + + public enum Result { + SUCCESS, + FAILURE, + NONE + } + + protected static final Runnable NO_OPERATION = () -> RadixUtil.getLogger().debug("Result: No Operation"); + + protected String name; + protected boolean active = false; + protected Runnable onSuccess; + protected Runnable onFailure; + + // TODO: Change to registerRunnables() + public void register(String name, Runnable onSuccess, Runnable onFailure) { + this.name = name; + //RadixUtil.getLogger().debug("Registering results"); +// if (this instanceof KeyPressCondition && ((KeyPressCondition) this).getKey() == 0) +// Thread.dumpStack(); + //RadixUtil.getLogger().debug("Result: success"); + this.onSuccess = onSuccess; + // RadixUtil.getLogger().debug("Result: failure: " + getClass()); + // Thread.dumpStack(); + this.onFailure = onFailure; + registerEntry(); + } + + // TODO: Change this to registerListeners() + public void register() {} + + // Every Condition needs to call this in their constructor + public void registerEntry() { + ConditionRegistry.register(this); + } + + public void unregister() { +// Thread.dumpStack(); + RadixUtil.getLogger().debug("Unregistering condition:" + getClass()); + // This should not cause any errors when called if the condition is + // already unregistered or was never registered in the first place + } + + protected Runnable runOn(Result result) { + return switch (result) { + case SUCCESS -> onSuccess; + case FAILURE -> onFailure; + case NONE -> NO_OPERATION; + }; + } + + public String name() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + // Change this for custom conditions/conditions you want registered in your own mod + public String modID() { + return Magus.MOD_ID; + } + + public void reset() {} + + public boolean getActiveStatus() { + return active; + } + + public static boolean startsWith(List conditions, List subConditions) { + try { + return conditions.subList(0, subConditions.size()).equals(subConditions); + } catch (IndexOutOfBoundsException e) { + return false; + } + } + + // TODO - May need to override the equals or create a new method to check if conditions have matching prefixes +// @Override +// public boolean equals(Object obj) { +// return super.equals(obj); +// } + + @Override + public String toString() { + return this.getClass().getSimpleName() + "[ " + name + " ]"; + } + + public Runnable onSuccess() { + return this.onSuccess; + } + + public Runnable onFailure() { + return this.onFailure; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/ConditionPath.java b/src/main/java/com/amuzil/omegasource/magus/radix/ConditionPath.java new file mode 100644 index 00000000..c8775b31 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/ConditionPath.java @@ -0,0 +1,140 @@ +package com.amuzil.omegasource.magus.radix; + +import com.amuzil.omegasource.magus.radix.condition.ConditionRegistry; +import com.amuzil.omegasource.magus.skill.modifiers.ModifiersRegistry; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; +import com.ibm.icu.impl.Pair; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraftforge.common.util.INBTSerializable; + +import java.util.*; + +public class ConditionPath implements INBTSerializable { + + public HashMap> activationPath; + public List conditions; + private boolean isDirty; + + public ConditionPath() { + activationPath = new HashMap<>(); + conditions = new LinkedList<>(); + markDirty(); + } + + public ConditionPath(List activatedConditions) { + conditions = new LinkedList<>(activatedConditions); + activationPath = new HashMap<>(); + + List emptyModifier = new ArrayList<>(); + + for (Condition activatedCondition : conditions) { + activationPath.put(activatedCondition, emptyModifier); + } + markDirty(); + } + + public void markDirty() { + this.isDirty = true; + } + + public void markClean() { + this.isDirty = false; + } + + public boolean isDirty() { + return this.isDirty; + } + + public void addStep(Condition activatedCondition, List modifierData) { + if (activatedCondition != null && conditions != null) { + conditions.add(activatedCondition); + activationPath.put(activatedCondition, modifierData); + markDirty(); + } + } + + // Remember that modifier data goes up to the currently active node. So, a lot of Effects + // will only check their first condition for the right modifier data. + public List getModifiers(Condition condition) { + return activationPath.getOrDefault(condition, new ArrayList<>()); + } + + @Override + public String toString() { + return conditions.toString(); + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag compoundTag = new CompoundTag(); + + ListTag listOfPairsTag = new ListTag(); + + CompoundTag pairTag; + int i = 0; + for (Map.Entry> pathEntry : activationPath.entrySet()) { + Condition activeCondition = pathEntry.getKey(); + List modifierData = pathEntry.getValue(); + + pairTag = new CompoundTag(); + ListTag modifierDataListTag = new ListTag(); + + modifierData.forEach(modifierDataInstance -> modifierDataListTag.add(modifierDataInstance.serializeNBT())); + + // Have to fix this... + pairTag.putInt("condition", ConditionRegistry.getID(activeCondition)); + pairTag.put("modifiers", modifierDataListTag); + listOfPairsTag.add(i, pairTag); + i++; + } + + compoundTag.put("activationPath", listOfPairsTag); + + return compoundTag; + } + + @Override + public void deserializeNBT(CompoundTag compoundTag) { + ListTag listOfPairsTag = (ListTag) compoundTag.get("activationPath"); + activationPath = new HashMap<>(); + if (listOfPairsTag == null) return; + listOfPairsTag.forEach(pairTag -> { + // Need to figure out how to convert this into conditions. + // Going to go over capability data to check for every active listener and use those in the path. + if (pairTag instanceof CompoundTag pairTagCompound) { + Pair> stepPair; + Condition condition = ConditionRegistry.getCondition(((CompoundTag) pairTag).getInt("condition")); + ListTag modifiersListTag = (ListTag) pairTagCompound.get("modifiers"); + + List modifierData = new ArrayList<>(); + // Only add modifier data if it's not null + if (modifiersListTag != null) + modifiersListTag.forEach(tag -> modifierData.add(ModifiersRegistry.fromCompoundTag(compoundTag))); + + activationPath.put(condition, modifierData); + } + }); + markClean(); + } + + @Override + public int hashCode() { + int hash = 0; + for (Condition cond : conditions) { + hash += cond.hashCode(); + } + // Hashing involves size of the list, and then an arbitrarily large prime number; e.g 29. + hash = hash % (conditions.size() * 29); + return hash; + } + + @Override + public boolean equals(Object obj) { + // This needs to be overridden to *ignore* modifiers. It needs to only check that each condition in each path matches + // (using custom defined hashcodes/equals method for each). + if (!(obj instanceof ConditionPath)) return false; + + return hashCode() == obj.hashCode() && conditions.size() == ((ConditionPath) obj).conditions.size() && activationPath.size() == conditions.size(); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/Leaf.java b/src/main/java/com/amuzil/omegasource/magus/radix/Leaf.java new file mode 100644 index 00000000..96f523a8 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/Leaf.java @@ -0,0 +1,9 @@ +package com.amuzil.omegasource.magus.radix; + +public interface Leaf { + void burn(); + + void reset(); + + T measure(); +} diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/Node.java b/src/main/java/com/amuzil/omegasource/magus/radix/Node.java new file mode 100644 index 00000000..109530e8 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/Node.java @@ -0,0 +1,191 @@ +package com.amuzil.omegasource.magus.radix; + +import com.amuzil.omegasource.magus.network.MagusNetwork; +import com.amuzil.omegasource.magus.network.packets.client_executed.RegisterModifierListenersPacket; +import com.amuzil.omegasource.magus.network.packets.client_executed.UnregisterModifierListenersPacket; +import com.amuzil.omegasource.magus.skill.elements.Element; +import com.amuzil.omegasource.magus.skill.modifiers.api.Modifier; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; +import com.mojang.datafixers.util.Pair; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.level.ServerPlayer; +import org.apache.logging.log4j.LogManager; + +import java.util.*; +import java.util.function.Consumer; +import java.util.stream.Collectors; + +/** + * + */ +public class Node { + //This needs to be changed to + private Map children; + // Need to figure this out... + private Pair parent; + private final Consumer onEnter; + private final Consumer onLeave; + private final Consumer onTerminate; + private final Condition terminateCondition; + private final List modifiers; + public final HashMap branches; + public boolean isComplete; + + /** + * @param children If a condition is fulfilled, the active node moves down to the mapped child node + * @param onEnter Called when the active node is moved down from the parent node to this node + * @param onLeave Called when the active node is moved down from this node to a child node + * @param onTerminate Called when the active node is moved up to the root node because either all children's conditions have expired or the terminate condition has been fulfilled + * @param terminateCondition If this condition is fulfilled, the active node will be terminated. If it expires, nothing special happens. It doesn't have to expire for the branch to terminate + */ + public Node( + Pair parent, + Map children, + Consumer onEnter, + Consumer onLeave, + Consumer onTerminate, + Condition terminateCondition, + List modifiers + ) { + this.parent = parent; + this.children = children; + this.onEnter = onEnter; + this.onLeave = onLeave; + this.onTerminate = onTerminate; + this.terminateCondition = terminateCondition; + this.modifiers = Collections.synchronizedList(modifiers.stream().map(Modifier::data).toList()); + branches = new HashMap<>(); + this.isComplete = false; // Temporary + } + + public Node (boolean isComplete) { + this.onEnter = null; + this.onLeave = null; + this.onTerminate = null; + this.terminateCondition = null; + this.modifiers = new ArrayList<>(); + this.branches = new HashMap<>(); + this.isComplete = isComplete; + } + public RadixBranch getTransition(Condition transitionCondition) { + return branches.get(transitionCondition); + } + + public void addCondition(ConditionPath conditionPath, Node next) { + branches.put(conditionPath.conditions.get(0), new RadixBranch(conditionPath, next)); + } + + public int totalConditions() { + return branches.size(); + } + + public Set getImmediateBranches() { + return branches.keySet(); + } + + @Override + public String toString() { + return "Node[ isComplete=" + isComplete + ", branches=" + branches + "]"; + } + + // ---------- Cali's RadixTree Impl ---------- + + public Map children() { + return children; + } + + public Consumer onEnter() { + return onEnter; + } + + public Consumer onLeave() { + return onLeave; + } + + public Pair parent() { + return this.parent; + } + + public Map getImmediateChildren() { + return children().entrySet().stream() + .filter(entry -> + entry.getValue().parent().getSecond().equals(this) + && entry.getValue().parent().getSecond() + .terminateCondition().equals(this.terminateCondition())) // Ensure the child's parent is the current node + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); + } + + public Consumer onTerminate() { + return onTerminate; + } + + public Condition terminateCondition() { + return terminateCondition; + } + + public synchronized List getModifiers() { + return modifiers; + } + + public void registerModifierListeners(Element activeElement, ServerPlayer player) { + CompoundTag listenerInstanceData = new CompoundTag(); + + //here we can send information to the client to help build the Modifier Listeners appropriately. + listenerInstanceData.putString("activeElement", activeElement.name()); + + List modifierTypes = new ArrayList<>(); + List modifiers = getModifiers(); + + synchronized (modifiers) { + modifiers.stream() + .filter(modifierData -> !modifierData.serversideOnly()) + .forEach(type -> modifierTypes.add(type.getName())); + } + + MagusNetwork.sendToClient(new RegisterModifierListenersPacket(modifierTypes, listenerInstanceData), player); + } + + public void unregisterModifierListeners(ServerPlayer player) { + MagusNetwork.sendToClient(new UnregisterModifierListenersPacket(), player); + } + + public synchronized void addModifierData(ModifierData modifierData) { + List existingModifiers = getModifiers(); + synchronized(existingModifiers) { + addModifierData(existingModifiers, modifierData); + } + } + + public synchronized void addModifierData(List modifierData) { + List existingModifiers = getModifiers(); + synchronized(existingModifiers) { + modifierData.forEach(data -> { + addModifierData(existingModifiers, data); + }); + } + } + + private static void addModifierData(List existingModifiers, ModifierData data) { + //Log the data being added to the Node + LogManager.getLogger().info("addModifierData: newData: "); + data.print(); + + //Identify the existing ModifierData record for this type. + int existingModifierIndex = existingModifiers.indexOf(existingModifiers.stream().filter(mod -> mod.getName().equals(data.getName())).findFirst().get()); + ModifierData currentModifier = existingModifiers.get(existingModifierIndex); + + //Log the data already on the Node. + LogManager.getLogger().info("addModifierData: oldData: "); + currentModifier.print(); + + //Merge the two modifier instances and log the result. + LogManager.getLogger().info("addModifierData: after adding together: "); + currentModifier.add(data); + currentModifier.print(); + existingModifiers.add(existingModifierIndex, currentModifier); + + //Log proving the data has been updated in the node successfully. + LogManager.getLogger().info("addModifierData: after setting on the node: "); + existingModifiers.get(existingModifierIndex).print(); + } +} \ No newline at end of file diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/NodeBuilder.java b/src/main/java/com/amuzil/omegasource/magus/radix/NodeBuilder.java new file mode 100644 index 00000000..08568bc4 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/NodeBuilder.java @@ -0,0 +1,151 @@ +package com.amuzil.omegasource.magus.radix; + +import com.amuzil.omegasource.magus.skill.forms.Form; +import com.amuzil.omegasource.magus.skill.modifiers.api.Modifier; +import com.mojang.datafixers.util.Pair; + +import java.util.*; +import java.util.function.Consumer; + +public class NodeBuilder { + private final Type type; + private final Map children; + private Consumer onEnter; + private Consumer onLeave; + private Consumer onTerminate; + private Condition terminateCondition; + private Pair parent; + private final List availableModifiers; + + private NodeBuilder(Type type) { + this.type = type; + this.children = new HashMap<>(); + this.availableModifiers = new ArrayList<>(); + this.onEnter = null; + this.onLeave = null; + this.onTerminate = null; + this.terminateCondition = null; + } + + public static NodeBuilder root() { + return new NodeBuilder(Type.ROOT); + } + + public static NodeBuilder middle() { + return new NodeBuilder(Type.MIDDLE); + } + + public static NodeBuilder end() { + return new NodeBuilder(Type.END); + } + + private IllegalStateException cannot(String message) { + return new IllegalStateException("A " + type.name().toLowerCase(Locale.ROOT) + " node cannot " + message); + } + + public NodeBuilder addParent(Pair parent) { + this.parent = parent; + return this; + } + public NodeBuilder addChild(Condition condition, Node child) { + if (type.canHaveChildren) { + children.put(condition, child); + return this; + } else { + throw cannot("Have Children"); + } + } + + @SafeVarargs // Suppressing unsafe variable number of arguments + public final NodeBuilder addChildren(Pair... children) { + if (type.canHaveChildren) { + for (Pair child : children) + addChild(child.getFirst(), child.getSecond()); + return this; + } + else throw cannot("Have Children"); + } + + public NodeBuilder addModifiers(List modifiers) { + this.availableModifiers.addAll(modifiers); + return this; + } + + public NodeBuilder addModifiers(Modifier... modifiers) { + Collections.addAll(this.availableModifiers, modifiers); + return this; + } + + public NodeBuilder addModifier(Modifier modifier) { + this.availableModifiers.add(modifier); + + return this; + } + + public NodeBuilder removeChild(Form form) { + if (type.canHaveChildren) { + children.remove(form); + return this; + } else { + throw cannot("have children"); + } + } + + public NodeBuilder onEnter(Consumer onEnter) { + if (type.canBeEntered) { + this.onEnter = onEnter; + return this; + } else { + throw cannot("be entered"); + } + } + + public NodeBuilder onLeave(Consumer onLeave) { + if (type.canBeLeft) { + this.onLeave = onLeave; + return this; + } else { + throw cannot("be left"); + } + } + + public NodeBuilder onTerminate(Consumer onTerminate) { + if (type.canBeTerminated) { + this.onTerminate = onTerminate; + return this; + } else { + throw cannot("be terminated"); + } + } + + public NodeBuilder terminateWhen(Condition terminateCondition) { + if (type.canBeTerminated) { + this.terminateCondition = terminateCondition; + return this; + } else { + throw cannot("be terminated"); + } + } + + public Node build() { + return new Node(parent, children, onEnter, onLeave, onTerminate, terminateCondition, availableModifiers); + } + + private enum Type { + ROOT(true, false, true, false), + MIDDLE(true, true, true, true), + END(false, true, false, false); + + final boolean canHaveChildren; + final boolean canBeEntered; + final boolean canBeLeft; + final boolean canBeTerminated; + + Type(boolean canHaveChildren, boolean canBeEntered, boolean canBeLeft, boolean canBeTerminated) { + this.canHaveChildren = canHaveChildren; + this.canBeEntered = canBeEntered; + this.canBeLeft = canBeLeft; + this.canBeTerminated = canBeTerminated; + } + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/RadixBranch.java b/src/main/java/com/amuzil/omegasource/magus/radix/RadixBranch.java new file mode 100644 index 00000000..ee508d44 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/RadixBranch.java @@ -0,0 +1,29 @@ +package com.amuzil.omegasource.magus.radix; + + +import java.util.List; + +public class RadixBranch { + // Class that represents a valid condition path leading from a previous Node and stores the Condition(s) + + public ConditionPath path; + public Node next; + + public RadixBranch(ConditionPath path) { + this(path, new Node(true)); + } + + public RadixBranch(ConditionPath path, Node next) { + this.path = path; + this.next = next; + } + + public List conditions() { + return path.conditions; + } + + @Override + public String toString() { + return "RadixBranch[Conditions=" + path + "]"; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/RadixTree.java b/src/main/java/com/amuzil/omegasource/magus/radix/RadixTree.java new file mode 100644 index 00000000..57f889f8 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/RadixTree.java @@ -0,0 +1,418 @@ +package com.amuzil.omegasource.magus.radix; + +import com.amuzil.omegasource.magus.network.MagusNetwork; +import com.amuzil.omegasource.magus.network.packets.server_executed.ConditionActivatedPacket; +import com.amuzil.omegasource.magus.radix.condition.MultiClientCondition; +import com.amuzil.omegasource.magus.skill.elements.Element; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; +import com.amuzil.omegasource.magus.skill.modifiers.data.MultiModifierData; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.Entity; +import org.apache.logging.log4j.LogManager; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Stream; + + +public class RadixTree { + private static final int NO_MISMATCH = -1; + private final Node root; + private Node active; + private Condition lastActivated = null; + // Fire is a test + private Element activeElement = null; // Disciplines.FIRE; + private ConditionPath path; + + // TODO: Comment this out, perform entity related logic in bending context +// private Entity owner; + + public RadixTree(Node root) { + this.root = root; + this.active = root; + } + + public RadixTree() { + this(new Node(false)); + } + + public static void registerConditions(List conditions) { + for (Condition condition : conditions) { + condition.register(); + } + } + + public Node getRoot() { + return root; + } + + private int getFirstMismatchCondition(List conditions, List edgeCondition) { + int LENGTH = Math.min(conditions.size(), edgeCondition.size()); + for (int i = 1; i < LENGTH; i++) { + if (!conditions.get(i).equals(edgeCondition.get(i))) { + return i; + } + } + return NO_MISMATCH; + } + + public void activateAllConditions() { + activateAllConditions(root, new ArrayList<>()); + } + + private void activateAllConditions(Node current, List result) { + if (current.isComplete) for (Condition condition : result) + condition.register(); + + for (RadixBranch branch : current.branches.values()) + activateAllConditions(branch.next, Stream.concat(result.stream(), branch.path.conditions.stream()).toList()); + } + + public void deactivateAllConditions() { + deactivateAllConditions(root, new ArrayList<>()); + } + + private void deactivateAllConditions(Node current, List result) { + if (current.isComplete) for (Condition condition : result) + condition.unregister(); + + for (RadixBranch branch : current.branches.values()) + deactivateAllConditions(branch.next, Stream.concat(result.stream(), branch.path.conditions.stream()).toList()); + } + + public void resetTree() { + deactivateAllConditions(); + for (Condition condition : root.getImmediateBranches()) + condition.register(); + setActive(root); + } + + // Helpful method to debug and to see all the conditions + public void printAllConditions() { + printAllConditions(root, new ArrayList<>()); + } + + private void printAllConditions(Node current, List result) { + if (current.isComplete) System.out.println("Condition: " + result); + + for (RadixBranch branch : current.branches.values()) + printAllConditions(branch.next, Stream.concat(result.stream(), branch.path.conditions.stream()).toList()); + } + + // Helpful method to debug and to see all the branches in tree format + public void printAllBranches() { + printAllBranches(root, ""); + } + + private void printAllBranches(Node current, String indent) { + int lastValue = current.totalConditions() - 1; + int i = 0; + for (RadixBranch branch : current.branches.values()) { + if (i == lastValue) System.out.println(indent.replace("+", "L") + branch.path); + else System.out.println(indent.replace("+", "|") + branch.path); + int length1 = indent.length() / 2 == 0 ? 4 : indent.length() / 2; + int length2 = branch.path.toString().length() / 3; + String lineIndent = new String(new char[length2]).replace("\0", "─"); + String oldIndent, newIndent; + if (i != lastValue) { + length1 = length1 - 4; + oldIndent = new String(new char[length1]).replace("\0", " "); + newIndent = " |" + oldIndent + "+" + lineIndent + "─>"; + } else { + oldIndent = new String(new char[length1]).replace("\0", " "); + newIndent = oldIndent + "+" + lineIndent + "─>"; + } + i++; + printAllBranches(branch.next, newIndent); + } + } + + private List prioritizeConditions(List conditions) { + List prioritizedConditions = new ArrayList<>(); + for (Condition condition : conditions) { + if (condition instanceof MultiClientCondition) { + prioritizedConditions.add(condition); + break; + } + } + return prioritizedConditions.isEmpty() ? conditions : prioritizedConditions; + } + + // Add conditions to RadixTree - O(n) + public void insert(List conditions) { + Node current = active; + int currIndex = 0; + + while (currIndex < conditions.size()) { + Condition transitionCondition = conditions.get(currIndex); + RadixBranch currentBranch = current.getTransition(transitionCondition); + // Iterate forward as we move through the conditions and either sprout a node or move down an existing node + List currCondition = conditions.subList(currIndex, conditions.size()); + + // There is no associated branch with the first condition of the current path + // so simply add the rest of the conditions and finish + if (currentBranch == null) { + current.branches.put(transitionCondition, new RadixBranch(new ConditionPath(currCondition))); + break; + } + + int splitIndex = getFirstMismatchCondition(currCondition, currentBranch.path.conditions); // uses equals + if (splitIndex == NO_MISMATCH) { + // The branch and leftover conditions are the same length + // so finish and update the next node as a complete node + if (currCondition.size() == currentBranch.path.conditions.size()) { + currentBranch.next.isComplete = true; + break; + } else if (currCondition.size() < currentBranch.path.conditions.size()) { + // The leftover condition is a prefix to the edge string, so split + List suffix = currentBranch.path.conditions.subList(currCondition.size() - 1, currCondition.size()); + currentBranch.path.conditions = currCondition; + Node newNext = new Node(true); + Node afterNewNext = currentBranch.next; + currentBranch.next = newNext; + + newNext.addCondition(new ConditionPath(suffix), afterNewNext); + break; + } else { // currStr.length() > currentEdge.label.length() + // There are leftover conditions after a perfect match + splitIndex = currentBranch.path.conditions.size(); + } + } else { + // The leftover conditions and branch conditions differed, so split at point + List suffix = currentBranch.path.conditions.subList(splitIndex, currentBranch.path.conditions.size()); + currentBranch.path.conditions = currentBranch.path.conditions.subList(0, splitIndex); + Node prevNext = currentBranch.next; + currentBranch.next = new Node(false); + currentBranch.next.addCondition(new ConditionPath(suffix), prevNext); + } + + // Traverse the tree + current = currentBranch.next; + currIndex += splitIndex; + } + + // Only register immediate children conditions + resetTree(); +// activateAllConditions(); + } + + // Returns matched condition path if found and null if not found - O(n) + public List search(List conditions) { + conditions = prioritizeConditions(conditions); + List ret = null; + Node current = active; + int currIndex = 0; + while (currIndex < conditions.size()) { + Condition currentCondition = conditions.get(currIndex); + RadixBranch branch = current.getTransition(currentCondition); // uses hashcode +// RadixBranch branch = current.getMatchedPath(currentCondition); + if (branch == null) return null; + + List currSubCondition = conditions.subList(currIndex, conditions.size()); + if (!Condition.startsWith(currSubCondition, branch.path.conditions)) return null; // uses equals + + currIndex += branch.path.conditions.size(); + current = branch.next; + if (ret == null) ret = new ArrayList<>(); + ret = Stream.concat(ret.stream(), branch.path.conditions.stream()).toList(); + } + return ret; + } + + public void burn() { + if (active.terminateCondition() != null) { + active.terminateCondition().unregister(); + } + + active = null; + activeElement = null; + } + + // ---------- Cali's RadixTree Impl ---------- + + public void start() { + setActive(root); + path = new ConditionPath(); + } + + public void setDiscipline(Element element) { + this.activeElement = element; + } + + + public Node getActive() { + return active; + } + + private void setActive(Node node) { + active = node; + + /** + * Automatically handles making conditions move down the tree when satisfied. + * Need to adjust because it's moving down the tree based on its terminating condition, rather than for each child condition. + * We only want to do this once per active node. + */ + // Current Node + if (active != null && active == root) { + Condition currentCondition = active.terminateCondition(); + if (currentCondition != null) { + Runnable success = currentCondition.onSuccess; + Runnable failure = currentCondition.onFailure; + currentCondition.register(currentCondition.name(), () -> { + if (success != null) + success.run(); + currentCondition.unregister(); + }, () -> { + if (failure != null) + failure.run(); + }); + currentCondition.register(); + } + + // Child Nodes + for (Condition condition : active.getImmediateBranches()) { + if (condition != null) { + Runnable success; + success = () -> { + if (condition.onSuccess != null) condition.onSuccess.run(); + MagusNetwork.sendToServer(new ConditionActivatedPacket(condition)); + RadixUtil.getLogger().debug("Packet sent."); + condition.unregister(); + }; + + Runnable failure; + failure = () -> { + condition.onFailure.run(); + condition.unregister(); + }; + String name = condition.name(); + condition.register(name, success, failure); + condition.register(); + } + } + + +// if (active.getModifiers().size() > 0 && owner instanceof ServerPlayer player) +// active.registerModifierListeners(activeElement, player); + + if (active.onEnter() != null) { + active.onEnter().accept(this); + } + + // Should run the original condition and terminate the tree + if (active.terminateCondition() != null) { + Runnable onSuccess = () -> { + active.terminateCondition().onSuccess.run(); + terminate(); + }; + active.terminateCondition().register("", onSuccess, () -> { + }); + } + } + } + + // Called when either the node's terminate condition is fulfilled or all active child conditions have expired + private void terminate() { + + System.out.println("Nice!"); + + if (active.onTerminate() != null) { + active.onTerminate().accept(this); + } + + if (active.terminateCondition() != null) { + active.terminateCondition().unregister(); + } + start(); + } + + // TODO: + // Rather than relying on the input module to send packets, handle everything in the condition runnables? + public void moveDown(Condition executedCondition) { + if (activeElement == null) { + LogManager.getLogger().info("NO ELEMENT SELECTED"); + return; + } + if (active == null) { + LogManager.getLogger().info("No currently active node to traverse from."); + return; + } + //add the last Node to the activation Path and store its ModifierData's + if (active.getImmediateChildren().get(executedCondition) == null) { + LogManager.getLogger().info("Condition met not valid for tree traversal."); + return; + } + if (this.lastActivated != null && active != null) { + //TODO: + // Need a better way to ensure the conditions are equivalent + if (this.lastActivated.name().equals(executedCondition.name())) { + addModifierData(new MultiModifierData()); + return; + } + this.lastActivated.unregister(); + path.addStep(this.lastActivated, active.getModifiers()); + } + this.lastActivated = executedCondition; + +// if (active.getModifiers().size() > 0 && owner instanceof ServerPlayer player) { +// active.unregisterModifierListeners(player); +// //todo remove this its just for testing +// active.getModifiers().forEach(modifier -> modifier.print()); +// } + + if (active.children().size() == 0) return; + + if (active.onLeave() != null) { + active.onLeave().accept(this); + } + + + if (active.terminateCondition() != null) { + active.terminateCondition().unregister(); + } + + //TODO: THis should not jump levels of the tree!!!!!! + setActive(active.branches.get(executedCondition).next); + } + + public void expire() { + terminate(); + } + + public void addModifierData(List modifierData) { + active.addModifierData(modifierData); + } + + public void addModifierData(ModifierData modifierData) { + active.addModifierData(modifierData); + } + + public void setOwner(Entity entity) { +// this.owner = entity; + } + + public ConditionPath getPath() { + return this.path; + } + + // Menu = radial menu or a HUD. Other activation types are self-explanatory. + public enum ActivationType { + MENU(0), HOTKEY(1), MULTIKEY(2), VR(3); + + final int priority; + + ActivationType(int priority) { + this.priority = priority; + } + + public int priority() { + return this.priority; + } + } + + // Essentially which input module to use. + // Used for VR, multikey, and hotkey activation types. + public enum InputType { + KEYBOARD_MOUSE, MOUSE_MOTION, VR + } +} \ No newline at end of file diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/RadixUtil.java b/src/main/java/com/amuzil/omegasource/magus/radix/RadixUtil.java new file mode 100644 index 00000000..964c6a9c --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/RadixUtil.java @@ -0,0 +1,20 @@ +package com.amuzil.omegasource.magus.radix; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + + +public class RadixUtil { + + private static final Logger logger = LogManager.getLogger(RadixTree.class); + + public static Logger getLogger() { + return logger; + } + + public static void assertTrue(boolean condition, String message) { + if (!condition) { + throw new AssertionError(message); + } + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/TreeBuilder.java b/src/main/java/com/amuzil/omegasource/magus/radix/TreeBuilder.java new file mode 100644 index 00000000..b7f8e809 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/TreeBuilder.java @@ -0,0 +1,8 @@ +package com.amuzil.omegasource.magus.radix; + + +/** + * Factory class used for adding + */ +public class TreeBuilder { +} diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/builders/InputConverter.java b/src/main/java/com/amuzil/omegasource/magus/radix/builders/InputConverter.java new file mode 100644 index 00000000..bf07f5e2 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/builders/InputConverter.java @@ -0,0 +1,127 @@ +package com.amuzil.omegasource.magus.radix.builders; + +import com.amuzil.omegasource.magus.radix.Condition; +import com.amuzil.omegasource.magus.radix.condition.MultiClientCondition; +import com.amuzil.omegasource.magus.radix.condition.minecraft.forge.key.KeyHoldCondition; +import com.amuzil.omegasource.magus.radix.condition.minecraft.forge.mouse.MouseScrollCondition; +import com.amuzil.omegasource.magus.skill.conditionals.InputData; +import com.amuzil.omegasource.magus.skill.conditionals.key.ChainedKeyInput; +import com.amuzil.omegasource.magus.skill.conditionals.key.KeyInput; +import com.amuzil.omegasource.magus.skill.conditionals.key.MultiKeyInput; +import com.amuzil.omegasource.magus.skill.conditionals.mouse.MouseDataBuilder; +import com.amuzil.omegasource.magus.skill.conditionals.mouse.MouseWheelInput; +import net.minecraftforge.client.event.InputEvent; + +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.function.Function; + +public class InputConverter { + private static final Map, Function>> CONDITION_BUILDERS = new HashMap<>(); + + static { + // Minimum amount of ticks a key must be pressed for it to be considered a held condition. + // This value is used in the condition class for how to check validity. Not used here. + final int HELD_THRESHOLD = 3; + // 50 by default + final int TIMEOUT_THRESHOLD = 10; + + /* Keys. */ + //TODO: Account for max delay + registerBuilder(KeyInput.class, keyInputs -> { + LinkedList conditions = new LinkedList<>(); + if (keyInputs instanceof List) + for (Object obj: (List) keyInputs) { + KeyInput keyInput = (KeyInput) obj; + // Any time less than this is just a key press. + // TODO: Adjust timeout to be per node. + // Use a configurable value to be our default timeout. If the condition should never time out, + // dont add the threshold value. + int timeout = TIMEOUT_THRESHOLD + keyInput.timeout(); + if (keyInput.timeout() < 0) + timeout = keyInput.timeout(); + + // Default is about 0 ticks. + + KeyHoldCondition keyPress = new KeyHoldCondition(keyInput.key().getValue(), + keyInput.held(), timeout, keyInput.release()); + // We can change these runnables later if need be. + keyPress.register("key_press", keyPress::reset, keyPress::reset); + conditions.add(keyPress); + } + return conditions; + }); + + registerBuilder(MultiKeyInput.class, multiKeyInputs -> { + LinkedList multiConditions = new LinkedList<>(); + for (Object obj : (List) multiKeyInputs) { + MultiKeyInput permutation = (MultiKeyInput) obj; + // THis list isn't working. + List conditions = new LinkedList<>(); + for (KeyInput input : permutation.keys()) { + conditions.addAll(buildPathFrom(List.of(input))); + } + //= new LinkedList<>(permutation.keys().stream().map(InputConverter::buildPathFrom) + //.collect(LinkedList::new, LinkedList::addAll, LinkedList::addAll)); + // Create a MultiCondition from the flattened conditions + MultiClientCondition multiCondition = new MultiClientCondition(conditions); + multiCondition.register("multi_key_press", multiCondition::reset, multiCondition::reset); + multiConditions.add(multiCondition); + } + // Return a list containing the MultiCondition + return multiConditions; + }); + + registerBuilder(ChainedKeyInput.class, chainedKeyInputs -> { + LinkedList chained = new LinkedList<>(); + for (Object obj : (List) chainedKeyInputs) { + ChainedKeyInput combination = (ChainedKeyInput) obj; + List conditions = new LinkedList<>(combination.keys().stream().map(InputConverter::buildPathFrom) + .collect(LinkedList::new, LinkedList::addAll, LinkedList::addAll)); + + chained.addAll(conditions); + } + // Return a list containing the ChainedCondition + return chained; + }); + + /* Mouse */ +// registerBuilder(MouseInput.class, +// mouseInput -> ); + + registerBuilder(MouseWheelInput.class, mouseWheelInputs -> { + LinkedList conditions = new LinkedList<>(); + if (mouseWheelInputs instanceof List) { + for (Object obj : (List) mouseWheelInputs) { + MouseWheelInput input = (MouseWheelInput) obj; + MouseScrollCondition scroll = new MouseScrollCondition(input.direction(), input.duration(), input.totalChange(), + input.timeout()); + scroll.register("mouse_scroll", scroll::reset, scroll::reset); + conditions.add(scroll); + } + } + return conditions; + }); + } + + @SuppressWarnings("unchecked") + public static void registerBuilder(Class type, Function> builder) { + CONDITION_BUILDERS.put(type, (Function>) builder); + } + + // TODO turn a linked list of conditions into a connected node tree. + + public static LinkedList buildPathFrom(T data) { + return CONDITION_BUILDERS.get(data.getClass()).apply(data); + } + + public static LinkedList buildPathFrom(List data) { + if (data.isEmpty()) + return new LinkedList<>(); + Class type = data.get(0).getClass(); + Function> function = CONDITION_BUILDERS.get(type); + return function.apply(data); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/builders/InputPathBuilder.java b/src/main/java/com/amuzil/omegasource/magus/radix/builders/InputPathBuilder.java new file mode 100644 index 00000000..977852c8 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/builders/InputPathBuilder.java @@ -0,0 +1,50 @@ +package com.amuzil.omegasource.magus.radix.builders; + +import com.amuzil.omegasource.magus.radix.Condition; +import com.amuzil.omegasource.magus.radix.ConditionPath; +import com.amuzil.omegasource.magus.radix.RadixTree; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +// Creates a path for a given object. Designed for things which directly require raw input. + +/** + * Creates an input-based ConditionPath for a given object. Useful for forms or things that exist predominantly client-side. + */ +public class InputPathBuilder { + public static InputPathBuilder instance; + private ConditionPath path; + // Todo: Change this to input type? Skills should use the activation type, forms input type? + private RadixTree.InputType type; + + public static InputPathBuilder getInstance() { + if (instance == null) instance = new InputPathBuilder(); + instance.reset(); + return instance; + } + + public InputPathBuilder path(Condition... conditions) { + PathBuilder.addSteps(path, conditions); + return this; + } + + public InputPathBuilder type(RadixTree.InputType type) { + this.type = type; + return this; + } + + public HashMap build() { + HashMap finalPath = new HashMap<>(); + finalPath.put(type, path); + reset(); + return finalPath; + } + + public void reset() { + this.type = null; + this.path = null; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/builders/PathBuilder.java b/src/main/java/com/amuzil/omegasource/magus/radix/builders/PathBuilder.java new file mode 100644 index 00000000..7c7a4927 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/builders/PathBuilder.java @@ -0,0 +1,105 @@ +package com.amuzil.omegasource.magus.radix.builders; + +import com.amuzil.omegasource.magus.radix.Condition; +import com.amuzil.omegasource.magus.radix.ConditionPath; +import com.amuzil.omegasource.magus.radix.RadixTree; +import com.amuzil.omegasource.magus.radix.RadixUtil; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; + +// Creates a path for a given object. Designed for things which directly require raw input. + +/** + * Creates a path for a given objecct. Uses different activation types to denote what kind of tree to use these conditions for. + * If using raw input, use InputPathBuilder instead. + */ +public class PathBuilder { + public static PathBuilder instance; + private List paths; + private ConditionPath path; + // Todo: Change this to input type? Skills should use the activation type, forms input type? + private RadixTree.ActivationType type; + + protected static void addSteps(ConditionPath path, Condition... conditions) { + List emptyData = new ArrayList<>(); + if (path == null) + path = new ConditionPath(List.of(conditions)); + for (Condition condition : conditions) { + RadixUtil.getLogger().debug(condition); + path.addStep(condition, emptyData); + } + } + + public static PathBuilder getInstance() { + if (instance == null) instance = new PathBuilder(); + instance.reset(); + return instance; + } + + public static void mergePath(HashMap> firstPath, HashMap> secondPath) { + boolean containsKey = false; + for (RadixTree.ActivationType type : secondPath.keySet()) { + if (firstPath.containsKey(type)) + containsKey = true; + } + + // Hard case + if (containsKey) { + for (RadixTree.ActivationType type : secondPath.keySet()) { + if (firstPath.containsKey(type)) { + List paths = secondPath.get(type); + List basePaths = firstPath.get(type); + basePaths.addAll(paths); + firstPath.put(type, basePaths); + } + } + } + // Easy case + else { + firstPath.putAll(secondPath); + } + } + + public PathBuilder finalisePath(ConditionPath path) { + if (paths == null) + this.paths = new LinkedList<>(); + this.paths.add(path); + return this; + } + + public PathBuilder finalisePath() { + finalisePath(path); + // Reset condition path +// this.path = new ConditionPath(); + return this; + } + + public PathBuilder path(Condition... conditions) { + addSteps(path, conditions); + return this; + } + + public PathBuilder type(RadixTree.ActivationType type) { + this.type = type; + return this; + } + + public HashMap> build() { + HashMap> finalPath = new HashMap<>(); + finalPath.put(type, paths); + RadixUtil.getLogger().debug(finalPath); +// reset(); + return finalPath; + } + + public void reset() { + this.type = null; + this.path = null; + if (paths != null) + this.paths.clear(); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/builders/SkillPathBuilder.java b/src/main/java/com/amuzil/omegasource/magus/radix/builders/SkillPathBuilder.java new file mode 100644 index 00000000..b37e155f --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/builders/SkillPathBuilder.java @@ -0,0 +1,12 @@ +package com.amuzil.omegasource.magus.radix.builders; + +import com.amuzil.omegasource.magus.level.event.FormActivatedEvent; +import com.amuzil.omegasource.magus.radix.Condition; +import com.amuzil.omegasource.magus.radix.condition.input.FormActivatedCondition; +import com.amuzil.omegasource.magus.skill.forms.Form; + +public class SkillPathBuilder extends PathBuilder { + public static Condition toCondition(Form form) { + return new FormActivatedCondition(FormActivatedEvent.class, form); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/condition/ConditionRegistry.java b/src/main/java/com/amuzil/omegasource/magus/radix/condition/ConditionRegistry.java new file mode 100644 index 00000000..24e70bf6 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/condition/ConditionRegistry.java @@ -0,0 +1,37 @@ +package com.amuzil.omegasource.magus.radix.condition; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.radix.Condition; +import com.amuzil.omegasource.magus.registry.Registries; +import com.amuzil.omegasource.magus.skill.forms.Form; +import net.minecraft.resources.ResourceLocation; + +import java.util.*; + +public class ConditionRegistry { + + // Id, Condition. Stuff is put into this map when registering. + private static final HashMap conditions = new HashMap<>(); + private static final Map conditionIDs = new HashMap<>(); + + static int id = 0; + public static void register(Condition condition) { + if (!conditions.containsValue(condition)) { + conditions.put(id, condition); + conditionIDs.put(condition, id); + id++; + } + } + + public static Condition getCondition(int id) { + return conditions.get(id); + } + + public static List getConditions() { + return new ArrayList<>(conditions.values()); + } + + public static int getID(Condition condition) { + return conditionIDs.get(condition); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/condition/MultiClientCondition.java b/src/main/java/com/amuzil/omegasource/magus/radix/condition/MultiClientCondition.java new file mode 100644 index 00000000..d40752eb --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/condition/MultiClientCondition.java @@ -0,0 +1,81 @@ +package com.amuzil.omegasource.magus.radix.condition; + +import com.amuzil.omegasource.magus.radix.Condition; +import net.minecraft.client.Minecraft; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.TickEvent; +import net.minecraftforge.eventbus.api.EventPriority; +import org.apache.logging.log4j.LogManager; + +import java.util.List; +import java.util.function.Consumer; + + +public class MultiClientCondition extends MultiCondition { + private static final int TIMEOUT_IN_TICKS = 3; + private Consumer clientTickListener; + + + public MultiClientCondition(List concurrentConditions) { + super(concurrentConditions); + } + + public MultiClientCondition(Condition condition) { + super(condition); + } + + public List getSubConditions() { + return concurrentConditions; + } + + @Override + public void register(String name, Runnable onSuccess, Runnable onFailure) { + super.register(name, onSuccess, onFailure); + this.clientTickListener = event -> { + if (event.phase == TickEvent.ClientTickEvent.Phase.START + && Minecraft.getInstance().getOverlay() == null) { +// System.out.println("Ticking."); + if (startedExecuting) { +// System.out.println("Started Executing."); + executionTime++; + if (executionTime > TIMEOUT_IN_TICKS) { + this.onFailure().run(); + +// LogManager.getLogger().info("MULTI CONDITION TIMED OUT"); + this.reset(); + } + } + } + }; + this.reset(); + } + + @Override + public void register() { + MinecraftForge.EVENT_BUS.addListener(EventPriority.NORMAL, false, TickEvent.ClientTickEvent.class, clientTickListener); + for (Condition condition : getSubConditions()) + condition.register(); + } + + @Override + public void unregister() { + MinecraftForge.EVENT_BUS.unregister(clientTickListener); + concurrentConditions.forEach(Condition::unregister); + } + + @Override + public int hashCode() { + return super.hashCode(); + } + + @Override + public boolean equals(Object obj) { + return super.equals(obj); + } + + @Override + public String toString() { + return String.format("%s[ %s ]", this.getClass().getSimpleName(), concurrentConditions); + } + +} \ No newline at end of file diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/condition/MultiCondition.java b/src/main/java/com/amuzil/omegasource/magus/radix/condition/MultiCondition.java new file mode 100644 index 00000000..8d82af93 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/condition/MultiCondition.java @@ -0,0 +1,139 @@ +package com.amuzil.omegasource.magus.radix.condition; + +import com.amuzil.omegasource.magus.radix.Condition; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.TickEvent; +import net.minecraftforge.eventbus.api.EventPriority; +import org.apache.logging.log4j.LogManager; + +import java.util.Hashtable; +import java.util.List; +import java.util.Objects; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Consumer; + +public class MultiCondition extends Condition { + protected static final int TIMEOUT_IN_TICKS = 15; + protected final List concurrentConditions; + protected final Hashtable conditionsMet = new Hashtable<>(); + protected Consumer levelTickListener; + protected int executionTime = 0; + protected boolean startedExecuting = false; + + private final Object lock = new Object(); + + public MultiCondition(List concurrentConditions) { + this.concurrentConditions = concurrentConditions; + this.registerEntry(); + } + + public MultiCondition(Condition condition) { + this(List.of(condition)); + } + + protected void checkConditionMet() { + if (conditionsMet.size() == concurrentConditions.size()) { + for (Boolean conditionIsMet: conditionsMet.values()) { + if (!conditionIsMet) + return; + } + this.onSuccess.run(); + startedExecuting = false; + this.reset(); + } + } + + public List getSubConditions() { + return concurrentConditions; + } + + @Override + public void register(String name, Runnable onSuccess, Runnable onFailure) { + super.register(name, onSuccess, onFailure); + this.levelTickListener = event -> { + if (event.phase == TickEvent.LevelTickEvent.Phase.START) { + if (startedExecuting) { + executionTime++; + if (executionTime > TIMEOUT_IN_TICKS) { + this.onFailure.run(); + this.reset(); + } + } + } + }; + this.onSuccess = onSuccess; + this.onFailure = onFailure; + this.reset(); + } + + public void reset() { + AtomicInteger counter = new AtomicInteger(); + conditionsMet.clear(); + this.startedExecuting = false; + this.executionTime = 0; + concurrentConditions.forEach(condition -> { + int id = counter.getAndIncrement(); + condition.register(condition.name(), () -> { + synchronized (conditionsMet) { + // Debugging statement: +// LogManager.getLogger().info("MARKING CONDITION MET: " + concurrentConditions.get(id).getClass()); + startedExecuting = true; + conditionsMet.put(id, true); + condition.unregister(); + condition.reset(); + } + checkConditionMet(); + }, () -> { + synchronized (conditionsMet) { + conditionsMet.put(id, false); + condition.unregister(); + condition.reset(); + } + checkConditionMet(); + }); + conditionsMet.put(id, false); + }); + } + + @Override + public void register() { + super.register(); + MinecraftForge.EVENT_BUS.addListener(EventPriority.NORMAL, false, TickEvent.LevelTickEvent.class, levelTickListener); + for (Condition condition : getSubConditions()) + condition.register(); + } + + @Override + public void unregister() { + super.unregister(); + concurrentConditions.forEach(Condition::unregister); + } + + @Override + public int hashCode() { + int hashSum = 0; + for (Condition condition : concurrentConditions) + hashSum += condition.hashCode(); + return Objects.hash(name, hashSum); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } else if (!(obj instanceof MultiCondition other)) { + return false; + } else { +// System.out.println("this: stored in tree -> " + this); +// System.out.println("other: activeCondition from user input -> " + other); + return Objects.equals(concurrentConditions.size(), ((MultiCondition) obj).concurrentConditions.size()) + && + /* Makes sure an alternative key condition that's been pressed has been pressed at least as long + * as the currently compared condition. */ + obj.hashCode() == this.hashCode(); + } + } + + + //TODO: Hashing, equals function like in KeyHoldCondition +} \ No newline at end of file diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/condition/SimpleCondition.java b/src/main/java/com/amuzil/omegasource/magus/radix/condition/SimpleCondition.java new file mode 100644 index 00000000..be412661 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/condition/SimpleCondition.java @@ -0,0 +1,23 @@ +package com.amuzil.omegasource.magus.radix.condition; + +import com.amuzil.omegasource.magus.radix.Condition; + +import java.util.function.Supplier; + +public class SimpleCondition extends Condition { + Supplier condition; + + public SimpleCondition(Supplier condition) { + this.condition = condition; + this.registerEntry(); + } + + @Override + public void register(String name, Runnable onSuccess, Runnable onFailure) { + if (condition.get()) { + onSuccess.run(); + } else { + onFailure.run(); + } + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/condition/input/FormActivatedCondition.java b/src/main/java/com/amuzil/omegasource/magus/radix/condition/input/FormActivatedCondition.java new file mode 100644 index 00000000..521df5bd --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/condition/input/FormActivatedCondition.java @@ -0,0 +1,48 @@ +package com.amuzil.omegasource.magus.radix.condition.input; + +import com.amuzil.omegasource.magus.level.event.FormActivatedEvent; +import com.amuzil.omegasource.magus.radix.condition.minecraft.forge.EventCondition; +import com.amuzil.omegasource.magus.skill.forms.Form; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; + +import java.util.LinkedList; +import java.util.List; +import java.util.function.Function; + +public class FormActivatedCondition extends EventCondition { + + private Form form; + private List modifierData; + public FormActivatedCondition(Class eventType, Function condition) { + super(eventType, condition); + } + + public FormActivatedCondition(Class eventType, Function condition, Form form, + List data) { + super(eventType, condition); + this.form = form; + this.modifierData = data; + } + + public FormActivatedCondition(Class eventType, Form form) { + this(eventType, formActivatedEvent -> formActivatedEvent.getForm().name().equals(form.name()), form, new LinkedList<>()); + } + + public FormActivatedCondition(Class eventType, Form form, List data) { + this(eventType, formActivatedEvent -> formActivatedEvent.getForm().name().equals(form.name()), form, data); + } + + public List getModifierData() { + return this.modifierData; + } + public Form getForm() { + return this.form; + } + + // TODO: Need to set this class' modifier data to modifier data from the event + @Override + public Runnable onSuccess() { + + return super.onSuccess(); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/condition/minecraft/forge/EventCondition.java b/src/main/java/com/amuzil/omegasource/magus/radix/condition/minecraft/forge/EventCondition.java new file mode 100644 index 00000000..2dfe3094 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/condition/minecraft/forge/EventCondition.java @@ -0,0 +1,49 @@ +package com.amuzil.omegasource.magus.radix.condition.minecraft.forge; + +import com.amuzil.omegasource.magus.radix.Condition; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.eventbus.api.Event; +import net.minecraftforge.eventbus.api.EventPriority; + +import java.util.function.Consumer; +import java.util.function.Function; + +public class EventCondition extends Condition { + private final Consumer listener; + private final Class eventType; + + public EventCondition(Class eventType, Function condition) { + this.eventType = eventType; + this.listener = event -> { + if (condition.apply(event)) { + this.onSuccess.run(); + } else { + this.onFailure.run(); + } + }; + } + + @Override + public void register(String name, Runnable onSuccess, Runnable onFailure) { + super.register(name, onSuccess, onFailure); + this.register(); + } + + @Override + public void register() { + super.register(); + //This is required because a class type check isn't inbuilt, for some reason. + MinecraftForge.EVENT_BUS.addListener(EventPriority.NORMAL, false, eventType, listener); + } + + @Override + public void unregister() { + super.unregister(); + MinecraftForge.EVENT_BUS.unregister(listener); + } + + @Override + public String name() { + return "event_trigger"; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/condition/minecraft/forge/TickTimedCondition.java b/src/main/java/com/amuzil/omegasource/magus/radix/condition/minecraft/forge/TickTimedCondition.java new file mode 100644 index 00000000..7406f83a --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/condition/minecraft/forge/TickTimedCondition.java @@ -0,0 +1,66 @@ +package com.amuzil.omegasource.magus.radix.condition.minecraft.forge; + +import com.amuzil.omegasource.magus.radix.Condition; +import com.amuzil.omegasource.magus.radix.RadixUtil; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.TickEvent; +import net.minecraftforge.event.TickEvent.Phase; +import net.minecraftforge.event.TickEvent.Type; +import net.minecraftforge.eventbus.api.EventPriority; + +import java.util.function.Consumer; + +public class TickTimedCondition extends Condition { + private final Consumer listener; + + private final Condition subCondition; + private final Result onSubSuccess; + private final Result onSubFailure; + + private int current; + + public TickTimedCondition(Type type, Phase phase, int timeout, Result onTimeout, Condition subCondition, Result onSubSuccess, Result onSubFailure) { + RadixUtil.assertTrue(timeout >= 0, "timeout must be >= 0"); + RadixUtil.assertTrue(onTimeout != Result.NONE, "onTimeout must be != NONE"); + + this.subCondition = subCondition; + this.onSubSuccess = onSubSuccess; + this.onSubFailure = onSubFailure; + + this.current = 0; + + this.listener = event -> { + if (event.type == type && event.phase == phase) { + this.current++; + if (this.current >= timeout) { + runOn(onTimeout).run(); + } + } + }; + } + + @Override + public void register(String name, Runnable onSuccess, Runnable onFailure) { + super.register(name, onSuccess, onFailure); + } + + @Override + public void register() { + super.register(); + // TODO is this the correct approach? + this.subCondition.register("key_press_predicate", runOn(this.onSubSuccess), runOn(this.onSubFailure)); + //Ensures no cast errors occur (blame forge) + MinecraftForge.EVENT_BUS.addListener(EventPriority.NORMAL, false, TickEvent.class, listener); + } + + @Override + public void unregister() { + MinecraftForge.EVENT_BUS.unregister(listener); + subCondition.unregister(); + } + + @Override + public String name() { + return "tick_timed_condition"; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/condition/minecraft/forge/TimedEventCondition.java b/src/main/java/com/amuzil/omegasource/magus/radix/condition/minecraft/forge/TimedEventCondition.java new file mode 100644 index 00000000..937d36ea --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/condition/minecraft/forge/TimedEventCondition.java @@ -0,0 +1,65 @@ +package com.amuzil.omegasource.magus.radix.condition.minecraft.forge; + +import com.amuzil.omegasource.magus.radix.Condition; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.TickEvent; +import net.minecraftforge.eventbus.api.Event; +import net.minecraftforge.eventbus.api.EventPriority; + +import java.util.function.Consumer; +import java.util.function.Function; + +public class TimedEventCondition extends Condition { + + private final Consumer listener; + private final Consumer timer; + private final Class eventType; + private int time; + + public TimedEventCondition(Class eventType, Function condition, + int timeout) { + this.eventType = eventType; + this.listener = event -> { + if (condition.apply(event)) { + this.onSuccess.run(); + reset(); + } else { + this.onFailure.run(); + reset(); + } + }; + this.time = 0; + this.timer = event -> { + time++; + if (time > timeout) { + this.onFailure.run(); + reset(); + } + }; + } + + public void reset() { + this.time = 0; + } + @Override + public void register() { + super.register(); + //This is required because a class type check isn't inbuilt, for some reason. + MinecraftForge.EVENT_BUS.addListener(EventPriority.NORMAL, false, + eventType, listener); + MinecraftForge.EVENT_BUS.addListener(EventPriority.NORMAL, false, + TickEvent.ClientTickEvent.class, timer); + } + + @Override + public void unregister() { + super.unregister(); + MinecraftForge.EVENT_BUS.unregister(listener); + MinecraftForge.EVENT_BUS.unregister(timer); + } + + @Override + public String name() { + return "event_timed_trigger"; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/condition/minecraft/forge/key/KeyHoldCondition.java b/src/main/java/com/amuzil/omegasource/magus/radix/condition/minecraft/forge/key/KeyHoldCondition.java new file mode 100644 index 00000000..aa6e97fb --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/condition/minecraft/forge/key/KeyHoldCondition.java @@ -0,0 +1,165 @@ +package com.amuzil.omegasource.magus.radix.condition.minecraft.forge.key; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.radix.Condition; +import com.amuzil.omegasource.magus.radix.RadixUtil; +import com.amuzil.omegasource.magus.skill.conditionals.mouse.MousePointInput; +import com.mojang.blaze3d.platform.InputConstants; +import net.minecraft.client.Minecraft; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.TickEvent; +import net.minecraftforge.event.TickEvent.ClientTickEvent; +import net.minecraftforge.eventbus.api.EventPriority; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.function.Consumer; + + +public class KeyHoldCondition extends Condition { + public static final int KEY_PRESS_TIMEOUT = 3; + private final int key; + private final int duration; + public List mouseInputs = new ArrayList<>(); + private Consumer clientTickListener; + private int currentTotal; + private int currentHolding; + private int timeout = -1; + // False by default. + private boolean release = false; + private boolean started = false; + + public KeyHoldCondition(int key, int duration) { + if (duration < 0) RadixUtil.getLogger().warn("You should not be defining a key press duration of less than 0."); + + this.currentTotal = 0; + this.currentHolding = 0; + this.duration = duration; + this.key = key; + } + + public KeyHoldCondition(int key, int duration, int timeout, boolean release) { + if (duration < 0) RadixUtil.getLogger().warn("You should not be defining a key press duration of less than 0."); + + this.currentTotal = 0; + this.currentHolding = 0; + this.duration = duration; + this.timeout = timeout; + this.release = release; + this.key = key; + this.started = false; + + this.clientTickListener = event -> { + if (event.phase == ClientTickEvent.Phase.START && Minecraft.getInstance().getOverlay() == null) { + if (Magus.keyboardMouseInputModule.keyPressed(key)) { + this.started = true; + this.currentHolding++; + if (pressed(this.currentHolding, duration)) { +// // If the Condition doesn't require the key being released.... + if (!release) { + this.onSuccess.run(); + } + } + } else { + if (pressed(this.currentHolding, duration)) { + // If the Condition requires the key being released.... + if (release) { + this.onSuccess.run(); + } + } + else { + // Not held for long enough + if (this.currentHolding > 0) { + this.onFailure.run(); + } + } + } + // If the duration is <= 3, then we want the Condition to act as a key press, rather than a hold. + + if (this.started) { + // Timeout of -1 means that this should wait forever. + if (timeout > -1 && this.currentTotal >= timeout) { + RadixUtil.getLogger().warn("Condition is failing. " + this); + this.onFailure.run(); + } + this.currentTotal++; + } + + } + }; +// this.registerEntry(); + } + + public int getHeld() { + return this.currentHolding; + } + + public boolean pressed(int held, int duration) { + if (duration <= KEY_PRESS_TIMEOUT) { + return held > 0; + } else return held >= duration; + } + + // Should be called in either runnable by other methods, rather than manually here. Calling it manually in the class can lead + // to race conditions and other weird bugs, none of which are ideal. + @Override + public void reset() { + this.currentTotal = 0; + this.currentHolding = 0; + this.started = false; + } + + public int getKey() { + return this.key; + } + + @Override + public int hashCode() { + return Objects.hash(key, duration, release, timeout); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } else if (!(obj instanceof KeyHoldCondition other)) { + return false; + } else { +// System.out.println("this: stored in tree -> " + this); +// System.out.println("other: activeCondition from user input -> " + other); + return Objects.equals(key, other.getKey()) && + /* Makes sure an alternative key condition that's been pressed has been pressed at least as long + * as the currently compared condition. */ + other.currentHolding >= duration && other.release == release && timeout == other.timeout; + } + } + + @Override + public void register(String name, Runnable onSuccess, Runnable onFailure) { + super.register(name, onSuccess, onFailure); + } + + @Override + public void register() { + super.register(); + MinecraftForge.EVENT_BUS.addListener(EventPriority.NORMAL, false, TickEvent.ClientTickEvent.class, clientTickListener); + active = true; + } + + @Override + public void unregister() { + MinecraftForge.EVENT_BUS.unregister(clientTickListener); + active = false; + } + + @Override + public String toString() { + String keyString = InputConstants.getKey(key, -1).getName().replace("key.", ""); + if (keyString.equals("keyboard.0")) + keyString = "mouse.left"; + if (keyString.equals("keyboard.1")) + keyString = "mouse.right"; + return String.format("%s[ active=%b, key=%s, held=%d, d=%d, t=%d, r=%b ]", this.getClass().getSimpleName(), active, keyString, currentHolding, duration, timeout, release); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/condition/minecraft/forge/key/KeyPressedCondition.java b/src/main/java/com/amuzil/omegasource/magus/radix/condition/minecraft/forge/key/KeyPressedCondition.java new file mode 100644 index 00000000..e2cde06e --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/condition/minecraft/forge/key/KeyPressedCondition.java @@ -0,0 +1,25 @@ +package com.amuzil.omegasource.magus.radix.condition.minecraft.forge.key; + +import com.amuzil.omegasource.magus.radix.condition.minecraft.forge.EventCondition; +import com.amuzil.omegasource.magus.radix.condition.minecraft.forge.TickTimedCondition; +import com.amuzil.omegasource.magus.skill.util.data.KeyboardData; +import net.minecraftforge.client.event.InputEvent; +import net.minecraftforge.event.TickEvent; + +import java.util.function.Function; + +/** + * Used to determine whether any key was pressed during a time period. + */ +public class KeyPressedCondition extends TickTimedCondition { + //Upon *any* key (not including modifiers or wasd) being pressed, return true + public KeyPressedCondition(int timeout, Function predicate) { + super(TickEvent.Type.CLIENT, TickEvent.Phase.START, timeout, Result.SUCCESS, new EventCondition<>( + InputEvent.Key.class, predicate), Result.SUCCESS, Result.FAILURE); + } + + @Override + public String name() { + return "key_pressed"; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/condition/minecraft/forge/mouse/MouseMotionCondition.java b/src/main/java/com/amuzil/omegasource/magus/radix/condition/minecraft/forge/mouse/MouseMotionCondition.java new file mode 100644 index 00000000..7503423d --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/condition/minecraft/forge/mouse/MouseMotionCondition.java @@ -0,0 +1,113 @@ +package com.amuzil.omegasource.magus.radix.condition.minecraft.forge.mouse; + +import com.amuzil.omegasource.magus.radix.Condition; +import com.amuzil.omegasource.magus.skill.conditionals.mouse.MousePathComparator; +import com.amuzil.omegasource.magus.skill.forms.Form; +import net.minecraft.client.Minecraft; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.TickEvent; +import net.minecraftforge.eventbus.api.EventPriority; + +import java.awt.geom.Point2D; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; + +public class MouseMotionCondition extends Condition { + private final Consumer clientTickListener; + private final MousePathComparator shapeComparator; + private final List mousePath; + private boolean tracking; + private final double speedThreshold; + private final int key; // Key that needs to be held + private final Form requiredForm; // Form that needs to be activated + private final List activeForms; // Track active forms in real-time + + public MouseMotionCondition(double speedThreshold, double errorMargin, int key, Form requiredForm) { + this.mousePath = new ArrayList<>(); + this.shapeComparator = new MousePathComparator(errorMargin); + this.speedThreshold = speedThreshold; + this.key = key; + this.requiredForm = requiredForm; + this.activeForms = new ArrayList<>(); + this.tracking = false; + + this.clientTickListener = event -> { + if (event.phase == TickEvent.Phase.START && Minecraft.getInstance().getOverlay() == null) { + boolean keyPressed = key == -1 || isKeyPressed(key); // -1 indicates no key requirement + boolean formActive = requiredForm == null || activeForms.contains(requiredForm); + + if (keyPressed && formActive) { + trackMouseMovement(); + } + } + }; + + this.registerEntry(); + } + + private void trackMouseMovement() { + double currentX = Minecraft.getInstance().mouseHandler.xpos(); + double currentY = Minecraft.getInstance().mouseHandler.ypos(); + + // Minecraft coordinates: up is negative Y, down is positive Y, left is negative X, right is positive X + // No adjustment needed as the coordinates naturally fit the system described + + if (!tracking) { + mousePath.clear(); + tracking = true; + } + + mousePath.add(new Point2D.Double(currentX, currentY)); + + // Example shape matching, modify as needed + if (shapeComparator.compareToPath(mousePath, generateDesiredShape())) { + this.onSuccess.run(); + reset(); + } + } + + public boolean isSatisfied() { + return !mousePath.isEmpty(); + } + + public void reset() { + this.mousePath.clear(); + this.tracking = false; + } + + public void setActiveForms(List forms) { + activeForms.clear(); + activeForms.addAll(forms); + } + + @Override + public void register(String name, Runnable onSuccess, Runnable onFailure) { + super.register(name, onSuccess, onFailure); + } + + @Override + public void register() { + super.register(); + MinecraftForge.EVENT_BUS.addListener(EventPriority.NORMAL, false, TickEvent.ClientTickEvent.class, clientTickListener); + } + + @Override + public void unregister() { + MinecraftForge.EVENT_BUS.unregister(clientTickListener); + } + + @Override + public String name() { + return "mouse_motion"; + } + + private boolean isKeyPressed(int key) { + return Minecraft.getInstance().options.keyMappings[key].isDown(); + } + + private List generateDesiredShape() { + // Placeholder for generating shapes like lines, spirals, etc. + return new ArrayList<>(); + } +} \ No newline at end of file diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/condition/minecraft/forge/mouse/MouseScrollCondition.java b/src/main/java/com/amuzil/omegasource/magus/radix/condition/minecraft/forge/mouse/MouseScrollCondition.java new file mode 100644 index 00000000..69b04710 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/condition/minecraft/forge/mouse/MouseScrollCondition.java @@ -0,0 +1,135 @@ +package com.amuzil.omegasource.magus.radix.condition.minecraft.forge.mouse; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.input.KeyboardMouseInputModule; +import com.amuzil.omegasource.magus.radix.Condition; +import com.amuzil.omegasource.magus.radix.condition.minecraft.forge.EventCondition; +import com.amuzil.omegasource.magus.radix.condition.minecraft.forge.key.KeyHoldCondition; +import com.amuzil.omegasource.magus.skill.conditionals.mouse.MouseDataBuilder; +import com.amuzil.omegasource.magus.skill.conditionals.mouse.MouseWheelInput; +import net.minecraft.client.Minecraft; +import net.minecraftforge.client.event.InputEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.TickEvent; +import net.minecraftforge.eventbus.api.EventPriority; + +import java.util.Objects; +import java.util.function.Consumer; +import java.util.function.Function; + +public class MouseScrollCondition extends Condition { + + private int timeout; + private int timer; + private int duration; + protected int currentScrolling; + private float currentScrollTotal; + private double maxScrollTotal; + private double currentScrollDelta; + private MouseDataBuilder.Direction direction; + private Consumer clientTicker; + private boolean started; + + public MouseScrollCondition(MouseDataBuilder.Direction direction, int duration, float total, int timeout) { + this.direction = direction; + this.duration = duration; + this.maxScrollTotal = total; + this.timeout = timeout; + this.timer = 0; + this.started = false; + + this.clientTicker = tickEvent -> { + + if (tickEvent.phase == TickEvent.ClientTickEvent.Phase.START && Minecraft.getInstance().getOverlay() == null) { + currentScrollDelta = ((KeyboardMouseInputModule) Magus.keyboardMouseInputModule).getMouseScrollDelta(); + currentScrollTotal += ((KeyboardMouseInputModule) Magus.keyboardMouseInputModule).getMouseScrollDelta(); + + // Wait until the player touches the mouse. + if (currentScrollDelta != 0) + started = true; + + + // Any instant of the required direction being fulfilled + if (duration < 0) { + if (total != 0) { + // If the current total is equal to the max total... + if (currentScrollTotal == maxScrollTotal) { + this.onSuccess.run(); + } + } else { + if (this.direction.getDirection() == (int) currentScrollDelta) { + this.onSuccess.run(); + } + } + } + + // Otherwise, we need to track over the duration + else { + if (currentScrollDelta == direction.getDirection()) { + currentScrolling++; + } + if (currentScrolling >= duration) { + this.onSuccess.run(); + } + } + + // Fail because wrong direction. Works when we need a specific direction for a certain amount of ticks. + if (duration > -1) { + if (maxScrollTotal == 0) { + if (currentScrollDelta != direction.getDirection()) { + this.onFailure.run(); + } + } + } + + timer++; + } + + // Time out + if (started && timer > timeout && timeout > -1) { + this.onFailure.run(); + } + }; + } + + @Override + public void reset() { + this.currentScrolling = 0; + this.currentScrollDelta = 0; + this.currentScrollTotal = 0; + this.timer = 0; + } + + @Override + public void register() { + super.register(); + MinecraftForge.EVENT_BUS.addListener(EventPriority.NORMAL, false, TickEvent.ClientTickEvent.class, clientTicker); + } + + @Override + public void unregister() { + MinecraftForge.EVENT_BUS.unregister(clientTicker); + } + + @Override + public int hashCode() { + return Objects.hash(direction.getDirection(), duration, maxScrollTotal, timeout); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } else if (!(obj instanceof MouseScrollCondition other)) { + return false; + } else { +// System.out.println("this: stored in tree -> " + this); +// System.out.println("other: activeCondition from user input -> " + other); + return Objects.equals(direction.getDirection(), other.direction.getDirection()) && + /* Makes sure an alternative key condition that's been pressed has been pressed at least as long + * as the currently compared condition. */ + other.currentScrolling >= duration && other.maxScrollTotal == maxScrollTotal && timeout == other.timeout; + } + } + +} diff --git a/src/main/java/com/amuzil/omegasource/magus/radix/leaf/MouseMovementLeaf.java b/src/main/java/com/amuzil/omegasource/magus/radix/leaf/MouseMovementLeaf.java new file mode 100644 index 00000000..2e324bfb --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/radix/leaf/MouseMovementLeaf.java @@ -0,0 +1,43 @@ +package com.amuzil.omegasource.magus.radix.leaf; + +import com.amuzil.omegasource.magus.radix.Leaf; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.living.LivingEvent; + +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.function.Consumer; + +public class MouseMovementLeaf implements Leaf> { + private final Consumer listener; + + private final List path; + + public MouseMovementLeaf() { + this.path = new LinkedList<>(); + this.listener = event -> { + // TODO see if we can directly capture the mouse movement + // This would be done by injecting a callback into net.minecraft.client.MouseHandler#onMove + path.add(event.getEntity().getLookAngle()); + }; + MinecraftForge.EVENT_BUS.addListener(this.listener); + } + + @Override + public void burn() { + this.path.clear(); + MinecraftForge.EVENT_BUS.unregister(this.listener); + } + + @Override + public void reset() { + path.clear(); + } + + @Override + public List measure() { + return Collections.unmodifiableList(path); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/registry/Registries.java b/src/main/java/com/amuzil/omegasource/magus/registry/Registries.java new file mode 100644 index 00000000..6389eccd --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/registry/Registries.java @@ -0,0 +1,236 @@ +package com.amuzil.omegasource.magus.registry; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.radix.Condition; +import com.amuzil.omegasource.magus.skill.elements.Element; +import com.amuzil.omegasource.magus.skill.elements.Elements; +import com.amuzil.omegasource.magus.skill.forms.Form; +import com.amuzil.omegasource.magus.skill.forms.Forms; +import com.amuzil.omegasource.magus.skill.skill.Skill; +import com.amuzil.omegasource.magus.skill.skill.SkillActive; +import com.amuzil.omegasource.magus.skill.skill.SkillCategory; +import com.amuzil.omegasource.magus.skill.util.traits.DataTrait; +import com.amuzil.omegasource.magus.skill.util.traits.SkillTrait; +import net.minecraft.core.Registry; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.registries.*; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Supplier; + +/** + * All custom registries go here. + */ +@Mod.EventBusSubscriber(modid = Magus.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) +public class Registries { + + // SKILLS + // this is a placeholder skill for testing purposes. + public static final Skill FIREBALL = new SkillActive("fireball", null); + public static Supplier> DATA_TRAITS; + public static Supplier> SKILL_CATEGORIES; + public static Supplier> SKILLS; + public static Supplier> FORMS; + public static List traits = new ArrayList<>(); + public static List categories = new ArrayList<>(); + public static List skills = new ArrayList<>(); + public static List forms = new ArrayList<>(); + public static List conditions = new ArrayList<>(); + + public static void init() { + } + + /** + * Registry methods. + */ + //These are added to the forge event bus registry. To get a specific trait, use the registry. + public static void registerTraits(List dataTraits) { + traits.addAll(dataTraits); + } + + public static void registerTrait(DataTrait dataTrait) { + traits.add(dataTrait); + } + + public static void registerSkillCategories(List skillCategories) { + categories.addAll(skillCategories); + } + + public static void registerSkillCategory(SkillCategory skillCategory) { + categories.add(skillCategory); + } + + public static void registerSkills(List registrySkills) { + skills.addAll(registrySkills); + } + + public static List getSkills() { + return skills; + } + + public static void registerSkill(Skill registrySkill) { + skills.add(registrySkill); + } + + public static void registerForms(List registryForms) { + forms.addAll(registryForms); + } + + public static void registerConditions(List registryConditions) { + conditions.addAll(registryConditions); + } + + public static void registerForm(Form registryForm) { + forms.add(registryForm); + } + + public static void registerCondition(Condition registryCondition) { + conditions.add(registryCondition); + } + + public static void registerDiscipline(Element element) { + categories.add(element); + Elements.ELEMENTS.add(element); + } + + + //How registering will work: + /* + All skills will be registered first, along with skill categories. + Then, each skill will have its getTraits() method called, and each of its traits will be registered. + */ + @SubscribeEvent + public static void onRegistryRegister(NewRegistryEvent event) { + //Data trait registry. + RegistryBuilder traits = new RegistryBuilder<>(); + traits.setName(new ResourceLocation(Magus.MOD_ID, "data_traits")); + DATA_TRAITS = event.create(traits); + + + //Skill categories + RegistryBuilder categories = new RegistryBuilder<>(); + categories.setName(new ResourceLocation(Magus.MOD_ID, "skill_categories")); + SKILL_CATEGORIES = event.create(categories); + + //Skills + RegistryBuilder skills = new RegistryBuilder<>(); + skills.setName(new ResourceLocation(Magus.MOD_ID, "skills")); + SKILLS = event.create(skills); + + //Forms + RegistryBuilder formRegistryBuilder = new RegistryBuilder<>(); + formRegistryBuilder.setName(new ResourceLocation(Magus.MOD_ID, "forms")); + FORMS = event.create(formRegistryBuilder); + + //Modifiers + } + + //What to do in the case of missing registry entries for each type of registry. + + @SubscribeEvent + public static void gameRegistry(RegisterEvent event) { + Elements.init(); + Forms.init(); // Moved here so that forms registry gets populated + /* Skill Categories. */ + if (event.getRegistryKey().equals(SKILL_CATEGORIES.get().getRegistryKey())) { + IForgeRegistry registry = SKILL_CATEGORIES.get(); + ResourceKey> resKey = registry.getRegistryKey(); + + + event.register(resKey, helper -> { + for (SkillCategory category : categories) + registry.register(category.name(), category); + }); + } + + /* Skills. */ + if (event.getRegistryKey().equals(SKILLS.get().getRegistryKey())) { + IForgeRegistry registry = SKILLS.get(); + ResourceKey> resKey = registry.getRegistryKey(); + + + event.register(resKey, helper -> { + registry.register(FIREBALL.getId(), FIREBALL); + }); + } + + /* Forms. */ + if (event.getRegistryKey().equals(FORMS.get().getRegistryKey())) { + IForgeRegistry registry = FORMS.get(); + ResourceKey> resKey = registry.getRegistryKey(); + + event.register(resKey, helper -> { + for (Form form : forms) + registry.register(form.name(), form); + //TODO: Element specific forms + }); + } + + /* Data Traits. */ + if (event.getRegistryKey().equals(DATA_TRAITS.get().getRegistryKey())) { + IForgeRegistry registry = DATA_TRAITS.get(); + ResourceKey> resKey = registry.getRegistryKey(); + + + //Registers every Data Trait for every skill included within Magus. + //Register other traits manually. + registerTraitsFromSkills(SKILLS.get().getValues().stream().toList(), event); + event.register(resKey, helper -> { + for (DataTrait trait : traits) + registry.register(trait.getName(), trait); + }); + } + } + + /** + * Use this method to register the data traits of all registered skills. + * + * @param skills List of skills. + * @param event Registry event. + * @param modID ModID. + */ + public static void registerTraitsFromSkills(List skills, RegisterEvent event, String modID) { + ResourceKey> key = DATA_TRAITS.get().getRegistryKey(); + IForgeRegistry registry = DATA_TRAITS.get(); + for (Skill skill : skills) + for (SkillTrait trait : skill.getTraits()) + event.register(key, helper -> registry.register(new ResourceLocation(modID) + trait.getName(), trait)); + + } + + /** + * Same as the above method, but if you standardise your modID in your data, + * then use this. + * + * @param skills Skills to register. + * @param event The registry event. + */ + public static void registerTraitsFromSkills(List skills, RegisterEvent event) { + ResourceKey> key = DATA_TRAITS.get().getRegistryKey(); + IForgeRegistry registry = DATA_TRAITS.get(); + for (Skill skill : skills) + for (SkillTrait trait : skill.getTraits()) + event.register(key, helper -> registry.register(trait.getName(), trait)); + + } + + @Mod.EventBusSubscriber(modid = Magus.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) + public static class ForgeRegistries { + @SubscribeEvent + public static void onMissing(MissingMappingsEvent event) { + //Data Traits + + //Skill Categories + + //Skills + + //Forms + + //Modifiers + } + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/server/ServerEvents.java b/src/main/java/com/amuzil/omegasource/magus/server/ServerEvents.java new file mode 100644 index 00000000..d15c5f11 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/server/ServerEvents.java @@ -0,0 +1,151 @@ +package com.amuzil.omegasource.magus.server; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.input.InputModule; +import com.amuzil.omegasource.magus.radix.Node; +import com.amuzil.omegasource.magus.radix.NodeBuilder; +import com.amuzil.omegasource.magus.skill.modifiers.ModifiersRegistry; +import com.amuzil.omegasource.magus.skill.test.avatar.AvatarFormRegistry; +import com.amuzil.omegasource.magus.skill.util.capability.CapabilityHandler; +import com.amuzil.omegasource.magus.skill.util.capability.entity.Data; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; +import com.amuzil.omegasource.magus.skill.util.capability.entity.Magi; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraftforge.event.entity.EntityJoinLevelEvent; +import net.minecraftforge.event.entity.EntityLeaveLevelEvent; +import net.minecraftforge.event.level.LevelEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; + + +@Mod.EventBusSubscriber +public class ServerEvents { + + @SubscribeEvent + public static void worldStart(LevelEvent event) {} + + @SubscribeEvent + public static void onEntityJoinLevel(EntityJoinLevelEvent event) { + + if (!event.getLevel().isClientSide() && event.getEntity() instanceof LivingEntity) { + // TODO: Add a wrapper class for getting capabilities and data. Maybe SkillUser? MagusEntity? + + Magi magi = Magi.get((LivingEntity) event.getEntity()); + if (magi != null && event.getEntity() instanceof Player) { + + + + // initialise the radix tree and set the player as an instance property for sending packets. + //todo this is temporary manual tree construction for testing purposes. the true tree will be + // generated at runtime based on available skills for the player/entity. + if (ModifiersRegistry.FOCUS != null) { + Node secondNode = NodeBuilder.middle() + .addModifiers(ModifiersRegistry.FOCUS.copy(), ModifiersRegistry.MULTI.copy(), + ModifiersRegistry.DIRECTION.copy(), ModifiersRegistry.TARGET.copy()) + .build(); + //Resets the tree; for testing purposes. +// if (magi.getTree() != null) +// magi.getTree().burn(); + } + // While this test code will directly use conditions, Skills will reference Forms + // that get automatically turned into conditions. +// KeyInput initializer = KeyDataBuilder.createInput("key.keyboard.left.alt", 0, 0, 4); +// KeyInput left = KeyDataBuilder.createInput(Minecraft.getInstance().options.keyAttack.getKey(), 0, +// 0, 4); +// +// Condition arc = new KeyHoldCondition(initializer.key().getValue(), initializer.held(), 20000, false); +// arc.register("Arc", arc::unregister, () -> { +// }); +// ConditionRegistry.register(arc); + + // TODO: Fix the tree to only change immediate children's conditions, + // and only register/unregister them in the tree itself +// Condition strike = new KeyHoldCondition(left.key().getValue(), left.held(), 2000000, false); +// strike.register("Strike", () -> { +//// strike.unregister(); +// Entity eventEntity = event.getEntity(); +// +// Level level = event.getLevel(); +// LightningBolt lightningBolt = EntityType.LIGHTNING_BOLT.create(level); +// +// if (lightningBolt != null) { +// // Set the position of the lightning bolt +// lightningBolt.moveTo(eventEntity.xo, eventEntity.yo, eventEntity.zo); +// +// // Spawn the lightning bolt in the world +// level.addFreshEntity(lightningBolt); +// MagusNetwork.sendToServer(new ConditionActivatedPacket(strike));//, (ServerPlayer) eventEntity); +// +// } +// +// }, () -> { +// }); +// ConditionRegistry.register(strike); +// +// +// Condition arc2 = new FormCondition(Forms.ARC, -1, Magus.keyboardInputModule); +// arc2.register("ARC", () -> { +// Magus.keyboardMouseInputModule.sendDebugMsg("ARC FORM TRIGGERED"); +// }, () -> {}); +// +// System.out.println("Test RadixTree"); +// RadixTree tree = new RadixTree(); +// for (Condition condition : ConditionRegistry.getConditions()) { +// List conditionPath = new ArrayList<>(); +// conditionPath.add(condition); +// conditionPath.add(arc); +// tree.insert(conditionPath); +// } +// for (Condition condition : ConditionRegistry.getConditions()) { +// List conditionPath = new ArrayList<>(); +// conditionPath.add(condition); +// conditionPath.add(strike); +// tree.insert(conditionPath); +// } +// System.out.println("FormConditions List:"); +// tree.printAllConditions(); +// System.out.println("FormConditions Tree:"); +// tree.printAllBranches(); +// List conditionPath = new ArrayList<>(); +// conditionPath.add(strike); +// conditionPath.add(arc); +// System.out.println("RadixTree.search passing result:\n" + tree.search(conditionPath)); +// conditionPath.clear(); +// conditionPath.add(strike); +// System.out.println("RadixTree.search failed result:\n" + tree.search(conditionPath)); + } + } else { + if (event.getEntity() instanceof Player) { + // TODO - Fix so that this doesn't run for every player on server + Magus.keyboardMouseInputModule.terminate(); + Magus.mouseMotionModule.terminate(); + InputModule.resetFormsTree(); + AvatarFormRegistry.registerForms(); +// System.out.println("All RadixTree Forms Conditions:"); +// Magus.keyboardInputModule.getFormsTree().printAllConditions(); + System.out.println("All RadixTree Branches:"); + Magus.keyboardMouseInputModule.getFormsTree().printAllBranches(); + Magus.keyboardMouseInputModule.init(); + Magus.keyboardMouseInputModule.registerModifiers(); + Magus.mouseMotionModule.init(); + } + } + } + + @SubscribeEvent + public static void OnPlayerLeaveWorld(EntityLeaveLevelEvent event) { + if (event.getEntity() instanceof ServerPlayer) { + // TODO - Causes whole server to crash when player leaves + // java.lang.NullPointerException: Cannot invoke "com.amuzil.omegasource.magus.input.InputModule.getFormsTree()" + // because "com.amuzil.omegasource.magus.Magus.keyboardMouseInputModule" is null + if (Magus.keyboardMouseInputModule != null) { // Temporary fix until we decide which side to make InputModules + Magus.keyboardMouseInputModule.getFormsTree().deactivateAllConditions(); + Magus.keyboardMouseInputModule.terminate(); + Magus.mouseMotionModule.terminate(); + } + } + } +} \ No newline at end of file diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/ConditionBuilder.java b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/ConditionBuilder.java new file mode 100644 index 00000000..e338553c --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/ConditionBuilder.java @@ -0,0 +1,68 @@ +package com.amuzil.omegasource.magus.skill.conditionals; + +import com.amuzil.omegasource.magus.radix.Condition; +import com.amuzil.omegasource.magus.radix.condition.MultiCondition; +import com.amuzil.omegasource.magus.radix.builders.InputConverter; + +import java.util.LinkedList; +import java.util.List; + +/** + * Covers all the different ways to activate an ability. + * Gonna use an enum to describe for now. Will update that later; think of it as a placeholder. + */ +public class ConditionBuilder { + + private static ConditionBuilder builder; + private List conditionList = new LinkedList<>(); + + public ConditionBuilder() { + } + + public static ConditionBuilder instance() { + if (builder == null) + builder = new ConditionBuilder(); + return builder; + } + + // These methods are static because they are not building a Condition from data, they simply transform one type + // of condition into another. + public static MultiCondition createMultiCondition(Condition condition) { + return new MultiCondition(condition); + } + + public static MultiCondition createMultiCondition(List condition) { + return new MultiCondition(condition); + } + + public ConditionBuilder fromInputData(List formExecutionInputs) { + formExecutionInputs.forEach(inputData -> conditionList.addAll(InputConverter.buildPathFrom(inputData))); + return this; + } + + public ConditionBuilder fromInputData(InputData formExecutionInput) { + conditionList.addAll(InputConverter.buildPathFrom(formExecutionInput)); + return this; + } + + /** + * @return A CombinationCondition combining all of the prequisite InputData + * for an input group. + */ + public LinkedList build() { + //Creates a copy of the list + List conditions = conditionList.stream().toList(); + + //Resets the builder + reset(); + + if (conditions.size() == 0) + return null; + + return new LinkedList<>(conditions); + } + + public void reset() { + conditionList = new LinkedList<>(); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/ConditionEnums.java b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/ConditionEnums.java new file mode 100644 index 00000000..abf2bcb6 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/ConditionEnums.java @@ -0,0 +1,33 @@ +package com.amuzil.omegasource.magus.skill.conditionals; + +public class ConditionEnums { + + + /** + * Covers a range of VR gestures for those who aren't too flexible or athletically inclined, and those + * who are quite adept in their range of motion. + */ + public enum GestureType { + SIMPLE, + COMPLEX + } + + /** + * These 2 types are generally used for multikey. Initialise is how to start listening for the hotkey or key combo, + * and the execution is when to stop. + */ + public enum InitialiseType { + TOGGLE, + HOLD + } + + public enum RadialType { + MOUSE, + NUMBER + } + + public enum ExecuteType { + DESIGNATED, + SPECIAL + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/InputData.java b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/InputData.java new file mode 100644 index 00000000..0c6c685d --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/InputData.java @@ -0,0 +1,3 @@ +package com.amuzil.omegasource.magus.skill.conditionals; + +public interface InputData {} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/InputDataBuilder.java b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/InputDataBuilder.java new file mode 100644 index 00000000..47c110a0 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/InputDataBuilder.java @@ -0,0 +1,34 @@ +package com.amuzil.omegasource.magus.skill.conditionals; + +import com.amuzil.omegasource.magus.skill.conditionals.inputdata.ChainedInputData; +import com.amuzil.omegasource.magus.skill.conditionals.inputdata.MultiInputData; + +import java.util.LinkedList; +import java.util.List; + +/** + * Designed as a factory class for taking InputData and turning it into a linked list + * for InputModule use. + */ +public class InputDataBuilder { + + public static LinkedList toInputs(InputData... data) { + return new LinkedList<>(List.of(data)); + } + + public static MultiInputData createMultiInput(InputData... inputs) { + return new MultiInputData(toInputs(inputs)); + } + + //Creates a permutation based off of each individual key input + public static ChainedInputData createChainedInput(InputData... inputs) { + LinkedList data = new LinkedList<>(); + for (InputData input : inputs) + data.add(createMultiInput(input)); + return new ChainedInputData(data); + } + + public static InputData createChainedInput(MultiInputData... inputs) { + return new ChainedInputData(new LinkedList<>(List.of(inputs))); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/inputdata/ChainedInputData.java b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/inputdata/ChainedInputData.java new file mode 100644 index 00000000..473bbe3e --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/inputdata/ChainedInputData.java @@ -0,0 +1,11 @@ +package com.amuzil.omegasource.magus.skill.conditionals.inputdata; + +import com.amuzil.omegasource.magus.skill.conditionals.InputData; + +import java.util.List; + +/** + * @param permutations Takes a list of permutations to turn into a generic input list. + */ +public record ChainedInputData(List permutations) implements InputData { +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/inputdata/MultiInputData.java b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/inputdata/MultiInputData.java new file mode 100644 index 00000000..455adf66 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/inputdata/MultiInputData.java @@ -0,0 +1,12 @@ +package com.amuzil.omegasource.magus.skill.conditionals.inputdata; + +import com.amuzil.omegasource.magus.skill.conditionals.InputData; + +import java.util.List; + +/** + * @param inputs Generic list of InputData to turn into InputPermutations. Good for containing inputs of multiple things + * that happen simultaneously. + */ +public record MultiInputData(List inputs) implements InputData { +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/key/ChainedKeyInput.java b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/key/ChainedKeyInput.java new file mode 100644 index 00000000..cbdcd6d0 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/key/ChainedKeyInput.java @@ -0,0 +1,29 @@ +package com.amuzil.omegasource.magus.skill.conditionals.key; + +import com.amuzil.omegasource.magus.skill.conditionals.InputData; + +import java.util.LinkedList; + +/** + * Stores all possible permutations. + */ +public record ChainedKeyInput(LinkedList keys) implements InputData { + + public MultiKeyInput first() { + return keys.get(0); + } + + public MultiKeyInput last() { + return keys.get(keys.size() - 1); + } + + // First KeyInput in the record. + public KeyInput trueFirst() { + return first().first(); + } + + // Last KeyInput in the record. + public KeyInput trueLast() { + return last().last(); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/key/KeyDataBuilder.java b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/key/KeyDataBuilder.java new file mode 100644 index 00000000..a726edc9 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/key/KeyDataBuilder.java @@ -0,0 +1,83 @@ +package com.amuzil.omegasource.magus.skill.conditionals.key; + +import com.mojang.blaze3d.platform.InputConstants; + +import java.util.LinkedList; +import java.util.List; + +/** + * Uses KeyInput, KeyCombination, KeyPermutation. + * Acts as a factory for those records. + * Allows for easy conversion between them. + */ +public class KeyDataBuilder { + + /* Look at #InputConstants for key names, codes, and types. */ + + /* Integers */ + public static KeyInput createInput(int key, int held) { + return new KeyInput(InputConstants.getKey(key, -1), false, held, -1); + } + + public static KeyInput createInput(int key, int held, int timeout) { + return new KeyInput(InputConstants.getKey(key, -1), false, held, timeout); + } + + public static KeyInput createInput(int key, boolean released, int held) { + return new KeyInput(InputConstants.getKey(key, -1), released, held, -1); + } + + public static KeyInput createInput(int key, boolean released, int held, int timeout) { + return new KeyInput(InputConstants.getKey(key, -1), released, held, timeout); + } + + /* Strings */ + public static KeyInput createInput(String key, int held) { + return new KeyInput(InputConstants.getKey(key), false, held, -1); + } + + public static KeyInput createInput(String key, boolean released, int held) { + return new KeyInput(InputConstants.getKey(key), released, held, -1); + } + + public static KeyInput createInput(String key, boolean released, int held, int timeout) { + return new KeyInput(InputConstants.getKey(key), released, held, timeout); + } + + public static KeyInput createInput(String key, int held, int timeout) { + return new KeyInput(InputConstants.getKey(key), false, held, timeout); + } + + /* Input Constants */ + public static KeyInput createInput(InputConstants.Key key, boolean released,int held) { + return new KeyInput(key, released, held, -1); + } + + public static KeyInput createInput(InputConstants.Key key, int held) { + return new KeyInput(key, false, held, -1); + } + + public static KeyInput createInput(InputConstants.Key key, int held, int timeout) { + return new KeyInput(key, false, held, timeout); + } + + //TODO: Remove these methods due to InputDataBuilder? + + public static MultiKeyInput createMultiInput(KeyInput... inputs) { + LinkedList data = new LinkedList<>(List.of(inputs)); + return new MultiKeyInput(data); + } + + //Creates a permutation based off of each individual key input + public static ChainedKeyInput createChainedInput(KeyInput... inputs) { + LinkedList data = new LinkedList<>(); + for (KeyInput input : inputs) + data.add(createMultiInput(input)); + return new ChainedKeyInput(data); + } + + public static ChainedKeyInput createChainedInput(MultiKeyInput... inputs) { + LinkedList data = new LinkedList<>(List.of(inputs)); + return new ChainedKeyInput(data); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/key/KeyInput.java b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/key/KeyInput.java new file mode 100644 index 00000000..e86647a6 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/key/KeyInput.java @@ -0,0 +1,16 @@ +package com.amuzil.omegasource.magus.skill.conditionals.key; + + +import com.amuzil.omegasource.magus.skill.conditionals.InputData; +import com.mojang.blaze3d.platform.InputConstants; + +/** + * + * @param key The key. + * @param release Whether the key should be released after. + * @param timeout Maximum amount of time this takes before it expires. Rather than using maxDelay, just set the timeout + * of the next Condition in the path to be whatever you need. + * @param held How long the key should be held for. + */ +// Note: For minDelay and maxDelay, adjust an object's condition path. +public record KeyInput(InputConstants.Key key, boolean release, int held, int timeout) implements InputData {} \ No newline at end of file diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/key/MultiKeyInput.java b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/key/MultiKeyInput.java new file mode 100644 index 00000000..cfe7d4c5 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/key/MultiKeyInput.java @@ -0,0 +1,23 @@ +package com.amuzil.omegasource.magus.skill.conditionals.key; + +import com.amuzil.omegasource.magus.skill.conditionals.InputData; + +import java.util.LinkedList; + +/** + * Essentially a wrapper class for a part of combination/sequential list of keys. + * This is meant to be a fragment of a whole key-combination, and it allows developers + * to break up the combination in a way that's readable + makes sense. + * ONLY SUPPORTS MULTIPLE KEYS AT ONCE. DELAY IS USELESS HERE. If multiple keys are passed with *different* delay, + * the key with the most delay will be read. + */ +public record MultiKeyInput(LinkedList keys) implements InputData { + + public KeyInput first() { + return keys.get(0); + } + + public KeyInput last() { + return keys.get(keys.size() - 1); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/mouse/MouseDataBuilder.java b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/mouse/MouseDataBuilder.java new file mode 100644 index 00000000..d6e402a9 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/mouse/MouseDataBuilder.java @@ -0,0 +1,107 @@ +package com.amuzil.omegasource.magus.skill.conditionals.mouse; + +import net.minecraft.client.Minecraft; + +import java.util.LinkedList; +import java.util.List; + +public class MouseDataBuilder { + + public static MouseWheelInput createWheelInput(Direction direction) { + return createWheelInput(direction, -1, -1, -1); + } + + public static MouseWheelInput createWheelInput(Direction direction, int duration) { + return createWheelInput(direction, -1, duration, -1); + } + + public static MouseWheelInput createWheelInput(Direction direction, int duration, int timeout) { + return createWheelInput(direction, -1, duration, timeout); + } + + public static MouseWheelInput createWheelInput(Direction direction, float totalChange, int duration, int timeout) { + return new MouseWheelInput(direction, totalChange, duration, timeout); + } + + public static MouseWheelInput createWheelInput(Direction direction, float totalChange, int timeout) { + return createWheelInput(direction, totalChange, -1, timeout); + } + + public static MouseWheelInput createWheelInput(Direction direction, float totalChange) { + return createWheelInput(direction, totalChange, -1); + } + + public static MouseMotionInput createSegmentMouseInput(MousePointInput... inputs) { + return new MouseMotionInput(List.of(inputs)); + } + + public static MouseShapeInput createChainedMouseInput(MouseMotionInput... inputs) { + return new MouseShapeInput(new LinkedList<>(List.of(inputs))); + } + + // Utility to create a line from a start to an end with linear interpolation + public static MouseMotionInput createLine(MousePointInput start, MousePointInput end, int numPoints) { + List points = new LinkedList<>(); + for (int i = 0; i <= numPoints; i++) { + double t = i / (double) numPoints; + double x = (1 - t) * start.x() + t * end.x(); + double y = (1 - t) * start.y() + t * end.y(); + if (Minecraft.getInstance().player != null) + points.add(new MousePointInput(x, y, Minecraft.getInstance().player.getLookAngle())); + } + return new MouseMotionInput(points); + } + + // Utility to create a polygon from a list of vertices + public static MouseShapeInput createPolygon(List vertices) { + List segments = new LinkedList<>(); + for (int i = 0; i < vertices.size(); i++) { + MousePointInput start = vertices.get(i); + MousePointInput end = vertices.get((i + 1) % vertices.size()); // Wrap around to close the shape + segments.add(createLine(start, end, 10)); // Adjust numPoints as needed + } + return new MouseShapeInput(segments); + } + + // Create a polygon with interpolated points between vertices based on distanceBetweenPoints + public static MouseShapeInput createPolygonWithInterpolation(List vertices, double distanceBetweenPoints) { + List segments = new LinkedList<>(); + + for (int i = 0; i < vertices.size(); i++) { + MousePointInput start = vertices.get(i); + MousePointInput end = vertices.get((i + 1) % vertices.size()); // Wrap around to close the shape + + // Calculate distance between start and end + double dx = end.x() - start.x(); + double dy = end.y() - start.y(); + double segmentLength = Math.hypot(dx, dy); + + // Calculate number of points based on distanceBetweenPoints + int numPoints = Math.max(2, (int) (segmentLength / distanceBetweenPoints)); + + // Create line segment with interpolated points + segments.add(createLine(start, end, numPoints)); + } + return new MouseShapeInput(segments); + } + + /** + * Number corresponds to the MC mouse wheel direction. + */ + public enum Direction { + + // Away from the user + FORWARDS(1), // Towards the user + BACK(-1), NEUTRAL(0); + + private final int dir; + + Direction(int dir) { + this.dir = dir; + } + + public int getDirection() { + return this.dir; + } + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/mouse/MouseMotionInput.java b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/mouse/MouseMotionInput.java new file mode 100644 index 00000000..10684efd --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/mouse/MouseMotionInput.java @@ -0,0 +1,62 @@ +package com.amuzil.omegasource.magus.skill.conditionals.mouse; + +import com.amuzil.omegasource.magus.skill.conditionals.InputData; +import net.minecraft.world.phys.Vec3; + +import java.util.List; + +public record MouseMotionInput(List mouseInputs) implements InputData { + + public MousePointInput start() { + return mouseInputs.get(0); + } + + public MousePointInput end() { + return mouseInputs().get(mouseInputs().size() - 1); + } + + public Vec3 getAimDirection() { + if (mouseInputs.size() > 1) + return mouseInputs.get(mouseInputs.size() / 2).lookAngle(); + else + return new Vec3((0),(1),(0)); + } + + public String getMotionDirection() { + MousePointInput first = start(); + Vec3 mouseDirection = getMouseDirection(); + String direction = ""; + double degree_span = 90.0D; // Note: 45° doesn't cover the entire unit circle, leaving room to recognize diagonals + Vec3 right = new Vec3(-first.lookAngle().z(), first.lookAngle().y(), first.lookAngle().x()).normalize(); + Vec3 left = new Vec3(first.lookAngle().z(), first.lookAngle().y(), -first.lookAngle().x()).normalize(); + + if (mouseDirection.y() > 0.45D) { + direction = "up"; + } else if (mouseDirection.y() < -0.45D) { + direction = "down"; + } else if (getAngle2D(right, mouseDirection) <= degree_span) { + direction = "right"; + } else if (getAngle2D(left, mouseDirection) <= degree_span) { + direction = "left"; + } + return direction; + } + + public Vec3 getMouseDirection() { + Vec3 first = start().lookAngle(); + Vec3 last = end().lookAngle(); + return last.subtract(first).normalize(); + } + + // Get angle between two 2D vectors and return in ° (degrees) + public static double getAngle2D(Vec3 v1, Vec3 v2) { + double dotProduct = v1.multiply((1), (0), (1)).dot(v2.multiply((1), (0), (1))); + double radians = dotProduct / (getMagnitude2D(v1) * getMagnitude2D(v2)); + return Math.toDegrees(Math.acos(radians)); + } + + // Get magnitude/length of 2D vector v + public static double getMagnitude2D(Vec3 v) { + return Math.sqrt(Math.pow(v.x, 2) + Math.pow(v.z, 2)); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/mouse/MousePathComparator.java b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/mouse/MousePathComparator.java new file mode 100644 index 00000000..e4034a3a --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/mouse/MousePathComparator.java @@ -0,0 +1,282 @@ +package com.amuzil.omegasource.magus.skill.conditionals.mouse; + +import net.minecraft.client.Minecraft; + +import java.awt.geom.Point2D; +import java.util.ArrayList; +import java.util.List; + +public class MousePathComparator { + + public MousePathComparator(double errorMargin) { + } + + // Generate a circular shape centered at the player's mouse position with rotation and scaling + public static MouseShapeInput generateCircle(MousePointInput center, double scale, double rotationDegrees, double distanceBetweenPoints) { + List points = new ArrayList<>(); + + // Calculate the number of points based on circumference and desired distance between points + double circumference = 2 * Math.PI * scale; + int numPoints = Math.max(10, (int) (circumference / distanceBetweenPoints)); + + // Convert rotation to radians + double rotationRadians = Math.toRadians(rotationDegrees); + + for (int i = 0; i < numPoints; i++) { + double angle = 2 * Math.PI * i / numPoints; + double x = center.x() + scale * Math.cos(angle + rotationRadians); + double y = center.y() - scale * Math.sin(angle + rotationRadians); // Flip y-axis + if(Minecraft.getInstance().player != null) + points.add(new MousePointInput(x, y, Minecraft.getInstance().player.getLookAngle())); + } + MouseMotionInput segmentInput = new MouseMotionInput(points); + return new MouseShapeInput(List.of(segmentInput)); + } + + // Generate a straight line starting from the player's mouse position with rotation and scaling + public static MouseShapeInput generateLine(MousePointInput start, double scale, double rotationDegrees, double distanceBetweenPoints) { + List points = new ArrayList<>(); + + // Calculate the number of points based on length and desired distance between points + int numPoints = Math.max(2, (int) (scale / distanceBetweenPoints)); + + // Convert rotation to radians + double angleRadians = Math.toRadians(rotationDegrees); + double endX = start.x() + scale * Math.cos(angleRadians); + double endY = start.y() - scale * Math.sin(angleRadians); // Flip y-axis + + for (int i = 0; i <= numPoints; i++) { + double t = i / (double) numPoints; + double x = start.x() + t * (endX - start.x()); + double y = start.y() + t * (endY - start.y()); + if (Minecraft.getInstance().player != null) + points.add(new MousePointInput(x, y, Minecraft.getInstance().player.getLookAngle())); + } + MouseMotionInput line = new MouseMotionInput(points); + return new MouseShapeInput(List.of(line)); + } + + // Generate a polygon centered at the player's mouse position with rotation and scaling + public static MouseShapeInput generatePolygon(MousePointInput center, int sides, double scale, double rotationDegrees, double distanceBetweenPoints, boolean isDiamond) { + List vertices = new ArrayList<>(); + + double angleIncrement = 2 * Math.PI / sides; + double rotationRadians = Math.toRadians(rotationDegrees); + + // For diamond, offset the rotation by 45 degrees + if (isDiamond) { + rotationRadians += Math.toRadians(45); + } + + for (int i = 0; i < sides; i++) { + double angle = angleIncrement * i + rotationRadians; + double x = center.x() + scale * Math.cos(angle); + double y = center.y() - scale * Math.sin(angle); // Flip y-axis + if (Minecraft.getInstance().player != null) + vertices.add(new MousePointInput(x, y, Minecraft.getInstance().player.getLookAngle())); + } + + // Interpolate points between vertices based on distanceBetweenPoints + return MouseDataBuilder.createPolygonWithInterpolation(vertices, distanceBetweenPoints); + } + + // Generate a star shape centered at the player's mouse position with rotation and scaling + public static MouseShapeInput generateStar(MousePointInput center, int pointsCount, double scale, double rotationDegrees, double distanceBetweenPoints) { + List vertices = new ArrayList<>(); + double angleIncrement = Math.PI / pointsCount; + double rotationRadians = Math.toRadians(rotationDegrees); + + // Define outer and inner radii based on scale + double outerRadius = scale; + double innerRadius = scale / 2; // Adjust the ratio as needed + + for (int i = 0; i < pointsCount * 2; i++) { + double radius = (i % 2 == 0) ? outerRadius : innerRadius; + double angle = angleIncrement * i + rotationRadians; + double x = center.x() + radius * Math.cos(angle); + double y = center.y() - radius * Math.sin(angle); // Flip y-axis + if (Minecraft.getInstance().player != null) + vertices.add(new MousePointInput(x, y, Minecraft.getInstance().player.getLookAngle())); + } + + // Interpolate points between vertices based on distanceBetweenPoints + return MouseDataBuilder.createPolygonWithInterpolation(vertices, distanceBetweenPoints); + } + + // Spiral!!! + public static MouseShapeInput generateSpiral(MousePointInput center, int turns, double initialRadius, double finalRadius, double rotationDegrees, double distanceBetweenPoints) { + List points = new ArrayList<>(); + + double rotationRadians = Math.toRadians(rotationDegrees); + double totalAngle = 2 * Math.PI * turns; + double radiusIncrement = (finalRadius - initialRadius) / (totalAngle / distanceBetweenPoints); + double angleIncrement = distanceBetweenPoints / initialRadius; + + double angle = 0; + double radius = initialRadius; + + while (angle <= totalAngle) { + double x = center.x() + radius * Math.cos(angle + rotationRadians); + double y = center.y() - radius * Math.sin(angle + rotationRadians); // Flip y-axis + if (Minecraft.getInstance().player != null) + points.add(new MousePointInput(x, y, Minecraft.getInstance().player.getLookAngle())); + + angle += angleIncrement; + radius += radiusIncrement * angleIncrement; + } + + MouseMotionInput segmentInput = new MouseMotionInput(points); + return new MouseShapeInput(List.of(segmentInput)); + } + + public static boolean compare(MouseShapeInput playerInput, MouseShapeInput targetShape, double errorMargin) { + // Resample the player's input to have a fixed number of points + List resampledPlayerPoints = resamplePoints(playerInput.getFullPath(), 64); + + // Rotate to align with the target shape + List rotatedPlayerPoints = rotateToZero(resampledPlayerPoints); + + // Scale to a reference square + List scaledPlayerPoints = scaleToSquare(rotatedPlayerPoints, 250); + + // Translate to origin + List normalizedPlayerPoints = translateToOrigin(scaledPlayerPoints); + + // Prepare the target shape in the same way + List resampledTargetPoints = resamplePoints(targetShape.getFullPath(), 64); + List rotatedTargetPoints = rotateToZero(resampledTargetPoints); + List scaledTargetPoints = scaleToSquare(rotatedTargetPoints, 250); + List normalizedTargetPoints = translateToOrigin(scaledTargetPoints); + + // Compute the path distance between the two point paths + double distance = pathDistance(normalizedPlayerPoints, normalizedTargetPoints); + + return distance <= errorMargin; + } + + // Resample the points to a fixed number + private static List resamplePoints(List points, int n) { + double pathLength = getPathLength(points); + double interval = pathLength / (n - 1); + double D = 0.0; + List newPoints = new ArrayList<>(); + newPoints.add(points.get(0)); + + for (int i = 1; i < points.size(); i++) { + double d = euclideanDistance(points.get(i - 1), points.get(i)); + if ((D + d) >= interval) { + double t = (interval - D) / d; + double x = points.get(i - 1).x() + t * (points.get(i).x() - points.get(i - 1).x()); + double y = points.get(i - 1).y() + t * (points.get(i).y() - points.get(i - 1).y()); + MousePointInput newPoint = null; + if (Minecraft.getInstance().player != null) + newPoint = new MousePointInput(x, y, Minecraft.getInstance().player.getLookAngle()); + newPoints.add(newPoint); + points.add(i, newPoint); + D = 0.0; + } else { + D += d; + } + } + if (newPoints.size() == n - 1) { + newPoints.add(points.get(points.size() - 1)); + } + return newPoints; + } + + // Rotate the points so that the indicative angle is at zero + private static List rotateToZero(List points) { + MousePointInput centroid = getCentroid(points); + double theta = Math.atan2(points.get(0).y() - centroid.y(), points.get(0).x() - centroid.x()); + return rotateBy(points, -theta); + } + + private static List rotateBy(List points, double angle) { + MousePointInput centroid = getCentroid(points); + List newPoints = new ArrayList<>(); + for (MousePointInput point : points) { + double x = (point.x() - centroid.x()) * Math.cos(angle) - (point.y() - centroid.y()) * Math.sin(angle) + centroid.x(); + double y = (point.x() - centroid.x()) * Math.sin(angle) + (point.y() - centroid.y()) * Math.cos(angle) + centroid.y(); + if (Minecraft.getInstance().player != null) + newPoints.add(new MousePointInput(x, y, Minecraft.getInstance().player.getLookAngle())); + } + return newPoints; + } + + // Scale the points to a reference square + private static List scaleToSquare(List points, double size) { + double minX = points.stream().mapToDouble(MousePointInput::x).min().orElse(0); + double maxX = points.stream().mapToDouble(MousePointInput::x).max().orElse(0); + double minY = points.stream().mapToDouble(MousePointInput::y).min().orElse(0); + double maxY = points.stream().mapToDouble(MousePointInput::y).max().orElse(0); + + double width = maxX - minX; + double height = maxY - minY; + + List newPoints = new ArrayList<>(); + for (MousePointInput point : points) { + double x = (point.x() - minX) * (size / width); + double y = (point.y() - minY) * (size / height); + if (Minecraft.getInstance().player != null) + newPoints.add(new MousePointInput(x, y, Minecraft.getInstance().player.getLookAngle())); + } + return newPoints; + } + + // Translate the points so that the centroid is at the origin + private static List translateToOrigin(List points) { + MousePointInput centroid = getCentroid(points); + List newPoints = new ArrayList<>(); + for (MousePointInput point : points) { + double x = point.x() - centroid.x(); + double y = point.y() - centroid.y(); + if (Minecraft.getInstance().player != null) + newPoints.add(new MousePointInput(x, y, Minecraft.getInstance().player.getLookAngle())); + } + return newPoints; + } + + // Calculate the path distance between two point paths + private static double pathDistance(List path1, List path2) { + double distance = 0.0; + for (int i = 0; i < path1.size(); i++) { + distance += euclideanDistance(path1.get(i), path2.get(i)); + } + return distance / path1.size(); + } + + // Helper methods + private static double euclideanDistance(MousePointInput p1, MousePointInput p2) { + return Math.hypot(p1.x() - p2.x(), p1.y() - p2.y()); + } + + private static double getPathLength(List points) { + double length = 0.0; + for (int i = 1; i < points.size(); i++) { + length += euclideanDistance(points.get(i - 1), points.get(i)); + } + return length; + } + + private static MousePointInput getCentroid(List points) { + double xSum = points.stream().mapToDouble(MousePointInput::x).sum(); + double ySum = points.stream().mapToDouble(MousePointInput::y).sum(); + assert Minecraft.getInstance().player != null; + return new MousePointInput(xSum / points.size(), ySum / points.size(), Minecraft.getInstance().player.getLookAngle()); + } + + // Helper method to normalize the number of points + private static List normalizePoints(List points, int desiredSize) { + List normalizedPoints = new ArrayList<>(); + double step = (points.size() - 1) / (double) (desiredSize - 1); + for (int i = 0; i < desiredSize; i++) { + int index = (int) Math.round(i * step); + normalizedPoints.add(points.get(Math.min(index, points.size() - 1))); + } + return normalizedPoints; + } + + public boolean compareToPath(List mousePath, List point2DS) { + return true; + } +} \ No newline at end of file diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/mouse/MousePointInput.java b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/mouse/MousePointInput.java new file mode 100644 index 00000000..9e533ba1 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/mouse/MousePointInput.java @@ -0,0 +1,17 @@ +package com.amuzil.omegasource.magus.skill.conditionals.mouse; + +import com.amuzil.omegasource.magus.skill.conditionals.InputData; +import net.minecraft.world.phys.Vec3; + +/** + * How we're going to do this: + * Mouse input is tracked 2D wise. If we need to track rotation, that's a separate thing for 3D. + * + * MouseInput, or the base layer, has a tiny snapshot of the player's mouse movement. + * MousePermutation is a longer input segment, or line. + * MouseCombination or MouseDrawing is a whole shape. + * Define a start and stop, or start position, direction, and how long the player has to move their mouse. + * + * Get a Bézier curve function working. This tracks input segments, then we path through the input segments. + */ +public record MousePointInput(double x, double y, Vec3 lookAngle) {} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/mouse/MouseShapeInput.java b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/mouse/MouseShapeInput.java new file mode 100644 index 00000000..13b4cd9d --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/mouse/MouseShapeInput.java @@ -0,0 +1,15 @@ +package com.amuzil.omegasource.magus.skill.conditionals.mouse; + +import java.util.LinkedList; +import java.util.List; + +public record MouseShapeInput(List mouseInputs) { + + public List getFullPath() { + List path = new LinkedList<>(); + for (MouseMotionInput segment : mouseInputs()) { + path.addAll(segment.mouseInputs()); + } + return path; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/mouse/MouseVircle.java b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/mouse/MouseVircle.java new file mode 100644 index 00000000..240dc59c --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/mouse/MouseVircle.java @@ -0,0 +1,60 @@ +package com.amuzil.omegasource.magus.skill.conditionals.mouse; + +import net.minecraft.world.phys.Vec3; + +import java.util.ArrayList; +import java.util.List; + +public class MouseVircle { + // Class that represents a virtual circle around the cursor + + final float sphereRadius = 0.7F; + private Vec3 centroid, aimDirection; + private String motionDirection = ""; + public List mouseInputs = new ArrayList<>(); + + public MouseVircle(MousePointInput point) { + this.centroid = point.lookAngle(); + this.mouseInputs.add(point); + } + + public void track(MousePointInput point) { + mouseInputs.add(point); + generateVircle(point.lookAngle()); + } + + public void generateVircle(Vec3 point) { + if (!hasPoint(point)) { + centroid = point; + MouseMotionInput motionInputs = new MouseMotionInput(mouseInputs); + motionDirection = motionInputs.getMotionDirection(); + aimDirection = motionInputs.getAimDirection(); + mouseInputs.clear(); +// System.out.println("Moved -> " + motionDirection); + } + } + + public boolean hasPoint(Vec3 point) { + // Let the sphere's centre coordinates be (cx, cy, cz) and its radius be r, + // then point (x, y, z) is in the sphere if sqrt( (x−cx)^2 + (y−cy)^2 + (z−cz)^2 ) <= r. + double xcx = Math.pow(point.x - centroid.x, 2); + double ycy = Math.pow(point.y - centroid.y, 2); + double zcz = Math.pow(point.z - centroid.z, 2); + double radial_dist = Math.sqrt(xcx + ycy + zcz); + return radial_dist <= sphereRadius; + } + + public boolean hasMotionDirection() { + return !motionDirection.isEmpty(); + } + + public String popMotionDirection() { + String popValue = motionDirection; + motionDirection = ""; + return popValue; + } + + public Vec3 getAimDirection() { + return aimDirection; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/mouse/MouseWheelInput.java b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/mouse/MouseWheelInput.java new file mode 100644 index 00000000..b1ba93f8 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/conditionals/mouse/MouseWheelInput.java @@ -0,0 +1,12 @@ +package com.amuzil.omegasource.magus.skill.conditionals.mouse; + +import com.amuzil.omegasource.magus.skill.conditionals.InputData; + +/** + * + * @param direction Which way the mouse wheel should go. If you want to just press the mouse wheel, use KeyInput. + * @param totalChange The total mouse delta amount to wait for (e.g 10 means scrolling forwards a lot). + * @param duration How long the mouse wheel should be held in a certain direction. + */ +public record MouseWheelInput(MouseDataBuilder.Direction direction, float totalChange, int duration, int timeout) implements InputData { +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/effects/Effect.java b/src/main/java/com/amuzil/omegasource/magus/skill/effects/Effect.java new file mode 100644 index 00000000..4ebfdb60 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/effects/Effect.java @@ -0,0 +1,22 @@ +package com.amuzil.omegasource.magus.skill.effects; + +import com.amuzil.omegasource.magus.radix.RadixTree; +import com.amuzil.omegasource.magus.skill.skill.Skill; +import com.amuzil.omegasource.magus.skill.skill.SkillCategory; +import net.minecraft.resources.ResourceLocation; + +public abstract class Effect extends Skill { + public Effect(String modID, String name, SkillCategory category) { + super(modID, name, category); + } + + public Effect(String name, SkillCategory category) { + super(name, category); + } + + public Effect(ResourceLocation id, SkillCategory category) { + super(id, category); + } + + public abstract RadixTree getPath(); +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/effects/EffectTreeBuilder.java b/src/main/java/com/amuzil/omegasource/magus/skill/effects/EffectTreeBuilder.java new file mode 100644 index 00000000..d56aa671 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/effects/EffectTreeBuilder.java @@ -0,0 +1,40 @@ +package com.amuzil.omegasource.magus.skill.effects; + +import com.amuzil.omegasource.magus.radix.Condition; +import com.amuzil.omegasource.magus.radix.Node; +import com.amuzil.omegasource.magus.radix.NodeBuilder; +import com.amuzil.omegasource.magus.radix.RadixTree; +import com.amuzil.omegasource.magus.skill.forms.Form; + +/** + * Creates Effects given a set of Forms. + * To use Effects together, check out SkillBuilder + */ +public class EffectTreeBuilder { + + private NodeBuilder tree; + private Node current; + static EffectTreeBuilder builder; + public static EffectTreeBuilder instance() { + if (builder != null) + return builder; + else builder = new EffectTreeBuilder(); + return builder; + } + + public EffectTreeBuilder start() { + tree = NodeBuilder.middle(); + return this; + } + + //Adds a required Form to the tree. + public EffectTreeBuilder addCondition(Condition form) { + tree.addChild(form, current); + return this; + } + + + public RadixTree build() { + return new RadixTree(tree.build()); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/elements/Element.java b/src/main/java/com/amuzil/omegasource/magus/skill/elements/Element.java new file mode 100644 index 00000000..5b81390a --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/elements/Element.java @@ -0,0 +1,28 @@ +package com.amuzil.omegasource.magus.skill.elements; + +import com.amuzil.omegasource.magus.registry.Registries; +import com.amuzil.omegasource.magus.skill.skill.SkillCategory; + + +public class Element extends SkillCategory { + private final String name; + private final Art art; + + public Element(Element.Art art) { + this.name = art.name().toLowerCase(); + this.art = art; + Registries.registerDiscipline(this); + } + + public String name() { + return name; + } + + public Art type() { + return art; + } + + public enum Art { + AIR, WATER, EARTH, FIRE + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/elements/Elements.java b/src/main/java/com/amuzil/omegasource/magus/skill/elements/Elements.java new file mode 100644 index 00000000..3308a764 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/elements/Elements.java @@ -0,0 +1,24 @@ +package com.amuzil.omegasource.magus.skill.elements; + +import java.util.ArrayList; +import java.util.List; + + +public class Elements { + public static final List ELEMENTS = new ArrayList<>(); + + public static final Element AIR = new Element(Element.Art.AIR); + public static final Element WATER = new Element(Element.Art.WATER); + public static final Element EARTH = new Element(Element.Art.EARTH); + public static final Element FIRE = new Element(Element.Art.FIRE); + + public static Element fromName(String name) { + return ELEMENTS.stream().filter(element -> element.name().equals(name)).findFirst().get(); + } + + public static Element fromArt(Element.Art art) { + return ELEMENTS.stream().filter(element -> element.type().equals(art)).findFirst().get(); + } + + public static void init() {} +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/event/SkillEvent.java b/src/main/java/com/amuzil/omegasource/magus/skill/event/SkillEvent.java new file mode 100644 index 00000000..0e2e7e50 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/event/SkillEvent.java @@ -0,0 +1,31 @@ +package com.amuzil.omegasource.magus.skill.event; + +import com.amuzil.omegasource.magus.radix.RadixTree; +import com.amuzil.omegasource.magus.skill.skill.Skill; +import net.minecraft.world.entity.LivingEntity; +import net.minecraftforge.event.entity.living.LivingEvent; + +public class SkillEvent extends LivingEvent { + + private Skill skill; + private RadixTree tree; + + public SkillEvent(LivingEntity entity, RadixTree tree, Skill skill) { + super(entity); + this.skill = skill; + this.tree = tree; + } + + @Override + public boolean isCancelable() { + return true; + } + + public Skill getSkill() { + return skill; + } + + public RadixTree getTree() { + return tree; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/event/SkillTickEvent.java b/src/main/java/com/amuzil/omegasource/magus/skill/event/SkillTickEvent.java new file mode 100644 index 00000000..f8ec7b81 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/event/SkillTickEvent.java @@ -0,0 +1,35 @@ +package com.amuzil.omegasource.magus.skill.event; + +import com.amuzil.omegasource.magus.radix.RadixTree; +import com.amuzil.omegasource.magus.skill.skill.Skill; +import net.minecraft.world.entity.LivingEntity; + +public class SkillTickEvent extends SkillEvent { + + public SkillTickEvent(LivingEntity entity, RadixTree tree, Skill skill) { + super(entity, tree, skill); + } + + public static class Start extends SkillTickEvent { + + public Start(LivingEntity entity, RadixTree tree, Skill skill) { + super(entity, tree, skill); + } + } + + public static class Run extends SkillTickEvent { + + public Run(LivingEntity entity, RadixTree tree, Skill skill) { + super(entity, tree, skill); + } + } + + public static class Stop extends SkillTickEvent { + + public Stop(LivingEntity entity, RadixTree tree, Skill skill) { + super(entity, tree, skill); + } + } + + +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/forms/Form.java b/src/main/java/com/amuzil/omegasource/magus/skill/forms/Form.java new file mode 100644 index 00000000..c6dc50d1 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/forms/Form.java @@ -0,0 +1,53 @@ +package com.amuzil.omegasource.magus.skill.forms; + +import com.amuzil.omegasource.magus.radix.Condition; +import com.amuzil.omegasource.magus.radix.ConditionPath; +import com.amuzil.omegasource.magus.registry.Registries; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; + +import java.util.ArrayList; +import java.util.List; + + +public class Form { + private final String name; + + public Form(String name) { + this.name = name; + Registries.registerForm(this); + } + + public Form() { // Create null Form to fix random NullPointerException + this.name = null; + } + + /** + * Just in case. I don't think we care about the MOD_ID as forge handles that. + * @param name + * @param modID + */ + public Form(String name, String modID) { + this(name); + } + + public String name() { + return name; + } + + // Can be freely overridden to alter a Form's path. + // Specifically, if InputData isn't specific enough for what you want to, feel free to alter it here. + public ConditionPath createPath(List conditions) { + ConditionPath path = new ConditionPath(); + List emptyData = new ArrayList<>(); + for (Condition condition : conditions) { + path.addStep(condition, emptyData); + } + + return path; + } + + @Override + public String toString() { + return "Form[ " + name().toUpperCase() + " ]"; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/forms/FormDataRegistry.java b/src/main/java/com/amuzil/omegasource/magus/skill/forms/FormDataRegistry.java new file mode 100644 index 00000000..2cebaa09 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/forms/FormDataRegistry.java @@ -0,0 +1,74 @@ +package com.amuzil.omegasource.magus.skill.forms; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.input.InputModuleData; +import com.amuzil.omegasource.magus.radix.Condition; +import com.amuzil.omegasource.magus.radix.RadixTree; +import com.amuzil.omegasource.magus.registry.Registries; +import com.amuzil.omegasource.magus.skill.conditionals.InputData; +import net.minecraft.resources.ResourceLocation; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + +public class FormDataRegistry { + + public static HashMap formsNamespace; + private static Map formsData; + + //Remember to see #InputConstants for the key names. + public static void init() { + formsData = new HashMap<>(); + formsNamespace = new HashMap<>(); + } + + public static Form getFormByName(String formName) { + return Registries.FORMS.get().getValue(new ResourceLocation(formName)); + } + + public static List getInputsForForm(Form formToModify, RadixTree.InputType type) { + if (formsData != null) + if (formsData.get(formToModify.name()) != null) { + InputModuleData inputModuleData = formsData.get(formToModify.name()); + // Should not collect modifier data for Forms.NULL + if (inputModuleData != null) + return inputModuleData.getInputs(type); + } + return null; + } + + public static void registerForm(List inputs, Form form, RadixTree.InputType type) { + // Register the requisite conditions + InputModuleData data = new InputModuleData(); + data.addTypeInputs(type, inputs); + data.fillConditions(type); + // This replaces the value, and since our InputModuleData automatically adds conditions and input data to itself when necessary... + formsData.put(form.name(), data); + formsNamespace.put(data.getConditions(type).hashCode(), form); + + // Need to pass this + List conditions = data.getConditions(type); + // Register the raw input data + switch (type) { + // I can dream... + case VR -> { + } + case KEYBOARD_MOUSE -> Magus.keyboardMouseInputModule.registerInputData(inputs, form, conditions); + case MOUSE_MOTION -> Magus.mouseMotionModule.registerInputData(inputs, form, conditions); + + } + } + + public static List getConditionsFrom(Form form, RadixTree.InputType type) { + return formsData.get(form).getConditions(type); + } + + public static void registerForm(InputData input, Form form) { + List singleton = new ArrayList<>(); + singleton.add(input); + registerForm(singleton, form, RadixTree.InputType.KEYBOARD_MOUSE); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/forms/Forms.java b/src/main/java/com/amuzil/omegasource/magus/skill/forms/Forms.java new file mode 100644 index 00000000..ae4e3c73 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/forms/Forms.java @@ -0,0 +1,29 @@ +package com.amuzil.omegasource.magus.skill.forms; + +public class Forms { + // FORMS + // bank form + public static final Form NULL = new Form("null"); + public static final Form PUSH = new Form("push"); + public static final Form PULL = new Form("pull"); + public static final Form RAISE = new Form("raise"); + public static final Form LOWER = new Form("lower"); + public static final Form BURST = new Form("burst"); + public static final Form ARC = new Form("arc"); + public static final Form COMPRESS = new Form("compress"); + public static final Form EXPAND = new Form("expand"); + public static final Form TWIST = new Form("twist"); + public static final Form SWIRL = new Form("swirl"); + public static final Form SLASH = new Form("slash"); + public static final Form STRIKE = new Form("strike"); + public static final Form FORCE = new Form("force"); + public static final Form BREATHE = new Form("breathe"); + public static final Form STEP = new Form("step"); + + + //These two may not be necessary. + public static final Form MENU = new Form("menu"); + public static final Form HOTKEY = new Form("hotkey"); + + public static void init() {} +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/ModifiersRegistry.java b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/ModifiersRegistry.java new file mode 100644 index 00000000..646b7080 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/ModifiersRegistry.java @@ -0,0 +1,81 @@ +package com.amuzil.omegasource.magus.skill.modifiers; + +import com.amuzil.omegasource.magus.skill.modifiers.api.Modifier; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; +import com.amuzil.omegasource.magus.skill.modifiers.data.*; +import com.amuzil.omegasource.magus.skill.modifiers.listeners.*; +import net.minecraft.nbt.CompoundTag; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class ModifiersRegistry { + + //used to look up what instance to deserialize into from nbt + private static Map modifierDataTypes; + + public static Modifier FOCUS; + public static Modifier MULTI; + public static Modifier DIRECTION; + public static Modifier TARGET; + public static Modifier GESTURE; + + public static Modifier CONTROL; + + // Change s.t listeners are referenced on correct sides (client or server), and rest of it is referenced on both + public static void init() { + modifierDataTypes = new HashMap<>(); + + ModifierData heldModifierData = new HeldModifierData(); + FOCUS = new Modifier(heldModifierData, null); + modifierDataTypes.put(heldModifierData.getName(), FOCUS); + + ModifierData multiModifierData = new MultiModifierData(); + MULTI = new Modifier(multiModifierData, null); + modifierDataTypes.put(multiModifierData.getName(), MULTI); + + ModifierData directionModifierData = new DirectionModifierData(); + DIRECTION = new Modifier(directionModifierData, null); + modifierDataTypes.put(directionModifierData.getName(), DIRECTION); + + ModifierData targetModifierData = new TargetModifierData(); + TARGET = new Modifier(targetModifierData, null); + modifierDataTypes.put(targetModifierData.getName(), TARGET); + + ModifierData gestureModifierData = new MouseGestureModifierData(); + GESTURE = new Modifier(gestureModifierData, null); + modifierDataTypes.put(gestureModifierData.getName(), GESTURE); + + ModifierData scrollModifierData = new MouseScrollModifierData(); + CONTROL = new Modifier(scrollModifierData, null); + modifierDataTypes.put(scrollModifierData.getName(), CONTROL); + } + + public static List getModifiers() { + return modifierDataTypes.values().stream().toList(); + } + + public static ModifierData fromCompoundTag(CompoundTag compoundTag) { + ModifierData data = modifierDataTypes.get(compoundTag.getString("dataIdentifier")).copy().data(); + data.deserializeNBT(compoundTag); + return data; + } + + public static Modifier fromName(String name) { + return modifierDataTypes.get(name).copy(); + } + + @OnlyIn(Dist.CLIENT) + public static void clientSetup() { + // Set up listeners that are marked as client-side only. + FOCUS.setListener(new KeyHeldModifierListener()); + TARGET.setListener(new TargetModifierListener()); + MULTI.setListener(new MultiModifierListener()); + GESTURE.setListener(new MouseGestureModifierListener()); + CONTROL.setListener(new MouseScrollModifierListener()); + DIRECTION.setListener(new DirectionModifierListener()); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/api/BaseModifierData.java b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/api/BaseModifierData.java new file mode 100644 index 00000000..a480d088 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/api/BaseModifierData.java @@ -0,0 +1,37 @@ +package com.amuzil.omegasource.magus.skill.modifiers.api; + +import net.minecraft.nbt.CompoundTag; + +public abstract class BaseModifierData extends ModifierData { + + private boolean isDirty = false; + + @Override + public void markDirty() { + isDirty = true; + } + + @Override + public void markClean() { + isDirty = false; + } + + @Override + public boolean isDirty() { + return isDirty; + } + + @Override + public boolean serversideOnly() { + return false; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag compoundTag = new CompoundTag(); + + compoundTag.putString("dataIdentifier", getName()); + + return compoundTag; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/api/Modifier.java b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/api/Modifier.java new file mode 100644 index 00000000..7529329f --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/api/Modifier.java @@ -0,0 +1,42 @@ +package com.amuzil.omegasource.magus.skill.modifiers.api; + +import net.minecraft.nbt.CompoundTag; + +public final class Modifier { + private ModifierData data; + private ModifierListener listener; + + public Modifier(ModifierData data, ModifierListener listener) { + this.data = data; + this.listener = listener; + } + + // Used for sided setup + public void setListener(ModifierListener listener) { + this.listener = listener; + } + + public Modifier copy() { + return new Modifier(data().copy(), listener() != null? listener().copy() : null); + } + + public void print() { + data.print(); + } + + public ModifierData data() { + return data; + } + + public void setData(ModifierData data) { + this.data = data; + } + + public ModifierListener listener() { + return listener; + } + + public void setupListener(CompoundTag compoundTag) { + listener.setupListener(compoundTag); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/api/ModifierData.java b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/api/ModifierData.java new file mode 100644 index 00000000..ee584687 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/api/ModifierData.java @@ -0,0 +1,35 @@ +package com.amuzil.omegasource.magus.skill.modifiers.api; + +import com.amuzil.omegasource.magus.skill.util.traits.DataTrait; + + +// actually adding data is handled by subclass implementations, this is just for generics. +public abstract class ModifierData implements DataTrait { + + + public ModifierData() { + } + + /* this method should be overwritten by the specific implementation + of ModifierData, and encapsulates merging two copies of the same + ModifierData into one set. This base method just ensures we aren't + merging two separate types */ + public void add(ModifierData modifierData) { + if(!modifierData.getClass().equals(this.getClass())) { + //todo logging - tried to merge 2 different types of ModifierData together + } else { + mergeFields(modifierData); + markDirty(); + } + } + + protected abstract void mergeFields(ModifierData modifierData); + + public abstract boolean serversideOnly(); + + public abstract void print(); + + public abstract void reset(); + + public abstract ModifierData copy(); +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/api/ModifierListener.java b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/api/ModifierListener.java new file mode 100644 index 00000000..aa9cddfb --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/api/ModifierListener.java @@ -0,0 +1,41 @@ +package com.amuzil.omegasource.magus.skill.modifiers.api; + +import net.minecraft.nbt.CompoundTag; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.eventbus.api.Event; +import net.minecraftforge.eventbus.api.EventPriority; + +import java.util.function.Consumer; + +public abstract class ModifierListener implements Consumer { + + Runnable onSuccess; + protected ModifierData modifierData; + + public void register(Runnable onSuccess) { + MinecraftForge.EVENT_BUS.addListener(EventPriority.NORMAL, false, this); + this.onSuccess = onSuccess; + } + + public void unregister() { + MinecraftForge.EVENT_BUS.unregister(this); + } + + public abstract void setupListener(CompoundTag compoundTag); + + public abstract boolean shouldCollectModifierData(T event); + + public abstract ModifierData collectModifierDataFromEvent(T event); + + public ModifierData getModifierData() { return modifierData; } + + @Override + public void accept(T event) { + if(shouldCollectModifierData(event)) { + this.modifierData = collectModifierDataFromEvent(event); + onSuccess.run(); + } + } + + public abstract ModifierListener copy(); +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/data/DirectionModifierData.java b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/data/DirectionModifierData.java new file mode 100644 index 00000000..ba47ccfe --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/data/DirectionModifierData.java @@ -0,0 +1,72 @@ +package com.amuzil.omegasource.magus.skill.modifiers.data; + +import com.amuzil.omegasource.magus.skill.modifiers.api.BaseModifierData; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.StringTag; +import org.apache.logging.log4j.LogManager; + +import java.util.ArrayList; +import java.util.List; + + +public class DirectionModifierData extends BaseModifierData { + + private List directions; + + public DirectionModifierData() { + this.directions = new ArrayList<>(); + } + + public DirectionModifierData(List directions) { + this.directions = directions; + } + + @Override + public String getName() { + return "DirectionModifier"; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag compoundTag = super.serializeNBT(); + ListTag listTag = new ListTag(); + + this.directions.forEach(direction -> listTag.add(StringTag.valueOf(direction))); + compoundTag.put("directions", listTag); + + return compoundTag; + } + + @Override + public DirectionModifierData copy() { + return new DirectionModifierData(); + } + + @Override + public void deserializeNBT(CompoundTag compoundTag) { + this.directions = new ArrayList<>(); + + ListTag listTag = (ListTag) compoundTag.get("directions"); + listTag.forEach(tag -> this.directions.add(tag.getAsString())); + } + + //it is safe to cast at this point because the public add(ModifierData data) method encapsulates type-checking + @Override + protected void mergeFields(ModifierData modifierData) { + DirectionModifierData directionModifierData = (DirectionModifierData) modifierData; + this.directions.addAll(directionModifierData.directions); + } + + @Override + public void reset() { + this.directions = new ArrayList<>(); + } + + @Override + public void print() { + LogManager.getLogger().info("DirectionModifierData directions: " + this.directions); +// LogManager.getLogger().info("MultiModifierData directions: \n" + this.directions.stream().map(direction -> direction.name()).collect(Collectors.joining(",\n"))); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/data/HeldModifierData.java b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/data/HeldModifierData.java new file mode 100644 index 00000000..39007ad8 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/data/HeldModifierData.java @@ -0,0 +1,98 @@ +package com.amuzil.omegasource.magus.skill.modifiers.data; + +import com.amuzil.omegasource.magus.skill.modifiers.api.BaseModifierData; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; +import net.minecraft.nbt.CompoundTag; +import org.apache.logging.log4j.LogManager; + + +public class HeldModifierData extends BaseModifierData { + + private int duration; + private boolean currentlyHeld; + private String formName; + + public HeldModifierData() { + this.duration = 0; + this.currentlyHeld = true; + } + + public HeldModifierData(int duration, boolean currentlyHeld) { + super(); + this.duration = duration; + this.currentlyHeld = currentlyHeld; + this.formName = ""; + } + + public HeldModifierData(int duration, boolean currentlyHeld, String formName) { + super(); + this.duration = duration; + this.currentlyHeld = currentlyHeld; + this.formName = formName; + } + + public void setFormName(String name) { + this.formName = name; + } + + public boolean held() { + return this.currentlyHeld; + } + + public String getFormName() { + return this.formName; + } + + @Override + public String getName() { + return "HeldModifier"; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag compoundTag = super.serializeNBT(); + + compoundTag.putInt("duration", duration); + compoundTag.putBoolean("currentlyHeld", currentlyHeld); + compoundTag.putString("formName", formName); + + return compoundTag; + } + + @Override + public HeldModifierData copy() { + return new HeldModifierData(); + } + + @Override + public void deserializeNBT(CompoundTag compoundTag) { + this.duration = compoundTag.getInt("duration"); + this.currentlyHeld = compoundTag.getBoolean("currentlyHeld"); + this.formName = compoundTag.getString("formName"); + } + + //it is safe to cast at this point because the public add(ModifierData data) method encapsulates type-checking + @Override + protected void mergeFields(ModifierData modifierData) { + HeldModifierData heldModifierData = (HeldModifierData) modifierData; + // Checks to make sure forms are consistent + if (this.currentlyHeld && heldModifierData.getFormName().equals(getFormName())) { + this.duration = this.duration + heldModifierData.duration; + this.currentlyHeld = heldModifierData.currentlyHeld; + } + } + + @Override + public void reset() { + this.duration = 0; + this.currentlyHeld = true; + this.formName = ""; + } + + @Override + public void print() { +// LogManager.getLogger().info("HeldModifierData duration: " + duration); +// LogManager.getLogger().info("HeldModifierData currentlyHeld: " + currentlyHeld); +// LogManager.getLogger().info("HeldModifierData formName: " + formName); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/data/MouseGestureModifierData.java b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/data/MouseGestureModifierData.java new file mode 100644 index 00000000..d15e3e35 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/data/MouseGestureModifierData.java @@ -0,0 +1,83 @@ +package com.amuzil.omegasource.magus.skill.modifiers.data; + +import com.amuzil.omegasource.magus.skill.conditionals.mouse.MouseShapeInput; +import com.amuzil.omegasource.magus.skill.modifiers.api.BaseModifierData; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import org.apache.logging.log4j.LogManager; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +public class MouseGestureModifierData extends BaseModifierData { + + private List mouseGestures; + private HashMap shapeCounter; + + public MouseGestureModifierData() { + this.mouseGestures = new ArrayList<>(); + this.shapeCounter = new HashMap<>(); + } + + public MouseGestureModifierData(List gestures) { + this.mouseGestures = gestures; + } + + @Override + public String getName() { + return "GestureModifier"; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag compoundTag = super.serializeNBT(); + ListTag listTag = new ListTag(); + + this.mouseGestures.forEach(gesture -> { + CompoundTag mouseGestures = new CompoundTag(); + mouseGestures.putString("gesture", gesture); + listTag.add(mouseGestures); + }); + compoundTag.put("mouseGestures", listTag); + + return compoundTag; + } + + @Override + public MouseGestureModifierData copy() { + return new MouseGestureModifierData(); + } + + @Override + public void deserializeNBT(CompoundTag compoundTag) { + this.mouseGestures = new ArrayList<>(); + + ListTag listTag = (ListTag) compoundTag.get("mouseGestures"); + assert listTag != null; + listTag.forEach(mouseGesture -> { + CompoundTag gesture = (CompoundTag) mouseGesture; + this.mouseGestures.add(gesture.getString("gesture")); + }); + } + + //it is safe to cast at this point because the public add(ModifierData data) method encapsulates type-checking + @Override + protected void mergeFields(ModifierData modifierData) { + MouseGestureModifierData mouseGestureModifierData = (MouseGestureModifierData) modifierData; + this.mouseGestures.addAll(mouseGestureModifierData.mouseGestures); + } + + @Override + public void reset() { + this.mouseGestures = new ArrayList<>(); + this.shapeCounter = new HashMap<>(); + } + + @Override + public void print() { + if (!mouseGestures.isEmpty()) + LogManager.getLogger().info("GestureModifier mouseGestures: " + mouseGestures); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/data/MouseScrollModifierData.java b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/data/MouseScrollModifierData.java new file mode 100644 index 00000000..c46746b6 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/data/MouseScrollModifierData.java @@ -0,0 +1,59 @@ +package com.amuzil.omegasource.magus.skill.modifiers.data; + +import com.amuzil.omegasource.magus.skill.modifiers.api.BaseModifierData; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; +import net.minecraft.nbt.CompoundTag; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import org.apache.logging.log4j.LogManager; + +public class MouseScrollModifierData extends BaseModifierData { + private float totalScrollDelta; + + + public MouseScrollModifierData(float totalScrollDelta) { + this.totalScrollDelta = totalScrollDelta; + } + + public MouseScrollModifierData() { + this(0); + } + + @Override + protected void mergeFields(ModifierData modifierData) { + MouseScrollModifierData scrollData = (MouseScrollModifierData) modifierData; + this.totalScrollDelta += scrollData.totalScrollDelta; + } + + @Override + public void print() { + if (totalScrollDelta != 0) LogManager.getLogger().info("Total Mouse Scroll Delta: " + totalScrollDelta); + } + + @Override + public void reset() { + this.totalScrollDelta = 0; + } + + @Override + public ModifierData copy() { + return new MouseScrollModifierData(); + } + + @Override + public String getName() { + return "MouseScrollModifier"; + } + + @Override + public void deserializeNBT(CompoundTag nbt) { + this.totalScrollDelta = nbt.getFloat("total_scroll_delta"); + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag tag = super.serializeNBT(); + tag.putFloat("total_scroll_delta", totalScrollDelta); + return tag; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/data/MultiModifierData.java b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/data/MultiModifierData.java new file mode 100644 index 00000000..af41ecef --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/data/MultiModifierData.java @@ -0,0 +1,83 @@ +package com.amuzil.omegasource.magus.skill.modifiers.data; + +import com.amuzil.omegasource.magus.skill.modifiers.api.BaseModifierData; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; +import net.minecraft.nbt.CompoundTag; +import org.apache.logging.log4j.LogManager; + +public class MultiModifierData extends BaseModifierData { + + private int count; + private String formName; + + public MultiModifierData() { + this(1, ""); + } + + public MultiModifierData(int count) { + this(count, ""); + } + + public MultiModifierData(int count, String formName) { + super(); + this.count = count; + this.formName = formName; + } + + public String getFormName() { + return this.formName; + } + + public int getCount() { + return this.count; + } + + @Override + public String getName() { + return "MultiModifier"; + } + + @Override + public boolean serversideOnly() { + return true; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag compoundTag = super.serializeNBT(); + + compoundTag.putInt("count", count); + compoundTag.putString("formName", formName); + + return compoundTag; + } + + @Override + public MultiModifierData copy() { + return new MultiModifierData(); + } + + @Override + public void deserializeNBT(CompoundTag compoundTag) { + this.count = compoundTag.getInt("count"); + this.formName = compoundTag.getString("formName"); + } + + //it is safe to cast at this point because the public add(ModifierData data) method encapsulates type-checking + @Override + protected void mergeFields(ModifierData modifierData) { + MultiModifierData heldModifierData = (MultiModifierData) modifierData; + this.count = this.count + heldModifierData.count; + } + + @Override + public void reset() { + this.count = 1; + this.formName = ""; + } + + @Override + public void print() { + LogManager.getLogger().info("MultiModifierData count: " + count); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/data/TargetModifierData.java b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/data/TargetModifierData.java new file mode 100644 index 00000000..378f8d33 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/data/TargetModifierData.java @@ -0,0 +1,82 @@ +package com.amuzil.omegasource.magus.skill.modifiers.data; + +import com.amuzil.omegasource.magus.skill.modifiers.api.BaseModifierData; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.world.phys.Vec3; +import org.apache.logging.log4j.LogManager; + +import java.util.ArrayList; +import java.util.List; + +public class TargetModifierData extends BaseModifierData { + + private ArrayList targetPositions; + + public TargetModifierData() { + this.targetPositions = new ArrayList<>(); + } + + public TargetModifierData(ArrayList directions) { + this.targetPositions = directions; + } + + @Override + public String getName() { + return "TargetModifier"; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag compoundTag = super.serializeNBT(); + ListTag listTag = new ListTag(); + + this.targetPositions.forEach(target -> { + CompoundTag targetPosition = new CompoundTag(); + targetPosition.putDouble("x", target.x); + targetPosition.putDouble("y", target.y); + targetPosition.putDouble("z", target.z); + listTag.add(targetPosition); + }); + compoundTag.put("targetPositions", listTag); + + return compoundTag; + } + + @Override + public TargetModifierData copy() { + return new TargetModifierData(); + } + + @Override + public void deserializeNBT(CompoundTag compoundTag) { + this.targetPositions = new ArrayList<>(); + + ListTag listTag = (ListTag) compoundTag.get("targetPositions"); + listTag.forEach(tag -> { + CompoundTag target = (CompoundTag)tag; + double x = target.getDouble("x"); + double y = target.getDouble("y"); + double z = target.getDouble("z"); + this.targetPositions.add(new Vec3(x, y, z)); + }); + } + + //it is safe to cast at this point because the public add(ModifierData data) method encapsulates type-checking + @Override + protected void mergeFields(ModifierData modifierData) { + TargetModifierData targetModifierData = (TargetModifierData) modifierData; + this.targetPositions.addAll(targetModifierData.targetPositions); + } + + @Override + public void reset() { + this.targetPositions = new ArrayList<>(); + } + + @Override + public void print() { + LogManager.getLogger().info("TargetModifierData targetPositions: \n" + this.targetPositions.size()); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/listeners/DirectionModifierListener.java b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/listeners/DirectionModifierListener.java new file mode 100644 index 00000000..d0e85099 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/listeners/DirectionModifierListener.java @@ -0,0 +1,78 @@ +package com.amuzil.omegasource.magus.skill.modifiers.listeners; + +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierListener; +import com.amuzil.omegasource.magus.skill.modifiers.data.DirectionModifierData; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.event.entity.living.LivingEvent; + +import java.util.LinkedList; +import java.util.List; + +import static com.amuzil.omegasource.magus.skill.conditionals.mouse.MouseMotionInput.getAngle2D; + + +@OnlyIn(Dist.CLIENT) +public class DirectionModifierListener extends ModifierListener { + private final double motionThreshold = 0.08d; + + public DirectionModifierListener() { + this.modifierData = new DirectionModifierData(); + } + + //this ModifierListener doesn't use any nested listeners + @Override + public void setupListener(CompoundTag compoundTag) { + } + + @Override + public boolean shouldCollectModifierData(LivingEvent.LivingTickEvent event) { + if(!(event.getEntity() instanceof Player)) return false; + // System.out.println(getDirection(event.getEntity().getLookAngle(), event.getEntity().getDeltaMovement().normalize())); + // LogManager.getLogger().info("MOVE MOTION: " + event.getEntity().getDeltaMovement().length()); + // LogManager.getLogger().info(event.getEntity().getDeltaMovement()); + return event.getEntity().getDeltaMovement().length() > motionThreshold; + } + + @Override + public ModifierData collectModifierDataFromEvent(LivingEvent.LivingTickEvent event) { + List directions = new LinkedList<>(); + String direction = getDirection(event.getEntity().getLookAngle(), event.getEntity().getDeltaMovement().normalize()); + if (!direction.isEmpty()) + directions.add(direction); + return new DirectionModifierData(directions); + } + + @Override + public ModifierListener copy() { + return new DirectionModifierListener(); + } + + public String getDirection(Vec3 faceDirection, Vec3 movementDirection) { + String direction = ""; + double degree_span = 45.0D; + Vec3 front = faceDirection.normalize(); + Vec3 back = new Vec3(-faceDirection.x, faceDirection.y, -faceDirection.z).normalize(); + Vec3 right = new Vec3(-faceDirection.z, faceDirection.y, faceDirection.x).normalize(); + Vec3 left = new Vec3(faceDirection.z, faceDirection.y, -faceDirection.x).normalize(); + + if (movementDirection.y() >= 1.0D) { + direction = "up"; + } else if (movementDirection.y() <= -1.0D) { + direction = "down"; + } else if (getAngle2D(front, movementDirection) <= degree_span) { + direction = "forward"; + } else if (getAngle2D(back, movementDirection) <= degree_span) { + direction = "back"; + } else if (getAngle2D(right, movementDirection) <= degree_span) { + direction = "right"; + } else if (getAngle2D(left, movementDirection) <= degree_span) { + direction = "left"; + } + return direction; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/listeners/KeyHeldModifierListener.java b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/listeners/KeyHeldModifierListener.java new file mode 100644 index 00000000..4aae3648 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/listeners/KeyHeldModifierListener.java @@ -0,0 +1,135 @@ +package com.amuzil.omegasource.magus.skill.modifiers.listeners; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.input.InputModule; +import com.amuzil.omegasource.magus.input.KeyboardMouseInputModule; +import com.amuzil.omegasource.magus.radix.RadixTree; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierListener; +import com.amuzil.omegasource.magus.skill.modifiers.data.HeldModifierData; +import net.minecraft.nbt.CompoundTag; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.TickEvent; +import org.apache.logging.log4j.LogManager; + +import java.util.LinkedList; +import java.util.List; +import java.util.function.Consumer; + +@OnlyIn(Dist.CLIENT) +public class KeyHeldModifierListener extends ModifierListener { + private final RadixTree.InputType type; + private Consumer clientTickListener; + private int currentHolding; + private boolean isHeld = true; + private boolean wasHeld = true; + private String formName; + private List activeKeyCodes; + + public KeyHeldModifierListener() { + this(RadixTree.InputType.KEYBOARD_MOUSE); + } + + public KeyHeldModifierListener(RadixTree.InputType type) { + this.modifierData = new HeldModifierData(); + this.type = type; + this.activeKeyCodes = new LinkedList<>(); + this.formName = ""; + } + + @Override + public void register(Runnable onSuccess) { + super.register(onSuccess); + MinecraftForge.EVENT_BUS.addListener(clientTickListener); + } + + @Override + public void unregister() { + super.unregister(); + MinecraftForge.EVENT_BUS.unregister(clientTickListener); + } + + + public InputModule getTypedModule(RadixTree.InputType type) { + return Magus.keyboardMouseInputModule; + } + + @Override + public void setupListener(CompoundTag compoundTag) { + // TODO: FIx this + InputModule module = Magus.keyboardMouseInputModule; + + this.clientTickListener = event -> { + if (event.phase == TickEvent.ClientTickEvent.Phase.START) { + + boolean pressed = true; +// System.out.println(formName); + // If all requisite keys aren't pressed, don't iterate modifier data + for (int key : activeKeyCodes) { + if (!module.keyPressed(key)) { + pressed = false; + break; + } + } + if (activeKeyCodes.isEmpty()) { + pressed = false; + } + + if (pressed) { + this.isHeld = true; + this.currentHolding++; + } else { + if (this.isHeld) { + this.wasHeld = true; + this.isHeld = false; + } + } + } + }; + } + + @Override + public boolean shouldCollectModifierData(TickEvent.ClientTickEvent event) { + InputModule module = getTypedModule(type); + if (module.getActiveForm() != null && !module.getActiveForm().name().equals("null")) { + formName = module.getActiveForm().name(); + if (!KeyboardMouseInputModule.getKeyCodes(module.getActiveForm(), type).isEmpty()) { + activeKeyCodes = KeyboardMouseInputModule.getKeyCodes(module.getActiveForm(), type); + if (module.getLastActivatedForm() != null && !formName.equals(module.getLastActivatedForm().name())) { + currentHolding = 0; + } + } + } + + if (activeKeyCodes.isEmpty()) return false; + + if (isHeld && currentHolding > 0) { + return true; + } + //so that we send a packet to say we've stopped holding(for continuous cast ability support) + if (!this.isHeld && this.wasHeld) { + this.wasHeld = false; + this.currentHolding = 0; + LogManager.getLogger().debug("Form Name: " + module.getActiveForm().name()); + // Forcibly collects data jic +// Magus.keyboardMouseInputModule.queueModifierData(collectModifierDataFromEvent(event)); +// Magus.keyboardMouseInputModule.resetLastActivated(); + return false; + } + return false; + } + + @Override + public ModifierData collectModifierDataFromEvent(TickEvent.ClientTickEvent event) { + LogManager.getLogger().debug("Collected Held Data at: " + currentHolding); + HeldModifierData data = new HeldModifierData(currentHolding, isHeld, formName); + return data; + } + + @Override + public KeyHeldModifierListener copy() { + return new KeyHeldModifierListener(); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/listeners/MouseGestureModifierListener.java b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/listeners/MouseGestureModifierListener.java new file mode 100644 index 00000000..79310efe --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/listeners/MouseGestureModifierListener.java @@ -0,0 +1,98 @@ +package com.amuzil.omegasource.magus.skill.modifiers.listeners; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.radix.RadixTree; +import com.amuzil.omegasource.magus.skill.conditionals.mouse.MousePointInput; +import com.amuzil.omegasource.magus.skill.conditionals.mouse.MouseShapeInput; +import com.amuzil.omegasource.magus.skill.conditionals.mouse.MouseVircle; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierListener; +import com.amuzil.omegasource.magus.skill.modifiers.data.MouseGestureModifierData; +import net.minecraft.client.Minecraft; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.TickEvent; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.function.Consumer; + +@OnlyIn(Dist.CLIENT) +public class MouseGestureModifierListener extends ModifierListener { + private Consumer clientTickListener; + public List mouseGestures; + public MouseVircle vircle; + private HashMap shapeCounter; + private final RadixTree.InputType type; + + public MouseGestureModifierListener() { + this(RadixTree.InputType.MOUSE_MOTION); + } + + public MouseGestureModifierListener(RadixTree.InputType type) { + this.modifierData = new MouseGestureModifierData(); + this.type = type; + this.mouseGestures = new LinkedList<>(); + } + + @Override + public void register(Runnable onSuccess) { + super.register(onSuccess); + MinecraftForge.EVENT_BUS.addListener(clientTickListener); + } + + @Override + public void unregister() { + super.unregister(); + MinecraftForge.EVENT_BUS.unregister(clientTickListener); + } + + @Override + public void setupListener(CompoundTag compoundTag) { + this.clientTickListener = event -> { + if (Magus.keyboardMouseInputModule.keyPressed(Minecraft.getInstance().options.keyShift.getKey().getValue())) { + Minecraft mci = Minecraft.getInstance(); + assert mci.player != null; + double x = mci.mouseHandler.xpos(); + double y = mci.mouseHandler.ypos(); + Vec3 lookAngle = mci.player.getLookAngle(); + if (vircle == null) { + vircle = new MouseVircle(new MousePointInput(x, y, lookAngle)); + } else { + vircle.track(new MousePointInput(x, y, lookAngle)); + if (vircle.hasMotionDirection()) { + mouseGestures.add(vircle.popMotionDirection()); + } + } + } + }; + } + + @Override + public boolean shouldCollectModifierData(TickEvent.ClientTickEvent event) { + if (!Magus.keyboardMouseInputModule.keyPressed(Minecraft.getInstance().options.keyShift.getKey().getValue())) { + if (!mouseGestures.isEmpty()) { + mouseGestures.clear(); + return false; + } + } + return true; + } + + @Override + public ModifierData collectModifierDataFromEvent(TickEvent.ClientTickEvent event) { + MouseGestureModifierData data = new MouseGestureModifierData(mouseGestures); + this.mouseGestures = new ArrayList<>(); + return data; + } + + @Override + public MouseGestureModifierListener copy() { + return new MouseGestureModifierListener(); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/listeners/MouseScrollModifierListener.java b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/listeners/MouseScrollModifierListener.java new file mode 100644 index 00000000..c79558d4 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/listeners/MouseScrollModifierListener.java @@ -0,0 +1,46 @@ +package com.amuzil.omegasource.magus.skill.modifiers.listeners; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.input.KeyboardMouseInputModule; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierListener; +import com.amuzil.omegasource.magus.skill.modifiers.data.MouseScrollModifierData; +import net.minecraft.nbt.CompoundTag; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.event.TickEvent; + +@OnlyIn(Dist.CLIENT) +public class MouseScrollModifierListener extends ModifierListener { + private float totalScrollDelta = 0; + KeyboardMouseInputModule inputModule = (KeyboardMouseInputModule) Magus.keyboardMouseInputModule; + + @Override + public void setupListener(CompoundTag compoundTag) { + + } + + @Override + public boolean shouldCollectModifierData(TickEvent.ClientTickEvent event) { + // Half a second, or 20 ticks +// Magus.LOGGER.warn(System.currentTimeMillis()); + return inputModule.scrollTimeout % 3 == 0 && + inputModule.getMouseScrollDelta() != 0 || + inputModule.resetScrolling; + } + + @Override + public ModifierData collectModifierDataFromEvent(TickEvent.ClientTickEvent event) { + if (inputModule.resetScrolling) { + this.totalScrollDelta = 0; + inputModule.resetScrolling = false; + } + else this.totalScrollDelta += inputModule.getMouseScrollDelta(); + return new MouseScrollModifierData(totalScrollDelta); + } + + @Override + public ModifierListener copy() { + return new MouseScrollModifierListener(); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/listeners/MultiModifierListener.java b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/listeners/MultiModifierListener.java new file mode 100644 index 00000000..26d0c1df --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/listeners/MultiModifierListener.java @@ -0,0 +1,68 @@ +package com.amuzil.omegasource.magus.skill.modifiers.listeners; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.input.InputModule; +import com.amuzil.omegasource.magus.input.KeyboardMouseInputModule; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierListener; +import com.amuzil.omegasource.magus.skill.modifiers.data.MultiModifierData; +import net.minecraft.nbt.CompoundTag; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.event.TickEvent; +import org.apache.logging.log4j.LogManager; + +@OnlyIn(Dist.CLIENT) +public class MultiModifierListener extends ModifierListener { + private int activationCounter; + private String formName; + + public MultiModifierListener() { + this.modifierData = new MultiModifierData(); + this.formName = ""; + this.activationCounter = 0; + } + + @Override + public void register(Runnable onSuccess) { + super.register(onSuccess); + } + + @Override + public void unregister() { + super.unregister(); + } + + public InputModule getTypedModule() { + return Magus.keyboardMouseInputModule; + } + + @Override + public void setupListener(CompoundTag compoundTag) { + } + + @Override + public boolean shouldCollectModifierData(TickEvent.ClientTickEvent event) { + InputModule module = getTypedModule(); + if (module.getActiveForm() != null) formName = module.getActiveForm().name(); + this.activationCounter = ((KeyboardMouseInputModule) module).getActivationCounter(); + if (!formName.equals("") && module.getActiveForm() != null && !formName.equals(module.getActiveForm().name())) { + this.activationCounter = 0; + return true; + } + return this.activationCounter > 0 && module.getActiveForm() != null && module.getLastActivatedForm() != null; + } + + @Override + public ModifierData collectModifierDataFromEvent(TickEvent.ClientTickEvent event) { + MultiModifierData data = new MultiModifierData(activationCounter, formName); + LogManager.getLogger().debug("Multi Count: " + activationCounter); + this.activationCounter = 0; + return data; + } + + @Override + public MultiModifierListener copy() { + return new MultiModifierListener(); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/listeners/TargetModifierListener.java b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/listeners/TargetModifierListener.java new file mode 100644 index 00000000..048a0517 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/modifiers/listeners/TargetModifierListener.java @@ -0,0 +1,85 @@ +package com.amuzil.omegasource.magus.skill.modifiers.listeners; + +import com.amuzil.omegasource.magus.input.InputModule; +import com.amuzil.omegasource.magus.skill.elements.Element; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierListener; +import com.amuzil.omegasource.magus.skill.modifiers.data.TargetModifierData; +import com.mojang.blaze3d.platform.InputConstants; +import net.minecraft.client.Minecraft; +import net.minecraft.core.BlockPos; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.tags.TagKey; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.client.event.InputEvent; +import org.apache.logging.log4j.LogManager; + +import java.util.ArrayList; +import java.util.List; + +// TODO: Configure which key this listener uses +@OnlyIn(Dist.CLIENT) +public class TargetModifierListener extends ModifierListener { + private Vec3 lastTargetPosition; + private Element activeElement; + + public TargetModifierListener() { + this.modifierData = new TargetModifierData(); + } + + @Override + public void setupListener(CompoundTag compoundTag) { +// this.activeElement = Elements.fromName(compoundTag.getString("activeElement")); + } + + @Override + public boolean shouldCollectModifierData(InputEvent.MouseButton event) { + + //TODO: Fix this + this.activeElement = InputModule.getDiscipline(); + if(event instanceof InputEvent.MouseButton.Post && // prevents double activation(Pre- and Post-event firing) + event.getButton() == InputConstants.MOUSE_BUTTON_MIDDLE && event.getAction() == InputConstants.PRESS) { + Minecraft mc = Minecraft.getInstance(); + Player player = mc.player; + Vec3 vector3d = mc.player.getEyePosition(1.0F); + Vec3 vector3d1 = mc.player.getViewVector(1.0F); + double distance = 20; //todo max distance make this configurable + Vec3 vector3d2 = vector3d.add(vector3d1.x * distance, vector3d1.y * distance, vector3d1.z * distance); + List> bendableMaterials = new ArrayList<>();//BendingMaterialUtil.getBendableMaterialsForElement(activeElement); + BlockHitResult hitresult = mc.player.level().clip(new ClipContext(vector3d, vector3d2, ClipContext.Block.COLLIDER, ClipContext.Fluid.ANY, player)); + if (hitresult.getType() == HitResult.Type.BLOCK) { + BlockPos locationHit = hitresult.getBlockPos(); + LogManager.getLogger().info("Position: " + locationHit); + BlockState hitBlockState = player.level().getBlockState(new BlockPos(locationHit)); + if(bendableMaterials.size() == 0 || bendableMaterials.stream().anyMatch(hitBlockState::is)) { + LogManager.getLogger().info("Blockstate: " + player.level().getBlockState(new BlockPos(locationHit))); + lastTargetPosition = new Vec3(locationHit.getX(), locationHit.getY(), locationHit.getZ()); + } + } + } + + return lastTargetPosition != null; + } + + @Override + public ModifierData collectModifierDataFromEvent(InputEvent.MouseButton event) { + ArrayList list = new ArrayList<>(); + list.add(this.lastTargetPosition); + TargetModifierData data = new TargetModifierData(list); + this.lastTargetPosition = null; + return data; + } + + @Override + public ModifierListener copy() { + return new TargetModifierListener(); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/skill/Skill.java b/src/main/java/com/amuzil/omegasource/magus/skill/skill/Skill.java new file mode 100644 index 00000000..5d7ac4e8 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/skill/Skill.java @@ -0,0 +1,149 @@ +package com.amuzil.omegasource.magus.skill.skill; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.radix.Condition; +import com.amuzil.omegasource.magus.radix.ConditionPath; +import com.amuzil.omegasource.magus.radix.RadixTree; +import com.amuzil.omegasource.magus.skill.event.SkillTickEvent; +import com.amuzil.omegasource.magus.skill.util.traits.SkillTrait; +import com.amuzil.omegasource.magus.skill.util.traits.skilltraits.UseTrait; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.LivingEntity; +import net.minecraftforge.common.MinecraftForge; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; + +/** + * Basic skill class. All other skills extend this. + */ +public abstract class Skill { + private final ResourceLocation id; + private final SkillCategory category; + private final List activationTypes; + private final List skillTypes; + private final List skillTraits; + // How the skill was activated. Useful if you want different methods to influence the skill in different ways. + // For complex, game-design move combinations, see ModifierData for how to alter your skills. + protected RadixTree.ActivationType activatedType; + private boolean shouldStart, shouldRun, shouldStop; + + public Skill(String modID, String name, SkillCategory category) { + this(new ResourceLocation(modID, name), category); + } + + public Skill(String name, SkillCategory category) { + this(Magus.MOD_ID, name, category); + } + + public Skill(ResourceLocation id, SkillCategory category) { + this.id = id; + this.category = category; + // Menu is default + this.activatedType = RadixTree.ActivationType.MENU; + this.skillTypes = new LinkedList<>(); + this.skillTraits = new LinkedList<>(); + this.activationTypes = new LinkedList<>(); + + // Maybe static instances of traits rather then new instances per Skill? Unsure + addTrait(new UseTrait("use_skill", false)); + } + + public void addTrait(SkillTrait trait) { + this.skillTraits.add(trait); + } + + public void addType(SkillType type) { + this.skillTypes.add(type); + } + + public RadixTree.ActivationType getActivatedType() { + return this.activatedType; + } + + public List getActivationTypes() { + return this.activationTypes; + } + + public void addActivationType(RadixTree.ActivationType type) { + this.activationTypes.add(type); + } + + public SkillCategory getCategory() { + return category; + } + + public ResourceLocation getId() { + return id; + } + + public List getTraits() { + return this.skillTraits; + } + + public List getTypes() { + return this.skillTypes; + } + + // Fix this because this will not work lmao + public void tick(LivingEntity entity, RadixTree tree) { + //Run this asynchronously + + + // Remember, for some reason post only returns true upon the event being cancelled. Blame Forge. + + + if (shouldStart(entity, tree)) { + if (MinecraftForge.EVENT_BUS.post(new SkillTickEvent.Start(entity, tree, this))) + return; + start(entity, tree); + } else return; + + + if (shouldRun(entity, tree)) { + if (!MinecraftForge.EVENT_BUS.post(new SkillTickEvent.Run(entity, tree, this))) + run(entity, tree); + + if (shouldStop(entity, tree)) { + if (!MinecraftForge.EVENT_BUS.post(new SkillTickEvent.Stop(entity, tree, this))) + stop(entity, tree); + } + } + } + + public List getMultikeyConditions() { + if (!getActivationTypes().contains(RadixTree.ActivationType.MULTIKEY)) return new ArrayList<>(); + return getActivationPaths().getOrDefault(RadixTree.ActivationType.MULTIKEY, new LinkedList<>()).get(0).conditions; + } + + public abstract HashMap> getActivationPaths(); + + public abstract boolean shouldStart(LivingEntity entity, RadixTree tree); + + public abstract boolean shouldRun(LivingEntity entity, RadixTree tree); + + public abstract boolean shouldStop(LivingEntity entity, RadixTree tree); + + public abstract void start(LivingEntity entity, RadixTree tree); + + public abstract void run(LivingEntity entity, RadixTree tree); + + public abstract void stop(LivingEntity entity, RadixTree tree); + + // Resets the skill and any necessary skill data; should be called upon stopping execution. + public abstract void reset(LivingEntity entity, RadixTree tree); + + + public enum SkillState { + START, RUN, STOP + } + + /** + * Different skill types. A skill can be multiple of one type. + */ + public enum SkillType { + OFFENSIVE, DEFENSIVE, MOBILITY, BUFF, UTILITY, RANGED, MELEE, CONSTRUCT + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/skill/SkillActive.java b/src/main/java/com/amuzil/omegasource/magus/skill/skill/SkillActive.java new file mode 100644 index 00000000..f80465d6 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/skill/SkillActive.java @@ -0,0 +1,110 @@ +package com.amuzil.omegasource.magus.skill.skill; + +import com.amuzil.omegasource.magus.radix.ConditionPath; +import com.amuzil.omegasource.magus.radix.RadixTree; +import com.amuzil.omegasource.magus.skill.util.capability.entity.Magi; +import com.amuzil.omegasource.magus.skill.util.data.SkillData; +import net.minecraft.world.entity.LivingEntity; + +import java.util.HashMap; +import java.util.List; + +public class SkillActive extends Skill { + + public SkillActive(String name, SkillCategory category) { + super(name, category); + } + + @Override + public HashMap> getActivationPaths() { + return null; + } + + + @Override + public boolean shouldStart(LivingEntity entity, RadixTree tree) { + boolean canStart = false; + RadixTree.ActivationType currentType = null, prevType = null; + if (getActivationPaths() == null || tree == null || tree.getPath() == null) + return false; + + + + // Initialise paths here, to reduce memory consumption + HashMap> paths = getActivationPaths(); + for (RadixTree.ActivationType type : getActivationTypes()) { + // Needs to be changed to a search + for (ConditionPath conditions : paths.get(type)) { + if (tree.search(conditions.conditions) != null) { + canStart = true; + currentType = type; + if (prevType != null && prevType.priority() > currentType.priority()) { + currentType = prevType; + } else prevType = currentType; + } + } + } + + Magi magi = Magi.get(entity); + if (magi != null) { + canStart &= magi.getSkillData(this).getState() == SkillState.START; + } + else canStart = false; + + // Finds the highest priority type that is valid, and goes with that. + this.activatedType = currentType; + return canStart; + } + + @Override + public boolean shouldRun(LivingEntity entity, RadixTree tree) { + SkillData data; + Magi magi = Magi.get(entity); + if (magi != null) { + data = magi.getSkillData(this); + return data.getState() == SkillState.RUN; + } + return false; + } + + @Override + public boolean shouldStop(LivingEntity entity, RadixTree tree) { + SkillData data; + Magi magi = Magi.get(entity); + if (magi != null) { + data = magi.getSkillData(this); + return data.getState() == SkillState.STOP; + } + return false; + } + + @Override + public void start(LivingEntity entity, RadixTree tree) { + SkillData data; + Magi magi = Magi.get(entity); + if (magi != null) { + data = magi.getSkillData(this); + data.setState(SkillState.RUN); + } + } + + @Override + public void run(LivingEntity entity, RadixTree tree) { + + } + + @Override + public void stop(LivingEntity entity, RadixTree tree) { + + } + + @Override + public void reset(LivingEntity entity, RadixTree tree) { + + } + + //Need to account for the different types as worked out by Maht and I (FavouriteDragon). + public boolean execute() { + return false; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/skill/SkillBuilder.java b/src/main/java/com/amuzil/omegasource/magus/skill/skill/SkillBuilder.java new file mode 100644 index 00000000..ec355f26 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/skill/SkillBuilder.java @@ -0,0 +1,4 @@ +package com.amuzil.omegasource.magus.skill.skill; + +public class SkillBuilder { +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/skill/SkillCategory.java b/src/main/java/com/amuzil/omegasource/magus/skill/skill/SkillCategory.java new file mode 100644 index 00000000..0a8cc249 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/skill/SkillCategory.java @@ -0,0 +1,13 @@ +package com.amuzil.omegasource.magus.skill.skill; + +import java.util.LinkedList; + +public class SkillCategory { + + //List of all skills available within the category + public LinkedList skills = new LinkedList<>(); + + public String name() { return "SkillCategory[ Blank ]"; } + + //TODO: GUI stuff as data +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/skill/SkillStance.java b/src/main/java/com/amuzil/omegasource/magus/skill/skill/SkillStance.java new file mode 100644 index 00000000..6abb819c --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/skill/SkillStance.java @@ -0,0 +1,63 @@ +package com.amuzil.omegasource.magus.skill.skill; + +import com.amuzil.omegasource.magus.radix.ConditionPath; +import com.amuzil.omegasource.magus.radix.RadixTree; +import net.minecraft.world.entity.LivingEntity; + +import java.util.HashMap; +import java.util.List; + +/** + * Name WIP. + * Functions as a "stance" skill, as described in Avatar's documentation, design, and outline. + * Stance skills are in between active and passive skills. You have to activate them, but rather than + * producing a direct effect, they invoke a passive effect upon the player. + * The idea is to have a cycle method or something similar to rotate through unlocked stances. + * Stance skills could range from Sun stance firebending, to give access to new combos, + * to different types of martial arts in a martial arts mod. E.g variations on karate. + */ +public class SkillStance extends Skill { + public SkillStance(String name, SkillCategory category) { + super(name, category); + } + + @Override + public HashMap> getActivationPaths() { + return null; + } + + @Override + public boolean shouldStart(LivingEntity entity, RadixTree tree) { + return false; + } + + @Override + public boolean shouldRun(LivingEntity entity, RadixTree tree) { + return false; + } + + @Override + public boolean shouldStop(LivingEntity entity, RadixTree tree) { + return false; + } + + @Override + public void start(LivingEntity entity, RadixTree tree) { + + } + + @Override + public void run(LivingEntity entity, RadixTree tree) { + + } + + @Override + public void stop(LivingEntity entity, RadixTree tree) { + + } + + @Override + public void reset(LivingEntity entity, RadixTree tree) { + + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/skill/SkillUser.java b/src/main/java/com/amuzil/omegasource/magus/skill/skill/SkillUser.java new file mode 100644 index 00000000..4bfba85a --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/skill/SkillUser.java @@ -0,0 +1,38 @@ +package com.amuzil.omegasource.magus.skill.skill; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.skill.util.capability.entity.Data; +import net.minecraft.world.entity.LivingEntity; +import net.minecraftforge.event.entity.living.LivingEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; + +@Mod.EventBusSubscriber(modid = Magus.MOD_ID) +public abstract class SkillUser { + + public abstract Data getData(); + public abstract LivingEntity getEntity(); + + public void onUpdate() { + } + + public void executeSkill() { + } + + public static SkillUser getSkillUser(LivingEntity entity) { + return null; + } + + // TODO: Check capabilities for the entity before returning true + public static boolean isSkillUserSupported(LivingEntity entity) { + return false; + } + + @SubscribeEvent + public static void livingTick(LivingEvent.LivingTickEvent event) { + //Call onUpdate here + if (getSkillUser(event.getEntity()) != null) + getSkillUser(event.getEntity()).onUpdate(); + } + +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/skill/Skills.java b/src/main/java/com/amuzil/omegasource/magus/skill/skill/Skills.java new file mode 100644 index 00000000..ce33aaf2 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/skill/Skills.java @@ -0,0 +1,20 @@ +package com.amuzil.omegasource.magus.skill.skill; + +import com.amuzil.omegasource.magus.registry.Registries; +import com.amuzil.omegasource.magus.skill.elements.Elements; +import com.amuzil.omegasource.magus.skill.skill.avatar.effects.FlowEffect; + +import java.util.ArrayList; +import java.util.List; + +public class Skills { + public static void registerSkills() { + List skills = new ArrayList<>(); + + // TODO: Move registration into skill categories + skills.add(new FlowEffect("air_flow", Elements.AIR)); + + + Registries.registerSkills(skills); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/skill/avatar/EffectSkill.java b/src/main/java/com/amuzil/omegasource/magus/skill/skill/avatar/EffectSkill.java new file mode 100644 index 00000000..2d84f94a --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/skill/avatar/EffectSkill.java @@ -0,0 +1,34 @@ +package com.amuzil.omegasource.magus.skill.skill.avatar; + +import com.amuzil.omegasource.magus.radix.ConditionPath; +import com.amuzil.omegasource.magus.radix.RadixTree; +import com.amuzil.omegasource.magus.skill.skill.Skill; +import com.amuzil.omegasource.magus.skill.skill.SkillActive; +import com.amuzil.omegasource.magus.skill.skill.SkillCategory; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.LivingEntity; + +import java.util.List; + +public class EffectSkill extends SkillActive { + public EffectSkill(String name, SkillCategory category) { + super(name, category); + } + + + + @Override + public void start(LivingEntity entity, RadixTree tree) { + super.start(entity, tree); + } + + @Override + public void run(LivingEntity entity, RadixTree tree) { + + } + + @Override + public void stop(LivingEntity entity, RadixTree tree) { + + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/skill/avatar/effects/FlowEffect.java b/src/main/java/com/amuzil/omegasource/magus/skill/skill/avatar/effects/FlowEffect.java new file mode 100644 index 00000000..926606da --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/skill/avatar/effects/FlowEffect.java @@ -0,0 +1,74 @@ +package com.amuzil.omegasource.magus.skill.skill.avatar.effects; + +import com.amuzil.omegasource.magus.radix.Condition; +import com.amuzil.omegasource.magus.radix.ConditionPath; +import com.amuzil.omegasource.magus.radix.RadixTree; +import com.amuzil.omegasource.magus.radix.RadixUtil; +import com.amuzil.omegasource.magus.radix.builders.SkillPathBuilder; +import com.amuzil.omegasource.magus.skill.forms.Forms; +import com.amuzil.omegasource.magus.skill.modifiers.api.ModifierData; +import com.amuzil.omegasource.magus.skill.modifiers.data.MouseGestureModifierData; +import com.amuzil.omegasource.magus.skill.skill.SkillCategory; +import com.amuzil.omegasource.magus.skill.skill.avatar.EffectSkill; +import net.minecraft.world.entity.LivingEntity; + +import java.util.HashMap; +import java.util.List; + +public class FlowEffect extends EffectSkill { + + public FlowEffect(String name, SkillCategory category) { + super(name, category); + addActivationType(RadixTree.ActivationType.MULTIKEY); + } + + @Override + public HashMap> getActivationPaths() { + // We're only testing multikey right now. Otherwise, we'd need to build for every distinct type. + return SkillPathBuilder.getInstance() + // Types it + .type(RadixTree.ActivationType.MULTIKEY) + // Constructs path based on given Forms/Conditions + .path(SkillPathBuilder.toCondition(Forms.ARC)) + // Adds the path to the finalised ConditionPath list + .finalisePath() + // Builds it + .build(); + } + + @Override + public boolean shouldStart(LivingEntity entity, RadixTree tree) { +// RadixUtil.getLogger().debug(tree); +// RadixUtil.getLogger().debug(super.shouldStart(entity, tree)); +// RadixUtil.getLogger().debug(getActivationPaths()); + return super.shouldStart(entity, tree); + } + + @Override + public boolean shouldStop(LivingEntity entity, RadixTree tree) { + return super.shouldStop(entity, tree); + } + + @Override + public void start(LivingEntity entity, RadixTree tree) { + // In case of avatar, we only care about initial path. + List conditions = getMultikeyConditions(); + List data = tree.getPath().getModifiers(conditions.get(0)); + + super.start(entity, tree); + } + + @Override + public boolean shouldRun(LivingEntity entity, RadixTree tree) { + // return modifier.held > 0 + return super.shouldRun(entity, tree); + } + + @Override + public void run(LivingEntity entity, RadixTree tree) { + // adjust player prepared chi (getModifierData()) + super.run(entity, tree); + RadixUtil.getLogger().debug("Current skill: " + this); + RadixUtil.getLogger().debug("Current player: " + entity); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/test/avatar/AvatarCommand.java b/src/main/java/com/amuzil/omegasource/magus/skill/test/avatar/AvatarCommand.java new file mode 100644 index 00000000..7a35ecab --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/test/avatar/AvatarCommand.java @@ -0,0 +1,108 @@ +package com.amuzil.omegasource.magus.skill.test.avatar; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.input.InputModule; +import com.amuzil.omegasource.magus.input.KeyboardMouseInputModule; +import com.amuzil.omegasource.magus.network.MagusNetwork; +import com.amuzil.omegasource.magus.network.packets.client_executed.FormActivatedPacket; +import com.amuzil.omegasource.magus.network.packets.server_executed.ElementActivatedPacket; +import com.amuzil.omegasource.magus.registry.Registries; +import com.amuzil.omegasource.magus.skill.elements.Element; +import com.amuzil.omegasource.magus.skill.elements.Elements; +import com.amuzil.omegasource.magus.skill.forms.Form; +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import com.mojang.brigadier.context.CommandContext; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.commands.Commands; +import net.minecraft.commands.arguments.EntityArgument; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.level.ServerPlayer; +import net.minecraftforge.network.PacketDistributor; +import org.apache.logging.log4j.core.jmx.Server; + +import java.util.Arrays; + +import static com.amuzil.omegasource.magus.Magus.MOD_ID; + + +public class AvatarCommand { + private static LiteralArgumentBuilder builder = Commands.literal("avatar"); + // Class for registering the '/avatar' command + public static void register(CommandDispatcher dispatcher) { + builder.then(Commands.literal("tree") + .then(Commands.literal("reset") + .executes(c -> reset())) + .executes(c -> tree())) + .executes(c -> { + // Default message when no options are provided. + InputModule.sendDebugMsg("Options: activate, form, tree"); + return 1; + }); + + createActivateArtCommand(); + createActivateFormCommand(); + dispatcher.register(builder); + } + + private static void createActivateArtCommand() { + Arrays.stream(Element.Art.values()).toList().forEach(elem -> + builder.then(Commands.literal("activate") + .then(Commands.literal(elem.name().toLowerCase()) + .executes(c -> activateElement(c, elem, null)) + .then(Commands.argument("target", EntityArgument.player()) + .executes(c -> activateElement(c, elem, EntityArgument.getPlayer(c, "target"))) + ) + ) + ) + ); + } + + private static void createActivateFormCommand() { + Registries.forms.forEach(form -> builder.then(Commands.literal("form") + .then(Commands.literal(form.name().toLowerCase()) + .then(Commands.argument("target", EntityArgument.player()) + .executes(c -> activateForm( + form.name().toLowerCase(), + EntityArgument.getPlayer(c, "target"))) + ) + ) + )); + } + + private static int tree() { + Magus.keyboardMouseInputModule.getFormsTree().printAllBranches(); + System.out.println("Current Active Forms: " + Magus.keyboardMouseInputModule.getActiveConditions()); + return 1; + } + + private static int reset() { + KeyboardMouseInputModule kim = (KeyboardMouseInputModule) Magus.keyboardMouseInputModule; + kim.getFormsTree().resetTree(); + kim.getActiveConditions().clear(); + InputModule.resetFormsTree(); + AvatarFormRegistry.registerForms(); + kim.registerRunnables(Magus.keyboardMouseInputModule.getFormsTree()); + InputModule.sendDebugMsg("Reset Forms RadixTree"); + return 1; + } + + private static int activateForm(String name, ServerPlayer player) { + Form form = Registries.FORMS.get().getValue(new ResourceLocation(MOD_ID, name)); + FormActivatedPacket.handleServerSide(form, InputModule.activeElement, 0, player); + return 1; + } + + private static int activateElement(CommandContext ctx, Element.Art art, ServerPlayer player) throws CommandSyntaxException { +// InputModule.setDiscipline(Elements.fromArt(art)) + if (player == null) + player = ctx.getSource().getPlayerOrException(); + ElementActivatedPacket packet = new ElementActivatedPacket(Elements.fromArt(art), player.getId()); + ServerPlayer finalPlayer = player; + MagusNetwork.CHANNEL.send(PacketDistributor.PLAYER.with(() -> finalPlayer), packet); + player.sendSystemMessage(Component.literal("Bending set to " + art)); + return 1; + } +} \ No newline at end of file diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/test/avatar/AvatarFormRegistry.java b/src/main/java/com/amuzil/omegasource/magus/skill/test/avatar/AvatarFormRegistry.java new file mode 100644 index 00000000..1041f382 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/test/avatar/AvatarFormRegistry.java @@ -0,0 +1,108 @@ +package com.amuzil.omegasource.magus.skill.test.avatar; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.input.KeyboardMouseInputModule; +import com.amuzil.omegasource.magus.radix.RadixTree; +import com.amuzil.omegasource.magus.radix.builders.InputPathBuilder; +import com.amuzil.omegasource.magus.skill.conditionals.InputData; +import com.amuzil.omegasource.magus.skill.conditionals.InputDataBuilder; +import com.amuzil.omegasource.magus.skill.conditionals.key.KeyDataBuilder; +import com.amuzil.omegasource.magus.skill.conditionals.key.KeyInput; +import com.amuzil.omegasource.magus.skill.conditionals.mouse.MouseDataBuilder; +import com.amuzil.omegasource.magus.skill.conditionals.mouse.MouseWheelInput; +import com.amuzil.omegasource.magus.skill.forms.FormDataRegistry; +import com.amuzil.omegasource.magus.skill.forms.Forms; +import com.lowdragmc.photon.client.fx.FX; +import com.lowdragmc.photon.client.fx.FXHelper; +import net.minecraft.client.Minecraft; +import net.minecraft.resources.ResourceLocation; + +import java.util.LinkedList; +import java.util.Map; + + +public class AvatarFormRegistry { + public static FX fire_bloom = FXHelper.getFX(new ResourceLocation(Magus.MOD_ID, "fire_bloom")); + public static FX fire_bloom_perma = FXHelper.getFX(new ResourceLocation(Magus.MOD_ID, "fire_bloom_perma")); + public static FX blue_fire = FXHelper.getFX(new ResourceLocation(Magus.MOD_ID, "blue_fire")); + public static FX blue_fire_perma = FXHelper.getFX(new ResourceLocation(Magus.MOD_ID, "blue_fire_perma")); + public static FX orb_bloom = FXHelper.getFX(new ResourceLocation(Magus.MOD_ID, "orb_bloom")); + public static FX water = FXHelper.getFX(new ResourceLocation(Magus.MOD_ID, "water")); + public static FX steam = FXHelper.getFX(new ResourceLocation(Magus.MOD_ID, "steam")); + + public static void registerForms() { + KeyInput left = KeyDataBuilder.createInput(Minecraft.getInstance().options.keyAttack.getKey(), 0); + KeyInput right = KeyDataBuilder.createInput(Minecraft.getInstance().options.keyUse.getKey(), 0); + KeyInput initializer = KeyDataBuilder.createInput("key.keyboard.left.alt", 0); + KeyInput sneak = KeyDataBuilder.createInput(Minecraft.getInstance().options.keyShift.getKey(), 10); + MouseWheelInput forwards = MouseDataBuilder.createWheelInput(MouseDataBuilder.Direction.FORWARDS, 2); + MouseWheelInput back = MouseDataBuilder.createWheelInput(MouseDataBuilder.Direction.BACK, 2); + + + // TODO: Rather than having "push", "pull", "raise", and "lower" as Forms, + // make them Effects using the Force Form, Direction modifier & Target Modifier + + /* Mouse Button Forms */ + FormDataRegistry.registerForm(InputDataBuilder.toInputs(left), Forms.STRIKE, RadixTree.InputType.KEYBOARD_MOUSE); + FormDataRegistry.registerForm(InputDataBuilder.toInputs(right), Forms.FORCE, RadixTree.InputType.KEYBOARD_MOUSE); + FormDataRegistry.registerForm(InputDataBuilder.toInputs(KeyDataBuilder.createMultiInput(left, right)), Forms.BURST, RadixTree.InputType.KEYBOARD_MOUSE); + FormDataRegistry.registerForm(InputDataBuilder.toInputs(forwards), Forms.EXPAND, RadixTree.InputType.KEYBOARD_MOUSE); + FormDataRegistry.registerForm(InputDataBuilder.toInputs(back), Forms.COMPRESS, RadixTree.InputType.KEYBOARD_MOUSE); + + /* Mouse Motion Forms */ + // TODO: Figure out a way to pass a condition that specifies when to track data for this Form and other mouse motion Forms. + + // Forms.SLASH; Sharp mouse motion in a direction. Used for things like air slash. + // Forms.TWIST; Circular mouse motion in front of the player. + // Forms.RAISE; Slower mouse motion up. Good for bending material manipulation, especially for Earth. + // Forms.LOWER; Slower mouse motion down. + + /* Keyboard Forms */ + FormDataRegistry.registerForm(InputDataBuilder.toInputs(initializer), Forms.ARC, RadixTree.InputType.KEYBOARD_MOUSE); + FormDataRegistry.registerForm(InputDataBuilder.toInputs(sneak), Forms.BREATHE, RadixTree.InputType.KEYBOARD_MOUSE); + // Forms.SPIN; Clockwise or anticlockwise cardinal directions. (WDSA or WASD). + +// FormDataRegistry.registerForm(Forms.PUSH); +// FormDataRegistry.registerForm(Forms.PULL); +// FormDataRegistry.registerForm(Forms.RAISE); +// FormDataRegistry.registerForm(Forms.LOWER); +// FormDataRegistry.registerForm(Forms.ROTATE); + // TODO: Add mouse wheel input (once the input module supports it). Mouse wheel 1; forwards/away from the player. + // Add mouse wheel input (once the input module supports it). Mouse wheel -1; towards the player/backwards. + + + // Motion! 7 different movement options. + // Left, right, up, down, jump, sneak, sprint. + LinkedList inputs = new LinkedList<>(); + for (Map.Entry key : KeyboardMouseInputModule.getMovementKeys().entrySet()) { + inputs.clear(); + + KeyInput first, second; + + // key.right is 68 + first = KeyDataBuilder.createInput(key.getValue(), true, 0); + // Has to be a relatively quick input. + second = KeyDataBuilder.createInput(key.getValue(), 0, 15); + inputs.add(first); + inputs.add(second); + FormDataRegistry.registerForm(inputs, Forms.STEP, RadixTree.InputType.KEYBOARD_MOUSE); + } + + /* Combination Forms */ + // Forms.COMPRESS; Shift and mouse wheel maybe? + // Forms.EXPAND; Shift and mouse wheel in other direction. + // FormDataRegistry.registerForm(InputDataBuilder.toInputs(sneak, forwards), Forms.COMPRESS); +// FormDataRegistry.registerForm(InputDataBuilder.toInputs(sneak, back), Forms.EXPAND); + } + + public static void reloadFX() { + fire_bloom = FXHelper.getFX(new ResourceLocation(Magus.MOD_ID, "fire_bloom")); + fire_bloom_perma = FXHelper.getFX(new ResourceLocation(Magus.MOD_ID, "fire_bloom_perma")); + blue_fire = FXHelper.getFX(new ResourceLocation(Magus.MOD_ID, "blue_fire")); + blue_fire_perma = FXHelper.getFX(new ResourceLocation(Magus.MOD_ID, "blue_fire_perma")); + orb_bloom = FXHelper.getFX(new ResourceLocation(Magus.MOD_ID, "orb_bloom")); + water = FXHelper.getFX(new ResourceLocation(Magus.MOD_ID, "water")); + steam = FXHelper.getFX(new ResourceLocation(Magus.MOD_ID, "steam")); + } + +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/test/avatar/AvatarTreeTest.java b/src/main/java/com/amuzil/omegasource/magus/skill/test/avatar/AvatarTreeTest.java new file mode 100644 index 00000000..62fd60be --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/test/avatar/AvatarTreeTest.java @@ -0,0 +1,15 @@ +package com.amuzil.omegasource.magus.skill.test.avatar; + +/** + * Tests out techniques using the radix tree. + */ +public class AvatarTreeTest { + + public static void registerTechniques() { + + //Air Gust: Arc > Strike + // So it's tree would have 2 nodes: One for Arc, One for Strike *For the Effects*. + // So a tree reliant on Effects would be reliant on EventConditionals, stemming from + // listening to the 'onSuccess' event for OnSkillUse. + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/bending/BendingMaterialUtil.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/bending/BendingMaterialUtil.java new file mode 100644 index 00000000..822e3e50 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/bending/BendingMaterialUtil.java @@ -0,0 +1,41 @@ +package com.amuzil.omegasource.magus.skill.util.bending; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.skill.elements.Element; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.block.Block; + +import java.util.ArrayList; +import java.util.List; + +public class BendingMaterialUtil { + public static final TagKey AIRBENDING_MATERIAL = BlockTags.create(new ResourceLocation(Magus.MOD_ID, "airbending_material.json")); + public static final TagKey WATERBENDING_MATERIAL = BlockTags.create(new ResourceLocation(Magus.MOD_ID, "waterbending_material")); + public static final TagKey EARTHBENDING_MATERIAL = BlockTags.create(new ResourceLocation(Magus.MOD_ID, "earthbending_material")); + public static final TagKey FIREBENDING_MATERIAL = BlockTags.create(new ResourceLocation(Magus.MOD_ID, "firebending_material")); + + public static List> getBendableMaterialsForElement(Element element) { + List> toReturn = new ArrayList<>(); + + switch (element.name()) { + case "air": + //add nothing + toReturn.add(AIRBENDING_MATERIAL); + break; + case "water": + toReturn.add(WATERBENDING_MATERIAL); + break; + case "earth": + toReturn.add(EARTHBENDING_MATERIAL); + break; + case "fire": + toReturn.add(FIREBENDING_MATERIAL); + //add fire block? + break; + default: return toReturn; + } + return toReturn; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/capability/CapabilityHandler.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/capability/CapabilityHandler.java new file mode 100644 index 00000000..ed2b4f3f --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/capability/CapabilityHandler.java @@ -0,0 +1,46 @@ +package com.amuzil.omegasource.magus.skill.util.capability; + +import com.amuzil.omegasource.magus.skill.util.capability.entity.Data; +import com.amuzil.omegasource.magus.skill.util.capability.entity.LivingDataCapability; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.CapabilityManager; +import net.minecraftforge.common.capabilities.CapabilityToken; +import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent; +import net.minecraftforge.event.AttachCapabilitiesEvent; + +import javax.annotation.Nullable; + +public class CapabilityHandler { + public static final Capability LIVING_DATA = CapabilityManager.get(new CapabilityToken<>(){}); + + public static void registerCapabilities(RegisterCapabilitiesEvent event) { + event.register(Data.class); + } + + public static void attachEntityCapability(AttachCapabilitiesEvent e) { + if (e.getObject() instanceof LivingEntity) { + //capabilities all living entities get. + //TODO: Add requirement to check against a list of compatible entities. + //E.g custom npcs, or specific mobs you want to be able to use Skills. + e.addCapability(LivingDataCapability.IDENTIFIER, new LivingDataCapability.LivingDataProvider()); + if (e.getObject() instanceof Player) { + //capabilities just players get. + } + } + } + + @Nullable + public static T getCapability(Entity entity, Capability capability) { + if (entity == null) return null; + if (!entity.isAlive()) return null; + return entity.getCapability(capability).isPresent() ? entity.getCapability(capability).orElseThrow(() -> new IllegalArgumentException("Lazy optional must not be empty")) : null; + } + + public static void initialiseCaps() { + //Prevents class loading exceptions + LivingDataCapability.LivingDataProvider.init(); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/capability/entity/Data.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/capability/entity/Data.java new file mode 100644 index 00000000..f7057e37 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/capability/entity/Data.java @@ -0,0 +1,21 @@ +package com.amuzil.omegasource.magus.skill.util.capability.entity; + +import net.minecraft.nbt.CompoundTag; +import net.minecraftforge.common.util.INBTSerializable; + +/** + * Very different from IDataTrait. This class lets you access data and do things with it, + * whereas IDataTrait merely stores it. + */ +//@AutoRegisterCapability +public interface Data extends INBTSerializable { + + /* These are used to make everything stored in the class serialised/unserialised. + Not for generic purposes like DataTrait. + */ + void markDirty(); + + void markClean(); + + boolean isDirty(); +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/capability/entity/LivingDataCapability.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/capability/entity/LivingDataCapability.java new file mode 100644 index 00000000..deae2388 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/capability/entity/LivingDataCapability.java @@ -0,0 +1,187 @@ +package com.amuzil.omegasource.magus.skill.util.capability.entity; + +import com.amuzil.omegasource.magus.Magus; +import com.amuzil.omegasource.magus.registry.Registries; +import com.amuzil.omegasource.magus.skill.skill.Skill; +import com.amuzil.omegasource.magus.skill.skill.SkillCategory; +import com.amuzil.omegasource.magus.skill.util.capability.CapabilityHandler; +import com.amuzil.omegasource.magus.skill.util.data.SkillData; +import com.amuzil.omegasource.magus.skill.util.traits.DataTrait; +import net.minecraft.core.Direction; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.LivingEntity; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.ICapabilityProvider; +import net.minecraftforge.common.capabilities.ICapabilitySerializable; +import net.minecraftforge.common.util.LazyOptional; +import org.jetbrains.annotations.Nullable; + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + +public class LivingDataCapability { + public static ResourceLocation IDENTIFIER = new ResourceLocation(Magus.MOD_ID, "living_data"); + + /** + * TODO: Figure out how to save this data when MC wants to save but nothing has changed/. + */ + public static class LivingDataCapabilityImp implements Data { + + //Data Traits to add: + // private List skills; +// private SkillData data; +// private List categories; +// private SkillCategory activeCategory; +// //Need to add energy mechanic; stored here +// //Need to add config and *global* skill modifiers. +// //Need to add something for inputs +// private Set activeListeners; +// //Miscellaneous data to save + + //The amount of data traits the player has should not change after initialisation. + private final List traits = new ArrayList<>(); + private final List categories = new ArrayList<>(); + private final List skills = new ArrayList<>(); + private boolean isDirty; + // Instance of skill/magus supported entity, essentially. + private Magi magi = null; + + public LivingDataCapabilityImp() { + fillTraits(); + //TODO: Data generation methods for each skill + fillCategories(); + fillSkills(); + markDirty(); + } + + public Magi getMagi(LivingEntity entity) { + if (magi == null) { + fillTraits(); + magi = new Magi(this, entity); + } + return this.magi; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag tag; + if (magi != null && magi.isDirty()) { + tag = magi.serialiseNBT(); + } else tag = new CompoundTag(); + traits.forEach(trait -> { + if (trait.isDirty() || isDirty()) { + tag.put(trait.getName(), trait.serializeNBT()); + } + }); + + return tag; + } + + @Override + public void deserializeNBT(CompoundTag nbt) { + markClean(); + traits.forEach(trait -> trait.deserializeNBT((CompoundTag) nbt.get(trait.getName()))); + if (magi != null) + magi.deserialiseNBT(nbt); + } + + public void fillTraits() { + traits.addAll(Registries.DATA_TRAITS.get().getValues()); + } + + public List getTraits() { + return this.traits; + } + + //When players move to versions with new techniques and such, we'll have to use these to accomodate. + public void addTraits(List dataTraits) { + traits.addAll(dataTraits); + } + + public void addTrait(DataTrait trait) { + traits.add(trait); + } + + //Ideally, these delete methods are *never* used, because each piece of content + //added to the mod should be final. + public void removeTrait(DataTrait trait) { + traits.remove(trait); + } + + public void removeTraits(List dataTraits) { + traits.removeAll(dataTraits); + } + + @Nullable + public DataTrait getTrait(String name) { + for (DataTrait trait : getTraits()) + if (trait.getName().equals(name)) + return trait; + + return null; + + } + + public void fillCategories() { + categories.addAll(Registries.SKILL_CATEGORIES.get().getValues()); + } + + public List getAllSkillCategories() { + return this.categories; + } + + public void fillSkills() { + skills.addAll(Registries.SKILLS.get().getValues()); + } + + public List getAllSkills() { + return this.skills; + } + + public SkillData getSkillData() { + return null; + } + + @Override + public void markDirty() { + this.isDirty = true; + } + + @Override + public void markClean() { + this.isDirty = false; + } + + @Override + public boolean isDirty() { + //TODO: Add a check for all kinds of data, not just DataTraits + return this.isDirty; + } + } + + public static class LivingDataProvider implements ICapabilityProvider, ICapabilitySerializable { + + private final LazyOptional instance = LazyOptional.of(LivingDataCapabilityImp::new); + + public static void init() { + } + + @Override + public CompoundTag serializeNBT() { + return instance.orElseThrow(NullPointerException::new).serializeNBT(); + } + + @Override + public void deserializeNBT(CompoundTag nbt) { + instance.orElseThrow(NullPointerException::new).deserializeNBT(nbt); + } + + @Nonnull + @Override + public LazyOptional getCapability(@Nonnull Capability cap, Direction side) { + return CapabilityHandler.LIVING_DATA.orEmpty(cap, instance.cast()); + } + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/capability/entity/Magi.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/capability/entity/Magi.java new file mode 100644 index 00000000..1090baa0 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/capability/entity/Magi.java @@ -0,0 +1,134 @@ +package com.amuzil.omegasource.magus.skill.util.capability.entity; + +import com.amuzil.omegasource.magus.registry.Registries; +import com.amuzil.omegasource.magus.skill.skill.Skill; +import com.amuzil.omegasource.magus.skill.util.capability.CapabilityHandler; +import com.amuzil.omegasource.magus.skill.util.data.SkillCategoryData; +import com.amuzil.omegasource.magus.skill.util.data.SkillData; +import com.amuzil.omegasource.magus.skill.util.traits.DataTrait; +import com.amuzil.omegasource.magus.skill.util.traits.SkillTrait; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraftforge.common.util.INBTSerializable; +import org.checkerframework.checker.units.qual.C; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +public class Magi { + private final Data capabilityData; + private final LivingEntity magi; + + // These are magi specific traits. + private List skillData; + private List skillCategoryData; + + // Change this to use an int - 0 for should start, 1 for should run, 2 for should stop, + // -1 for default/idle. If I need multiple states, then use bits; 000 for idle, and then + // 1xx is should start, x1x is should run, xx1 is should stop + private HashMap skillStatuses = new HashMap<>(); + + public Magi(Data capabilityData, LivingEntity entity) { + this.capabilityData = capabilityData; + this.magi = entity; + + // Initialise skilldata. + this.skillData = new ArrayList<>(); + for (Skill skill : Registries.skills) + skillData.add(new SkillData(skill)); + + // Testing... + skillData.forEach(skillData1 -> skillData1.setCanUse(true)); + } + + @Nullable + public static Magi get(LivingEntity entity) { + LivingDataCapability.LivingDataCapabilityImp cap = ((LivingDataCapability.LivingDataCapabilityImp) (CapabilityHandler.getCapability(entity, CapabilityHandler.LIVING_DATA))); + if (cap == null) { + // Capability isn't ready yet. + return null; + } + return cap.getMagi(entity); + } + + public static boolean isEntitySupported(Entity entity) { + return entity instanceof LivingEntity; + } + + public LivingDataCapability.LivingDataCapabilityImp getMagusData() { + return (LivingDataCapability.LivingDataCapabilityImp) capabilityData; + } + + // Need to sync this with given skills, traits, e.t.c + public boolean isDirty() { + return false; + } + public List getTraits() { + return getMagusData().getTraits(); + } + + public List getSkillTraits(Skill skill) { + // Get skill data based on the skill, + // then get the list of its traits. + // Empty for now... + return getSkillData(skill).getSkillTraits(); + } + + // Returns appropriate SkillData from a list of SkillData + public SkillData getSkillData(Skill skill) { + return getSkillData(skill.getId()); + } + + public SkillData getSkillData(ResourceLocation id) { + return skillData.stream().filter(skillData1 -> skillData1.getSkillId().equals(id)).toList().get(0); + } + + public SkillData getSkillData(String id) { + ResourceLocation loc = new ResourceLocation(id); + return getSkillData(loc); + } + + // Called per tick + public void onUpdate() { + if (getMagi() instanceof Player) { + List skills = Registries.getSkills(); + for (Skill skill : skills) { +// RadixUtil.getLogger().debug(skill); + if (getSkillData(skill).canUse()) { +// skill.tick(getMagi(), getTree()); + } + } + } + } + + public void onDeath() { + + } + + public LivingEntity getMagi() { + return this.magi; + } + + // We don't serialise `traits`, because those are serialised in the cap itself. + // Wrapper allows us to access. + public CompoundTag serialiseNBT() { + CompoundTag tag = new CompoundTag(); + if (isDirty()) { + // TODO: Figure out if I need to use the returned tags from each of these values.... + skillCategoryData.forEach(catData -> tag.put(catData.getName(), catData.serializeNBT())); + skillData.forEach(sData -> tag.put(sData.getName(), sData.serializeNBT())); + } + return tag; + } + + public void deserialiseNBT(CompoundTag tag) { + skillCategoryData.forEach(catData -> catData.deserializeNBT(tag.getCompound(catData.getName()))); + skillData.forEach(sData -> sData.deserializeNBT(tag.getCompound(sData.getName()))); + } + +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/capability/entity/avatar/Bender.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/capability/entity/avatar/Bender.java new file mode 100644 index 00000000..f8e129d7 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/capability/entity/avatar/Bender.java @@ -0,0 +1,14 @@ +package com.amuzil.omegasource.magus.skill.util.capability.entity.avatar; + +import com.amuzil.omegasource.magus.skill.util.capability.entity.Data; +import com.amuzil.omegasource.magus.skill.util.capability.entity.Magi; +import net.minecraft.world.entity.LivingEntity; + +public class Bender extends Magi { + + public Bender(Data capabilityData, LivingEntity entity) { + super(capabilityData, entity); + } + + +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/data/KeyboardData.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/data/KeyboardData.java new file mode 100644 index 00000000..e3952832 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/data/KeyboardData.java @@ -0,0 +1,30 @@ +package com.amuzil.omegasource.magus.skill.util.data; + +import org.lwjgl.glfw.GLFW; + +import java.util.ArrayList; +import java.util.List; + +import static com.mojang.blaze3d.platform.InputConstants.*; + +public class KeyboardData { + //Converts InputConstants key data into GLFW + + //TODO: Configurable list of invalid keys. + + //This is adjustable; we want to be cancelling GUI keys, not these keys. + public static boolean ignore(int keyCode) { + List invalidKeys = new ArrayList<>(); + invalidKeys.add(KEY_A); + invalidKeys.add(KEY_S); + invalidKeys.add(KEY_W); + invalidKeys.add(KEY_D); + invalidKeys.add(KEY_SPACE); + invalidKeys.add(GLFW.GLFW_KEY_LEFT_ALT); + invalidKeys.add(GLFW.GLFW_KEY_RIGHT_ALT); + invalidKeys.add(GLFW.GLFW_KEY_LEFT_CONTROL); + + return invalidKeys.contains(keyCode); + } + +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/data/PlayerData.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/data/PlayerData.java new file mode 100644 index 00000000..897228c9 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/data/PlayerData.java @@ -0,0 +1,4 @@ +package com.amuzil.omegasource.magus.skill.util.data; + +public class PlayerData { +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/data/SkillCategoryData.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/data/SkillCategoryData.java new file mode 100644 index 00000000..f637c041 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/data/SkillCategoryData.java @@ -0,0 +1,37 @@ +package com.amuzil.omegasource.magus.skill.util.data; + +import com.amuzil.omegasource.magus.skill.util.traits.DataTrait; +import net.minecraft.nbt.CompoundTag; + +public class SkillCategoryData implements DataTrait { + + @Override + public String getName() { + return null; + } + + @Override + public void markDirty() { + + } + + @Override + public void markClean() { + + } + + @Override + public boolean isDirty() { + return false; + } + + @Override + public CompoundTag serializeNBT() { + return null; + } + + @Override + public void deserializeNBT(CompoundTag nbt) { + + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/data/SkillData.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/data/SkillData.java new file mode 100644 index 00000000..6152173a --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/data/SkillData.java @@ -0,0 +1,152 @@ +package com.amuzil.omegasource.magus.skill.util.data; + +import com.amuzil.omegasource.magus.radix.RadixTree; +import com.amuzil.omegasource.magus.radix.RadixUtil; +import com.amuzil.omegasource.magus.registry.Registries; +import com.amuzil.omegasource.magus.skill.skill.Skill; +import com.amuzil.omegasource.magus.skill.util.traits.DataTrait; +import com.amuzil.omegasource.magus.skill.util.traits.SkillTrait; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.resources.ResourceLocation; +import org.jetbrains.annotations.Nullable; + +import java.util.LinkedList; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +//TODO: Make this an implementation rather than a class. +//E.g SizeTrait vs ElementTrait or something are both SkillTraits but.... +public class SkillData implements DataTrait { + + List skillTraits; + // Types should not need serialisation as they do not change + //The reason we're using a resource location and not the actual Skill object is because + //it's much easier to serialise a String and then get a skill from it. + ResourceLocation skillId; + private boolean canUse; + private boolean isDirty = false; + private Skill.SkillState state; + + public SkillData(ResourceLocation skillId) { + this.skillId = skillId; + this.skillTraits = new LinkedList<>(); + this.canUse = false; + + this.state = Skill.SkillState.START; + if (getSkill() != null) + skillTraits = getSkill().getTraits(); + } + + public SkillData(Skill skill) { + this(skill.getId()); + } + + public void setCanUse(boolean canUse) { + this.canUse = canUse; + markDirty(); + } + + public Skill.SkillState getState() { + return this.state; + } + + public void setState(Skill.SkillState state) { + this.state = state; + markDirty(); + } + + public boolean canUse() { + return this.canUse; + } + + public List getActivationTypes() { + return this.getSkill().getActivationTypes(); + } + + + public List getSkillTypes() { + return this.getSkill().getTypes(); + } + + @Override + public String getName() { + return getSkillId() + "_skillData"; + } + + @Override + public void markDirty() { + this.isDirty = true; + } + + @Override + public void markClean() { + this.isDirty = false; + } + + @Override + public boolean isDirty() { + for (SkillTrait trait : skillTraits) + if (trait.isDirty()) { + markDirty(); + return true; + } + + return this.isDirty; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag tag = new CompoundTag(); + tag.putString("Skill ID", skillId.toString()); + skillTraits.forEach(skillTrait -> { + if (skillTrait.isDirty()) tag.put(skillTrait.getName() + "Trait", skillTrait.serializeNBT()); + }); + return tag; + } + + @Override + public void deserializeNBT(CompoundTag nbt) { + markClean(); + try { + skillId = ResourceLocation.tryParse(nbt.getString("Skill ID")); + skillTraits.forEach(skillTrait -> skillTrait.deserializeNBT((CompoundTag) Objects.requireNonNull(nbt.get(skillTrait.getName() + "Trait")))); + } catch (NullPointerException e) { + RadixUtil.getLogger().error("Something has gone seriously wrong:" + "A skill trait hasn't been carried over from the registry."); + e.printStackTrace(); + } + } + + + public List getSkillTraits() { + if (skillTraits == null || skillTraits.isEmpty()) + skillTraits = getSkill().getTraits(); + return skillTraits; + } + + public ResourceLocation getSkillId() { + return skillId; + } + + public Skill getSkill() { + return Registries.SKILLS.get().getValue(getSkillId()); + } + + public List getFilteredTraits(Predicate filter) { + return getSkillTraits().stream().filter(filter).collect(Collectors.toList()); + } + + @Nullable + public SkillTrait getTrait(String name) { + for (SkillTrait trait : getSkillTraits()) + if (trait.getName().equals(name)) return trait; + + return null; + } + + public void reset() { + for (SkillTrait trait : getSkillTraits()) + trait.reset(); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/DataTrait.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/DataTrait.java new file mode 100644 index 00000000..e43f6205 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/DataTrait.java @@ -0,0 +1,19 @@ +package com.amuzil.omegasource.magus.skill.util.traits; + +import net.minecraft.nbt.CompoundTag; +import net.minecraftforge.common.util.INBTSerializable; + +public interface DataTrait extends INBTSerializable { + + String getName(); + + /* Remember to call these in *every* setter you have for each trait! */ + /* Methods for whether to save the data. */ + void markDirty(); + + /* Do not use this ever. This is only used by LivingData upon unserialisation. */ + void markClean(); + + boolean isDirty(); + +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/DataTraits.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/DataTraits.java new file mode 100644 index 00000000..e659d314 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/DataTraits.java @@ -0,0 +1,7 @@ +package com.amuzil.omegasource.magus.skill.util.traits; + +public class DataTraits { + + public static void register() { + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/InputTrait.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/InputTrait.java new file mode 100644 index 00000000..19d1b3fa --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/InputTrait.java @@ -0,0 +1,4 @@ +package com.amuzil.omegasource.magus.skill.util.traits; + +public interface InputTrait extends DataTrait { +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/SkillCategoryTrait.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/SkillCategoryTrait.java new file mode 100644 index 00000000..7c87cf0b --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/SkillCategoryTrait.java @@ -0,0 +1,4 @@ +package com.amuzil.omegasource.magus.skill.util.traits; + +public class SkillCategoryTrait { +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/SkillTrait.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/SkillTrait.java new file mode 100644 index 00000000..a4c92032 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/SkillTrait.java @@ -0,0 +1,54 @@ +package com.amuzil.omegasource.magus.skill.util.traits; + +import net.minecraft.nbt.CompoundTag; + +public class SkillTrait implements DataTrait { + private String name; + private boolean isDirty = false; + + public SkillTrait(String name) { + this.name = name; + markDirty(); + } + + @Override + public String getName() { + return name; + } + + @Override + public void markDirty() { + this.isDirty = true; + } + + @Override + public void markClean() { + this.isDirty = false; + } + + @Override + public boolean isDirty() { + return this.isDirty; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag tag = new CompoundTag(); + tag.putString("name", name); + return tag; + } + + @Override + public void deserializeNBT(CompoundTag nbt) { + markClean(); + name = nbt.getString("name"); + } + + /** + * Resets stored values. Good for resetting things that are ticked during a Skill's use, + * such as a combo count or timed duration. + */ + public void reset() { + markDirty(); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/entitytraits/EnergyTrait.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/entitytraits/EnergyTrait.java new file mode 100644 index 00000000..21261be1 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/entitytraits/EnergyTrait.java @@ -0,0 +1,87 @@ +package com.amuzil.omegasource.magus.skill.util.traits.entitytraits; + +import com.amuzil.omegasource.magus.skill.util.traits.DataTrait; +import net.minecraft.nbt.CompoundTag; + +/** + * This serves as a generic wrapper for any kind of meter/energy bar for the player. + * Chi, mana, qi, nen, stamina, whatever. Other such classes should extend this, because this is the class that will be + * ticked and adjusted in Magi.java + * + * Example of a custom implementation: Chi.java for the Avatar Mod rework. + * Instead of just the values contained in this class, it will also track your "available" amount of energy, and adjust + * based on that. + * + * Of course, if you need more specific custom behaviour in terms of when to regenerate, how to regenerate energy, e.t.c, + * then make a child class extending Magi and add your logic there. + */ +public class EnergyTrait implements DataTrait { + private String name; + private double maxEnergy; + private double currentEnergy; + private boolean isDirty = false; + + public EnergyTrait(String name, double maxEnergy) { + this.name = name; + this.maxEnergy = maxEnergy; + this.currentEnergy = maxEnergy; + } + + public void setCurrentEnergy(double currentEnergy) { + this.currentEnergy = currentEnergy; + markDirty(); + } + + public void changeEnergy(double changeAmount) { + setCurrentEnergy(currentEnergy + changeAmount); + } + + public void setMaxEnergy(double maxEnergy) { + this.maxEnergy = maxEnergy; + markDirty(); + } + + public double getMaxEnergy() { + return this.maxEnergy; + } + + public double getCurrentEnergy() { + return this.currentEnergy; + } + + @Override + public String getName() { + return name; + } + + @Override + public void markDirty() { + this.isDirty = true; + } + + @Override + public void markClean() { + this.isDirty = false; + } + + @Override + public boolean isDirty() { + return this.isDirty; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag tag = new CompoundTag(); + tag.putString("name", getName()); + tag.putDouble("max_energy", maxEnergy); + tag.putDouble("current_energy", currentEnergy); + return tag; + } + + @Override + public void deserializeNBT(CompoundTag nbt) { + this.name = nbt.getString("name"); + this.maxEnergy = nbt.getDouble("max_energy"); + this.currentEnergy = nbt.getDouble("current_energy"); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/AngleWidthTrait.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/AngleWidthTrait.java new file mode 100644 index 00000000..8df9fb32 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/AngleWidthTrait.java @@ -0,0 +1,46 @@ +package com.amuzil.omegasource.magus.skill.util.traits.skilltraits; + +import com.amuzil.omegasource.magus.skill.util.traits.SkillTrait; +import net.minecraft.nbt.CompoundTag; + +/** + * In degrees. + */ +public class AngleWidthTrait extends SkillTrait { + + //Between 0 and 360. Double for *very* specific angles. + private double degrees; + + public AngleWidthTrait(double degrees, String name) { + super(name); + this.degrees = degrees; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag tag = super.serializeNBT(); + tag.putDouble(getName(), degrees); + return tag; + } + + @Override + public void deserializeNBT(CompoundTag nbt) { + super.deserializeNBT(nbt); + degrees = nbt.getDouble(getName()); + } + + public void setDegrees(double degrees) { + this.degrees = degrees; + markDirty(); + } + + public double getDegrees() { + return degrees; + } + + @Override + public void reset() { + super.reset(); + setDegrees(0); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/BooleanTrait.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/BooleanTrait.java new file mode 100644 index 00000000..7f01d82f --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/BooleanTrait.java @@ -0,0 +1,50 @@ +package com.amuzil.omegasource.magus.skill.util.traits.skilltraits; + +import com.amuzil.omegasource.magus.skill.util.traits.SkillTrait; +import net.minecraft.nbt.CompoundTag; + +/** Unlike the classes in the skilltraits package, these + * traits exist outside the skill instance. For example + * StanceTrait s are toggleable booleans that say whether a player has a certain stance enabled. + */ +public class BooleanTrait extends SkillTrait { + + private boolean enabled; + + public BooleanTrait(String name, boolean enabled) { + super(name); + this.enabled = enabled; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag tag = super.serializeNBT(); + tag.putBoolean(getName(), enabled); + return tag; + } + + @Override + public void deserializeNBT(CompoundTag nbt) { + super.deserializeNBT(nbt); + enabled = nbt.getBoolean(getName()); + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + markDirty(); + } + + public boolean isEnabled() { + return this.enabled; + } + + public void toggleEnabled() { + setEnabled(!isEnabled()); + } + + @Override + public void reset() { + super.reset(); + setEnabled(false); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/ColourTrait.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/ColourTrait.java new file mode 100644 index 00000000..8cd803af --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/ColourTrait.java @@ -0,0 +1,81 @@ +package com.amuzil.omegasource.magus.skill.util.traits.skilltraits; + +import com.amuzil.omegasource.magus.skill.util.traits.SkillTrait; +import net.minecraft.nbt.CompoundTag; + +/** + * Supports an R, G, and B value. Designed for 0 - 1D, but you can pass an int. + */ +public class ColourTrait extends SkillTrait { + + private double r, g, b; + + public ColourTrait(double r, double g, double b, String name) { + super(name); + this.r = r; + this.g = g; + this.b = b; + } + + public ColourTrait(int r, int g, int b, String name) { + super(name); + this.r = r / 255D; + this.g = g / 255D; + this.b = b / 255D; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag tag = super.serializeNBT(); + tag.putDouble(getName() + "Red", r); + tag.putDouble(getName() + "Green", g); + tag.putDouble(getName() + "Blue", b); + return tag; + } + + @Override + public void deserializeNBT(CompoundTag nbt) { + super.deserializeNBT(nbt); + r = nbt.getDouble(getName() + "Red"); + g = nbt.getDouble(getName() + "Green"); + b = nbt.getDouble(getName() + "Blue"); + } + + public void setR(double r) { + this.r = r; + markDirty(); + } + + public void setG(double g) { + this.g = g; + markDirty(); + } + + public void setB(double b) { + this.b = b; + markDirty(); + } + + public void setRGB(double r, double g, double b) { + setR(r); + setG(g); + setB(b); + } + + public double getR() { + return r; + } + + public double getG() { + return g; + } + + public double getB() { return b;} + + @Override + public void reset() { + super.reset(); + //Default colour is white. + setRGB(1D, 1D, 1D); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/DamageTrait.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/DamageTrait.java new file mode 100644 index 00000000..d1ac5200 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/DamageTrait.java @@ -0,0 +1,47 @@ +package com.amuzil.omegasource.magus.skill.util.traits.skilltraits; + +import com.amuzil.omegasource.magus.skill.util.traits.SkillTrait; +import net.minecraft.nbt.CompoundTag; + +/** + * Basic DamageTrait class for skills. Lets the user determine + * what kind of damage it's for. E.g a Lightning Arc technique might take + * multiple damage traits for the shockwave, chain hits, e.t.c. + */ +public class DamageTrait extends SkillTrait { + + private double damage; + + public DamageTrait(double damage, String name) { + super(name); + this.damage = damage; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag tag = super.serializeNBT(); + tag.putDouble(getName(), damage); + return tag; + } + + @Override + public void deserializeNBT(CompoundTag nbt) { + super.deserializeNBT(nbt); + damage = nbt.getDouble(getName()); + } + + public void setDamage(double damage) { + this.damage = damage; + markDirty(); + } + + public double getDamage() { + return this.damage; + } + + @Override + public void reset() { + super.reset(); + setDamage(0); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/KnockbackTrait.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/KnockbackTrait.java new file mode 100644 index 00000000..dd766282 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/KnockbackTrait.java @@ -0,0 +1,42 @@ +package com.amuzil.omegasource.magus.skill.util.traits.skilltraits; + +import com.amuzil.omegasource.magus.skill.util.traits.SkillTrait; +import net.minecraft.nbt.CompoundTag; + +public class KnockbackTrait extends SkillTrait { + + private double knockback; + + public KnockbackTrait(double knockback, String name) { + super(name); + this.knockback = knockback; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag tag = super.serializeNBT(); + tag.putDouble(getName(), knockback); + return tag; + } + + @Override + public void deserializeNBT(CompoundTag nbt) { + super.deserializeNBT(nbt); + knockback = nbt.getDouble(getName()); + } + + public void setKnockback(double knockback) { + this.knockback = knockback; + markDirty(); + } + + public double getKnockback() { + return knockback; + } + + @Override + public void reset() { + super.reset(); + setKnockback(0); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/LevelTrait.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/LevelTrait.java new file mode 100644 index 00000000..50f7ff16 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/LevelTrait.java @@ -0,0 +1,44 @@ +package com.amuzil.omegasource.magus.skill.util.traits.skilltraits; + +import com.amuzil.omegasource.magus.skill.util.traits.SkillTrait; +import net.minecraft.nbt.CompoundTag; + +public class LevelTrait extends SkillTrait { + + private int level; + + public LevelTrait(int level, String name) { + super(name); + this.level = level; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag tag = super.serializeNBT(); + tag.putInt(getName(), level); + return tag; + } + + @Override + public void deserializeNBT(CompoundTag nbt) { + super.deserializeNBT(nbt); + level = nbt.getInt(getName()); + } + + public void setLevel(int level) { + this.level = level; + markDirty(); + } + + public int getLevel() { + return level; + } + + //-1, because 0 is usually going to be unlocked/starting level in most mods. + //-1 is locked. + @Override + public void reset() { + super.reset(); + setLevel(-1); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/PotionLevelTrait.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/PotionLevelTrait.java new file mode 100644 index 00000000..7b97c57a --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/PotionLevelTrait.java @@ -0,0 +1,45 @@ +package com.amuzil.omegasource.magus.skill.util.traits.skilltraits; + +import com.amuzil.omegasource.magus.skill.util.traits.SkillTrait; +import net.minecraft.nbt.CompoundTag; + +public class PotionLevelTrait extends SkillTrait { + + private int level; + + public PotionLevelTrait(int level, String name) { + super(name); + this.level = level; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag tag = super.serializeNBT(); + tag.putInt(getName(), level); + return tag; + } + + @Override + public void deserializeNBT(CompoundTag nbt) { + super.deserializeNBT(nbt); + level = nbt.getInt(getName()); + } + + public void setLevel(int level) { + this.level = level; + markDirty(); + } + + public int getLevel() { + return level; + } + + /** + * 0 means a level 1 potion, so -1 means nothing at all. + */ + @Override + public void reset() { + super.reset(); + setLevel(-1); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/PushTrait.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/PushTrait.java new file mode 100644 index 00000000..e5d15837 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/PushTrait.java @@ -0,0 +1,53 @@ +package com.amuzil.omegasource.magus.skill.util.traits.skilltraits; + +import com.amuzil.omegasource.magus.skill.util.traits.SkillTrait; +import net.minecraft.nbt.CompoundTag; + +public class PushTrait extends SkillTrait { + + private PushType type; + + public PushTrait(PushType type, String name) { + super(name); + this.type = type; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag tag = super.serializeNBT(); + tag.putString(getName(), type.name()); + return super.serializeNBT(); + } + + @Override + public void deserializeNBT(CompoundTag nbt) { + super.deserializeNBT(nbt); + type = PushType.valueOf(nbt.getString(getName())); + } + + public void setType(PushType type) { + this.type = type; + markDirty(); + } + + public PushType getType() { + return type; + } + + @Override + public void reset() { + super.reset(); + setType(PushType.NONE); + } + + /** Shows the different levels of redstone pushing in increasing order of redstone. + * + */ + public enum PushType { + NONE, + REDSTONE, + STONE, + IRON_DOOR, + IRON_TRAPDOOR; + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/RangeTrait.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/RangeTrait.java new file mode 100644 index 00000000..e6836ae9 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/RangeTrait.java @@ -0,0 +1,42 @@ +package com.amuzil.omegasource.magus.skill.util.traits.skilltraits; + +import com.amuzil.omegasource.magus.skill.util.traits.SkillTrait; +import net.minecraft.nbt.CompoundTag; + +public class RangeTrait extends SkillTrait { + + private double range; + + public RangeTrait(double range, String name) { + super(name); + this.range = range; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag tag = super.serializeNBT(); + tag.putDouble(getName(), range); + return tag; + } + + @Override + public void deserializeNBT(CompoundTag nbt) { + super.deserializeNBT(nbt); + range = nbt.getDouble(getName()); + } + + public void setRange(double range) { + this.range = range; + markDirty(); + } + + public double getRange() { + return range; + } + + @Override + public void reset() { + super.reset(); + setRange(0); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/SizeTrait.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/SizeTrait.java new file mode 100644 index 00000000..d6841b38 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/SizeTrait.java @@ -0,0 +1,42 @@ +package com.amuzil.omegasource.magus.skill.util.traits.skilltraits; + +import com.amuzil.omegasource.magus.skill.util.traits.SkillTrait; +import net.minecraft.nbt.CompoundTag; + +public class SizeTrait extends SkillTrait { + + private double size; + + public SizeTrait(float size, String name) { + super(name); + this.size = size; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag tag = super.serializeNBT(); + tag.putDouble("size", size); + return tag; + } + + @Override + public void deserializeNBT(CompoundTag nbt) { + super.deserializeNBT(nbt); + size = nbt.getDouble("size"); + } + + public void setSize(double size) { + this.size = size; + markDirty(); + } + + public double getSize() { + return size; + } + + @Override + public void reset() { + super.reset(); + setSize(0); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/SourceTrait.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/SourceTrait.java new file mode 100644 index 00000000..fb2b8aae --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/SourceTrait.java @@ -0,0 +1,75 @@ +package com.amuzil.omegasource.magus.skill.util.traits.skilltraits; + +import com.amuzil.omegasource.magus.skill.util.traits.SkillTrait; +import net.minecraft.core.BlockPos; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraftforge.common.extensions.IForgeBlockState; + +/** + * Huge trait class, stores the source block of the Skill. + */ +public class SourceTrait extends SkillTrait { + + //TODO: Change this to an IForgeBlockState and make it support modded blocks. Right now it only supports vanilla. + private IForgeBlockState state; + private BlockPos pos; + + //Note: If you want to know how long a usable blockstate has been selected, use another + //TimedTrait. + public SourceTrait(String name, IForgeBlockState state, BlockPos pos) { + super(name); + this.state = state; + this.pos = pos; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag tag = super.serializeNBT(); + tag.putInt(getName() + " State", Block.getId((BlockState) state)); + tag.putIntArray(getName() + " Pos", new int[] { + pos.getX(), pos.getY(), pos.getZ() + }); + return tag; + } + + @Override + public void deserializeNBT(CompoundTag nbt) { + super.deserializeNBT(nbt); + state = Block.stateById(nbt.getInt(getName() + " State")); + int[] blockPos = nbt.getIntArray(getName() + " Pos"); + pos = new BlockPos(blockPos[0], blockPos[1], blockPos[2]); + } + + public void setState(BlockState state) { + this.state = state; + markDirty(); + } + + public void setPos(BlockPos pos) { + this.pos = pos; + markDirty(); + } + + public BlockState getState() { + return (BlockState) state; + } + + public IForgeBlockState getForgeState() { + return this.state; + } + + public BlockPos getPos() { + return pos; + } + + @Override + public void reset() { + super.reset(); + //Default source info is 0,0,0 with Air. + setPos(BlockPos.ZERO); + setState(Blocks.AIR.defaultBlockState()); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/SpeedTrait.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/SpeedTrait.java new file mode 100644 index 00000000..ef150129 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/SpeedTrait.java @@ -0,0 +1,42 @@ +package com.amuzil.omegasource.magus.skill.util.traits.skilltraits; + +import com.amuzil.omegasource.magus.skill.util.traits.SkillTrait; +import net.minecraft.nbt.CompoundTag; + +public class SpeedTrait extends SkillTrait { + + private double speed; + + public SpeedTrait(double speed, String name) { + super(name); + this.speed = speed; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag tag = super.serializeNBT(); + tag.putDouble(getName(), speed); + return super.serializeNBT(); + } + + @Override + public void deserializeNBT(CompoundTag nbt) { + super.deserializeNBT(nbt); + speed = nbt.getDouble(getName()); + } + + public void setSpeed(double speed) { + this.speed = speed; + markDirty(); + } + + public double getSpeed() { + return speed; + } + + @Override + public void reset() { + super.reset(); + setSpeed(0); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/StringTrait.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/StringTrait.java new file mode 100644 index 00000000..eb897c13 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/StringTrait.java @@ -0,0 +1,43 @@ +package com.amuzil.omegasource.magus.skill.util.traits.skilltraits; + +import com.amuzil.omegasource.magus.skill.util.traits.SkillTrait; +import net.minecraft.nbt.CompoundTag; + +public class StringTrait extends SkillTrait { + + private String info; + + public StringTrait(String name, String info) { + super(name); + this.info = info; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag tag = super.serializeNBT(); + tag.putString(getName(), info); + return tag; + } + + @Override + public void deserializeNBT(CompoundTag nbt) { + super.deserializeNBT(nbt); + info = nbt.getString(getName()); + } + + public void setInfo(String info) { + this.info = info; + markDirty(); + } + + public String getInfo() { + return info; + } + + //Probably won't be used, but just in case. + @Override + public void reset() { + super.reset(); + setInfo(""); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/TimedTrait.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/TimedTrait.java new file mode 100644 index 00000000..268bf99a --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/TimedTrait.java @@ -0,0 +1,49 @@ +package com.amuzil.omegasource.magus.skill.util.traits.skilltraits; + +import com.amuzil.omegasource.magus.skill.util.traits.SkillTrait; +import net.minecraft.nbt.CompoundTag; + +/** + * The most generic trait of all time. Works for: + * Fire time, charging, lifetime, potion duration, e.t.c. + */ +public class TimedTrait extends SkillTrait { + private int time; + + public TimedTrait(int time, String name) { + super(name); + this.time = time; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag tag = super.serializeNBT(); + tag.putInt(getName(), time); + return tag; + } + + @Override + public void deserializeNBT(CompoundTag nbt) { + super.deserializeNBT(nbt); + time = nbt.getInt(getName()); + } + + public void setTime(int time) { + this.time = time; + markDirty(); + } + + public int getTime() { + return time; + } + + /** + * -1 instead of 0 here, because 0 implies a duration of nothing, whereas + * -1 means never iterate at all. + */ + @Override + public void reset() { + super.reset(); + setTime(-1); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/UseTrait.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/UseTrait.java new file mode 100644 index 00000000..89829588 --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/UseTrait.java @@ -0,0 +1,10 @@ +package com.amuzil.omegasource.magus.skill.util.traits.skilltraits; + +import com.amuzil.omegasource.magus.skill.util.traits.SkillTrait; + +public class UseTrait extends BooleanTrait { + + public UseTrait(String name, boolean enabled) { + super(name, enabled); + } +} diff --git a/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/XPTrait.java b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/XPTrait.java new file mode 100644 index 00000000..1b02b28e --- /dev/null +++ b/src/main/java/com/amuzil/omegasource/magus/skill/util/traits/skilltraits/XPTrait.java @@ -0,0 +1,42 @@ +package com.amuzil.omegasource.magus.skill.util.traits.skilltraits; + +import com.amuzil.omegasource.magus.skill.util.traits.SkillTrait; +import net.minecraft.nbt.CompoundTag; + +public class XPTrait extends SkillTrait { + + private double xp; + + public XPTrait(double xp, String name) { + super(name); + this.xp = xp; + } + + @Override + public CompoundTag serializeNBT() { + CompoundTag tag = super.serializeNBT(); + tag.putDouble(getName(), xp); + return tag; + } + + @Override + public void deserializeNBT(CompoundTag nbt) { + super.deserializeNBT(nbt); + xp = nbt.getDouble(getName()); + } + + public void setXP(double xp) { + this.xp = xp; + markDirty(); + } + + public double getXp() { + return xp; + } + + @Override + public void reset() { + super.reset(); + setXP(0); + } +} diff --git a/src/main/java/com/amuzil/omegasource/skillapi/SkillAPI.java b/src/main/java/com/amuzil/omegasource/skillapi/SkillAPI.java deleted file mode 100644 index 5723dd9f..00000000 --- a/src/main/java/com/amuzil/omegasource/skillapi/SkillAPI.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.amuzil.omegasource.skillapi; - -import net.minecraft.block.Block; -import net.minecraft.block.Blocks; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.InterModComms; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; -import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; -import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; -import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; -import net.minecraftforge.fml.event.server.FMLServerStartingEvent; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.util.stream.Collectors; - -// The value here should match an entry in the META-INF/mods.toml file - -/** - * Note! This is a separate repository for a feature of Magus. As such, - * this file will be condensed into Magus', the modid will be changed, e.t.c. - * This is so Mahtaran and I can work on features of Magus separately. - */ - -@Mod(SkillAPI.MODID) -public class SkillAPI { - // Directly reference a log4j logger. - private static final Logger LOGGER = LogManager.getLogger(); - - //MODID reference - public static final String MODID = "skill_api"; - - public SkillAPI() { - // Register the setup method for modloading - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); - // Register the enqueueIMC method for modloading - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::enqueueIMC); - // Register the processIMC method for modloading - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::processIMC); - // Register the doClientStuff method for modloading - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::doClientStuff); - - // Register ourselves for server and other game events we are interested in - MinecraftForge.EVENT_BUS.register(this); - } - - private void setup(final FMLCommonSetupEvent event) { - // some preinit code - LOGGER.info("HELLO FROM PREINIT"); - LOGGER.info("DIRT BLOCK >> {}", Blocks.DIRT.getRegistryName()); - } - - private void doClientStuff(final FMLClientSetupEvent event) { - // do something that can only be done on the client - LOGGER.info("Got game settings {}", event.getMinecraftSupplier().get().options); - } - - private void enqueueIMC(final InterModEnqueueEvent event) { - // some example code to dispatch IMC to another mod - InterModComms.sendTo("examplemod", "helloworld", () -> { - LOGGER.info("Hello world from the MDK"); - return "Hello world"; - }); - } - - private void processIMC(final InterModProcessEvent event) { - // some example code to receive and process InterModComms from other mods - LOGGER.info("Got IMC {}", event.getIMCStream(). - map(m -> m.getMessageSupplier().get()). - collect(Collectors.toList())); - } - - // You can use SubscribeEvent and let the Event Bus discover methods to call - @SubscribeEvent - public void onServerStarting(FMLServerStartingEvent event) { - // do something when the server starts - LOGGER.info("HELLO from server starting"); - } - - // You can use EventBusSubscriber to automatically subscribe events on the contained class (this is subscribing to the MOD - // Event bus for receiving Registry Events) - @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) - public static class RegistryEvents { - @SubscribeEvent - public static void onBlocksRegistry(final RegistryEvent.Register blockRegistryEvent) { - // register a new block here - LOGGER.info("HELLO from Register Block"); - } - } -} diff --git a/src/main/java/com/amuzil/omegasource/skillapi/activators/Activator.java b/src/main/java/com/amuzil/omegasource/skillapi/activators/Activator.java deleted file mode 100644 index d178c996..00000000 --- a/src/main/java/com/amuzil/omegasource/skillapi/activators/Activator.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.amuzil.omegasource.skillapi.activators; - -public class Activator { -} diff --git a/src/main/java/com/amuzil/omegasource/skillapi/listeners/DynamicStateListener.java b/src/main/java/com/amuzil/omegasource/skillapi/listeners/DynamicStateListener.java deleted file mode 100644 index 0615301a..00000000 --- a/src/main/java/com/amuzil/omegasource/skillapi/listeners/DynamicStateListener.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.amuzil.omegasource.skillapi.listeners; - -public class DynamicStateListener { -} diff --git a/src/main/java/com/amuzil/omegasource/skillapi/skills/SkillBase.java b/src/main/java/com/amuzil/omegasource/skillapi/skills/SkillBase.java deleted file mode 100644 index b1d71874..00000000 --- a/src/main/java/com/amuzil/omegasource/skillapi/skills/SkillBase.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.amuzil.omegasource.skillapi.skills; - -public class SkillBase { -} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index aabc446e..8cf3e73f 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -6,57 +6,59 @@ # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml modLoader="javafml" #mandatory # A version range to match for said mod loader - for regular FML @Mod it will be the forge version -loaderVersion="[36,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. +loaderVersion="${loader_version_range}" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. # The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. # Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. -license="All rights reserved" +license="${mod_license}" # A URL to refer people to when problems occur with this mod #issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional # A list of mods - how many allowed here is determined by the individual mod loader [[mods]] #mandatory # The modid of the mod -modId="examplemod" #mandatory -# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it -# ${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata -# see the associated build.gradle script for how to populate this completely automatically during a build -version="${file.jarVersion}" #mandatory - # A display name for the mod -displayName="Example Mod" #mandatory -# A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/ +modId="${mod_id}" #mandatory +# The version number of the mod +version="${mod_version}" #mandatory +# A display name for the mod +displayName="${mod_name}" #mandatory +# A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/ #updateJSONURL="https://change.me.example.invalid/updates.json" #optional # A URL for the "homepage" for this mod, displayed in the mod UI #displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional # A file name (in the root of the mod JAR) containing a logo for display -logoFile="examplemod.png" #optional +#logoFile="examplemod.png" #optional # A text field displayed in the mod UI -credits="Thanks for this example mod goes to Java" #optional +#credits="" #optional # A text field displayed in the mod UI -authors="Love, Cheese and small house plants" #optional -# The description text for the mod (multi line!) (#mandatory) -description=''' -This is a long form description of the mod. You can write whatever you want here - -Have some lorem ipsum. +authors="${mod_authors}" #optional +# Display Test controls the display for your mod in the server connection screen +# MATCH_VERSION means that your mod will cause a red X if the versions on client and server differ. This is the default behaviour and should be what you choose if you have server and client elements to your mod. +# IGNORE_SERVER_VERSION means that your mod will not cause a red X if it's present on the server but not on the client. This is what you should use if you're a server only mod. +# IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component. +# NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value. +# IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself. +#displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional) -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed mollis lacinia magna. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed sagittis luctus odio eu tempus. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque volutpat ligula eget lacus auctor sagittis. In hac habitasse platea dictumst. Nunc gravida elit vitae sem vehicula efficitur. Donec mattis ipsum et arcu lobortis, eleifend sagittis sem rutrum. Cras pharetra quam eget posuere fermentum. Sed id tincidunt justo. Lorem ipsum dolor sit amet, consectetur adipiscing elit. -''' +# The description text for the mod (multi line!) (#mandatory) +description='''${mod_description}''' # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. -[[dependencies.examplemod]] #optional - # the modid of the dependency - modId="forge" #mandatory - # Does this dependency have to exist - if not, ordering below must be specified - mandatory=true #mandatory - # The version range of the dependency - versionRange="[36,)" #mandatory - # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory - ordering="NONE" - # Side this dependency is applied on - BOTH, CLIENT or SERVER - side="BOTH" +[[dependencies.${mod_id}]] #optional +# the modid of the dependency +modId="forge" #mandatory +# Does this dependency have to exist - if not, ordering below must be specified +mandatory=true #mandatory +# The version range of the dependency +versionRange="${forge_version_range}" #mandatory +# An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory +# BEFORE - This mod is loaded BEFORE the dependency +# AFTER - This mod is loaded AFTER the dependency +ordering="NONE" +# Side this dependency is applied on - BOTH, CLIENT, or SERVER +side="BOTH" # Here's another dependency -[[dependencies.examplemod]] - modId="minecraft" - mandatory=true +[[dependencies.${mod_id}]] +modId="minecraft" +mandatory=true # This version range declares a minimum of the current minecraft version up to but not including the next major version - versionRange="[1.16.5,1.17)" - ordering="NONE" - side="BOTH" +versionRange="${minecraft_version_range}" +ordering="NONE" +side="BOTH" diff --git a/src/main/resources/assets/magus/fx/blue_fire.fx b/src/main/resources/assets/magus/fx/blue_fire.fx new file mode 100644 index 00000000..2d4f7130 Binary files /dev/null and b/src/main/resources/assets/magus/fx/blue_fire.fx differ diff --git a/src/main/resources/assets/magus/fx/blue_fire_perma.fx b/src/main/resources/assets/magus/fx/blue_fire_perma.fx new file mode 100644 index 00000000..2ef3a40a Binary files /dev/null and b/src/main/resources/assets/magus/fx/blue_fire_perma.fx differ diff --git a/src/main/resources/assets/magus/fx/fire_bloom.fx b/src/main/resources/assets/magus/fx/fire_bloom.fx new file mode 100644 index 00000000..cad2fbb5 Binary files /dev/null and b/src/main/resources/assets/magus/fx/fire_bloom.fx differ diff --git a/src/main/resources/assets/magus/fx/fire_bloom_perma.fx b/src/main/resources/assets/magus/fx/fire_bloom_perma.fx new file mode 100644 index 00000000..81e7e789 Binary files /dev/null and b/src/main/resources/assets/magus/fx/fire_bloom_perma.fx differ diff --git a/src/main/resources/assets/magus/fx/orb_bloom.fx b/src/main/resources/assets/magus/fx/orb_bloom.fx new file mode 100644 index 00000000..2fa2182a Binary files /dev/null and b/src/main/resources/assets/magus/fx/orb_bloom.fx differ diff --git a/src/main/resources/assets/magus/fx/steam.fx b/src/main/resources/assets/magus/fx/steam.fx new file mode 100644 index 00000000..3891ae57 Binary files /dev/null and b/src/main/resources/assets/magus/fx/steam.fx differ diff --git a/src/main/resources/assets/magus/fx/water.fx b/src/main/resources/assets/magus/fx/water.fx new file mode 100644 index 00000000..480a070e Binary files /dev/null and b/src/main/resources/assets/magus/fx/water.fx differ diff --git a/src/main/resources/assets/magus/textures/fire.png b/src/main/resources/assets/magus/textures/fire.png new file mode 100644 index 00000000..4aa6c668 Binary files /dev/null and b/src/main/resources/assets/magus/textures/fire.png differ diff --git a/src/main/resources/assets/magus/textures/orbit.png b/src/main/resources/assets/magus/textures/orbit.png new file mode 100644 index 00000000..4dd50a24 Binary files /dev/null and b/src/main/resources/assets/magus/textures/orbit.png differ diff --git a/src/main/resources/data/magus/tags/blocks/airbending_material.json b/src/main/resources/data/magus/tags/blocks/airbending_material.json new file mode 100644 index 00000000..7864d3bd --- /dev/null +++ b/src/main/resources/data/magus/tags/blocks/airbending_material.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:air" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/magus/tags/blocks/earthbending_material.json b/src/main/resources/data/magus/tags/blocks/earthbending_material.json new file mode 100644 index 00000000..b9384ac6 --- /dev/null +++ b/src/main/resources/data/magus/tags/blocks/earthbending_material.json @@ -0,0 +1,38 @@ +{ + "values": [ + "minecraft:stone", + "minecraft:cobblestone", + "minecraft:granite", + "minecraft:diorite", + "minecraft:polished_diorite", + "minecraft:andesite", + "minecraft:polished_andesite", + "minecraft:mud", + "minecraft:dirt", + "minecraft:coarse_dirt", + "minecraft:podzol", + "minecraft:grass_block", + "minecraft:gravel", + "minecraft:sand", + "minecraft:sandstone", + "minecraft:red_sand", + "minecraft:deepslate", + "minecraft:tuff", + "minecraft:lodestone", + "minecraft:blackstone", + "minecraft:calcite", + "minecraft:cobbled_deepslate", + "#forge:blocks/sand", + "#forge:blocks/stone", + "#forge:blocks/sandstone", + "#forge:blocks/cobblestone", + "#forge:blocks/gravel", + "#forge:blocks/obsidian", + "#forge:blocks/end_stones", + "#forge:blocks/glass", + "#forge:blocks/glass_panes", + "#forge:blocks/stained_glass", + "#forge:blocks/stained_glass_panes", + "#forge:blocks/netherrack" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/magus/tags/blocks/firebending_material.json b/src/main/resources/data/magus/tags/blocks/firebending_material.json new file mode 100644 index 00000000..7acd8eb0 --- /dev/null +++ b/src/main/resources/data/magus/tags/blocks/firebending_material.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:fire", + "minecraft:soul_fire", + "minecraft:torch", + "minecraft:campfire", + "minecraft:soul_campfire", + "minecraft:lantern" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/magus/tags/blocks/waterbending_material.json b/src/main/resources/data/magus/tags/blocks/waterbending_material.json new file mode 100644 index 00000000..e4e67bab --- /dev/null +++ b/src/main/resources/data/magus/tags/blocks/waterbending_material.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:water", + "minecraft:ice", + "minecraft:packed_ice", + "minecraft:blue_ice", + "minecraft:snow_block" + ] +} \ No newline at end of file diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index c79a3626..092cdb00 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,7 +1,9 @@ { "pack": { - "description": "examplemod resources", - "pack_format": 6, - "_comment": "A pack_format of 6 requires json lang files and some texture changes from 1.16.2. Note: we require v6 pack meta for all mods." + "description": "Magus resources", + "pack_format": 9, + "forge:resource_pack_format": 9, + "forge:data_pack_format": 10 } } + diff --git a/src/test/java/com/amuzil/omegasource/MagusTest.java b/src/test/java/com/amuzil/omegasource/MagusTest.java new file mode 100644 index 00000000..edd2f6d4 --- /dev/null +++ b/src/test/java/com/amuzil/omegasource/MagusTest.java @@ -0,0 +1,27 @@ +package com.amuzil.omegasource; + +import com.amuzil.omegasource.magus.Magus; +import com.lowdragmc.photon.client.fx.FX; +import com.lowdragmc.photon.client.fx.FXHelper; +import net.minecraft.resources.ResourceLocation; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; + +public class MagusTest { + +// @Test +// public void checkResource(){ +// System.out.println("Executing Test..."); +// ResourceLocation resource; FX fx; +// +// resource = new ResourceLocation(Magus.MOD_ID, "blue_fire"); +// fx = FXHelper.getFX(resource); +// System.out.println("resource: " + resource.getNamespace()); +// System.out.println("resource: " + resource.getPath()); +// System.out.println("resource: " + resource.toDebugFileName()); +// System.out.println("fx: " + fx); +// +// assertNotNull(fx, "FX object not found!"); +// } +} diff --git a/src/test/resources/assets/magus/fx/blue_fire.fx b/src/test/resources/assets/magus/fx/blue_fire.fx new file mode 100644 index 00000000..13bf3f6b Binary files /dev/null and b/src/test/resources/assets/magus/fx/blue_fire.fx differ diff --git a/src/test/resources/assets/magus/fx/fire_bloom.fx b/src/test/resources/assets/magus/fx/fire_bloom.fx new file mode 100644 index 00000000..2372e4ed Binary files /dev/null and b/src/test/resources/assets/magus/fx/fire_bloom.fx differ diff --git a/src/test/resources/assets/magus/textures/fire.png b/src/test/resources/assets/magus/textures/fire.png new file mode 100644 index 00000000..4aa6c668 Binary files /dev/null and b/src/test/resources/assets/magus/textures/fire.png differ diff --git a/src/test/resources/assets/magus/textures/orbit.png b/src/test/resources/assets/magus/textures/orbit.png new file mode 100644 index 00000000..4dd50a24 Binary files /dev/null and b/src/test/resources/assets/magus/textures/orbit.png differ diff --git a/src/test/resources/data/magus/tags/blocks/airbending_material.json b/src/test/resources/data/magus/tags/blocks/airbending_material.json new file mode 100644 index 00000000..7864d3bd --- /dev/null +++ b/src/test/resources/data/magus/tags/blocks/airbending_material.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:air" + ] +} \ No newline at end of file diff --git a/src/test/resources/data/magus/tags/blocks/earthbending_material.json b/src/test/resources/data/magus/tags/blocks/earthbending_material.json new file mode 100644 index 00000000..b9384ac6 --- /dev/null +++ b/src/test/resources/data/magus/tags/blocks/earthbending_material.json @@ -0,0 +1,38 @@ +{ + "values": [ + "minecraft:stone", + "minecraft:cobblestone", + "minecraft:granite", + "minecraft:diorite", + "minecraft:polished_diorite", + "minecraft:andesite", + "minecraft:polished_andesite", + "minecraft:mud", + "minecraft:dirt", + "minecraft:coarse_dirt", + "minecraft:podzol", + "minecraft:grass_block", + "minecraft:gravel", + "minecraft:sand", + "minecraft:sandstone", + "minecraft:red_sand", + "minecraft:deepslate", + "minecraft:tuff", + "minecraft:lodestone", + "minecraft:blackstone", + "minecraft:calcite", + "minecraft:cobbled_deepslate", + "#forge:blocks/sand", + "#forge:blocks/stone", + "#forge:blocks/sandstone", + "#forge:blocks/cobblestone", + "#forge:blocks/gravel", + "#forge:blocks/obsidian", + "#forge:blocks/end_stones", + "#forge:blocks/glass", + "#forge:blocks/glass_panes", + "#forge:blocks/stained_glass", + "#forge:blocks/stained_glass_panes", + "#forge:blocks/netherrack" + ] +} \ No newline at end of file diff --git a/src/test/resources/data/magus/tags/blocks/firebending_material.json b/src/test/resources/data/magus/tags/blocks/firebending_material.json new file mode 100644 index 00000000..7acd8eb0 --- /dev/null +++ b/src/test/resources/data/magus/tags/blocks/firebending_material.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:fire", + "minecraft:soul_fire", + "minecraft:torch", + "minecraft:campfire", + "minecraft:soul_campfire", + "minecraft:lantern" + ] +} \ No newline at end of file diff --git a/src/test/resources/data/magus/tags/blocks/waterbending_material.json b/src/test/resources/data/magus/tags/blocks/waterbending_material.json new file mode 100644 index 00000000..e4e67bab --- /dev/null +++ b/src/test/resources/data/magus/tags/blocks/waterbending_material.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:water", + "minecraft:ice", + "minecraft:packed_ice", + "minecraft:blue_ice", + "minecraft:snow_block" + ] +} \ No newline at end of file