diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..ae7baf5 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,14 @@ +# These are supported funding model platforms + +github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +patreon: battleplugins +open_collective: # Replace with a single Open Collective username +ko_fi: # Replace with a single Ko-fi username +tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel +community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry +liberapay: # Replace with a single Liberapay username +issuehunt: # Replace with a single IssueHunt username +lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry +polar: # Replace with a single Polar username +buy_me_a_coffee: # Replace with a single Buy Me a Coffee username +custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..d7eadab --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,26 @@ +name: Build + +on: + push: + branches: [ rewrite ] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v2 + with: + java-version: '17' + distribution: 'adopt' + cache: gradle + - name: Build with Gradle + run: ./gradlew build + - name: Publish to Modrinth + if: ${{ success() && github.repository == 'BattlePlugins/ArenaSpleef' && github.ref_name == 'master' }} + env: + CHANGELOG: ${{ github.event.head_commit.message }} + BUILD_NUMBER: ${{ github.run_number }} + MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} + run: ./gradlew modrinth \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b63da45 --- /dev/null +++ b/.gitignore @@ -0,0 +1,42 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md new file mode 100644 index 0000000..e69de29 diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..32b2bd6 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,64 @@ +plugins { + id("java") + id("java-library") + id("xyz.jpenilla.run-paper") version "2.3.0" + id("com.modrinth.minotaur") version "2.+" +} + +group = "org.battleplugins.arena" +version = "2.0.0-SNAPSHOT" + +val supportedVersions = listOf("1.19.4", "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6", "1.21") + +java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) + +repositories { + mavenCentral() + + maven("https://repo.papermc.io/repository/maven-public/") + maven("https://repo.battleplugins.org/releases/") + maven("https://repo.battleplugins.org/snapshots/") +} + +dependencies { + api("io.papermc.paper:paper-api:1.19.4-R0.1-SNAPSHOT") + api("org.battleplugins:arena:4.0.0-SNAPSHOT") +} + +tasks { + runServer { + minecraftVersion("1.20.6") + + // Set Java 21 (1.20.6 requires Java 21) + javaLauncher = project.javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(21) + } + } + + jar { + from("src/main/java/resources") { + include("*") + } + + archiveFileName.set("ArenaSpleef.jar") + archiveClassifier.set("") + } + + processResources { + filesMatching("plugin.yml") { + expand("version" to rootProject.version) + } + } +} + +modrinth { + val snapshot = "SNAPSHOT" in rootProject.version.toString() + + token.set(System.getenv("MODRINTH_TOKEN") ?: "") + projectId.set("arenaspleef") + versionNumber.set(rootProject.version as String + if (snapshot) "-" + System.getenv("BUILD_NUMBER") else "") + versionType.set(if (snapshot) "beta" else "release") + changelog.set(System.getenv("CHANGELOG") ?: "") + uploadFile.set(tasks.jar) + gameVersions.set(supportedVersions) +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..249e583 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..fbc673c --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sun Jun 30 13:07:35 CDT 2024 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1b6c787 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..e600667 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,16 @@ +rootProject.name = "ArenaSpleef" + +dependencyResolutionManagement { + repositories { + mavenCentral() + + // Paper, Velocity + maven("https://repo.papermc.io/repository/maven-public/") + } +} + +pluginManagement { + repositories { + gradlePluginPortal() + } +} \ No newline at end of file diff --git a/src/main/java/org/battleplugins/arena/spleef/ArenaSpleef.java b/src/main/java/org/battleplugins/arena/spleef/ArenaSpleef.java new file mode 100644 index 0000000..4f9b6b5 --- /dev/null +++ b/src/main/java/org/battleplugins/arena/spleef/ArenaSpleef.java @@ -0,0 +1,57 @@ +package org.battleplugins.arena.spleef; + +import org.battleplugins.arena.BattleArena; +import org.battleplugins.arena.config.ArenaConfigParser; +import org.battleplugins.arena.config.ParseException; +import org.battleplugins.arena.event.action.EventActionType; +import org.bukkit.configuration.Configuration; +import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.plugin.java.JavaPlugin; + +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; + +public class ArenaSpleef extends JavaPlugin { + public static EventActionType GIVE_SHOVEL = EventActionType.create("give-shovel", GiveShovelAction.class, GiveShovelAction::new); + public static EventActionType PASTE_LAYERS = EventActionType.create("paste-layers", PasteLayersAction.class, PasteLayersAction::new); + + private static ArenaSpleef instance; + + private SpleefConfig config; + + @Override + public void onEnable() { + instance = this; + + this.saveDefaultConfig(); + + File configFile = new File(this.getDataFolder(), "config.yml"); + Configuration config = YamlConfiguration.loadConfiguration(configFile); + try { + this.config = ArenaConfigParser.newInstance(configFile.toPath(), SpleefConfig.class, config); + } catch (ParseException e) { + ParseException.handle(e); + + this.getSLF4JLogger().error("Failed to load Spleef configuration! Disabling plugin."); + this.getServer().getPluginManager().disablePlugin(this); + return; + } + + Path dataFolder = this.getDataFolder().toPath(); + Path arenasPath = dataFolder.resolve("arenas"); + if (Files.notExists(arenasPath)) { + this.saveResource("arenas/spleef.yml", false); + } + + BattleArena.getInstance().registerArena(this, "Spleef", SpleefArena.class, SpleefArena::new); + } + + public SpleefConfig getMainConfig() { + return this.config; + } + + public static ArenaSpleef getInstance() { + return instance; + } +} diff --git a/src/main/java/org/battleplugins/arena/spleef/GiveShovelAction.java b/src/main/java/org/battleplugins/arena/spleef/GiveShovelAction.java new file mode 100644 index 0000000..d1506a6 --- /dev/null +++ b/src/main/java/org/battleplugins/arena/spleef/GiveShovelAction.java @@ -0,0 +1,26 @@ +package org.battleplugins.arena.spleef; + +import org.battleplugins.arena.ArenaPlayer; +import org.battleplugins.arena.event.action.EventAction; +import org.bukkit.inventory.ItemStack; + +import java.util.Map; + +public class GiveShovelAction extends EventAction { + private static final String SHOVEL_KEY = "shovel"; + + public GiveShovelAction(Map params, String... requiredKeys) { + super(params, requiredKeys); + } + + @Override + public void call(ArenaPlayer arenaPlayer) { + ItemStack shovel = ArenaSpleef.getInstance().getMainConfig().getShovel(this.get(SHOVEL_KEY)); + if (shovel == null) { + ArenaSpleef.getInstance().getSLF4JLogger().warn("Invalid shovel " + this.get(SHOVEL_KEY) + ". Not giving shovel to player."); + return; + } + + arenaPlayer.getPlayer().getInventory().addItem(shovel); + } +} diff --git a/src/main/java/org/battleplugins/arena/spleef/PasteLayersAction.java b/src/main/java/org/battleplugins/arena/spleef/PasteLayersAction.java new file mode 100644 index 0000000..9e6e2b3 --- /dev/null +++ b/src/main/java/org/battleplugins/arena/spleef/PasteLayersAction.java @@ -0,0 +1,27 @@ +package org.battleplugins.arena.spleef; + +import org.battleplugins.arena.Arena; +import org.battleplugins.arena.ArenaPlayer; +import org.battleplugins.arena.competition.Competition; +import org.battleplugins.arena.event.action.EventAction; + +import java.util.Map; + +public class PasteLayersAction extends EventAction { + public PasteLayersAction(Map params) { + super(params); + } + + @Override + public void call(ArenaPlayer arenaPlayer) { + } + + @Override + public void postProcess(Arena arena, Competition competition) { + if (!(competition instanceof SpleefCompetition spleefCompetition)) { + return; + } + + spleefCompetition.pasteLayers(); + } +} diff --git a/src/main/java/org/battleplugins/arena/spleef/SpleefArena.java b/src/main/java/org/battleplugins/arena/spleef/SpleefArena.java new file mode 100644 index 0000000..15349a9 --- /dev/null +++ b/src/main/java/org/battleplugins/arena/spleef/SpleefArena.java @@ -0,0 +1,81 @@ +package org.battleplugins.arena.spleef; + +import org.battleplugins.arena.Arena; +import org.battleplugins.arena.ArenaPlayer; +import org.battleplugins.arena.command.ArenaCommandExecutor; +import org.battleplugins.arena.competition.map.MapFactory; +import org.battleplugins.arena.competition.phase.CompetitionPhaseType; +import org.battleplugins.arena.config.ArenaOption; +import org.battleplugins.arena.event.ArenaEventHandler; +import org.battleplugins.arena.event.arena.ArenaPhaseCompleteEvent; +import org.battleplugins.arena.event.arena.ArenaPhaseStartEvent; +import org.battleplugins.arena.options.ArenaOptionType; +import org.battleplugins.arena.options.types.BooleanArenaOption; +import org.bukkit.event.EventPriority; +import org.bukkit.event.block.BlockBreakEvent; + +import java.time.Duration; + +public class SpleefArena extends Arena { + + @ArenaOption(name = "layer-decay-delay", description = "The delay before each layer decays.") + private Duration layerDecayDelay = Duration.ofMinutes(2); + + @ArenaOption(name = "layer-decay-time", description = "The time it takes to decay and entire layer.") + private Duration layerDecayTime = Duration.ofMinutes(1); + + @Override + public ArenaCommandExecutor createCommandExecutor() { + return new SpleefExecutor(this); + } + + @Override + public MapFactory getMapFactory() { + return SpleefMap.FACTORY; + } + + @ArenaEventHandler + public void onPhaseStart(ArenaPhaseStartEvent event) { + if (!CompetitionPhaseType.INGAME.equals(event.getPhase().getType())) { + return; + } + + if (event.getCompetition() instanceof SpleefCompetition spleefCompetition) { + spleefCompetition.beginLayerDecay(); + } + } + + @ArenaEventHandler + public void onPhaseComplete(ArenaPhaseCompleteEvent event) { + if (!CompetitionPhaseType.INGAME.equals(event.getPhase().getType())) { + return; + } + + if (event.getCompetition() instanceof SpleefCompetition spleefCompetition) { + spleefCompetition.stopLayerDecay(); + } + } + + @ArenaEventHandler(priority = EventPriority.LOW) + public void onBlockBreak(BlockBreakEvent event, ArenaPlayer player) { + if (player.getCompetition().option(ArenaOptionType.BLOCK_BREAK).map(BooleanArenaOption::isEnabled).orElse(true)) { + return; // Game already allows block breaking + } + + SpleefMap spleefMap = (SpleefMap) player.getCompetition().getMap(); + for (SpleefMap.Layer layer : spleefMap.getLayers()) { + if (layer.getBounds().isInside(event.getBlock().getLocation())) { + event.setCancelled(false); + return; + } + } + } + + public Duration getLayerDecayDelay() { + return this.layerDecayDelay; + } + + public Duration getLayerDecayTime() { + return this.layerDecayTime; + } +} diff --git a/src/main/java/org/battleplugins/arena/spleef/SpleefCompetition.java b/src/main/java/org/battleplugins/arena/spleef/SpleefCompetition.java new file mode 100644 index 0000000..c8a80fc --- /dev/null +++ b/src/main/java/org/battleplugins/arena/spleef/SpleefCompetition.java @@ -0,0 +1,96 @@ +package org.battleplugins.arena.spleef; + +import org.battleplugins.arena.competition.CompetitionType; +import org.battleplugins.arena.competition.LiveCompetition; +import org.bukkit.Bukkit; +import org.bukkit.Material; +import org.bukkit.block.Block; +import org.bukkit.scheduler.BukkitRunnable; +import org.bukkit.scheduler.BukkitTask; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class SpleefCompetition extends LiveCompetition { + private final SpleefArena arena; + private final SpleefMap map; + + private final List decayTasks = new ArrayList<>(); + + public SpleefCompetition(SpleefArena arena, CompetitionType type, SpleefMap map) { + super(arena, type, map); + + this.arena = arena; + this.map = map; + } + + public void beginLayerDecay() { + List layers = new ArrayList<>(this.map.getLayers()); + layers.sort((layer1, layer2) -> layer2.getBounds().getMaxY() - layer1.getBounds().getMaxY()); + + for (int i = 0; i < layers.size(); i++) { + SpleefMap.Layer layer = layers.get(i); + + long delay = (i + 1) * this.arena.getLayerDecayDelay().toSeconds() * 20; + BukkitTask decayTask = Bukkit.getScheduler().runTaskLater(ArenaSpleef.getInstance(), () -> { + Duration layerDecayTime = this.arena.getLayerDecayTime(); + List blocks = new ArrayList<>(layer.getBounds().getVolume()); + + for (int x = layer.getBounds().getMinX(); x <= layer.getBounds().getMaxX(); x++) { + for (int y = layer.getBounds().getMinY(); y <= layer.getBounds().getMaxY(); y++) { + for (int z = layer.getBounds().getMinZ(); z <= layer.getBounds().getMaxZ(); z++) { + blocks.add(this.map.getWorld().getBlockAt(x, y, z)); + } + } + } + + Collections.shuffle(blocks); + + long totalDecayTimeTicks = layerDecayTime.getSeconds() * 20; + long intervalBetweenDecayTicks = totalDecayTimeTicks / blocks.size(); + + this.decayTasks.add(new BukkitRunnable() { + private int index = 0; + + @Override + public void run() { + if (index >= blocks.size()) { + this.cancel(); + return; + } + + Block block = blocks.get(index); + block.setType(Material.AIR); + + this.index++; + } + }.runTaskTimer(ArenaSpleef.getInstance(), 0, intervalBetweenDecayTicks)); + }, delay); + + this.decayTasks.add(decayTask); + } + } + + public void stopLayerDecay() { + for (BukkitTask decayTask : this.decayTasks) { + decayTask.cancel(); + } + + this.decayTasks.clear(); + } + + public void pasteLayers() { + List layers = this.map.getLayers(); + for (SpleefMap.Layer layer : layers) { + for (int x = layer.getBounds().getMinX(); x <= layer.getBounds().getMaxX(); x++) { + for (int y = layer.getBounds().getMinY(); y <= layer.getBounds().getMaxY(); y++) { + for (int z = layer.getBounds().getMinZ(); z <= layer.getBounds().getMaxZ(); z++) { + this.map.getWorld().getBlockAt(x, y, z).setBlockData(layer.getBlockData()); + } + } + } + } + } +} diff --git a/src/main/java/org/battleplugins/arena/spleef/SpleefConfig.java b/src/main/java/org/battleplugins/arena/spleef/SpleefConfig.java new file mode 100644 index 0000000..10f140b --- /dev/null +++ b/src/main/java/org/battleplugins/arena/spleef/SpleefConfig.java @@ -0,0 +1,18 @@ +package org.battleplugins.arena.spleef; + +import org.battleplugins.arena.config.ArenaOption; +import org.bukkit.inventory.ItemStack; +import org.jetbrains.annotations.Nullable; + +import java.util.Map; + +public class SpleefConfig { + + @ArenaOption(name = "shovels", description = "The shovels for this spleef game.", required = true) + private Map shovels; + + @Nullable + public ItemStack getShovel(String name) { + return this.shovels == null ? null : this.shovels.get(name); + } +} diff --git a/src/main/java/org/battleplugins/arena/spleef/SpleefExecutor.java b/src/main/java/org/battleplugins/arena/spleef/SpleefExecutor.java new file mode 100644 index 0000000..1f1160e --- /dev/null +++ b/src/main/java/org/battleplugins/arena/spleef/SpleefExecutor.java @@ -0,0 +1,100 @@ +package org.battleplugins.arena.spleef; + +import org.battleplugins.arena.command.ArenaCommand; +import org.battleplugins.arena.command.ArenaCommandExecutor; +import org.battleplugins.arena.command.Argument; +import org.battleplugins.arena.competition.map.CompetitionMap; +import org.battleplugins.arena.competition.map.options.Bounds; +import org.battleplugins.arena.spleef.editor.SpleefEditorWizards; +import org.bukkit.entity.Player; + +public class SpleefExecutor extends ArenaCommandExecutor { + + public SpleefExecutor(SpleefArena arena) { + super(arena); + } + + @ArenaCommand(commands = "layer", subCommands = "add", description = "Adds a layer to a spleef arena.", permissionNode = "layer.add") + public void layer(Player player, CompetitionMap map) { + if (!(map instanceof SpleefMap spleefMap)) { + return; // Should not happen but just incase + } + + SpleefEditorWizards.ADD_LAYER.openWizard(player, this.arena, ctx -> ctx.setMap(spleefMap)); + } + + @ArenaCommand(commands = "layer", subCommands = "remove", description = "Removes a layer from a spleef arena.", permissionNode = "layer.remove") + public void removeLayer(Player player, CompetitionMap map, @Argument(name = "index") int index) { + if (!(map instanceof SpleefMap spleefMap)) { + return; // Should not happen but just incase + } + + index--; + + if (index < 0 || index >= spleefMap.getLayers().size()) { + SpleefMessages.INVALID_LAYER.send(player, Integer.toString(spleefMap.getLayers().size())); + return; + } + + spleefMap.removeLayer(spleefMap.getLayers().get(index)); + SpleefMessages.LAYER_REMOVED.send(player); + } + + @ArenaCommand(commands = "layer", subCommands = "clear", description = "Clears all layers from a spleef arena.", permissionNode = "layer.clear") + public void clearLayer(Player player, CompetitionMap map) { + if (!(map instanceof SpleefMap spleefMap)) { + return; // Should not happen but just incase + } + + spleefMap.clearLayers(); + SpleefMessages.LAYER_REMOVED_ALL.send(player); + } + + @ArenaCommand(commands = "layer", subCommands = "index", description = "Changes the index of a layer.", permissionNode = "layer.index") + public void indexLayer(Player player, CompetitionMap map, @Argument(name = "from") int from, @Argument(name = "to") int to) { + if (!(map instanceof SpleefMap spleefMap)) { + return; // Should not happen but just incase + } + + from--; + to--; + + if (spleefMap.getLayers().isEmpty()) { + SpleefMessages.NO_LAYERS.send(player); + return; + } + + if (from < 0 || from >= spleefMap.getLayers().size() || to < 0 || to >= spleefMap.getLayers().size()) { + SpleefMessages.INVALID_LAYER.send(player, Integer.toString(spleefMap.getLayers().size())); + return; + } + + SpleefMap.Layer layer = spleefMap.getLayers().get(from); + spleefMap.removeLayer(layer); + spleefMap.addLayer(to, layer); + + SpleefMessages.LAYER_INDEX_CHANGED.send(player); + } + + @ArenaCommand(commands = "layer", subCommands = "list", description = "Lists all layers in a spleef arena.", permissionNode = "layer.list") + public void listLayers(Player player, CompetitionMap map) { + if (!(map instanceof SpleefMap spleefMap)) { + return; // Should not happen but just incase + } + + if (spleefMap.getLayers().isEmpty()) { + SpleefMessages.NO_LAYERS.send(player); + return; + } + + this.sendHeader(player); + for (int i = 0; i < spleefMap.getLayers().size(); i++) { + SpleefMap.Layer layer = spleefMap.getLayers().get(i); + Bounds bounds = layer.getBounds(); + String minBounds = bounds.getMinX() + ", " + bounds.getMinY() + ", " + bounds.getMinZ(); + String maxBounds = bounds.getMaxX() + ", " + bounds.getMaxY() + ", " + bounds.getMaxZ(); + + SpleefMessages.LAYER_INFO.send(player, Integer.toString(i + 1), minBounds, maxBounds, layer.getBlockData().getAsString()); + } + } +} diff --git a/src/main/java/org/battleplugins/arena/spleef/SpleefMap.java b/src/main/java/org/battleplugins/arena/spleef/SpleefMap.java new file mode 100644 index 0000000..2b079f0 --- /dev/null +++ b/src/main/java/org/battleplugins/arena/spleef/SpleefMap.java @@ -0,0 +1,90 @@ +package org.battleplugins.arena.spleef; + +import org.battleplugins.arena.Arena; +import org.battleplugins.arena.competition.Competition; +import org.battleplugins.arena.competition.map.LiveCompetitionMap; +import org.battleplugins.arena.competition.map.MapFactory; +import org.battleplugins.arena.competition.map.MapType; +import org.battleplugins.arena.competition.map.options.Bounds; +import org.battleplugins.arena.competition.map.options.Spawns; +import org.battleplugins.arena.config.ArenaOption; +import org.bukkit.block.data.BlockData; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.List; + +public class SpleefMap extends LiveCompetitionMap { + static final MapFactory FACTORY = MapFactory.create(SpleefMap.class, SpleefMap::new); + + @ArenaOption(name = "layers", description = "The layers for this spleef map.") + private List layers; + + public SpleefMap() { + } + + public SpleefMap(String name, Arena arena, MapType type, String world, @Nullable Bounds bounds, @Nullable Spawns spawns) { + super(name, arena, type, world, bounds, spawns); + } + + @Override + public Competition createCompetition(Arena arena) { + if (!(arena instanceof SpleefArena spleefArena)) { + throw new IllegalArgumentException("Arena must be a spleef arena!"); + } + + return new SpleefCompetition(spleefArena, arena.getType(), this); + } + + public List getLayers() { + return this.layers == null ? List.of() : List.copyOf(this.layers); + } + + public void addLayer(Layer layer) { + if (this.layers == null) { + this.layers = new ArrayList<>(); + } + + this.layers.add(layer); + } + + public void addLayer(int index, Layer layer) { + if (this.layers == null) { + this.layers = new ArrayList<>(); + } + + this.layers.add(index, layer); + } + + public void removeLayer(Layer layer) { + this.layers.remove(layer); + } + + public void clearLayers() { + this.layers.clear(); + } + + public static class Layer { + @ArenaOption(name = "bounds", description = "The bounds of this layer.", required = true) + private Bounds bounds; + + @ArenaOption(name = "block-data", description = "The block data of this layer.", required = true) + private BlockData blockData; + + public Layer() { + } + + public Layer(Bounds bounds, BlockData blockData) { + this.bounds = bounds; + this.blockData = blockData; + } + + public Bounds getBounds() { + return this.bounds; + } + + public BlockData getBlockData() { + return this.blockData; + } + } +} diff --git a/src/main/java/org/battleplugins/arena/spleef/SpleefMessages.java b/src/main/java/org/battleplugins/arena/spleef/SpleefMessages.java new file mode 100644 index 0000000..ee8d93d --- /dev/null +++ b/src/main/java/org/battleplugins/arena/spleef/SpleefMessages.java @@ -0,0 +1,19 @@ +package org.battleplugins.arena.spleef; + +import org.battleplugins.arena.messages.Message; +import org.battleplugins.arena.messages.Messages; + +public final class SpleefMessages { + public static final Message LAYER_SET_MIN_POSITION = Messages.info("spleef-editor-layer-set-min-position", "Click a block to set the minimum (first) position of the layer."); + public static final Message LAYER_SET_MAX_POSITION = Messages.info("spleef-editor-layer-set-max-position", "Click a block to set the maximum (second) position of the layer."); + public static final Message LAYER_SET_BLOCK_DATA = Messages.info("spleef-editor-set-block-data", "Enter the name of the block the layer should be made of. Type \"cancel\" to cancel."); + public static final Message LAYER_SET_BLOCK_DATA_INVALID = Messages.error("spleef-set-block-data-invalid", "Invalid block name. Please try again."); + + public static final Message LAYER_ADDED = Messages.success("spleef-layer-added", "Layer added successfully!"); + public static final Message LAYER_REMOVED = Messages.success("spleef-layer-removed", "Layer removed successfully!"); + public static final Message LAYER_REMOVED_ALL = Messages.success("spleef-layer-removed-all", "All layers removed successfully!"); + public static final Message LAYER_INDEX_CHANGED = Messages.success("spleef-layer-index-changed", "Layer index changed successfully!"); + public static final Message LAYER_INFO = Messages.info("spleef-layer-info", "Layer #{}: Min: {}, Max: {}, Block: {}"); + public static final Message INVALID_LAYER = Messages.error("spleef-invalid-layer", "Invalid layer! There are only {} layers."); + public static final Message NO_LAYERS = Messages.error("spleef-no-layers", "There are no layers in this map!"); +} diff --git a/src/main/java/org/battleplugins/arena/spleef/editor/AddLayerContext.java b/src/main/java/org/battleplugins/arena/spleef/editor/AddLayerContext.java new file mode 100644 index 0000000..7c22ba6 --- /dev/null +++ b/src/main/java/org/battleplugins/arena/spleef/editor/AddLayerContext.java @@ -0,0 +1,57 @@ +package org.battleplugins.arena.spleef.editor; + +import io.papermc.paper.math.Position; +import org.battleplugins.arena.Arena; +import org.battleplugins.arena.editor.ArenaEditorWizard; +import org.battleplugins.arena.editor.EditorContext; +import org.battleplugins.arena.spleef.SpleefMap; +import org.bukkit.block.data.BlockData; +import org.bukkit.entity.Player; + +public class AddLayerContext extends EditorContext { + private SpleefMap map; + private Position min; + private Position max; + private BlockData blockData; + + public AddLayerContext(ArenaEditorWizard wizard, Arena arena, Player player) { + super(wizard, arena, player); + } + + public SpleefMap getMap() { + return this.map; + } + + public void setMap(SpleefMap map) { + this.map = map; + } + + public Position getMin() { + return this.min; + } + + public void setMin(Position min) { + this.min = min; + } + + public Position getMax() { + return this.max; + } + + public void setMax(Position max) { + this.max = max; + } + + public BlockData getBlockData() { + return this.blockData; + } + + public void setBlockData(BlockData blockData) { + this.blockData = blockData; + } + + @Override + public boolean isComplete() { + return this.map != null && this.min != null && this.max != null && this.blockData != null; + } +} diff --git a/src/main/java/org/battleplugins/arena/spleef/editor/AddLayerOption.java b/src/main/java/org/battleplugins/arena/spleef/editor/AddLayerOption.java new file mode 100644 index 0000000..3dedad9 --- /dev/null +++ b/src/main/java/org/battleplugins/arena/spleef/editor/AddLayerOption.java @@ -0,0 +1,20 @@ +package org.battleplugins.arena.spleef.editor; + +import org.battleplugins.arena.editor.type.EditorKey; + +public enum AddLayerOption implements EditorKey { + MIN("min"), + MAX("max"), + BLOCK_DATA("blockData"); + + private final String key; + + AddLayerOption(String key) { + this.key = key; + } + + @Override + public String getKey() { + return this.key; + } +} diff --git a/src/main/java/org/battleplugins/arena/spleef/editor/SpleefEditorWizards.java b/src/main/java/org/battleplugins/arena/spleef/editor/SpleefEditorWizards.java new file mode 100644 index 0000000..f53b466 --- /dev/null +++ b/src/main/java/org/battleplugins/arena/spleef/editor/SpleefEditorWizards.java @@ -0,0 +1,76 @@ +package org.battleplugins.arena.spleef.editor; + +import io.papermc.paper.math.Position; +import org.battleplugins.arena.BattleArena; +import org.battleplugins.arena.competition.map.options.Bounds; +import org.battleplugins.arena.config.ParseException; +import org.battleplugins.arena.editor.ArenaEditorWizard; +import org.battleplugins.arena.editor.ArenaEditorWizards; +import org.battleplugins.arena.editor.stage.PositionInputStage; +import org.battleplugins.arena.editor.stage.TextInputStage; +import org.battleplugins.arena.editor.type.MapOption; +import org.battleplugins.arena.messages.Messages; +import org.battleplugins.arena.spleef.SpleefMap; +import org.battleplugins.arena.spleef.SpleefMessages; +import org.bukkit.Bukkit; + +import java.io.IOException; + +public final class SpleefEditorWizards { + public static final ArenaEditorWizard ADD_LAYER = ArenaEditorWizards.createWizard(AddLayerContext::new) + .addStage(MapOption.MIN_POS, new PositionInputStage<>(SpleefMessages.LAYER_SET_MIN_POSITION, ctx -> ctx::setMin)) + .addStage(MapOption.MAX_POS, new PositionInputStage<>(SpleefMessages.LAYER_SET_MAX_POSITION, ctx -> ctx::setMax)) + .addStage(AddLayerOption.BLOCK_DATA, new TextInputStage<>( + SpleefMessages.LAYER_SET_BLOCK_DATA, + SpleefMessages.LAYER_SET_BLOCK_DATA_INVALID, + (ctx, str) -> { + try { + Bukkit.createBlockData(str); + } catch (IllegalArgumentException e) { + return false; + } + + return true; + }, + ctx -> str -> ctx.setBlockData(Bukkit.createBlockData(str)) + )) + .onCreationComplete(ctx -> { + Position min = ctx.getMin(); + Position max = ctx.getMax(); + + // Sanitize min max + if (min.blockX() > max.blockX()) { + int temp = min.blockX(); + min = Position.block(max.blockX(), min.blockY(), min.blockZ()); + max = Position.block(temp, max.blockY(), max.blockZ()); + } + + if (min.blockY() > max.blockY()) { + int temp = min.blockY(); + min = Position.block(min.blockX(), max.blockY(), min.blockZ()); + max = Position.block(max.blockX(), temp, max.blockZ()); + } + + if (min.blockZ() > max.blockZ()) { + int temp = min.blockZ(); + min = Position.block(min.blockX(), min.blockY(), max.blockZ()); + max = Position.block(max.blockX(), max.blockY(), temp); + } + + Bounds bounds = new Bounds(min, max); + + SpleefMap map = ctx.getMap(); + SpleefMap.Layer layer = new SpleefMap.Layer(bounds, ctx.getBlockData()); + map.addLayer(layer); + + try { + map.save(); + } catch (ParseException | IOException e) { + BattleArena.getInstance().error("Failed to save map file for arena {}", ctx.getArena().getName(), e); + Messages.MAP_FAILED_TO_SAVE.send(ctx.getPlayer(), map.getName()); + return; + } + + SpleefMessages.LAYER_ADDED.send(ctx.getPlayer()); + }); +} diff --git a/src/main/resources/arenas/spleef.yml b/src/main/resources/arenas/spleef.yml new file mode 100644 index 0000000..a49096f --- /dev/null +++ b/src/main/resources/arenas/spleef.yml @@ -0,0 +1,90 @@ +name: Spleef +type: Match +team-options: + named-teams: false + team-size: 1 + team-amount: 2 + team-selection: none +lives: + enabled: false +victory-conditions: + teams-alive: + amount: 1 + time-limit: + time-limit: 5m +layer-decay-delay: 2m +layer-decay-time: 1m +events: + on-join: + - store{types=all} + - change-gamemode{gamemode=adventure} + - flight{enabled=false} + - teleport{location=waitroom} + on-spectate: + - store{types=all} + - change-gamemode{gamemode=spectator} + - flight{enabled=true} + - teleport{location=spectator} + on-leave: + - clear-effects + - restore{types=all} + on-death: + - clear-inventory + - respawn + - delay{ticks=1} + - change-gamemode{gamemode=adventure} + - teleport{location=waitroom} +options: + - block-break{enabled=false} + - block-place{enabled=false} + - block-drops{enabled=false} + - block-interact{enabled=false} + - item-drops{enabled=false} + - keep-inventory{enabled=true} + - keep-experience{enabled=true} + - damage-entities{option=never} + - damage-players{option=never} +initial-phase: waiting +phases: + waiting: + allow-join: true + next-phase: countdown + countdown: + allow-join: false + allow-spectate: true + revert-phase: true + next-phase: ingame + countdown-time: 5s + events: + on-start: + - paste-layers + on-complete: + - teleport{location=team_spawn} + - play-sound{sound=block.note_block.pling;pitch=2;volume=1} + ingame: + allow-join: false + allow-spectate: true + next-phase: victory + options: + - block-interact{enabled=true} + events: + on-start: + - change-gamemode{gamemode=survival} + - give-shovel{shovel=classic} + victory: + allow-join: false + allow-spectate: false + next-phase: waiting + duration: 5s + events: + on-complete: + - leave + on-victory: + - send-message{message=Congrats, you won!} + - play-sound{sound=entity.player.levelup;pitch=1;volume=1} + on-lose: + - send-message{message=Sorry, you lost!} + - play-sound{sound=block.anvil.place;pitch=0;volume=1} + on-draw: + - send-message{message=It's a draw!} + - play-sound{sound=block.beacon.deactivate;pitch=0;volume=1} \ No newline at end of file diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml new file mode 100644 index 0000000..85ed1af --- /dev/null +++ b/src/main/resources/config.yml @@ -0,0 +1,13 @@ +# ----------------- +# Main configuration for ArenaSpleef +# +# Documentation: https://docs.battleplugins.org/books/additional-gamemodes/chapter/spleef +# Support: https://discord.gg/tMVPVJf +# GitHub: https://github.com/BattlePlugins/ArenaSpleef +# ----------------- +config-version: 2.0 # The config version, do not change! + +# The shovels to use for Spleef. +shovels: + classic: diamond_shovel{display-name=Spleef Shovel} + super-shovel: golden_shovel{display-name=Super Spleef Shovel;enchantments=[unbreaking:10,efficiency:5]} \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml new file mode 100644 index 0000000..8e61f50 --- /dev/null +++ b/src/main/resources/plugin.yml @@ -0,0 +1,9 @@ +name: ArenaSpleef +main: org.battleplugins.arena.spleef.ArenaSpleef +version: ${version} +description: A Spleef mode for BattleArena. +author: BattlePlugins +website: https://battleplugins.org +api-version: 1.19 +depend: [BattleArena] +softdepend: [WorldEdit] \ No newline at end of file