diff --git a/.github/workflows/maven-test.yml b/.github/workflows/maven-test.yml new file mode 100644 index 0000000..df2ecf0 --- /dev/null +++ b/.github/workflows/maven-test.yml @@ -0,0 +1,31 @@ +# This workflow will test a package using Maven + +name: Maven Test + +on: + push + +jobs: + build: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + strategy: + matrix: + java: [ '8', '11', '17' ] + + name: Java ${{ matrix.java }} build + steps: + - uses: actions/checkout@v2 + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v2 + with: + distribution: 'zulu' + java-version: ${{ matrix.java }} + cache: 'maven' + server-id: github # Value of the distributionManagement/repository/id field of the pom.xml + settings-path: ${{ github.workspace }} # location for the settings.xml file + + - name: Build with Maven + run: mvn -B test --file pom.xml diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..e72bfdd --- /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 +. \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7d672ea..5adc078 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.dogonfire werewolf - 0.9.0 + 0.10.0 Werewolf Werewolves in Minecraft! https://github.com/DogOnFire/Werewolf @@ -16,10 +16,10 @@ 1.8 - 1.8 - 1.8 + ${jdk.version} + ${jdk.version} UTF-8 - 1.17.1-R0.1-SNAPSHOT + 1.19.4-R0.1-SNAPSHOT http://localhost:9000/ ${dependency.check.report.dir}/dependency-check-report.xml @@ -37,12 +37,12 @@ vault-repo - http://nexus.hc.to/content/repositories/pub_releases + https://nexus.hc.to/content/repositories/pub_releases md_5-public - http://repo.md-5.net/content/groups/public/ + https://repo.md-5.net/content/groups/public/ @@ -53,15 +53,20 @@ dmulloy2-repo https://repo.dmulloy2.net/repository/public/ - + - sk89q-repo - http://maven.sk89q.com/repo/ + enginehub-repo + https://maven.enginehub.org/repo/ placeholderapi - http://repo.extendedclip.com/content/repositories/placeholderapi/ + https://repo.extendedclip.com/content/repositories/placeholderapi/ + + + + codemc-releases + https://repo.codemc.org/repository/maven-releases/ @@ -83,35 +88,35 @@ LibsDisguises LibsDisguises - 10.0.26-SNAPSHOT + 10.0.34 provided - + - eu.blackfire62.myskin.bukkit - MySkin - 3.3 - system - ${project.basedir}/lib/MySkin.jar + net.skinsrestorer + skinsrestorer-api + 14.2.10 + provided com.sk89q.worldguard worldguard-bukkit - 7.0.7-SNAPSHOT + 7.0.7 provided com.comphenix.protocol ProtocolLib - 4.7.0 + 5.0.0 + provided me.clip placeholderapi - 2.10.10 + 2.11.3 provided diff --git a/src/com/dogonfire/werewolf/ClanManager.java b/src/com/dogonfire/werewolf/ClanManager.java index a163aa9..b3bca1e 100644 --- a/src/com/dogonfire/werewolf/ClanManager.java +++ b/src/com/dogonfire/werewolf/ClanManager.java @@ -34,10 +34,6 @@ public enum ClanType private HashMap werewolfTextures = new HashMap(); private HashMap werewolfTextureSignatures = new HashMap(); - - private String alphaTexture = "eyJ0aW1lc3RhbXAiOjE0MzQyNzgzMTczMzYsInByb2ZpbGVJZCI6ImUwZDA3NGJkNjcyMjQ3ZmM5NWQzZjI4ZTI4OTllMTU1IiwicHJvZmlsZU5hbWUiOiJXZXJld29sZkFscGhhIiwiaXNQdWJsaWMiOnRydWUsInRleHR1cmVzIjp7IlNLSU4iOnsidXJsIjoiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9lMDMzODY5NWQwMWY0NTQ2ZmVmZGU0YzllOTVlMTRiNzgzMmExMzg3Mjc3MjQ1ZDI4MmMyOThkNzgxYmFkNTMiLCJtZXRhZGF0YSI6eyJtb2RlbCI6InNsaW0ifX19fQ=="; - private String alphaTextureSignature = "KVI3HBmEn027sMbETloJRyyVjG1gf4p9+S1QmF7r3mEr2UPp+vHEjz/9+aJmOXrYfj4Xvj5xAJRJJYGc9Q5sTk+zimxTDUTRHSyk1lAy5R0fmULRspCKy7+Z7gL5MyFLB/Pcc9Jqwax/JrhH1Sj8Buq5fA4xzBQ5R1dY2yjONfuz1CYUf4jUHm+X4iEXBZ2nSKLaum6ZUf3qWSoUdV9cd3kgokN2xocm0fNwSXpOLyaaD55pbdeZJBXXiPipZKab7wQW0loWVSh+G1e931Ex/Zk3Kxeq1IszOCMBC54DYUk8MDHN+UayeiyaV3na2tgGWpWvJQtUqX57uaVKSoyUHLwYEn0D2V4lbzcJ/hDyErtJMQgclmylseB8TAuJNGF+cSVm8u5ug++bYwv2ZSb4lxXtvoqgimV+aStzE/PIwEZSHwD/rTTLd6IxV0Yak1XqasFNt08boymghCgd/JnHqbXJysPXKxQQv36A7do2rMM7fJKKhojCO400mYnfvrog8/mkqk7C+G1cMwSCzHjVLs/dk12meMS+7gVZY+2mgfoN9uYPyUk4TgpIU7XH70KFcQ2BSHPcYrS24s/XmYwrRsH7eudAuuCke60/FX5n8W2L26TXcBqHsuk/ralIh7Xgu5DF1NcPat6C61adeAMuwJfCBAScYpkDVqlqzDrtbEk="; - private FileConfiguration clansConfig = null; private File clansConfigFile = null; @@ -86,13 +82,13 @@ public void load() this.werewolfAccountId.put(ClanType.WerewolfBite, UUID.fromString(plugin.werewolfBiteAccountUUID)); this.werewolfAccountId.put(ClanType.WildBite, UUID.fromString(plugin.wildBiteAccountUUID)); - this.werewolfTextures.put(ClanType.Potion, "eyJ0aW1lc3RhbXAiOjE0MzI5MDc2Nzk1NDgsInByb2ZpbGVJZCI6IjAzOWM1M2FhNTg3MzQ0MjBhMDk1OWFmOTcxMzIxNDA4IiwicHJvZmlsZU5hbWUiOiJ4ZW9uYnVpbGRlciIsImlzUHVibGljIjp0cnVlLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZTBiYTQ1YmFmY2MyNTZmNjJjYWYyYzRiNjliNjVjNzEwZjZhZmE2MDIxOTllMmIyYTMyZDlkOTdmMzJlZTAiLCJtZXRhZGF0YSI6eyJtb2RlbCI6InNsaW0ifX19fQ=="); - this.werewolfTextures.put(ClanType.WerewolfBite, "eyJ0aW1lc3RhbXAiOjE0MzI5OTYxMjcxNzksInByb2ZpbGVJZCI6ImI2OGE4ZjAwN2QyNDRjNTJiNmFkMTQyM2JmYmUyNmVlIiwicHJvZmlsZU5hbWUiOiJTTV9XZXJld29sZiIsImlzUHVibGljIjp0cnVlLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZGE4YmI5OWI2YTg2ZGFkOGM3NmUwNDc1OWNmNmY3MDc1OTYyN2EzMmQ0YTRjMWEzM2ZjZGQyNjZlZGMzN2M4IiwibWV0YWRhdGEiOnsibW9kZWwiOiJzbGltIn19fX0="); - this.werewolfTextures.put(ClanType.WildBite, "eyJ0aW1lc3RhbXAiOjE0MzI5MDg3NTY2MjEsInByb2ZpbGVJZCI6ImRhNTA4ZWNjZGJkOTQ2YzU4MDk1NDdiOTFhYTRmZjVmIiwicHJvZmlsZU5hbWUiOiJCTV9XZXJld29sZiIsImlzUHVibGljIjp0cnVlLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMTZjNjMwZjI0YzhkMzhkNWQ0OWYzOGExN2YzNmZmNjQ4ZTZiNjgzYTRjZDU2MWIyZTM1NjU3Y2ZhIiwibWV0YWRhdGEiOnsibW9kZWwiOiJzbGltIn19fX0="); + this.werewolfTextures.put(ClanType.Potion, plugin.potionSkinValue); + this.werewolfTextures.put(ClanType.WerewolfBite, plugin.werewolfBiteSkinValue); + this.werewolfTextures.put(ClanType.WildBite, plugin.wildBiteSkinValue); - this.werewolfTextureSignatures.put(ClanType.Potion, "vN7JzBCT9Fr2sKQmk0chBLUH4qNHsFBsC09U44HOpSWvH3qFt+3lKPkctUhQuBqrM6/TOPgG9yFB3k/5LA+vW4v+pk94vSYbh/iWMUHfNHN5FSNrwIMvIk9Qr8Bn8QKIHHn2Guq4V6y1xV9eM6GM5c9mUNgdbNs3Mqp80r5Pm8L04pr69/VhB5uKRzDBVI1UrRubq6ibYJKG/cktYkakiejAnv7y8YFzWkUwBKHPcsAkj0GzbmDx1a8vgvogS+CYCqvvbHZD9Tva2/UC81N4jbdiB0Dl1zIT0FAYjkyx6DPPFoTOqV9m6DjowwA7D6cCoS29YfgHB9kUiZnbcOO9qnrCImx998v0a71an1pvmETaH9WF+5SpP0SWDWl9ccQdI9Roc1UNzzg9ueBapzsoYgQ957H2iBuWdOZVGYnhFJ1pcHrwd8c6l2dgKQ1WMABV+W3p5N6KCStAfbz25kPdmnQCY+g7wpT6q/WJ9/a0vliUH8aWqhpNoDq79w5URsTgSoQrzTDa+wvGxWW7w+D56nD2yl86gxn5ELdzTjYRr4K8ThbYUprErvFHDjACSYVW/WveMT9+diKEAcTAFsy0kNM1oUUz1sjTpuUj57UM+AzY6c4cyUak7tiDWai4O3brkRyVCLY6r8nOZXWWw69h0zabDHM+bsJDQ8+52aNbcYQ="); - this.werewolfTextureSignatures.put(ClanType.WerewolfBite, "rmVoUjl/eeoJbDV2Twh/G8/HQeTcu1my04dnfckjpLzrMhBRW9F8O2diI6x7n9BI0chB7CPa/AmnvkqBxM6RViGD3p9Iw532ddYk9Dk7/jBJ/XAMKNQfsDuyB95lgHfDyuP+DsJXsWQ4CzmUAOahhOjswtT13nKZkGRtyzpmx4GiOtVgQlgnTJyhoRU7YRu6fYAAWPMyAKtx+c8/uflRpbGoJV1BaMYp8skCoB8eoi3ylo3gUy63Zgwcqs68g68P4YNuokcHrMXs0UbjAUVFWza7tcCdKj22Rou/erQPcCbRZKofjECFSb71MyidocyLxpL7MUURJNvh7w8JccLQ+MDUFILsD6j2w8XcGSP9tXeYWUpUjrCN5aeCh7e85/pxs/Dkmn69EUyyghC8P0WE8kZenVb55OQ3XISZ8KvJH42a2NvgJBuHdj9XwmHzT2CIsNVoAmAYCDawGpYbAnfwrXm67V/u8ekxnahB0+y2GhW4FByfT88fE3Kord01gpuQbZ/iS6ruwSHgge513WH6Q4dR14VHUnx+i3ONl2EbNaEIs5+UmVQ/AD/A2v8RufLsSCKWxi4tUzvhfDKNs5VHagZco9wjMyeSbL/rLQBK7u/ehkBgju+ggODok+xMk9Osp+GlmBkXEkWjM8MDhMggXdWIIur6C4UNlOuaJx2FZGU="); - this.werewolfTextureSignatures.put(ClanType.WildBite, "IbElGTsg5vIrDi/VDYjHPjdVB/n/Fh1SH45jfR8f2fkgozGkd6wxifIpBkBcgYl0GrsbQvvghO0+Euar4UCbHPa7xOnjqzt/gz2Y/VbotX/tPAJc7B2LoCG6xsF8K9xWCjHnfoM2wmgj1NfFtHjfBGd/LjkSNGyO4WG/Lg6XOzYUznUiX8Q6Bb/h5IFw+pfaO2ACH6r+NovorThvjCZqdZrW9mgQD6nzsd+u2LOAlMBa07nqfThzQDFkyfckLEp4/nGXuuQbp07uA+PqYWt488LEKbTk4ft8v0QT4M4DC0iMzZ+ghS6rCxQsPfKnL9U+eBe655JjEriQ/CbrDjT3zlwFTGmLiRQ8D0YEAKJVNnL3JlhObhNeIt/yvxZx4UNzm6Hfgg3ZyJMczGDaE+UnJn00qGUKpP9UMozMNtnglfRmMI0+s0FCmQit5cc4kKwIRCjgRVwje1MEVkhjc2eGPCU1XBvex42DHq8G6Nw8PCZ1/ESLjmMs41kSMMUkL9rbUigvxMIW9Xe8RaVWFuYt3l5ETmPt/K/0taz09TdcZxEgQo8Hhn5BYiGDi9ztVwG2XPbrfneyjqtS7wmYYn7LFdMh9idLwreGq6UjSBeOH6Ha16KIyMemfUuPZHQaBDAoenuNpJaGt6YKYNLT1x+9YJQ1LeSsBN8Natp3Bxrztf8="); + this.werewolfTextureSignatures.put(ClanType.Potion, plugin.potionSkinSignature); + this.werewolfTextureSignatures.put(ClanType.WerewolfBite, plugin.werewolfBiteSkinSignature); + this.werewolfTextureSignatures.put(ClanType.WildBite, plugin.wildBiteSkinSignature); for (ClanType clan : ClanType.values()) { @@ -168,12 +164,12 @@ public UUID getWerewolfAccountIdForAlpha(ClanType type) public String getWerewolfTextureForAlpha(ClanType type) { - return this.alphaTexture; + return plugin.alphaSkinValue; } public String getWerewolfTextureSignatureForAlpha(ClanType type) { - return this.alphaTextureSignature; + return plugin.alphaSkinSignature; } public void handleMobKill(Player player, ClanType clanType, EntityType mobType) @@ -190,30 +186,18 @@ public void handleMobKill(Player player, ClanType clanType, EntityType mobType) points = 5.0D; break; case SKELETON: - points = 3.0D; - break; - case ENDERMAN: - points = 3.0D; - break; - case SHEEP: - points = 3.0D; - break; case COW: + case SHEEP: + case ENDERMAN: points = 3.0D; break; case SPIDER: - points = 2.0D; - break; case ZOMBIE: points = 2.0D; break; case RABBIT: - points = 1.0D; - break; - case SILVERFISH: - points = 1.0D; - break; case CHICKEN: + case SILVERFISH: points = 1.0D; break; default: @@ -353,7 +337,7 @@ public UUID getAlpha(ClanType clan) if (alphaPlayerId != null) { assignAlphaInClan(clan, alphaPlayerId); - } + } } return null; diff --git a/src/com/dogonfire/werewolf/Werewolf.java b/src/com/dogonfire/werewolf/Werewolf.java index 8374f6e..aa89187 100644 --- a/src/com/dogonfire/werewolf/Werewolf.java +++ b/src/com/dogonfire/werewolf/Werewolf.java @@ -129,6 +129,14 @@ public class Werewolf extends JavaPlugin public String potionAccountUUID = "c61647e5-fc2f-4536-abe9-c851911ad22f"; public String werewolfBiteAccountUUID = "b68a8f00-7d24-4c52-b6ad-1423bfbe26ee"; public String wildBiteAccountUUID = "da508ecc-dbd9-46c5-8095-47b91aa4ff5f"; + public String alphaSkinValue = "ewogICJ0aW1lc3RhbXAiIDogMTY4NTAzNzE3NjgzNiwKICAicHJvZmlsZUlkIiA6ICJlMGQwNzRiZDY3MjI0N2ZjOTVkM2YyOGUyODk5ZTE1NSIsCiAgInByb2ZpbGVOYW1lIiA6ICJXZXJld29sZkFscGhhIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2NhZTg4YjY5MjA0YWUyYzNlM2NiZTcwOWUzZTYyNTIxZTUzZmEwNWU0ZGFkODkxYzZhZmJkZmI5MDg2OGE3ZTAiLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ=="; + public String alphaSkinSignature = "GIDMFU5fTmB4T4RFFs/pQDAg7ZsCsu5KAxMXiQw4G32G0Db5SRmJ6OtiSc3SRznJO9EAW7lmjo38+BdY4b3cgTM7IbXmZGx5ML22ZW5KYspUoot2wo9kIj5ksh+H0Tfy9JCPLpg17nd7O1aY5+RhI5Aq+mhtyhJFXn1a906Qg9/XtHhiw0bUrthpa1RrtHnbH6+hFKgzNKAEeT93MvrPajOT7dmzQ72UK3KXgpe6KzbrWFf+NL0ZbpfkjwabSIALUdcL6+92EI//dB5yMgHEln9wfzKjH+82cDGEoGQjAnJIf+/KVWOtkfNRJauwpUkIUkD4tmkXxCCTyXXwUuIb7e7CwxyFWK4K7e7ir/P5zf1NuQZV+X1MwbF1c++dlGa4yBIvrb97F9tTu+7tw6KFwxqCvj4yRjhkGXsN0soI39v95q7ucxWaX0D4oKwa9QYi9zLW6DIh9bPxGa78TAPC/WyAdM/8J+/uinX2mvEsECsKQVmrCGRrqrZgfctsnXHuqstKMNOecwDFDzi8rWlcM3/wrdHn14Lvn2bsZGR4Xhr532CY2t+JgkQvYBM5Z+tkW5C7MCVH4BbLwf2zDcDkGIOzq5VoKlu/2WML88etjyzSIhCN0WJXWFkeRr7ddTar7Nx8/AzHRUBcTGXC+UGiHMYWWq8bAILFggLKY8eJzq0="; + public String potionSkinValue = "ewogICJ0aW1lc3RhbXAiIDogMTY4NTAzNzM4MjA1NCwKICAicHJvZmlsZUlkIiA6ICJjNjE2NDdlNWZjMmY0NTM2YWJlOWM4NTE5MTFhZDIyZiIsCiAgInByb2ZpbGVOYW1lIiA6ICJXRl9XZXJld29sZiIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS84NjA2YmNlMjkzZGRiY2RlNDE1NzE5NGJkMTZkZDhmZDQzNTAyMjU3MTUyYThiYTJiMWFmMTRlOTM3ZWY5NzAzIgogICAgfQogIH0KfQ=="; + public String potionSkinSignature = "M4bpafjzWq9GBbbHGL2xL8dwHxghLdily2bUnBsPPfsjrYidl8uws2pagluNPzxcCSqiZusJvbyoELgFBHrhKxDMGsUvG2nG/XV6GrZj8+bOYKlsU5IszwDaXJB9p6Uxh68pGoKximacJa1ELayKxbxLhJndGVTtO55pOvIB425f6VMRdJa6EvimsiibPMgGBKDVR4BP9ctP5Ij1cFyVpUZuiocp069LKPBMRR4mjRIeD4fmhz6o7yP5g4j6v3/n75T/NPR/NnMcRO7zYDnH0V0/a+dr0UTsGbH+4teuxdExgBrh2sjCCt7Zb4Yno6ElDYIABRqPUHSzNQ7IY3BHzGBaLZ29K/nUgN4mABlqj30ZL6RXmnlyzJUF/MxTcU0R/ROe8nmrt7eX700c29yrtufEkHhhUNX/hB/LjLIAoRIQgpHOGaocCgFsVRR1GGTot1KHuj8k0rvUKmxITpxbjOhdXwkwIMJ/WCAFygeBP6CTfnIKvZbJO2IAkv0/SQ8T38zLl2Xo0wbcUhQS4T44PWGzAVIX9I21lce9VHh55qTgQn0k+Wf9wog/KJw4HjLpWm+eTKuJiZH5zVGxQOzS0AU0OT+g/wHTcBqqtEDD1MeqhYfnQX7uU0wVN+HbahYV6Q2pE6qgyHCqjFTaS+N1dhmtTnhPsJdA4EhHCE9AAWE="; + public String werewolfBiteSkinValue = "ewogICJ0aW1lc3RhbXAiIDogMTY4NTAzNzQwOTQzMiwKICAicHJvZmlsZUlkIiA6ICJiNjhhOGYwMDdkMjQ0YzUyYjZhZDE0MjNiZmJlMjZlZSIsCiAgInByb2ZpbGVOYW1lIiA6ICJTTV9XZXJld29sZiIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS82MzZhNWVkN2I0ZmZmM2I3MzU0YzRjOGM5NjBmM2QxOTVkZWZkMjgyMjA4NjYyNjY1ZGViYjQ2NGJiNWJmZTY1IiwKICAgICAgIm1ldGFkYXRhIiA6IHsKICAgICAgICAibW9kZWwiIDogInNsaW0iCiAgICAgIH0KICAgIH0KICB9Cn0="; + public String werewolfBiteSkinSignature = "RlCvrZ4SYkPDg2xl6f97ya5Z+578Uov0R6eHqJdFAPEB/rXqlwgPXS3bEhubQ3pLV9QS8BPE2OqycGrg7QrrQ7w267aurZ6Ax7RmGunGnuiJ9jcjlxjwp6Ltk4o/N8OUBYfF3TUfFXnj6lzZUeITZDSb21o/2UFglVxssk5U0PFN7/VpV4g6hv8iDBT9TH6v8wG8I4AZqgU2eoYGvddkLlCX/63FVEEbUb/eTc8R/iOyQVvnhaP8vhs1DXu7kp/b50hhDM31pDkMT3TJq2tEEHGmLZVok9aabtIuhRlIfpjyvJOV5VO9RDWiZeZqKQcYO1F7p+bv5gl8Cqodl7OrG8tzwjq2hH+tRMLidHCjgvsbHOLElUjWoBnMu10r+94Adl9+B/CPUF+NFqUwQ2jCY+WS75M/GX9C7gftO8f1c5n9eO8HVaUeB4fmPqAA0yoCUvIjVgr46a1imcppl2O1fKS+kIVI+Lb08Ujymilqe5lEnwOz/ykndAoleMM7+6kViHGF5/HkUS8l50AnJYVgIUPwLTlwY2GlvtSOcSEHTXCx9YsHBY60r4Ow3bi5pCkNvBTvaHqCWIHLuIA86r2GQPJGuZGn7iy1KJTlvDjZ2LhdfDktZpzmhfcAR8Iw2bnM9jeWKgg3gzEQgkROzQBvzONDVMqcL2ILXPKEdniypy8="; + public String wildBiteSkinValue = "ewogICJ0aW1lc3RhbXAiIDogMTY4NTAzNzQzNDY4NywKICAicHJvZmlsZUlkIiA6ICJkYTUwOGVjY2RiZDk0NmM1ODA5NTQ3YjkxYWE0ZmY1ZiIsCiAgInByb2ZpbGVOYW1lIiA6ICJCTV9XZXJld29sZiIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9jMzc5MWEwOGM1Zjk1ZTQ1MGZkMmZiOGEwZTc1ZmViYTMwN2ZhZDJkNjYzMTkzNTAzYzU3NmMxOWRjM2MwYzdlIiwKICAgICAgIm1ldGFkYXRhIiA6IHsKICAgICAgICAibW9kZWwiIDogInNsaW0iCiAgICAgIH0KICAgIH0KICB9Cn0="; + public String wildBiteSkinSignature = "Z8NgxOC7mVyeW9hGKMxGKGG16ZDkADR5RXmyktriE6wUodq+TRokU0LIGaCHYrc6ReH3rzQJtNj5Whs83tLPAWGMj79silx6jzPhZ5Db2iTZQjVAG98rNGFBxgsjqSG72LyeyxwRIN6L/OSnf2qna2dP1T12d2uyfdipzuNdXnreG/5WqRj0Rrn3ok+GieuoR1DzYugkPu/3vhJOAFfvtSdoAv0C1JtuKaIeDj5BOm+RHvzwcFiYU9dhnGA0n3mxjGUpCCY/RFGF5l80Cw2RqN6j4rougUhklPe4swpS9KX2fF2TsK/JS8WJ1jHuKyykqnml2VHqsoNDX8yTCD/tTdXWJ+lTDsdkdCkPLbX2hkfIJ/0vv55GnQltERie757K+HHncmYw4tBxjgtTCcdIcLNNoAf9jlQC4f8sUCdPiIr7PKoxrik6GkZKx52DsaUGvv/+32E/Aswo1TnD0gMFOiWTtYfJ4OmMW5Ez+AtpoWnypAFKDtTIqMadhD/3HatlpCXsAuA49vE15dfN6WF+wJ66hCtxUKZJSqFhQ81Fan3R9+62E1f+7Vm8yyzoo/ttRmg7zFRAMTaf200z4Ei3xZvq0NiN8USdd3au4DAwK45Tn3FYc+Qo+9TVYn1iDEG9uo5BGYhxiYAz/TnVJccKOqaCzlu1KV/JxabEpAFd534="; public boolean werewolfNamesEnabled = true; public List givenNames = Arrays.asList("Dark", "Black", "White", "Red", "Blood", "Blue", "Gray", "Neon", "Wild", "Lurking", "Feral", "Bestial", "Fierce", "Vicious", "Bloodthirsty", "Fearsome", "Ghoulish", "Wrathful", "Teenage", "Savage"); @@ -148,7 +156,7 @@ public class Werewolf extends JavaPlugin public boolean craftableLoreBookEnabled = true; private Version version = null; - public static final String MAX = "1.17.1-R0.1-SNAPSHOT"; + public static final String MAX = "1.19.4-R0.1-SNAPSHOT"; public static final String MIN = "1.13"; public static final String NMS = VersionFactory.getNmsVersion().toString(); private static boolean isCompatible = true; @@ -328,11 +336,11 @@ public void onEnable() this.commands = new Commands(this); - if (!version.isSupported(MAX) || !version.isCompatible(MIN)) + if (!version.isCompatible(MIN)) { log(ChatColor.RED + "* Werewolf is not compatible with your server"); log(ChatColor.RED + "* Your server version is " + ChatColor.GOLD + version.toString()); - log(ChatColor.RED + "* The supported version for this plugin is " + ChatColor.GOLD + MIN); + log(ChatColor.RED + "* The minimum supported version for this plugin is " + ChatColor.GOLD + MIN); log(ChatColor.RED + "* Werewolves are now disabled."); pluginEnabled = false; @@ -342,6 +350,16 @@ public void onEnable() return; } + if (!version.isSupported(MAX)) + { + log(ChatColor.RED + "* Werewolf is not supported and tested with your server version!"); + log(ChatColor.RED + "* Your server version is " + ChatColor.GOLD + version.toString()); + log(ChatColor.RED + "* The maximum supported version for this plugin is " + ChatColor.GOLD + MAX); + log(ChatColor.RED + "* You can still report bugs to https://github.com/DogOnFire/Werewolf/issues."); + + isCompatible = false; + } + pluginEnabled = true; werewolfManager = new WerewolfManager(this); @@ -359,8 +377,7 @@ public void onEnable() if(!WerewolfDisguiseAPI.init()) { - onDisable(); - return; + this.disguisesEnabled = false; } // Pre-cache some known disguises @@ -770,6 +787,14 @@ public void loadSettings() this.potionAccountUUID = config.getString("Clans.PotionAccountUUID", "c61647e5-fc2f-4536-abe9-c851911ad22f"); this.werewolfBiteAccountUUID = config.getString("Clans.WerewolfBiteAccountUUID", "b68a8f00-7d24-4c52-b6ad-1423bfbe26ee"); this.wildBiteAccountUUID = config.getString("Clans.WildBiteAccountUUID", "da508ecc-dbd9-46c5-8095-47b91aa4ff5f"); + this.alphaSkinValue = config.getString("Clans.AlphaSkinValue", "ewogICJ0aW1lc3RhbXAiIDogMTY4NTAzNzE3NjgzNiwKICAicHJvZmlsZUlkIiA6ICJlMGQwNzRiZDY3MjI0N2ZjOTVkM2YyOGUyODk5ZTE1NSIsCiAgInByb2ZpbGVOYW1lIiA6ICJXZXJld29sZkFscGhhIiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2NhZTg4YjY5MjA0YWUyYzNlM2NiZTcwOWUzZTYyNTIxZTUzZmEwNWU0ZGFkODkxYzZhZmJkZmI5MDg2OGE3ZTAiLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ=="); + this.alphaSkinSignature = config.getString("Clans.AlphaSkinSignature", "GIDMFU5fTmB4T4RFFs/pQDAg7ZsCsu5KAxMXiQw4G32G0Db5SRmJ6OtiSc3SRznJO9EAW7lmjo38+BdY4b3cgTM7IbXmZGx5ML22ZW5KYspUoot2wo9kIj5ksh+H0Tfy9JCPLpg17nd7O1aY5+RhI5Aq+mhtyhJFXn1a906Qg9/XtHhiw0bUrthpa1RrtHnbH6+hFKgzNKAEeT93MvrPajOT7dmzQ72UK3KXgpe6KzbrWFf+NL0ZbpfkjwabSIALUdcL6+92EI//dB5yMgHEln9wfzKjH+82cDGEoGQjAnJIf+/KVWOtkfNRJauwpUkIUkD4tmkXxCCTyXXwUuIb7e7CwxyFWK4K7e7ir/P5zf1NuQZV+X1MwbF1c++dlGa4yBIvrb97F9tTu+7tw6KFwxqCvj4yRjhkGXsN0soI39v95q7ucxWaX0D4oKwa9QYi9zLW6DIh9bPxGa78TAPC/WyAdM/8J+/uinX2mvEsECsKQVmrCGRrqrZgfctsnXHuqstKMNOecwDFDzi8rWlcM3/wrdHn14Lvn2bsZGR4Xhr532CY2t+JgkQvYBM5Z+tkW5C7MCVH4BbLwf2zDcDkGIOzq5VoKlu/2WML88etjyzSIhCN0WJXWFkeRr7ddTar7Nx8/AzHRUBcTGXC+UGiHMYWWq8bAILFggLKY8eJzq0="); + this.potionSkinValue = config.getString("Clans.PotionSkinValue", "ewogICJ0aW1lc3RhbXAiIDogMTY4NTAzNzM4MjA1NCwKICAicHJvZmlsZUlkIiA6ICJjNjE2NDdlNWZjMmY0NTM2YWJlOWM4NTE5MTFhZDIyZiIsCiAgInByb2ZpbGVOYW1lIiA6ICJXRl9XZXJld29sZiIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS84NjA2YmNlMjkzZGRiY2RlNDE1NzE5NGJkMTZkZDhmZDQzNTAyMjU3MTUyYThiYTJiMWFmMTRlOTM3ZWY5NzAzIgogICAgfQogIH0KfQ=="); + this.potionSkinSignature = config.getString("Clans.PotionSkinSignature", "M4bpafjzWq9GBbbHGL2xL8dwHxghLdily2bUnBsPPfsjrYidl8uws2pagluNPzxcCSqiZusJvbyoELgFBHrhKxDMGsUvG2nG/XV6GrZj8+bOYKlsU5IszwDaXJB9p6Uxh68pGoKximacJa1ELayKxbxLhJndGVTtO55pOvIB425f6VMRdJa6EvimsiibPMgGBKDVR4BP9ctP5Ij1cFyVpUZuiocp069LKPBMRR4mjRIeD4fmhz6o7yP5g4j6v3/n75T/NPR/NnMcRO7zYDnH0V0/a+dr0UTsGbH+4teuxdExgBrh2sjCCt7Zb4Yno6ElDYIABRqPUHSzNQ7IY3BHzGBaLZ29K/nUgN4mABlqj30ZL6RXmnlyzJUF/MxTcU0R/ROe8nmrt7eX700c29yrtufEkHhhUNX/hB/LjLIAoRIQgpHOGaocCgFsVRR1GGTot1KHuj8k0rvUKmxITpxbjOhdXwkwIMJ/WCAFygeBP6CTfnIKvZbJO2IAkv0/SQ8T38zLl2Xo0wbcUhQS4T44PWGzAVIX9I21lce9VHh55qTgQn0k+Wf9wog/KJw4HjLpWm+eTKuJiZH5zVGxQOzS0AU0OT+g/wHTcBqqtEDD1MeqhYfnQX7uU0wVN+HbahYV6Q2pE6qgyHCqjFTaS+N1dhmtTnhPsJdA4EhHCE9AAWE="); + this.werewolfBiteSkinValue = config.getString("Clans.WerewolfBiteSkinValue", "ewogICJ0aW1lc3RhbXAiIDogMTY4NTAzNzQwOTQzMiwKICAicHJvZmlsZUlkIiA6ICJiNjhhOGYwMDdkMjQ0YzUyYjZhZDE0MjNiZmJlMjZlZSIsCiAgInByb2ZpbGVOYW1lIiA6ICJTTV9XZXJld29sZiIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS82MzZhNWVkN2I0ZmZmM2I3MzU0YzRjOGM5NjBmM2QxOTVkZWZkMjgyMjA4NjYyNjY1ZGViYjQ2NGJiNWJmZTY1IiwKICAgICAgIm1ldGFkYXRhIiA6IHsKICAgICAgICAibW9kZWwiIDogInNsaW0iCiAgICAgIH0KICAgIH0KICB9Cn0="); + this.werewolfBiteSkinSignature = config.getString("Clans.WerewolfBiteSkinSignature", "RlCvrZ4SYkPDg2xl6f97ya5Z+578Uov0R6eHqJdFAPEB/rXqlwgPXS3bEhubQ3pLV9QS8BPE2OqycGrg7QrrQ7w267aurZ6Ax7RmGunGnuiJ9jcjlxjwp6Ltk4o/N8OUBYfF3TUfFXnj6lzZUeITZDSb21o/2UFglVxssk5U0PFN7/VpV4g6hv8iDBT9TH6v8wG8I4AZqgU2eoYGvddkLlCX/63FVEEbUb/eTc8R/iOyQVvnhaP8vhs1DXu7kp/b50hhDM31pDkMT3TJq2tEEHGmLZVok9aabtIuhRlIfpjyvJOV5VO9RDWiZeZqKQcYO1F7p+bv5gl8Cqodl7OrG8tzwjq2hH+tRMLidHCjgvsbHOLElUjWoBnMu10r+94Adl9+B/CPUF+NFqUwQ2jCY+WS75M/GX9C7gftO8f1c5n9eO8HVaUeB4fmPqAA0yoCUvIjVgr46a1imcppl2O1fKS+kIVI+Lb08Ujymilqe5lEnwOz/ykndAoleMM7+6kViHGF5/HkUS8l50AnJYVgIUPwLTlwY2GlvtSOcSEHTXCx9YsHBY60r4Ow3bi5pCkNvBTvaHqCWIHLuIA86r2GQPJGuZGn7iy1KJTlvDjZ2LhdfDktZpzmhfcAR8Iw2bnM9jeWKgg3gzEQgkROzQBvzONDVMqcL2ILXPKEdniypy8="); + this.wildBiteSkinValue = config.getString("Clans.WildBiteSkinValue", "ewogICJ0aW1lc3RhbXAiIDogMTY4NTAzNzQzNDY4NywKICAicHJvZmlsZUlkIiA6ICJkYTUwOGVjY2RiZDk0NmM1ODA5NTQ3YjkxYWE0ZmY1ZiIsCiAgInByb2ZpbGVOYW1lIiA6ICJCTV9XZXJld29sZiIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS9jMzc5MWEwOGM1Zjk1ZTQ1MGZkMmZiOGEwZTc1ZmViYTMwN2ZhZDJkNjYzMTkzNTAzYzU3NmMxOWRjM2MwYzdlIiwKICAgICAgIm1ldGFkYXRhIiA6IHsKICAgICAgICAibW9kZWwiIDogInNsaW0iCiAgICAgIH0KICAgIH0KICB9Cn0="); + this.wildBiteSkinSignature = config.getString("Clans.WildBiteSkinSignature", "Z8NgxOC7mVyeW9hGKMxGKGG16ZDkADR5RXmyktriE6wUodq+TRokU0LIGaCHYrc6ReH3rzQJtNj5Whs83tLPAWGMj79silx6jzPhZ5Db2iTZQjVAG98rNGFBxgsjqSG72LyeyxwRIN6L/OSnf2qna2dP1T12d2uyfdipzuNdXnreG/5WqRj0Rrn3ok+GieuoR1DzYugkPu/3vhJOAFfvtSdoAv0C1JtuKaIeDj5BOm+RHvzwcFiYU9dhnGA0n3mxjGUpCCY/RFGF5l80Cw2RqN6j4rougUhklPe4swpS9KX2fF2TsK/JS8WJ1jHuKyykqnml2VHqsoNDX8yTCD/tTdXWJ+lTDsdkdCkPLbX2hkfIJ/0vv55GnQltERie757K+HHncmYw4tBxjgtTCcdIcLNNoAf9jlQC4f8sUCdPiIr7PKoxrik6GkZKx52DsaUGvv/+32E/Aswo1TnD0gMFOiWTtYfJ4OmMW5Ez+AtpoWnypAFKDtTIqMadhD/3HatlpCXsAuA49vE15dfN6WF+wJ66hCtxUKZJSqFhQ81Fan3R9+62E1f+7Vm8yyzoo/ttRmg7zFRAMTaf200z4Ei3xZvq0NiN8USdd3au4DAwK45Tn3FYc+Qo+9TVYn1iDEG9uo5BGYhxiYAz/TnVJccKOqaCzlu1KV/JxabEpAFd534="); this.werewolfNamesEnabled = config.getBoolean("WerewolfNames.Enabled", true); if (config.contains("WerewolfNames.Given_names")) @@ -847,6 +872,14 @@ public void saveSettings() config.set("Clans.PotionAccountUUID", this.potionAccountUUID); config.set("Clans.WerewolfBiteAccountUUID", this.werewolfBiteAccountUUID); config.set("Clans.WildBiteAccountUUID", this.wildBiteAccountUUID); + config.set("Clans.AlphaSkinValue", this.alphaSkinValue); + config.set("Clans.AlphaSkinSignature", this.alphaSkinSignature); + config.set("Clans.PotionSkinValue", this.potionSkinValue); + config.set("Clans.PotionSkinSignature", this.potionSkinSignature); + config.set("Clans.WerewolfBiteSkinValue", this.werewolfBiteSkinValue); + config.set("Clans.WerewolfBiteSkinSignature", this.werewolfBiteSkinSignature); + config.set("Clans.WildBiteSkinValue", this.wildBiteSkinValue); + config.set("Clans.WildBiteSkinSignature", this.wildBiteSkinSignature); config.set("WerewolfNames.Enabled", this.werewolfNamesEnabled); config.set("WerewolfNames.Given_names", this.givenNames); diff --git a/src/com/dogonfire/werewolf/api/IWerewolfDisguiseFactory.java b/src/com/dogonfire/werewolf/api/IWerewolfDisguiseFactory.java index 582d220..d4de617 100644 --- a/src/com/dogonfire/werewolf/api/IWerewolfDisguiseFactory.java +++ b/src/com/dogonfire/werewolf/api/IWerewolfDisguiseFactory.java @@ -61,16 +61,16 @@ public WerewolfDisguise(String werewolfName, String accountName) switch (accountName) { case "WerewolfAlpha": - this.accountId = UUID.fromString("e0d074bd-6722-47fc-95d3-f28e2899e155"); + this.accountId = UUID.fromString(Werewolf.instance().alphaAccountUUID); break; case "WF_Werewolf": - this.accountId = UUID.fromString("c61647e5-fc2f-4536-abe9-c851911ad22f"); + this.accountId = UUID.fromString(Werewolf.instance().potionAccountUUID); break; case "SM_Werewolf": - this.accountId = UUID.fromString("b68a8f00-7d24-4c52-b6ad-1423bfbe26ee"); + this.accountId = UUID.fromString(Werewolf.instance().werewolfBiteAccountUUID); break; case "BM_Werewolf": - this.accountId = UUID.fromString("da508ecc-dbd9-46c5-8095-47b91aa4ff5f"); + this.accountId = UUID.fromString(Werewolf.instance().wildBiteAccountUUID); break; default: // Account called Werewolf. No clan has this skin... diff --git a/src/com/dogonfire/werewolf/api/LibsDisguisesFactory.java b/src/com/dogonfire/werewolf/api/LibsDisguisesFactory.java index 97ab278..7dc21b1 100644 --- a/src/com/dogonfire/werewolf/api/LibsDisguisesFactory.java +++ b/src/com/dogonfire/werewolf/api/LibsDisguisesFactory.java @@ -11,9 +11,9 @@ public class LibsDisguisesFactory implements IWerewolfDisguiseFactory { - public class LibsDisguisesDisguise extends WerewolfDisguise + public class LibsDisguisesWerewolfDisguise extends WerewolfDisguise { - public LibsDisguisesDisguise(UUID werewolfDisguiseAccountId, String werewolfDisguiseAccountName) + public LibsDisguisesWerewolfDisguise(UUID werewolfDisguiseAccountId, String werewolfDisguiseAccountName) { super(werewolfDisguiseAccountId, werewolfDisguiseAccountName); } @@ -131,8 +131,8 @@ public boolean removeDisguise(Player player) }*/ @Override - public LibsDisguisesDisguise newDisguise(UUID disguiseAccountId, String disguiseAccountName) + public LibsDisguisesWerewolfDisguise newDisguise(UUID disguiseAccountId, String disguiseAccountName) { - return new LibsDisguisesDisguise(disguiseAccountId, disguiseAccountName); + return new LibsDisguisesWerewolfDisguise(disguiseAccountId, disguiseAccountName); } } diff --git a/src/com/dogonfire/werewolf/api/MySkinFactory.java b/src/com/dogonfire/werewolf/api/MySkinFactory.java index 9c48c46..d2f31dd 100644 --- a/src/com/dogonfire/werewolf/api/MySkinFactory.java +++ b/src/com/dogonfire/werewolf/api/MySkinFactory.java @@ -1,143 +1,140 @@ package com.dogonfire.werewolf.api; import java.util.UUID; - -import org.bukkit.Bukkit; import org.bukkit.entity.Player; - import com.dogonfire.werewolf.Werewolf; -import eu.blackfire62.myskin.bukkit.MySkin; -import eu.blackfire62.myskin.shared.SkinProperty; -import eu.blackfire62.myskin.shared.util.MojangAPI; -import eu.blackfire62.myskin.shared.util.MojangAPIException; +//import eu.blackfire62.myskin.bukkit.MySkin; +//import eu.blackfire62.myskin.shared.SkinProperty; +//import eu.blackfire62.myskin.shared.util.MojangAPI; +//import eu.blackfire62.myskin.shared.util.MojangAPIException; public class MySkinFactory implements IWerewolfDisguiseFactory { - private MySkin mySkin; +// private MySkin mySkin; public class MySkinWerewolfDisguise extends WerewolfDisguise { - private SkinProperty disguiseSkinProperty; +// private SkinProperty disguiseSkinProperty; public MySkinWerewolfDisguise(UUID disguiseAccountId, String disguiseAccountName) { super(disguiseAccountId, disguiseAccountName); // Load the Disguise skin - disguiseSkinProperty = mySkin.getCache().loadSkinProperty(getSkinAccountUUID()); +// disguiseSkinProperty = mySkin.getCache().loadSkinProperty(getSkinAccountUUID()); } public boolean disguise(Player player, String werewolfName) { - Werewolf.instance().logDebug("Disguising player " + player.getName() + " using MySkin..."); - - if(!Werewolf.instance().getServer().getPluginManager().getPlugin("MySkin").isEnabled()) - { - Werewolf.instance().logDebug("Didn't disguise player... MySkin is not enabled!"); - return false; - } - - try - { - // Load the Disguise skin from the cache, and if it returns null, load the skin from the MojangAPI and put it in the cache - Werewolf.instance().logDebug("[MySkin] Started Disguising of player: " + player.getName()); - Werewolf.instance().logDebug("Skinaccountuuid: " + getSkinAccountUUID()); - disguiseSkinProperty = mySkin.getCache().loadSkinProperty(getSkinAccountUUID()); - if (disguiseSkinProperty == null) - { - // TODO Remove the SkinTexture parts and move completely to MojangAPI - Werewolf.instance().logDebug("[MySkin] Using the SkinTexture, since the cached skin returned null!"); - disguiseSkinProperty = new SkinProperty(getSkinTextureValue(player), getSkinTextureSignature(player)); - if (disguiseSkinProperty == null) - { - Werewolf.instance().logDebug("[MySkin] Using the MojangAPI, since the newly loaded disguiseSkinProperty returned null!"); - disguiseSkinProperty = MojangAPI.getSkinProperty(getSkinAccountUUID()); - if (disguiseSkinProperty == null) - { - Werewolf.instance().log("[MySkin] Tried Disguising as a non-cached werewolf! Disguise failed!"); - return false; - } - else - { - mySkin.getCache().saveSkinProperty(getSkinAccountUUID(), disguiseSkinProperty); - } - } - else - { - mySkin.getCache().saveSkinProperty(getSkinAccountUUID(), disguiseSkinProperty); - } - } - - // Get the SkinProperty for the current player and save the player's skin to the cache - SkinProperty playerSkinProperty = mySkin.getHandler().getSkinProperty(player); - mySkin.getCache().saveSkinProperty(player.getUniqueId(), playerSkinProperty); - - // Apply the loaded SkinProperty to the player - mySkin.getHandler().setSkinProperty(player, disguiseSkinProperty); - mySkin.getHandler().update(player); - Werewolf.getWerewolfScoreboardManager().showNametagForPlayer(player, false); - - return true; - } - catch (NoClassDefFoundError e) - { - e.printStackTrace(); - Werewolf.instance().logDebug("Couldn't disguise player... MySkin not found!"); - } - catch (MojangAPIException e) - { - e.printStackTrace(); - Werewolf.instance().log("[ERROR] Couldn't disguise player... MojangAPI Error, check the logs!"); - } +// Werewolf.instance().logDebug("Disguising player " + player.getName() + " using MySkin..."); +// +// if(!Werewolf.instance().getServer().getPluginManager().getPlugin("MySkin").isEnabled()) +// { +// Werewolf.instance().logDebug("Didn't disguise player... MySkin is not enabled!"); +// return false; +// } +// +// try +// { +// // Load the Disguise skin from the cache, and if it returns null, load the skin from the MojangAPI and put it in the cache +// Werewolf.instance().logDebug("[MySkin] Started Disguising of player: " + player.getName()); +// Werewolf.instance().logDebug("Skinaccountuuid: " + getSkinAccountUUID()); +// disguiseSkinProperty = mySkin.getCache().loadSkinProperty(getSkinAccountUUID()); +// if (disguiseSkinProperty == null) +// { +// // TODO Remove the SkinTexture parts and move completely to MojangAPI +// Werewolf.instance().logDebug("[MySkin] Using the SkinTexture, since the cached skin returned null!"); +// disguiseSkinProperty = new SkinProperty(getSkinTextureValue(player), getSkinTextureSignature(player)); +// if (disguiseSkinProperty == null) +// { +// Werewolf.instance().logDebug("[MySkin] Using the MojangAPI, since the newly loaded disguiseSkinProperty returned null!"); +// disguiseSkinProperty = MojangAPI.getSkinProperty(getSkinAccountUUID()); +// if (disguiseSkinProperty == null) +// { +// Werewolf.instance().log("[MySkin] Tried Disguising as a non-cached werewolf! Disguise failed!"); +// return false; +// } +// else +// { +// mySkin.getCache().saveSkinProperty(getSkinAccountUUID(), disguiseSkinProperty); +// } +// } +// else +// { +// mySkin.getCache().saveSkinProperty(getSkinAccountUUID(), disguiseSkinProperty); +// } +// } +// +// // Get the SkinProperty for the current player and save the player's skin to the cache +// SkinProperty playerSkinProperty = mySkin.getHandler().getSkinProperty(player); +// mySkin.getCache().saveSkinProperty(player.getUniqueId(), playerSkinProperty); +// +// // Apply the loaded SkinProperty to the player +// mySkin.getHandler().setSkinProperty(player, disguiseSkinProperty); +// mySkin.getHandler().update(player); +// Werewolf.getWerewolfScoreboardManager().showNametagForPlayer(player, false); +// +// return true; +// } +// catch (NoClassDefFoundError e) +// { +// e.printStackTrace(); +// Werewolf.instance().logDebug("Couldn't disguise player... MySkin not found!"); +// } +// catch (MojangAPIException e) +// { +// e.printStackTrace(); +// Werewolf.instance().log("[ERROR] Couldn't disguise player... MojangAPI Error, check the logs!"); +// } return false; } public boolean undisguise(Player player) { - if(!Werewolf.instance().getServer().getPluginManager().getPlugin("MySkin").isEnabled()) - { - Werewolf.instance().logDebug("Didn't undisguise player... MySkin not enabled!"); - return false; - } - - try - { - Werewolf.instance().logDebug("[MySkin] Undisguise - Start undisguise!"); - - // Load the Player's original skin from the cache - SkinProperty playerSkinProperty = mySkin.getCache().loadSkinProperty(player.getUniqueId()); - if (playerSkinProperty == null) - { - Werewolf.instance().logDebug("[MySkin] Could not fetch Player's original skin from cache, trying to get from MojangAPI"); - playerSkinProperty = MojangAPI.getSkinProperty(player.getUniqueId()); - if (playerSkinProperty == null) - { - Werewolf.instance().log("[MySkin] Undisguise - Tried Disguising as a non-cached player! Undisguise failed!"); - return false; - } - Werewolf.instance().logDebug("[MySkin] Sucessfully fetched the player's original skin from MojangAPI"); - } - - // Apply the Player's old skin back - mySkin.getHandler().setSkinProperty(player, playerSkinProperty); - mySkin.getHandler().update(player); - mySkin.getCache().resetSkinOfPlayer(player.getUniqueId()); - Werewolf.getWerewolfScoreboardManager().showNametagForPlayer(player, true); - - return true; - } - catch (NoClassDefFoundError e) - { - e.printStackTrace(); - Werewolf.instance().logDebug("Couldn't undisguise player... MySkin not found!"); - } - catch (MojangAPIException e) - { - e.printStackTrace(); - Werewolf.instance().log("[ERROR] Couldn't undisguise player... MojangAPI Error, check the logs!"); - } +// if(!Werewolf.instance().getServer().getPluginManager().getPlugin("MySkin").isEnabled()) +// { +// Werewolf.instance().logDebug("Didn't undisguise player... MySkin not enabled!"); +// return false; +// } +// +// try +// { +// Werewolf.instance().logDebug("[MySkin] Undisguise - Start undisguise!"); +// +// // Load the Player's original skin from the cache +// SkinProperty playerSkinProperty = mySkin.getCache().loadSkinProperty(player.getUniqueId()); +// if (playerSkinProperty == null) +// { +// Werewolf.instance().logDebug("[MySkin] Could not fetch Player's original skin from cache, trying to get from MojangAPI"); +// playerSkinProperty = MojangAPI.getSkinProperty(player.getUniqueId()); +// if (playerSkinProperty == null) +// { +// Werewolf.instance().log("[MySkin] Undisguise - Tried Disguising as a non-cached player! Undisguise failed!"); +// return false; +// } +// Werewolf.instance().logDebug("[MySkin] Sucessfully fetched the player's original skin from MojangAPI"); +// } +// +// // Apply the Player's old skin back +// mySkin.getHandler().setSkinProperty(player, playerSkinProperty); +// mySkin.getHandler().update(player); +// mySkin.getCache().resetSkinOfPlayer(player.getUniqueId()); +// Werewolf.getWerewolfScoreboardManager().showNametagForPlayer(player, true); +// +// return true; +// } +// catch (NoClassDefFoundError e) +// { +// e.printStackTrace(); +// Werewolf.instance().logDebug("Couldn't undisguise player... MySkin not found!"); +// } +// catch (MojangAPIException e) +// { +// e.printStackTrace(); +// Werewolf.instance().log("[ERROR] Couldn't undisguise player... MojangAPI Error, check the logs!"); +// } return false; } } @@ -145,20 +142,22 @@ public boolean undisguise(Player player) public MySkinFactory() { - this.mySkin = (MySkin) Bukkit.getPluginManager().getPlugin("MySkin"); - - try - { - mySkin.getCache().saveSkinOfPlayer(UUID.fromString(Werewolf.instance().potionAccountUUID), UUID.fromString(Werewolf.instance().potionAccountUUID)); - mySkin.getCache().saveSkinOfPlayer(UUID.fromString(Werewolf.instance().werewolfBiteAccountUUID), UUID.fromString(Werewolf.instance().werewolfBiteAccountUUID)); - mySkin.getCache().saveSkinOfPlayer(UUID.fromString(Werewolf.instance().wildBiteAccountUUID), UUID.fromString(Werewolf.instance().wildBiteAccountUUID)); - mySkin.getCache().saveSkinOfPlayer(UUID.fromString(Werewolf.instance().alphaAccountUUID), UUID.fromString(Werewolf.instance().alphaAccountUUID)); - } - catch (NullPointerException e) - { - Werewolf.instance().log("[ERROR] Couldn't save Werewolf skins to MySkin's cache... Werewolves are disabled!"); - Werewolf.instance().onDisable(); - } + Werewolf.instance().log("[ERROR] Cannot use MySkin integration...! Werewolves are disabled!"); + Werewolf.instance().onDisable(); +// this.mySkin = (MySkin) Bukkit.getPluginManager().getPlugin("MySkin"); +// +// try +// { +// mySkin.getCache().saveSkinOfPlayer(UUID.fromString(Werewolf.instance().potionAccountUUID), UUID.fromString(Werewolf.instance().potionAccountUUID)); +// mySkin.getCache().saveSkinOfPlayer(UUID.fromString(Werewolf.instance().werewolfBiteAccountUUID), UUID.fromString(Werewolf.instance().werewolfBiteAccountUUID)); +// mySkin.getCache().saveSkinOfPlayer(UUID.fromString(Werewolf.instance().wildBiteAccountUUID), UUID.fromString(Werewolf.instance().wildBiteAccountUUID)); +// mySkin.getCache().saveSkinOfPlayer(UUID.fromString(Werewolf.instance().alphaAccountUUID), UUID.fromString(Werewolf.instance().alphaAccountUUID)); +// } +// catch (NullPointerException e) +// { +// Werewolf.instance().log("[ERROR] Couldn't save Werewolf skins to MySkin's cache... Werewolves are disabled!"); +// Werewolf.instance().onDisable(); +// } } @Override diff --git a/src/com/dogonfire/werewolf/api/SkinsRestorerFactory.java b/src/com/dogonfire/werewolf/api/SkinsRestorerFactory.java new file mode 100644 index 0000000..575b39e --- /dev/null +++ b/src/com/dogonfire/werewolf/api/SkinsRestorerFactory.java @@ -0,0 +1,114 @@ +package com.dogonfire.werewolf.api; + +import com.dogonfire.werewolf.ClanManager; +import com.dogonfire.werewolf.Werewolf; +import net.skinsrestorer.api.PlayerWrapper; +import net.skinsrestorer.api.SkinsRestorerAPI; +import net.skinsrestorer.api.exception.SkinRequestException; +import org.bukkit.entity.Player; + +import java.util.UUID; + +public class SkinsRestorerFactory implements IWerewolfDisguiseFactory +{ + private SkinsRestorerAPI skinsRestorerAPI; + + public class SkinsRestorerWerewolfDisguise extends WerewolfDisguise + { + public SkinsRestorerWerewolfDisguise(UUID accountId, String accountName) { + super(accountId, accountName); + } + + @Override + public boolean disguise(Player player, String werewolfName) { + Werewolf.instance().logDebug("Disguising player " + player.getName() + " using SkinsRestorer..."); + + if(!Werewolf.instance().getServer().getPluginManager().getPlugin("SkinsRestorer").isEnabled()) + { + Werewolf.instance().logDebug("Didn't disguise player... SkinsRestorer is not enabled!"); + return false; + } + + Werewolf.instance().logDebug("[SkinsRestorer] Started Disguising of player: " + player.getName()); + + try + { + // Cache the old, current skin + skinsRestorerAPI.setSkinData(player.getName() + "_cache", skinsRestorerAPI.getSkinData(player.getName())); + + // #setSkin() for player skin + if (Werewolf.getClanManager().isAlpha(player.getUniqueId())) { + Werewolf.instance().logDebug("[SkinsRestorer] Disguising " + player.getName() + " using the Alpha skin."); + skinsRestorerAPI.setSkin(player.getName(), "Alpha"); + } + else { + String clanName = Werewolf.getWerewolfManager().getWerewolfClan(player.getUniqueId()).name(); + Werewolf.instance().logDebug("[SkinsRestorer] Disguising " + player.getName() + " using the " + clanName + " skin."); + skinsRestorerAPI.setSkin(player.getName(), clanName); + } + + // Force skin refresh for player + skinsRestorerAPI.applySkin(new PlayerWrapper(player)); + return true; + } + catch (SkinRequestException e) + { + Werewolf.instance().log("[SkinsRestorer] Failed to apply skin for player"); + e.printStackTrace(); + } + return false; + } + + @Override + public boolean undisguise(Player player) { + Werewolf.instance().logDebug("Undisguising player " + player.getName() + " using SkinsRestorer..."); + + if(!Werewolf.instance().getServer().getPluginManager().getPlugin("SkinsRestorer").isEnabled()) + { + Werewolf.instance().logDebug("Didn't undisguise player... SkinsRestorer is not enabled!"); + return false; + } + + Werewolf.instance().logDebug("[SkinsRestorer] Undisguise - Start undisguise!"); + + try + { + skinsRestorerAPI.setSkin(player.getName(), player.getName() + "_cache"); + + // Force skin refresh for player + skinsRestorerAPI.applySkin(new PlayerWrapper(player)); + return true; + } + catch (SkinRequestException e) + { + Werewolf.instance().log("[SkinsRestorer] Failed to apply skin for player"); + e.printStackTrace(); + } + return false; + } + } + + public SkinsRestorerFactory() + { + this.skinsRestorerAPI = SkinsRestorerAPI.getApi(); + + try + { + skinsRestorerAPI.setSkinData("Alpha", skinsRestorerAPI.createPlatformProperty("textures", Werewolf.instance().alphaSkinValue, Werewolf.instance().alphaSkinSignature)); + skinsRestorerAPI.setSkinData(ClanManager.ClanType.Potion.name(), skinsRestorerAPI.createPlatformProperty("textures", Werewolf.instance().potionSkinValue, Werewolf.instance().potionSkinSignature)); + skinsRestorerAPI.setSkinData(ClanManager.ClanType.WerewolfBite.name(), skinsRestorerAPI.createPlatformProperty("textures", Werewolf.instance().werewolfBiteSkinValue, Werewolf.instance().werewolfBiteSkinSignature)); + skinsRestorerAPI.setSkinData(ClanManager.ClanType.WildBite.name(), skinsRestorerAPI.createPlatformProperty("textures", Werewolf.instance().wildBiteSkinValue, Werewolf.instance().wildBiteSkinSignature)); + } + catch (NullPointerException e) + { + Werewolf.instance().log("[ERROR] Couldn't save Werewolf skin data to SkinsRestorer's cache... Werewolves are disabled!"); + Werewolf.instance().onDisable(); + } + } + + @Override + public WerewolfDisguise newDisguise(UUID disguiseAccountId, String disguiseAccountName) + { + return new SkinsRestorerWerewolfDisguise(disguiseAccountId, disguiseAccountName); + } +} diff --git a/src/com/dogonfire/werewolf/api/WerewolfDisguiseAPI.java b/src/com/dogonfire/werewolf/api/WerewolfDisguiseAPI.java index 7fe9cdb..e02ebc7 100644 --- a/src/com/dogonfire/werewolf/api/WerewolfDisguiseAPI.java +++ b/src/com/dogonfire/werewolf/api/WerewolfDisguiseAPI.java @@ -27,14 +27,21 @@ public static boolean init() werewolfDisguiser = new LibsDisguisesFactory(); return true; } - else if (pm.getPlugin("MySkin") != null && pm.getPlugin("MySkin").isEnabled()) + else if (pm.getPlugin("SkinsRestorer") != null && pm.getPlugin("SkinsRestorer").isEnabled()) { - Werewolf.instance().log("MySkin found, using it for werewolf disguises!"); - werewolfDisguiser = new MySkinFactory(); + Werewolf.instance().log("SkinsRestorer found, using it for werewolf disguises!"); + werewolfDisguiser = new SkinsRestorerFactory(); return true; } + else if (pm.getPlugin("MySkin") != null && pm.getPlugin("MySkin").isEnabled()) + { + Werewolf.instance().log("MySkin found - Werewolf doesn't support MySkin anymore, please use SkinsRestorer or Lib's Disguises instead!"); +// Werewolf.instance().log("MySkin found, using it for werewolf disguises!"); +// werewolfDisguiser = new MySkinFactory(); +// return true; + } - Werewolf.instance().log(ChatColor.RED + "No supported disguise plugin found... Werewolves are disabled!"); + Werewolf.instance().log(ChatColor.RED + "No supported disguise plugin found... Werewolf disguises are disabled!"); return false; } diff --git a/src/com/dogonfire/werewolf/listeners/DamageListener.java b/src/com/dogonfire/werewolf/listeners/DamageListener.java index 095f128..92ef7d5 100644 --- a/src/com/dogonfire/werewolf/listeners/DamageListener.java +++ b/src/com/dogonfire/werewolf/listeners/DamageListener.java @@ -50,7 +50,7 @@ public void onEntityDamage1(EntityDamageEvent event) if (Werewolf.getWerewolfManager().hasWerewolfSkin(player.getUniqueId()) && plugin.disguisesEnabled) { WerewolfDisguise skin = Werewolf.getSkinManager().getSkin(player); - + if (skin != null) { Werewolf.getWerewolfManager().setPouncing(player.getUniqueId()); @@ -80,19 +80,24 @@ public void onEntityDamage2(EntityDamageEvent event) double damage = event.getDamage(); switch (event.getCause()) { - case FALL: - damage = 0; - break; - case CONTACT: - case LAVA: - case LIGHTNING: - case BLOCK_EXPLOSION: - case ENTITY_ATTACK: - damage *= DamageManager.SilverArmorMultiplier; - break; - - default: - break; + case FALL: + damage = 0; + break; + case CONTACT: + case LAVA: + case FIRE: + case LIGHTNING: + case BLOCK_EXPLOSION: + case ENTITY_ATTACK: + case ENTITY_SWEEP_ATTACK: + case PROJECTILE: + case THORNS: + case FREEZE: + damage *= DamageManager.SilverArmorMultiplier; + break; + + default: + break; } if (Werewolf.getClanManager().isAlpha(werewolfPlayer.getUniqueId())) @@ -161,7 +166,7 @@ public void onEntityDamage2(EntityDamageEvent event) if (damageEvent.getEntity() instanceof Player) { Player victim = (Player) damageEvent.getEntity(); - /* + /* * TODO: Readd Vampire integration * if (!this.plugin.isVampire(victim)) * { @@ -240,6 +245,11 @@ public void onEntityDeath(EntityDeathEvent event) int health = 0; switch (event.getEntity().getType()) { + case WARDEN: + case ENDER_DRAGON: + case WITHER: + health = 5; + break; case PLAYER: case VILLAGER: case WANDERING_TRADER: @@ -256,6 +266,7 @@ public void onEntityDeath(EntityDeathEvent event) case ZOGLIN: case PIGLIN_BRUTE: case POLAR_BEAR: + case ELDER_GUARDIAN: health = 4; break; case ENDERMAN: @@ -271,6 +282,9 @@ public void onEntityDeath(EntityDeathEvent event) case STRIDER: case ZOMBIFIED_PIGLIN: case WITCH: + case GUARDIAN: + case CAMEL: + case SNIFFER: health = 3; break; case SHEEP: @@ -283,10 +297,15 @@ public void onEntityDeath(EntityDeathEvent event) case TURTLE: case FOX: case SPIDER: + case SQUID: + case GLOW_SQUID: + case ALLAY: + case PHANTOM: health = 2; break; case SKELETON: case WITHER_SKELETON: + case BLAZE: case STRAY: case CHICKEN: case PARROT: @@ -298,6 +317,12 @@ public void onEntityDeath(EntityDeathEvent event) case SALMON: case PUFFERFISH: case TROPICAL_FISH: + case FROG: + case TADPOLE: + case ENDERMITE: + case BAT: + case MAGMA_CUBE: + case SNOWMAN: health = 1; break; default: diff --git a/src/com/dogonfire/werewolf/listeners/InteractListener.java b/src/com/dogonfire/werewolf/listeners/InteractListener.java index 022be58..0b3f8b3 100644 --- a/src/com/dogonfire/werewolf/listeners/InteractListener.java +++ b/src/com/dogonfire/werewolf/listeners/InteractListener.java @@ -50,6 +50,13 @@ private boolean checkForEatingFood(PlayerInteractEvent event) case COOKIE: case CARROT: case MILK_BUCKET: + case GOLDEN_CARROT: + case SUSPICIOUS_STEW: + case CHORUS_FRUIT: + case MELON_SLICE: + case SWEET_BERRIES: + case GLOW_BERRIES: + case HONEY_BOTTLE: player.sendMessage(Werewolf.getLanguageManager().getLanguageString(LanguageManager.LANGUAGESTRING.WerewolfTryEat, ChatColor.RED)); event.setCancelled(true); return true; @@ -263,32 +270,36 @@ public boolean isForbiddenDefense(Material material) { switch (material) { - case GOLDEN_CHESTPLATE: - case LEATHER_CHESTPLATE: - case DIAMOND_CHESTPLATE: - case CHAINMAIL_CHESTPLATE: - case IRON_CHESTPLATE: - case CHAINMAIL_BOOTS: - case GOLDEN_BOOTS: - case LEATHER_BOOTS: - case IRON_BOOTS: - case DIAMOND_BOOTS: - case GOLDEN_LEGGINGS: - case CHAINMAIL_LEGGINGS: - case LEATHER_LEGGINGS: - case IRON_LEGGINGS: - case DIAMOND_LEGGINGS: - case CHAINMAIL_HELMET: - case GOLDEN_HELMET: - case LEATHER_HELMET: - case IRON_HELMET: - case DIAMOND_HELMET: - case TURTLE_HELMET: - case ELYTRA: - case SHIELD: - return true; - default: - return false; + case GOLDEN_CHESTPLATE: + case LEATHER_CHESTPLATE: + case DIAMOND_CHESTPLATE: + case CHAINMAIL_CHESTPLATE: + case IRON_CHESTPLATE: + case NETHERITE_CHESTPLATE: + case CHAINMAIL_BOOTS: + case GOLDEN_BOOTS: + case LEATHER_BOOTS: + case IRON_BOOTS: + case DIAMOND_BOOTS: + case NETHERITE_BOOTS: + case GOLDEN_LEGGINGS: + case CHAINMAIL_LEGGINGS: + case LEATHER_LEGGINGS: + case IRON_LEGGINGS: + case DIAMOND_LEGGINGS: + case NETHERITE_LEGGINGS: + case CHAINMAIL_HELMET: + case GOLDEN_HELMET: + case LEATHER_HELMET: + case IRON_HELMET: + case DIAMOND_HELMET: + case NETHERITE_HELMET: + case TURTLE_HELMET: + case ELYTRA: + case SHIELD: + return true; + default: + return false; } } } diff --git a/src/com/dogonfire/werewolf/listeners/InventoryListener.java b/src/com/dogonfire/werewolf/listeners/InventoryListener.java index a79a58c..14ab48b 100644 --- a/src/com/dogonfire/werewolf/listeners/InventoryListener.java +++ b/src/com/dogonfire/werewolf/listeners/InventoryListener.java @@ -24,133 +24,6 @@ public InventoryListener(Werewolf p) this.plugin = p; } - /* Doesn't work, and isn't needed as items are tested when the inventory is closed - - @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) - public void onInventoryClick(InventoryClickEvent event) - { - if (!Werewolf.getWerewolfManager().hasWerewolfSkin(event.getWhoClicked().getUniqueId())) - { - return; - } - - if (event.getInventory().getType() != InventoryType.PLAYER) - { - return; - } - - if (event.getSlotType() == InventoryType.SlotType.ARMOR || event.isShiftClick()) - { - event.setCancelled(true); - } - }*/ - - /* - @EventHandler - public void onInventory(InventoryCloseEvent event) - { - if (!Werewolf.getWerewolfManager().isWolfForm(event.getPlayer().getUniqueId())) - { - return; - } - - if (event.getView().getType() == InventoryType.CRAFTING) - { - preventArmor((Player) event.getPlayer()); - } - } - - private void preventArmor(Player player) - { - PlayerInventory pinv = player.getInventory(); - ItemStack helmet = pinv.getHelmet(); - ItemStack chestplate = pinv.getChestplate(); - ItemStack leggings = pinv.getLeggings(); - ItemStack boots = pinv.getBoots(); - - if (helmet != null) - { - if (pinv.firstEmpty() >= 0) - { - pinv.addItem(new ItemStack[] { helmet }); - } - else - { - player.getWorld().dropItem(player.getLocation(), helmet); - } - - pinv.setHelmet(new ItemStack(Material.AIR)); - } - - if (chestplate != null) - { - if (pinv.firstEmpty() >= 0) - { - pinv.addItem(new ItemStack[] { chestplate }); - } - else - { - player.getWorld().dropItem(player.getLocation(), chestplate); - } - pinv.setChestplate(new ItemStack(Material.AIR)); - } - - if (leggings != null) - { - if (pinv.firstEmpty() >= 0) - { - pinv.addItem(new ItemStack[] { leggings }); - } - else - { - player.getWorld().dropItem(player.getLocation(), leggings); - } - pinv.setLeggings(new ItemStack(Material.AIR)); - } - - if (boots != null) - { - if (pinv.firstEmpty() >= 0) - { - pinv.addItem(new ItemStack[] { boots }); - } - else - { - player.getWorld().dropItem(player.getLocation(), boots); - } - pinv.setBoots(new ItemStack(Material.AIR)); - } - } - */ - - /* - * @EventHandler public void onPrepareItemCraft(PrepareItemCraftEvent event) - * { if (event.getView().getType() != InventoryType.WORKBENCH) { - * this.plugin.logDebug("Not workbench. Was " + - * event.getView().getType().name()); return; } - * - * this.plugin.logDebug("PrepareItemCraftEvent"); - * - * CraftingInventory craftingInventory = event.getInventory(); if - * (!craftingInventory.contains(Material.IRON_SWORD)) { - * this.plugin.logDebug("Not sword"); return; } - * - * if (!craftingInventory.contains(Material.QUARTZ)) { - * this.plugin.logDebug("Not quartz"); return; } - * - * ItemStack silverSword = new ItemStack(Material.IRON_SWORD); - * - * ItemMeta itemMeta = silverSword.getItemMeta(); - * - * List list = new ArrayList(); list.add(ChatColor.DARK_GREEN + - * "Good for slaying Werewolves!"); itemMeta.setDisplayName(ChatColor.GOLD + - * "Werewolf Slayer"); itemMeta.setLore(list); - * - * silverSword.setItemMeta(itemMeta); - * - * craftingInventory.setResult(silverSword); } - */ - @EventHandler(priority = EventPriority.LOWEST) public void onInventoryClose(InventoryCloseEvent event) { @@ -406,11 +279,145 @@ public boolean isForbiddenItem(Material material) case IRON_SHOVEL: case FLINT_AND_STEEL: case FISHING_ROD: + case LEAD: + case COMPASS: + case SHEARS: case TRIDENT: case CROSSBOW: + case SPYGLASS: + case RECOVERY_COMPASS: + case BUNDLE: + case BRUSH: return true; default: return false; } } + + /* Doesn't work, and isn't needed as items are tested when the inventory is closed + + @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) + public void onInventoryClick(InventoryClickEvent event) + { + if (!Werewolf.getWerewolfManager().hasWerewolfSkin(event.getWhoClicked().getUniqueId())) + { + return; + } + + if (event.getInventory().getType() != InventoryType.PLAYER) + { + return; + } + + if (event.getSlotType() == InventoryType.SlotType.ARMOR || event.isShiftClick()) + { + event.setCancelled(true); + } + }*/ + + /* + @EventHandler + public void onInventory(InventoryCloseEvent event) + { + if (!Werewolf.getWerewolfManager().isWolfForm(event.getPlayer().getUniqueId())) + { + return; + } + + if (event.getView().getType() == InventoryType.CRAFTING) + { + preventArmor((Player) event.getPlayer()); + } + } + + private void preventArmor(Player player) + { + PlayerInventory pinv = player.getInventory(); + ItemStack helmet = pinv.getHelmet(); + ItemStack chestplate = pinv.getChestplate(); + ItemStack leggings = pinv.getLeggings(); + ItemStack boots = pinv.getBoots(); + + if (helmet != null) + { + if (pinv.firstEmpty() >= 0) + { + pinv.addItem(new ItemStack[] { helmet }); + } + else + { + player.getWorld().dropItem(player.getLocation(), helmet); + } + + pinv.setHelmet(new ItemStack(Material.AIR)); + } + + if (chestplate != null) + { + if (pinv.firstEmpty() >= 0) + { + pinv.addItem(new ItemStack[] { chestplate }); + } + else + { + player.getWorld().dropItem(player.getLocation(), chestplate); + } + pinv.setChestplate(new ItemStack(Material.AIR)); + } + + if (leggings != null) + { + if (pinv.firstEmpty() >= 0) + { + pinv.addItem(new ItemStack[] { leggings }); + } + else + { + player.getWorld().dropItem(player.getLocation(), leggings); + } + pinv.setLeggings(new ItemStack(Material.AIR)); + } + + if (boots != null) + { + if (pinv.firstEmpty() >= 0) + { + pinv.addItem(new ItemStack[] { boots }); + } + else + { + player.getWorld().dropItem(player.getLocation(), boots); + } + pinv.setBoots(new ItemStack(Material.AIR)); + } + } + */ + + /* + * @EventHandler public void onPrepareItemCraft(PrepareItemCraftEvent event) + * { if (event.getView().getType() != InventoryType.WORKBENCH) { + * this.plugin.logDebug("Not workbench. Was " + + * event.getView().getType().name()); return; } + * + * this.plugin.logDebug("PrepareItemCraftEvent"); + * + * CraftingInventory craftingInventory = event.getInventory(); if + * (!craftingInventory.contains(Material.IRON_SWORD)) { + * this.plugin.logDebug("Not sword"); return; } + * + * if (!craftingInventory.contains(Material.QUARTZ)) { + * this.plugin.logDebug("Not quartz"); return; } + * + * ItemStack silverSword = new ItemStack(Material.IRON_SWORD); + * + * ItemMeta itemMeta = silverSword.getItemMeta(); + * + * List list = new ArrayList(); list.add(ChatColor.DARK_GREEN + + * "Good for slaying Werewolves!"); itemMeta.setDisplayName(ChatColor.GOLD + + * "Werewolf Slayer"); itemMeta.setLore(list); + * + * silverSword.setItemMeta(itemMeta); + * + * craftingInventory.setResult(silverSword); } + */ } diff --git a/src/com/dogonfire/werewolf/listeners/PlayerListener.java b/src/com/dogonfire/werewolf/listeners/PlayerListener.java index 4f09eb6..f774b14 100644 --- a/src/com/dogonfire/werewolf/listeners/PlayerListener.java +++ b/src/com/dogonfire/werewolf/listeners/PlayerListener.java @@ -242,6 +242,7 @@ else if (Werewolf.getWerewolfManager().hasWerewolfSkin(event.getEntity().getUniq { switch (killer.getInventory().getItemInMainHand().getType()) { + case NETHERITE_SWORD: case DIAMOND_SWORD: case GOLDEN_SWORD: case IRON_SWORD: diff --git a/src/resources/plugin.yml b/src/resources/plugin.yml index 7352bba..15a193a 100644 --- a/src/resources/plugin.yml +++ b/src/resources/plugin.yml @@ -6,8 +6,8 @@ api-version: 1.13 load: POSTWORLD description: Werewolves in Minecraft! depend: [] -softdepend: [Vault, HealthBar, LibsDisguises, MySkin] -website: http://dev.bukkit.org/server-mods/werewolf +softdepend: [Vault, HealthBar, LibsDisguises, SkinsRestorer] +website: https://dev.bukkit.org/server-mods/werewolf commands: werewolf: description: Command for the Werewolf plugin