diff --git a/LICENSE b/LICENSE index f288702d..4dc0d668 100644 --- a/LICENSE +++ b/LICENSE @@ -1,674 +1,21 @@ - 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 -. +MIT License + +Copyright (c) 2024 Benjamin Sommerfeld + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index 68882cde..834ffad8 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@

Pathetic - A Pathfinding library for Minecraft

-

A high-performance, backwards-compatible, and asynchronous easy-to-use pathfinding library written in Java. -
Pathetic leverages the A* algorithm with customizable heuristics for real-time pathfinding in Spigot/Paper environments.

+

A high-performance, backwards-compatible, and asynchronous easy-to-use pathfinding library written in Java for 3D environments. +
Pathetic leverages the A* algorithm with customizable heuristics for real-time pathfinding.

Key Features

@@ -23,7 +23,7 @@

Installation

-To integrate pathetic into your project, follow the following steps: +To integrate pathetic into your bukkit project, follow the following steps:
*(We advise you to relocate pathetic)* @@ -40,7 +40,7 @@ To integrate pathetic into your project, follow the following steps: com.github.Metaphoriker.pathetic - pathetic-mapping + pathetic-bukkit VERSION ``` @@ -55,13 +55,47 @@ allprojects { } dependencies { - implementation 'com.github.Metaphoriker.pathetic:pathetic-mapping:VERSION' + implementation 'com.github.Metaphoriker.pathetic:pathetic-bukkit:VERSION' +} +``` + +

Manual Pathetic

+If you want to leverage pathetic for your own implementation, you can use the following dependency: + +

Maven

+ +```xml + + + jitpack.io + https://jitpack.io + + + + + de.metaphoriker + pathetic-engine + VERSION + +``` + +

Gradle

+ +```groovy +allprojects { + repositories { + maven { url 'https://jitpack.io' } + } +} + +dependencies { + implementation 'de.metaphoriker:pathetic-engine:VERSION' } ```

Example Usage

-

See the pathetic-example module for a detailed example usage.

+

See the pathetic-example module for a detailed bukkit example.

Documentation

diff --git a/pathetic-api/pom.xml b/pathetic-api/pom.xml index 1b7b2e3b..3a6fcaff 100644 --- a/pathetic-api/pom.xml +++ b/pathetic-api/pom.xml @@ -14,13 +14,11 @@ 3.3.1 - - org.spigotmc - spigot-api - org.projectlombok lombok + 1.18.36 + provided diff --git a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/event/EventPublisher.java b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/event/EventPublisher.java deleted file mode 100644 index 08e366af..00000000 --- a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/event/EventPublisher.java +++ /dev/null @@ -1,41 +0,0 @@ -package de.metaphoriker.pathetic.api.event; - -import com.google.common.eventbus.EventBus; -import lombok.experimental.UtilityClass; - -/** - * Utility class for publishing and managing events using the Google Guava EventBus. This class - * provides methods to raise events and register/unregister event listeners. - */ -@UtilityClass -public class EventPublisher { - - private static final EventBus eventBus = new EventBus(); - - /** - * Raises an event by posting it to the EventBus. - * - * @param pathingEvent the event to be raised - */ - public static void raiseEvent(PathingEvent pathingEvent) { - eventBus.post(pathingEvent); - } - - /** - * Registers an event listener with the EventBus. - * - * @param listener the listener to be registered - */ - public static void registerListener(Object listener) { - eventBus.register(listener); - } - - /** - * Unregisters an event listener from the EventBus. - * - * @param listener the listener to be unregistered - */ - public static void unregisterListener(Object listener) { - eventBus.unregister(listener); - } -} diff --git a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/event/PathingEvent.java b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/event/PathingEvent.java deleted file mode 100644 index 562765d8..00000000 --- a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/event/PathingEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package de.metaphoriker.pathetic.api.event; - -/** Represents all pathing events */ -public interface PathingEvent {} diff --git a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/event/PathingFinishedEvent.java b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/event/PathingFinishedEvent.java deleted file mode 100644 index 6d306abc..00000000 --- a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/event/PathingFinishedEvent.java +++ /dev/null @@ -1,17 +0,0 @@ -package de.metaphoriker.pathetic.api.event; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NonNull; -import de.metaphoriker.pathetic.api.pathing.result.PathfinderResult; - -/** - * An event called when a pathfinder finishes pathing. Therefor, the result does not matter. Means - * that the event is called even if the pathing fails. - */ -@Getter -@AllArgsConstructor -public class PathingFinishedEvent implements PathingEvent { - - @NonNull private final PathfinderResult pathfinderResult; -} diff --git a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/event/PathingStartFindEvent.java b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/event/PathingStartFindEvent.java deleted file mode 100644 index 28f9ba82..00000000 --- a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/event/PathingStartFindEvent.java +++ /dev/null @@ -1,20 +0,0 @@ -package de.metaphoriker.pathetic.api.event; - -import java.util.List; -import lombok.Getter; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; -import de.metaphoriker.pathetic.api.pathing.filter.PathFilter; -import de.metaphoriker.pathetic.api.pathing.filter.PathFilterStage; -import de.metaphoriker.pathetic.api.wrapper.PathPosition; - -/** An event called when a Pathfinder starts pathing. */ -@Getter -@RequiredArgsConstructor -public class PathingStartFindEvent implements PathingEvent { - - @NonNull private final PathPosition start; - @NonNull private final PathPosition target; - @NonNull private final List filters; - @NonNull private final List filterStages; -} diff --git a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/event/package-info.java b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/event/package-info.java deleted file mode 100644 index f6fe6e1e..00000000 --- a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/event/package-info.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * This package contains classes related to the event system of pathetic. - * - *

The event system is built around the Guava EventBus. It provides a way to define, raise, and - * handle custom events within the application. The main class in this package is the - * EventPublisher, which provides static methods to raise events and register/unregister listeners. - * - *

To create a new event, you would extend the PathingEvent class. To handle an event, you would - * create a method in your listener class that is annotated with @Subscribe and takes a single - * argument of your event type. - * - *

For example: - * - * 

