From 7a4107d7903f2d080ef38db836d61a6e2f8a6fcd Mon Sep 17 00:00:00 2001 From: iiegit Date: Sun, 11 Sep 2016 23:58:32 -0400 Subject: [PATCH 01/13] Initial commit --- .gitignore | 12 + LICENSE | 674 +++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 2 + 3 files changed, 688 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 README.md diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..32858aa --- /dev/null +++ b/.gitignore @@ -0,0 +1,12 @@ +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..9cecc1d --- /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. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + 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: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md new file mode 100644 index 0000000..fc92d39 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# unconflicted-Hardcore +committing my local code as-is to a new repository From f1034a986f6f230be295bf1b38c0a8224fa442e5 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Mon, 12 Sep 2016 00:05:07 -0400 Subject: [PATCH 02/13] Cloning things in --- .DS_Store | Bin 0 -> 6148 bytes README.md | 2 +- bin/.DS_Store | Bin 0 -> 6148 bytes config.yml | 0 plugin.yml | 10 + src/.DS_Store | Bin 0 -> 6148 bytes src/alisolarflare/RandomTP.java | 183 ++++++++++++++++++ src/alisolarflare/listeners/CompassLobby.java | 26 +++ .../ConflictCompassCraftingListener.java | 74 +++++++ .../listeners/DiamondArmorBlocker.java | 51 +++++ src/iie/DeathListener.java | 43 ++++ src/iie/HelloWorld.java | 75 +++++++ src/iie/HelloWorldPlugin.java | 43 ++++ src/iie/JoinListener.java | 52 +++++ 14 files changed, 558 insertions(+), 1 deletion(-) create mode 100644 .DS_Store create mode 100644 bin/.DS_Store create mode 100644 config.yml create mode 100644 plugin.yml create mode 100644 src/.DS_Store create mode 100644 src/alisolarflare/RandomTP.java create mode 100644 src/alisolarflare/listeners/CompassLobby.java create mode 100644 src/alisolarflare/listeners/ConflictCompassCraftingListener.java create mode 100644 src/alisolarflare/listeners/DiamondArmorBlocker.java create mode 100644 src/iie/DeathListener.java create mode 100644 src/iie/HelloWorld.java create mode 100644 src/iie/HelloWorldPlugin.java create mode 100644 src/iie/JoinListener.java diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..62bc7eb2a52d0a16e12cfb72c70fcece6246dfc7 GIT binary patch literal 6148 zcmeHKu}%Xq47Irql~_75W@hWe8db*^^am>LBtYW0iqbuQ#fLEP1cezu`Kk*)|K zTS}f2$M)q(m&8QGt9`#DS`g7(8jzt>1k+X1nJQl|5mP#Jv z3JC^+fnXpQ2nJ3uAa^!oer_0jFc1s`1K$kbd`QxO*|8Yv(IK6d0D?1_RuLVw1bmWX zb}WWs5n*!`G*|W#gUwy$ldsE;#n9Y|z4&0y{8hZLW|#O$mlJ2h=!1b^V9G#a!v*gD zYx!lWMgG(!M!`TZ@Xr|FS-WmmvMIk?e{2tTZIZT;2En=lMMU(;BR~c?M=sQ8_5@wl XWyfNOD417w!FUKLA<+c`zresJ@X9>o literal 0 HcmV?d00001 diff --git a/README.md b/README.md index fc92d39..07a08c2 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # unconflicted-Hardcore -committing my local code as-is to a new repository +committing my local code as-is to a new repository \ No newline at end of file diff --git a/bin/.DS_Store b/bin/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..4e5679eae8c9aef33e490e016ef93edb83223ffa GIT binary patch literal 6148 zcmeHKJ5Iwu5S<|@BGE)tlzWBTU=^7Y|xUr|X-hJ-qHj-rny&{J7+FeS2YN|1>_WI*EY_Pys4H1*iZOu%2zUxDI5b0#tws zd@EqzhXOaOi9?`&IuLvW0NQW78}5CU02WICYvK@y3`~Ox465dcp+QH!WL-@h0)sA^ z!-wXRH76AHr{nzM<)Sr^kqS_Oa|LFxTw4FXgI}2c&q-WS0V?pX6wrCIY1Vk9?5&fR wvtC=^Tlklu*2@vR6$8B$V_~iMc2rmF9{V+M2y{B~P6zTwz;vNefxl4T6EnsoY5)KL literal 0 HcmV?d00001 diff --git a/config.yml b/config.yml new file mode 100644 index 0000000..e69de29 diff --git a/plugin.yml b/plugin.yml new file mode 100644 index 0000000..d8927be --- /dev/null +++ b/plugin.yml @@ -0,0 +1,10 @@ + main: iie.HelloWorldPlugin + version: 1.0.0 + name: HelloWorldPlugin + commands: + hardcore: + description: Command that teleports you to hardcore world + HelloWorld: + description: Command that says Hello World! + debugRTP: + description: Command that randomly teleports someone inside the hardcore world \ No newline at end of file diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..4e5679eae8c9aef33e490e016ef93edb83223ffa GIT binary patch literal 6148 zcmeHKJ5Iwu5S<|@BGE)tlzWBTU=^7Y|xUr|X-hJ-qHj-rny&{J7+FeS2YN|1>_WI*EY_Pys4H1*iZOu%2zUxDI5b0#tws zd@EqzhXOaOi9?`&IuLvW0NQW78}5CU02WICYvK@y3`~Ox465dcp+QH!WL-@h0)sA^ z!-wXRH76AHr{nzM<)Sr^kqS_Oa|LFxTw4FXgI}2c&q-WS0V?pX6wrCIY1Vk9?5&fR wvtC=^Tlklu*2@vR6$8B$V_~iMc2rmF9{V+M2y{B~P6zTwz;vNefxl4T6EnsoY5)KL literal 0 HcmV?d00001 diff --git a/src/alisolarflare/RandomTP.java b/src/alisolarflare/RandomTP.java new file mode 100644 index 0000000..d92800c --- /dev/null +++ b/src/alisolarflare/RandomTP.java @@ -0,0 +1,183 @@ +package alisolarflare; + +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.World; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +import iie.HelloWorldPlugin; + +public class RandomTP implements CommandExecutor{ + + private int conflictX; + private int conflictZ; + private int conflictRadius = 70; + private boolean northUsed; + private boolean southUsed; + private boolean eastUsed; + private boolean westUsed; + @SuppressWarnings("unused") + private HelloWorldPlugin helloWorldPlugin; + public RandomTP(HelloWorldPlugin helloWorldPlugin) { + this.helloWorldPlugin = helloWorldPlugin; + } + + //every 4 players who use it will be teleported near each other. + //ex. iie > 1200, ali -> 1210, byz -> 1190, charles -> 1195, wind -> 300, zan -> 310, etc + public void conflictRtp(Player player, World world, Location minLocation, Location maxLocation){ + //INIT - xDifference, xAverage + int xdifference = minLocation.getBlockX() - maxLocation.getBlockX(); + int xAverage = (int) Math.floor(minLocation.getBlockX() + maxLocation.getBlockX() / 2); + + //INIT - zDifference, zAverage + int zdifference = minLocation.getBlockX() - maxLocation.getBlockY(); + int zAverage = (int) Math.floor(minLocation.getBlockZ() + maxLocation.getBlockZ()); + + //CHECK - Reset Cycle + if ((northUsed || southUsed || eastUsed || westUsed) == false){ + + //Tries 20 times to find a location + for(int i = 0; i < 20; i ++){ + + //INIT - attemptedX, attemptedZ + int attemptedX = (int) Math.floor((Math.random()-0.5)*xdifference) + xAverage; + int attemptedZ = (int) Math.floor((Math.random()-0.5)*zdifference) + zAverage; + + int cr = conflictRadius; + + + //CHECKS - if ground is safe + boolean groundIsSafe = world.getHighestBlockAt(attemptedX, attemptedZ).getType() != Material.WATER; + boolean northIsSafe = world.getHighestBlockAt(attemptedX, attemptedZ-cr).getType() != Material.WATER; + boolean eastIsSafe = world.getHighestBlockAt(attemptedX+cr, attemptedZ).getType() != Material.WATER; + boolean southIsSafe = world.getHighestBlockAt(attemptedX, attemptedZ+cr).getType() != Material.WATER; + boolean westIsSafe = world.getHighestBlockAt(attemptedX-cr, attemptedZ).getType() != Material.WATER; + + //TRANSFER - data to class + if (groundIsSafe && (northIsSafe || southIsSafe || eastIsSafe || westIsSafe)){ + + northUsed = northIsSafe; + eastUsed = eastIsSafe; + westUsed = westIsSafe; + southUsed = southIsSafe; + conflictX = attemptedX; + conflictZ = attemptedZ; + + player.teleport(world.getHighestBlockAt(attemptedX, attemptedZ).getLocation()); + break; + } + } + } + + String dir = "north"; + //CHOOSES A RANDOM DIRECTION + for(int i = 0; i < 1000; i++){ + double randomDirection = Math.random(); + if (randomDirection < 0.25){ + if(northUsed){ + northUsed = true; + dir = "north"; + break; + } + }else if(randomDirection < 0.50){ + if(eastUsed){ + eastUsed = true; + dir = "east"; + break; + } + }else if(randomDirection < 0.75){ + if(southUsed){ + southUsed = true; + dir = "south"; + break; + } + }else{ + if(westUsed){ + westUsed = true; + dir = "west"; + break; + } + + } + } + + + //TELEPORT - teleports player to the conflict point + switch(dir){ + case "north": + northUsed = false; + player.teleport(world.getHighestBlockAt(conflictX, conflictZ - conflictRadius).getLocation()); + break; + case "east": + eastUsed = false; + player.teleport(world.getHighestBlockAt(conflictX + conflictRadius, conflictZ).getLocation()); + break; + case "south": + southUsed = false; + player.teleport(world.getHighestBlockAt(conflictX, conflictZ + conflictRadius).getLocation()); + break; + case "west": + westUsed = false; + player.teleport(world.getHighestBlockAt(conflictX - conflictRadius, conflictZ).getLocation()); + break; + default: + player.teleport(world.getHighestBlockAt(conflictX, conflictZ).getLocation()); + break; + } + } + + //Randomly teleports a player, into the hardcore world + public void rtp(Player player, World world, Location minLocation, Location maxLocation){ + player.sendMessage("TELEPORT INITIATED"); + player.sendMessage("minLocation: " + minLocation.toString()); + player.sendMessage("maxLocation: " + maxLocation.toString()); + player.sendMessage("world : " + world.toString()); + player.sendMessage("player : " + player.toString()); + + //INIT - xDifference, xAverage + int xdifference = minLocation.getBlockX() - maxLocation.getBlockX(); + int xAverage = (int) Math.floor(minLocation.getBlockX() + maxLocation.getBlockX() / 2); + + //INIT - zDifference, zAverage + int zdifference = minLocation.getBlockX() - maxLocation.getBlockY(); + int zAverage = (int) Math.floor(minLocation.getBlockZ() + maxLocation.getBlockZ()); + player.sendMessage("Averages : " + xAverage + "|" + zAverage); + //TELEPORTS - Tries 20 times to find a location + for(int i = 0; i < 20; i ++){ + + //INIT - attemptedX, attemptedZ + int attemptedX = (int) Math.floor((Math.random()-0.5)*xdifference) + xAverage; + int attemptedZ = (int) Math.floor((Math.random()-0.5)*zdifference) + zAverage; + player.sendMessage("TAKE " + i + " : " + attemptedX + ", "+ attemptedZ); + //CHECKS - if ground is safe + boolean groundisSafe = world.getHighestBlockAt(attemptedX, attemptedZ).getType() != Material.WATER; + if (groundisSafe){ + player.sendMessage("SAFE GROUND, TELEPORTING"); + player.teleport(world.getHighestBlockAt(attemptedX, attemptedZ).getLocation()); + return; + } + + //player.teleport(arg0) + } + } + + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { + if(!(sender instanceof Player)){ + sender.sendMessage("You must be a Player to use this command!"); + sender.sendMessage(sender.toString()); + return false; + } + Player player = (Player) sender; + if(player.getWorld().getName() != "hardcore"){ + sender.sendMessage("You must be in the hardcore world to use this command!"); + sender.sendMessage("Current World: " + player.getWorld().getName()); + return false; + } + rtp(player, player.getWorld(), new Location(player.getWorld(), 644, 65, -944), new Location(player.getWorld(), 1700, 65, 464)); + return false; + } +} diff --git a/src/alisolarflare/listeners/CompassLobby.java b/src/alisolarflare/listeners/CompassLobby.java new file mode 100644 index 0000000..a07f676 --- /dev/null +++ b/src/alisolarflare/listeners/CompassLobby.java @@ -0,0 +1,26 @@ +package alisolarflare.listeners; + +import org.bukkit.Bukkit; +import org.bukkit.Material; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerJoinEvent; +import org.bukkit.inventory.Inventory; +import org.bukkit.inventory.ItemStack; + + +public class CompassLobby implements Listener{ + @EventHandler + public void onPlayerJoin(PlayerJoinEvent event){ + openGUI(event.getPlayer()); + } + public void openGUI(Player p){ + //format: null, size of inventory (must be divisible by 9), "GUI name" + Inventory inv = Bukkit.createInventory(null, 9, "GUI Name"); + inv.setItem(0, new ItemStack(Material.GRASS)); + inv.setItem(1, new ItemStack(Material.IRON_SWORD)); + inv.setItem(8, new ItemStack(Material.BARRIER)); + p.openInventory(inv); + } +} diff --git a/src/alisolarflare/listeners/ConflictCompassCraftingListener.java b/src/alisolarflare/listeners/ConflictCompassCraftingListener.java new file mode 100644 index 0000000..ab26daf --- /dev/null +++ b/src/alisolarflare/listeners/ConflictCompassCraftingListener.java @@ -0,0 +1,74 @@ +package alisolarflare.listeners; + +import java.util.ArrayList; +import java.util.List; + +import org.bukkit.Material; +import org.bukkit.Sound; +import org.bukkit.enchantments.Enchantment; +import org.bukkit.entity.HumanEntity; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.inventory.CraftItemEvent; +import org.bukkit.inventory.ItemStack; + +public class ConflictCompassCraftingListener implements Listener{ + public static void main(String[] args){ + String nulltest = null; + if(nulltest == null){ + System.out.println("NUUUUULL"); + } + } + + @EventHandler + public boolean onConflictCompassCraft(CraftItemEvent event){ + //SANITATION - HARDCORE + if(event.getWhoClicked().getWorld().getName() != "hardcore") + return false; + + + //INIT - targetItem + ItemStack targetItem = event.getRecipe().getResult(); + + //SANITATION - NOT COMPASS + if(targetItem.getType() != Material.COMPASS) + return false; + + + event.setCancelled(true); + //GIVE - chainmail chestplate + event.getWhoClicked().getInventory().addItem(generateConflictCompass(event.getWhoClicked())); + //PLAY - cave sound + event.getWhoClicked().getWorld().playSound(event.getWhoClicked().getLocation(), Sound.AMBIENT_CAVE,0,0); + return false; + } + + private ItemStack generateConflictCompass(HumanEntity crafter) { + ItemStack conflictCompass = new ItemStack(Material.COMPASS); + conflictCompass.addUnsafeEnchantment(Enchantment.DURABILITY, 1); + List loreString = new ArrayList(); + loreString.add("The needle is tipped with the scent of"); + + loreString.add(nearestPlayerName(crafter)); + conflictCompass.getItemMeta().setLore(loreString); + return null; + } + + private String nearestPlayerName(HumanEntity crafter) { + Player nearestPlayer = null; + for(Player player: crafter.getWorld().getPlayers()){ + if (player.getUniqueId() == crafter.getUniqueId()){ + //SKIP CODE + }if (nearestPlayer == null){ + nearestPlayer = player; + }else if (nearestPlayer.getLocation().distance(crafter.getLocation()) > player.getLocation().distance(crafter.getLocation())){ + nearestPlayer = player; + } + } + if(nearestPlayer == null) + return "METAL"; + + return nearestPlayer.toString(); + } +} diff --git a/src/alisolarflare/listeners/DiamondArmorBlocker.java b/src/alisolarflare/listeners/DiamondArmorBlocker.java new file mode 100644 index 0000000..277dd36 --- /dev/null +++ b/src/alisolarflare/listeners/DiamondArmorBlocker.java @@ -0,0 +1,51 @@ +package alisolarflare.listeners; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.bukkit.Material; +import org.bukkit.Sound; +import org.bukkit.enchantments.Enchantment; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.inventory.CraftItemEvent; +import org.bukkit.inventory.ItemStack; + +public class DiamondArmorBlocker implements Listener{ + public static List blockedItems = Arrays.asList(Material.DIAMOND_BOOTS, Material.DIAMOND_CHESTPLATE, Material.DIAMOND_LEGGINGS, Material.DIAMOND_HELMET); + @EventHandler + public boolean onArmorSmith(CraftItemEvent event){ + //SANITATION - hardcore + if(event.getWhoClicked().getWorld().getName() != "hardcore"){ + return false; + } + + //INIT - inventory, targetItem + ItemStack targetItem = event.getRecipe().getResult(); + + //REPLACE - Diamond Chestplate > Chainmail Chestplate + if (blockedItems.contains(targetItem.getType())){ + event.setCancelled(true); + //GIVE - chainmail chestplate + event.getWhoClicked().getInventory().addItem(failArmor(targetItem.getType())); + //PLAY - cave sound + event.getWhoClicked().getWorld().playSound(event.getWhoClicked().getLocation(), Sound.AMBIENT_CAVE,0,0); + event.getWhoClicked().getWorld().playSound(event.getWhoClicked().getLocation(), Sound.ENTITY_ITEM_BREAK,0,0); + } + return false; + + + } + public ItemStack failArmor(Material material){ + ItemStack failArmor = new ItemStack(material); + failArmor.addEnchantment(Enchantment.THORNS, 1); + + //INIT - Chainmail's lore + List loreString = new ArrayList(); + loreString.add("This world is forever dangerous."); + loreString.add("There is no protection here."); + failArmor.getItemMeta().setLore(loreString); + return failArmor; + } +} diff --git a/src/iie/DeathListener.java b/src/iie/DeathListener.java new file mode 100644 index 0000000..ea67603 --- /dev/null +++ b/src/iie/DeathListener.java @@ -0,0 +1,43 @@ +package iie; + +import java.util.Objects; + +import org.bukkit.Location; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.entity.PlayerDeathEvent; + +public class DeathListener implements Listener { + + HelloWorldPlugin plugin; + public DeathListener(HelloWorldPlugin plugin){ + this.plugin = plugin; + } + + @EventHandler(priority = EventPriority.MONITOR) + public void onHardcoreDeath(PlayerDeathEvent deathEvent){ + + int currentTime = (int) ((System.currentTimeMillis())/1000); //divided by 1000 to fit within Integer range + Player player = deathEvent.getEntity(); + String playername = (String) player.getName(); + Location location = player.getLocation(); + String worldString = (String) location.getWorld().getName(); + + //player.sendMessage("you died"); + //player.sendMessage("currentTime = " + String.valueOf(currentTime)); + //player.sendMessage("worldString = " + String.valueOf(worldString)); + + if (Objects.equals(worldString, "hardcore")){ + + HelloWorldPlugin.hardcoreTimeDead.getScore(playername).setScore(currentTime); + HelloWorldPlugin.hardcoreInvite.getScore(playername).setScore(0); + + //player.sendMessage("death detected"); + //player.sendMessage("hardcoreTimeDead score = " + String.valueOf(HelloWorldPlugin.hardcoreTimeDead.getScore(playername).getScore())); + //player.sendMessage("currentTime = " + String.valueOf(currentTime)); + + } + } +} diff --git a/src/iie/HelloWorld.java b/src/iie/HelloWorld.java new file mode 100644 index 0000000..9e331cb --- /dev/null +++ b/src/iie/HelloWorld.java @@ -0,0 +1,75 @@ +package iie; + +import java.util.Objects; + +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.Sound; +import org.bukkit.World; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + + +public class HelloWorld implements CommandExecutor { + + HelloWorldPlugin plugin; + public HelloWorld(HelloWorldPlugin plugin){ + this.plugin = plugin; + } + + @Override + public boolean onCommand(CommandSender sender, Command label, String command, String[] args) { + + + + + if (sender instanceof Player){ + + Player player = (Player) sender; + String playername = sender.getName(); + + if (!Objects.equals(player.getScoreboard(), Bukkit.getScoreboardManager().getMainScoreboard())){ + player.sendMessage("not in your current circumstances"); + return false; + } + + World hardcoreWorld = player.getServer().getWorld("hardcore"); + Location location = new Location(hardcoreWorld, 1280, 71, -179); + + int currentTime = (int) ((System.currentTimeMillis())/1000); + int deathTime = 0; + + if (HelloWorldPlugin.hardcoreTimeDead.getScore(playername) != null) //null check - if score exists + deathTime = HelloWorldPlugin.hardcoreTimeDead.getScore(playername).getScore(); //set deathTime to that score + + + + + if (currentTime - deathTime >= 86400 && deathTime != 0){ + sender.sendMessage("You died " + ((currentTime - deathTime) /3600) + " hours ago. Good luck, " + playername + "."); + player.teleport(location); + player.getWorld().playSound(player.getLocation(), Sound.AMBIENT_CAVE,1F,1F); + }else if(deathTime == 0){ + sender.sendMessage("You have never died, good luck"); + player.teleport(location); + player.getWorld().playSound(player.getLocation(), Sound.AMBIENT_CAVE,1F,1F); + }else{ + sender.sendMessage("you are dead for the next " + ((86400 - (currentTime - deathTime)) /3600) + " hours"); + player.getWorld().playSound(player.getLocation(), Sound.AMBIENT_CAVE,1F,1F); + // replace sound with some other sound + } + + + + }else{ + sender.sendMessage("You must be a player to use this command!"); + } + + + + return false; + } + +} diff --git a/src/iie/HelloWorldPlugin.java b/src/iie/HelloWorldPlugin.java new file mode 100644 index 0000000..a3a1995 --- /dev/null +++ b/src/iie/HelloWorldPlugin.java @@ -0,0 +1,43 @@ +package iie; + +import java.util.AbstractMap; +import java.util.HashMap; + +import org.bukkit.Bukkit; +import org.bukkit.plugin.java.JavaPlugin; +import org.bukkit.scoreboard.Objective; +import org.bukkit.scoreboard.Scoreboard; + + +public class HelloWorldPlugin extends JavaPlugin { + + public static Scoreboard board; + public static Objective hardcoreTimeDead; + public static Objective hardcoreInvite; + public static AbstractMap deathMap = new HashMap(); + + public void onEnable(){ + + board = Bukkit.getServer().getScoreboardManager().getMainScoreboard(); + if (board.getObjective("hardcoreTimeDead") != null){ //null check hardcoreTimeDead + hardcoreTimeDead = board.getObjective("hardcoreTimeDead"); + }else{ + hardcoreTimeDead = board.registerNewObjective("hardcoreTimeDead", "dummy"); + } + if (board.getObjective("hardcoreInvite") != null){ //null check hardcoreInvite + hardcoreInvite = board.getObjective("hardcoreInvite"); + }else{ + hardcoreInvite = board.registerNewObjective("hardcoreInvite", "dummy"); + } + + registerCommands(); + getServer().getPluginManager().registerEvents(new JoinListener(this), this); + getServer().getPluginManager().registerEvents(new DeathListener(this), this); + + + } + public void registerCommands(){ + getCommand("hardcore").setExecutor(new HelloWorld(this)); + } + +} \ No newline at end of file diff --git a/src/iie/JoinListener.java b/src/iie/JoinListener.java new file mode 100644 index 0000000..5bf6b1b --- /dev/null +++ b/src/iie/JoinListener.java @@ -0,0 +1,52 @@ +package iie; + +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerJoinEvent; + +public class JoinListener implements Listener { + + HelloWorldPlugin plugin; + public JoinListener(HelloWorldPlugin plugin){ + this.plugin = plugin; + } + + @EventHandler(priority = EventPriority.MONITOR) + public void onPlayerJoin(PlayerJoinEvent JoinEvent){ + + + Player player = JoinEvent.getPlayer(); + String playername = (String) player.getName(); + + + if (HelloWorldPlugin.hardcoreInvite.getScore(playername) == null){ //null check + HelloWorldPlugin.hardcoreInvite.getScore(playername).setScore(0); //convert null to 0 + } + if (HelloWorldPlugin.hardcoreTimeDead.getScore(playername) == null){ //null check + HelloWorldPlugin.hardcoreTimeDead.getScore(playername).setScore(0); //convert null to 0 + } + + int invite = HelloWorldPlugin.hardcoreInvite.getScore(playername).getScore(); + int deathTime = HelloWorldPlugin.hardcoreTimeDead.getScore(playername).getScore(); + int currentTime = (int) ((System.currentTimeMillis())/1000); + + + if (currentTime - deathTime >= 86400 && deathTime != 0 && invite == 0){ + player.sendMessage(playername + ", your death has lifted in Hardcore world. (You died " + String.valueOf((currentTime - deathTime) /3600) + " hours ago)"); + player.sendMessage("Are you ready to give life another shot?"); + HelloWorldPlugin.hardcoreInvite.getScore(playername).setScore(1); + }else if (currentTime - deathTime <= 86400){ + player.sendMessage(String.valueOf((86400 - (currentTime - deathTime)) /3600) + " hours of death remaining in hardcore"); + }else if (deathTime == 0){ + return; + } + + + //HelloWorldPlugin.deathMap.put(playername, String.valueOf(HelloWorldPlugin.hardcoreTimeDead.getScore(playername).getScore())); + + + } + +} From 137f394830a6ac7d7b9a8b4463fed5e6ca21d105 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Tue, 11 Oct 2016 16:48:51 -0400 Subject: [PATCH 03/13] My current build --- .classpath | 20 +++++ .gitignore | 1 + .project | 23 ++++++ .settings/org.eclipse.core.resources.prefs | 3 + .settings/org.eclipse.jdt.core.prefs | 5 ++ pom.xml | 54 ++++++++++++++ src/iie/BoundaryListener.java | 87 ++++++++++++++++++++++ src/iie/ChatFormattingListener.java | 14 ++++ src/iie/EnderchestListener.java | 5 ++ src/iie/HelloWorldPlugin.java | 13 ++++ src/iie/JoinListener.java | 5 +- 11 files changed, 229 insertions(+), 1 deletion(-) create mode 100644 .classpath create mode 100644 .project create mode 100644 .settings/org.eclipse.core.resources.prefs create mode 100644 .settings/org.eclipse.jdt.core.prefs create mode 100644 pom.xml create mode 100644 src/iie/BoundaryListener.java create mode 100644 src/iie/ChatFormattingListener.java create mode 100644 src/iie/EnderchestListener.java diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..be86bf9 --- /dev/null +++ b/.classpath @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore index 32858aa..829bbce 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* +/target/ diff --git a/.project b/.project new file mode 100644 index 0000000..a9ec82a --- /dev/null +++ b/.project @@ -0,0 +1,23 @@ + + + unconflicted-Hardcore + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..7a53139 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 +encoding/src=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..714351a --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..c3f7a4a --- /dev/null +++ b/pom.xml @@ -0,0 +1,54 @@ + + 4.0.0 + com.github.TBMCPlugins + Hardcore + 0.0.1-SNAPSHOT + + src + + + src + + *.yml + + + **/*.java + + + + + + maven-compiler-plugin + 3.5.1 + + 1.8 + 1.8 + + + + + + UTF-8 + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + jcenter + http://jcenter.bintray.com + + + jitpack.io + https://jitpack.io + + + + + org.spigotmc + spigot-api + 1.9.2-R0.1-SNAPSHOT + + + \ No newline at end of file diff --git a/src/iie/BoundaryListener.java b/src/iie/BoundaryListener.java new file mode 100644 index 0000000..31123a1 --- /dev/null +++ b/src/iie/BoundaryListener.java @@ -0,0 +1,87 @@ +package iie; + +import java.util.AbstractMap; +import java.util.HashMap; + +import org.bukkit.Bukkit; +import org.bukkit.Sound; +import org.bukkit.World; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerMoveEvent; + +public class BoundaryListener implements Listener { + + HelloWorldPlugin plugin; + public BoundaryListener(HelloWorldPlugin plugin){ + this.plugin = plugin; + } + + int minX = 666; // MAP BORDER COORDS HERE + int maxX = 2366; + int minZ = -1520; + int maxZ = 280; + + public boolean OutOfBounds (Player player, int x, int z){ + boolean isOutOfBounds = false; + x = player.getLocation().getBlockX(); + z = player.getLocation().getBlockZ(); + if (x < minX || x > maxX || z < minZ || z > maxZ) isOutOfBounds = true; + return isOutOfBounds; + } + + public boolean FurtherOut (Player player, int x, int z){ + boolean isFurtherOut = false; + x = player.getLocation().getBlockX(); + z = player.getLocation().getBlockZ(); + if (x < minX - 50 || x > maxX + 50 || z < minZ - 50 || z > maxZ + 50) isFurtherOut = true; + return isFurtherOut; + } + + public static AbstractMap moveDelay = new HashMap(); + public static AbstractMap boundaryWarning = new HashMap(); + + @EventHandler(priority = EventPriority.MONITOR) + public void onPlayerMove(PlayerMoveEvent event){ + + Player player = (Player) event.getPlayer(); + String playername = player.getName(); + World world = player.getWorld(); + String worldname = world.getName(); + if (playername == "iie") world.playSound(player.getLocation(), Sound.ENTITY_EXPERIENCE_ORB_PICKUP,1F,1F); + + new Thread(() -> { + + + + if (worldname != "hardcore") return; + + int currentTime = (int) (System.currentTimeMillis()/1000); + int playerTime = moveDelay.get(playername); + boolean playerWarning = boundaryWarning.get(playername); + int x = player.getLocation().getBlockX(); + int z = player.getLocation().getBlockZ(); + boolean OutOfBounds = OutOfBounds(player, x, z); + + + if (playerWarning && currentTime > playerTime + 1 && OutOfBounds){ + world.playSound(player.getLocation(), Sound.AMBIENT_CAVE,1F,1F); + Bukkit.dispatchCommand(Bukkit.getConsoleSender(), ("tellraw " + playername + " {\"text\":\"...out of bounds...\",\"color\":\"dark_red\"}")); + boundaryWarning.put(playername, false); + } else if (playerWarning && currentTime > playerTime && FurtherOut(player, x, z)){ + world.playSound(player.getLocation(), Sound.AMBIENT_CAVE,1F,1F); + Bukkit.dispatchCommand(Bukkit.getConsoleSender(), ("tellraw " + playername + " {\"text\":\"...out of bounds...\",\"color\":\"dark_red\"}")); + boundaryWarning.put(playername, false); + if (playername == "iie") ; + } else if (!playerWarning && !OutOfBounds) boundaryWarning.put(playername, true); + + + moveDelay.put(playername, currentTime); + + }).start(); + + } + +} diff --git a/src/iie/ChatFormattingListener.java b/src/iie/ChatFormattingListener.java new file mode 100644 index 0000000..c8676ed --- /dev/null +++ b/src/iie/ChatFormattingListener.java @@ -0,0 +1,14 @@ +package iie; + +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; + +public class ChatFormattingListener implements Listener{ + + @EventHandler(priority = EventPriority.MONITOR) + public void AsyncPlayerChatEvent (){ + + } + +} diff --git a/src/iie/EnderchestListener.java b/src/iie/EnderchestListener.java new file mode 100644 index 0000000..08be92d --- /dev/null +++ b/src/iie/EnderchestListener.java @@ -0,0 +1,5 @@ +package iie; + +public class EnderchestListener { + +} diff --git a/src/iie/HelloWorldPlugin.java b/src/iie/HelloWorldPlugin.java index a3a1995..34f5063 100644 --- a/src/iie/HelloWorldPlugin.java +++ b/src/iie/HelloWorldPlugin.java @@ -2,8 +2,10 @@ package iie; import java.util.AbstractMap; import java.util.HashMap; +import java.util.UUID; import org.bukkit.Bukkit; +import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scoreboard.Objective; import org.bukkit.scoreboard.Scoreboard; @@ -11,13 +13,18 @@ import org.bukkit.scoreboard.Scoreboard; public class HelloWorldPlugin extends JavaPlugin { + public static Player iie; + public static Scoreboard board; public static Objective hardcoreTimeDead; public static Objective hardcoreInvite; + public static Objective hardcoreOutBound; public static AbstractMap deathMap = new HashMap(); public void onEnable(){ + iie = Bukkit.getServer().getOfflinePlayer((UUID) UUID.fromString("633d0de1-4a67-46ff-bd8a-004fa8ce4858")).getPlayer(); + board = Bukkit.getServer().getScoreboardManager().getMainScoreboard(); if (board.getObjective("hardcoreTimeDead") != null){ //null check hardcoreTimeDead hardcoreTimeDead = board.getObjective("hardcoreTimeDead"); @@ -29,10 +36,16 @@ public class HelloWorldPlugin extends JavaPlugin { }else{ hardcoreInvite = board.registerNewObjective("hardcoreInvite", "dummy"); } + if (board.getObjective("hardcoreOutBound") != null){ //null check hardcoreOutBound + hardcoreOutBound = board.getObjective("hardcoreOutBound"); + }else{ + hardcoreOutBound = board.registerNewObjective("hardcoreOutBound", "dummy"); + } registerCommands(); getServer().getPluginManager().registerEvents(new JoinListener(this), this); getServer().getPluginManager().registerEvents(new DeathListener(this), this); + getServer().getPluginManager().registerEvents(new BoundaryListener(this), this); } diff --git a/src/iie/JoinListener.java b/src/iie/JoinListener.java index 5bf6b1b..b55762e 100644 --- a/src/iie/JoinListener.java +++ b/src/iie/JoinListener.java @@ -19,7 +19,7 @@ public class JoinListener implements Listener { Player player = JoinEvent.getPlayer(); String playername = (String) player.getName(); - + if (HelloWorldPlugin.hardcoreInvite.getScore(playername) == null){ //null check HelloWorldPlugin.hardcoreInvite.getScore(playername).setScore(0); //convert null to 0 @@ -43,6 +43,9 @@ public class JoinListener implements Listener { return; } + BoundaryListener.moveDelay.put(playername, currentTime); + BoundaryListener.boundaryWarning.put(playername, true); + //HelloWorldPlugin.deathMap.put(playername, String.valueOf(HelloWorldPlugin.hardcoreTimeDead.getScore(playername).getScore())); From 034391d0c831940885ad6b5bb91a9a1e61df877f Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Sat, 22 Oct 2016 19:14:08 -0400 Subject: [PATCH 04/13] added DebugRTP --- src/iie/HelloWorldPlugin.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/iie/HelloWorldPlugin.java b/src/iie/HelloWorldPlugin.java index 34f5063..4eed883 100644 --- a/src/iie/HelloWorldPlugin.java +++ b/src/iie/HelloWorldPlugin.java @@ -10,6 +10,8 @@ import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scoreboard.Objective; import org.bukkit.scoreboard.Scoreboard; +import alisolarflare.RandomTP; + public class HelloWorldPlugin extends JavaPlugin { @@ -51,6 +53,7 @@ public class HelloWorldPlugin extends JavaPlugin { } public void registerCommands(){ getCommand("hardcore").setExecutor(new HelloWorld(this)); + getCommand("debugRTP").setExecutor(new RandomTP(this)); } } \ No newline at end of file From 6dab69e2c9b45daec51b4cd37d12fe3acc60d712 Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Sat, 22 Oct 2016 19:26:51 -0400 Subject: [PATCH 05/13] Added more listeners, changed name --- plugin.yml | 2 +- src/iie/HelloWorldPlugin.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/plugin.yml b/plugin.yml index d8927be..c00ee65 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ main: iie.HelloWorldPlugin version: 1.0.0 - name: HelloWorldPlugin + name: ButtonHardcorePlugin commands: hardcore: description: Command that teleports you to hardcore world diff --git a/src/iie/HelloWorldPlugin.java b/src/iie/HelloWorldPlugin.java index 4eed883..6785820 100644 --- a/src/iie/HelloWorldPlugin.java +++ b/src/iie/HelloWorldPlugin.java @@ -11,6 +11,8 @@ import org.bukkit.scoreboard.Objective; import org.bukkit.scoreboard.Scoreboard; import alisolarflare.RandomTP; +import alisolarflare.listeners.ConflictCompassCraftingListener; +import alisolarflare.listeners.DiamondArmorBlocker; public class HelloWorldPlugin extends JavaPlugin { @@ -48,6 +50,8 @@ public class HelloWorldPlugin extends JavaPlugin { getServer().getPluginManager().registerEvents(new JoinListener(this), this); getServer().getPluginManager().registerEvents(new DeathListener(this), this); getServer().getPluginManager().registerEvents(new BoundaryListener(this), this); + getServer().getPluginManager().registerEvents(new DiamondArmorBlocker(), this); + getServer().getPluginManager().registerEvents(new ConflictCompassCraftingListener(), this); } From 8624563a2bb4e2fffa18a2b66e775650d93b1cd7 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sat, 22 Oct 2016 20:08:46 -0400 Subject: [PATCH 06/13] very minor reformatting of mainplugin --- src/iie/HelloWorldPlugin.java | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/iie/HelloWorldPlugin.java b/src/iie/HelloWorldPlugin.java index 6785820..3028230 100644 --- a/src/iie/HelloWorldPlugin.java +++ b/src/iie/HelloWorldPlugin.java @@ -26,25 +26,22 @@ public class HelloWorldPlugin extends JavaPlugin { public static AbstractMap deathMap = new HashMap(); public void onEnable(){ - - iie = Bukkit.getServer().getOfflinePlayer((UUID) UUID.fromString("633d0de1-4a67-46ff-bd8a-004fa8ce4858")).getPlayer(); - + board = Bukkit.getServer().getScoreboardManager().getMainScoreboard(); - if (board.getObjective("hardcoreTimeDead") != null){ //null check hardcoreTimeDead + if (board.getObjective("hardcoreTimeDead") != null) //null check hardcoreTimeDead hardcoreTimeDead = board.getObjective("hardcoreTimeDead"); - }else{ + else hardcoreTimeDead = board.registerNewObjective("hardcoreTimeDead", "dummy"); - } - if (board.getObjective("hardcoreInvite") != null){ //null check hardcoreInvite + + if (board.getObjective("hardcoreInvite") != null) //null check hardcoreInvite hardcoreInvite = board.getObjective("hardcoreInvite"); - }else{ + else hardcoreInvite = board.registerNewObjective("hardcoreInvite", "dummy"); - } - if (board.getObjective("hardcoreOutBound") != null){ //null check hardcoreOutBound + + if (board.getObjective("hardcoreOutBound") != null) //null check hardcoreOutBound hardcoreOutBound = board.getObjective("hardcoreOutBound"); - }else{ + else hardcoreOutBound = board.registerNewObjective("hardcoreOutBound", "dummy"); - } registerCommands(); getServer().getPluginManager().registerEvents(new JoinListener(this), this); From 4c812b512981ce821ce05e5f97e36dfee87206a4 Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Sat, 22 Oct 2016 20:35:57 -0400 Subject: [PATCH 07/13] Adjusted RandomTP to be static --- src/alisolarflare/DebugRTP.java | 27 ++++++++ .../{RandomTP.java => RandomTPModule.java} | 69 +++++++------------ src/iie/HelloWorldPlugin.java | 8 ++- 3 files changed, 56 insertions(+), 48 deletions(-) create mode 100644 src/alisolarflare/DebugRTP.java rename src/alisolarflare/{RandomTP.java => RandomTPModule.java} (73%) diff --git a/src/alisolarflare/DebugRTP.java b/src/alisolarflare/DebugRTP.java new file mode 100644 index 0000000..eaa0bb6 --- /dev/null +++ b/src/alisolarflare/DebugRTP.java @@ -0,0 +1,27 @@ +package alisolarflare; + +import org.bukkit.Location; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +public class DebugRTP implements CommandExecutor { + + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { + if(!(sender instanceof Player)){ + sender.sendMessage("You must be a Player to use this command!"); + sender.sendMessage(sender.toString()); + return false; + } + Player player = (Player) sender; + if(player.getWorld().getName() != "hardcore"){ + sender.sendMessage("You must be in the hardcore world to use this command!"); + sender.sendMessage("Current World: " + player.getWorld().getName()); + return false; + } + RandomTPModule.rtp(player, player.getWorld(), new Location(player.getWorld(), 644, 65, -944), new Location(player.getWorld(), 1700, 65, 464)); + return false; + } +} diff --git a/src/alisolarflare/RandomTP.java b/src/alisolarflare/RandomTPModule.java similarity index 73% rename from src/alisolarflare/RandomTP.java rename to src/alisolarflare/RandomTPModule.java index d92800c..3bf96a1 100644 --- a/src/alisolarflare/RandomTP.java +++ b/src/alisolarflare/RandomTPModule.java @@ -1,33 +1,31 @@ package alisolarflare; +import java.util.HashMap; + import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import iie.HelloWorldPlugin; -public class RandomTP implements CommandExecutor{ - - private int conflictX; - private int conflictZ; - private int conflictRadius = 70; - private boolean northUsed; - private boolean southUsed; - private boolean eastUsed; - private boolean westUsed; +public class RandomTPModule{ + private static int conflictX; + private static int conflictZ; + private static int conflictRadius = 70; + private static boolean northUsed; + private static boolean southUsed; + private static boolean eastUsed; + private static boolean westUsed; @SuppressWarnings("unused") private HelloWorldPlugin helloWorldPlugin; - public RandomTP(HelloWorldPlugin helloWorldPlugin) { + public RandomTPModule(HelloWorldPlugin helloWorldPlugin) { this.helloWorldPlugin = helloWorldPlugin; } //every 4 players who use it will be teleported near each other. - //ex. iie > 1200, ali -> 1210, byz -> 1190, charles -> 1195, wind -> 300, zan -> 310, etc - public void conflictRtp(Player player, World world, Location minLocation, Location maxLocation){ + //ex. iie 2000, ali 2010, byz 2005, charles 1995, wind 300, zan 310, etc + public static void conflictRtp(Player player, World world, Location minLocation, Location maxLocation){ //INIT - xDifference, xAverage int xdifference = minLocation.getBlockX() - maxLocation.getBlockX(); int xAverage = (int) Math.floor(minLocation.getBlockX() + maxLocation.getBlockX() / 2); @@ -59,10 +57,10 @@ public class RandomTP implements CommandExecutor{ //TRANSFER - data to class if (groundIsSafe && (northIsSafe || southIsSafe || eastIsSafe || westIsSafe)){ - northUsed = northIsSafe; - eastUsed = eastIsSafe; - westUsed = westIsSafe; - southUsed = southIsSafe; + northUsed = !northIsSafe; + eastUsed = !eastIsSafe; + westUsed = !westIsSafe; + southUsed = !southIsSafe; conflictX = attemptedX; conflictZ = attemptedZ; @@ -74,28 +72,28 @@ public class RandomTP implements CommandExecutor{ String dir = "north"; //CHOOSES A RANDOM DIRECTION - for(int i = 0; i < 1000; i++){ + for(int i = 0; i < 200; i++){ double randomDirection = Math.random(); if (randomDirection < 0.25){ - if(northUsed){ + if(!northUsed){ northUsed = true; dir = "north"; break; } }else if(randomDirection < 0.50){ - if(eastUsed){ + if(!eastUsed){ eastUsed = true; dir = "east"; break; } }else if(randomDirection < 0.75){ - if(southUsed){ + if(!southUsed){ southUsed = true; dir = "south"; break; } }else{ - if(westUsed){ + if(!westUsed){ westUsed = true; dir = "west"; break; @@ -108,19 +106,15 @@ public class RandomTP implements CommandExecutor{ //TELEPORT - teleports player to the conflict point switch(dir){ case "north": - northUsed = false; player.teleport(world.getHighestBlockAt(conflictX, conflictZ - conflictRadius).getLocation()); break; case "east": - eastUsed = false; player.teleport(world.getHighestBlockAt(conflictX + conflictRadius, conflictZ).getLocation()); break; case "south": - southUsed = false; player.teleport(world.getHighestBlockAt(conflictX, conflictZ + conflictRadius).getLocation()); break; case "west": - westUsed = false; player.teleport(world.getHighestBlockAt(conflictX - conflictRadius, conflictZ).getLocation()); break; default: @@ -130,7 +124,7 @@ public class RandomTP implements CommandExecutor{ } //Randomly teleports a player, into the hardcore world - public void rtp(Player player, World world, Location minLocation, Location maxLocation){ + public static void rtp(Player player, World world, Location minLocation, Location maxLocation){ player.sendMessage("TELEPORT INITIATED"); player.sendMessage("minLocation: " + minLocation.toString()); player.sendMessage("maxLocation: " + maxLocation.toString()); @@ -163,21 +157,4 @@ public class RandomTP implements CommandExecutor{ //player.teleport(arg0) } } - - @Override - public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if(!(sender instanceof Player)){ - sender.sendMessage("You must be a Player to use this command!"); - sender.sendMessage(sender.toString()); - return false; - } - Player player = (Player) sender; - if(player.getWorld().getName() != "hardcore"){ - sender.sendMessage("You must be in the hardcore world to use this command!"); - sender.sendMessage("Current World: " + player.getWorld().getName()); - return false; - } - rtp(player, player.getWorld(), new Location(player.getWorld(), 644, 65, -944), new Location(player.getWorld(), 1700, 65, 464)); - return false; - } } diff --git a/src/iie/HelloWorldPlugin.java b/src/iie/HelloWorldPlugin.java index 6785820..6ef4735 100644 --- a/src/iie/HelloWorldPlugin.java +++ b/src/iie/HelloWorldPlugin.java @@ -10,7 +10,9 @@ import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scoreboard.Objective; import org.bukkit.scoreboard.Scoreboard; -import alisolarflare.RandomTP; +import alisolarflare.DebugRTP; +import alisolarflare.RandomTPModule; +import alisolarflare.listeners.CompassLobby; import alisolarflare.listeners.ConflictCompassCraftingListener; import alisolarflare.listeners.DiamondArmorBlocker; @@ -50,14 +52,16 @@ public class HelloWorldPlugin extends JavaPlugin { getServer().getPluginManager().registerEvents(new JoinListener(this), this); getServer().getPluginManager().registerEvents(new DeathListener(this), this); getServer().getPluginManager().registerEvents(new BoundaryListener(this), this); + getServer().getPluginManager().registerEvents(new DiamondArmorBlocker(), this); getServer().getPluginManager().registerEvents(new ConflictCompassCraftingListener(), this); + getServer().getPluginManager().registerEvents(new CompassLobby(), this); } public void registerCommands(){ getCommand("hardcore").setExecutor(new HelloWorld(this)); - getCommand("debugRTP").setExecutor(new RandomTP(this)); + getCommand("debugRTP").setExecutor(new DebugRTP()); } } \ No newline at end of file From 1e17a1dab64be5d91a6755496bdd2f7afde18241 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sat, 22 Oct 2016 20:51:34 -0400 Subject: [PATCH 08/13] picking a random direction without a loop --- src/alisolarflare/RandomTP.java | 23 +++++++++++++++++++---- src/iie/HelloWorldPlugin.java | 1 - 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/alisolarflare/RandomTP.java b/src/alisolarflare/RandomTP.java index d92800c..6369198 100644 --- a/src/alisolarflare/RandomTP.java +++ b/src/alisolarflare/RandomTP.java @@ -1,5 +1,8 @@ package alisolarflare; +import java.util.ArrayList; +import java.util.Arrays; + import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; @@ -28,6 +31,9 @@ public class RandomTP implements CommandExecutor{ //every 4 players who use it will be teleported near each other. //ex. iie > 1200, ali -> 1210, byz -> 1190, charles -> 1195, wind -> 300, zan -> 310, etc public void conflictRtp(Player player, World world, Location minLocation, Location maxLocation){ + + + //INIT - xDifference, xAverage int xdifference = minLocation.getBlockX() - maxLocation.getBlockX(); int xAverage = (int) Math.floor(minLocation.getBlockX() + maxLocation.getBlockX() / 2); @@ -37,7 +43,7 @@ public class RandomTP implements CommandExecutor{ int zAverage = (int) Math.floor(minLocation.getBlockZ() + maxLocation.getBlockZ()); //CHECK - Reset Cycle - if ((northUsed || southUsed || eastUsed || westUsed) == false){ + if (!(northUsed || southUsed || eastUsed || westUsed)){ //Tries 20 times to find a location for(int i = 0; i < 20; i ++){ @@ -52,9 +58,10 @@ public class RandomTP implements CommandExecutor{ //CHECKS - if ground is safe boolean groundIsSafe = world.getHighestBlockAt(attemptedX, attemptedZ).getType() != Material.WATER; boolean northIsSafe = world.getHighestBlockAt(attemptedX, attemptedZ-cr).getType() != Material.WATER; - boolean eastIsSafe = world.getHighestBlockAt(attemptedX+cr, attemptedZ).getType() != Material.WATER; boolean southIsSafe = world.getHighestBlockAt(attemptedX, attemptedZ+cr).getType() != Material.WATER; boolean westIsSafe = world.getHighestBlockAt(attemptedX-cr, attemptedZ).getType() != Material.WATER; + boolean eastIsSafe = world.getHighestBlockAt(attemptedX+cr, attemptedZ).getType() != Material.WATER; + //TRANSFER - data to class if (groundIsSafe && (northIsSafe || southIsSafe || eastIsSafe || westIsSafe)){ @@ -73,8 +80,16 @@ public class RandomTP implements CommandExecutor{ } String dir = "north"; + + ArrayList directions = new ArrayList(); + if(!northUsed) directions.add("north"); + if(!southUsed) directions.add("south"); + if(!westUsed) directions.add("west"); + if(!eastUsed) directions.add("east"); + dir = directions.get((int) Math.floor(Math.random() * directions.size())); + //CHOOSES A RANDOM DIRECTION - for(int i = 0; i < 1000; i++){ + /*for(int i = 0; i < 1000; i++){ double randomDirection = Math.random(); if (randomDirection < 0.25){ if(northUsed){ @@ -102,7 +117,7 @@ public class RandomTP implements CommandExecutor{ } } - } + }*/ //TELEPORT - teleports player to the conflict point diff --git a/src/iie/HelloWorldPlugin.java b/src/iie/HelloWorldPlugin.java index 3028230..0e19edf 100644 --- a/src/iie/HelloWorldPlugin.java +++ b/src/iie/HelloWorldPlugin.java @@ -2,7 +2,6 @@ package iie; import java.util.AbstractMap; import java.util.HashMap; -import java.util.UUID; import org.bukkit.Bukkit; import org.bukkit.entity.Player; From e86754efcb9e933c4d5c4f5e872470c6ad32ab53 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sat, 22 Oct 2016 21:10:26 -0400 Subject: [PATCH 09/13] removing commented-out for loop --- src/alisolarflare/RandomTPModule.java | 32 --------------------------- 1 file changed, 32 deletions(-) diff --git a/src/alisolarflare/RandomTPModule.java b/src/alisolarflare/RandomTPModule.java index 77da768..fca4de7 100644 --- a/src/alisolarflare/RandomTPModule.java +++ b/src/alisolarflare/RandomTPModule.java @@ -83,38 +83,6 @@ public class RandomTPModule{ if(!eastUsed) directions.add("east"); dir = directions.get((int) Math.floor(Math.random() * directions.size())); - /* - for(int i = 0; i < 1000; i++){ - double randomDirection = Math.random(); - if (randomDirection < 0.25){ - if(!northUsed){ - northUsed = true; - dir = "north"; - break; - } - }else if(randomDirection < 0.50){ - if(!eastUsed){ - eastUsed = true; - dir = "east"; - break; - } - }else if(randomDirection < 0.75){ - if(!southUsed){ - southUsed = true; - dir = "south"; - break; - } - }else{ - if(!westUsed){ - westUsed = true; - dir = "west"; - break; - } - - } - }*/ - - //TELEPORT - teleports player to the conflict point switch(dir){ case "north": From b17822976e4082c5a8aaa8cfff10f8b8ec423711 Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Sat, 22 Oct 2016 22:09:20 -0400 Subject: [PATCH 10/13] Removed a deadly listener --- src/iie/HelloWorldPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/iie/HelloWorldPlugin.java b/src/iie/HelloWorldPlugin.java index 70a7a25..b418859 100644 --- a/src/iie/HelloWorldPlugin.java +++ b/src/iie/HelloWorldPlugin.java @@ -51,7 +51,7 @@ public class HelloWorldPlugin extends JavaPlugin { getServer().getPluginManager().registerEvents(new DiamondArmorBlocker(), this); getServer().getPluginManager().registerEvents(new ConflictCompassCraftingListener(), this); - getServer().getPluginManager().registerEvents(new CompassLobby(), this); + //getServer().getPluginManager().registerEvents(new CompassLobby(), this); } From 4bdb9603a0807c8d08f6559820440ed21c45b4cf Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Sun, 23 Oct 2016 00:13:21 -0400 Subject: [PATCH 11/13] Changed HelloWorldPlugin to ButtonHardcorePlugin --- plugin.yml | 4 ++-- src/alisolarflare/RandomTPModule.java | 6 +++--- src/iie/BoundaryListener.java | 4 ++-- ...ldPlugin.java => ButtonHardcorePlugin.java} | 2 +- src/iie/DeathListener.java | 8 ++++---- src/iie/HelloWorld.java | 8 ++++---- src/iie/JoinListener.java | 18 +++++++++--------- 7 files changed, 25 insertions(+), 25 deletions(-) rename src/iie/{HelloWorldPlugin.java => ButtonHardcorePlugin.java} (97%) diff --git a/plugin.yml b/plugin.yml index c00ee65..c46d68b 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,5 +1,5 @@ - main: iie.HelloWorldPlugin - version: 1.0.0 + main: iie.ButtonHardcorePlugin + version: 1.0.1 name: ButtonHardcorePlugin commands: hardcore: diff --git a/src/alisolarflare/RandomTPModule.java b/src/alisolarflare/RandomTPModule.java index fca4de7..b5a2306 100644 --- a/src/alisolarflare/RandomTPModule.java +++ b/src/alisolarflare/RandomTPModule.java @@ -8,7 +8,7 @@ import org.bukkit.Material; import org.bukkit.World; import org.bukkit.entity.Player; -import iie.HelloWorldPlugin; +import iie.ButtonHardcorePlugin; public class RandomTPModule{ private static int conflictX; @@ -19,8 +19,8 @@ public class RandomTPModule{ private static boolean eastUsed; private static boolean westUsed; @SuppressWarnings("unused") - private HelloWorldPlugin helloWorldPlugin; - public RandomTPModule(HelloWorldPlugin helloWorldPlugin) { + private ButtonHardcorePlugin helloWorldPlugin; + public RandomTPModule(ButtonHardcorePlugin helloWorldPlugin) { this.helloWorldPlugin = helloWorldPlugin; } diff --git a/src/iie/BoundaryListener.java b/src/iie/BoundaryListener.java index 31123a1..62dc117 100644 --- a/src/iie/BoundaryListener.java +++ b/src/iie/BoundaryListener.java @@ -14,8 +14,8 @@ import org.bukkit.event.player.PlayerMoveEvent; public class BoundaryListener implements Listener { - HelloWorldPlugin plugin; - public BoundaryListener(HelloWorldPlugin plugin){ + ButtonHardcorePlugin plugin; + public BoundaryListener(ButtonHardcorePlugin plugin){ this.plugin = plugin; } diff --git a/src/iie/HelloWorldPlugin.java b/src/iie/ButtonHardcorePlugin.java similarity index 97% rename from src/iie/HelloWorldPlugin.java rename to src/iie/ButtonHardcorePlugin.java index b418859..929ccea 100644 --- a/src/iie/HelloWorldPlugin.java +++ b/src/iie/ButtonHardcorePlugin.java @@ -16,7 +16,7 @@ import alisolarflare.listeners.ConflictCompassCraftingListener; import alisolarflare.listeners.DiamondArmorBlocker; -public class HelloWorldPlugin extends JavaPlugin { +public class ButtonHardcorePlugin extends JavaPlugin { public static Player iie; diff --git a/src/iie/DeathListener.java b/src/iie/DeathListener.java index ea67603..52069e7 100644 --- a/src/iie/DeathListener.java +++ b/src/iie/DeathListener.java @@ -11,8 +11,8 @@ import org.bukkit.event.entity.PlayerDeathEvent; public class DeathListener implements Listener { - HelloWorldPlugin plugin; - public DeathListener(HelloWorldPlugin plugin){ + ButtonHardcorePlugin plugin; + public DeathListener(ButtonHardcorePlugin plugin){ this.plugin = plugin; } @@ -31,8 +31,8 @@ public class DeathListener implements Listener { if (Objects.equals(worldString, "hardcore")){ - HelloWorldPlugin.hardcoreTimeDead.getScore(playername).setScore(currentTime); - HelloWorldPlugin.hardcoreInvite.getScore(playername).setScore(0); + ButtonHardcorePlugin.hardcoreTimeDead.getScore(playername).setScore(currentTime); + ButtonHardcorePlugin.hardcoreInvite.getScore(playername).setScore(0); //player.sendMessage("death detected"); //player.sendMessage("hardcoreTimeDead score = " + String.valueOf(HelloWorldPlugin.hardcoreTimeDead.getScore(playername).getScore())); diff --git a/src/iie/HelloWorld.java b/src/iie/HelloWorld.java index 9e331cb..ab18b31 100644 --- a/src/iie/HelloWorld.java +++ b/src/iie/HelloWorld.java @@ -14,8 +14,8 @@ import org.bukkit.entity.Player; public class HelloWorld implements CommandExecutor { - HelloWorldPlugin plugin; - public HelloWorld(HelloWorldPlugin plugin){ + ButtonHardcorePlugin plugin; + public HelloWorld(ButtonHardcorePlugin plugin){ this.plugin = plugin; } @@ -41,8 +41,8 @@ public class HelloWorld implements CommandExecutor { int currentTime = (int) ((System.currentTimeMillis())/1000); int deathTime = 0; - if (HelloWorldPlugin.hardcoreTimeDead.getScore(playername) != null) //null check - if score exists - deathTime = HelloWorldPlugin.hardcoreTimeDead.getScore(playername).getScore(); //set deathTime to that score + if (ButtonHardcorePlugin.hardcoreTimeDead.getScore(playername) != null) //null check - if score exists + deathTime = ButtonHardcorePlugin.hardcoreTimeDead.getScore(playername).getScore(); //set deathTime to that score diff --git a/src/iie/JoinListener.java b/src/iie/JoinListener.java index b55762e..5a2cb1b 100644 --- a/src/iie/JoinListener.java +++ b/src/iie/JoinListener.java @@ -8,8 +8,8 @@ import org.bukkit.event.player.PlayerJoinEvent; public class JoinListener implements Listener { - HelloWorldPlugin plugin; - public JoinListener(HelloWorldPlugin plugin){ + ButtonHardcorePlugin plugin; + public JoinListener(ButtonHardcorePlugin plugin){ this.plugin = plugin; } @@ -21,22 +21,22 @@ public class JoinListener implements Listener { String playername = (String) player.getName(); - if (HelloWorldPlugin.hardcoreInvite.getScore(playername) == null){ //null check - HelloWorldPlugin.hardcoreInvite.getScore(playername).setScore(0); //convert null to 0 + if (ButtonHardcorePlugin.hardcoreInvite.getScore(playername) == null){ //null check + ButtonHardcorePlugin.hardcoreInvite.getScore(playername).setScore(0); //convert null to 0 } - if (HelloWorldPlugin.hardcoreTimeDead.getScore(playername) == null){ //null check - HelloWorldPlugin.hardcoreTimeDead.getScore(playername).setScore(0); //convert null to 0 + if (ButtonHardcorePlugin.hardcoreTimeDead.getScore(playername) == null){ //null check + ButtonHardcorePlugin.hardcoreTimeDead.getScore(playername).setScore(0); //convert null to 0 } - int invite = HelloWorldPlugin.hardcoreInvite.getScore(playername).getScore(); - int deathTime = HelloWorldPlugin.hardcoreTimeDead.getScore(playername).getScore(); + int invite = ButtonHardcorePlugin.hardcoreInvite.getScore(playername).getScore(); + int deathTime = ButtonHardcorePlugin.hardcoreTimeDead.getScore(playername).getScore(); int currentTime = (int) ((System.currentTimeMillis())/1000); if (currentTime - deathTime >= 86400 && deathTime != 0 && invite == 0){ player.sendMessage(playername + ", your death has lifted in Hardcore world. (You died " + String.valueOf((currentTime - deathTime) /3600) + " hours ago)"); player.sendMessage("Are you ready to give life another shot?"); - HelloWorldPlugin.hardcoreInvite.getScore(playername).setScore(1); + ButtonHardcorePlugin.hardcoreInvite.getScore(playername).setScore(1); }else if (currentTime - deathTime <= 86400){ player.sendMessage(String.valueOf((86400 - (currentTime - deathTime)) /3600) + " hours of death remaining in hardcore"); }else if (deathTime == 0){ From 9a2787b8c5be6c7822ef1c77dfdf025b305dda54 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sun, 23 Oct 2016 00:19:30 -0400 Subject: [PATCH 12/13] divide zAverage by 2 --- src/alisolarflare/RandomTPModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/alisolarflare/RandomTPModule.java b/src/alisolarflare/RandomTPModule.java index b5a2306..feea64e 100644 --- a/src/alisolarflare/RandomTPModule.java +++ b/src/alisolarflare/RandomTPModule.java @@ -34,7 +34,7 @@ public class RandomTPModule{ //INIT - zDifference, zAverage int zdifference = minLocation.getBlockX() - maxLocation.getBlockY(); - int zAverage = (int) Math.floor(minLocation.getBlockZ() + maxLocation.getBlockZ()); + int zAverage = (int) Math.floor(minLocation.getBlockZ() + maxLocation.getBlockZ() / 2); //CHECK - Reset Cycle if (!(northUsed || southUsed || eastUsed || westUsed)){ From 75c7b605b4d4115c1f765219abfa490593f9fb19 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Sun, 23 Oct 2016 12:44:39 +0200 Subject: [PATCH 13/13] Fixed plugin.yml inclusion --- pom.xml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index c3f7a4a..2b4f11b 100644 --- a/pom.xml +++ b/pom.xml @@ -8,13 +8,16 @@ src - - *.yml - **/*.java - - + + + + . + + *.yml + + @@ -51,4 +54,4 @@ 1.9.2-R0.1-SNAPSHOT - \ No newline at end of file +