diff --git a/.github/workflows/maven-test.yml b/.github/workflows/maven-test.yml new file mode 100644 index 0000000..8ea4989 --- /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: [ '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/.gitignore b/.gitignore index cc7c678..80c0fe0 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,8 @@ dependency-reduced-pom.xml /.settings/ # Maven build -/target/ \ No newline at end of file +/target/ + +# IDEA +/.idea/ +werewolf.iml diff --git a/.travis.yml b/.travis.yml index 861cf25..3af11d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,9 +16,9 @@ before_install: - wget -P "lib/" https://www.doggycraft.dk/lib/MySkin.jar addons: sonarcloud: - organization: "dogonfire" + organization: "doggycraftdk" token: - secure: "TSveGpsVp/WNHcB7zMD8Bool6j09F1J95L6dnWF8slJrUlytZOUMCSP76MdiLngnBaiWlXAkgBnD1QEwdg/xkrl6EVBTT3oys2AKhikR4+CRmgZRoW/adSmOR/GUA6IPM/Uj2iM+bWkjFxAFHvvA0TrNjqmAHEaKpMRL+yHsKysKXapIJ2nd/VEfv4gO9OXt7YbKLGgNgWdhuWlbC10rwhHPO8Bj4yRr3UeILqFUF2C7wHJt+w45Gcd4oG//A7anWcLWR+QUeJx5HVe2sAFPIOVslxnY6eFxcZXOVXsiW2yRehyo/ANEnGEcfAfiKyZ5hqgLWhth7fs6AeolozkWAT4M0S+uu8YyPeNk7HlUwEiMAMxtnB5zv2Q0i9XU1d2d3AYwX/Ru5kaMILp0zmT8SryjEsnEwpNmMdK3KmuUqIjwcdClvZyS6Z7WRvth+rtI5QBzZlYl3L6b9tRN1mVUQFeM5Sgo4sYowPfwMnHyhDAb4zuH2gwwFRtSMbuxesK7GpN2DiXKDx1K0UlXWCt2CviyIjnG1iYHVE6kLvMq0W668l8NrM6ANtj5Q0PoBXgAYI+Im8A/h8Hf5MAiC/J9Ou9KFLndxV+aO26nnTYkrFpPB1lfhncb7fcucsmu+M0Ld37hFQtp+rZ3jSPnhQFFuMRqwx1lMHbsQB1tqfCMWvg=" + secure: $SONAR_TOKEN script: - - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar -Dsonar.projectKey=DogOnFire_Werewolf + - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar -Dsonar.projectKey=DoggyCraftDK_Werewolf \ No newline at end of file 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/README.md b/README.md index d782a80..79c38dd 100644 --- a/README.md +++ b/README.md @@ -11,73 +11,73 @@ Werewolf ![Werewolf](https://raw.githubusercontent.com/DoggyCraftDK/Werewolf/master/img/Werewolf.jpg) -The plugin for adding werewolves into Minecraft! +The plugin for adding Werewolves into Minecraft! Background --------- To become a Werewolf, you have to get bitten (attacked) by a wolf or Werewolf at night and contract the Werewolf infection. This infection will turn the player into a Werewolf every night, starting the next night, if the player is under a open sky. To prevent turning, the player can stay inside during night. -* When in wolf-form, character skin changes to a Werewolf skin -* When in wolf-form, players will become identifiable only as their werewolf name in the playerlist and chat (Adding a element of mystery) -* When in wolf-form, werewolves speak in a language which appears as growling noises to normal players. -* A Werewolf automatically turns into his Wolf-form during a full moon, when under a open sky. -* A Werewolf automatically turns into his Human-form at dawn. -* A Werewolf only eats meat! -* A Werewolf gains health from killing mobs (Hunting) -* A Werewolf does high unarmed damage -* A Werewolf moves faster -* A Werewolf jumps higher -* A Werewolf has night vision. -* A Werewolf cannot wield Armor while in Wolf-form, but has a high natural defense -* A Werewolf can growl with /growl -* A Werewolf can howl with /howl -* ~~Vampires cannot be infected with the Werewolf infection~~ **_Vampire integration removed, for now_** -* When a Werewolf gets killed, the player re-spawns in human form. -* Werewolves are very vulnerable to silver weapons. -* Werewolves are flock creatures and live in clans -* Werewolves are the natural leaders of wild wolves -* The Werewolf infection can be cured by drinking the werewolf cure potion +* When in wolf-form, character skin changes to a Werewolf skin +* When in wolf-form, players will become identifiable only as their werewolf name in the playerlist and chat (Adding a element of mystery) +* When in wolf-form, werewolves speak in a language which appears as growling noises to normal players. +* A Werewolf automatically turns into his Wolf-form during a full moon, when under a open sky. +* A Werewolf automatically turns into his Human-form at dawn. +* A Werewolf only eats meat! +* A Werewolf gains health from killing mobs (Hunting) +* A Werewolf does high unarmed damage +* A Werewolf moves faster +* A Werewolf jumps higher +* A Werewolf has night vision. +* A Werewolf cannot wield Armor while in Wolf-form, but has a high natural defense +* A Werewolf can growl with /growl +* A Werewolf can howl with /howl +* Vampires cannot be infected with the Werewolf infection +* When a Werewolf gets killed, the player re-spawns in human form. +* Werewolves are very vulnerable to silver weapons. +* Werewolves are flock creatures and live in clans +* Werewolves are the natural leaders of wild wolves +* The Werewolf infection can be cured by drinking the werewolf cure potion Installation --------- -* [Install a Spigot server](https://github.com/DogOnFire/Werewolf/#obtain-a-build-of-spigot) -* [Download Werewolf](https://github.com/DogOnFire/Werewolf/#download) -* Drop the Werewolf.jar into the plugins folder. -* Drop either [MySkin.jar](https://www.spigotmc.org/resources/myskin-1-8-1-14-4.52303/) or [LibsDisguises](https://www.spigotmc.org/resources/libs-disguises.32453/) into the plugins folder. -* Start your Spigot/CraftBukkit server. (Using /reload can have unwanted side effects with players still online, and with complex plugins dependencies, so it's not recommended.) +* [Install a Spigot server](https://github.com/DogOnFire/Werewolf/#obtain-a-build-of-spigot) +* [Download Werewolf](https://github.com/DogOnFire/Werewolf/#download) +* Drop the Werewolf.jar into the plugins folder. +* Drop either [MySkin.jar](https://www.spigotmc.org/resources/myskin-1-8-1-14-4.52303/) or [LibsDisguises](https://www.spigotmc.org/resources/libs-disguises.32453/) into the plugins folder. +* Start your Spigot/CraftBukkit server. (Using /reload can have unwanted side effects with players still online, and with complex plugins dependencies, so it's not recommended.) Links --------- ###### Project -* [Werewolf at SpigotMC](https://www.spigotmc.org/resources/werewolf.7442/) -* [Werewolf at BukkitDev](https://dev.bukkit.org/bukkit-plugins/werewolf/) +* [Werewolf at SpigotMC](https://www.spigotmc.org/resources/werewolf.7442/) +* [Werewolf at BukkitDev](https://dev.bukkit.org/bukkit-plugins/werewolf/) ###### Download -* [BukkitDev](https://dev.bukkit.org/projects/werewolf/files/) -* [SpigotMC](https://www.spigotmc.org/resources/werewolf/updates) +* [BukkitDev](https://dev.bukkit.org/projects/werewolf/files/) +* [SpigotMC](https://www.spigotmc.org/resources/werewolf.7442/updates) ###### Support and Documentation -* [Issues/Tickets](https://github.com/DogOnFire/Issues/issues) -* [Wiki](https://github.com/DogOnFire/Docs/wiki) -* [Configuration](https://github.com/DogOnFire/Werewolf/wiki/Configuration) -* [Permissions](https://github.com/DogOnFire/Werewolf/wiki/Permissions) -* [Commands](https://github.com/DogOnFire/Werewolf/wiki/Commands) +* [Issues/Tickets](https://github.com/DogOnFire/Issues/issues) +* [Wiki](https://github.com/DogOnFire/Docs/wiki) +* [Configuration](https://github.com/DogOnFire/Werewolf/wiki/Configuration) +* [Permissions](https://github.com/DogOnFire/Werewolf/wiki/Permissions) +* [Commands](https://github.com/DogOnFire/Werewolf/wiki/Commands) ###### Developers -* [License (GPLv3)](https://github.com/DogOnFire/Werewolf/blob/master/LICENSE.txt) -* [API](https://github.com/DogOnFire/Docs/wiki/API) -* [Contribute](https://github.com/DogOnFire/Werewolf/blob/master/CONTRIBUTING.md) +* [License (GPLv3)](https://github.com/DogOnFire/Werewolf/blob/master/LICENSE.txt) +* [API](https://github.com/DogOnFire/Docs/wiki/API) +* [Contribute](https://github.com/DogOnFire/Werewolf/blob/master/CONTRIBUTING.md) ###### Related Plugins -* [ProtocolLib at BukkitDev](https://dev.bukkit.org/bukkit-plugins/protocollib) +* [ProtocolLib at BukkitDev](https://dev.bukkit.org/bukkit-plugins/protocollib) Compiling Werewolf.jar --------- -* Werewolf must be compiled with java 8 compliance. Make sure you have a JDK 8 installed. -* Werewolf has developed using Eclipse (But any other IDE should work as well) -* Check out this repo using git in a commandline: git clone https://github.com/DogOnFire/Werewolf.git -* Open the Werewolf project folder in Eclipse -* Right click the Werewolf project folder in Eclipse and select "Run as maven build..." -* Click the "Run" button in the configuration window that appears -* The Werewolf.jar file will be compiled and available in the /target folder under your project folder +* Werewolf must be compiled with Java 8 compliance. Make sure you have a JDK 8 installed. +* Werewolf has been developed using Eclipse (But any other IDE should work as well) +* Checkout the Werewolf repo using [git](https://git-scm.com/downloads) in a Command Line: `git clone https://github.com/DogOnFire/Werewolf.git` +* Open the Werewolf project folder in Eclipse (or another IDE of choice) +* Right click the Werewolf project folder in Eclipse and select "Run as maven build..." +* Click the "Run" button in the configuration window that appears +* The Werewolf jar-file will be compiled and available in the /target folder under your project folder diff --git a/lang/english.yml b/lang/english.yml index bc7fc59..57e5564 100644 --- a/lang/english.yml +++ b/lang/english.yml @@ -12,6 +12,8 @@ YouTeleportedToClanHome: - You are now in the home of the $Type clan CurrentBounty: - The bounty for slaying a werewolf is $Amount +YourWerewolfName: +- Your werewolf name is $PlayerName YouCutTheHeadOfWerewolf: - You cut the head of that werewolf! FullMoonNumberOfWerewolves: diff --git a/pom.xml b/pom.xml index 02443b3..bd4ddb0 100644 --- a/pom.xml +++ b/pom.xml @@ -1,127 +1,192 @@ - - 4.0.0 - com.dogonfire - werewolf - 0.8.0 - Werewolf - Werewolves in Minecraft! - https://github.com/DogOnFire/Werewolf - jar - - - GNU General Public License Version 3.0 - https://www.gnu.org/licenses/gpl-3.0.txt - - - - 1.8 - 1.8 - 1.8 - UTF-8 - http://localhost:9000/ - ${dependency.check.report.dir}/dependency-check-report.xml - ${dependency.check.report.dir}/dependency-check-report.html - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots - - - - vault-repo - http://nexus.hc.to/content/repositories/pub_releases - - - - md_5-public - http://repo.md-5.net/content/groups/public/ - - - robingrether-repo - http://repo.robingrether.de/ - - - - sk89q-repo - http://maven.sk89q.com/repo/ - - - - placeholderapi - http://repo.extendedclip.com/content/repositories/placeholderapi/ - - - - - - org.spigotmc - spigot-api - 1.14.4-R0.1-SNAPSHOT - provided - - - - net.milkbowl.vault - VaultAPI - 1.7 - provided - - - - LibsDisguises - LibsDisguises - 9.8.2-SNAPSHOT - provided - - - eu.blackfire62.myskin.bukkit - MySkin - 2.4 - system - ${project.basedir}/lib/MySkin.jar - - - - com.sk89q.worldguard - worldguard-bukkit - 7.0.1-SNAPSHOT - provided - - - - me.clip - placeholderapi - 2.9.2 - provided - - - - org.codehaus.mojo - sonar-maven-plugin - 3.6.0.1398 - pom - - - - clean package - ${project.name}-${project.version} - ${project.basedir}/src/ - - - true - ${project.basedir}/src/resources - - *.yml - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - - + + 4.0.0 + com.dogonfire + werewolf + 0.11.0 + Werewolf + Werewolves in Minecraft! + https://github.com/DogOnFire/Werewolf + jar + + + GNU General Public License Version 3.0 + https://www.gnu.org/licenses/gpl-3.0.txt + + + + 1.8 + ${jdk.version} + ${jdk.version} + UTF-8 + 1.19.4-R0.1-SNAPSHOT + http://localhost:9000/ + + ${dependency.check.report.dir}/dependency-check-report.xml + + + ${dependency.check.report.dir}/dependency-check-report.html + + + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots + + + + vault-repo + https://nexus.hc.to/content/repositories/pub_releases + + + + md_5-public + https://repo.md-5.net/content/groups/public/ + + + + + + + + dmulloy2-repo + https://repo.dmulloy2.net/repository/public/ + + + + enginehub-repo + https://maven.enginehub.org/repo/ + + + + placeholderapi + https://repo.extendedclip.com/content/repositories/placeholderapi/ + + + + codemc-releases + https://repo.codemc.org/repository/maven-releases/ + + + + clan-jhoo + https://nexus.clanjhoo.com/repository/maven-public/ + + + + + + + + + + + + + + + + org.spigotmc + spigot-api + ${bukkitAPIVersion} + provided + + + + net.milkbowl.vault + VaultAPI + 1.7 + provided + + + + LibsDisguises + LibsDisguises + 10.0.34 + provided + + + + net.skinsrestorer + skinsrestorer-api + 14.2.10 + provided + + + + com.sk89q.worldguard + worldguard-bukkit + 7.0.7 + provided + + + + com.comphenix.protocol + ProtocolLib + 5.0.0 + provided + + + + me.clip + placeholderapi + 2.11.3 + provided + + + + com.clanjhoo + vampire + 1.0.BETA-17 + provided + + + * + * + + + + + + + + + + + + + + + + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.9.1.2184 + pom + + + + clean package + ${project.name}-${project.version} + ${project.basedir}/src/ + + + true + ${project.basedir}/src/resources + + *.yml + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.1 + + + \ No newline at end of file diff --git a/src/com/dogonfire/werewolf/PotionManager.java b/src/com/dogonfire/werewolf/PotionManager.java deleted file mode 100644 index acd675c..0000000 --- a/src/com/dogonfire/werewolf/PotionManager.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.dogonfire.werewolf; - -import java.util.ArrayList; -import java.util.List; -import org.bukkit.ChatColor; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.PotionMeta; -import org.bukkit.potion.PotionEffect; -import org.bukkit.potion.PotionEffectType; - -public class PotionManager -{ - - PotionManager(Werewolf plugin) - { - - } - - public ItemStack createWerewolfInfectionPotion() - { - ItemStack potion = new ItemStack(Material.POTION); - - PotionMeta potionMeta = (PotionMeta) potion.getItemMeta(); - - potionMeta.setDisplayName(ChatColor.GOLD + "Werewolf infection potion"); - - List pages = new ArrayList(); - - pages.add(Werewolf.getLanguageManager().getLanguageString(LanguageManager.LANGUAGESTRING.InfectionPotionDescription1, ChatColor.GRAY)); - pages.add(Werewolf.getLanguageManager().getLanguageString(LanguageManager.LANGUAGESTRING.InfectionPotionDescription2, ChatColor.GRAY)); - - potionMeta.setLore(pages); - potionMeta.addCustomEffect(new PotionEffect(PotionEffectType.CONFUSION, 600, 2), true); - - potion.setItemMeta(potionMeta); - - return potion; - } - - public ItemStack createWerewolfCurePotion() - { - ItemStack potion = new ItemStack(Material.POTION); - - PotionMeta potionMeta = (PotionMeta)potion.getItemMeta(); - - potionMeta.setDisplayName(ChatColor.GOLD + "Werewolf cure potion"); - - List pages = new ArrayList(); - - pages.add(Werewolf.getLanguageManager().getLanguageString(LanguageManager.LANGUAGESTRING.CurePotionDescription1, ChatColor.GRAY)); - pages.add(Werewolf.getLanguageManager().getLanguageString(LanguageManager.LANGUAGESTRING.CurePotionDescription2, ChatColor.GRAY)); - - potionMeta.setLore(pages); - potionMeta.addCustomEffect(new PotionEffect(PotionEffectType.CONFUSION, 600, 2), true); - - potion.setItemMeta(potionMeta); - - return potion; - } -} diff --git a/src/com/dogonfire/werewolf/Werewolf.java b/src/com/dogonfire/werewolf/Werewolf.java index 15c80f6..1474296 100644 --- a/src/com/dogonfire/werewolf/Werewolf.java +++ b/src/com/dogonfire/werewolf/Werewolf.java @@ -1,15 +1,22 @@ package com.dogonfire.werewolf; -import com.dogonfire.werewolf.Metrics.Graph; -import com.dogonfire.werewolf.api.WerewolfDisguiseAPI; +import com.clanjhoo.vampire.VampireAPI; +import com.dogonfire.werewolf.commands.Commands; +import com.dogonfire.werewolf.tasks.CompassTrackerTask; +import com.dogonfire.werewolf.utils.Metrics; +import com.dogonfire.werewolf.utils.Metrics.Graph; +import com.dogonfire.werewolf.disguises.WerewolfDisguiseAPI; import com.dogonfire.werewolf.listeners.ChatListener; import com.dogonfire.werewolf.listeners.DamageListener; import com.dogonfire.werewolf.listeners.InteractListener; import com.dogonfire.werewolf.listeners.InventoryListener; import com.dogonfire.werewolf.listeners.PlayerListener; +import com.dogonfire.werewolf.managers.*; import com.dogonfire.werewolf.tasks.CentralMessageTask; import com.dogonfire.werewolf.tasks.DisguiseTask; import com.dogonfire.werewolf.tasks.UndisguiseTask; +import com.dogonfire.werewolf.utils.PacketUtils; +import com.dogonfire.werewolf.utils.WerewolfPlaceholderExpansion; import com.dogonfire.werewolf.versioning.Version; import com.dogonfire.werewolf.versioning.VersionFactory; @@ -33,24 +40,18 @@ import org.bukkit.command.CommandSender; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.util.Vector; -/* TODO: re-add Vampire integration.. - -import com.massivecraft.vampire.entity.UPlayer; -*/ public class Werewolf extends JavaPlugin { public static Werewolf instance; public static boolean pluginEnabled = false; - /* - * TODO: re-add Vampire integration.. - * - * public boolean vapireEnabled = false; - */ + + public boolean vampireEnabled = false; public boolean vaultEnabled = false; public boolean disguisesEnabled = false; public boolean healthBarEnabled = false; @@ -104,19 +105,19 @@ public class Werewolf extends JavaPlugin public List allowedWorlds = new ArrayList(); private static Werewolf plugin; private static FileConfiguration config = null; - public static PacketUtils pu = null; - private static LanguageManager languageManager = null; + public static PacketUtils pu = null; + private static LanguageManager languageManager = null; // private static PotionManager potionManager = null; - private static ClanManager clanManager = null; + private static ClanManager clanManager = null; private static SignManager signManager = null; private static WerewolfManager werewolfManager = null; - private static HuntManager huntManager = null; + private static HuntManager huntManager = null; private static TrophyManager trophyManager = null; private static SkinManager skinManager = null; private static PermissionsManager permissionsManager = null; private static WerewolfScoreboardManager werewolfScoreboardManager = null; private static StatisticsManager statisticsManager = null; - private static ItemManager itemManager = null; + private static ItemManager itemManager = null; public String potionName = "Witherfang"; public String werewolfBiteName = "Bloodmoon"; @@ -129,13 +130,21 @@ 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"); public List surnames = Arrays.asList("Devourer", "Fang", "Wolf", "Howl", "Turned", "Ghoul", "Paws", "Claw"); private static Economy economy = null; - private Commands commands = null; + private Commands commands = null; private String chatPrefix = "Werewolf"; public String serverName = "Your Server"; @@ -148,7 +157,7 @@ public class Werewolf extends JavaPlugin public boolean craftableLoreBookEnabled = true; private Version version = null; - public static final String MAX = "1.14.4-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; @@ -294,17 +303,14 @@ public void onDisable() { if (vaultEnabled) { - CompassTracker.stop(); + CompassTrackerTask.stop(); } for (Player player : getServer().getOnlinePlayers()) { - if (getWerewolfManager().isWerewolf(player)) + if (getWerewolfManager().isWerewolf(player) && getWerewolfManager().hasWerewolfSkin(player.getUniqueId())) { - if (getWerewolfManager().hasWerewolfSkin(player.getUniqueId())) - { - untransform(player); - } + untransform(player); } } @@ -331,11 +337,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; @@ -345,13 +351,23 @@ 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); clanManager = new ClanManager(this); // potionManager = new PotionManager(this); languageManager = new LanguageManager(this); - statisticsManager = new StatisticsManager(this); + statisticsManager = new StatisticsManager(); itemManager = new ItemManager(this); damageListener = new DamageListener(this); playerListener = new PlayerListener(this); @@ -362,8 +378,7 @@ public void onEnable() if(!WerewolfDisguiseAPI.init()) { - onDisable(); - return; + this.disguisesEnabled = false; } // Pre-cache some known disguises @@ -378,7 +393,7 @@ public void onEnable() inventoryListener = new InventoryListener(this); } - pu = new PacketUtils(this); + pu = new PacketUtils(); PluginManager pm = getServer().getPluginManager(); @@ -390,8 +405,8 @@ public void onEnable() log("Vault detected. Bounties and sign economy are enabled!"); - CompassTracker.setPlugin(this); - CompassTracker.setUpdateRate(this.compassUpdateRate); + CompassTrackerTask.setPlugin(this); + CompassTrackerTask.setUpdateRate(this.compassUpdateRate); RegisteredServiceProvider economyProvider = plugin.getServer().getServicesManager().getRegistration(Economy.class); if (economyProvider != null) @@ -409,14 +424,13 @@ public void onEnable() } permissionsManager = new PermissionsManager(this); - /* - * TODO: re-add Vampire integration.. - * - * if (pm.getPlugin("Vampire") != null) { - * log("Vampire plugin detected. Enabling support for vampirism :-)"); - * - * this.vampireEnabled = true; } - */ + + if (pm.getPlugin("Vampire") != null) + { + log("Vampire plugin detected. Enabling support for vampirism :-)"); + + this.vampireEnabled = true; + } // Check for HealthBar if (pm.getPlugin("HealthBar") != null && pm.getPlugin("HealthBar").isEnabled()) @@ -458,7 +472,7 @@ public void onEnable() if (this.useScoreboards) { - Werewolf.werewolfScoreboardManager = new WerewolfScoreboardManager(this); + Werewolf.werewolfScoreboardManager = new WerewolfScoreboardManager(); } getServer().getScheduler().scheduleSyncRepeatingTask(this, new Runnable() @@ -491,14 +505,6 @@ public boolean isWerewolvesAllowedInWorld(Player player) return this.allowedWorlds.contains(player.getWorld().getName()); } - /* - * TODO: re-add Vampire integration.. - * - * public boolean isVampire(Player player) { if (this.vampireEnabled) { - * UPlayer uplayer = UPlayer.get(player); if (uplayer == null) { return - * false; } return uplayer.isVampire(); } return false; } - */ - public boolean isUnderOpenSky(Player player) { return player.getWorld().getHighestBlockYAt(player.getLocation()) <= player.getLocation().getBlockY(); @@ -508,7 +514,7 @@ public boolean isFullMoonDuskInWorld(World world) { long time = world.getFullTime() % 24000L; - return (time > 10000L) && (time < 14000L) && (MoonCheck(world) == MoonPhase.FullMoon); + return (time > 10000L) && (time < 14000L) && (moonCheck(world) == MoonPhase.FullMoon); } public boolean isNightInWorld(World world) @@ -522,7 +528,7 @@ public boolean isFullMoonInWorld(World world) { if (plugin.onlyTransformDuringFullMoon) { - return (isNightInWorld(world)) && (MoonCheck(world) == MoonPhase.FullMoon); + return (isNightInWorld(world)) && (moonCheck(world) == MoonPhase.FullMoon); } return isNightInWorld(world); } @@ -532,7 +538,7 @@ public static MoonPhase getMoonPhaseByInt(int I) return MoonPhase.values()[I]; } - public MoonPhase MoonCheck(World world) + public MoonPhase moonCheck(World world) { long T = world.getFullTime(); long D = T / 24000L; @@ -565,8 +571,9 @@ public String getNextFullMoonText(World world) return getLanguageManager().getLanguageString(LanguageManager.LANGUAGESTRING.In2Days, ChatColor.GOLD); case 7: return getLanguageManager().getLanguageString(LanguageManager.LANGUAGESTRING.Tomorrow, ChatColor.GOLD); + default: + return "WTF?"; } - return "WTF?"; } public static enum MoonPhase { @@ -772,6 +779,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")) @@ -849,6 +864,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); @@ -927,15 +950,43 @@ public int getValue() } }); - /* - * TODO: re-add Vampire integration.. - * - * pluginsUsedGraph.addPlotter(new Metrics.Plotter("Using Vampire") - * { - * - * @Override public int getValue() { if - * (Werewolf.this.vampireEnabled) { return 1; } return 0; } }); - */ + pluginsUsedGraph.addPlotter(new Metrics.Plotter("Using Lib's Disguises") + { + @Override public int getValue() + { + Plugin pl = getServer().getPluginManager().getPlugin("LibsDisguises"); + if (pl != null && pl.isEnabled()) + { + return 1; + } + return 0; + } + }); + + pluginsUsedGraph.addPlotter(new Metrics.Plotter("Using SkinsRestorer") + { + @Override public int getValue() + { + Plugin pl = getServer().getPluginManager().getPlugin("SkinsRestorer"); + if (pl != null && pl.isEnabled()) + { + return 1; + } + return 0; + } + }); + + pluginsUsedGraph.addPlotter(new Metrics.Plotter("Using Vampire") + { + @Override public int getValue() + { + if (Werewolf.this.vampireEnabled) + { + return 1; + } + return 0; + } + }); Graph featuresEnabledGraph = metrics.createGraph("Features enabled"); diff --git a/src/com/dogonfire/werewolf/WerewolfAPI.java b/src/com/dogonfire/werewolf/WerewolfAPI.java new file mode 100644 index 0000000..7d4b25a --- /dev/null +++ b/src/com/dogonfire/werewolf/WerewolfAPI.java @@ -0,0 +1,133 @@ +package com.dogonfire.werewolf; + +import java.util.UUID; + +import com.clanjhoo.vampire.VampireAPI; +import com.dogonfire.werewolf.managers.ClanManager; +import org.bukkit.Bukkit; +import org.bukkit.OfflinePlayer; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; + +import com.dogonfire.werewolf.Werewolf; + +public class WerewolfAPI +{ + public static void setFullWerewolf(UUID playerId) + { + // Werewolf.getWerewolfManager().makeWerewolf(player, turnNow, clan); + } + + public static ItemStack newWerewolfSilverSword() + { + return Werewolf.getItemManager().newSilverSword(1); + } + + public static ItemStack newWerewolfLoreBook() + { + return Werewolf.getItemManager().newLoreBook(); + } + + public static ItemStack newWerewolfCurePotion() + { + return Werewolf.getItemManager().newCurePotion(); + } + + public static ItemStack newWerewolfInfectionPotion() + { + return Werewolf.getItemManager().newInfectionPotion(); + } + + public static ItemStack newWerewolfWolfbanePotion() + { + return Werewolf.getItemManager().newWolfbanePotion(); + } + + public static boolean isWerewolfSilverSword(ItemStack item) + { + return Werewolf.getItemManager().isSilverSword(item); + } + + public static boolean isWerewolfLoreBook(ItemStack item) + { + return Werewolf.getItemManager().isLoreBook(item); + } + + public static boolean isWerewolfCurePotion(ItemStack item) + { + return Werewolf.getItemManager().isCurePotion(item); + } + + public static boolean isWerewolfInfectionPotion(ItemStack item) + { + return Werewolf.getItemManager().isInfectionPotion(item); + } + + public static boolean isWerewolfWolfbanePotion(ItemStack item) + { + return Werewolf.getItemManager().isWolfbanePotion(item); + } + + public static boolean isWerewolf(UUID playerId) + { + return Werewolf.getWerewolfManager().isWerewolf(playerId); + } + + public static boolean isWerewolf(Player player) + { + return isWerewolf(player.getUniqueId()); + } + public static boolean isVampire(Player player) + { + if (Werewolf.instance().vampireEnabled) + { + return VampireAPI.isVampire(player); + } + return false; + } + + public static boolean isVampire(UUID playerId) + { + if (Werewolf.instance().vampireEnabled) + { + Player player = Bukkit.getPlayer(playerId); + if (player == null) { + player = (Player) Bukkit.getOfflinePlayer(playerId); + } + return VampireAPI.isVampire(player); + } + return false; + } + + public static boolean isHuman(UUID playerId) + { + return !isWerewolf(playerId) && !isVampire(playerId); + } + + public static boolean isHuman(Player player) + { + return isHuman(player.getUniqueId()); + } + + public static boolean isAlpha(UUID playerId) + { + return Werewolf.getClanManager().isAlpha(playerId); + } + + public static boolean isAlpha(Player player) + { + return Werewolf.getClanManager().isAlpha(player.getUniqueId()); + } + + public static int getNumberOfWerewolves() + { + return Werewolf.getWerewolfManager().getNumberOfWerewolves(); + } + + public static ClanManager.ClanType getWerewolfClan(UUID playerId) { + if (!isWerewolf(playerId)) { + return null; + } + return Werewolf.getWerewolfManager().getWerewolfClan(playerId); + } +} diff --git a/src/com/dogonfire/werewolf/api/MySkinFactory.java b/src/com/dogonfire/werewolf/api/MySkinFactory.java deleted file mode 100644 index f1652ad..0000000 --- a/src/com/dogonfire/werewolf/api/MySkinFactory.java +++ /dev/null @@ -1,159 +0,0 @@ -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; - -public class MySkinFactory implements IWerewolfDisguiseFactory -{ - private MySkin mySkin; - - public class MySkinWerewolfDisguise extends WerewolfDisguise - { - private SkinProperty disguiseSkinProperty; - - public MySkinWerewolfDisguise(UUID disguiseAccountId, String disguiseAccountName) - { - super(disguiseAccountId, disguiseAccountName); - - // Load the Disguise skin - 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); - - 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()); - - 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; - } - } - - - public MySkinFactory() - { - this.mySkin = (MySkin) Bukkit.getPluginManager().getPlugin("MySkin"); - - 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)); - } - - @Override - public WerewolfDisguise newDisguise(UUID disguiseAccountId, String disguiseAccountName) - { - return new MySkinWerewolfDisguise(disguiseAccountId, disguiseAccountName); - } -} \ No newline at end of file diff --git a/src/com/dogonfire/werewolf/api/WerewolfAPI.java b/src/com/dogonfire/werewolf/api/WerewolfAPI.java deleted file mode 100644 index 341e579..0000000 --- a/src/com/dogonfire/werewolf/api/WerewolfAPI.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.dogonfire.werewolf.api; - -import java.util.UUID; - -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; - -import com.dogonfire.werewolf.Werewolf; - -public class WerewolfAPI -{ - public static void setFullWerewolf(UUID playerId) - { - // Werewolf.getWerewolfManager().makeWerewolf(player, turnNow, clan); - } - - public static ItemStack newWerewolfSilverSword() - { - return Werewolf.getItemManager().newSilverSword(1); - } - - public static ItemStack newWerewolfLorebook() - { - return Werewolf.getItemManager().newLoreBook(); - } - - public static ItemStack newWerewolfCurePotion() - { - return Werewolf.getItemManager().newCurePotion(); - } - - public static ItemStack newWerewolfInfectionPotion() - { - return Werewolf.getItemManager().newInfectionPotion(); - } - - public static ItemStack newWerewolfWolfbanePotion() - { - return Werewolf.getItemManager().newWolfbanePotion(); - } - - public static boolean isWerewolf(UUID playerId) - { - return Werewolf.getWerewolfManager().isWerewolf(playerId); - } - - public static boolean isWerewolf(Player player) - { - return Werewolf.getWerewolfManager().isWerewolf(player.getUniqueId()); - } - - public static boolean isAlpha(UUID playerId) - { - return Werewolf.getClanManager().isAlpha(playerId); - } - - public static boolean isAlpha(Player player) - { - return Werewolf.getClanManager().isAlpha(player.getUniqueId()); - } - - public static int getNumberOfWerewolves() - { - return Werewolf.getWerewolfManager().getNumberOfWerewolves(); - } -} diff --git a/src/com/dogonfire/werewolf/Commands.java b/src/com/dogonfire/werewolf/commands/Commands.java similarity index 99% rename from src/com/dogonfire/werewolf/Commands.java rename to src/com/dogonfire/werewolf/commands/Commands.java index 13a099e..fffa7d4 100644 --- a/src/com/dogonfire/werewolf/Commands.java +++ b/src/com/dogonfire/werewolf/commands/Commands.java @@ -1,4 +1,4 @@ -package com.dogonfire.werewolf; +package com.dogonfire.werewolf.commands; import java.util.ArrayList; import java.util.Collections; @@ -7,6 +7,10 @@ import java.util.Random; import java.util.Set; import java.util.UUID; + +import com.dogonfire.werewolf.Werewolf; +import com.dogonfire.werewolf.managers.ClanManager; +import com.dogonfire.werewolf.managers.LanguageManager; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.Validate; import org.bukkit.ChatColor; @@ -24,13 +28,13 @@ import org.bukkit.potion.PotionEffectType; import org.bukkit.util.StringUtil; -import com.dogonfire.werewolf.ClanManager.ClanType; +import com.dogonfire.werewolf.managers.ClanManager.ClanType; public class Commands implements TabExecutor { private Werewolf plugin; - Commands(Werewolf p) + public Commands(Werewolf p) { this.plugin = p; } @@ -80,6 +84,11 @@ public boolean commandInfo(Player player) player.sendMessage(""); + Werewolf.getLanguageManager().setPlayerName(Werewolf.getWerewolfManager().getWerewolfName(player.getUniqueId())); + player.sendMessage(Werewolf.getLanguageManager().getLanguageString(LanguageManager.LANGUAGESTRING.YourWerewolfName, ChatColor.AQUA)); + + player.sendMessage(""); + if (numberOfTransformations >= this.plugin.transformsForNoDropItems) { player.sendMessage(Werewolf.getLanguageManager().getLanguageString(LanguageManager.LANGUAGESTRING.WerewolfCommandNoDropItems, ChatColor.WHITE)); @@ -533,7 +542,7 @@ public boolean commandClan(Player player) int n = 1; for (ClanManager.ClanType clan : clanList) { - if (clan == playerClan) + if (clan.equals(playerClan)) { this.plugin.sendInfo(player, "" + ChatColor.GOLD + n + ") " + ChatColor.GOLD + Werewolf.getClanManager().getClanName(clan) + ChatColor.AQUA + " - " + Werewolf.getWerewolfManager().getWerewolfClanMembers(clan).size() + " members - " + String.format("%1$,.2f", new Object[] { Double.valueOf(Werewolf.getClanManager().getClanPoint(clan)) }) + " clan points"); diff --git a/src/com/dogonfire/werewolf/api/IWerewolfDisguiseFactory.java b/src/com/dogonfire/werewolf/disguises/IWerewolfDisguiseFactory.java similarity index 82% rename from src/com/dogonfire/werewolf/api/IWerewolfDisguiseFactory.java rename to src/com/dogonfire/werewolf/disguises/IWerewolfDisguiseFactory.java index 87dd91b..787a24a 100644 --- a/src/com/dogonfire/werewolf/api/IWerewolfDisguiseFactory.java +++ b/src/com/dogonfire/werewolf/disguises/IWerewolfDisguiseFactory.java @@ -1,11 +1,11 @@ -package com.dogonfire.werewolf.api; +package com.dogonfire.werewolf.disguises; import java.util.UUID; import org.bukkit.entity.Player; import com.dogonfire.werewolf.Werewolf; -import com.dogonfire.werewolf.ClanManager.ClanType; +import com.dogonfire.werewolf.managers.ClanManager.ClanType; // Let's abstract disguise commands away, so that we don't depend on a particular Disguise plugin @@ -20,7 +20,7 @@ public abstract class WerewolfDisguise public WerewolfDisguise(UUID accountId, String accountName) { Werewolf.instance().logDebug("Constructer Start! - Werewolfname: " + werewolfName + " - AccountId: " + accountId + " - AccountName: " + accountName); - if (werewolfName == null || werewolfName == "") + if (werewolfName == null || werewolfName.isEmpty()) { werewolfName = "Werewolf"; } @@ -31,7 +31,7 @@ public WerewolfDisguise(UUID accountId, String accountName) accountId = UUID.fromString("c21f069b-137c-4992-8edc-e1a12995ff0f"); } - if (accountName == null || accountName == "") + if (werewolfName == null || accountName.isEmpty()) { // Account called Werewolf. No clan has this skin... accountName = "Werewolf"; @@ -43,12 +43,12 @@ public WerewolfDisguise(UUID accountId, String accountName) public WerewolfDisguise(String werewolfName, String accountName) { - if (werewolfName == null || werewolfName == "") + if (werewolfName == null || werewolfName.isEmpty()) { werewolfName = "Werewolf"; } - if (accountName == null || accountName == "") + if (werewolfName == null || accountName.isEmpty()) { // Account called Werewolf. No clan has this skin... accountName = "Werewolf"; @@ -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... @@ -85,7 +85,7 @@ public WerewolfDisguise(String werewolfName, String accountName) public WerewolfDisguise(String werewolfName, ClanType clanType) { - if (werewolfName == null || werewolfName == "") + if (werewolfName == null || werewolfName.isEmpty()) { werewolfName = "Werewolf"; } @@ -122,12 +122,9 @@ public String getSkinTextureValue(Player player) return Werewolf.getClanManager().getWerewolfTextureForAlpha(Werewolf.getWerewolfManager().getWerewolfClan(player.getUniqueId())); } - if (Werewolf.getWerewolfManager().isWerewolf(player.getUniqueId())) + if (Werewolf.getWerewolfManager().isWerewolf(player.getUniqueId()) && Werewolf.instance().useClans) { - if (Werewolf.instance().useClans) - { - return Werewolf.getClanManager().getWerewolfTextureForClan(Werewolf.getWerewolfManager().getWerewolfClan(player.getUniqueId())); - } + return Werewolf.getClanManager().getWerewolfTextureForClan(Werewolf.getWerewolfManager().getWerewolfClan(player.getUniqueId())); } return "eyJ0aW1lc3RhbXAiOjE1NjUxMjM3NTE5NDEsInByb2ZpbGVJZCI6IjQ1NjZlNjlmYzkwNzQ4ZWU4ZDcxZDdiYTVhYTAwZDIwIiwicHJvZmlsZU5hbWUiOiJUaGlua29mZGVhdGgiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzRkMWUwOGIwYmI3ZTlmNTkwYWYyNzc1ODEyNWJiZWQxNzc4YWM2Y2VmNzI5YWVkZmNiOTYxM2U5OTExYWU3NSJ9LCJDQVBFIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjBjYzA4ODQwNzAwNDQ3MzIyZDk1M2EwMmI5NjVmMWQ2NWExM2E2MDNiZjY0YjE3YzgwM2MyMTQ0NmZlMTYzNSJ9fX0="; } @@ -139,12 +136,9 @@ public String getSkinTextureSignature(Player player) return Werewolf.getClanManager().getWerewolfTextureSignatureForAlpha(Werewolf.getWerewolfManager().getWerewolfClan(player.getUniqueId())); } - if (Werewolf.getWerewolfManager().isWerewolf(player.getUniqueId())) + if (Werewolf.getWerewolfManager().isWerewolf(player.getUniqueId()) && Werewolf.instance().useClans) { - if (Werewolf.instance().useClans) - { - return Werewolf.getClanManager().getWerewolfTextureSignatureForClan(Werewolf.getWerewolfManager().getWerewolfClan(player.getUniqueId())); - } + return Werewolf.getClanManager().getWerewolfTextureSignatureForClan(Werewolf.getWerewolfManager().getWerewolfClan(player.getUniqueId())); } return "ef4Zb4mm9alUQUjk28gO85/Rug8DFYPyVAjT1hq+csjw23FVpCIQPvl3Bc4/zcDGIUiGGX/hi9G1U6LMcGyQg/4ONbMLFZtB7P1i9Dak/sIqZstMuBnWblK0//cdnFwEpZh+psdvsZUHOq6k37omwwc1wboIsqbe6r+23EZzZ9fBCWnk3qiYoWK+CMMhSJrhiamYIxjoMafJWeIkKhCUWiKrDJQw47NVnVTeEG4B8t4pRKs4L1wMsUavRgKQpWD9Lb/ivE0mNhQrLFT0IxEu7v5+e47OaEWhyL8OZ8/hcY/D7+Mf86M4jOP1AcKsvh4KdklHHZyrwSlGFcHKMvA6q1BLdj2BT4DlsqGF9eTv8aGwwXHxTi5L5JzeIwaE/6wZebolNWvZs/aXop2gMEn9yBFju82KeB89yrC75vUxHzH2zT6393/BV6le6m3mWRFAMJfXzLVSUaOK8CgBGnEOkc1Gy+LSXLayCgvBPzF0Rn0m0elIf/h4NV4pPhCe6Prh0lFKVpc5u2keihOhm7LpweBOBq8e4JN7eOUmojVKkAvAXWXYfAqjg49M0Uau3s+UeNqt+REcB9Di7J1++GKKtBBErJDChU6jt+kmkMJ+7frbIEV/1U2TA7FMIYQbvvZR3JJj9W9xI2L0GYadO/sAa1uYxjHiOTa12Jy4k6meobw="; } diff --git a/src/com/dogonfire/werewolf/api/LibsDisguisesFactory.java b/src/com/dogonfire/werewolf/disguises/LibsDisguisesFactory.java similarity index 89% rename from src/com/dogonfire/werewolf/api/LibsDisguisesFactory.java rename to src/com/dogonfire/werewolf/disguises/LibsDisguisesFactory.java index 97ab278..ab1bb04 100644 --- a/src/com/dogonfire/werewolf/api/LibsDisguisesFactory.java +++ b/src/com/dogonfire/werewolf/disguises/LibsDisguisesFactory.java @@ -1,4 +1,4 @@ -package com.dogonfire.werewolf.api; +package com.dogonfire.werewolf.disguises; import java.util.UUID; @@ -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/MojangAPI.java b/src/com/dogonfire/werewolf/disguises/MojangAPI.java similarity index 99% rename from src/com/dogonfire/werewolf/api/MojangAPI.java rename to src/com/dogonfire/werewolf/disguises/MojangAPI.java index 14ae8db..65d561e 100644 --- a/src/com/dogonfire/werewolf/api/MojangAPI.java +++ b/src/com/dogonfire/werewolf/disguises/MojangAPI.java @@ -1,4 +1,4 @@ -package com.dogonfire.werewolf.api; +package com.dogonfire.werewolf.disguises; import java.io.IOException; import java.io.InputStreamReader; diff --git a/src/com/dogonfire/werewolf/disguises/MySkinFactory.java b/src/com/dogonfire/werewolf/disguises/MySkinFactory.java new file mode 100644 index 0000000..dbf3811 --- /dev/null +++ b/src/com/dogonfire/werewolf/disguises/MySkinFactory.java @@ -0,0 +1,168 @@ +package com.dogonfire.werewolf.disguises; + +import java.util.UUID; +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; + +public class MySkinFactory implements IWerewolfDisguiseFactory +{ +// private MySkin mySkin; + + public class MySkinWerewolfDisguise extends WerewolfDisguise + { +// private SkinProperty disguiseSkinProperty; + + public MySkinWerewolfDisguise(UUID disguiseAccountId, String disguiseAccountName) + { + super(disguiseAccountId, disguiseAccountName); + + // Load the Disguise skin +// 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!"); +// } + + 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!"); +// } + return false; + } + } + + + public MySkinFactory() + { + 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 + public WerewolfDisguise newDisguise(UUID disguiseAccountId, String disguiseAccountName) + { + return new MySkinWerewolfDisguise(disguiseAccountId, disguiseAccountName); + } +} \ No newline at end of file diff --git a/src/com/dogonfire/werewolf/disguises/SkinsRestorerFactory.java b/src/com/dogonfire/werewolf/disguises/SkinsRestorerFactory.java new file mode 100644 index 0000000..214028e --- /dev/null +++ b/src/com/dogonfire/werewolf/disguises/SkinsRestorerFactory.java @@ -0,0 +1,114 @@ +package com.dogonfire.werewolf.disguises; + +import com.dogonfire.werewolf.managers.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/disguises/WerewolfDisguiseAPI.java similarity index 78% rename from src/com/dogonfire/werewolf/api/WerewolfDisguiseAPI.java rename to src/com/dogonfire/werewolf/disguises/WerewolfDisguiseAPI.java index 7fe9cdb..f41a5cf 100644 --- a/src/com/dogonfire/werewolf/api/WerewolfDisguiseAPI.java +++ b/src/com/dogonfire/werewolf/disguises/WerewolfDisguiseAPI.java @@ -1,4 +1,4 @@ -package com.dogonfire.werewolf.api; +package com.dogonfire.werewolf.disguises; import java.util.HashMap; import java.util.UUID; @@ -6,7 +6,7 @@ import org.bukkit.plugin.PluginManager; import com.dogonfire.werewolf.Werewolf; -import com.dogonfire.werewolf.api.IWerewolfDisguiseFactory.WerewolfDisguise; +import com.dogonfire.werewolf.disguises.IWerewolfDisguiseFactory.WerewolfDisguise; import net.md_5.bungee.api.ChatColor; @@ -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/Recipes.java b/src/com/dogonfire/werewolf/items/Recipes.java similarity index 92% rename from src/com/dogonfire/werewolf/Recipes.java rename to src/com/dogonfire/werewolf/items/Recipes.java index e4dc11a..a82b98b 100644 --- a/src/com/dogonfire/werewolf/Recipes.java +++ b/src/com/dogonfire/werewolf/items/Recipes.java @@ -1,5 +1,6 @@ -package com.dogonfire.werewolf; +package com.dogonfire.werewolf.items; +import com.dogonfire.werewolf.Werewolf; import org.bukkit.Material; import org.bukkit.NamespacedKey; import org.bukkit.inventory.ItemStack; @@ -82,7 +83,7 @@ public static ShapedRecipe SilverSword() public static ShapedRecipe silverArmorRecipe(Plugin plugin) { ItemStack silverArmor = Werewolf.getItemManager().newSilverArmor(1); - NamespacedKey key = new NamespacedKey(plugin, "SilverArmor"); + NamespacedKey key = new NamespacedKey(plugin, "SilverArmorRecipe"); ShapedRecipe silverArmorRecipe = new ShapedRecipe(key, silverArmor); silverArmorRecipe.shape("BXB", "LSL", "BXB"); @@ -97,7 +98,7 @@ public static ShapedRecipe silverArmorRecipe(Plugin plugin) public static ShapedRecipe silverSwordRecipe(Plugin plugin) { ItemStack silverSword = Werewolf.getItemManager().newSilverSword(1); - NamespacedKey key = new NamespacedKey(plugin, "SilverSword"); + NamespacedKey key = new NamespacedKey(plugin, "SilverSwordRecipe"); ShapedRecipe silverSwordRecipe = new ShapedRecipe(key, silverSword); silverSwordRecipe.shape("OBX", "OXB", "SOO"); @@ -111,7 +112,7 @@ public static ShapedRecipe silverSwordRecipe(Plugin plugin) public static ShapelessRecipe wolfbanePotion(Plugin plugin) { ItemStack potion = Werewolf.getItemManager().newWolfbanePotion(); - NamespacedKey key = new NamespacedKey(plugin, "WolfbanePotion"); + NamespacedKey key = new NamespacedKey(plugin, "WolfbanePotionRecipe"); ShapelessRecipe wolfbaneRecipe = new ShapelessRecipe(key, potion); wolfbaneRecipe.addIngredient(Material.GLASS_BOTTLE); @@ -126,7 +127,7 @@ public static ShapelessRecipe wolfbanePotion(Plugin plugin) public static ShapelessRecipe infectionPotion(Plugin plugin) { ItemStack potion = Werewolf.getItemManager().newInfectionPotion(); - NamespacedKey key = new NamespacedKey(plugin, "InfectionPotion"); + NamespacedKey key = new NamespacedKey(plugin, "InfectionPotionRecipe"); ShapelessRecipe infectionRecipe = new ShapelessRecipe(key, potion); infectionRecipe.addIngredient(Material.SLIME_BALL); @@ -141,7 +142,7 @@ public static ShapelessRecipe infectionPotion(Plugin plugin) public static ShapelessRecipe curePotion(Plugin plugin) { ItemStack potion = Werewolf.getItemManager().newCurePotion(); - NamespacedKey key = new NamespacedKey(plugin, "CurePotion"); + NamespacedKey key = new NamespacedKey(plugin, "CurePotionRecipe"); ShapelessRecipe cureRecipe = new ShapelessRecipe(key, potion); cureRecipe.addIngredient(Material.POPPY); @@ -153,7 +154,7 @@ public static ShapelessRecipe curePotion(Plugin plugin) public static ShapedRecipe loreBook(Plugin plugin) { - NamespacedKey key = new NamespacedKey(plugin, "LoreBook"); + NamespacedKey key = new NamespacedKey(plugin, "LoreBookRecipe"); ShapedRecipe loreBookRecipe = new ShapedRecipe(key, Werewolf.getItemManager().newLoreBook()); loreBookRecipe.shape("BPB", "PXP", "BPB"); diff --git a/src/com/dogonfire/werewolf/listeners/DamageListener.java b/src/com/dogonfire/werewolf/listeners/DamageListener.java index 2790723..0b884d9 100644 --- a/src/com/dogonfire/werewolf/listeners/DamageListener.java +++ b/src/com/dogonfire/werewolf/listeners/DamageListener.java @@ -2,6 +2,7 @@ import java.util.Random; +import com.dogonfire.werewolf.WerewolfAPI; import org.bukkit.ChatColor; import org.bukkit.Effect; import org.bukkit.EntityEffect; @@ -17,11 +18,11 @@ import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.util.Vector; -import com.dogonfire.werewolf.ClanManager; -import com.dogonfire.werewolf.DamageManager; -import com.dogonfire.werewolf.LanguageManager; +import com.dogonfire.werewolf.managers.ClanManager; +import com.dogonfire.werewolf.managers.DamageManager; +import com.dogonfire.werewolf.managers.LanguageManager; import com.dogonfire.werewolf.Werewolf; -import com.dogonfire.werewolf.api.IWerewolfDisguiseFactory.WerewolfDisguise; +import com.dogonfire.werewolf.disguises.IWerewolfDisguiseFactory.WerewolfDisguise; public class DamageListener implements Listener { @@ -44,22 +45,19 @@ public void onEntityDamage1(EntityDamageEvent event) { Player player = (Player) event.getEntity(); - if (Werewolf.getWerewolfManager().hasWerewolfSkin(player.getUniqueId())) + // Before trying to use Disguises, check if Disguises is + // enabled... + if (Werewolf.getWerewolfManager().hasWerewolfSkin(player.getUniqueId()) && plugin.disguisesEnabled) { - // Before trying to use LibsDisguises, check if LibsDisguises is - // enabled... - if (plugin.disguisesEnabled) + WerewolfDisguise skin = Werewolf.getSkinManager().getSkin(player); + + if (skin != null) { - WerewolfDisguise skin = Werewolf.getSkinManager().getSkin(player); - - if (skin != null) - { - Werewolf.getWerewolfManager().setPouncing(player.getUniqueId()); - } - else - { - this.plugin.logDebug("onEntityDamage: Skin is null for " + player.getName()); - } + Werewolf.getWerewolfManager().setPouncing(player.getUniqueId()); + } + else + { + this.plugin.logDebug("onEntityDamage: Skin is null for " + player.getName()); } } } @@ -82,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())) @@ -163,37 +166,30 @@ public void onEntityDamage2(EntityDamageEvent event) if (damageEvent.getEntity() instanceof Player) { Player victim = (Player) damageEvent.getEntity(); - /* - * TODO: Readd Vampire integration - * if (!this.plugin.isVampire(victim)) - * { - */ - if (Werewolf.getPermissionsManager().hasPermission(player, "werewolf.infectother") && Werewolf.getPermissionsManager().hasPermission(victim, "werewolf.becomeinfected")) - { - if (!Werewolf.getWerewolfManager().isWerewolf(victim)) - { - this.plugin.logDebug(player.getName() + " is doing risk damage to " + victim.getName()); - - if (Math.random() < this.plugin.werewolfInfectionRisk) - { - ClanManager.ClanType clanType = Werewolf.getWerewolfManager().getWerewolfClan(player.getUniqueId()); - - Werewolf.getWerewolfManager().makeWerewolf(victim, false, clanType); - - Werewolf.getLanguageManager().setPlayerName(player.getName()); - victim.sendMessage(Werewolf.getLanguageManager().getLanguageString(LanguageManager.LANGUAGESTRING.BiteVictim, ChatColor.LIGHT_PURPLE)); - - Werewolf.getLanguageManager().setPlayerName(victim.getName()); - player.sendMessage(Werewolf.getLanguageManager().getLanguageString(LanguageManager.LANGUAGESTRING.BiteAttacker, ChatColor.LIGHT_PURPLE)); - - victim.getLocation().getWorld().playEffect(player.getLocation(), Effect.SMOKE, 100); - victim.getLocation().getWorld().playEffect(player.getLocation().add(new Vector(0, 1, 0)), Effect.SMOKE, 100); - victim.getLocation().getWorld().playEffect(player.getLocation().add(new Vector(0, 2, 0)), Effect.SMOKE, 100); - - this.plugin.log(player.getName() + " infected " + victim.getName() + " with the werewolf infection!"); - } + + if (!WerewolfAPI.isVampire(victim)) + { + if (Werewolf.getPermissionsManager().hasPermission(player, "werewolf.infectother") && Werewolf.getPermissionsManager().hasPermission(victim, "werewolf.becomeinfected") && !Werewolf.getWerewolfManager().isWerewolf(victim)) { + this.plugin.logDebug(player.getName() + " is doing risk damage to " + victim.getName()); + + if (Math.random() < this.plugin.werewolfInfectionRisk) { + ClanManager.ClanType clanType = Werewolf.getWerewolfManager().getWerewolfClan(player.getUniqueId()); + + Werewolf.getWerewolfManager().makeWerewolf(victim, false, clanType); + + Werewolf.getLanguageManager().setPlayerName(player.getName()); + victim.sendMessage(Werewolf.getLanguageManager().getLanguageString(LanguageManager.LANGUAGESTRING.BiteVictim, ChatColor.LIGHT_PURPLE)); + + Werewolf.getLanguageManager().setPlayerName(victim.getName()); + player.sendMessage(Werewolf.getLanguageManager().getLanguageString(LanguageManager.LANGUAGESTRING.BiteAttacker, ChatColor.LIGHT_PURPLE)); + + victim.getLocation().getWorld().playEffect(player.getLocation(), Effect.SMOKE, 100); + victim.getLocation().getWorld().playEffect(player.getLocation().add(new Vector(0, 1, 0)), Effect.SMOKE, 100); + victim.getLocation().getWorld().playEffect(player.getLocation().add(new Vector(0, 2, 0)), Effect.SMOKE, 100); + + this.plugin.log(player.getName() + " infected " + victim.getName() + " with the werewolf infection!"); } - /*}*/ + } } } } @@ -245,68 +241,88 @@ public void onEntityDeath(EntityDeathEvent event) int health = 0; switch (event.getEntity().getType()) { - case PLAYER: - health = 4; - break; - case VILLAGER: - health = 4; - break; - case HORSE: - health = 4; - break; - case COW: - health = 4; - break; - case ENDERMAN: - health = 3; - break; - case ZOMBIE: - health = 3; - break; - case LLAMA: - health = 3; - break; - case DROWNED: - health = 3; - break; - case DOLPHIN: - health = 3; - break; - case PIG_ZOMBIE: - health = 3; - break; - case SHEEP: - health = 2; - break; - case OCELOT: - health = 2; - break; - case RABBIT: - health = 2; - break; - case PIG: - health = 2; - break; - case WOLF: - health = 2; - break; - case TURTLE: - health = 2; - break; - case SPIDER: - health = 2; - break; - case SKELETON: - health = 1; - break; - case CHICKEN: - health = 1; - break; - case SILVERFISH: - health = 1; - break; - default: - break; + case WARDEN: + case ENDER_DRAGON: + case WITHER: + health = 5; + break; + case PLAYER: + case VILLAGER: + case WANDERING_TRADER: + case PILLAGER: + case VINDICATOR: + case EVOKER: + case ILLUSIONER: + case RAVAGER: + case HORSE: + case DONKEY: + case MULE: + case COW: + case MUSHROOM_COW: + case ZOGLIN: + case PIGLIN_BRUTE: + case POLAR_BEAR: + case ELDER_GUARDIAN: + health = 4; + break; + case ENDERMAN: + case ZOMBIE: + case ZOMBIE_VILLAGER: + case LLAMA: + case TRADER_LLAMA: + case PANDA: + case DROWNED: + case HUSK: + case DOLPHIN: + case PIGLIN: + case STRIDER: + case ZOMBIFIED_PIGLIN: + case WITCH: + case GUARDIAN: + case CAMEL: + case SNIFFER: + health = 3; + break; + case SHEEP: + case GOAT: + case WOLF: + case CAT: + case OCELOT: + case RABBIT: + case PIG: + case TURTLE: + case FOX: + case SPIDER: + case SQUID: + case GLOW_SQUID: + case PHANTOM: + health = 2; + break; + case BLAZE: + case STRAY: + case CHICKEN: + case PARROT: + case AXOLOTL: + case BEE: + case COD: + case SALMON: + case PUFFERFISH: + case TROPICAL_FISH: + case FROG: + case TADPOLE: + case BAT: + health = 1; + break; + case ALLAY: + case ENDERMITE: + case SKELETON: + case WITHER_SKELETON: + case SNOWMAN: + case MAGMA_CUBE: + case SILVERFISH: + case VEX: + default: + break; } if (health > 0 && killer.getHealth() < killer.getAttribute(Attribute.GENERIC_MAX_HEALTH).getDefaultValue()) @@ -332,20 +348,16 @@ public void onEntityDeath(EntityDeathEvent event) if (event.getEntity() instanceof Player) { - /* - * TODO: Readd Vampire integration.. if(plugin.vampireEnabled) { - * if(plugin.isVampire((Player)event.getEntity())) { - * Werewolf.getWerewolfScoreboardManager(). - * setVampireKillsForPlayer(killer, - * Werewolf.getStatisticsManager().increaseVampireKills(killer. - * getUniqueId())); } else { - * Werewolf.getWerewolfScoreboardManager(). - * setHumanKillsForPlayer(killer, - * Werewolf.getStatisticsManager().increaseHumanKills(killer. - * getUniqueId())); } } else { - */ - Werewolf.getWerewolfScoreboardManager().setHumanKillsForPlayer(killer, Werewolf.getStatisticsManager().increaseHumanKills(killer.getUniqueId())); - /* } */ + if(WerewolfAPI.isVampire((Player)event.getEntity())) + { + Werewolf.getWerewolfScoreboardManager().setVampireKillsForPlayer(killer, + Werewolf.getStatisticsManager().increaseVampireKills(killer.getUniqueId())); + } + else + { + Werewolf.getWerewolfScoreboardManager().setHumanKillsForPlayer(killer, + Werewolf.getStatisticsManager().increaseHumanKills(killer.getUniqueId())); + } } else { @@ -365,12 +377,9 @@ public void onEntityDeath(EntityDeathEvent event) return; } - if (this.plugin.vaultEnabled) + if (this.plugin.vaultEnabled && !Werewolf.getWerewolfManager().hasWerewolfSkin(killer.getUniqueId())) { - if (!Werewolf.getWerewolfManager().hasWerewolfSkin(killer.getUniqueId())) - { - Werewolf.getHuntManager().handleKill(killer.getUniqueId(), killer.getName()); - } + Werewolf.getHuntManager().handleKill(killer.getUniqueId(), killer.getName()); } } } \ No newline at end of file diff --git a/src/com/dogonfire/werewolf/listeners/InteractListener.java b/src/com/dogonfire/werewolf/listeners/InteractListener.java index 8429b80..04a4fad 100644 --- a/src/com/dogonfire/werewolf/listeners/InteractListener.java +++ b/src/com/dogonfire/werewolf/listeners/InteractListener.java @@ -1,7 +1,7 @@ package com.dogonfire.werewolf.listeners; -import com.dogonfire.werewolf.ClanManager; -import com.dogonfire.werewolf.LanguageManager; +import com.dogonfire.werewolf.managers.ClanManager; +import com.dogonfire.werewolf.managers.LanguageManager; import com.dogonfire.werewolf.Werewolf; @@ -11,6 +11,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.Action; +import org.bukkit.event.block.BlockDispenseArmorEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerItemConsumeEvent; import org.bukkit.inventory.ItemStack; @@ -49,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; @@ -242,38 +250,56 @@ else if (!checkForDrinkingWerewolfInfectionPotion(event)) { checkForDrinkingWerewolfCurePotion(event); } - } + } + + @EventHandler + public void dispenseArmorEvent(BlockDispenseArmorEvent event) + { + if (event.getTargetEntity() instanceof Player) + { + Player player = (Player) event.getTargetEntity(); + + if (Werewolf.getWerewolfManager().hasWerewolfSkin(player.getUniqueId())) + { + event.setCancelled(true); + } + } + } 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 e94c333..7e52d6a 100644 --- a/src/com/dogonfire/werewolf/listeners/InventoryListener.java +++ b/src/com/dogonfire/werewolf/listeners/InventoryListener.java @@ -24,194 +24,82 @@ 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) + @EventHandler(priority = EventPriority.LOWEST) + public void onInventoryClose(InventoryCloseEvent event) { - if (!Werewolf.getWerewolfManager().hasWerewolfSkin(event.getWhoClicked().getUniqueId())) + if ((!Werewolf.pluginEnabled) || (!this.plugin.dropArmorOnTransform)) { return; } - - if (event.getInventory().getType() != InventoryType.PLAYER) + + if (!(event.getPlayer() instanceof Player)) { return; } - if (event.getSlotType() == InventoryType.SlotType.ARMOR || event.isShiftClick()) + Player player = (Player) event.getPlayer(); + if (!Werewolf.getWerewolfManager().hasWerewolfSkin(player.getUniqueId())) { - event.setCancelled(true); + return; } - }*/ - /* - @EventHandler - public void onInventory(InventoryCloseEvent event) - { - if (!Werewolf.getWerewolfManager().isWolfForm(event.getPlayer().getUniqueId())) - { - return; - } - - if (event.getView().getType() == InventoryType.CRAFTING) - { - preventArmor((Player) event.getPlayer()); - } + removeOffHand(player); + removeMainHand(player); + removeArmor(player); } - private void preventArmor(Player player) + public void removeMainHand(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 (isForbiddenItem(player.getInventory().getItemInMainHand().getType())) { - if (pinv.firstEmpty() >= 0) + if (Werewolf.getWerewolfManager().hasToDropItems(player.getUniqueId())) { - 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 }); + player.getWorld().dropItemNaturally(player.getLocation(), player.getInventory().getItemInMainHand()); } else { - player.getWorld().dropItem(player.getLocation(), boots); + ItemStack stack = player.getInventory().getItemInMainHand(); + int slot = player.getInventory().firstEmpty(); + if (slot > -1) + { + player.getInventory().setItem(slot, stack); + } + else + { + player.getWorld().dropItemNaturally(player.getLocation(), player.getInventory().getItemInMainHand()); + } } - pinv.setBoots(new ItemStack(Material.AIR)); + player.getInventory().setItemInMainHand(null); } } - */ - /* - * @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) + public void removeOffHand(Player player) { - if ((!Werewolf.pluginEnabled) || (!this.plugin.dropArmorOnTransform)) + if (isForbiddenItem(player.getInventory().getItemInOffHand().getType())) { - return; - } - if (!(event.getPlayer() instanceof Player)) - { - return; - } - Player player = (Player) event.getPlayer(); - if (!Werewolf.getWerewolfManager().hasWerewolfSkin(player.getUniqueId())) - { - return; - } - if (player.getInventory().getItemInOffHand() != null) - { - if (isForbiddenItem(player.getInventory().getItemInOffHand().getType())) + if (Werewolf.getWerewolfManager().hasToDropItems(player.getUniqueId())) { - if (Werewolf.getWerewolfManager().hasToDropItems(player.getUniqueId())) { - player.getWorld().dropItemNaturally(player.getLocation(), player.getInventory().getItemInOffHand()); - } - else { - ItemStack stack = player.getInventory().getItemInOffHand(); - int slot = player.getInventory().firstEmpty(); - if (slot > -1) - { - player.getInventory().setItem(slot, stack); - } - else - { - player.getWorld().dropItemNaturally(player.getLocation(), player.getInventory().getItemInOffHand()); - } - } - player.getInventory().setItemInOffHand(null); + player.getWorld().dropItemNaturally(player.getLocation(), player.getInventory().getItemInOffHand()); } - } - if (player.getInventory().getItemInMainHand() != null) - { - if (isForbiddenItem(player.getInventory().getItemInMainHand().getType())) + else { - if (Werewolf.getWerewolfManager().hasToDropItems(player.getUniqueId())) { - player.getWorld().dropItemNaturally(player.getLocation(), player.getInventory().getItemInMainHand()); + ItemStack stack = player.getInventory().getItemInOffHand(); + int slot = player.getInventory().firstEmpty(); + if (slot > -1) + { + player.getInventory().setItem(slot, stack); } - else { - ItemStack stack = player.getInventory().getItemInMainHand(); - int slot = player.getInventory().firstEmpty(); - if (slot > -1) - { - player.getInventory().setItem(slot, stack); - } - else - { - player.getWorld().dropItemNaturally(player.getLocation(), player.getInventory().getItemInMainHand()); - } + else + { + player.getWorld().dropItemNaturally(player.getLocation(), player.getInventory().getItemInOffHand()); } - player.getInventory().setItemInMainHand(null); } + player.getInventory().setItemInOffHand(null); } + } + public void removeArmor(Player player) + { PlayerInventory inventory = player.getInventory(); for (ItemStack stack : inventory.getArmorContents()) { @@ -235,10 +123,10 @@ public void onInventoryClose(InventoryCloseEvent event) } } } - + player.getInventory().setArmorContents(new ItemStack[] { new ItemStack(Material.AIR), new ItemStack(Material.AIR), new ItemStack(Material.AIR), new ItemStack(Material.AIR) }); } - + @EventHandler public void onPlayerNewHeldItem(PlayerItemHeldEvent event) { @@ -249,7 +137,7 @@ public void onPlayerNewHeldItem(PlayerItemHeldEvent event) { return; } - + if (this.plugin.keepWerewolfHandsFree) { int heldItemSlot = event.getNewSlot(); @@ -257,115 +145,296 @@ public void onPlayerNewHeldItem(PlayerItemHeldEvent event) { Material material = player.getInventory().getItem(heldItemSlot).getType(); if (!isForbiddenItem(material)) { return; } - + ItemStack stack = player.getInventory().getItem(heldItemSlot); int inventorySlots = 36; //player.getInventory().getSize(); Boolean foundSlot = false; - + for (int slot = 0; slot < inventorySlots; slot++) { - if (player.getInventory().getItem(slot) == null || player.getInventory().getItem(slot).getType() == Material.AIR) { - if (slot != heldItemSlot) { - player.getInventory().setItem(slot, stack); - player.getInventory().setItem(heldItemSlot, new ItemStack(Material.AIR)); - foundSlot = true; - break; - } + if ((player.getInventory().getItem(slot) == null || player.getInventory().getItem(slot).getType() == Material.AIR) && slot != heldItemSlot) { + player.getInventory().setItem(slot, stack); + player.getInventory().setItem(heldItemSlot, new ItemStack(Material.AIR)); + foundSlot = true; + break; } } - if (foundSlot == false) { + if (!foundSlot) { event.setCancelled(true); } } } } } - + @EventHandler public void onPlayerPickupItem(EntityPickupItemEvent event) { Entity entity = event.getEntity(); - if (entity.getType() == EntityType.PLAYER) { + if (entity.getType() == EntityType.PLAYER) + { Player player = (Player) entity; - + if (!Werewolf.getWerewolfManager().hasWerewolfSkin(player.getUniqueId())) { return; } - + Material material = event.getItem().getItemStack().getType(); - if (!isForbiddenItem(material)) { return; } - + // The difference is that, if it is not a forbidden item, we still + // don't want + // the item to be in the main hand, but if there is no other choice, + // then it's fine. + if (!isForbiddenItem(material)) + { + if (player.getInventory().getItemInMainHand().getType() == Material.AIR) + { + ItemStack stack = event.getItem().getItemStack(); + + int heldItemSlot = player.getInventory().getHeldItemSlot(); + int inventorySlots = 36; + + for (int slot = 0; slot < inventorySlots; slot++) + { + if ((player.getInventory().getItem(slot) == null || player.getInventory().getItem(slot).getType() == Material.AIR) && slot != heldItemSlot) + { + player.getInventory().setItem(slot, stack); + event.getItem().remove(); + event.setCancelled(true); + break; + } + } + } + return; + } + if (this.plugin.keepWerewolfHandsFree) { if (player.getInventory().getItemInMainHand().getType() == Material.AIR) { ItemStack stack = event.getItem().getItemStack(); - + int heldItemSlot = player.getInventory().getHeldItemSlot(); - int inventorySlots = 36; //player.getInventory().getSize(); + int inventorySlots = 36; // player.getInventory().getSize(); Boolean foundSlot = false; - - for (int slot = 0; slot < inventorySlots; slot++) { - if (player.getInventory().getItem(slot) == null || player.getInventory().getItem(slot).getType() == Material.AIR) { - if (slot != heldItemSlot) { - player.getInventory().setItem(slot, stack); - event.getItem().remove(); - event.setCancelled(true); - foundSlot = true; - break; - } + + for (int slot = 0; slot < inventorySlots; slot++) + { + if ((player.getInventory().getItem(slot) == null || player.getInventory().getItem(slot).getType() == Material.AIR) && slot != heldItemSlot) + { + player.getInventory().setItem(slot, stack); + event.getItem().remove(); + event.setCancelled(true); + foundSlot = true; + break; } } - - if (foundSlot == false) { + + if (!foundSlot) + { event.setCancelled(true); } } - } - } + } + } } - + public boolean isForbiddenItem(Material material) { switch (material) { - case WOODEN_SWORD: - case GOLDEN_SWORD: - case STONE_SWORD: - case DIAMOND_SWORD: - case IRON_SWORD: - case SHIELD: - case BOW: - case POTION: - case SPLASH_POTION: - case WOODEN_AXE: - case GOLDEN_AXE: - case STONE_AXE: - case DIAMOND_AXE: - case IRON_AXE: - case WOODEN_PICKAXE: - case GOLDEN_PICKAXE: - case STONE_PICKAXE: - case DIAMOND_PICKAXE: - case IRON_PICKAXE: - case WOODEN_HOE: - case GOLDEN_HOE: - case STONE_HOE: - case DIAMOND_HOE: - case IRON_HOE: - case WOODEN_SHOVEL: - case GOLDEN_SHOVEL: - case STONE_SHOVEL: - case DIAMOND_SHOVEL: - case IRON_SHOVEL: - case FLINT_AND_STEEL: - case FISHING_ROD: - case TRIDENT: - case CROSSBOW: - return true; - default: - return false; + case WOODEN_SWORD: + case GOLDEN_SWORD: + case STONE_SWORD: + case DIAMOND_SWORD: + case NETHERITE_SWORD: + case IRON_SWORD: + case SHIELD: + case BOW: + case POTION: + case SPLASH_POTION: + case WOODEN_AXE: + case GOLDEN_AXE: + case STONE_AXE: + case DIAMOND_AXE: + case NETHERITE_AXE: + case IRON_AXE: + case WOODEN_PICKAXE: + case GOLDEN_PICKAXE: + case STONE_PICKAXE: + case DIAMOND_PICKAXE: + case NETHERITE_PICKAXE: + case IRON_PICKAXE: + case WOODEN_HOE: + case GOLDEN_HOE: + case STONE_HOE: + case DIAMOND_HOE: + case NETHERITE_HOE: + case IRON_HOE: + case WOODEN_SHOVEL: + case GOLDEN_SHOVEL: + case STONE_SHOVEL: + case DIAMOND_SHOVEL: + case NETHERITE_SHOVEL: + case IRON_SHOVEL: + case FLINT_AND_STEEL: +// case FISHING_ROD: +// case LEAD: +// case COMPASS: +// case CLOCK: + case ENDER_PEARL: +// case ENDER_EYE: +// case WRITABLE_BOOK: +// case BOOK: + case FIRE_CHARGE: +// case NAME_TAG: +// case CARROT_ON_A_STICK: +// case WARPED_FUNGUS_ON_A_STICK: +// case MAP: +// case FILLED_MAP: +// case BUCKET: +// case WATER_BUCKET: +// case PUFFERFISH_BUCKET: +// case SALMON_BUCKET: +// case MILK_BUCKET: +// case SHEARS: + case TRIDENT: + case TOTEM_OF_UNDYING: + 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 190a1ba..769bdab 100644 --- a/src/com/dogonfire/werewolf/listeners/PlayerListener.java +++ b/src/com/dogonfire/werewolf/listeners/PlayerListener.java @@ -3,9 +3,9 @@ import java.util.Collection; import java.util.Random; -import com.dogonfire.werewolf.ClanManager; -import com.dogonfire.werewolf.DamageManager; -import com.dogonfire.werewolf.LanguageManager; +import com.dogonfire.werewolf.managers.ClanManager; +import com.dogonfire.werewolf.managers.DamageManager; +import com.dogonfire.werewolf.managers.LanguageManager; import com.dogonfire.werewolf.Werewolf; import com.dogonfire.werewolf.tasks.CheckTransformationTask; import com.dogonfire.werewolf.tasks.PotionEffectTask; @@ -164,28 +164,25 @@ public void onPlayerDeath(PlayerDeathEvent event) { if (event.getEntity().getKiller() == null || event.getEntity().getKiller().getUniqueId() == null) { - if (this.plugin.renameWerewolves) + if (this.plugin.renameWerewolves && Werewolf.getWerewolfManager().hasWerewolfSkin(event.getEntity().getUniqueId())) { - if (Werewolf.getWerewolfManager().hasWerewolfSkin(event.getEntity().getUniqueId())) + String werewolfName = "Werewolf"; + if (plugin.werewolfNamesEnabled) { + werewolfName = Werewolf.getWerewolfManager().getWerewolfName(event.getEntity().getUniqueId()); + } + switch (this.random.nextInt(3)) { - String werewolfName = "Werewolf"; - if (plugin.werewolfNamesEnabled) { - werewolfName = Werewolf.getWerewolfManager().getWerewolfName(event.getEntity().getUniqueId()); - } - switch (this.random.nextInt(3)) - { - case 0: - event.setDeathMessage(werewolfName + " died"); - break; - case 1: - event.setDeathMessage(werewolfName + " was killed"); - break; - case 2: - event.setDeathMessage(werewolfName + " died"); - break; - default: - break; - } + case 0: + event.setDeathMessage(werewolfName + " died"); + break; + case 1: + event.setDeathMessage(werewolfName + " was killed"); + break; + case 2: + event.setDeathMessage(werewolfName + " died"); + break; + default: + break; } } return; @@ -198,19 +195,23 @@ public void onPlayerDeath(PlayerDeathEvent event) { if (Werewolf.getWerewolfManager().hasWerewolfSkin(event.getEntity().getKiller().getUniqueId())) { + String werewolfName = "Werewolf"; + if (plugin.werewolfNamesEnabled) { + werewolfName = Werewolf.getWerewolfManager().getWerewolfName(event.getEntity().getKiller().getUniqueId()); + } switch (this.random.nextInt(4)) { case 0: - event.setDeathMessage(victimName + " was slaughtered by a Werewolf"); + event.setDeathMessage(victimName + " was slaughtered by " + werewolfName); break; case 1: - event.setDeathMessage(victimName + " was ripped apart by a Werewolf"); + event.setDeathMessage(victimName + " was ripped apart by " + werewolfName); break; case 2: - event.setDeathMessage(victimName + " was torn to pieces by a Werewolf"); + event.setDeathMessage(victimName + " was torn to pieces by " + werewolfName); break; case 3: - event.setDeathMessage(victimName + " was eaten by a Werewolf"); + event.setDeathMessage(victimName + " was eaten by " + werewolfName); break; default: break; @@ -218,13 +219,17 @@ public void onPlayerDeath(PlayerDeathEvent event) } else if (Werewolf.getWerewolfManager().hasWerewolfSkin(event.getEntity().getUniqueId())) { + String werewolfName = "Werewolf"; + if (plugin.werewolfNamesEnabled) { + werewolfName = Werewolf.getWerewolfManager().getWerewolfName(event.getEntity().getUniqueId()); + } if (killerName != null) { - event.setDeathMessage("Werewolf was slain by " + killerName); + event.setDeathMessage(werewolfName + " was slain by " + killerName); } else { - event.setDeathMessage("Werewolf died"); + event.setDeathMessage(werewolfName + " died"); } } } @@ -237,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: @@ -306,19 +312,16 @@ public void onPotionSplash(PotionSplashEvent event) { Player player = (Player) livingEntity; - if (Werewolf.getWerewolfManager().isWolfForm(player.getUniqueId())) + if (Werewolf.getWerewolfManager().isWolfForm(player.getUniqueId()) && random.nextInt(100) < plugin.wolfbaneUntransformChance) { - if (random.nextInt(100) < plugin.wolfbaneUntransformChance) - { - Werewolf.server.getScheduler().scheduleSyncDelayedTask(this.plugin, new PotionEffectTask(this.plugin, player, new PotionEffect(PotionEffectType.POISON, 4 * 20, 2)), 16L); - - player.spawnParticle(Particle.FIREWORKS_SPARK, player.getLocation(), 100); - DustOptions dustOptions = new DustOptions(Color.BLACK, 1); - player.spawnParticle(Particle.REDSTONE, player.getLocation().add(new Vector(0, 1, 0)), 100, dustOptions); - player.spawnParticle(Particle.REDSTONE, player.getLocation().add(new Vector(0, 2, 0)), 100, dustOptions); + Werewolf.server.getScheduler().scheduleSyncDelayedTask(this.plugin, new PotionEffectTask(this.plugin, player, new PotionEffect(PotionEffectType.POISON, 4 * 20, 2)), 16L); + + player.spawnParticle(Particle.FIREWORKS_SPARK, player.getLocation(), 100); + DustOptions dustOptions = new DustOptions(Color.BLACK, 1); + player.spawnParticle(Particle.REDSTONE, player.getLocation().add(new Vector(0, 1, 0)), 100, dustOptions); + player.spawnParticle(Particle.REDSTONE, player.getLocation().add(new Vector(0, 2, 0)), 100, dustOptions); - plugin.untransform(player); - } + plugin.untransform(player); } } } diff --git a/src/com/dogonfire/werewolf/ClanManager.java b/src/com/dogonfire/werewolf/managers/ClanManager.java similarity index 69% rename from src/com/dogonfire/werewolf/ClanManager.java rename to src/com/dogonfire/werewolf/managers/ClanManager.java index a63d686..ee9c0d0 100644 --- a/src/com/dogonfire/werewolf/ClanManager.java +++ b/src/com/dogonfire/werewolf/managers/ClanManager.java @@ -1,4 +1,4 @@ -package com.dogonfire.werewolf; +package com.dogonfire.werewolf.managers; import java.io.File; import java.text.DateFormat; @@ -11,6 +11,7 @@ import java.util.List; import java.util.UUID; +import com.dogonfire.werewolf.Werewolf; import org.bukkit.Location; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; @@ -20,9 +21,9 @@ public class ClanManager { - private Werewolf plugin; + private Werewolf plugin; - public static enum ClanType + public enum ClanType { WildBite, WerewolfBite, Potion; } @@ -34,10 +35,6 @@ public static 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; @@ -49,7 +46,7 @@ public static enum ClanType private UUID alphaAccountId = null; private String alphaAccount = ""; - ClanManager(Werewolf plugin) + public ClanManager(Werewolf plugin) { this.plugin = plugin; } @@ -86,13 +83,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()) { @@ -132,7 +129,7 @@ public void save() public String getClanName(UUID playerId) { - return (String) this.clanNames.get(Werewolf.getWerewolfManager().getWerewolfClan(playerId)); + return this.clanNames.get(Werewolf.getWerewolfManager().getWerewolfClan(playerId)); } public String getWerewolfAccountForClan(ClanType type) @@ -148,7 +145,7 @@ public UUID getWerewolfAccountIdForClan(ClanType type) public String getWerewolfTextureForClan(ClanType type) { - return this.werewolfTextures.get(type); + return this.werewolfTextures.get(type); } public String getWerewolfTextureSignatureForClan(ClanType type) @@ -168,12 +165,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) @@ -181,42 +178,93 @@ public void handleMobKill(Player player, ClanType clanType, EntityType mobType) double points = 0.0D; if (this.playerClanPoints.containsKey(player.getName())) { - points = ((Double) this.playerClanPoints.get(player.getName())).doubleValue(); + points = this.playerClanPoints.get(player.getName()).doubleValue(); } switch (mobType) { + case WARDEN: + case ENDER_DRAGON: + case WITHER: + points = 50.0D; + break; case PLAYER: + case VILLAGER: + case WANDERING_TRADER: + case PILLAGER: + case VINDICATOR: + case EVOKER: + case ILLUSIONER: + case RAVAGER: + case ZOGLIN: + case PIGLIN_BRUTE: + case ELDER_GUARDIAN: + case ENDERMAN: points = 5.0D; break; + case POLAR_BEAR: + case HORSE: + case DONKEY: + case MULE: + case COW: + case MUSHROOM_COW: + case ZOMBIE: + case ZOMBIE_VILLAGER: + case LLAMA: + case TRADER_LLAMA: + case PANDA: + case DROWNED: + case HUSK: + case DOLPHIN: + case PIGLIN: + case STRIDER: + case ZOMBIFIED_PIGLIN: + case WITCH: + case GUARDIAN: case SKELETON: - points = 3.0D; - break; - case ENDERMAN: + case WITHER_SKELETON: + case CAMEL: + case SNIFFER: points = 3.0D; break; case SHEEP: - points = 3.0D; - break; - case COW: - points = 3.0D; - break; + case GOAT: + case WOLF: + case CAT: + case OCELOT: + case RABBIT: + case PIG: + case TURTLE: + case FOX: case SPIDER: + case GLOW_SQUID: + case PHANTOM: points = 2.0D; break; - case ZOMBIE: - points = 2.0D; - break; - case RABBIT: - points = 1.0D; - break; - case SILVERFISH: - points = 1.0D; - break; + case BLAZE: + case STRAY: case CHICKEN: + case PARROT: + case AXOLOTL: + case SQUID: + case BEE: + case COD: + case SALMON: + case PUFFERFISH: + case TROPICAL_FISH: + case FROG: + case TADPOLE: + case BAT: + case VEX: points = 1.0D; break; + case ALLAY: + case ENDERMITE: + case SNOWMAN: + case MAGMA_CUBE: + case SILVERFISH: default: + points = 0.5D; break; } @@ -257,6 +305,7 @@ public String getClanName(ClanType clan) return (String) this.clanNames.get(clan); } + // TODO Bloodrage clan? public void updateClans() { if (!this.plugin.useClans) @@ -352,7 +401,7 @@ public UUID getAlpha(ClanType clan) if (alphaPlayerId != null) { assignAlphaInClan(clan, alphaPlayerId); - } + } } return null; diff --git a/src/com/dogonfire/werewolf/DamageManager.java b/src/com/dogonfire/werewolf/managers/DamageManager.java similarity index 92% rename from src/com/dogonfire/werewolf/DamageManager.java rename to src/com/dogonfire/werewolf/managers/DamageManager.java index dc3a4ef..133b923 100644 --- a/src/com/dogonfire/werewolf/DamageManager.java +++ b/src/com/dogonfire/werewolf/managers/DamageManager.java @@ -1,5 +1,6 @@ -package com.dogonfire.werewolf; +package com.dogonfire.werewolf.managers; +import com.dogonfire.werewolf.Werewolf; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -31,24 +32,28 @@ public static double getDamageFromItemInHand(Player player) case STONE_PICKAXE: damage = 4; break; case IRON_PICKAXE: damage = 5; break; case DIAMOND_PICKAXE: damage = 6; break; + case NETHERITE_PICKAXE: damage = 7; break; case WOODEN_SHOVEL: damage = 2; break; case GOLDEN_SHOVEL: damage = 2; break; case STONE_SHOVEL: damage = 3; break; case IRON_SHOVEL: damage = 4; break; case DIAMOND_SHOVEL: damage = 5; break; + case NETHERITE_SHOVEL: damage = 6; break; case WOODEN_AXE: damage = 4; break; case GOLDEN_AXE: damage = 4; break; case STONE_AXE: damage = 5; break; case IRON_AXE: damage = 6; break; case DIAMOND_AXE: damage = 7; break; + case NETHERITE_AXE: damage = 8; break; case WOODEN_SWORD: damage = 5; break; case GOLDEN_SWORD: damage = 5; break; case STONE_SWORD: damage = 6; break; case IRON_SWORD: damage = 7; break; case DIAMOND_SWORD: damage = 8; break; + case NETHERITE_SWORD: damage = 9; break; default: damage = 1; break; } diff --git a/src/com/dogonfire/werewolf/HuntManager.java b/src/com/dogonfire/werewolf/managers/HuntManager.java similarity index 93% rename from src/com/dogonfire/werewolf/HuntManager.java rename to src/com/dogonfire/werewolf/managers/HuntManager.java index e36d1ee..83dfe89 100644 --- a/src/com/dogonfire/werewolf/HuntManager.java +++ b/src/com/dogonfire/werewolf/managers/HuntManager.java @@ -1,4 +1,4 @@ -package com.dogonfire.werewolf; +package com.dogonfire.werewolf.managers; import java.io.File; import java.text.DateFormat; @@ -10,6 +10,8 @@ import java.util.UUID; +import com.dogonfire.werewolf.tasks.CompassTrackerTask; +import com.dogonfire.werewolf.Werewolf; import org.bukkit.ChatColor; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; @@ -17,13 +19,13 @@ public class HuntManager { - private Werewolf plugin; + private Werewolf plugin; private int totalBounty = 0; private FileConfiguration huntersConfig = null; private File huntersConfigFile = null; private Random random = new Random(); - HuntManager(Werewolf p) + public HuntManager(Werewolf p) { this.plugin = p; } @@ -57,18 +59,18 @@ public void save() public boolean isHunting(UUID playerId) { - return CompassTracker.hasWatcher(playerId); + return CompassTrackerTask.hasWatcher(playerId); } public void setHunting(UUID playerId, boolean hunting) { if (hunting) { - CompassTracker.addWatcher(playerId); + CompassTrackerTask.addWatcher(playerId); } else { - CompassTracker.removeWatcher(playerId); + CompassTrackerTask.removeWatcher(playerId); } } diff --git a/src/com/dogonfire/werewolf/ItemManager.java b/src/com/dogonfire/werewolf/managers/ItemManager.java similarity index 88% rename from src/com/dogonfire/werewolf/ItemManager.java rename to src/com/dogonfire/werewolf/managers/ItemManager.java index c305e9f..b5e8caa 100644 --- a/src/com/dogonfire/werewolf/ItemManager.java +++ b/src/com/dogonfire/werewolf/managers/ItemManager.java @@ -1,27 +1,43 @@ -package com.dogonfire.werewolf; +package com.dogonfire.werewolf.managers; import java.util.ArrayList; import java.util.List; +import java.util.Objects; +import com.dogonfire.werewolf.items.Recipes; +import com.dogonfire.werewolf.Werewolf; +import org.bukkit.*; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.BookMeta; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.PotionMeta; +import org.bukkit.persistence.PersistentDataContainer; +import org.bukkit.persistence.PersistentDataType; import org.bukkit.potion.PotionData; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionType; -import org.bukkit.Bukkit; -import org.bukkit.Material; -import org.bukkit.ChatColor; public class ItemManager { - private Werewolf plugin; + private Werewolf plugin; + private NamespacedKey namespacedKey; public ItemManager(Werewolf plugin) { this.plugin = plugin; + this.namespacedKey = new NamespacedKey(plugin, "ww-item"); + } + + private boolean isWerewolfItem(ItemStack item, String itemName) + { + ItemMeta itemMeta = item.getItemMeta(); + if (itemMeta == null) + { + return false; + } + PersistentDataContainer dataContainer = itemMeta.getPersistentDataContainer(); + return dataContainer.has(namespacedKey, PersistentDataType.STRING) && Objects.equals(dataContainer.get(namespacedKey, PersistentDataType.STRING), itemName); } public void setupRecipes() @@ -29,7 +45,7 @@ public void setupRecipes() if(plugin.craftableInfectionPotionEnabled) { Bukkit.addRecipe(Recipes.infectionPotion(plugin)); - plugin.logDebug("Cratable infection potions are enabled"); + plugin.logDebug("Craftable infection potions are enabled"); } if(plugin.craftableCurePotionEnabled) @@ -80,6 +96,9 @@ public ItemStack newInfectionPotion() //potionMeta.setMainEffect(PotionEffectType.CONFUSION); potionMeta.addCustomEffect(new PotionEffect(PotionEffectType.CONFUSION, 300, 0), true); + // Add NBT data + potionMeta.getPersistentDataContainer().set(namespacedKey, PersistentDataType.STRING, "InfectionPotion"); + potion.setItemMeta(potionMeta); return potion; @@ -102,6 +121,9 @@ public ItemStack newCurePotion() //potionMeta.setMainEffect(PotionEffectType.CONFUSION); potionMeta.addCustomEffect(new PotionEffect(PotionEffectType.CONFUSION, 300, 0), true); + // Add NBT data + potionMeta.getPersistentDataContainer().set(namespacedKey, PersistentDataType.STRING, "CurePotion"); + potion.setItemMeta(potionMeta); return potion; @@ -135,6 +157,9 @@ public ItemStack newWolfbanePotion() //itemStack.setItemMeta(potionMeta); //return itemStack; + + // Add NBT data + potionMeta.getPersistentDataContainer().set(namespacedKey, PersistentDataType.STRING, "WolfbanePotion"); potion.setItemMeta(potionMeta); @@ -157,6 +182,9 @@ public ItemStack newSilverSword(int level) itemMeta.setLore(pages); + // Add NBT data + itemMeta.getPersistentDataContainer().set(namespacedKey, PersistentDataType.STRING, "SilverSword"); + weapon.setItemMeta(itemMeta); return weapon; @@ -178,6 +206,9 @@ public ItemStack newSilverArmor(int level) itemMeta.setLore(pages); + // Add NBT data + itemMeta.getPersistentDataContainer().set(namespacedKey, PersistentDataType.STRING, "SilverArmor"); + weapon.setItemMeta(itemMeta); return weapon; @@ -312,79 +343,36 @@ public ItemStack newLoreBook() itemMeta.setLore(pages); + // Add NBT data + itemMeta.getPersistentDataContainer().set(namespacedKey, PersistentDataType.STRING, "LoreBook"); + book.setItemMeta(itemMeta); return book; } - public boolean isSilverSword(ItemStack IS) { - ItemMeta itemMeta = IS.getItemMeta(); - if (itemMeta == null) - { - return false; - } - if (itemMeta.getDisplayName() == null) - { - return false; - } - return (itemMeta.getDisplayName().contains(Werewolf.getLanguageManager().getLanguageString(LanguageManager.LANGUAGESTRING.SilverSwordTitle, ChatColor.GOLD))); + return isWerewolfItem(IS, "SilverSword"); } public boolean isCurePotion(ItemStack IS) { - ItemMeta itemMeta = IS.getItemMeta(); - if (itemMeta == null) - { - return false; - } - if (itemMeta.getDisplayName() == null) - { - return false; - } - return (itemMeta.getDisplayName().contains(Werewolf.getLanguageManager().getLanguageString(LanguageManager.LANGUAGESTRING.CurePotionTitle, ChatColor.GOLD))); + return isWerewolfItem(IS, "CurePotion"); } public boolean isInfectionPotion(ItemStack IS) { - ItemMeta itemMeta = IS.getItemMeta(); - if (itemMeta == null) - { - return false; - } - if (itemMeta.getDisplayName() == null) - { - return false; - } - return (itemMeta.getDisplayName().contains(Werewolf.getLanguageManager().getLanguageString(LanguageManager.LANGUAGESTRING.InfectionPotionTitle, ChatColor.GOLD))); + return isWerewolfItem(IS, "InfectionPotion"); } public boolean isWolfbanePotion(ItemStack IS) { - ItemMeta itemMeta = IS.getItemMeta(); - if (itemMeta == null) - { - return false; - } - if (itemMeta.getDisplayName() == null) - { - return false; - } - return (itemMeta.getDisplayName().contains(Werewolf.getLanguageManager().getLanguageString(LanguageManager.LANGUAGESTRING.WolfbanePotionTitle, ChatColor.GOLD))); + return isWerewolfItem(IS, "WolfbanePotion"); } public boolean isLoreBook(ItemStack IS) { - ItemMeta itemMeta = IS.getItemMeta(); - if (itemMeta == null) - { - return false; - } - if (itemMeta.getDisplayName() == null) - { - return false; - } - return (itemMeta.getDisplayName().contains(Werewolf.getLanguageManager().getLanguageString(LanguageManager.LANGUAGESTRING.LoreBookTitle, ChatColor.GOLD))); + return isWerewolfItem(IS, "LoreBook"); } } diff --git a/src/com/dogonfire/werewolf/LanguageManager.java b/src/com/dogonfire/werewolf/managers/LanguageManager.java similarity index 97% rename from src/com/dogonfire/werewolf/LanguageManager.java rename to src/com/dogonfire/werewolf/managers/LanguageManager.java index dcac494..519a67d 100644 --- a/src/com/dogonfire/werewolf/LanguageManager.java +++ b/src/com/dogonfire/werewolf/managers/LanguageManager.java @@ -1,5 +1,6 @@ -package com.dogonfire.werewolf; +package com.dogonfire.werewolf.managers; +import com.dogonfire.werewolf.Werewolf; import com.google.common.io.Files; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -16,7 +17,7 @@ public class LanguageManager { - private Werewolf plugin; + private Werewolf plugin; private FileConfiguration languageConfig = null; private Random random = new Random(); private String amount; @@ -114,7 +115,7 @@ public void save() String languageFileName = this.plugin.language + ".yml"; File languageConfigFile = new File(this.plugin.getDataFolder() + "/lang/" + languageFileName); - if ((!languageConfigFile.exists()) || languageConfigFile == null) + if (!languageConfigFile.exists()) { return; } @@ -143,7 +144,7 @@ public String getLanguageString(LANGUAGESTRING type, ChatColor color) return parseString(text, color); } - LanguageManager(Werewolf p) + public LanguageManager(Werewolf p) { this.plugin = p; } @@ -262,6 +263,7 @@ public static enum LANGUAGESTRING YouPlacedASilverSwordSign, YouPlacedABookSign, YouAreNotTheAlphaOfTheClan, + YourWerewolfName, DenyVampire, NoRecentAlphaCall, ClanAlphaCannotAnswerCall, diff --git a/src/com/dogonfire/werewolf/PermissionsManager.java b/src/com/dogonfire/werewolf/managers/PermissionsManager.java similarity index 65% rename from src/com/dogonfire/werewolf/PermissionsManager.java rename to src/com/dogonfire/werewolf/managers/PermissionsManager.java index 6d77290..d46e680 100644 --- a/src/com/dogonfire/werewolf/PermissionsManager.java +++ b/src/com/dogonfire/werewolf/managers/PermissionsManager.java @@ -1,5 +1,6 @@ -package com.dogonfire.werewolf; +package com.dogonfire.werewolf.managers; +import com.dogonfire.werewolf.Werewolf; import net.milkbowl.vault.chat.Chat; import net.milkbowl.vault.permission.Permission; @@ -14,7 +15,7 @@ public class PermissionsManager { private String pluginName = "null"; - private Werewolf plugin; + private Werewolf plugin; private Permission vaultPermission = null; private static Chat vaultChat = null; @@ -28,7 +29,13 @@ public PermissionsManager(Werewolf p) vaultPermission = permissionProvider.getProvider(); RegisteredServiceProvider chatProvider = plugin.getServer().getServicesManager().getRegistration(Chat.class); - vaultChat = chatProvider.getProvider(); + try { + vaultChat = chatProvider.getProvider(); + } + catch (NullPointerException e) { + this.plugin.log("No chatprovider found, Vault cannot get prefixes."); + } + } } @@ -67,39 +74,36 @@ public boolean hasPermission(Player player, String node) //this.plugin.logDebug("Current permission: " + permission.getName()); Map permissionChildren = permission.getChildren(); - if ((permissionChildren.containsKey(node) && permissionChildren.get(node).booleanValue() == true) || permission.getName().contains(node)) + if ((permissionChildren.containsKey(node) && permissionChildren.get(node).booleanValue() == true) && permission.getName().contains(node)) { - if (permission.getName().contains(node)) + this.plugin.logDebug("Heyy, it was the correct perm finally... Perm: " + permission.getName() + " - Node: " + node); + this.plugin.logDebug("Current permissionDefault: " + permission.getDefault().toString()); + if (permission.getDefault() == PermissionDefault.TRUE) { - this.plugin.logDebug("Heyy, it was the correct perm finally... Perm: " + permission.getName() + " - Node: " + node); - this.plugin.logDebug("Current permissionDefault: " + permission.getDefault().toString()); - if (permission.getDefault() == PermissionDefault.TRUE) + this.plugin.logDebug("It was default true! Returning true!"); + return true; + } + else if (permission.getDefault() == PermissionDefault.OP) + { + this.plugin.logDebug("It was for operators!"); + if (player.isOp()) { - this.plugin.logDebug("It was default true! Returning true!"); + this.plugin.logDebug("Player is an operator! Returning true!"); return true; } - else if (permission.getDefault() == PermissionDefault.OP) - { - this.plugin.logDebug("It was for operators!"); - if (player.isOp()) - { - this.plugin.logDebug("Player is an operator! Returning true!"); - return true; - } - this.plugin.logDebug("Player is not an operator!"); - } - else if (permission.getDefault() == PermissionDefault.NOT_OP) + this.plugin.logDebug("Player is not an operator!"); + } + else if (permission.getDefault() == PermissionDefault.NOT_OP) + { + this.plugin.logDebug("It was for non-operators!"); + if (!player.isOp()) { - this.plugin.logDebug("It was for non-operators!"); - if (!player.isOp()) - { - this.plugin.logDebug("Player is not an operator! Returning true!"); - return true; - } - this.plugin.logDebug("Player is an operator!"); + this.plugin.logDebug("Player is not an operator! Returning true!"); + return true; } - break; + this.plugin.logDebug("Player is an operator!"); } + break; } } } @@ -133,8 +137,10 @@ public String getPrefix(String playerName) { if (this.plugin.vaultEnabled) { - Player player = plugin.getServer().getPlayer(playerName); - return vaultChat.getPlayerPrefix(player); + if (vaultChat != null) { + Player player = plugin.getServer().getPlayer(playerName); + return vaultChat.getPlayerPrefix(player); + } } return ""; } diff --git a/src/com/dogonfire/werewolf/SignManager.java b/src/com/dogonfire/werewolf/managers/SignManager.java similarity index 96% rename from src/com/dogonfire/werewolf/SignManager.java rename to src/com/dogonfire/werewolf/managers/SignManager.java index f6fad95..2ac1154 100644 --- a/src/com/dogonfire/werewolf/SignManager.java +++ b/src/com/dogonfire/werewolf/managers/SignManager.java @@ -1,5 +1,6 @@ -package com.dogonfire.werewolf; +package com.dogonfire.werewolf.managers; +import com.dogonfire.werewolf.Werewolf; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.block.BlockState; @@ -13,13 +14,13 @@ import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.inventory.ItemStack; -import com.dogonfire.werewolf.api.WerewolfAPI; +import com.dogonfire.werewolf.WerewolfAPI; public class SignManager implements Listener { - private Werewolf plugin; + private Werewolf plugin; - SignManager(Werewolf p) + public SignManager(Werewolf p) { this.plugin = p; } @@ -329,7 +330,7 @@ private boolean checkForActivatingSign(PlayerInteractEvent event) Player player = event.getPlayer(); String typeLine = sign.getLine(1); - if (typeLine.equals("Infection") && (player.isOp() || Werewolf.getPermissionsManager().hasPermission(player, "werewolf.sign.infection.use"))) + if ("Infection".equals(typeLine) && (player.isOp() || Werewolf.getPermissionsManager().hasPermission(player, "werewolf.sign.infection.use"))) { double price = 0.0D; if (this.plugin.vaultEnabled) @@ -356,7 +357,7 @@ private boolean checkForActivatingSign(PlayerInteractEvent event) return true; } - else if (typeLine.equals("Cure") && (player.isOp() || (Werewolf.getPermissionsManager().hasPermission(player, "werewolf.sign.cure.use")))) + else if ("Cure".equals(typeLine) && (player.isOp() || (Werewolf.getPermissionsManager().hasPermission(player, "werewolf.sign.cure.use")))) { double price = 0.0D; @@ -382,7 +383,7 @@ else if (typeLine.equals("Cure") && (player.isOp() || (Werewolf.getPermissionsMa return true; } - else if (typeLine.equals("Wolfbane") && (player.isOp() || (Werewolf.getPermissionsManager().hasPermission(player, "werewolf.sign.wolfbane.use")))) + else if ("Wolfbane".equals(typeLine) && (player.isOp() || (Werewolf.getPermissionsManager().hasPermission(player, "werewolf.sign.wolfbane.use")))) { double price = 0.0D; @@ -408,7 +409,7 @@ else if (typeLine.equals("Wolfbane") && (player.isOp() || (Werewolf.getPermissio return true; } - else if (typeLine.equals("SilverSword") && (player.isOp() || (Werewolf.getPermissionsManager().hasPermission(player, "werewolf.sign.silversword.use")))) + else if ("SilverSword".equals(typeLine) && (player.isOp() || (Werewolf.getPermissionsManager().hasPermission(player, "werewolf.sign.silversword.use")))) { double price = 0.0D; @@ -434,7 +435,7 @@ else if (typeLine.equals("SilverSword") && (player.isOp() || (Werewolf.getPermis return true; } - else if (typeLine.equals("LoreBook") && (player.isOp() || (Werewolf.getPermissionsManager().hasPermission(player, "werewolf.sign.lorebook.use")))) + else if ("LoreBook".equals(typeLine) && (player.isOp() || (Werewolf.getPermissionsManager().hasPermission(player, "werewolf.sign.lorebook.use")))) { double price = 0.0D; @@ -453,7 +454,7 @@ else if (typeLine.equals("LoreBook") && (player.isOp() || (Werewolf.getPermissio { Werewolf.getLanguageManager().setAmount("free"); } - event.getPlayer().getWorld().dropItemNaturally(event.getPlayer().getLocation(), WerewolfAPI.newWerewolfLorebook()); + event.getPlayer().getWorld().dropItemNaturally(event.getPlayer().getLocation(), WerewolfAPI.newWerewolfLoreBook()); this.plugin.sendInfo(player.getUniqueId(), LanguageManager.LANGUAGESTRING.YouBoughtALoreBook, ChatColor.GREEN, "", (int)price, 1); this.plugin.log(event.getPlayer().getName() + " bought a werewolf lorebook for " + price); diff --git a/src/com/dogonfire/werewolf/SkinManager.java b/src/com/dogonfire/werewolf/managers/SkinManager.java similarity index 88% rename from src/com/dogonfire/werewolf/SkinManager.java rename to src/com/dogonfire/werewolf/managers/SkinManager.java index d198f16..1d3fa2f 100644 --- a/src/com/dogonfire/werewolf/SkinManager.java +++ b/src/com/dogonfire/werewolf/managers/SkinManager.java @@ -1,19 +1,21 @@ -package com.dogonfire.werewolf; +package com.dogonfire.werewolf.managers; import java.util.HashMap; import java.util.UUID; + +import com.dogonfire.werewolf.Werewolf; import org.bukkit.entity.Player; -import com.dogonfire.werewolf.api.IWerewolfDisguiseFactory.WerewolfDisguise; -import com.dogonfire.werewolf.api.WerewolfDisguiseAPI; +import com.dogonfire.werewolf.disguises.IWerewolfDisguiseFactory.WerewolfDisguise; +import com.dogonfire.werewolf.disguises.WerewolfDisguiseAPI; public class SkinManager { - private Werewolf plugin; + private Werewolf plugin; private HashMap skins = new HashMap(); protected int nextID = -2147483648; - SkinManager(Werewolf p) + public SkinManager(Werewolf p) { this.plugin = p; } @@ -57,7 +59,7 @@ public boolean setWerewolfSkin(Player player, String werewolfName) werewolfAccountName = Werewolf.getClanManager().getWerewolfAccountForClan(clantype); } - if (werewolfName.isEmpty() || werewolfName == null) + if (werewolfName.isEmpty()) { werewolfName = "Werewolf"; } diff --git a/src/com/dogonfire/werewolf/StatisticsManager.java b/src/com/dogonfire/werewolf/managers/StatisticsManager.java similarity index 95% rename from src/com/dogonfire/werewolf/StatisticsManager.java rename to src/com/dogonfire/werewolf/managers/StatisticsManager.java index 7d0acf5..5cc2616 100644 --- a/src/com/dogonfire/werewolf/StatisticsManager.java +++ b/src/com/dogonfire/werewolf/managers/StatisticsManager.java @@ -1,4 +1,4 @@ -package com.dogonfire.werewolf; +package com.dogonfire.werewolf.managers; import java.util.HashMap; import java.util.UUID; @@ -6,6 +6,8 @@ public class StatisticsManager { + private HashMap werewolfStatistics = new HashMap(); + public class WerewolfStatistics { public int numberOfMobKills; @@ -15,12 +17,9 @@ public class WerewolfStatistics WerewolfStatistics() {} } - - private HashMap werewolfStatistics = new HashMap(); - - StatisticsManager(Werewolf plugin) - { + public StatisticsManager() + { } public void clearStatistics(UUID playerId) diff --git a/src/com/dogonfire/werewolf/TrophyManager.java b/src/com/dogonfire/werewolf/managers/TrophyManager.java similarity index 82% rename from src/com/dogonfire/werewolf/TrophyManager.java rename to src/com/dogonfire/werewolf/managers/TrophyManager.java index 3387dd4..de23088 100644 --- a/src/com/dogonfire/werewolf/TrophyManager.java +++ b/src/com/dogonfire/werewolf/managers/TrophyManager.java @@ -1,4 +1,4 @@ -package com.dogonfire.werewolf; +package com.dogonfire.werewolf.managers; import java.io.File; import java.text.DateFormat; @@ -7,6 +7,8 @@ import java.util.Date; import java.util.List; import java.util.UUID; + +import com.dogonfire.werewolf.Werewolf; import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.Material; @@ -20,15 +22,15 @@ import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.SkullMeta; -import com.dogonfire.werewolf.ClanManager.ClanType; +import com.dogonfire.werewolf.managers.ClanManager.ClanType; public class TrophyManager implements Listener { - private Werewolf plugin = null; + private Werewolf plugin = null; private FileConfiguration skullsConfig = null; private File skullsConfigFile = null; - TrophyManager(Werewolf plugin) + public TrophyManager(Werewolf plugin) { this.plugin = plugin; } @@ -62,6 +64,10 @@ public void save() } } + // UUID's will render the skulls blank, so we use PlayerNames, for now. + // Otherwise we might have to use the cached textured from MySkin, or just request from MojangAPI, + // and cache them here...? + @SuppressWarnings("deprecation") public ItemStack getTrophyFromWerewolfPlayer(UUID killerId, UUID werewolfId) { ItemStack skullTrophy = new ItemStack(Material.PLAYER_HEAD); @@ -73,11 +79,27 @@ public ItemStack getTrophyFromWerewolfPlayer(UUID killerId, UUID werewolfId) DateFormat formatter = new SimpleDateFormat(pattern); ClanType clan = Werewolf.getWerewolfManager().getWerewolfClan(werewolfId); - - OfflinePlayer skullPlayer = plugin.getServer().getOfflinePlayer(Werewolf.getClanManager().getWerewolfAccountIdForClan(clan)); + OfflinePlayer skullPlayer = null; + + if (Werewolf.getClanManager().isAlpha(werewolfId)) + { + skullPlayer = plugin.getServer().getOfflinePlayer(Werewolf.getClanManager().getWerewolfAccountForAlpha(clan)); + } + else + { + skullPlayer = plugin.getServer().getOfflinePlayer(Werewolf.getClanManager().getWerewolfAccountForClan(clan)); + } skullMeta.setOwningPlayer(skullPlayer); - skullMeta.setDisplayName(ChatColor.GOLD + "Werewolf Head"); + skullTrophy.setItemMeta(skullMeta); + + String werewolfName = "Werewolf"; + if (plugin.werewolfNamesEnabled) + { + werewolfName = Werewolf.getWerewolfManager().getWerewolfName(werewolfId) + "'s"; + } + + skullMeta.setDisplayName(ChatColor.GOLD + werewolfName + " Head"); String killerName = plugin.getServer().getPlayer(killerId).getName(); diff --git a/src/com/dogonfire/werewolf/WerewolfManager.java b/src/com/dogonfire/werewolf/managers/WerewolfManager.java similarity index 97% rename from src/com/dogonfire/werewolf/WerewolfManager.java rename to src/com/dogonfire/werewolf/managers/WerewolfManager.java index 22dbdc9..14fa548 100644 --- a/src/com/dogonfire/werewolf/WerewolfManager.java +++ b/src/com/dogonfire/werewolf/managers/WerewolfManager.java @@ -1,4 +1,4 @@ -package com.dogonfire.werewolf; +package com.dogonfire.werewolf.managers; import java.io.File; import java.text.DateFormat; @@ -15,6 +15,8 @@ import java.util.Set; import java.util.UUID; +import com.dogonfire.werewolf.Werewolf; +import com.dogonfire.werewolf.WerewolfAPI; import org.bukkit.ChatColor; import org.bukkit.Sound; import org.bukkit.World; @@ -24,7 +26,7 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; -import com.dogonfire.werewolf.ClanManager.ClanType; +import com.dogonfire.werewolf.managers.ClanManager.ClanType; import com.dogonfire.werewolf.tasks.CheckTransformationTask; /* import org.bukkit.block.Biome; @@ -53,7 +55,7 @@ static enum WolfState { private HashMap packWolves = new HashMap(); private HashMap lastWorldUpdates = new HashMap(); - WerewolfManager(Werewolf plugin) + public WerewolfManager(Werewolf plugin) { this.plugin = plugin; @@ -189,12 +191,9 @@ public Collection getOnlineWerewolvesInWolfForm() { for (UUID playerId : getOnlineWerewolves(world)) { - if (this.isWerewolf(playerId)) + if (this.isWerewolf(playerId) && this.isWolfForm(playerId)) { - if (this.isWolfForm(playerId)) - { - werewolfPlayers.add(playerId); - } + werewolfPlayers.add(playerId); } } } @@ -270,7 +269,7 @@ public Set getWerewolvesInClan(ClanManager.ClanType clanType) ClanType playerClanType = this.getWerewolfClan(playerId); - if (playerClanType == clanType) + if (playerClanType.equals(clanType)) { werewolfList.add(playerId); } @@ -426,13 +425,8 @@ public boolean isWerewolf(UUID playerId) } String wolfState = this.werewolvesConfig.getString(playerId.toString() + ".WolfState"); - - if (wolfState == null) - { - return false; - } - - return true; + + return wolfState != null; } public boolean isFullWerewolf(UUID playerId) @@ -837,7 +831,7 @@ private String newWerewolfName() String fullName = givenName + surname; - if (fullName == "") + if (fullName.isEmpty()) { fullName = "Werewolf"; } @@ -1073,15 +1067,13 @@ public void update() if (isWerewolf(player)) { - /* - * TODO: re-add Vampire integration.. - * - * if (this.plugin.isVampire(player)) { - * this.plugin.log(player.getName() + - * " is a Vampire! Removing his Werewolf infection..."); - * Werewolf.getWerewolfManager().unmakeWerewolf(player.getUniqueId() - * ); return; } - */ + if (WerewolfAPI.isVampire(player)) + { + this.plugin.log(player.getName() + " is a Vampire! Removing his Werewolf infection..."); + Werewolf.getWerewolfManager().unmakeWerewolf(player.getUniqueId()); + return; + } + if (Werewolf.getWerewolfManager().canTransform(player)) { this.plugin.transform(player); diff --git a/src/com/dogonfire/werewolf/WerewolfScoreboardManager.java b/src/com/dogonfire/werewolf/managers/WerewolfScoreboardManager.java similarity index 54% rename from src/com/dogonfire/werewolf/WerewolfScoreboardManager.java rename to src/com/dogonfire/werewolf/managers/WerewolfScoreboardManager.java index b23fb07..bda07bc 100644 --- a/src/com/dogonfire/werewolf/WerewolfScoreboardManager.java +++ b/src/com/dogonfire/werewolf/managers/WerewolfScoreboardManager.java @@ -1,8 +1,9 @@ -package com.dogonfire.werewolf; +package com.dogonfire.werewolf.managers; import java.util.HashMap; import java.util.UUID; +import com.dogonfire.werewolf.Werewolf; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; @@ -11,17 +12,20 @@ import org.bukkit.scoreboard.Score; import org.bukkit.scoreboard.Scoreboard; import org.bukkit.scoreboard.ScoreboardManager; +import org.bukkit.scoreboard.Team; public class WerewolfScoreboardManager { private ScoreboardManager manager; private HashMap playerHuntingObjectives = new HashMap(); - WerewolfScoreboardManager(Werewolf plugin) + public WerewolfScoreboardManager() { manager = Bukkit.getScoreboardManager(); } + // Hunting Scoreboard \\ + public void newPlayerHuntingScoreboard(Player player) { Scoreboard board = manager.getNewScoreboard(); @@ -29,7 +33,7 @@ public void newPlayerHuntingScoreboard(Player player) //Team team = board.registerNewTeam("teamname"); // Setting the scoreboard/objective and it's display name - Objective objective = board.registerNewObjective("test", "dummy", ChatColor.DARK_AQUA + "Hunting Status"); + Objective objective = board.registerNewObjective("WerewolfHunting", "dummy", ChatColor.DARK_AQUA + "Hunting Status"); // Setting where to display the scoreboard/objective (either SIDEBAR, PLAYER_LIST or BELOW_NAME) objective.setDisplaySlot(DisplaySlot.SIDEBAR); @@ -43,14 +47,11 @@ public void newPlayerHuntingScoreboard(Player player) setMobKillsForPlayer(player, 0); setHumanKillsForPlayer(player, 0); - - /* TODO: re-add Vampire integration.. - - if(plugin.vampireEnabled) + + if(Werewolf.instance().vampireEnabled) { setVampireKillsForPlayer(player, 0); } - */ } @@ -76,4 +77,47 @@ public void setVampireKillsForPlayer(Player player, int kills) Score score = playerHuntingObjectives.get(player.getUniqueId()).getScore(ChatColor.RED + "Vampires slain:"); //Get a fake offline player score.setScore(kills); } + + + // Scoreboard Teams \\ + public void showNametagForPlayer(Player player, Boolean showNametag) + { + Werewolf.instance().logDebug("running showNametagForPlayer(" + player.getName() + ", " + showNametag + ")"); + Scoreboard board = manager.getMainScoreboard(); + + if (board != null) + { + Werewolf.instance().logDebug("Board is not null for player!"); + if (Werewolf.getWerewolfManager().isWerewolf(player)) + { + Werewolf.instance().logDebug("Player is a Werewolf!"); + Team werewolfTeam = null; + + // Make sure the team exists + if (board.getTeam("Werewolf") != null) + { + werewolfTeam = board.getTeam("Werewolf"); + } + else if (board.getTeam("Werewolf") == null) + { + werewolfTeam = board.registerNewTeam("Werewolf"); + werewolfTeam.setOption(Team.Option.NAME_TAG_VISIBILITY, Team.OptionStatus.NEVER); + } + + // Apply the edits necessary for the player + if (!showNametag) + { + werewolfTeam.addEntry(player.getName()); + Werewolf.instance().logDebug("The player, " + player.getName() + ", is now added to the Werewolf Team (!NO NAMETAG!)"); + } + else if (showNametag && werewolfTeam.getEntries().contains(player.getName())) + { + werewolfTeam.removeEntry(player.getName()); + Werewolf.instance().logDebug("The player, " + player.getName() + ", is now removed from the Werewolf Team (!NAMETAG SHOWN!)"); + } + return; + } + } + Werewolf.instance().logDebug("Could not find the main scoreboard!"); + } } diff --git a/src/com/dogonfire/werewolf/CompassTracker.java b/src/com/dogonfire/werewolf/tasks/CompassTrackerTask.java similarity index 88% rename from src/com/dogonfire/werewolf/CompassTracker.java rename to src/com/dogonfire/werewolf/tasks/CompassTrackerTask.java index 4a028b4..39cb4b1 100644 --- a/src/com/dogonfire/werewolf/CompassTracker.java +++ b/src/com/dogonfire/werewolf/tasks/CompassTrackerTask.java @@ -1,16 +1,17 @@ -package com.dogonfire.werewolf; +package com.dogonfire.werewolf.tasks; import java.util.ArrayList; import java.util.UUID; +import com.dogonfire.werewolf.Werewolf; import org.bukkit.Server; import org.bukkit.entity.Player; -public class CompassTracker implements Runnable +public class CompassTrackerTask implements Runnable { private static ArrayList watchList = new ArrayList(); private static int taskId = -2; - private static Werewolf plugin; + private static Werewolf plugin; private static long updateRate = 100L; public static void setPlugin(Werewolf newPlugin) @@ -30,7 +31,7 @@ public static boolean start() { if (!isRunning()) { - taskId = plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, new CompassTracker(), 40L, updateRate); + taskId = plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, new CompassTrackerTask(), 40L, updateRate); if (isRunning()) { return true; diff --git a/src/com/dogonfire/werewolf/tasks/DisguiseTask.java b/src/com/dogonfire/werewolf/tasks/DisguiseTask.java index 0d257dd..cc2eece 100644 --- a/src/com/dogonfire/werewolf/tasks/DisguiseTask.java +++ b/src/com/dogonfire/werewolf/tasks/DisguiseTask.java @@ -1,7 +1,7 @@ package com.dogonfire.werewolf.tasks; -import com.dogonfire.werewolf.ClanManager; -import com.dogonfire.werewolf.LanguageManager; +import com.dogonfire.werewolf.managers.ClanManager; +import com.dogonfire.werewolf.managers.LanguageManager; import com.dogonfire.werewolf.Werewolf; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -256,15 +256,15 @@ public void run() Werewolf.getWerewolfManager().pushPlayerData(this.player); Werewolf.getStatisticsManager().clearStatistics(this.player.getUniqueId()); - // Before trying to disguise, check if Disguises are enabled... - if (plugin.disguisesEnabled) + if (plugin.useScoreboards) { - Werewolf.getSkinManager().setWerewolfSkin(this.player, this.player.getPlayerListName()); + Werewolf.getWerewolfScoreboardManager().newPlayerHuntingScoreboard(this.player); } - if (plugin.useScoreboards) + // Before trying to disguise, check if Disguises are enabled... + if (plugin.disguisesEnabled) { - Werewolf.getWerewolfScoreboardManager().newPlayerHuntingScoreboard(this.player); + Werewolf.getSkinManager().setWerewolfSkin(this.player, this.player.getPlayerListName()); } if (this.plugin.isFullMoonInWorld(this.player.getWorld()) && !Werewolf.getWerewolfManager().hasRecentTransform(this.player.getUniqueId())) diff --git a/src/com/dogonfire/werewolf/tasks/InfoTask.java b/src/com/dogonfire/werewolf/tasks/InfoTask.java index 4c0312b..e811308 100644 --- a/src/com/dogonfire/werewolf/tasks/InfoTask.java +++ b/src/com/dogonfire/werewolf/tasks/InfoTask.java @@ -5,7 +5,7 @@ import org.bukkit.ChatColor; import org.bukkit.entity.Player; -import com.dogonfire.werewolf.LanguageManager; +import com.dogonfire.werewolf.managers.LanguageManager; import com.dogonfire.werewolf.Werewolf; public class InfoTask implements Runnable diff --git a/src/com/dogonfire/werewolf/tasks/UndisguiseTask.java b/src/com/dogonfire/werewolf/tasks/UndisguiseTask.java index fcf2231..ac65b30 100644 --- a/src/com/dogonfire/werewolf/tasks/UndisguiseTask.java +++ b/src/com/dogonfire/werewolf/tasks/UndisguiseTask.java @@ -63,12 +63,11 @@ public void run() player.setPlayerListName(playerListName); }*/ player.setPlayerListName(player.getDisplayName()); - if (this.makeVisible) + + // Before trying to undisguise, check if Disguises are enabled... + if (this.makeVisible && plugin.disguisesEnabled) { - // Before trying to undisguise, check if Disguises are enabled... - if (plugin.disguisesEnabled) { - Werewolf.getSkinManager().unsetWerewolfSkin(player); - } + Werewolf.getSkinManager().unsetWerewolfSkin(player); } if (this.plugin.healthBarEnabled) { @@ -84,7 +83,7 @@ public void run() Werewolf.getWerewolfManager().popPlayerData(this.playerId); - if (this.plugin.useWerewolfGroupName) + if (this.plugin.useWerewolfGroupName && player != null) { String groupName = Werewolf.getWerewolfManager().getOriginalPermissionGroup(playerId); if ((groupName != null) && (!groupName.equals(this.plugin.werewolfGroupName))) @@ -101,7 +100,7 @@ public void run() { Werewolf.getWerewolfManager().setNotWerewolf(this.playerId); } - else + else if (player != null) { Werewolf.getWerewolfManager().setHumanForm(this.playerId, player.getName()); } diff --git a/src/com/dogonfire/werewolf/FieldSetter.java b/src/com/dogonfire/werewolf/utils/FieldSetter.java similarity index 97% rename from src/com/dogonfire/werewolf/FieldSetter.java rename to src/com/dogonfire/werewolf/utils/FieldSetter.java index 13ed45f..5313424 100644 --- a/src/com/dogonfire/werewolf/FieldSetter.java +++ b/src/com/dogonfire/werewolf/utils/FieldSetter.java @@ -1,4 +1,4 @@ -package com.dogonfire.werewolf; +package com.dogonfire.werewolf.utils; import java.lang.reflect.Field; diff --git a/src/com/dogonfire/werewolf/Metrics.java b/src/com/dogonfire/werewolf/utils/Metrics.java similarity index 99% rename from src/com/dogonfire/werewolf/Metrics.java rename to src/com/dogonfire/werewolf/utils/Metrics.java index a3143ef..aa6a51d 100644 --- a/src/com/dogonfire/werewolf/Metrics.java +++ b/src/com/dogonfire/werewolf/utils/Metrics.java @@ -1,4 +1,4 @@ -package com.dogonfire.werewolf; +package com.dogonfire.werewolf.utils; import org.bukkit.Bukkit; import org.bukkit.Server; @@ -425,7 +425,7 @@ private void postPlugin(final boolean isPing) throws IOException int coreCount = Runtime.getRuntime().availableProcessors(); // normalize os arch .. amd64 -> x86_64 - if (osarch.equals("amd64")) + if ("amd64".equals(osarch)) { osarch = "x86_64"; } @@ -555,7 +555,7 @@ else if (response.startsWith("7")) else { // Is this the first update this hour? - if (response.equals("1") || response.contains("This is your first update this hour")) + if ("1".equals(response) || response.contains("This is your first update this hour")) { synchronized (graphs) { @@ -643,7 +643,7 @@ private static void appendJSONPair(StringBuilder json, String key, String value) try { - if (value.equals("0") || !value.endsWith("0")) + if ("0".equals(value) || !value.endsWith("0")) { Double.parseDouble(value); isValueNumeric = true; diff --git a/src/com/dogonfire/werewolf/PacketUtils.java b/src/com/dogonfire/werewolf/utils/PacketUtils.java similarity index 91% rename from src/com/dogonfire/werewolf/PacketUtils.java rename to src/com/dogonfire/werewolf/utils/PacketUtils.java index 01a8f7f..16ec20f 100644 --- a/src/com/dogonfire/werewolf/PacketUtils.java +++ b/src/com/dogonfire/werewolf/utils/PacketUtils.java @@ -1,4 +1,4 @@ -package com.dogonfire.werewolf; +package com.dogonfire.werewolf.utils; import org.bukkit.entity.Player; import org.bukkit.potion.PotionEffect; @@ -8,7 +8,7 @@ public class PacketUtils { - PacketUtils(Werewolf p) + public PacketUtils() { } diff --git a/src/com/dogonfire/werewolf/WerewolfPlaceholderExpansion.java b/src/com/dogonfire/werewolf/utils/WerewolfPlaceholderExpansion.java similarity index 85% rename from src/com/dogonfire/werewolf/WerewolfPlaceholderExpansion.java rename to src/com/dogonfire/werewolf/utils/WerewolfPlaceholderExpansion.java index 76adb22..15b8491 100644 --- a/src/com/dogonfire/werewolf/WerewolfPlaceholderExpansion.java +++ b/src/com/dogonfire/werewolf/utils/WerewolfPlaceholderExpansion.java @@ -1,4 +1,4 @@ -package com.dogonfire.werewolf; +package com.dogonfire.werewolf.utils; import java.util.UUID; import org.bukkit.entity.Player; @@ -7,11 +7,11 @@ /* From https://github.com/PlaceholderAPI/PlaceholderAPI/wiki/PlaceholderExpansion#internal-class */ -class WerewolfPlaceholderExpansion extends PlaceholderExpansion +public class WerewolfPlaceholderExpansion extends PlaceholderExpansion { private Werewolf plugin; - WerewolfPlaceholderExpansion(Werewolf plugin) + public WerewolfPlaceholderExpansion(Werewolf plugin) { this.plugin = plugin; } @@ -56,7 +56,7 @@ public String onPlaceholderRequest(Player player, String identifier) } // %werewolf_clan% - if (identifier.equals("clan")) + if ("clan".equals(identifier)) { UUID playerUUID = player.getUniqueId(); String clan = ""; @@ -68,7 +68,7 @@ public String onPlaceholderRequest(Player player, String identifier) } // %werewolf_werewolf% - if (identifier.equals("werewolf")) + if ("werewolf".equals(identifier)) { String isWerewolf = ""; if (Werewolf.getWerewolfManager().isWerewolf(player)) 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