{@code
- * // Define a new event
- *  public class CustomEvent extends PathingEvent {
- *    private final String message;
- *
- *    public CustomEvent(String message) {
- *      this.message = message;
- *    }
- *
- *    public String getMessage() {
- *      return message;
- *    }
- *  }
- *
- *  // Define a listener for the new event
- *  public class CustomEventListener {
- *
- *   {@literal @}Subscribe
- *   public void onCustomEvent(CustomEvent event) {
- *     System.out.println("Received custom event with message: " + event.getMessage());
- *    }
- *  }
- *
- * // Register the listener and raise the event
- * EventPublisher.registerListener(new CustomEventListener());
- * EventPublisher.raiseEvent(new CustomEvent("Hello, world!"));
- *
- * }
- */ -package de.metaphoriker.pathetic.api.event; diff --git a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/Pathfinder.java b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/Pathfinder.java index ce146161..96c314f5 100644 --- a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/Pathfinder.java +++ b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/Pathfinder.java @@ -2,8 +2,8 @@ import java.util.List; import java.util.concurrent.CompletionStage; -import javax.annotation.Nullable; +import de.metaphoriker.pathetic.api.pathing.hook.PathfinderHook; import de.metaphoriker.pathetic.api.pathing.result.PathState; import lombok.NonNull; import de.metaphoriker.pathetic.api.pathing.filter.PathFilter; @@ -27,7 +27,7 @@ public interface Pathfinder { CompletionStage findPath( @NonNull PathPosition start, @NonNull PathPosition target, - @Nullable List<@NonNull PathFilter> filters); + List<@NonNull PathFilter> filters); /** * Tries to find a Path between the two {@link PathPosition}'s provided with the given @@ -52,8 +52,8 @@ CompletionStage findPath( CompletionStage findPath( @NonNull PathPosition start, @NonNull PathPosition target, - @Nullable List sharedFilters, - @Nullable List<@NonNull PathFilterStage> filterStages); + List<@NonNull PathFilter> sharedFilters, + List<@NonNull PathFilterStage> filterStages); /** * Aborts the running pathfinding process. @@ -62,4 +62,11 @@ CompletionStage findPath( * will be {@link PathState#ABORTED}. */ void abort(); + + /** + * Registers a {@link PathfinderHook} that will be called on every step of the pathfinding process. + * This can be used to modify the pathfinding process or to collect data. + * @param hook The hook to register. + */ + void registerPathfindingHook(PathfinderHook hook); } diff --git a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/PathfinderFactory.java b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/PathfinderFactory.java new file mode 100644 index 00000000..8b4cc2fd --- /dev/null +++ b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/PathfinderFactory.java @@ -0,0 +1,30 @@ +package de.metaphoriker.pathetic.api.pathing; + +import de.metaphoriker.pathetic.api.pathing.configuration.PathfinderConfiguration; + +/** + * A factory class for creating {@link Pathfinder} instances. + * + * @param The type of {@link PathfinderInitializer} used to initialize the pathfinder. + */ +public abstract class PathfinderFactory { + + protected final I initializer; + + /** + * Creates a new {@link PathfinderFactory} with the given initializer. + * + * @param initializer The initializer to use for initializing the pathfinder. + */ + public PathfinderFactory(I initializer) { + this.initializer = initializer; + } + + /** + * Creates a new {@link Pathfinder} instance with the given configuration. + * + * @param configuration The configuration for the pathfinder. + * @return A new {@link Pathfinder} instance. + */ + public abstract Pathfinder createPathfinder(PathfinderConfiguration configuration); +} diff --git a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/PathfinderInitializer.java b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/PathfinderInitializer.java new file mode 100644 index 00000000..4094f3bd --- /dev/null +++ b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/PathfinderInitializer.java @@ -0,0 +1,17 @@ +package de.metaphoriker.pathetic.api.pathing; + +import de.metaphoriker.pathetic.api.pathing.configuration.PathfinderConfiguration; + +/** + * An interface for initializing {@link Pathfinder} instances. + */ +public interface PathfinderInitializer { + + /** + * Initializes the given {@link Pathfinder} with the given {@link PathfinderConfiguration}. + * + * @param pathfinder The pathfinder to initialize. + * @param configuration The configuration for the pathfinder. + */ + void initialize(Pathfinder pathfinder, PathfinderConfiguration configuration); +} diff --git a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/configuration/PathfinderConfiguration.java b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/configuration/PathfinderConfiguration.java index 9c68c9fb..8a7e01bd 100644 --- a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/configuration/PathfinderConfiguration.java +++ b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/configuration/PathfinderConfiguration.java @@ -1,10 +1,5 @@ package de.metaphoriker.pathetic.api.pathing.configuration; -import de.metaphoriker.pathetic.api.annotation.Experimental; -import de.metaphoriker.pathetic.api.pathing.Pathfinder; -import de.metaphoriker.pathetic.api.pathing.filter.PathFilterStage; -import de.metaphoriker.pathetic.api.wrapper.PathPosition; -import java.util.List; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; @@ -45,22 +40,12 @@ public class PathfinderConfiguration { */ boolean async; - /** - * If set to true, the pathfinding process will terminate immediately if either the start or - * target or both are unreachable. - * - *

NOTE: This prevents fallback strategies. - * @deprecated Will be removed in future releases - */ - @Deprecated - boolean allowingFailFast; - /** * If pathfinding fails, this parameter determines whether the algorithm should fall back to the * last successfully calculated path. This can help maintain progress, but might use an outdated * path. */ - boolean allowingFallback; + @Builder.Default boolean allowingFallback = true; /** * Controls whether chunks should be loaded or generated as needed during the pathfinding process. @@ -68,20 +53,6 @@ public class PathfinderConfiguration { */ boolean loadingChunks; - /** - * Determines whether the pathfinding algorithm should see PathFilterStages as prioritization, - * instead of filtering. This means that the pathfinding algorithm will prioritize paths that pass - * the filters over paths that do not. - * - *

Setting this to true will no longer take the {@link PathFilterStage}s into the validation - * process. Shared filters must still be passed. - * - *

{@link Pathfinder#findPath(PathPosition, PathPosition, List, List)} - * - * @experimental This feature is experimental and may be subject to change. - */ - @Experimental @Builder.Default boolean prioritizing = false; - /** * The set of weights used to calculate heuristics within the A* algorithm. These influence the * pathfinding priority for distance, elevation changes, smoothness, and diagonal movement. @@ -90,16 +61,6 @@ public class PathfinderConfiguration { */ @Builder.Default HeuristicWeights heuristicWeights = HeuristicWeights.NATURAL_PATH_WEIGHTS; - /** - * Determines whether the pathfinding algorithm should collect statistics about the pathfinding - * process. This can be useful for debugging and performance tuning. - * - *

Help us improve the API by providing feedback with the collected statistics! - * - * @default true - */ - @Builder.Default boolean bStats = true; - /** * @return A new {@link PathfinderConfiguration} with default parameters but async. */ @@ -129,7 +90,6 @@ public static PathfinderConfiguration deepCopy(PathfinderConfiguration pathfinde .maxIterations(pathfinderConfiguration.maxIterations) .maxLength(pathfinderConfiguration.maxLength) .async(pathfinderConfiguration.async) - .allowingFailFast(pathfinderConfiguration.allowingFailFast) .allowingFallback(pathfinderConfiguration.allowingFallback) .loadingChunks(pathfinderConfiguration.loadingChunks) .heuristicWeights(pathfinderConfiguration.heuristicWeights) diff --git a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/filter/PathValidationContext.java b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/filter/PathValidationContext.java index 8f40b0f3..9c9a6928 100644 --- a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/filter/PathValidationContext.java +++ b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/filter/PathValidationContext.java @@ -1,7 +1,7 @@ package de.metaphoriker.pathetic.api.pathing.filter; import lombok.Value; -import de.metaphoriker.pathetic.api.snapshot.SnapshotManager; +import de.metaphoriker.pathetic.api.provider.BlockProvider; import de.metaphoriker.pathetic.api.wrapper.PathPosition; /** @@ -40,9 +40,9 @@ public class PathValidationContext { PathPosition absoluteTarget; /** - * The snapshot manager provides access to world data, such as block information, in the context + * The BlockProvider provides access to world data, such as block information, in the context * of the pathfinding process. It is used to retrieve block data from the world at different * positions during path validation. */ - SnapshotManager snapshotManager; + BlockProvider blockProvider; } diff --git a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/filter/filters/PassablePathFilter.java b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/filter/filters/PassablePathFilter.java index c1465520..024a0333 100644 --- a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/filter/filters/PassablePathFilter.java +++ b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/filter/filters/PassablePathFilter.java @@ -15,8 +15,9 @@ public class PassablePathFilter implements PathFilter { @Override public boolean filter(@NonNull PathValidationContext pathValidationContext) { return pathValidationContext - .getSnapshotManager() + .getBlockProvider() .getBlock(pathValidationContext.getPosition()) + .getBlockInformation() .isPassable(); } } diff --git a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/filter/filters/SolidGroundPathFilter.java b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/filter/filters/SolidGroundPathFilter.java deleted file mode 100644 index 95ed64b9..00000000 --- a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/filter/filters/SolidGroundPathFilter.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.metaphoriker.pathetic.api.pathing.filter.filters; - -import lombok.NonNull; -import de.metaphoriker.pathetic.api.pathing.filter.PathValidationContext; -import de.metaphoriker.pathetic.api.pathing.filter.PathFilter; -import de.metaphoriker.pathetic.api.snapshot.SnapshotManager; -import de.metaphoriker.pathetic.api.wrapper.PathBlock; - -/** - * A PathFilter implementation that determines if a path is on solid ground. - */ -public class SolidGroundPathFilter implements PathFilter { - - @Override - public boolean filter(@NonNull PathValidationContext pathValidationContext) { - SnapshotManager snapshotManager = pathValidationContext.getSnapshotManager(); - PathBlock block = snapshotManager.getBlock(pathValidationContext.getPosition()); - return hasGround(block, snapshotManager); - } - - protected boolean hasGround(PathBlock block, SnapshotManager snapshotManager) { - PathBlock below = snapshotManager.getBlock(block.getPathPosition().add(0, -1, 0)); - return below.isSolid(); - } -} diff --git a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/filter/filters/WaterPathFilter.java b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/filter/filters/WaterPathFilter.java deleted file mode 100644 index 2c399004..00000000 --- a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/filter/filters/WaterPathFilter.java +++ /dev/null @@ -1,21 +0,0 @@ -package de.metaphoriker.pathetic.api.pathing.filter.filters; - -import lombok.NonNull; -import org.bukkit.Material; -import de.metaphoriker.pathetic.api.pathing.filter.PathValidationContext; -import de.metaphoriker.pathetic.api.pathing.filter.PathFilter; -import de.metaphoriker.pathetic.api.snapshot.SnapshotManager; -import de.metaphoriker.pathetic.api.wrapper.PathPosition; - -/** A PathFilter implementation that determines if a path is through water. */ -public class WaterPathFilter implements PathFilter { - - @Override - public boolean filter(@NonNull PathValidationContext pathValidationContext) { - SnapshotManager snapshotManager = pathValidationContext.getSnapshotManager(); - PathPosition pathPosition = pathValidationContext.getPosition(); - - return snapshotManager.getBlock(pathPosition).getBlockInformation().getMaterial() - == Material.WATER; - } -} diff --git a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/hook/PathfinderHook.java b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/hook/PathfinderHook.java new file mode 100644 index 00000000..a2bf7e5e --- /dev/null +++ b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/hook/PathfinderHook.java @@ -0,0 +1,14 @@ +package de.metaphoriker.pathetic.api.pathing.hook; + +/** + * Interface for hooks that are called during the pathfinding process. + */ +public interface PathfinderHook { + + /** + * Called on each step of the pathfinding process. + * + * @param pathfindingContext the context of the current pathfinding step + */ + void onPathfindingStep(PathfindingContext pathfindingContext); +} diff --git a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/hook/PathfindingContext.java b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/hook/PathfindingContext.java new file mode 100644 index 00000000..7eb0559e --- /dev/null +++ b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/pathing/hook/PathfindingContext.java @@ -0,0 +1,16 @@ +package de.metaphoriker.pathetic.api.pathing.hook; + +import de.metaphoriker.pathetic.api.wrapper.Depth; +import lombok.Value; + +/** + * Context for the current step of the pathfinding process. + */ +@Value +public class PathfindingContext { + + /** + * The depth of the current pathfinding step. + */ + Depth depth; +} diff --git a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/snapshot/SnapshotManager.java b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/provider/BlockProvider.java similarity index 82% rename from pathetic-api/src/main/java/de/metaphoriker/pathetic/api/snapshot/SnapshotManager.java rename to pathetic-api/src/main/java/de/metaphoriker/pathetic/api/provider/BlockProvider.java index 34471fd1..75bbb744 100644 --- a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/snapshot/SnapshotManager.java +++ b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/provider/BlockProvider.java @@ -1,13 +1,13 @@ -package de.metaphoriker.pathetic.api.snapshot; +package de.metaphoriker.pathetic.api.provider; import de.metaphoriker.pathetic.api.wrapper.PathBlock; import de.metaphoriker.pathetic.api.wrapper.PathPosition; /** - * The SnapshotManager interface defines methods for retrieving block data snapshots at specific + * The BlockProvider interface defines methods for retrieving block data snapshots at specific * positions within a Minecraft world. */ -public interface SnapshotManager { +public interface BlockProvider { /** * Gets the block at the given position diff --git a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/wrapper/BlockInformation.java b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/wrapper/BlockInformation.java index c5a3eb16..d9e88a19 100644 --- a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/wrapper/BlockInformation.java +++ b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/wrapper/BlockInformation.java @@ -1,26 +1,6 @@ package de.metaphoriker.pathetic.api.wrapper; -import javax.annotation.Nullable; -import lombok.EqualsAndHashCode; -import lombok.NonNull; -import lombok.ToString; -import lombok.Value; -import org.bukkit.Material; -import org.bukkit.block.BlockState; +public interface BlockInformation { -@Value -@ToString -@EqualsAndHashCode -public class BlockInformation { - - /** The material of the represented block */ - @NonNull Material material; - - /** - * The block state of the represented block -- GETTER -- Gets the block state of the represented - * block - * - * @api.Note This is only available in v. 1.13 or above and therefore nullable - */ - @Nullable BlockState blockState; + boolean isPassable(); } diff --git a/pathetic-model/src/main/java/de/metaphoriker/pathetic/model/pathing/pathfinder/Depth.java b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/wrapper/Depth.java similarity index 79% rename from pathetic-model/src/main/java/de/metaphoriker/pathetic/model/pathing/pathfinder/Depth.java rename to pathetic-api/src/main/java/de/metaphoriker/pathetic/api/wrapper/Depth.java index 7f19b203..1a3ebfbf 100644 --- a/pathetic-model/src/main/java/de/metaphoriker/pathetic/model/pathing/pathfinder/Depth.java +++ b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/wrapper/Depth.java @@ -1,4 +1,4 @@ -package de.metaphoriker.pathetic.model.pathing.pathfinder; +package de.metaphoriker.pathetic.api.wrapper; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/wrapper/PathBlock.java b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/wrapper/PathBlock.java index ed55f2f4..e9d194f5 100644 --- a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/wrapper/PathBlock.java +++ b/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/wrapper/PathBlock.java @@ -15,25 +15,13 @@ public final class PathBlock { private final PathPosition pathPosition; private final BlockInformation blockInformation; - /** - * @return Whether the block is air - */ - public boolean isAir() { - return blockInformation.getMaterial().isAir(); - } - /** * @return Whether the block is possible to walk through + * @deprecated Use {@link BlockInformation#isPassable()} instead */ + @Deprecated public boolean isPassable() { - return !isSolid(); - } - - /** - * @return Whether the block is solid - */ - public boolean isSolid() { - return blockInformation.getMaterial().isSolid(); + return blockInformation.isPassable(); } /** diff --git a/pathetic-example/README.md b/pathetic-bukkit/pathetic-example/README.md similarity index 100% rename from pathetic-example/README.md rename to pathetic-bukkit/pathetic-example/README.md diff --git a/pathetic-example/pom.xml b/pathetic-bukkit/pathetic-example/pom.xml similarity index 91% rename from pathetic-example/pom.xml rename to pathetic-bukkit/pathetic-example/pom.xml index d8e6c94b..af4b29a9 100644 --- a/pathetic-example/pom.xml +++ b/pathetic-bukkit/pathetic-example/pom.xml @@ -8,13 +8,14 @@ pathetic-main de.metaphoriker 3.3.1 + ../../pom.xml pathetic-example 3.3.1 jar - PatheticTest + pathetic-example 21 @@ -69,10 +70,12 @@ org.spigotmc spigot-api + 1.21.4-R0.1-SNAPSHOT + provided de.metaphoriker - pathetic-mapping + pathetic-bukkit 3.3.1 diff --git a/pathetic-example/src/main/java/de/metaphoriker/pathetic/example/PatheticPlugin.java b/pathetic-bukkit/pathetic-example/src/main/java/de/metaphoriker/pathetic/example/PatheticPlugin.java similarity index 60% rename from pathetic-example/src/main/java/de/metaphoriker/pathetic/example/PatheticPlugin.java rename to pathetic-bukkit/pathetic-example/src/main/java/de/metaphoriker/pathetic/example/PatheticPlugin.java index c225f546..0450a4cb 100644 --- a/pathetic-example/src/main/java/de/metaphoriker/pathetic/example/PatheticPlugin.java +++ b/pathetic-bukkit/pathetic-example/src/main/java/de/metaphoriker/pathetic/example/PatheticPlugin.java @@ -1,10 +1,12 @@ package de.metaphoriker.pathetic.example; import de.metaphoriker.pathetic.api.pathing.Pathfinder; +import de.metaphoriker.pathetic.api.pathing.PathfinderFactory; import de.metaphoriker.pathetic.api.pathing.configuration.PathfinderConfiguration; +import de.metaphoriker.pathetic.bukkit.PatheticBukkit; +import de.metaphoriker.pathetic.bukkit.factory.BukkitPathfinderFactory; +import de.metaphoriker.pathetic.bukkit.factory.BukkitPathfinderInitializer; import de.metaphoriker.pathetic.example.command.PatheticCommand; -import de.metaphoriker.pathetic.mapping.PatheticFacade; -import de.metaphoriker.pathetic.mapping.PathfinderFactory; import org.bukkit.plugin.java.JavaPlugin; public final class PatheticPlugin extends JavaPlugin { @@ -13,14 +15,16 @@ public final class PatheticPlugin extends JavaPlugin { @Override public void onEnable() { - // Initialize the PatheticMapper with this plugin instance - PatheticFacade.initialize(this); + // Initialize Pathetic with this plugin instance + PatheticBukkit.initialize(this); + + // Create the respective Pathfinder Factory with the respective initializer + PathfinderFactory factory = new BukkitPathfinderFactory(); // Create a new Pathfinder instance with a custom configuration Pathfinder reusablePathfinder = - PathfinderFactory.createPathfinder( // Use the factory to create a new pathfinder instance + factory.createPathfinder( // Use the factory to create a new pathfinder instance PathfinderConfiguration.createConfiguration() - .withAllowingFailFast(true) // Allow pathfinding to fail fast if necessary .withAllowingFallback(true) // Allow fallback strategies if the primary fails .withLoadingChunks(true) // Allow chunks to be loaded during pathfinding ); @@ -28,11 +32,4 @@ public void onEnable() { // Register the command executor for the "pathetic" command getCommand("pathetic").setExecutor(new PatheticCommand(reusablePathfinder)); } - - // Called when the plugin is disabled - @Override - public void onDisable() { - // Shutdown the PatheticMapper to clear any resources it holds - PatheticFacade.shutdown(); - } } diff --git a/pathetic-example/src/main/java/de/metaphoriker/pathetic/example/command/PatheticCommand.java b/pathetic-bukkit/pathetic-example/src/main/java/de/metaphoriker/pathetic/example/command/PatheticCommand.java similarity index 98% rename from pathetic-example/src/main/java/de/metaphoriker/pathetic/example/command/PatheticCommand.java rename to pathetic-bukkit/pathetic-example/src/main/java/de/metaphoriker/pathetic/example/command/PatheticCommand.java index 7f458fdd..3bda9d3e 100644 --- a/pathetic-example/src/main/java/de/metaphoriker/pathetic/example/command/PatheticCommand.java +++ b/pathetic-bukkit/pathetic-example/src/main/java/de/metaphoriker/pathetic/example/command/PatheticCommand.java @@ -7,6 +7,8 @@ import java.util.Map; import java.util.UUID; import java.util.concurrent.CompletionStage; + +import de.metaphoriker.pathetic.bukkit.mapper.BukkitMapper; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.command.Command; @@ -19,7 +21,6 @@ import de.metaphoriker.pathetic.api.wrapper.PathPosition; import de.metaphoriker.pathetic.example.filter.DangerousMaterialsFilter; import de.metaphoriker.pathetic.example.filter.MinimumHeightFilter; -import de.metaphoriker.pathetic.mapping.bukkit.BukkitMapper; public class PatheticCommand implements TabExecutor { diff --git a/pathetic-example/src/main/java/de/metaphoriker/pathetic/example/filter/DangerousMaterialsFilter.java b/pathetic-bukkit/pathetic-example/src/main/java/de/metaphoriker/pathetic/example/filter/DangerousMaterialsFilter.java similarity index 76% rename from pathetic-example/src/main/java/de/metaphoriker/pathetic/example/filter/DangerousMaterialsFilter.java rename to pathetic-bukkit/pathetic-example/src/main/java/de/metaphoriker/pathetic/example/filter/DangerousMaterialsFilter.java index 8f5c0efe..bd348232 100644 --- a/pathetic-example/src/main/java/de/metaphoriker/pathetic/example/filter/DangerousMaterialsFilter.java +++ b/pathetic-bukkit/pathetic-example/src/main/java/de/metaphoriker/pathetic/example/filter/DangerousMaterialsFilter.java @@ -1,15 +1,16 @@ package de.metaphoriker.pathetic.example.filter; -import java.util.EnumSet; -import org.bukkit.Material; import de.metaphoriker.pathetic.api.pathing.filter.PathFilter; import de.metaphoriker.pathetic.api.pathing.filter.PathValidationContext; -import de.metaphoriker.pathetic.api.snapshot.SnapshotManager; +import de.metaphoriker.pathetic.api.provider.BlockProvider; import de.metaphoriker.pathetic.api.wrapper.PathBlock; import de.metaphoriker.pathetic.api.wrapper.PathPosition; +import de.metaphoriker.pathetic.bukkit.provider.BukkitBlockInformation; +import java.util.EnumSet; +import org.bukkit.Material; /** - * A PathFilter that excludes nodes which are located on or near dangerous materials like lava. + * A PathFilter that excludes nodes which are located on or near dangerous materials like lava. * * @api.Note Due to the radius check, this filter can be computationally expensive. */ @@ -40,14 +41,14 @@ public DangerousMaterialsFilter(EnumSet dangerousMaterials, int radius @Override public boolean filter(PathValidationContext context) { PathPosition position = context.getPosition(); - SnapshotManager snapshotManager = context.getSnapshotManager(); - + BlockProvider blockProvider = context.getBlockProvider(); for (int x = -radius; x <= radius; x++) { for (int y = -radius; y <= radius; y++) { for (int z = -radius; z <= radius; z++) { - PathBlock block = snapshotManager.getBlock(position.add(x, y, z)); - if (block != null - && dangerousMaterials.contains(block.getBlockInformation().getMaterial())) { + PathBlock block = blockProvider.getBlock(position.add(x, y, z)); + BukkitBlockInformation bukkitBlockInformation = + (BukkitBlockInformation) block.getBlockInformation(); + if (dangerousMaterials.contains(bukkitBlockInformation.getMaterial())) { return false; // The node is near a dangerous material, so it's excluded. } } diff --git a/pathetic-example/src/main/java/de/metaphoriker/pathetic/example/filter/MinimumHeightFilter.java b/pathetic-bukkit/pathetic-example/src/main/java/de/metaphoriker/pathetic/example/filter/MinimumHeightFilter.java similarity index 100% rename from pathetic-example/src/main/java/de/metaphoriker/pathetic/example/filter/MinimumHeightFilter.java rename to pathetic-bukkit/pathetic-example/src/main/java/de/metaphoriker/pathetic/example/filter/MinimumHeightFilter.java diff --git a/pathetic-example/src/main/resources/plugin.yml b/pathetic-bukkit/pathetic-example/src/main/resources/plugin.yml similarity index 100% rename from pathetic-example/src/main/resources/plugin.yml rename to pathetic-bukkit/pathetic-example/src/main/resources/plugin.yml diff --git a/pathetic-nms/paper/pom.xml b/pathetic-bukkit/pathetic-provider/paper/pom.xml similarity index 81% rename from pathetic-nms/paper/pom.xml rename to pathetic-bukkit/pathetic-provider/paper/pom.xml index 68c3274c..3706f5f3 100644 --- a/pathetic-nms/paper/pom.xml +++ b/pathetic-bukkit/pathetic-provider/paper/pom.xml @@ -7,7 +7,7 @@ de.metaphoriker pathetic-main 3.3.1 - ../../pom.xml + ../../../pom.xml paper @@ -33,5 +33,12 @@ 3.3.1 provided + + + de.metaphoriker + pathetic-provider + 3.3.1 + compile + diff --git a/pathetic-nms/paper/src/main/java/de/metaphoriker/pathetic/provider/paper/PaperChunkDataProvider.java b/pathetic-bukkit/pathetic-provider/paper/src/main/java/de/metaphoriker/pathetic/provider/paper/PaperChunkDataProvider.java similarity index 91% rename from pathetic-nms/paper/src/main/java/de/metaphoriker/pathetic/provider/paper/PaperChunkDataProvider.java rename to pathetic-bukkit/pathetic-provider/paper/src/main/java/de/metaphoriker/pathetic/provider/paper/PaperChunkDataProvider.java index dff6f4cf..eb38a71d 100644 --- a/pathetic-nms/paper/src/main/java/de/metaphoriker/pathetic/provider/paper/PaperChunkDataProvider.java +++ b/pathetic-bukkit/pathetic-provider/paper/src/main/java/de/metaphoriker/pathetic/provider/paper/PaperChunkDataProvider.java @@ -1,10 +1,10 @@ package de.metaphoriker.pathetic.provider.paper; +import de.metaphoriker.pathetic.provider.ChunkDataProvider; import org.bukkit.Bukkit; import org.bukkit.ChunkSnapshot; import org.bukkit.World; import org.bukkit.block.BlockState; -import de.metaphoriker.pathetic.api.snapshot.ChunkDataProvider; public class PaperChunkDataProvider implements ChunkDataProvider { diff --git a/pathetic-bukkit/pathetic-provider/pom.xml b/pathetic-bukkit/pathetic-provider/pom.xml new file mode 100644 index 00000000..4a24bfdb --- /dev/null +++ b/pathetic-bukkit/pathetic-provider/pom.xml @@ -0,0 +1,32 @@ + + + + + pathetic-main + de.metaphoriker + 3.3.1 + ../../pom.xml + + + 4.0.0 + + pathetic-provider + 3.3.1 + + + + org.spigotmc + spigot-api + 1.21.4-R0.1-SNAPSHOT + provided + + + + de.metaphoriker + pathetic-api + + + + diff --git a/pathetic-mapping/pom.xml b/pathetic-bukkit/pathetic-provider/resolver/pom.xml similarity index 52% rename from pathetic-mapping/pom.xml rename to pathetic-bukkit/pathetic-provider/resolver/pom.xml index a00fa6ff..4070b5bc 100644 --- a/pathetic-mapping/pom.xml +++ b/pathetic-bukkit/pathetic-provider/resolver/pom.xml @@ -2,48 +2,48 @@ + 4.0.0 - pathetic-main de.metaphoriker + pathetic-main 3.3.1 + ../../../pom.xml - 4.0.0 - pathetic-mapping - 3.3.1 - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.5.1 - - - package - - shade - - - - - - + resolver + + org.slf4j + slf4j-api + 2.0.16 + provided + + + + org.projectlombok + lombok + 1.18.36 + provided + + de.metaphoriker - pathetic-model - 3.3.1 - compile + pathetic-api + - org.spigotmc - spigot-api + de.metaphoriker + paper + 3.3.1 + compile + - org.projectlombok - lombok + de.metaphoriker + spigot + 3.3.1 + compile diff --git a/pathetic-bukkit/pathetic-provider/resolver/src/main/java/de/metaphoriker/pathetic/resolver/ChunkDataProviderResolver.java b/pathetic-bukkit/pathetic-provider/resolver/src/main/java/de/metaphoriker/pathetic/resolver/ChunkDataProviderResolver.java new file mode 100644 index 00000000..22b043d9 --- /dev/null +++ b/pathetic-bukkit/pathetic-provider/resolver/src/main/java/de/metaphoriker/pathetic/resolver/ChunkDataProviderResolver.java @@ -0,0 +1,36 @@ +package de.metaphoriker.pathetic.resolver; + +import de.metaphoriker.pathetic.provider.ChunkDataProvider; +import de.metaphoriker.pathetic.provider.paper.PaperChunkDataProvider; +import de.metaphoriker.pathetic.provider.spigot.SpigotChunkDataProviderResolver; +import lombok.Getter; +import lombok.extern.slf4j.Slf4j; + +@Getter +@Slf4j +public class ChunkDataProviderResolver { + + private final ChunkDataProvider chunkDataProvider; + + public ChunkDataProviderResolver(int major, int minor) { + String version = "1." + major + "." + minor; + + if (isPaper()) { + chunkDataProvider = new PaperChunkDataProvider(); + } else { + chunkDataProvider = SpigotChunkDataProviderResolver.resolve(major, minor); + } + + log.debug( + "Detected version v{}, using {}", version, chunkDataProvider.getClass().getSimpleName()); + } + + private boolean isPaper() { + try { + Class.forName("io.papermc.paper.configuration.GlobalConfiguration"); + return true; + } catch (ClassNotFoundException e) { + return false; + } + } +} diff --git a/pathetic-nms/pom.xml b/pathetic-bukkit/pathetic-provider/spigot/pom.xml similarity index 93% rename from pathetic-nms/pom.xml rename to pathetic-bukkit/pathetic-provider/spigot/pom.xml index 142f6b8f..750fd040 100644 --- a/pathetic-nms/pom.xml +++ b/pathetic-bukkit/pathetic-provider/spigot/pom.xml @@ -2,27 +2,30 @@ - + 4.0.0 - pathetic-main de.metaphoriker + pathetic-main 3.3.1 + ../../../pom.xml - 4.0.0 - - pathetic-nms + spigot 3.3.1 org.slf4j slf4j-api + 2.0.16 + provided org.projectlombok lombok + 1.18.36 + provided @@ -32,7 +35,7 @@ de.metaphoriker - paper + pathetic-provider 3.3.1 compile @@ -149,5 +152,4 @@ compile - diff --git a/pathetic-nms/src/main/java/de/metaphoriker/pathetic/provider/ChunkDataProviderResolver.java b/pathetic-bukkit/pathetic-provider/spigot/src/main/java/de/metaphoriker/pathetic/provider/spigot/SpigotChunkDataProviderResolver.java similarity index 75% rename from pathetic-nms/src/main/java/de/metaphoriker/pathetic/provider/ChunkDataProviderResolver.java rename to pathetic-bukkit/pathetic-provider/spigot/src/main/java/de/metaphoriker/pathetic/provider/spigot/SpigotChunkDataProviderResolver.java index 0e777f78..c4e439f9 100644 --- a/pathetic-nms/src/main/java/de/metaphoriker/pathetic/provider/ChunkDataProviderResolver.java +++ b/pathetic-bukkit/pathetic-provider/spigot/src/main/java/de/metaphoriker/pathetic/provider/spigot/SpigotChunkDataProviderResolver.java @@ -1,11 +1,9 @@ -package de.metaphoriker.pathetic.provider; +package de.metaphoriker.pathetic.provider.spigot; -import lombok.Getter; -import lombok.extern.slf4j.Slf4j; -import de.metaphoriker.pathetic.api.snapshot.ChunkDataProvider; -import de.metaphoriker.pathetic.provider.v1_16.v1_16ChunkDataProviderImpl; +import de.metaphoriker.pathetic.provider.ChunkDataProvider; import de.metaphoriker.pathetic.provider.v1_12.v1_12ChunkDataProviderImpl; import de.metaphoriker.pathetic.provider.v1_15.v1_15ChunkDataProviderImpl; +import de.metaphoriker.pathetic.provider.v1_16.v1_16ChunkDataProviderImpl; import de.metaphoriker.pathetic.provider.v1_17.v1_17ChunkDataProviderImpl; import de.metaphoriker.pathetic.provider.v1_18.v1_18ChunkDataProviderImpl; import de.metaphoriker.pathetic.provider.v1_18_R2.v1_18_R2ChunkDataProviderImpl; @@ -17,29 +15,12 @@ import de.metaphoriker.pathetic.provider.v1_20_R4.v1_20_R4ChunkDataProviderImpl; import de.metaphoriker.pathetic.provider.v1_21_R1.v1_21_R1ChunkDataProviderImpl; import de.metaphoriker.pathetic.provider.v1_21_R2.v1_21_R2ChunkDataProviderImpl; +import de.metaphoriker.pathetic.provider.v1_21_R3ChunkDataProviderImpl; import de.metaphoriker.pathetic.provider.v1_8.v1_8ChunkDataProviderImpl; -import de.metaphoriker.pathetic.provider.paper.PaperChunkDataProvider; - -@Getter -@Slf4j -public class ChunkDataProviderResolver { - private final ChunkDataProvider chunkDataProvider; - - public ChunkDataProviderResolver(int major, int minor) { - String version = "1." + major + "." + minor; - - if (isPaper()) { - chunkDataProvider = new PaperChunkDataProvider(); - } else { - chunkDataProvider = determineChunkDataProvider(major, minor); - } +public class SpigotChunkDataProviderResolver { - log.debug( - "Detected version v{}, using {}", version, chunkDataProvider.getClass().getSimpleName()); - } - - private ChunkDataProvider determineChunkDataProvider(int major, int minor) { + public static ChunkDataProvider resolve(int major, int minor) { final ChunkDataProvider chunkDataProvider; switch (major) { case 21: @@ -103,13 +84,4 @@ private ChunkDataProvider determineChunkDataProvider(int major, int minor) { } return chunkDataProvider; } - - private boolean isPaper() { - try { - Class.forName("io.papermc.paper.configuration.GlobalConfiguration"); - return true; - } catch (ClassNotFoundException e) { - return false; - } - } } diff --git a/pathetic-nms/v1_12/pom.xml b/pathetic-bukkit/pathetic-provider/spigot/v1_12/pom.xml similarity index 79% rename from pathetic-nms/v1_12/pom.xml rename to pathetic-bukkit/pathetic-provider/spigot/v1_12/pom.xml index 6f9e68a4..2acc9a06 100644 --- a/pathetic-nms/v1_12/pom.xml +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_12/pom.xml @@ -6,7 +6,7 @@ pathetic-main de.metaphoriker 3.3.1 - ../../pom.xml + ../../../../pom.xml 4.0.0 @@ -26,7 +26,12 @@ 1.12.2-R0.1-SNAPSHOT provided - + + de.metaphoriker + pathetic-provider + 3.3.1 + compile + de.metaphoriker pathetic-api diff --git a/pathetic-nms/v1_12/src/main/java/de/metaphoriker/pathetic/provider/v1_12/v1_12ChunkDataProviderImpl.java b/pathetic-bukkit/pathetic-provider/spigot/v1_12/src/main/java/de/metaphoriker/pathetic/provider/v1_12/v1_12ChunkDataProviderImpl.java similarity index 92% rename from pathetic-nms/v1_12/src/main/java/de/metaphoriker/pathetic/provider/v1_12/v1_12ChunkDataProviderImpl.java rename to pathetic-bukkit/pathetic-provider/spigot/v1_12/src/main/java/de/metaphoriker/pathetic/provider/v1_12/v1_12ChunkDataProviderImpl.java index f83c57c7..0f2614ec 100644 --- a/pathetic-nms/v1_12/src/main/java/de/metaphoriker/pathetic/provider/v1_12/v1_12ChunkDataProviderImpl.java +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_12/src/main/java/de/metaphoriker/pathetic/provider/v1_12/v1_12ChunkDataProviderImpl.java @@ -1,12 +1,12 @@ package de.metaphoriker.pathetic.provider.v1_12; +import de.metaphoriker.pathetic.provider.ChunkDataProvider; import net.minecraft.server.v1_12_R1.Chunk; import net.minecraft.server.v1_12_R1.WorldServer; import org.bukkit.ChunkSnapshot; import org.bukkit.World; import org.bukkit.block.BlockState; import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; -import de.metaphoriker.pathetic.api.snapshot.ChunkDataProvider; public class v1_12ChunkDataProviderImpl implements ChunkDataProvider { diff --git a/pathetic-nms/v1_15/pom.xml b/pathetic-bukkit/pathetic-provider/spigot/v1_15/pom.xml similarity index 79% rename from pathetic-nms/v1_15/pom.xml rename to pathetic-bukkit/pathetic-provider/spigot/v1_15/pom.xml index 4fdd37d4..e4a4558a 100644 --- a/pathetic-nms/v1_15/pom.xml +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_15/pom.xml @@ -6,7 +6,7 @@ pathetic-main de.metaphoriker 3.3.1 - ../../pom.xml + ../../../../pom.xml 4.0.0 @@ -26,7 +26,12 @@ 1.15.2-R0.1-SNAPSHOT provided - + + de.metaphoriker + pathetic-provider + 3.3.1 + compile + de.metaphoriker pathetic-api diff --git a/pathetic-nms/v1_15/src/main/java/de/metaphoriker/pathetic/provider/v1_15/v1_15ChunkDataProviderImpl.java b/pathetic-bukkit/pathetic-provider/spigot/v1_15/src/main/java/de/metaphoriker/pathetic/provider/v1_15/v1_15ChunkDataProviderImpl.java similarity index 93% rename from pathetic-nms/v1_15/src/main/java/de/metaphoriker/pathetic/provider/v1_15/v1_15ChunkDataProviderImpl.java rename to pathetic-bukkit/pathetic-provider/spigot/v1_15/src/main/java/de/metaphoriker/pathetic/provider/v1_15/v1_15ChunkDataProviderImpl.java index 00c67c86..5c6d2b4b 100644 --- a/pathetic-nms/v1_15/src/main/java/de/metaphoriker/pathetic/provider/v1_15/v1_15ChunkDataProviderImpl.java +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_15/src/main/java/de/metaphoriker/pathetic/provider/v1_15/v1_15ChunkDataProviderImpl.java @@ -1,5 +1,6 @@ package de.metaphoriker.pathetic.provider.v1_15; +import de.metaphoriker.pathetic.provider.ChunkDataProvider; import net.minecraft.server.v1_15_R1.ChunkStatus; import net.minecraft.server.v1_15_R1.WorldServer; import org.bukkit.ChunkSnapshot; @@ -7,7 +8,6 @@ import org.bukkit.block.BlockState; import org.bukkit.craftbukkit.v1_15_R1.CraftChunk; import org.bukkit.craftbukkit.v1_15_R1.CraftWorld; -import de.metaphoriker.pathetic.api.snapshot.ChunkDataProvider; public class v1_15ChunkDataProviderImpl implements ChunkDataProvider { diff --git a/pathetic-nms/v1_16/pom.xml b/pathetic-bukkit/pathetic-provider/spigot/v1_16/pom.xml similarity index 79% rename from pathetic-nms/v1_16/pom.xml rename to pathetic-bukkit/pathetic-provider/spigot/v1_16/pom.xml index 1a478533..0e0a18a8 100644 --- a/pathetic-nms/v1_16/pom.xml +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_16/pom.xml @@ -6,7 +6,7 @@ pathetic-main de.metaphoriker 3.3.1 - ../../pom.xml + ../../../../pom.xml 4.0.0 @@ -26,7 +26,12 @@ 1.16.5-R0.1-SNAPSHOT provided - + + de.metaphoriker + pathetic-provider + 3.3.1 + compile + de.metaphoriker pathetic-api diff --git a/pathetic-nms/v1_16/src/main/java/de/metaphoriker/pathetic/provider/v1_16/v1_16ChunkDataProviderImpl.java b/pathetic-bukkit/pathetic-provider/spigot/v1_16/src/main/java/de/metaphoriker/pathetic/provider/v1_16/v1_16ChunkDataProviderImpl.java similarity index 93% rename from pathetic-nms/v1_16/src/main/java/de/metaphoriker/pathetic/provider/v1_16/v1_16ChunkDataProviderImpl.java rename to pathetic-bukkit/pathetic-provider/spigot/v1_16/src/main/java/de/metaphoriker/pathetic/provider/v1_16/v1_16ChunkDataProviderImpl.java index 75bcd045..aed42357 100644 --- a/pathetic-nms/v1_16/src/main/java/de/metaphoriker/pathetic/provider/v1_16/v1_16ChunkDataProviderImpl.java +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_16/src/main/java/de/metaphoriker/pathetic/provider/v1_16/v1_16ChunkDataProviderImpl.java @@ -1,5 +1,6 @@ package de.metaphoriker.pathetic.provider.v1_16; +import de.metaphoriker.pathetic.provider.ChunkDataProvider; import net.minecraft.server.v1_16_R3.ChunkStatus; import net.minecraft.server.v1_16_R3.WorldServer; import org.bukkit.ChunkSnapshot; @@ -7,7 +8,6 @@ import org.bukkit.block.BlockState; import org.bukkit.craftbukkit.v1_16_R3.CraftChunk; import org.bukkit.craftbukkit.v1_16_R3.CraftWorld; -import de.metaphoriker.pathetic.api.snapshot.ChunkDataProvider; public class v1_16ChunkDataProviderImpl implements ChunkDataProvider { diff --git a/pathetic-nms/v1_17/pom.xml b/pathetic-bukkit/pathetic-provider/spigot/v1_17/pom.xml similarity index 79% rename from pathetic-nms/v1_17/pom.xml rename to pathetic-bukkit/pathetic-provider/spigot/v1_17/pom.xml index 081914c0..abf587a3 100644 --- a/pathetic-nms/v1_17/pom.xml +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_17/pom.xml @@ -6,7 +6,7 @@ pathetic-main de.metaphoriker 3.3.1 - ../../pom.xml + ../../../../pom.xml 4.0.0 @@ -26,7 +26,12 @@ 1.17.1-R0.1-SNAPSHOT provided - + + de.metaphoriker + pathetic-provider + 3.3.1 + compile + de.metaphoriker pathetic-api diff --git a/pathetic-nms/v1_17/src/main/java/de/metaphoriker/pathetic/provider/v1_17/v1_17ChunkDataProviderImpl.java b/pathetic-bukkit/pathetic-provider/spigot/v1_17/src/main/java/de/metaphoriker/pathetic/provider/v1_17/v1_17ChunkDataProviderImpl.java similarity index 95% rename from pathetic-nms/v1_17/src/main/java/de/metaphoriker/pathetic/provider/v1_17/v1_17ChunkDataProviderImpl.java rename to pathetic-bukkit/pathetic-provider/spigot/v1_17/src/main/java/de/metaphoriker/pathetic/provider/v1_17/v1_17ChunkDataProviderImpl.java index bc53b140..65f367f3 100644 --- a/pathetic-nms/v1_17/src/main/java/de/metaphoriker/pathetic/provider/v1_17/v1_17ChunkDataProviderImpl.java +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_17/src/main/java/de/metaphoriker/pathetic/provider/v1_17/v1_17ChunkDataProviderImpl.java @@ -1,5 +1,6 @@ package de.metaphoriker.pathetic.provider.v1_17; +import de.metaphoriker.pathetic.provider.ChunkDataProvider; import net.minecraft.server.level.WorldServer; import net.minecraft.world.level.block.state.IBlockData; import net.minecraft.world.level.chunk.ChunkStatus; @@ -11,7 +12,6 @@ import org.bukkit.craftbukkit.v1_17_R1.CraftWorld; import org.bukkit.craftbukkit.v1_17_R1.block.CraftBlockStates; import org.bukkit.craftbukkit.v1_17_R1.block.data.CraftBlockData; -import de.metaphoriker.pathetic.api.snapshot.ChunkDataProvider; public class v1_17ChunkDataProviderImpl implements ChunkDataProvider { diff --git a/pathetic-nms/v1_18/pom.xml b/pathetic-bukkit/pathetic-provider/spigot/v1_18/pom.xml similarity index 79% rename from pathetic-nms/v1_18/pom.xml rename to pathetic-bukkit/pathetic-provider/spigot/v1_18/pom.xml index 8445502d..927e32f5 100644 --- a/pathetic-nms/v1_18/pom.xml +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_18/pom.xml @@ -7,7 +7,7 @@ de.metaphoriker pathetic-main 3.3.1 - ../../pom.xml + ../../../../pom.xml v1_18 @@ -26,6 +26,12 @@ 1.18.1-R0.1-SNAPSHOT provided + + de.metaphoriker + pathetic-provider + 3.3.1 + compile + de.metaphoriker pathetic-api diff --git a/pathetic-nms/v1_18/src/main/java/de/metaphoriker/pathetic/provider/v1_18/v1_18ChunkDataProviderImpl.java b/pathetic-bukkit/pathetic-provider/spigot/v1_18/src/main/java/de/metaphoriker/pathetic/provider/v1_18/v1_18ChunkDataProviderImpl.java similarity index 96% rename from pathetic-nms/v1_18/src/main/java/de/metaphoriker/pathetic/provider/v1_18/v1_18ChunkDataProviderImpl.java rename to pathetic-bukkit/pathetic-provider/spigot/v1_18/src/main/java/de/metaphoriker/pathetic/provider/v1_18/v1_18ChunkDataProviderImpl.java index ca44e37e..bbbb9044 100644 --- a/pathetic-nms/v1_18/src/main/java/de/metaphoriker/pathetic/provider/v1_18/v1_18ChunkDataProviderImpl.java +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_18/src/main/java/de/metaphoriker/pathetic/provider/v1_18/v1_18ChunkDataProviderImpl.java @@ -1,6 +1,8 @@ package de.metaphoriker.pathetic.provider.v1_18; import java.lang.reflect.Field; + +import de.metaphoriker.pathetic.provider.ChunkDataProvider; import net.minecraft.server.level.WorldServer; import net.minecraft.world.level.block.state.IBlockData; import net.minecraft.world.level.chunk.ChunkStatus; @@ -13,7 +15,6 @@ import org.bukkit.craftbukkit.v1_18_R1.CraftWorld; import org.bukkit.craftbukkit.v1_18_R1.block.CraftBlockStates; import org.bukkit.craftbukkit.v1_18_R1.block.data.CraftBlockData; -import de.metaphoriker.pathetic.api.snapshot.ChunkDataProvider; public class v1_18ChunkDataProviderImpl implements ChunkDataProvider { diff --git a/pathetic-nms/v1_18_R2/pom.xml b/pathetic-bukkit/pathetic-provider/spigot/v1_18_R2/pom.xml similarity index 79% rename from pathetic-nms/v1_18_R2/pom.xml rename to pathetic-bukkit/pathetic-provider/spigot/v1_18_R2/pom.xml index cc3cde35..d9b62349 100644 --- a/pathetic-nms/v1_18_R2/pom.xml +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_18_R2/pom.xml @@ -7,7 +7,7 @@ de.metaphoriker pathetic-main 3.3.1 - ../../pom.xml + ../../../../pom.xml v1_18_R2 @@ -26,7 +26,12 @@ 1.18.2-R0.1-SNAPSHOT provided - + + de.metaphoriker + pathetic-provider + 3.3.1 + compile + de.metaphoriker pathetic-api diff --git a/pathetic-nms/v1_18_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_18_R2/v1_18_R2ChunkDataProviderImpl.java b/pathetic-bukkit/pathetic-provider/spigot/v1_18_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_18_R2/v1_18_R2ChunkDataProviderImpl.java similarity index 96% rename from pathetic-nms/v1_18_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_18_R2/v1_18_R2ChunkDataProviderImpl.java rename to pathetic-bukkit/pathetic-provider/spigot/v1_18_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_18_R2/v1_18_R2ChunkDataProviderImpl.java index 7b4c6391..cae4eb89 100644 --- a/pathetic-nms/v1_18_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_18_R2/v1_18_R2ChunkDataProviderImpl.java +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_18_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_18_R2/v1_18_R2ChunkDataProviderImpl.java @@ -1,6 +1,8 @@ package de.metaphoriker.pathetic.provider.v1_18_R2; import java.lang.reflect.Field; + +import de.metaphoriker.pathetic.provider.ChunkDataProvider; import net.minecraft.server.level.WorldServer; import net.minecraft.world.level.block.state.IBlockData; import net.minecraft.world.level.chunk.ChunkStatus; @@ -13,7 +15,6 @@ import org.bukkit.craftbukkit.v1_18_R2.CraftWorld; import org.bukkit.craftbukkit.v1_18_R2.block.CraftBlockStates; import org.bukkit.craftbukkit.v1_18_R2.block.data.CraftBlockData; -import de.metaphoriker.pathetic.api.snapshot.ChunkDataProvider; public class v1_18_R2ChunkDataProviderImpl implements ChunkDataProvider { diff --git a/pathetic-nms/v1_19_R2/pom.xml b/pathetic-bukkit/pathetic-provider/spigot/v1_19_R2/pom.xml similarity index 79% rename from pathetic-nms/v1_19_R2/pom.xml rename to pathetic-bukkit/pathetic-provider/spigot/v1_19_R2/pom.xml index 0436b7ed..50a760e8 100644 --- a/pathetic-nms/v1_19_R2/pom.xml +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_19_R2/pom.xml @@ -7,7 +7,7 @@ de.metaphoriker pathetic-main 3.3.1 - ../../pom.xml + ../../../../pom.xml v1_19_R2 @@ -26,7 +26,12 @@ 1.19.3-R0.1-SNAPSHOT provided - + + de.metaphoriker + pathetic-provider + 3.3.1 + compile + de.metaphoriker pathetic-api diff --git a/pathetic-nms/v1_19_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_19_R2/v1_19_R2ChunkDataProviderImpl.java b/pathetic-bukkit/pathetic-provider/spigot/v1_19_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_19_R2/v1_19_R2ChunkDataProviderImpl.java similarity index 96% rename from pathetic-nms/v1_19_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_19_R2/v1_19_R2ChunkDataProviderImpl.java rename to pathetic-bukkit/pathetic-provider/spigot/v1_19_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_19_R2/v1_19_R2ChunkDataProviderImpl.java index ec38b740..f7ecb659 100644 --- a/pathetic-nms/v1_19_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_19_R2/v1_19_R2ChunkDataProviderImpl.java +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_19_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_19_R2/v1_19_R2ChunkDataProviderImpl.java @@ -1,6 +1,8 @@ package de.metaphoriker.pathetic.provider.v1_19_R2; import java.lang.reflect.Field; + +import de.metaphoriker.pathetic.provider.ChunkDataProvider; import net.minecraft.server.level.WorldServer; import net.minecraft.world.level.block.state.IBlockData; import net.minecraft.world.level.chunk.ChunkStatus; @@ -13,7 +15,6 @@ import org.bukkit.craftbukkit.v1_19_R2.CraftWorld; import org.bukkit.craftbukkit.v1_19_R2.block.CraftBlockStates; import org.bukkit.craftbukkit.v1_19_R2.block.data.CraftBlockData; -import de.metaphoriker.pathetic.api.snapshot.ChunkDataProvider; public class v1_19_R2ChunkDataProviderImpl implements ChunkDataProvider { diff --git a/pathetic-nms/v1_19_R3/pom.xml b/pathetic-bukkit/pathetic-provider/spigot/v1_19_R3/pom.xml similarity index 79% rename from pathetic-nms/v1_19_R3/pom.xml rename to pathetic-bukkit/pathetic-provider/spigot/v1_19_R3/pom.xml index c5f66833..e3676d6a 100644 --- a/pathetic-nms/v1_19_R3/pom.xml +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_19_R3/pom.xml @@ -7,7 +7,7 @@ de.metaphoriker pathetic-main 3.3.1 - ../../pom.xml + ../../../../pom.xml v1_19_R3 @@ -26,7 +26,12 @@ 1.19.4-R0.1-SNAPSHOT provided - + + de.metaphoriker + pathetic-provider + 3.3.1 + compile + de.metaphoriker pathetic-api diff --git a/pathetic-nms/v1_19_R3/src/main/java/de/metaphoriker/pathetic/provider/v1_19_R3/v1_19_R3ChunkDataProviderImpl.java b/pathetic-bukkit/pathetic-provider/spigot/v1_19_R3/src/main/java/de/metaphoriker/pathetic/provider/v1_19_R3/v1_19_R3ChunkDataProviderImpl.java similarity index 96% rename from pathetic-nms/v1_19_R3/src/main/java/de/metaphoriker/pathetic/provider/v1_19_R3/v1_19_R3ChunkDataProviderImpl.java rename to pathetic-bukkit/pathetic-provider/spigot/v1_19_R3/src/main/java/de/metaphoriker/pathetic/provider/v1_19_R3/v1_19_R3ChunkDataProviderImpl.java index d3e1222b..54729b83 100644 --- a/pathetic-nms/v1_19_R3/src/main/java/de/metaphoriker/pathetic/provider/v1_19_R3/v1_19_R3ChunkDataProviderImpl.java +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_19_R3/src/main/java/de/metaphoriker/pathetic/provider/v1_19_R3/v1_19_R3ChunkDataProviderImpl.java @@ -1,6 +1,8 @@ package de.metaphoriker.pathetic.provider.v1_19_R3; import java.lang.reflect.Field; + +import de.metaphoriker.pathetic.provider.ChunkDataProvider; import net.minecraft.server.level.WorldServer; import net.minecraft.world.level.block.state.IBlockData; import net.minecraft.world.level.chunk.ChunkStatus; @@ -13,7 +15,6 @@ import org.bukkit.craftbukkit.v1_19_R3.CraftWorld; import org.bukkit.craftbukkit.v1_19_R3.block.CraftBlockStates; import org.bukkit.craftbukkit.v1_19_R3.block.data.CraftBlockData; -import de.metaphoriker.pathetic.api.snapshot.ChunkDataProvider; public class v1_19_R3ChunkDataProviderImpl implements ChunkDataProvider { diff --git a/pathetic-nms/v1_20_R1/pom.xml b/pathetic-bukkit/pathetic-provider/spigot/v1_20_R1/pom.xml similarity index 79% rename from pathetic-nms/v1_20_R1/pom.xml rename to pathetic-bukkit/pathetic-provider/spigot/v1_20_R1/pom.xml index 3c6d3634..21215e60 100644 --- a/pathetic-nms/v1_20_R1/pom.xml +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_20_R1/pom.xml @@ -7,7 +7,7 @@ de.metaphoriker pathetic-main 3.3.1 - ../../pom.xml + ../../../../pom.xml v1_20_R1 @@ -26,7 +26,12 @@ 1.20.1-R0.1-SNAPSHOT provided - + + de.metaphoriker + pathetic-provider + 3.3.1 + compile + de.metaphoriker pathetic-api diff --git a/pathetic-nms/v1_20_R1/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R1/v1_20_R1ChunkDataProviderImpl.java b/pathetic-bukkit/pathetic-provider/spigot/v1_20_R1/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R1/v1_20_R1ChunkDataProviderImpl.java similarity index 96% rename from pathetic-nms/v1_20_R1/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R1/v1_20_R1ChunkDataProviderImpl.java rename to pathetic-bukkit/pathetic-provider/spigot/v1_20_R1/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R1/v1_20_R1ChunkDataProviderImpl.java index e4faba53..7056d546 100644 --- a/pathetic-nms/v1_20_R1/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R1/v1_20_R1ChunkDataProviderImpl.java +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_20_R1/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R1/v1_20_R1ChunkDataProviderImpl.java @@ -1,6 +1,8 @@ package de.metaphoriker.pathetic.provider.v1_20_R1; import java.lang.reflect.Field; + +import de.metaphoriker.pathetic.provider.ChunkDataProvider; import net.minecraft.server.level.WorldServer; import net.minecraft.world.level.block.state.IBlockData; import net.minecraft.world.level.chunk.ChunkStatus; @@ -10,7 +12,6 @@ import org.bukkit.block.BlockState; import org.bukkit.craftbukkit.v1_20_R1.CraftChunk; import org.bukkit.craftbukkit.v1_20_R1.CraftWorld; -import de.metaphoriker.pathetic.api.snapshot.ChunkDataProvider; public class v1_20_R1ChunkDataProviderImpl implements ChunkDataProvider { diff --git a/pathetic-nms/v1_20_R2/pom.xml b/pathetic-bukkit/pathetic-provider/spigot/v1_20_R2/pom.xml similarity index 79% rename from pathetic-nms/v1_20_R2/pom.xml rename to pathetic-bukkit/pathetic-provider/spigot/v1_20_R2/pom.xml index 34739e59..02b39f29 100644 --- a/pathetic-nms/v1_20_R2/pom.xml +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_20_R2/pom.xml @@ -7,7 +7,7 @@ de.metaphoriker pathetic-main 3.3.1 - ../../pom.xml + ../../../../pom.xml v1_20_R2 @@ -26,7 +26,12 @@ 1.20.2-R0.1-SNAPSHOT provided - + + de.metaphoriker + pathetic-provider + 3.3.1 + compile + de.metaphoriker pathetic-api diff --git a/pathetic-nms/v1_20_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R2/v1_20_R2ChunkDataProviderImpl.java b/pathetic-bukkit/pathetic-provider/spigot/v1_20_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R2/v1_20_R2ChunkDataProviderImpl.java similarity index 96% rename from pathetic-nms/v1_20_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R2/v1_20_R2ChunkDataProviderImpl.java rename to pathetic-bukkit/pathetic-provider/spigot/v1_20_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R2/v1_20_R2ChunkDataProviderImpl.java index 9621e46e..18fc61cd 100644 --- a/pathetic-nms/v1_20_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R2/v1_20_R2ChunkDataProviderImpl.java +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_20_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R2/v1_20_R2ChunkDataProviderImpl.java @@ -1,5 +1,6 @@ package de.metaphoriker.pathetic.provider.v1_20_R2; +import de.metaphoriker.pathetic.provider.ChunkDataProvider; import net.minecraft.server.level.WorldServer; import net.minecraft.world.level.block.state.IBlockData; import net.minecraft.world.level.chunk.ChunkStatus; @@ -9,7 +10,6 @@ import org.bukkit.block.BlockState; import org.bukkit.craftbukkit.v1_20_R2.CraftChunk; import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import de.metaphoriker.pathetic.api.snapshot.ChunkDataProvider; import java.lang.reflect.Field; diff --git a/pathetic-nms/v1_20_R3/pom.xml b/pathetic-bukkit/pathetic-provider/spigot/v1_20_R3/pom.xml similarity index 79% rename from pathetic-nms/v1_20_R3/pom.xml rename to pathetic-bukkit/pathetic-provider/spigot/v1_20_R3/pom.xml index 58119f61..aaab4707 100644 --- a/pathetic-nms/v1_20_R3/pom.xml +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_20_R3/pom.xml @@ -7,7 +7,7 @@ de.metaphoriker pathetic-main 3.3.1 - ../../pom.xml + ../../../../pom.xml v1_20_R3 @@ -26,7 +26,12 @@ 1.20.4-R0.1-SNAPSHOT provided - + + de.metaphoriker + pathetic-provider + 3.3.1 + compile + de.metaphoriker pathetic-api diff --git a/pathetic-nms/v1_20_R3/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R3/v1_20_R3ChunkDataProviderImpl.java b/pathetic-bukkit/pathetic-provider/spigot/v1_20_R3/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R3/v1_20_R3ChunkDataProviderImpl.java similarity index 96% rename from pathetic-nms/v1_20_R3/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R3/v1_20_R3ChunkDataProviderImpl.java rename to pathetic-bukkit/pathetic-provider/spigot/v1_20_R3/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R3/v1_20_R3ChunkDataProviderImpl.java index 73b68cda..ff047b91 100644 --- a/pathetic-nms/v1_20_R3/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R3/v1_20_R3ChunkDataProviderImpl.java +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_20_R3/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R3/v1_20_R3ChunkDataProviderImpl.java @@ -1,6 +1,8 @@ package de.metaphoriker.pathetic.provider.v1_20_R3; import java.lang.reflect.Field; + +import de.metaphoriker.pathetic.provider.ChunkDataProvider; import net.minecraft.server.level.WorldServer; import net.minecraft.world.level.block.state.IBlockData; import net.minecraft.world.level.chunk.ChunkStatus; @@ -10,7 +12,6 @@ import org.bukkit.block.BlockState; import org.bukkit.craftbukkit.v1_20_R3.CraftChunk; import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; -import de.metaphoriker.pathetic.api.snapshot.ChunkDataProvider; public final class v1_20_R3ChunkDataProviderImpl implements ChunkDataProvider { diff --git a/pathetic-nms/v1_20_R4/pom.xml b/pathetic-bukkit/pathetic-provider/spigot/v1_20_R4/pom.xml similarity index 79% rename from pathetic-nms/v1_20_R4/pom.xml rename to pathetic-bukkit/pathetic-provider/spigot/v1_20_R4/pom.xml index de40d8b4..c4041e32 100644 --- a/pathetic-nms/v1_20_R4/pom.xml +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_20_R4/pom.xml @@ -7,7 +7,7 @@ de.metaphoriker pathetic-main 3.3.1 - ../../pom.xml + ../../../../pom.xml v1_20_R4 @@ -26,7 +26,12 @@ 1.20.5-R0.1-SNAPSHOT provided - + + de.metaphoriker + pathetic-provider + 3.3.1 + compile + de.metaphoriker pathetic-api diff --git a/pathetic-nms/v1_20_R4/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R4/v1_20_R4ChunkDataProviderImpl.java b/pathetic-bukkit/pathetic-provider/spigot/v1_20_R4/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R4/v1_20_R4ChunkDataProviderImpl.java similarity index 96% rename from pathetic-nms/v1_20_R4/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R4/v1_20_R4ChunkDataProviderImpl.java rename to pathetic-bukkit/pathetic-provider/spigot/v1_20_R4/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R4/v1_20_R4ChunkDataProviderImpl.java index e312f863..f3ece1ef 100644 --- a/pathetic-nms/v1_20_R4/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R4/v1_20_R4ChunkDataProviderImpl.java +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_20_R4/src/main/java/de/metaphoriker/pathetic/provider/v1_20_R4/v1_20_R4ChunkDataProviderImpl.java @@ -1,5 +1,6 @@ package de.metaphoriker.pathetic.provider.v1_20_R4; +import de.metaphoriker.pathetic.provider.ChunkDataProvider; import net.minecraft.server.level.WorldServer; import net.minecraft.world.level.block.state.IBlockData; import net.minecraft.world.level.chunk.DataPaletteBlock; @@ -9,7 +10,6 @@ import org.bukkit.block.BlockState; import org.bukkit.craftbukkit.v1_20_R4.CraftChunk; import org.bukkit.craftbukkit.v1_20_R4.CraftWorld; -import de.metaphoriker.pathetic.api.snapshot.ChunkDataProvider; import java.lang.reflect.Field; diff --git a/pathetic-nms/v1_21_R1/pom.xml b/pathetic-bukkit/pathetic-provider/spigot/v1_21_R1/pom.xml similarity index 79% rename from pathetic-nms/v1_21_R1/pom.xml rename to pathetic-bukkit/pathetic-provider/spigot/v1_21_R1/pom.xml index 5c785ba8..4e37c78b 100644 --- a/pathetic-nms/v1_21_R1/pom.xml +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_21_R1/pom.xml @@ -7,7 +7,7 @@ de.metaphoriker pathetic-main 3.3.1 - ../../pom.xml + ../../../../pom.xml v1_21_R1 @@ -26,6 +26,12 @@ 1.21.1-R0.1-SNAPSHOT provided + + de.metaphoriker + pathetic-provider + 3.3.1 + compile + de.metaphoriker pathetic-api diff --git a/pathetic-nms/v1_21_R1/src/main/java/de/metaphoriker/pathetic/provider/v1_21_R1/v1_21_R1ChunkDataProviderImpl.java b/pathetic-bukkit/pathetic-provider/spigot/v1_21_R1/src/main/java/de/metaphoriker/pathetic/provider/v1_21_R1/v1_21_R1ChunkDataProviderImpl.java similarity index 96% rename from pathetic-nms/v1_21_R1/src/main/java/de/metaphoriker/pathetic/provider/v1_21_R1/v1_21_R1ChunkDataProviderImpl.java rename to pathetic-bukkit/pathetic-provider/spigot/v1_21_R1/src/main/java/de/metaphoriker/pathetic/provider/v1_21_R1/v1_21_R1ChunkDataProviderImpl.java index 2d690361..679a1b20 100644 --- a/pathetic-nms/v1_21_R1/src/main/java/de/metaphoriker/pathetic/provider/v1_21_R1/v1_21_R1ChunkDataProviderImpl.java +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_21_R1/src/main/java/de/metaphoriker/pathetic/provider/v1_21_R1/v1_21_R1ChunkDataProviderImpl.java @@ -1,5 +1,6 @@ package de.metaphoriker.pathetic.provider.v1_21_R1; +import de.metaphoriker.pathetic.provider.ChunkDataProvider; import net.minecraft.server.level.WorldServer; import net.minecraft.world.level.block.state.IBlockData; import net.minecraft.world.level.chunk.DataPaletteBlock; @@ -9,7 +10,6 @@ import org.bukkit.block.BlockState; import org.bukkit.craftbukkit.v1_21_R1.CraftChunk; import org.bukkit.craftbukkit.v1_21_R1.CraftWorld; -import de.metaphoriker.pathetic.api.snapshot.ChunkDataProvider; import java.lang.reflect.Field; diff --git a/pathetic-nms/v1_21_R2/pom.xml b/pathetic-bukkit/pathetic-provider/spigot/v1_21_R2/pom.xml similarity index 79% rename from pathetic-nms/v1_21_R2/pom.xml rename to pathetic-bukkit/pathetic-provider/spigot/v1_21_R2/pom.xml index b423f930..c3ff65dd 100644 --- a/pathetic-nms/v1_21_R2/pom.xml +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_21_R2/pom.xml @@ -7,7 +7,7 @@ de.metaphoriker pathetic-main 3.3.1 - ../../pom.xml + ../../../../pom.xml v1_21_R2 @@ -26,6 +26,12 @@ 1.21.3-R0.1-SNAPSHOT provided + + de.metaphoriker + pathetic-provider + 3.3.1 + compile + de.metaphoriker pathetic-api diff --git a/pathetic-nms/v1_21_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_21_R2/v1_21_R2ChunkDataProviderImpl.java b/pathetic-bukkit/pathetic-provider/spigot/v1_21_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_21_R2/v1_21_R2ChunkDataProviderImpl.java similarity index 96% rename from pathetic-nms/v1_21_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_21_R2/v1_21_R2ChunkDataProviderImpl.java rename to pathetic-bukkit/pathetic-provider/spigot/v1_21_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_21_R2/v1_21_R2ChunkDataProviderImpl.java index 89f8c0dd..f0817da8 100644 --- a/pathetic-nms/v1_21_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_21_R2/v1_21_R2ChunkDataProviderImpl.java +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_21_R2/src/main/java/de/metaphoriker/pathetic/provider/v1_21_R2/v1_21_R2ChunkDataProviderImpl.java @@ -1,6 +1,8 @@ package de.metaphoriker.pathetic.provider.v1_21_R2; import java.lang.reflect.Field; + +import de.metaphoriker.pathetic.provider.ChunkDataProvider; import net.minecraft.server.level.WorldServer; import net.minecraft.world.level.block.state.IBlockData; import net.minecraft.world.level.chunk.DataPaletteBlock; @@ -10,7 +12,6 @@ import org.bukkit.block.BlockState; import org.bukkit.craftbukkit.v1_21_R2.CraftChunk; import org.bukkit.craftbukkit.v1_21_R2.CraftWorld; -import de.metaphoriker.pathetic.api.snapshot.ChunkDataProvider; public class v1_21_R2ChunkDataProviderImpl implements ChunkDataProvider { diff --git a/pathetic-nms/v1_21_R3/pom.xml b/pathetic-bukkit/pathetic-provider/spigot/v1_21_R3/pom.xml similarity index 79% rename from pathetic-nms/v1_21_R3/pom.xml rename to pathetic-bukkit/pathetic-provider/spigot/v1_21_R3/pom.xml index b2e510cc..235fe3ea 100644 --- a/pathetic-nms/v1_21_R3/pom.xml +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_21_R3/pom.xml @@ -7,7 +7,7 @@ de.metaphoriker pathetic-main 3.3.1 - ../../pom.xml + ../../../../pom.xml v1_21_R3 @@ -26,6 +26,12 @@ 1.21.4-R0.1-SNAPSHOT provided + + de.metaphoriker + pathetic-provider + 3.3.1 + compile + de.metaphoriker pathetic-api diff --git a/pathetic-nms/v1_21_R3/src/main/java/de/metaphoriker/pathetic/provider/v1_21_R3ChunkDataProviderImpl.java b/pathetic-bukkit/pathetic-provider/spigot/v1_21_R3/src/main/java/de/metaphoriker/pathetic/provider/v1_21_R3ChunkDataProviderImpl.java similarity index 96% rename from pathetic-nms/v1_21_R3/src/main/java/de/metaphoriker/pathetic/provider/v1_21_R3ChunkDataProviderImpl.java rename to pathetic-bukkit/pathetic-provider/spigot/v1_21_R3/src/main/java/de/metaphoriker/pathetic/provider/v1_21_R3ChunkDataProviderImpl.java index 4dc55472..90e68fa1 100644 --- a/pathetic-nms/v1_21_R3/src/main/java/de/metaphoriker/pathetic/provider/v1_21_R3ChunkDataProviderImpl.java +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_21_R3/src/main/java/de/metaphoriker/pathetic/provider/v1_21_R3ChunkDataProviderImpl.java @@ -1,6 +1,5 @@ package de.metaphoriker.pathetic.provider; -import de.metaphoriker.pathetic.api.snapshot.ChunkDataProvider; import net.minecraft.server.level.WorldServer; import net.minecraft.world.level.block.state.IBlockData; import net.minecraft.world.level.chunk.DataPaletteBlock; diff --git a/pathetic-nms/v1_8/pom.xml b/pathetic-bukkit/pathetic-provider/spigot/v1_8/pom.xml similarity index 79% rename from pathetic-nms/v1_8/pom.xml rename to pathetic-bukkit/pathetic-provider/spigot/v1_8/pom.xml index ce2119ce..513a2772 100644 --- a/pathetic-nms/v1_8/pom.xml +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_8/pom.xml @@ -6,7 +6,7 @@ pathetic-main de.metaphoriker 3.3.1 - ../../pom.xml + ../../../../pom.xml 4.0.0 @@ -26,7 +26,12 @@ 1.8.8-R0.1-SNAPSHOT provided - + + de.metaphoriker + pathetic-provider + 3.3.1 + compile + de.metaphoriker pathetic-api diff --git a/pathetic-nms/v1_8/src/main/java/de/metaphoriker/pathetic/provider/v1_8/v1_8ChunkDataProviderImpl.java b/pathetic-bukkit/pathetic-provider/spigot/v1_8/src/main/java/de/metaphoriker/pathetic/provider/v1_8/v1_8ChunkDataProviderImpl.java similarity index 92% rename from pathetic-nms/v1_8/src/main/java/de/metaphoriker/pathetic/provider/v1_8/v1_8ChunkDataProviderImpl.java rename to pathetic-bukkit/pathetic-provider/spigot/v1_8/src/main/java/de/metaphoriker/pathetic/provider/v1_8/v1_8ChunkDataProviderImpl.java index e18c8731..e68376e4 100644 --- a/pathetic-nms/v1_8/src/main/java/de/metaphoriker/pathetic/provider/v1_8/v1_8ChunkDataProviderImpl.java +++ b/pathetic-bukkit/pathetic-provider/spigot/v1_8/src/main/java/de/metaphoriker/pathetic/provider/v1_8/v1_8ChunkDataProviderImpl.java @@ -1,12 +1,12 @@ package de.metaphoriker.pathetic.provider.v1_8; +import de.metaphoriker.pathetic.provider.ChunkDataProvider; import net.minecraft.server.v1_8_R3.Chunk; import net.minecraft.server.v1_8_R3.WorldServer; import org.bukkit.ChunkSnapshot; import org.bukkit.World; import org.bukkit.block.BlockState; import org.bukkit.craftbukkit.v1_8_R3.CraftWorld; -import de.metaphoriker.pathetic.api.snapshot.ChunkDataProvider; public class v1_8ChunkDataProviderImpl implements ChunkDataProvider { diff --git a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/snapshot/ChunkDataProvider.java b/pathetic-bukkit/pathetic-provider/src/main/java/de/metaphoriker/pathetic/provider/ChunkDataProvider.java similarity index 94% rename from pathetic-api/src/main/java/de/metaphoriker/pathetic/api/snapshot/ChunkDataProvider.java rename to pathetic-bukkit/pathetic-provider/src/main/java/de/metaphoriker/pathetic/provider/ChunkDataProvider.java index 0e772838..62d458aa 100644 --- a/pathetic-api/src/main/java/de/metaphoriker/pathetic/api/snapshot/ChunkDataProvider.java +++ b/pathetic-bukkit/pathetic-provider/src/main/java/de/metaphoriker/pathetic/provider/ChunkDataProvider.java @@ -1,4 +1,4 @@ -package de.metaphoriker.pathetic.api.snapshot; +package de.metaphoriker.pathetic.provider; import org.bukkit.ChunkSnapshot; import org.bukkit.World; diff --git a/pathetic-bukkit/pom.xml b/pathetic-bukkit/pom.xml new file mode 100644 index 00000000..ac589f7a --- /dev/null +++ b/pathetic-bukkit/pom.xml @@ -0,0 +1,66 @@ + + + 4.0.0 + + de.metaphoriker + pathetic-main + 3.3.1 + + + pathetic-bukkit + 3.3.1 + + + + org.spigotmc + spigot-api + 1.21.4-R0.1-SNAPSHOT + provided + + + org.projectlombok + lombok + 1.18.36 + provided + + + org.slf4j + slf4j-api + 2.0.16 + provided + + + de.metaphoriker + pathetic-engine + 3.3.1 + + + org.projectlombok + lombok + + + org.slf4j + slf4j-api + + + com.google.guava + guava + + + + + de.metaphoriker + resolver + 3.3.1 + compile + + + de.metaphoriker + pathetic-provider + 3.3.1 + compile + + + diff --git a/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/PatheticBukkit.java b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/PatheticBukkit.java new file mode 100644 index 00000000..342d5bc9 --- /dev/null +++ b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/PatheticBukkit.java @@ -0,0 +1,47 @@ +package de.metaphoriker.pathetic.bukkit; + +import de.metaphoriker.pathetic.engine.Pathetic; +import de.metaphoriker.pathetic.bukkit.listener.ChunkInvalidateListener; +import de.metaphoriker.pathetic.bukkit.util.BukkitVersionUtil; +import de.metaphoriker.pathetic.engine.util.ErrorLogger; +import lombok.experimental.UtilityClass; +import lombok.extern.slf4j.Slf4j; +import org.bukkit.Bukkit; +import org.bukkit.plugin.java.JavaPlugin; + +@Slf4j +@UtilityClass +public class PatheticBukkit { + + private static JavaPlugin instance; + + /** + * @throws IllegalStateException If an attempt is made to initialize more than 1 time + */ + public static void initialize(JavaPlugin javaPlugin) { + + if (instance != null) throw ErrorLogger.logFatalError("Can't be initialized twice"); + + instance = javaPlugin; + Bukkit.getPluginManager().registerEvents(new ChunkInvalidateListener(), javaPlugin); + + Pathetic.loadEngineVersion(); + + if (BukkitVersionUtil.getVersion().isUnder(16, 0) + || BukkitVersionUtil.getVersion().isEqual(BukkitVersionUtil.Version.of(16, 0))) { + log.warn( + "Pathetic is currently running in a version older than or equal to 1.16. " + + "Some functionalities might not be accessible, such as accessing the BlockState of blocks."); + } + + log.debug("Pathetic v{} initialized", Pathetic.getEngineVersion()); + } + + public static boolean isInitialized() { + return instance != null; + } + + public static JavaPlugin getPluginInstance() { + return instance; + } +} diff --git a/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/factory/BukkitPathfinderFactory.java b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/factory/BukkitPathfinderFactory.java new file mode 100644 index 00000000..2cbcb478 --- /dev/null +++ b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/factory/BukkitPathfinderFactory.java @@ -0,0 +1,33 @@ +package de.metaphoriker.pathetic.bukkit.factory; + +import de.metaphoriker.pathetic.api.pathing.Pathfinder; +import de.metaphoriker.pathetic.api.pathing.PathfinderFactory; +import de.metaphoriker.pathetic.api.pathing.configuration.PathfinderConfiguration; +import de.metaphoriker.pathetic.api.provider.BlockProvider; +import de.metaphoriker.pathetic.bukkit.provider.FailingBlockProvider; +import de.metaphoriker.pathetic.engine.pathfinder.AStarPathfinder; + +public class BukkitPathfinderFactory extends PathfinderFactory { + + /** + * Creates a new {@link PathfinderFactory} with the given initializer. + * + * @param initializer The initializer to use for initializing the pathfinder. + */ + public BukkitPathfinderFactory() { + super(new BukkitPathfinderInitializer()); + } + + @Override + public Pathfinder createPathfinder(PathfinderConfiguration configuration) { + Pathfinder pathfinder = new AStarPathfinder(getBlockProvider(configuration), configuration); + initializer.initialize(pathfinder, configuration); + return pathfinder; + } + + private BlockProvider getBlockProvider(PathfinderConfiguration configuration) { + return configuration.isLoadingChunks() + ? new FailingBlockProvider.RequestingBlockProvider() + : new FailingBlockProvider(); + } +} diff --git a/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/factory/BukkitPathfinderInitializer.java b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/factory/BukkitPathfinderInitializer.java new file mode 100644 index 00000000..66c4f2f4 --- /dev/null +++ b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/factory/BukkitPathfinderInitializer.java @@ -0,0 +1,14 @@ +package de.metaphoriker.pathetic.bukkit.factory; + +import de.metaphoriker.pathetic.api.pathing.Pathfinder; +import de.metaphoriker.pathetic.api.pathing.PathfinderInitializer; +import de.metaphoriker.pathetic.api.pathing.configuration.PathfinderConfiguration; +import de.metaphoriker.pathetic.bukkit.hook.SpigotPathfindingHook; + +public class BukkitPathfinderInitializer implements PathfinderInitializer { + + @Override + public void initialize(Pathfinder pathfinder, PathfinderConfiguration configuration) { + pathfinder.registerPathfindingHook(new SpigotPathfindingHook()); + } +} diff --git a/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/hook/SpigotPathfindingHook.java b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/hook/SpigotPathfindingHook.java new file mode 100644 index 00000000..b1225389 --- /dev/null +++ b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/hook/SpigotPathfindingHook.java @@ -0,0 +1,20 @@ +package de.metaphoriker.pathetic.bukkit.hook; + +import de.metaphoriker.pathetic.api.pathing.hook.PathfinderHook; +import de.metaphoriker.pathetic.api.pathing.hook.PathfindingContext; +import de.metaphoriker.pathetic.api.wrapper.Depth; +import de.metaphoriker.pathetic.bukkit.util.WatchdogUtil; + +public class SpigotPathfindingHook implements PathfinderHook { + + @Override + public void onPathfindingStep(PathfindingContext pathfindingContext) { + tickWatchdogIfNeeded(pathfindingContext.getDepth()); + } + + private void tickWatchdogIfNeeded(Depth depth) { + if (depth.getDepth() % 500 == 0) { + WatchdogUtil.tickWatchdog(); + } + } +} diff --git a/pathetic-model/src/main/java/de/metaphoriker/pathetic/bukkit/listeners/ChunkInvalidateListener.java b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/listener/ChunkInvalidateListener.java similarity index 91% rename from pathetic-model/src/main/java/de/metaphoriker/pathetic/bukkit/listeners/ChunkInvalidateListener.java rename to pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/listener/ChunkInvalidateListener.java index 63e80bb0..3e6a09b7 100644 --- a/pathetic-model/src/main/java/de/metaphoriker/pathetic/bukkit/listeners/ChunkInvalidateListener.java +++ b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/listener/ChunkInvalidateListener.java @@ -1,5 +1,6 @@ -package de.metaphoriker.pathetic.bukkit.listeners; +package de.metaphoriker.pathetic.bukkit.listener; +import de.metaphoriker.pathetic.bukkit.provider.FailingBlockProvider; import org.bukkit.block.Block; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -13,7 +14,6 @@ import org.bukkit.event.block.BlockPistonRetractEvent; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.LeavesDecayEvent; -import de.metaphoriker.pathetic.model.snapshot.FailingSnapshotManager; public class ChunkInvalidateListener implements Listener { @@ -69,7 +69,7 @@ public void onDecay(LeavesDecayEvent event) { private void handleEvent(Block... blocks) { for (Block block : blocks) - FailingSnapshotManager.invalidateChunk( + FailingBlockProvider.invalidateChunk( block.getWorld().getUID(), block.getChunk().getX(), block.getChunk().getZ()); } } diff --git a/pathetic-mapping/src/main/java/de/metaphoriker/pathetic/mapping/bukkit/BukkitMapper.java b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/mapper/BukkitMapper.java similarity index 90% rename from pathetic-mapping/src/main/java/de/metaphoriker/pathetic/mapping/bukkit/BukkitMapper.java rename to pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/mapper/BukkitMapper.java index ad41c368..43f85306 100644 --- a/pathetic-mapping/src/main/java/de/metaphoriker/pathetic/mapping/bukkit/BukkitMapper.java +++ b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/mapper/BukkitMapper.java @@ -1,6 +1,8 @@ -package de.metaphoriker.pathetic.mapping.bukkit; +package de.metaphoriker.pathetic.bukkit.mapper; import java.util.Arrays; + +import de.metaphoriker.pathetic.bukkit.provider.BukkitBlockInformation; import lombok.NonNull; import lombok.experimental.UtilityClass; import org.bukkit.Bukkit; @@ -8,12 +10,11 @@ import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.util.Vector; -import de.metaphoriker.pathetic.api.wrapper.BlockInformation; import de.metaphoriker.pathetic.api.wrapper.PathBlock; import de.metaphoriker.pathetic.api.wrapper.PathEnvironment; import de.metaphoriker.pathetic.api.wrapper.PathPosition; import de.metaphoriker.pathetic.api.wrapper.PathVector; -import de.metaphoriker.pathetic.util.ErrorLogger; +import de.metaphoriker.pathetic.engine.util.ErrorLogger; @UtilityClass public class BukkitMapper { @@ -66,7 +67,7 @@ public Block toBlock(@NonNull PathBlock pathBlock) { public PathBlock toPathBlock(@NonNull Block block) { return new PathBlock( new PathPosition(toPathWorld(block.getWorld()), block.getX(), block.getY(), block.getZ()), - new BlockInformation(block.getType(), block.getState())); + new BukkitBlockInformation(block.getType(), block.getState())); } public World toWorld(@NonNull PathEnvironment pathEnvironment) { diff --git a/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/provider/BukkitBlockInformation.java b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/provider/BukkitBlockInformation.java new file mode 100644 index 00000000..29b221cb --- /dev/null +++ b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/provider/BukkitBlockInformation.java @@ -0,0 +1,20 @@ +package de.metaphoriker.pathetic.bukkit.provider; + +import de.metaphoriker.pathetic.api.wrapper.BlockInformation; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.bukkit.Material; +import org.bukkit.block.BlockState; + +@Getter +@RequiredArgsConstructor +public class BukkitBlockInformation implements BlockInformation { + + private final Material material; + private final BlockState blockState; + + @Override + public boolean isPassable() { + return !material.isSolid(); + } +} diff --git a/pathetic-model/src/main/java/de/metaphoriker/pathetic/model/snapshot/FailingSnapshotManager.java b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/provider/FailingBlockProvider.java similarity index 80% rename from pathetic-model/src/main/java/de/metaphoriker/pathetic/model/snapshot/FailingSnapshotManager.java rename to pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/provider/FailingBlockProvider.java index 82da0553..042a9069 100644 --- a/pathetic-model/src/main/java/de/metaphoriker/pathetic/model/snapshot/FailingSnapshotManager.java +++ b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/provider/FailingBlockProvider.java @@ -1,5 +1,14 @@ -package de.metaphoriker.pathetic.model.snapshot; +package de.metaphoriker.pathetic.bukkit.provider; +import de.metaphoriker.pathetic.api.provider.BlockProvider; +import de.metaphoriker.pathetic.api.wrapper.PathBlock; +import de.metaphoriker.pathetic.api.wrapper.PathEnvironment; +import de.metaphoriker.pathetic.api.wrapper.PathPosition; +import de.metaphoriker.pathetic.bukkit.provider.world.WorldDomain; +import de.metaphoriker.pathetic.bukkit.util.BukkitVersionUtil; +import de.metaphoriker.pathetic.bukkit.util.ChunkUtil; +import de.metaphoriker.pathetic.resolver.ChunkDataProviderResolver; +import de.metaphoriker.pathetic.engine.util.ErrorLogger; import java.util.Map; import java.util.Optional; import java.util.UUID; @@ -10,23 +19,13 @@ import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.BlockState; -import de.metaphoriker.pathetic.api.snapshot.SnapshotManager; -import de.metaphoriker.pathetic.api.wrapper.BlockInformation; -import de.metaphoriker.pathetic.api.wrapper.PathBlock; -import de.metaphoriker.pathetic.api.wrapper.PathEnvironment; -import de.metaphoriker.pathetic.api.wrapper.PathPosition; -import de.metaphoriker.pathetic.model.snapshot.world.WorldDomain; -import de.metaphoriker.pathetic.provider.ChunkDataProviderResolver; -import de.metaphoriker.pathetic.util.BukkitVersionUtil; -import de.metaphoriker.pathetic.util.ChunkUtils; -import de.metaphoriker.pathetic.util.ErrorLogger; /** - * The FailingSnapshotManager class implements the SnapshotManager interface and provides a default + * The FailingBlockProvider class implements the BlockProvider interface and provides a default * implementation for retrieving block data snapshots from a Minecraft world. It utilizes chunk * snapshots to efficiently access block information, even in asynchronous contexts. * - *

FailingSnapshotManager also uses NMS (net.minecraft.server) utilities to bypass the Spigot + *

FailingBlockProvider also uses NMS (net.minecraft.server) utilities to bypass the Spigot * AsyncCatcher and fetch snapshots natively from an asynchronous context. This allows for more * flexible and efficient access to world data. * @@ -35,7 +34,7 @@ * are not loaded in the world. Developers using this manager should handle potential failures * gracefully. */ -public class FailingSnapshotManager implements SnapshotManager { +public class FailingBlockProvider implements BlockProvider { private static final Map SNAPSHOTS_MAP = new ConcurrentHashMap<>(); @@ -50,7 +49,7 @@ public class FailingSnapshotManager implements SnapshotManager { public static void invalidateChunk(UUID worldUUID, int chunkX, int chunkZ) { if (SNAPSHOTS_MAP.containsKey(worldUUID)) { WorldDomain worldDomain = SNAPSHOTS_MAP.get(worldUUID); - long chunkKey = ChunkUtils.getChunkKey(chunkX, chunkZ); + long chunkKey = ChunkUtil.getChunkKey(chunkX, chunkZ); worldDomain.removeSnapshot(chunkKey); } } @@ -66,12 +65,12 @@ private static Optional fetchBlock(PathPosition position) { int z = position.getBlockZ() - chunkZ * 16; Material material = - ChunkUtils.getMaterial(chunkSnapshotOptional.get(), x, position.getBlockY(), z); + ChunkUtil.getMaterial(chunkSnapshotOptional.get(), x, position.getBlockY(), z); BlockState blockState = CHUNK_DATA_PROVIDER_RESOLVER .getChunkDataProvider() .getBlockState(chunkSnapshotOptional.get(), x, position.getBlockY(), z); - return Optional.of(new PathBlock(position, new BlockInformation(material, blockState))); + return Optional.of(new PathBlock(position, new BukkitBlockInformation(material, blockState))); } return Optional.empty(); @@ -84,7 +83,7 @@ private static Optional getChunkSnapshot(PathPosition position) { if (SNAPSHOTS_MAP.containsKey(position.getPathEnvironment().getUuid())) { WorldDomain worldDomain = SNAPSHOTS_MAP.get(position.getPathEnvironment().getUuid()); - long chunkKey = ChunkUtils.getChunkKey(chunkX, chunkZ); + long chunkKey = ChunkUtil.getChunkKey(chunkX, chunkZ); Optional snapshot = worldDomain.getSnapshot(chunkKey); if (snapshot.isPresent()) return snapshot; @@ -111,7 +110,7 @@ private static ChunkSnapshot processChunkSnapshot( WorldDomain worldDomain = SNAPSHOTS_MAP.computeIfAbsent( position.getPathEnvironment().getUuid(), uuid -> new WorldDomain()); - worldDomain.addSnapshot(ChunkUtils.getChunkKey(chunkX, chunkZ), chunkSnapshot); + worldDomain.addSnapshot(ChunkUtil.getChunkKey(chunkX, chunkZ), chunkSnapshot); return chunkSnapshot; } @@ -142,7 +141,7 @@ public PathBlock getHighestBlockAt(PathPosition position) { .getBlockState(chunkSnapshot, chunkX, highestY, chunkZ); Material material = chunkSnapshot.getBlockType(chunkX, highestY, chunkZ); - return new PathBlock(highestBlockPosition, new BlockInformation(material, blockState)); + return new PathBlock(highestBlockPosition, new BukkitBlockInformation(material, blockState)); } // if no valid chunk snapshot was found @@ -150,11 +149,11 @@ public PathBlock getHighestBlockAt(PathPosition position) { } /** - * The RequestingSnapshotManager is an inner class of FailingSnapshotManager, extending it. This - * class provides additional functionality for ensuring that block data snapshots are available, - * even if not initially loaded. + * The RequestingBlockProvider is an inner class of FailingBlockProvider, extending it. This class + * provides additional functionality for ensuring that block data snapshots are available, even if + * not initially loaded. */ - public static class RequestingSnapshotManager extends FailingSnapshotManager { + public static class RequestingBlockProvider extends FailingBlockProvider { private static ChunkSnapshot retrieveChunkSnapshot( PathEnvironment world, int chunkX, int chunkZ) { @@ -191,12 +190,12 @@ private static PathBlock ensureBlock(PathPosition pathPosition) { int x = pathPosition.getBlockX() - chunkX * 16; int z = pathPosition.getBlockZ() - chunkZ * 16; - Material material = ChunkUtils.getMaterial(chunkSnapshot, x, pathPosition.getBlockY(), z); + Material material = ChunkUtil.getMaterial(chunkSnapshot, x, pathPosition.getBlockY(), z); BlockState blockState = CHUNK_DATA_PROVIDER_RESOLVER .getChunkDataProvider() .getBlockState(chunkSnapshot, x, pathPosition.getBlockY(), z); - return new PathBlock(pathPosition, new BlockInformation(material, blockState)); + return new PathBlock(pathPosition, new BukkitBlockInformation(material, blockState)); } @Override @@ -231,7 +230,7 @@ private PathBlock ensureHighestBlock(PathPosition pathPosition) { .getBlockState(chunkSnapshot, chunkX, highestY, chunkZ); Material material = chunkSnapshot.getBlockType(chunkX, highestY, chunkZ); - return new PathBlock(highestBlockPosition, new BlockInformation(material, blockState)); + return new PathBlock(highestBlockPosition, new BukkitBlockInformation(material, blockState)); } } } diff --git a/pathetic-model/src/main/java/de/metaphoriker/pathetic/model/snapshot/world/WorldDomain.java b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/provider/world/WorldDomain.java similarity index 87% rename from pathetic-model/src/main/java/de/metaphoriker/pathetic/model/snapshot/world/WorldDomain.java rename to pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/provider/world/WorldDomain.java index 94fd0dfd..28f37c84 100644 --- a/pathetic-model/src/main/java/de/metaphoriker/pathetic/model/snapshot/world/WorldDomain.java +++ b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/provider/world/WorldDomain.java @@ -1,9 +1,9 @@ -package de.metaphoriker.pathetic.model.snapshot.world; +package de.metaphoriker.pathetic.bukkit.provider.world; +import de.metaphoriker.pathetic.engine.util.ExpiringHashMap; import java.util.Map; import java.util.Optional; import org.bukkit.ChunkSnapshot; -import de.metaphoriker.pathetic.util.ExpiringHashMap; public class WorldDomain { diff --git a/pathetic-model/src/main/java/de/metaphoriker/pathetic/util/BukkitVersionUtil.java b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/util/BukkitVersionUtil.java similarity index 97% rename from pathetic-model/src/main/java/de/metaphoriker/pathetic/util/BukkitVersionUtil.java rename to pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/util/BukkitVersionUtil.java index e5f7a414..23058f3c 100644 --- a/pathetic-model/src/main/java/de/metaphoriker/pathetic/util/BukkitVersionUtil.java +++ b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/util/BukkitVersionUtil.java @@ -1,12 +1,11 @@ -package de.metaphoriker.pathetic.util; +package de.metaphoriker.pathetic.bukkit.util; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import lombok.Getter; import lombok.experimental.UtilityClass; import org.bukkit.Bukkit; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - @UtilityClass public class BukkitVersionUtil { diff --git a/pathetic-model/src/main/java/de/metaphoriker/pathetic/util/ChunkUtils.java b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/util/ChunkUtil.java similarity index 92% rename from pathetic-model/src/main/java/de/metaphoriker/pathetic/util/ChunkUtils.java rename to pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/util/ChunkUtil.java index 29687271..b9a1fd9c 100644 --- a/pathetic-model/src/main/java/de/metaphoriker/pathetic/util/ChunkUtils.java +++ b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/util/ChunkUtil.java @@ -1,15 +1,15 @@ -package de.metaphoriker.pathetic.util; +package de.metaphoriker.pathetic.bukkit.util; +import de.metaphoriker.pathetic.engine.util.ErrorLogger; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import lombok.SneakyThrows; import lombok.experimental.UtilityClass; import org.bukkit.ChunkSnapshot; import org.bukkit.Material; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - @UtilityClass -public class ChunkUtils { +public class ChunkUtil { private static Method materialMethod; private static Method blockTypeMethod; diff --git a/pathetic-model/src/main/java/de/metaphoriker/pathetic/util/WatchdogUtil.java b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/util/WatchdogUtil.java similarity index 89% rename from pathetic-model/src/main/java/de/metaphoriker/pathetic/util/WatchdogUtil.java rename to pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/util/WatchdogUtil.java index aaa593ef..4c258dc6 100644 --- a/pathetic-model/src/main/java/de/metaphoriker/pathetic/util/WatchdogUtil.java +++ b/pathetic-bukkit/src/main/java/de/metaphoriker/pathetic/bukkit/util/WatchdogUtil.java @@ -1,5 +1,6 @@ -package de.metaphoriker.pathetic.util; +package de.metaphoriker.pathetic.bukkit.util; +import de.metaphoriker.pathetic.engine.util.ErrorLogger; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import lombok.experimental.UtilityClass; diff --git a/pathetic-engine/pom.xml b/pathetic-engine/pom.xml new file mode 100644 index 00000000..dcb0b3f6 --- /dev/null +++ b/pathetic-engine/pom.xml @@ -0,0 +1,153 @@ + + 4.0.0 + + + pathetic-main + de.metaphoriker + 3.3.1 + + + pathetic-engine + 3.3.1 + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.5.1 + + + + org.jheaps + de.metaphoriker.pathetic.shaded.jheaps + + + org.projectlombok + de.metaphoriker.pathetic.shaded.lombok + + + org.slf4j + de.metaphoriker.pathetic.shaded.slf4j + + + com.google.common + de.metaphoriker.pathetic.shaded.guava + + + + + org.jheaps:jheaps + + org/jheaps/tree/FibonacciHeap.class + org/jheaps/tree/FibonacciHeap$Node.class + org/jheaps/annotations/ConstantTime.class + org/jheaps/annotations/LogarithmicTime.class + org/jheaps/MergeableAddressableHeap.class + org/jheaps/AddressableHeap.class + org/jheaps/AddressableHeap$Handle.class + + + + com.google.guava:guava + + com/google/common/hash/BloomFilter.class + com/google/common/hash/BloomFilterStrategies.class + com/google/common/hash/BloomFilter$Strategy.class + com/google/common/hash/BloomFilterStrategies$1.class + com/google/common/hash/BloomFilterStrategies$2.class + com/google/common/hash/BloomFilterStrategies$LockFreeBitArray.class + com/google/common/hash/Funnel.class + com/google/common/hash/PrimitiveSink.class + + com/google/common/collect/Iterables.class + com/google/common/collect/Iterators.class + com/google/common/collect/ImmutableList.class + com/google/common/collect/RegularImmutableList.class + com/google/common/collect/SingletonImmutableList.class + com/google/common/collect/UnmodifiableIterator.class + com/google/common/collect/AbstractIndexedListIterator.class + + com/google/common/base/Predicate.class + com/google/common/base/Supplier.class + com/google/common/base/Objects.class + + com/google/common/base/Preconditions.class + com/google/common/math/LongMath.class + com/google/common/math/LongMath$1.class + com/google/common/primitives/Ints.class + com/google/common/primitives/UnsignedBytes.class + com/google/common/primitives/IntsMethodsForWeb.class + com/google/common/primitives/Longs.class + com/google/common/hash/Hashing.class + com/google/common/hash/Murmur3_32HashFunction.class + com/google/common/hash/Murmur3_128HashFunction.class + com/google/common/hash/AbstractCompositeHashFunction.class + com/google/common/hash/Striped64.class + com/google/common/hash/LongAddable.class + com/google/common/hash/LongAddables.class + com/google/common/hash/LongAddables$PureJavaLongAddable.class + com/google/common/hash/LongAddables$2.class + com/google/common/hash/LongAdder.class + com/google/common/hash/HashFunction.class + com/google/common/hash/Hasher.class + com/google/common/hash/HashCode.class + com/google/common/hash/HashCode$BytesHashCode.class + com/google/common/hash/HashCode$IntHashCode.class + com/google/common/hash/HashCode$LongHashCode.class + com/google/common/hash/AbstractHasher.class + com/google/common/hash/AbstractHashFunction.class + com/google/common/hash/AbstractStreamingHasher.class + com/google/common/hash/Murmur3_128HashFunction$Murmur3_128Hasher.class + com/google/common/hash/Java8Compatibility.class + + + + + + + package + + shade + + + + + + + + + + org.projectlombok + lombok + 1.18.36 + compile + + + org.slf4j + slf4j-api + 2.0.16 + compile + + + com.google.guava + guava + 33.4.0-jre + compile + + + de.metaphoriker + pathetic-api + 3.3.1 + compile + + + org.jheaps + jheaps + 0.14 + compile + + + diff --git a/pathetic-model/src/main/java/de/metaphoriker/pathetic/model/pathing/Node.java b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/Node.java similarity index 97% rename from pathetic-model/src/main/java/de/metaphoriker/pathetic/model/pathing/Node.java rename to pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/Node.java index f5a296b0..e9cf3bb3 100644 --- a/pathetic-model/src/main/java/de/metaphoriker/pathetic/model/pathing/Node.java +++ b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/Node.java @@ -1,4 +1,4 @@ -package de.metaphoriker.pathetic.model.pathing; +package de.metaphoriker.pathetic.engine; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -8,7 +8,7 @@ import de.metaphoriker.pathetic.api.pathing.configuration.HeuristicWeights; import de.metaphoriker.pathetic.api.wrapper.PathPosition; import de.metaphoriker.pathetic.api.wrapper.PathVector; -import de.metaphoriker.pathetic.util.ComputingCache; +import de.metaphoriker.pathetic.engine.util.ComputingCache; @Getter @EqualsAndHashCode(onlyExplicitlyIncluded = true) diff --git a/pathetic-model/src/main/java/de/metaphoriker/pathetic/model/pathing/Offset.java b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/Offset.java similarity index 97% rename from pathetic-model/src/main/java/de/metaphoriker/pathetic/model/pathing/Offset.java rename to pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/Offset.java index e16310ea..5153431b 100644 --- a/pathetic-model/src/main/java/de/metaphoriker/pathetic/model/pathing/Offset.java +++ b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/Offset.java @@ -1,4 +1,4 @@ -package de.metaphoriker.pathetic.model.pathing; +package de.metaphoriker.pathetic.engine; import java.util.stream.Stream; import lombok.AllArgsConstructor; diff --git a/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/Pathetic.java b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/Pathetic.java new file mode 100644 index 00000000..3dc6d3a4 --- /dev/null +++ b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/Pathetic.java @@ -0,0 +1,30 @@ +package de.metaphoriker.pathetic.engine; + +import de.metaphoriker.pathetic.engine.util.ErrorLogger; +import lombok.Getter; +import lombok.experimental.UtilityClass; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + +@UtilityClass +public class Pathetic { + + private static final String PROPERTIES_FILE = "pathetic.properties"; + + @Getter + private static String engineVersion; + + public static void loadEngineVersion() { + try (InputStream inputStream = + Pathetic.class.getClassLoader().getResourceAsStream(PROPERTIES_FILE)) { + Properties properties = new Properties(); + properties.load(inputStream); + + engineVersion = properties.getProperty("engine.version"); + } catch (IOException e) { + throw ErrorLogger.logFatalError("Error loading engine version", e); + } + } +} diff --git a/pathetic-model/src/main/java/de/metaphoriker/pathetic/model/pathing/pathfinder/AStarPathfinder.java b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/pathfinder/AStarPathfinder.java similarity index 80% rename from pathetic-model/src/main/java/de/metaphoriker/pathetic/model/pathing/pathfinder/AStarPathfinder.java rename to pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/pathfinder/AStarPathfinder.java index 11b7d0e7..d50d8891 100644 --- a/pathetic-model/src/main/java/de/metaphoriker/pathetic/model/pathing/pathfinder/AStarPathfinder.java +++ b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/pathfinder/AStarPathfinder.java @@ -1,24 +1,24 @@ -package de.metaphoriker.pathetic.model.pathing.pathfinder; +package de.metaphoriker.pathetic.engine.pathfinder; import de.metaphoriker.pathetic.api.pathing.configuration.PathfinderConfiguration; import de.metaphoriker.pathetic.api.pathing.filter.PathFilter; import de.metaphoriker.pathetic.api.pathing.filter.PathFilterStage; import de.metaphoriker.pathetic.api.pathing.filter.PathValidationContext; +import de.metaphoriker.pathetic.api.provider.BlockProvider; +import de.metaphoriker.pathetic.api.wrapper.Depth; import de.metaphoriker.pathetic.api.wrapper.PathPosition; import de.metaphoriker.pathetic.api.wrapper.PathVector; -import de.metaphoriker.pathetic.model.pathing.Node; -import de.metaphoriker.pathetic.model.pathing.Offset; -import de.metaphoriker.pathetic.util.ExpiringHashMap; -import de.metaphoriker.pathetic.util.GridRegionData; -import de.metaphoriker.pathetic.util.Tuple3; -import de.metaphoriker.pathetic.util.WatchdogUtil; +import de.metaphoriker.pathetic.engine.Node; +import de.metaphoriker.pathetic.engine.Offset; +import de.metaphoriker.pathetic.engine.util.ExpiringHashMap; +import de.metaphoriker.pathetic.engine.util.GridRegionData; +import de.metaphoriker.pathetic.engine.util.Tuple3; import java.util.*; import org.jheaps.tree.FibonacciHeap; public class AStarPathfinder extends AbstractPathfinder { private static final int DEFAULT_GRID_CELL_SIZE = 12; - private static final int PRIORITY_BOOST_IN_PERCENTAGE = 80; /** * The grid map used to store the regional examined positions and Bloom filters for each grid @@ -27,8 +27,11 @@ public class AStarPathfinder extends AbstractPathfinder { private final Map, ExpiringHashMap.Entry> gridMap = new ExpiringHashMap<>(); - public AStarPathfinder(PathfinderConfiguration pathfinderConfiguration) { + private final BlockProvider blockProvider; + + public AStarPathfinder(BlockProvider blockProvider, PathfinderConfiguration pathfinderConfiguration) { super(pathfinderConfiguration); + this.blockProvider = blockProvider; } @Override @@ -42,18 +45,10 @@ protected void tick( List filters, List filterStages) { - tickWatchdogIfNeeded(depth); - evaluateNewNodes(nodeQueue, examinedPositions, currentNode, filters, filterStages); depth.increment(); } - private void tickWatchdogIfNeeded(Depth depth) { - if (depth.getDepth() % 500 == 0) { - WatchdogUtil.tickWatchdog(); - } - } - private void evaluateNewNodes( FibonacciHeap nodeQueue, Set examinedPositions, @@ -66,32 +61,10 @@ private void evaluateNewNodes( for (Node newNode : newNodes) { double nodeCost = newNode.getHeuristic().get(); - if (pathfinderConfiguration.isPrioritizing()) { - double priorityAdjustment = calculatePriorityAdjustment(newNode, filterStages); - nodeCost -= priorityAdjustment; - } nodeQueue.insert(nodeCost, newNode); } } - private double calculatePriorityAdjustment(Node node, List filterStages) { - for (PathFilterStage filterStage : filterStages) { - boolean filterResult = - filterStage.filter( - new PathValidationContext( - node.getPosition(), - node.getParent() != null ? node.getParent().getPosition() : null, - node.getStart(), - node.getTarget(), - snapshotManager)); - - if (filterResult) { - return node.getHeuristic().get() * (PRIORITY_BOOST_IN_PERCENTAGE / 100.0); - } - } - return 0.0; - } - private boolean isNodeValid( Node currentNode, Node newNode, @@ -141,8 +114,7 @@ private boolean isReachable( isHeightDifferencePassable(from, to, vector1, hasYDifference); if (doAllFiltersPass(filters, neighbour1) - && (!pathfinderConfiguration.isPrioritizing() - && doAnyFilterStagePass(filterStages, neighbour1)) + && doAnyFilterStagePass(filterStages, neighbour1) && heightDifferencePassable) return true; } } @@ -158,7 +130,8 @@ private boolean isHeightDifferencePassable( int yDifference = from.getPosition().getBlockY() - to.getPosition().getBlockY(); Node neighbour3 = createNeighbourNode(from, vector1.add(new PathVector(0, yDifference, 0))); - return snapshotManager.getBlock(neighbour3.getPosition()).isPassable(); + // TODO: 15.12.2024: do we really need to check if the block is passable, or can we use the filters? + return blockProvider.getBlock(neighbour3.getPosition()).getBlockInformation().isPassable(); } private Collection fetchValidNeighbours( @@ -228,7 +201,7 @@ private boolean isNodeInvalid( return true; // Node is invalid if filters fail } - return !pathfinderConfiguration.isPrioritizing() && !stagesPass; + return !stagesPass; } private boolean doAllFiltersPass(List filters, Node node) { @@ -239,7 +212,7 @@ private boolean doAllFiltersPass(List filters, Node node) { node.getParent() != null ? node.getParent().getPosition() : null, node.getStart(), node.getTarget(), - snapshotManager); + blockProvider); if (!filter.filter(context)) { return false; @@ -258,7 +231,7 @@ private boolean doAnyFilterStagePass(List filterStages, Node no node.getParent() != null ? node.getParent().getPosition() : null, node.getStart(), node.getTarget(), - snapshotManager))) { + blockProvider))) { return true; } } diff --git a/pathetic-model/src/main/java/de/metaphoriker/pathetic/model/pathing/pathfinder/AbstractPathfinder.java b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/pathfinder/AbstractPathfinder.java similarity index 67% rename from pathetic-model/src/main/java/de/metaphoriker/pathetic/model/pathing/pathfinder/AbstractPathfinder.java rename to pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/pathfinder/AbstractPathfinder.java index d8cb3ead..09464dc4 100644 --- a/pathetic-model/src/main/java/de/metaphoriker/pathetic/model/pathing/pathfinder/AbstractPathfinder.java +++ b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/pathfinder/AbstractPathfinder.java @@ -1,5 +1,20 @@ -package de.metaphoriker.pathetic.model.pathing.pathfinder; +package de.metaphoriker.pathetic.engine.pathfinder; +import de.metaphoriker.pathetic.api.pathing.Pathfinder; +import de.metaphoriker.pathetic.api.pathing.configuration.PathfinderConfiguration; +import de.metaphoriker.pathetic.api.pathing.filter.PathFilter; +import de.metaphoriker.pathetic.api.pathing.filter.PathFilterStage; +import de.metaphoriker.pathetic.api.pathing.hook.PathfinderHook; +import de.metaphoriker.pathetic.api.pathing.hook.PathfindingContext; +import de.metaphoriker.pathetic.api.pathing.result.Path; +import de.metaphoriker.pathetic.api.pathing.result.PathState; +import de.metaphoriker.pathetic.api.pathing.result.PathfinderResult; +import de.metaphoriker.pathetic.api.wrapper.Depth; +import de.metaphoriker.pathetic.api.wrapper.PathPosition; +import de.metaphoriker.pathetic.engine.Node; +import de.metaphoriker.pathetic.engine.result.PathImpl; +import de.metaphoriker.pathetic.engine.result.PathfinderResultImpl; +import de.metaphoriker.pathetic.engine.util.ErrorLogger; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -14,28 +29,6 @@ import javax.annotation.Nullable; import lombok.NonNull; import org.jheaps.tree.FibonacciHeap; -import de.metaphoriker.pathetic.BStatsHandler; -import de.metaphoriker.pathetic.Pathetic; -import de.metaphoriker.pathetic.api.event.EventPublisher; -import de.metaphoriker.pathetic.api.event.PathingFinishedEvent; -import de.metaphoriker.pathetic.api.event.PathingStartFindEvent; -import de.metaphoriker.pathetic.api.pathing.Pathfinder; -import de.metaphoriker.pathetic.api.pathing.configuration.PathfinderConfiguration; -import de.metaphoriker.pathetic.api.pathing.filter.PathFilter; -import de.metaphoriker.pathetic.api.pathing.filter.PathFilterStage; -import de.metaphoriker.pathetic.api.pathing.result.Path; -import de.metaphoriker.pathetic.api.pathing.result.PathState; -import de.metaphoriker.pathetic.api.pathing.result.PathfinderResult; -import de.metaphoriker.pathetic.api.snapshot.SnapshotManager; -import de.metaphoriker.pathetic.api.wrapper.PathBlock; -import de.metaphoriker.pathetic.api.wrapper.PathPosition; -import de.metaphoriker.pathetic.api.wrapper.PathVector; -import de.metaphoriker.pathetic.model.pathing.Node; -import de.metaphoriker.pathetic.model.pathing.Offset; -import de.metaphoriker.pathetic.model.pathing.result.PathImpl; -import de.metaphoriker.pathetic.model.pathing.result.PathfinderResultImpl; -import de.metaphoriker.pathetic.model.snapshot.FailingSnapshotManager; -import de.metaphoriker.pathetic.util.ErrorLogger; /** * The AbstractPathfinder class provides a skeletal implementation of the Pathfinder interface and @@ -52,31 +45,20 @@ abstract class AbstractPathfinder implements Pathfinder { protected static final Set EMPTY_LINKED_HASHSET = Collections.unmodifiableSet(new LinkedHashSet<>(0)); - private static final SnapshotManager SIMPLE_SNAPSHOT_MANAGER = new FailingSnapshotManager(); - private static final SnapshotManager LOADING_SNAPSHOT_MANAGER = - new FailingSnapshotManager.RequestingSnapshotManager(); - private static final ExecutorService PATHING_EXECUTOR = Executors.newWorkStealingPool(); static { - Pathetic.addShutdownListener(PATHING_EXECUTOR::shutdown); + Runtime.getRuntime().addShutdownHook(new Thread(PATHING_EXECUTOR::shutdown)); } + private final Set pathfinderHooks = new HashSet<>(); + protected final PathfinderConfiguration pathfinderConfiguration; - protected final SnapshotManager snapshotManager; private volatile boolean aborted; protected AbstractPathfinder(PathfinderConfiguration pathfinderConfiguration) { this.pathfinderConfiguration = pathfinderConfiguration; - this.snapshotManager = determineSnapshotManager(pathfinderConfiguration); - } - - private SnapshotManager determineSnapshotManager( - PathfinderConfiguration pathfinderConfiguration) { - return pathfinderConfiguration.isLoadingChunks() - ? LOADING_SNAPSHOT_MANAGER - : SIMPLE_SNAPSHOT_MANAGER; } @Override @@ -96,13 +78,9 @@ private SnapshotManager determineSnapshotManager( if (sharedFilters == null) sharedFilters = Collections.emptyList(); if (filterStages == null) filterStages = Collections.emptyList(); - raiseStartEvent(start, target, sharedFilters, filterStages); - if (shouldSkipPathing(start, target)) { - return CompletableFuture.completedFuture( - finishPathing( - new PathfinderResultImpl( - PathState.INITIALLY_FAILED, new PathImpl(start, target, EMPTY_LINKED_HASHSET)))); + return CompletableFuture.completedFuture(new PathfinderResultImpl( + PathState.INITIALLY_FAILED, new PathImpl(start, target, EMPTY_LINKED_HASHSET))); } return initiatePathing(start, target, sharedFilters, filterStages); @@ -114,10 +92,13 @@ public void abort() { this.aborted = true; } + @Override + public void registerPathfindingHook(PathfinderHook hook) { + pathfinderHooks.add(hook); + } + private boolean shouldSkipPathing(PathPosition start, PathPosition target) { - return !isSameEnvironment(start, target) - || isSameBlock(start, target) - || isFastFailEnabledAndBlockUnreachable(start, target); + return !isSameEnvironment(start, target) || isSameBlock(start, target); } private boolean isSameEnvironment(PathPosition start, PathPosition target) { @@ -128,43 +109,19 @@ private boolean isSameBlock(PathPosition start, PathPosition target) { return start.isInSameBlock(target); } - private boolean isFastFailEnabledAndBlockUnreachable(PathPosition start, PathPosition target) { - return this.pathfinderConfiguration.isAllowingFailFast() - && (isBlockUnreachable(target) || isBlockUnreachable(start)); - } - - private boolean isBlockUnreachable(PathPosition position) { - for (PathVector vector : Offset.MERGED.getVectors()) { - PathPosition offsetPosition = position.add(vector); - PathBlock pathBlock = this.snapshotManager.getBlock(offsetPosition); - if (pathBlock != null && pathBlock.isPassable()) { - return false; - } - } - return true; - } - private CompletionStage initiatePathing( PathPosition start, PathPosition target, List filters, List filterStages) { - pushToBStatsIfActivated(); return pathfinderConfiguration.isAsync() ? CompletableFuture.supplyAsync( () -> executePathingAndCleanupFilters(start, target, filters, filterStages), PATHING_EXECUTOR) - .thenApply(this::finishPathing) .exceptionally(throwable -> handleException(start, target, throwable)) : initiateSyncPathing(start, target, filters, filterStages); } - private void pushToBStatsIfActivated() { - if (pathfinderConfiguration.isBStats()) { - BStatsHandler.increasePathCount(); - } - } - private PathfinderResult executePathing( PathPosition start, PathPosition target, @@ -182,17 +139,19 @@ private PathfinderResult executePathing( while (!nodeQueue.isEmpty() && depth.getDepth() <= pathfinderConfiguration.getMaxIterations()) { + pathfinderHooks.forEach(hook -> hook.onPathfindingStep(new PathfindingContext(depth))); + if (isAborted()) return abortedPathing(fallbackNode); Node currentNode = nodeQueue.deleteMin().getValue(); fallbackNode = currentNode; if (hasReachedLengthLimit(currentNode)) { - return finishPathing(PathState.LENGTH_LIMITED, currentNode); + return new PathfinderResultImpl(PathState.LENGTH_LIMITED, fetchRetracedPath(currentNode)); } if (currentNode.isTarget()) { - return finishPathing(PathState.FOUND, currentNode); + return new PathfinderResultImpl(PathState.FOUND, fetchRetracedPath(currentNode)); } tick( @@ -209,7 +168,7 @@ private PathfinderResult executePathing( private PathfinderResult abortedPathing(Node fallbackNode) { aborted = false; - return finishPathing(PathState.ABORTED, fallbackNode); + return new PathfinderResultImpl(PathState.ABORTED, fetchRetracedPath(fallbackNode)); } private boolean isAborted() { @@ -243,29 +202,8 @@ private PathfinderResult executePathingAndCleanupFilters( private PathfinderResult handleException( PathPosition start, PathPosition target, Throwable throwable) { ErrorLogger.logFatalError("Failed to find path async", throwable); - return finishPathing( - new PathfinderResultImpl( - PathState.FAILED, new PathImpl(start, target, EMPTY_LINKED_HASHSET))); - } - - protected PathfinderResult finishPathing(PathfinderResult pathfinderResult) { - raiseFinishedEvent(pathfinderResult); - return pathfinderResult; - } - - private void raiseFinishedEvent(PathfinderResult pathfinderResult) { - PathingFinishedEvent finishedEvent = new PathingFinishedEvent(pathfinderResult); - EventPublisher.raiseEvent(finishedEvent); - } - - private void raiseStartEvent( - PathPosition start, - PathPosition target, - List filters, - List filterStages) { - PathingStartFindEvent startEvent = - new PathingStartFindEvent(start, target, filters, filterStages); - EventPublisher.raiseEvent(startEvent); + return new PathfinderResultImpl( + PathState.FAILED, new PathImpl(start, target, EMPTY_LINKED_HASHSET)); } private Node createStartNode(PathPosition start, PathPosition target) { @@ -282,10 +220,6 @@ private boolean hasReachedLengthLimit(Node currentNode) { && currentNode.getDepth() > pathfinderConfiguration.getMaxLength(); } - private PathfinderResult finishPathing(PathState pathState, Node currentNode) { - return finishPathing(new PathfinderResultImpl(pathState, fetchRetracedPath(currentNode))); - } - /** If the pathfinder has failed to find a path, it will try to still give a result. */ private PathfinderResult backupPathfindingOrFailure( Depth depth, PathPosition start, PathPosition target, Node fallbackNode) { @@ -298,25 +232,22 @@ private PathfinderResult backupPathfindingOrFailure( Optional fallbackResult = fallback(fallbackNode); return fallbackResult.orElseGet( () -> - finishPathing( - new PathfinderResultImpl( - PathState.FAILED, new PathImpl(start, target, EMPTY_LINKED_HASHSET)))); + new PathfinderResultImpl( + PathState.FAILED, new PathImpl(start, target, EMPTY_LINKED_HASHSET))); } private Optional maxIterationsReached(Depth depth, Node fallbackNode) { if (depth.getDepth() > pathfinderConfiguration.getMaxIterations()) return Optional.of( - finishPathing( - new PathfinderResultImpl( - PathState.MAX_ITERATIONS_REACHED, fetchRetracedPath(fallbackNode)))); + new PathfinderResultImpl( + PathState.MAX_ITERATIONS_REACHED, fetchRetracedPath(fallbackNode))); return Optional.empty(); } private Optional fallback(Node fallbackNode) { if (pathfinderConfiguration.isAllowingFallback()) return Optional.of( - finishPathing( - new PathfinderResultImpl(PathState.FALLBACK, fetchRetracedPath(fallbackNode)))); + new PathfinderResultImpl(PathState.FALLBACK, fetchRetracedPath(fallbackNode))); return Optional.empty(); } diff --git a/pathetic-model/src/main/java/de/metaphoriker/pathetic/model/pathing/result/PathImpl.java b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/result/PathImpl.java similarity index 97% rename from pathetic-model/src/main/java/de/metaphoriker/pathetic/model/pathing/result/PathImpl.java rename to pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/result/PathImpl.java index 987ded3b..a403bccd 100644 --- a/pathetic-model/src/main/java/de/metaphoriker/pathetic/model/pathing/result/PathImpl.java +++ b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/result/PathImpl.java @@ -1,4 +1,4 @@ -package de.metaphoriker.pathetic.model.pathing.result; +package de.metaphoriker.pathetic.engine.result; import com.google.common.collect.Iterables; import java.util.ArrayList; @@ -17,7 +17,7 @@ import de.metaphoriker.pathetic.api.pathing.result.Path; import de.metaphoriker.pathetic.api.util.ParameterizedSupplier; import de.metaphoriker.pathetic.api.wrapper.PathPosition; -import de.metaphoriker.pathetic.util.ErrorLogger; +import de.metaphoriker.pathetic.engine.util.ErrorLogger; @Value public class PathImpl implements Path { diff --git a/pathetic-model/src/main/java/de/metaphoriker/pathetic/model/pathing/result/PathfinderResultImpl.java b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/result/PathfinderResultImpl.java similarity index 94% rename from pathetic-model/src/main/java/de/metaphoriker/pathetic/model/pathing/result/PathfinderResultImpl.java rename to pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/result/PathfinderResultImpl.java index 647e7005..24d494e9 100644 --- a/pathetic-model/src/main/java/de/metaphoriker/pathetic/model/pathing/result/PathfinderResultImpl.java +++ b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/result/PathfinderResultImpl.java @@ -1,4 +1,4 @@ -package de.metaphoriker.pathetic.model.pathing.result; +package de.metaphoriker.pathetic.engine.result; import lombok.AllArgsConstructor; import lombok.NonNull; diff --git a/pathetic-model/src/main/java/de/metaphoriker/pathetic/util/ComputingCache.java b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/util/ComputingCache.java similarity index 87% rename from pathetic-model/src/main/java/de/metaphoriker/pathetic/util/ComputingCache.java rename to pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/util/ComputingCache.java index 59b4c618..af7c4c5c 100644 --- a/pathetic-model/src/main/java/de/metaphoriker/pathetic/util/ComputingCache.java +++ b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/util/ComputingCache.java @@ -1,4 +1,4 @@ -package de.metaphoriker.pathetic.util; +package de.metaphoriker.pathetic.engine.util; import java.util.function.Supplier; diff --git a/pathetic-model/src/main/java/de/metaphoriker/pathetic/util/ErrorLogger.java b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/util/ErrorLogger.java similarity index 81% rename from pathetic-model/src/main/java/de/metaphoriker/pathetic/util/ErrorLogger.java rename to pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/util/ErrorLogger.java index 9d217875..14e65ff7 100644 --- a/pathetic-model/src/main/java/de/metaphoriker/pathetic/util/ErrorLogger.java +++ b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/util/ErrorLogger.java @@ -1,7 +1,7 @@ -package de.metaphoriker.pathetic.util; +package de.metaphoriker.pathetic.engine.util; import lombok.extern.slf4j.Slf4j; -import de.metaphoriker.pathetic.Pathetic; +import de.metaphoriker.pathetic.engine.Pathetic; @Slf4j public class ErrorLogger { @@ -14,8 +14,7 @@ public static IllegalStateException logFatalError(String message, Throwable caus log.error("==============================="); log.error("A fatal error has occurred: {}", message); log.error("Please open an issue on the Pathetic GitHub page with all this information:"); - log.error("Version: {}", Pathetic.getModelVersion()); - log.error("Server Version: {}", Pathetic.getPluginInstance().getServer().getVersion()); + log.error("Version: {}", Pathetic.getEngineVersion()); log.error("Java Version: {}", System.getProperty("java.version")); log.error("OS: {}", System.getProperty("os.name")); log.error("OS Architecture: {}", System.getProperty("os.arch")); diff --git a/pathetic-model/src/main/java/de/metaphoriker/pathetic/util/ExpiringHashMap.java b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/util/ExpiringHashMap.java similarity index 97% rename from pathetic-model/src/main/java/de/metaphoriker/pathetic/util/ExpiringHashMap.java rename to pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/util/ExpiringHashMap.java index 69f62c3b..488dd9fc 100644 --- a/pathetic-model/src/main/java/de/metaphoriker/pathetic/util/ExpiringHashMap.java +++ b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/util/ExpiringHashMap.java @@ -1,4 +1,4 @@ -package de.metaphoriker.pathetic.util; +package de.metaphoriker.pathetic.engine.util; import java.util.concurrent.ConcurrentHashMap; import lombok.Getter; diff --git a/pathetic-model/src/main/java/de/metaphoriker/pathetic/util/GridRegionData.java b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/util/GridRegionData.java similarity index 97% rename from pathetic-model/src/main/java/de/metaphoriker/pathetic/util/GridRegionData.java rename to pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/util/GridRegionData.java index 2627d61a..1f5496f4 100644 --- a/pathetic-model/src/main/java/de/metaphoriker/pathetic/util/GridRegionData.java +++ b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/util/GridRegionData.java @@ -1,4 +1,4 @@ -package de.metaphoriker.pathetic.util; +package de.metaphoriker.pathetic.engine.util; import com.google.common.hash.BloomFilter; import com.google.common.hash.Funnel; diff --git a/pathetic-model/src/main/java/de/metaphoriker/pathetic/util/Tuple3.java b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/util/Tuple3.java similarity index 92% rename from pathetic-model/src/main/java/de/metaphoriker/pathetic/util/Tuple3.java rename to pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/util/Tuple3.java index c1ceb0e1..711f6f87 100644 --- a/pathetic-model/src/main/java/de/metaphoriker/pathetic/util/Tuple3.java +++ b/pathetic-engine/src/main/java/de/metaphoriker/pathetic/engine/util/Tuple3.java @@ -1,4 +1,4 @@ -package de.metaphoriker.pathetic.util; +package de.metaphoriker.pathetic.engine.util; import java.util.Objects; diff --git a/pathetic-engine/src/main/resources/pathetic.properties b/pathetic-engine/src/main/resources/pathetic.properties new file mode 100644 index 00000000..c367fd6b --- /dev/null +++ b/pathetic-engine/src/main/resources/pathetic.properties @@ -0,0 +1 @@ +engine.version=${project.version} diff --git a/pathetic-mapping/src/main/java/de/metaphoriker/pathetic/mapping/PatheticFacade.java b/pathetic-mapping/src/main/java/de/metaphoriker/pathetic/mapping/PatheticFacade.java deleted file mode 100644 index 086e685f..00000000 --- a/pathetic-mapping/src/main/java/de/metaphoriker/pathetic/mapping/PatheticFacade.java +++ /dev/null @@ -1,29 +0,0 @@ -package de.metaphoriker.pathetic.mapping; - -import de.metaphoriker.pathetic.Pathetic; -import lombok.experimental.UtilityClass; -import org.bukkit.plugin.java.JavaPlugin; - -/** PatheticMapper is a utility class that maps the Pathetic API to the Pathetic Implementation. */ -@UtilityClass -public class PatheticFacade { - - /** - * @apiNote If Pathetic is not initialized yet but is used anyways, this will cause many things to - * break. - * @param javaPlugin the JavaPlugin which initializes the lib - * @throws IllegalStateException If an attempt is made to initialize more than once - */ - public void initialize(JavaPlugin javaPlugin) { - Pathetic.initialize(javaPlugin); - } - - /** - * Signals Pathetic to initiate its shutdown process, releasing resources and finalizing - * operations. This method should be called when Pathetic is no longer needed or the plugin is - * being disabled. - */ - public void shutdown() { - Pathetic.shutdown(); - } -} diff --git a/pathetic-mapping/src/main/java/de/metaphoriker/pathetic/mapping/PathfinderFactory.java b/pathetic-mapping/src/main/java/de/metaphoriker/pathetic/mapping/PathfinderFactory.java deleted file mode 100644 index 4e61e0a5..00000000 --- a/pathetic-mapping/src/main/java/de/metaphoriker/pathetic/mapping/PathfinderFactory.java +++ /dev/null @@ -1,27 +0,0 @@ -package de.metaphoriker.pathetic.mapping; - -import de.metaphoriker.pathetic.Pathetic; -import de.metaphoriker.pathetic.api.pathing.Pathfinder; -import de.metaphoriker.pathetic.api.pathing.configuration.PathfinderConfiguration; -import de.metaphoriker.pathetic.model.pathing.pathfinder.AStarPathfinder; -import de.metaphoriker.pathetic.util.ErrorLogger; - -/** A factory class for creating {@link Pathfinder} instances. */ -public final class PathfinderFactory { - - private PathfinderFactory() {} - - /** - * Creates a new {@link Pathfinder} instance. - * - * @param pathfinderConfiguration The configuration for the pathfinder. - * @return A new {@link Pathfinder} instance. - * @throws IllegalStateException If Pathetic is not initialized. - */ - public static Pathfinder createPathfinder(PathfinderConfiguration pathfinderConfiguration) { - if (!Pathetic.isInitialized()) { - throw ErrorLogger.logFatalError("Pathetic is not initialized yet."); - } - return new AStarPathfinder(pathfinderConfiguration); - } -} diff --git a/pathetic-model/pom.xml b/pathetic-model/pom.xml deleted file mode 100644 index 9f2a9c45..00000000 --- a/pathetic-model/pom.xml +++ /dev/null @@ -1,125 +0,0 @@ - - 4.0.0 - - - pathetic-main - de.metaphoriker - 3.3.1 - - - pathetic-model - 3.3.1 - - - - - src/main/resources - true - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.5.1 - - - - org.bstats - de.metaphoriker.pathetic.shaded.bstats - - - org.jheaps - de.metaphoriker.pathetic.shaded.jheaps - - - - - org.jheaps:jheaps - - org/jheaps/tree/FibonacciHeap.class - org/jheaps/tree/FibonacciHeap$Node.class - org/jheaps/annotations/ConstantTime.class - org/jheaps/annotations/LogarithmicTime.class - org/jheaps/MergeableAddressableHeap.class - org/jheaps/AddressableHeap.class - org/jheaps/AddressableHeap$Handle.class - - - - - - - package - - shade - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 8 - 8 - - - - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - - - - org.spigotmc - spigot-api - - - org.projectlombok - lombok - - - org.slf4j - slf4j-api - - - com.google.guava - guava - 33.3.1-jre - provided - - - de.metaphoriker - pathetic-api - 3.3.1 - compile - - - de.metaphoriker - pathetic-nms - 3.3.1 - compile - - - org.bstats - bstats-bukkit - 3.1.0 - compile - - - org.jheaps - jheaps - 0.14 - compile - - - diff --git a/pathetic-model/src/main/java/de/metaphoriker/pathetic/BStatsHandler.java b/pathetic-model/src/main/java/de/metaphoriker/pathetic/BStatsHandler.java deleted file mode 100644 index 2e27e918..00000000 --- a/pathetic-model/src/main/java/de/metaphoriker/pathetic/BStatsHandler.java +++ /dev/null @@ -1,42 +0,0 @@ -package de.metaphoriker.pathetic; - -import lombok.experimental.UtilityClass; -import org.bstats.bukkit.Metrics; -import org.bstats.charts.SimplePie; -import org.bstats.charts.SingleLineChart; -import org.bukkit.plugin.java.JavaPlugin; - -@UtilityClass -public class BStatsHandler { - - private Metrics metrics; - - private int paths; - - private void init(JavaPlugin javaPlugin) { - if (metrics != null) return; - - metrics = new Metrics(javaPlugin, 20529); - metrics.addCustomChart( - new SingleLineChart( - "total_paths", - () -> { - int totalPaths = paths; - paths = 0; - return totalPaths; - })); - metrics.addCustomChart(new SimplePie("pathetic-model_version", Pathetic::getModelVersion)); - } - - private void makeSureBStatsIsInitialized() { - if (!Pathetic.isInitialized()) - throw new IllegalStateException("Pathetic has not been initialized yet"); - - init(Pathetic.getPluginInstance()); - } - - public synchronized void increasePathCount() { - makeSureBStatsIsInitialized(); - paths++; - } -} diff --git a/pathetic-model/src/main/java/de/metaphoriker/pathetic/Pathetic.java b/pathetic-model/src/main/java/de/metaphoriker/pathetic/Pathetic.java deleted file mode 100644 index 433e8bf4..00000000 --- a/pathetic-model/src/main/java/de/metaphoriker/pathetic/Pathetic.java +++ /dev/null @@ -1,81 +0,0 @@ -package de.metaphoriker.pathetic; - -import java.io.IOException; -import java.io.InputStream; -import java.util.HashSet; -import java.util.Properties; -import java.util.Set; -import lombok.Getter; -import lombok.experimental.UtilityClass; -import lombok.extern.slf4j.Slf4j; -import org.bukkit.Bukkit; -import org.bukkit.plugin.java.JavaPlugin; -import de.metaphoriker.pathetic.bukkit.listeners.ChunkInvalidateListener; -import de.metaphoriker.pathetic.util.BukkitVersionUtil; -import de.metaphoriker.pathetic.util.ErrorLogger; - -@UtilityClass -@Slf4j -public class Pathetic { - - private static final String PROPERTIES_FILE = "pathetic.properties"; - - private static final Set SHUTDOWN_LISTENERS = new HashSet<>(); - - private static JavaPlugin instance; - @Getter private static String modelVersion; - - /** - * @throws IllegalStateException If an attempt is made to initialize more than 1 time - */ - public static void initialize(JavaPlugin javaPlugin) { - - if (instance != null) throw ErrorLogger.logFatalError("Can't be initialized twice"); - - instance = javaPlugin; - Bukkit.getPluginManager().registerEvents(new ChunkInvalidateListener(), javaPlugin); - - loadModelVersion(); - - if (BukkitVersionUtil.getVersion().isUnder(16, 0) - || BukkitVersionUtil.getVersion().isEqual(BukkitVersionUtil.Version.of(16, 0))) { - log.warn( - "Pathetic is currently running in a version older than or equal to 1.16. " - + "Some functionalities might not be accessible, such as accessing the BlockState of blocks."); - } - - log.debug("Pathetic v{} initialized", modelVersion); - } - - public static void shutdown() { - SHUTDOWN_LISTENERS.forEach(Runnable::run); - SHUTDOWN_LISTENERS.clear(); - - instance = null; - log.debug("Pathetic shutdown"); - } - - public static boolean isInitialized() { - return instance != null; - } - - public static JavaPlugin getPluginInstance() { - return instance; - } - - public static void addShutdownListener(Runnable listener) { - SHUTDOWN_LISTENERS.add(listener); - } - - private static void loadModelVersion() { - try (InputStream inputStream = - Pathetic.class.getClassLoader().getResourceAsStream(PROPERTIES_FILE)) { - Properties properties = new Properties(); - properties.load(inputStream); - - modelVersion = properties.getProperty("model.version"); - } catch (IOException e) { - throw ErrorLogger.logFatalError("Error loading model version", e); - } - } -} diff --git a/pathetic-model/src/main/resources/pathetic.properties b/pathetic-model/src/main/resources/pathetic.properties deleted file mode 100644 index 4c5349c4..00000000 --- a/pathetic-model/src/main/resources/pathetic.properties +++ /dev/null @@ -1 +0,0 @@ -model.version=${project.version} \ No newline at end of file diff --git a/pom.xml b/pom.xml index a6854d2d..1f4c365e 100644 --- a/pom.xml +++ b/pom.xml @@ -17,27 +17,29 @@ pathetic-api - pathetic-example - pathetic-mapping - pathetic-nms - pathetic-nms/paper - pathetic-model - pathetic-nms/v1_8 - pathetic-nms/v1_12 - pathetic-nms/v1_15 - pathetic-nms/v1_16 - pathetic-nms/v1_17 - pathetic-nms/v1_18 - pathetic-nms/v1_18_R2 - pathetic-nms/v1_19_R2 - pathetic-nms/v1_19_R3 - pathetic-nms/v1_20_R1 - pathetic-nms/v1_20_R2 - pathetic-nms/v1_20_R3 - pathetic-nms/v1_20_R4 - pathetic-nms/v1_21_R1 - pathetic-nms/v1_21_R2 - pathetic-nms/v1_21_R3 + pathetic-bukkit + pathetic-bukkit/pathetic-example + pathetic-engine + pathetic-bukkit/pathetic-provider + pathetic-bukkit/pathetic-provider/paper + pathetic-bukkit/pathetic-provider/spigot + pathetic-bukkit/pathetic-provider/spigot/v1_8 + pathetic-bukkit/pathetic-provider/spigot/v1_12 + pathetic-bukkit/pathetic-provider/spigot/v1_15 + pathetic-bukkit/pathetic-provider/spigot/v1_16 + pathetic-bukkit/pathetic-provider/spigot/v1_17 + pathetic-bukkit/pathetic-provider/spigot/v1_18 + pathetic-bukkit/pathetic-provider/spigot/v1_18_R2 + pathetic-bukkit/pathetic-provider/spigot/v1_19_R2 + pathetic-bukkit/pathetic-provider/spigot/v1_19_R3 + pathetic-bukkit/pathetic-provider/spigot/v1_20_R1 + pathetic-bukkit/pathetic-provider/spigot/v1_20_R2 + pathetic-bukkit/pathetic-provider/spigot/v1_20_R3 + pathetic-bukkit/pathetic-provider/spigot/v1_20_R4 + pathetic-bukkit/pathetic-provider/spigot/v1_21_R1 + pathetic-bukkit/pathetic-provider/spigot/v1_21_R2 + pathetic-bukkit/pathetic-provider/spigot/v1_21_R3 + pathetic-bukkit/pathetic-provider/resolver @@ -45,7 +47,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.11.1 + 3.11.2 ${project.reporting.outputDirectory}/myoutput myapidocs @@ -63,24 +65,6 @@ - - org.spigotmc - spigot-api - 1.21.4-R0.1-SNAPSHOT - provided - - - org.projectlombok - lombok - 1.18.36 - provided - - - org.slf4j - slf4j-api - 2.0.16 - provided - de.metaphoriker pathetic-api @@ -97,7 +81,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.11.1 + 3.11.2 8 ../