From 23bed03961f822c951aa350d5e5d78604660cd4f Mon Sep 17 00:00:00 2001 From: iiegit Date: Tue, 23 Aug 2016 14:21:40 -0400 Subject: [PATCH 01/27] Initial commit --- .gitignore | 12 + LICENSE | 674 +++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 1 + 3 files changed, 687 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..f985703 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# iieHardcoreWorld \ No newline at end of file From 1ec94c06e841f1548a32478db8b5772139c56f36 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Tue, 23 Aug 2016 14:25:31 -0400 Subject: [PATCH 02/27] human beings are pitiful clumps of matter --- config.yml | 0 plugin.yml | 6 ++++ src/iie/DeathListener.java | 37 +++++++++++++++++++++++++ src/iie/HelloWorld.java | 46 +++++++++++++++++++++++++++++++ src/iie/HelloWorldPlugin.java | 18 ++++++++++++ src/iie/publicstaticvoidmain.java | 19 +++++++++++++ 6 files changed, 126 insertions(+) create mode 100644 config.yml create mode 100644 plugin.yml 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/publicstaticvoidmain.java 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..13eb73d --- /dev/null +++ b/plugin.yml @@ -0,0 +1,6 @@ + main: iie.HelloWorldPlugin + version: 1.0.0 + name: HelloWorldPlugin + commands: + HelloWorld: + description: Command that says Hello World! \ No newline at end of file diff --git a/src/iie/DeathListener.java b/src/iie/DeathListener.java new file mode 100644 index 0000000..6e9baa6 --- /dev/null +++ b/src/iie/DeathListener.java @@ -0,0 +1,37 @@ +package iie; + +import java.time.Clock; +import java.time.LocalDateTime; + +import org.bukkit.Location; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +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 + public void onHardcoreDeath(PlayerDeathEvent deathEvent){ + + + LocalDateTime currentTime = LocalDateTime.now(Clock.systemUTC()); + String timeString = currentTime.toString(); + Player player = deathEvent.getEntity(); + String playerString = (String) player.getName(); + Location location = player.getLocation(); + String worldString = (String) location.getWorld().getName(); + + + if (worldString == "hardcore"){ + plugin.deathMap.put(playerString, timeString); + } + + } + +} diff --git a/src/iie/HelloWorld.java b/src/iie/HelloWorld.java new file mode 100644 index 0000000..50a2b5b --- /dev/null +++ b/src/iie/HelloWorld.java @@ -0,0 +1,46 @@ +package iie; + +import org.bukkit.Location; +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) { + // TODO Auto-generated method stub + + sender.sendMessage("WELL, AT LEAST THIS WORKS"); + if (sender instanceof Player){ + + String playername = sender.getName(); + int deathtime = Integer.parseInt(plugin.deathMap.get(playername)); + long currentTime = System.currentTimeMillis(); + int timeInt = (int) currentTime; + + if (timeInt - deathtime >= 86400000){ + Player player = (Player) sender; + World hardcoreWorld = player.getServer().getWorld("hardcore"); + Location location = new Location(hardcoreWorld, 1280, 71, -179); + player.teleport(location); + }else{ + sender.sendMessage("you are dead for the next" + ((86400000 - (timeInt - deathtime))/3600000) + "hours"); + } + + }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..f96ed78 --- /dev/null +++ b/src/iie/HelloWorldPlugin.java @@ -0,0 +1,18 @@ +package iie; + +import java.util.AbstractMap; +import java.util.HashMap; + +import org.bukkit.plugin.java.JavaPlugin; + +public class HelloWorldPlugin extends JavaPlugin { + public AbstractMap deathMap = new HashMap(); + public void onEnable(){ + registerCommands(); + getServer().getPluginManager().registerEvents(new DeathListener(this), this); + } + public void registerCommands(){ + getCommand("HelloWorld").setExecutor(new HelloWorld(this)); + } + +} diff --git a/src/iie/publicstaticvoidmain.java b/src/iie/publicstaticvoidmain.java new file mode 100644 index 0000000..d12060d --- /dev/null +++ b/src/iie/publicstaticvoidmain.java @@ -0,0 +1,19 @@ +package iie; + +public class publicstaticvoidmain { + public static void main(String[] args){ + System.out.println("Hello World!"); + + int test = 1234; + String testString = Integer.toString(test); + int test2 = Integer.parseInt(testString); + System.out.println(test2); + + + long currentTime = System.currentTimeMillis(); + System.out.println(currentTime); + + + + } +} From 3b2be4a9b374de1f3840b01b25db49f91330bf96 Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Tue, 23 Aug 2016 15:44:02 -0400 Subject: [PATCH 03/27] added .project file --- .classpath | 8 ++++++++ .gitignore | 1 + .project | 17 +++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 .classpath create mode 100644 .project diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..cefbd63 --- /dev/null +++ b/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/.gitignore b/.gitignore index 32858aa..a031ac2 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* +/bin/ diff --git a/.project b/.project new file mode 100644 index 0000000..775687b --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + iieHardcoreWorld + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + From 7651b14c939cb200be871936a232e2d21cba1e92 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Tue, 23 Aug 2016 22:55:58 -0400 Subject: [PATCH 04/27] some bugs fixed DeathListener still not working --- src/iie/DeathListener.java | 4 ++++ src/iie/HelloWorld.java | 35 +++++++++++++++++++++++++------ src/iie/publicstaticvoidmain.java | 23 ++++++++++++++++++++ 3 files changed, 56 insertions(+), 6 deletions(-) diff --git a/src/iie/DeathListener.java b/src/iie/DeathListener.java index 6e9baa6..c2ad90f 100644 --- a/src/iie/DeathListener.java +++ b/src/iie/DeathListener.java @@ -27,9 +27,13 @@ public class DeathListener implements Listener { Location location = player.getLocation(); String worldString = (String) location.getWorld().getName(); + player.sendMessage(timeString); + player.sendMessage(playerString); + player.sendMessage(worldString); if (worldString == "hardcore"){ plugin.deathMap.put(playerString, timeString); + player.sendMessage(plugin.deathMap.toString()); } } diff --git a/src/iie/HelloWorld.java b/src/iie/HelloWorld.java index 50a2b5b..32d7a4b 100644 --- a/src/iie/HelloWorld.java +++ b/src/iie/HelloWorld.java @@ -21,18 +21,41 @@ public class HelloWorld implements CommandExecutor { sender.sendMessage("WELL, AT LEAST THIS WORKS"); if (sender instanceof Player){ - String playername = sender.getName(); - int deathtime = Integer.parseInt(plugin.deathMap.get(playername)); - long currentTime = System.currentTimeMillis(); - int timeInt = (int) currentTime; + sender.sendMessage("sender IS instanceof Player"); - if (timeInt - deathtime >= 86400000){ + long currentTime = System.currentTimeMillis(); + String playername = sender.getName(); + long deathTime = 0; + + if (plugin.deathMap.get(playername) != null){ + + deathTime = Long.parseLong(plugin.deathMap.get(playername)); + + }else{ + + sender.sendMessage("you have never died in hardcore"); + + Player player = (Player) sender; + World hardcoreWorld = player.getServer().getWorld("hardcore"); + Location location = new Location(hardcoreWorld, 1280, 71, -179); + player.teleport(location); + } + + sender.sendMessage(playername); + sender.sendMessage(String.valueOf(deathTime)); + sender.sendMessage(String.valueOf(currentTime)); + + if (currentTime - deathTime >= 86400000){ + + sender.sendMessage("more than 24 hours have passed since you died in hardcore last"); + Player player = (Player) sender; World hardcoreWorld = player.getServer().getWorld("hardcore"); Location location = new Location(hardcoreWorld, 1280, 71, -179); player.teleport(location); + }else{ - sender.sendMessage("you are dead for the next" + ((86400000 - (timeInt - deathtime))/3600000) + "hours"); + sender.sendMessage("you are dead for the next " + (86400000 - (currentTime - deathTime) ) /3600000 + " hours"); } }else{ diff --git a/src/iie/publicstaticvoidmain.java b/src/iie/publicstaticvoidmain.java index d12060d..5c4a587 100644 --- a/src/iie/publicstaticvoidmain.java +++ b/src/iie/publicstaticvoidmain.java @@ -1,6 +1,10 @@ package iie; +import java.util.AbstractMap; +import java.util.HashMap; + public class publicstaticvoidmain { + public static void main(String[] args){ System.out.println("Hello World!"); @@ -9,10 +13,29 @@ public class publicstaticvoidmain { int test2 = Integer.parseInt(testString); System.out.println(test2); + if (test == 1234){ + test = 12345; + } + + System.out.println(test); + long currentTime = System.currentTimeMillis(); + System.out.println(currentTime); + + System.out.println(Long.parseLong("1472003809703")); + AbstractMap deathMap = new HashMap(); + deathMap.put("test", "1472003809703"); + long deathTime = Long.parseLong(deathMap.get("test")); + System.out.println(deathMap.get("test")); + System.out.println(deathTime + " is a number"); + + System.out.println(deathMap.get("other")); + System.out.println("you are dead for the next " + ((86400000 - (currentTime - deathTime))/3600000) + " hours"); + + } From 42fd476ff72b523bbed59b210101163c52a99570 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Tue, 23 Aug 2016 23:21:20 -0400 Subject: [PATCH 05/27] some more small changes --- src/iie/HelloWorld.java | 62 ++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/src/iie/HelloWorld.java b/src/iie/HelloWorld.java index 32d7a4b..c78b584 100644 --- a/src/iie/HelloWorld.java +++ b/src/iie/HelloWorld.java @@ -18,51 +18,55 @@ public class HelloWorld implements CommandExecutor { public boolean onCommand(CommandSender sender, Command label, String command, String[] args) { // TODO Auto-generated method stub - sender.sendMessage("WELL, AT LEAST THIS WORKS"); + + + + + + + //sender.sendMessage("WELL, AT LEAST THIS WORKS"); + if (sender instanceof Player){ - - sender.sendMessage("sender IS instanceof Player"); - + //sender.sendMessage("sender IS instanceof Player"); long currentTime = System.currentTimeMillis(); String playername = sender.getName(); long deathTime = 0; - - if (plugin.deathMap.get(playername) != null){ - - deathTime = Long.parseLong(plugin.deathMap.get(playername)); - - }else{ - - sender.sendMessage("you have never died in hardcore"); - + + if (plugin.deathMap.get(playername) != null){ + deathTime = Long.parseLong(plugin.deathMap.get(playername)); + }else{ + sender.sendMessage("you have never died in hardcore"); Player player = (Player) sender; World hardcoreWorld = player.getServer().getWorld("hardcore"); Location location = new Location(hardcoreWorld, 1280, 71, -179); - player.teleport(location); + player.teleport(location); } - - sender.sendMessage(playername); - sender.sendMessage(String.valueOf(deathTime)); - sender.sendMessage(String.valueOf(currentTime)); - if (currentTime - deathTime >= 86400000){ - - sender.sendMessage("more than 24 hours have passed since you died in hardcore last"); - + //sender.sendMessage(playername); + //sender.sendMessage(String.valueOf(deathTime)); + //sender.sendMessage(String.valueOf(currentTime)); + + + if (currentTime - deathTime >= 86400000 && deathTime != 0){ + sender.sendMessage((86400000 - (currentTime - deathTime) ) /3600000 + " hours have passed since you died in hardcore last"); Player player = (Player) sender; World hardcoreWorld = player.getServer().getWorld("hardcore"); Location location = new Location(hardcoreWorld, 1280, 71, -179); player.teleport(location); - - }else{ - sender.sendMessage("you are dead for the next " + (86400000 - (currentTime - deathTime) ) /3600000 + " hours"); + }else{ + sender.sendMessage("you are dead for the next " + (86400000 - (currentTime - deathTime) ) /3600000 + " hours"); } - }else{ - - sender.sendMessage("You must be a player to use this command!"); - + + }else{ + sender.sendMessage("You must be a player to use this command!"); } + + + + + + return false; } From 9073a6b2206af2419baa14a85b4ec0184af5d9a9 Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Tue, 23 Aug 2016 23:39:53 -0400 Subject: [PATCH 06/27] Added sender.sendmessages --- src/iie/DeathListener.java | 3 +++ src/iie/HelloWorld.java | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/iie/DeathListener.java b/src/iie/DeathListener.java index c2ad90f..67f8611 100644 --- a/src/iie/DeathListener.java +++ b/src/iie/DeathListener.java @@ -34,6 +34,9 @@ public class DeathListener implements Listener { if (worldString == "hardcore"){ plugin.deathMap.put(playerString, timeString); player.sendMessage(plugin.deathMap.toString()); + + player.sendMessage("Key saved: " + playerString); + player.sendMessage("Data saved: " + plugin.deathMap.get(playerString)); } } diff --git a/src/iie/HelloWorld.java b/src/iie/HelloWorld.java index c78b584..f57cfec 100644 --- a/src/iie/HelloWorld.java +++ b/src/iie/HelloWorld.java @@ -31,9 +31,13 @@ public class HelloWorld implements CommandExecutor { long currentTime = System.currentTimeMillis(); String playername = sender.getName(); long deathTime = 0; - - if (plugin.deathMap.get(playername) != null){ - deathTime = Long.parseLong(plugin.deathMap.get(playername)); + + sender.sendMessage("Playername: " + playername); + sender.sendMessage("Data Imported: " + plugin.deathMap.get(playername)); + + if (plugin.deathMap.get(playername) != null){ + deathTime = Long.parseLong(plugin.deathMap.get(playername)); + sender.sendMessage("DeathTime: " + deathTime); }else{ sender.sendMessage("you have never died in hardcore"); Player player = (Player) sender; @@ -46,7 +50,6 @@ public class HelloWorld implements CommandExecutor { //sender.sendMessage(String.valueOf(deathTime)); //sender.sendMessage(String.valueOf(currentTime)); - if (currentTime - deathTime >= 86400000 && deathTime != 0){ sender.sendMessage((86400000 - (currentTime - deathTime) ) /3600000 + " hours have passed since you died in hardcore last"); Player player = (Player) sender; From 786b806dae5bfa8421e2526a91fe0fd635a94cf5 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Thu, 25 Aug 2016 18:07:42 -0400 Subject: [PATCH 07/27] some fixes for DeathListener to (this) or not to (this) --- src/iie/DeathListener.java | 17 ++++++++-------- src/iie/HelloWorld.java | 33 ++++++++++++------------------- src/iie/HelloWorldPlugin.java | 4 ++-- src/iie/publicstaticvoidmain.java | 3 +++ 4 files changed, 26 insertions(+), 31 deletions(-) diff --git a/src/iie/DeathListener.java b/src/iie/DeathListener.java index 67f8611..4b605af 100644 --- a/src/iie/DeathListener.java +++ b/src/iie/DeathListener.java @@ -1,11 +1,11 @@ package iie; -import java.time.Clock; -import java.time.LocalDateTime; +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; @@ -16,12 +16,11 @@ public class DeathListener implements Listener { this.plugin = plugin; } - @EventHandler + @EventHandler(priority = EventPriority.MONITOR) public void onHardcoreDeath(PlayerDeathEvent deathEvent){ - LocalDateTime currentTime = LocalDateTime.now(Clock.systemUTC()); - String timeString = currentTime.toString(); + String timeString = String.valueOf(System.currentTimeMillis()); Player player = deathEvent.getEntity(); String playerString = (String) player.getName(); Location location = player.getLocation(); @@ -31,12 +30,12 @@ public class DeathListener implements Listener { player.sendMessage(playerString); player.sendMessage(worldString); - if (worldString == "hardcore"){ - plugin.deathMap.put(playerString, timeString); - player.sendMessage(plugin.deathMap.toString()); + if (Objects.equals(worldString, "hardcore")){ + HelloWorldPlugin.deathMap.put(playerString, timeString); + player.sendMessage(HelloWorldPlugin.deathMap.toString()); player.sendMessage("Key saved: " + playerString); - player.sendMessage("Data saved: " + plugin.deathMap.get(playerString)); + player.sendMessage("Data saved: " + HelloWorldPlugin.deathMap.get(playerString)); } } diff --git a/src/iie/HelloWorld.java b/src/iie/HelloWorld.java index f57cfec..c092825 100644 --- a/src/iie/HelloWorld.java +++ b/src/iie/HelloWorld.java @@ -9,34 +9,27 @@ import org.bukkit.entity.Player; public class HelloWorld implements CommandExecutor { - HelloWorldPlugin plugin; - public HelloWorld(HelloWorldPlugin plugin){ - this.plugin = plugin; - } + //HelloWorldPlugin plugin; + //public HelloWorld(HelloWorldPlugin plugin){ + // this.plugin = plugin; + //} @Override public boolean onCommand(CommandSender sender, Command label, String command, String[] args) { - // TODO Auto-generated method stub - - - - - //sender.sendMessage("WELL, AT LEAST THIS WORKS"); if (sender instanceof Player){ - //sender.sendMessage("sender IS instanceof Player"); + long currentTime = System.currentTimeMillis(); String playername = sender.getName(); long deathTime = 0; - sender.sendMessage("Playername: " + playername); - sender.sendMessage("Data Imported: " + plugin.deathMap.get(playername)); - - if (plugin.deathMap.get(playername) != null){ - deathTime = Long.parseLong(plugin.deathMap.get(playername)); + sender.sendMessage("Data Imported: " + HelloWorldPlugin.deathMap.get(playername)); + + if (HelloWorldPlugin.deathMap.get(playername) != null){ + deathTime = Long.parseLong(HelloWorldPlugin.deathMap.get(playername)); sender.sendMessage("DeathTime: " + deathTime); }else{ sender.sendMessage("you have never died in hardcore"); @@ -46,17 +39,17 @@ public class HelloWorld implements CommandExecutor { player.teleport(location); } - //sender.sendMessage(playername); - //sender.sendMessage(String.valueOf(deathTime)); - //sender.sendMessage(String.valueOf(currentTime)); + if (currentTime - deathTime >= 86400000 && deathTime != 0){ sender.sendMessage((86400000 - (currentTime - deathTime) ) /3600000 + " hours have passed since you died in hardcore last"); Player player = (Player) sender; World hardcoreWorld = player.getServer().getWorld("hardcore"); Location location = new Location(hardcoreWorld, 1280, 71, -179); player.teleport(location); - }else{ + }else if(deathTime == 0){ + sender.sendMessage("good luck"); + }else{ sender.sendMessage("you are dead for the next " + (86400000 - (currentTime - deathTime) ) /3600000 + " hours"); } diff --git a/src/iie/HelloWorldPlugin.java b/src/iie/HelloWorldPlugin.java index f96ed78..17e779c 100644 --- a/src/iie/HelloWorldPlugin.java +++ b/src/iie/HelloWorldPlugin.java @@ -6,13 +6,13 @@ import java.util.HashMap; import org.bukkit.plugin.java.JavaPlugin; public class HelloWorldPlugin extends JavaPlugin { - public AbstractMap deathMap = new HashMap(); + public static AbstractMap deathMap = new HashMap(); public void onEnable(){ registerCommands(); getServer().getPluginManager().registerEvents(new DeathListener(this), this); } public void registerCommands(){ - getCommand("HelloWorld").setExecutor(new HelloWorld(this)); + getCommand("HelloWorld").setExecutor(new HelloWorld(/*this*/)); } } diff --git a/src/iie/publicstaticvoidmain.java b/src/iie/publicstaticvoidmain.java index 5c4a587..aa38426 100644 --- a/src/iie/publicstaticvoidmain.java +++ b/src/iie/publicstaticvoidmain.java @@ -21,8 +21,11 @@ public class publicstaticvoidmain { long currentTime = System.currentTimeMillis(); + int currentTimeInt = (int) (currentTime/1000); System.out.println(currentTime); + System.out.println(currentTimeInt); + System.out.println(Long.parseLong("1472003809703")); From 7d0847924b762569736848e4e0f528ea34b70c7c Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Thu, 25 Aug 2016 18:19:33 -0400 Subject: [PATCH 08/27] added .classpath to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a031ac2..7d05c00 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.class +*.classpath # Mobile Tools for Java (J2ME) .mtj.tmp/ From 090430c864067a8c499392e6e10e250b616655f6 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Thu, 25 Aug 2016 18:41:57 -0400 Subject: [PATCH 09/27] let's test --- .classpath | 4 ++-- src/iie/HelloWorld.java | 8 ++++---- src/iie/HelloWorldPlugin.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.classpath b/.classpath index cefbd63..072474b 100644 --- a/.classpath +++ b/.classpath @@ -2,7 +2,7 @@ - - + + diff --git a/src/iie/HelloWorld.java b/src/iie/HelloWorld.java index c092825..972943f 100644 --- a/src/iie/HelloWorld.java +++ b/src/iie/HelloWorld.java @@ -9,10 +9,10 @@ import org.bukkit.entity.Player; public class HelloWorld implements CommandExecutor { - //HelloWorldPlugin plugin; - //public HelloWorld(HelloWorldPlugin plugin){ - // this.plugin = plugin; - //} + HelloWorldPlugin plugin; + public HelloWorld(HelloWorldPlugin plugin){ + this.plugin = plugin; + } @Override public boolean onCommand(CommandSender sender, Command label, String command, String[] args) { diff --git a/src/iie/HelloWorldPlugin.java b/src/iie/HelloWorldPlugin.java index 17e779c..6544357 100644 --- a/src/iie/HelloWorldPlugin.java +++ b/src/iie/HelloWorldPlugin.java @@ -12,7 +12,7 @@ public class HelloWorldPlugin extends JavaPlugin { getServer().getPluginManager().registerEvents(new DeathListener(this), this); } public void registerCommands(){ - getCommand("HelloWorld").setExecutor(new HelloWorld(/*this*/)); + getCommand("HelloWorld").setExecutor(new HelloWorld(this)); } } From e12cb6879980f87ac0f1d50ea08cedd433b22114 Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Sat, 27 Aug 2016 01:07:32 -0400 Subject: [PATCH 10/27] Created an RTP method --- src/alisolarflare/RandomTP.java | 39 +++++++++++++++++++++++++++++++++ src/iie/HelloWorld.java | 1 + 2 files changed, 40 insertions(+) create mode 100644 src/alisolarflare/RandomTP.java diff --git a/src/alisolarflare/RandomTP.java b/src/alisolarflare/RandomTP.java new file mode 100644 index 0000000..a2378d4 --- /dev/null +++ b/src/alisolarflare/RandomTP.java @@ -0,0 +1,39 @@ +package alisolarflare; + +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.World; +import org.bukkit.entity.Player; + + +public class RandomTP{ + //Randomly teleports a player, into the hardcore world + public void rtp(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()); + + //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; + + //CHECKS - if ground is safe + boolean groundisSafe = world.getHighestBlockAt(attemptedX, attemptedZ).getType() != Material.WATER; + if (groundisSafe){ + player.teleport(world.getHighestBlockAt(attemptedX, attemptedZ).getLocation()); + return; + } + + //player.teleport(arg0) + } + } +} diff --git a/src/iie/HelloWorld.java b/src/iie/HelloWorld.java index 972943f..9f08ff6 100644 --- a/src/iie/HelloWorld.java +++ b/src/iie/HelloWorld.java @@ -7,6 +7,7 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; + public class HelloWorld implements CommandExecutor { HelloWorldPlugin plugin; From e9cb4ef576590d5772b4c7d79bfbc42ee21c0dd6 Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Sat, 27 Aug 2016 01:40:48 -0400 Subject: [PATCH 11/27] Added a diamond armor blocker --- src/alisolarflare/DiamondArmorBlocker.java | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 src/alisolarflare/DiamondArmorBlocker.java diff --git a/src/alisolarflare/DiamondArmorBlocker.java b/src/alisolarflare/DiamondArmorBlocker.java new file mode 100644 index 0000000..80d8eaf --- /dev/null +++ b/src/alisolarflare/DiamondArmorBlocker.java @@ -0,0 +1,49 @@ +package alisolarflare; + +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 void onArmorSmith(CraftItemEvent event){ + //SANITATION - hardcore + if(event.getWhoClicked().getWorld().getName() != "hardcore"){ + return; + } + + //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); + } + + + } + 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. There is no protection here"); + failArmor.getItemMeta().setLore(loreString); + return failArmor; + } +} From 25569a7113c30c7b40633b5b54320550bc91e591 Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Sat, 27 Aug 2016 02:24:27 -0400 Subject: [PATCH 12/27] Created a diamond armor blocker --- src/alisolarflare/{ => listeners}/DiamondArmorBlocker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/alisolarflare/{ => listeners}/DiamondArmorBlocker.java (98%) diff --git a/src/alisolarflare/DiamondArmorBlocker.java b/src/alisolarflare/listeners/DiamondArmorBlocker.java similarity index 98% rename from src/alisolarflare/DiamondArmorBlocker.java rename to src/alisolarflare/listeners/DiamondArmorBlocker.java index 80d8eaf..52c7547 100644 --- a/src/alisolarflare/DiamondArmorBlocker.java +++ b/src/alisolarflare/listeners/DiamondArmorBlocker.java @@ -1,4 +1,4 @@ -package alisolarflare; +package alisolarflare.listeners; import java.util.ArrayList; import java.util.Arrays; From c4eb6565f1bcc9b44fb9d6e729197a190fa0b87e Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Sat, 27 Aug 2016 02:24:55 -0400 Subject: [PATCH 13/27] removed classpath (.gitignore error) --- .classpath | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .classpath diff --git a/.classpath b/.classpath deleted file mode 100644 index 072474b..0000000 --- a/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - From a566c9508787e0b15cd38cfa60fbcdf29fa61e93 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Mon, 29 Aug 2016 19:28:10 -0400 Subject: [PATCH 14/27] Crash-proofing using scoreboard --- src/iie/DeathListener.java | 44 +++++++++++++++++++++++++------ src/iie/HelloWorld.java | 10 +++---- src/iie/HelloWorldPlugin.java | 10 +++++++ src/iie/publicstaticvoidmain.java | 5 ++-- 4 files changed, 54 insertions(+), 15 deletions(-) diff --git a/src/iie/DeathListener.java b/src/iie/DeathListener.java index 4b605af..36aa3c1 100644 --- a/src/iie/DeathListener.java +++ b/src/iie/DeathListener.java @@ -8,6 +8,8 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.entity.PlayerDeathEvent; +import org.bukkit.event.player.PlayerJoinEvent; +import org.bukkit.scoreboard.Score; public class DeathListener implements Listener { @@ -18,24 +20,50 @@ public class DeathListener implements Listener { @EventHandler(priority = EventPriority.MONITOR) public void onHardcoreDeath(PlayerDeathEvent deathEvent){ - - + String timeString = String.valueOf(System.currentTimeMillis()); Player player = deathEvent.getEntity(); String playerString = (String) player.getName(); Location location = player.getLocation(); String worldString = (String) location.getWorld().getName(); - player.sendMessage(timeString); - player.sendMessage(playerString); - player.sendMessage(worldString); + //player.sendMessage(timeString); + //player.sendMessage(playerString); + //player.sendMessage(worldString); if (Objects.equals(worldString, "hardcore")){ HelloWorldPlugin.deathMap.put(playerString, timeString); - player.sendMessage(HelloWorldPlugin.deathMap.toString()); + Score score = HelloWorldPlugin.hardcoreTimeDead.getScore(playerString); + score.setScore((int) (System.currentTimeMillis()/1000)); - player.sendMessage("Key saved: " + playerString); - player.sendMessage("Data saved: " + HelloWorldPlugin.deathMap.get(playerString)); + //player.sendMessage(HelloWorldPlugin.deathMap.toString()); + //player.sendMessage("Key saved: " + playerString); + //player.sendMessage("Data saved: " + HelloWorldPlugin.deathMap.get(playerString)); + } + + } + + @EventHandler(priority = EventPriority.MONITOR) + public void onPlayerLogin(PlayerJoinEvent joinEvent){ + + + + Player player = joinEvent.getPlayer(); + String playerString = (String) player.getName(); + Score score = null; + + + + try{ + score = HelloWorldPlugin.hardcoreTimeDead.getScore(playerString); + }catch(IllegalArgumentException throwable){ + score.setScore(0); + } + + + + if (HelloWorldPlugin.deathMap.get(playerString) == null && score.getScore() != 0){ + HelloWorldPlugin.deathMap.put(playerString, String.valueOf((score.getScore()) * 1000)); } } diff --git a/src/iie/HelloWorld.java b/src/iie/HelloWorld.java index 9f08ff6..8e3d5e4 100644 --- a/src/iie/HelloWorld.java +++ b/src/iie/HelloWorld.java @@ -26,14 +26,14 @@ public class HelloWorld implements CommandExecutor { long currentTime = System.currentTimeMillis(); String playername = sender.getName(); long deathTime = 0; - sender.sendMessage("Playername: " + playername); - sender.sendMessage("Data Imported: " + HelloWorldPlugin.deathMap.get(playername)); + //sender.sendMessage("Playername: " + playername); + //sender.sendMessage("Data Imported: " + HelloWorldPlugin.deathMap.get(playername)); if (HelloWorldPlugin.deathMap.get(playername) != null){ deathTime = Long.parseLong(HelloWorldPlugin.deathMap.get(playername)); - sender.sendMessage("DeathTime: " + deathTime); + //sender.sendMessage("DeathTime: " + deathTime); }else{ - sender.sendMessage("you have never died in hardcore"); + sender.sendMessage("You have never died in hardcore"); Player player = (Player) sender; World hardcoreWorld = player.getServer().getWorld("hardcore"); Location location = new Location(hardcoreWorld, 1280, 71, -179); @@ -43,7 +43,7 @@ public class HelloWorld implements CommandExecutor { if (currentTime - deathTime >= 86400000 && deathTime != 0){ - sender.sendMessage((86400000 - (currentTime - deathTime) ) /3600000 + " hours have passed since you died in hardcore last"); + sender.sendMessage("You died " + (86400000 - (currentTime - deathTime) ) /3600000 + " hours ago. Ready to give it another shot?"); Player player = (Player) sender; World hardcoreWorld = player.getServer().getWorld("hardcore"); Location location = new Location(hardcoreWorld, 1280, 71, -179); diff --git a/src/iie/HelloWorldPlugin.java b/src/iie/HelloWorldPlugin.java index 6544357..382729e 100644 --- a/src/iie/HelloWorldPlugin.java +++ b/src/iie/HelloWorldPlugin.java @@ -3,13 +3,23 @@ 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 AbstractMap deathMap = new HashMap(); + public void onEnable(){ registerCommands(); getServer().getPluginManager().registerEvents(new DeathListener(this), this); + board = Bukkit.getServer().getScoreboardManager().getMainScoreboard(); + hardcoreTimeDead = board.registerNewObjective("hardcoreTimeDead", "dummy"); } public void registerCommands(){ getCommand("HelloWorld").setExecutor(new HelloWorld(this)); diff --git a/src/iie/publicstaticvoidmain.java b/src/iie/publicstaticvoidmain.java index aa38426..65074d0 100644 --- a/src/iie/publicstaticvoidmain.java +++ b/src/iie/publicstaticvoidmain.java @@ -17,15 +17,16 @@ public class publicstaticvoidmain { test = 12345; } + test = (int) (System.currentTimeMillis()/1000); System.out.println(test); long currentTime = System.currentTimeMillis(); int currentTimeInt = (int) (currentTime/1000); - System.out.println(currentTime); + System.out.println(currentTime + " current time"); System.out.println(currentTimeInt); - + System.out.println(Long.parseLong("1472003809703")); From e30e60da28bb62c42df2bf24d8880e24e5f9e0dd Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Tue, 30 Aug 2016 18:17:37 +0200 Subject: [PATCH 15/27] Fix crash at plugin load --- src/iie/HelloWorldPlugin.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/iie/HelloWorldPlugin.java b/src/iie/HelloWorldPlugin.java index 382729e..4061f63 100644 --- a/src/iie/HelloWorldPlugin.java +++ b/src/iie/HelloWorldPlugin.java @@ -8,20 +8,21 @@ 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 AbstractMap deathMap = new HashMap(); - - public void onEnable(){ + public static Objective hardcoreTimeDead; + public static AbstractMap deathMap = new HashMap(); + + public void onEnable() { registerCommands(); getServer().getPluginManager().registerEvents(new DeathListener(this), this); board = Bukkit.getServer().getScoreboardManager().getMainScoreboard(); - hardcoreTimeDead = board.registerNewObjective("hardcoreTimeDead", "dummy"); + if (board.getObjective("hardcoreTimeDead") == null) + hardcoreTimeDead = board.registerNewObjective("hardcoreTimeDead", "dummy"); } - public void registerCommands(){ + + public void registerCommands() { getCommand("HelloWorld").setExecutor(new HelloWorld(this)); } From 1a66291958d2210f4db0830ecee056abd6e11df4 Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Wed, 31 Aug 2016 02:36:49 -0400 Subject: [PATCH 16/27] Started work on ConflictRTP --- src/alisolarflare/RandomTP.java | 113 +++++++++++++++++++++++++++++--- 1 file changed, 105 insertions(+), 8 deletions(-) diff --git a/src/alisolarflare/RandomTP.java b/src/alisolarflare/RandomTP.java index a2378d4..b2e4fcb 100644 --- a/src/alisolarflare/RandomTP.java +++ b/src/alisolarflare/RandomTP.java @@ -7,32 +7,129 @@ import org.bukkit.entity.Player; public class RandomTP{ - //Randomly teleports a player, into the hardcore world - public void rtp(Player player, World world, Location minLocation, Location maxLocation){ - - + + private int conflictX; + private int conflictZ; + private int conflictCycle; + private int conflictRadius = 70; + private boolean northUsed; + private boolean southUsed; + private boolean eastUsed; + private boolean westUsed; + //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; + } + } + } + + int dir = 0; + //CHOOSES A RANDOM DIRECTION + for(int i = 0; i < 1000; i++){ + double randomDirection = Math.random(); + if (randomDirection < 0.25){ + if(northUsed){ + northUsed = true; + dir = 0; + break; + } + }else if(randomDirection < 0.50){ + if(eastUsed){ + eastUsed = true; + dir = 1; + break; + } + }else if(randomDirection < 0.75){ + if(southUsed){ + southUsed = true; + dir = 2; + break; + } + }else{ + if(westUsed){ + westUsed = true; + dir = 3; + break; + } + + } + } + + + + + + //INCREMENT - shift cycle + conflictCycle++; + //conflict cycle - 0:N, 1:E, 2:S, 3:W + } + + //Randomly teleports a player, into the hardcore world + public void rtp(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()); + //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; - + //CHECKS - if ground is safe boolean groundisSafe = world.getHighestBlockAt(attemptedX, attemptedZ).getType() != Material.WATER; if (groundisSafe){ player.teleport(world.getHighestBlockAt(attemptedX, attemptedZ).getLocation()); return; } - + //player.teleport(arg0) } } From 2b4ba7f8ebdec8e3fdfdf37b204ecce1dc1e7ff3 Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Wed, 31 Aug 2016 08:05:56 -0400 Subject: [PATCH 17/27] Finished ConflictRTP code --- src/alisolarflare/RandomTP.java | 39 +++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/src/alisolarflare/RandomTP.java b/src/alisolarflare/RandomTP.java index b2e4fcb..f9c1016 100644 --- a/src/alisolarflare/RandomTP.java +++ b/src/alisolarflare/RandomTP.java @@ -10,7 +10,6 @@ public class RandomTP{ private int conflictX; private int conflictZ; - private int conflictCycle; private int conflictRadius = 70; private boolean northUsed; private boolean southUsed; @@ -63,32 +62,32 @@ public class RandomTP{ } } - int dir = 0; + 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 = 0; + dir = "north"; break; } }else if(randomDirection < 0.50){ if(eastUsed){ eastUsed = true; - dir = 1; + dir = "east"; break; } }else if(randomDirection < 0.75){ if(southUsed){ southUsed = true; - dir = 2; + dir = "south"; break; } }else{ if(westUsed){ westUsed = true; - dir = 3; + dir = "west"; break; } @@ -96,12 +95,28 @@ public class RandomTP{ } - - - - //INCREMENT - shift cycle - conflictCycle++; - //conflict cycle - 0:N, 1:E, 2:S, 3:W + //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 From 6932fa56dd74a240c850c044e46c35fcb1f71aba Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Wed, 31 Aug 2016 08:10:15 -0400 Subject: [PATCH 18/27] Changed Listeners to return boolean values --- .../listeners/ConflictCompassCraftingListener.java | 14 ++++++++++++++ .../listeners/DiamondArmorBlocker.java | 5 +++-- src/iie/DeathListener.java | 7 ++++--- 3 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 src/alisolarflare/listeners/ConflictCompassCraftingListener.java diff --git a/src/alisolarflare/listeners/ConflictCompassCraftingListener.java b/src/alisolarflare/listeners/ConflictCompassCraftingListener.java new file mode 100644 index 0000000..e7f1f58 --- /dev/null +++ b/src/alisolarflare/listeners/ConflictCompassCraftingListener.java @@ -0,0 +1,14 @@ +package alisolarflare.listeners; + +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.inventory.CraftItemEvent; + +public class ConflictCompassCraftingListener implements Listener{ + + @EventHandler + public boolean onConflictCompassCraft(CraftItemEvent event){ + + return false; + } +} diff --git a/src/alisolarflare/listeners/DiamondArmorBlocker.java b/src/alisolarflare/listeners/DiamondArmorBlocker.java index 52c7547..842f307 100644 --- a/src/alisolarflare/listeners/DiamondArmorBlocker.java +++ b/src/alisolarflare/listeners/DiamondArmorBlocker.java @@ -15,10 +15,10 @@ 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 void onArmorSmith(CraftItemEvent event){ + public boolean onArmorSmith(CraftItemEvent event){ //SANITATION - hardcore if(event.getWhoClicked().getWorld().getName() != "hardcore"){ - return; + return false; } //INIT - inventory, targetItem @@ -33,6 +33,7 @@ public class DiamondArmorBlocker implements Listener{ 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; } diff --git a/src/iie/DeathListener.java b/src/iie/DeathListener.java index 36aa3c1..964aef3 100644 --- a/src/iie/DeathListener.java +++ b/src/iie/DeathListener.java @@ -19,7 +19,7 @@ public class DeathListener implements Listener { } @EventHandler(priority = EventPriority.MONITOR) - public void onHardcoreDeath(PlayerDeathEvent deathEvent){ + public boolean onHardcoreDeath(PlayerDeathEvent deathEvent){ String timeString = String.valueOf(System.currentTimeMillis()); Player player = deathEvent.getEntity(); @@ -40,11 +40,12 @@ public class DeathListener implements Listener { //player.sendMessage("Key saved: " + playerString); //player.sendMessage("Data saved: " + HelloWorldPlugin.deathMap.get(playerString)); } + return false; } @EventHandler(priority = EventPriority.MONITOR) - public void onPlayerLogin(PlayerJoinEvent joinEvent){ + public boolean onPlayerLogin(PlayerJoinEvent joinEvent){ @@ -65,7 +66,7 @@ public class DeathListener implements Listener { if (HelloWorldPlugin.deathMap.get(playerString) == null && score.getScore() != 0){ HelloWorldPlugin.deathMap.put(playerString, String.valueOf((score.getScore()) * 1000)); } - + return false; } } From f9b4d9abe4dd1ad971fc40a8489cc67c98f1c32d Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Wed, 31 Aug 2016 08:33:45 -0400 Subject: [PATCH 19/27] Created a Conflict Compass Crafting listener --- .../ConflictCompassCraftingListener.java | 56 ++++++++++++++++++- .../listeners/DiamondArmorBlocker.java | 3 +- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/src/alisolarflare/listeners/ConflictCompassCraftingListener.java b/src/alisolarflare/listeners/ConflictCompassCraftingListener.java index e7f1f58..ee2c355 100644 --- a/src/alisolarflare/listeners/ConflictCompassCraftingListener.java +++ b/src/alisolarflare/listeners/ConflictCompassCraftingListener.java @@ -1,14 +1,68 @@ 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{ - + @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 index 842f307..277dd36 100644 --- a/src/alisolarflare/listeners/DiamondArmorBlocker.java +++ b/src/alisolarflare/listeners/DiamondArmorBlocker.java @@ -43,7 +43,8 @@ public class DiamondArmorBlocker implements Listener{ //INIT - Chainmail's lore List loreString = new ArrayList(); - loreString.add("This world is forever dangerous. There is no protection here"); + loreString.add("This world is forever dangerous."); + loreString.add("There is no protection here."); failArmor.getItemMeta().setLore(loreString); return failArmor; } From 5eed40ddb61b37b413f4244594c6c4523eaca4cc Mon Sep 17 00:00:00 2001 From: BuildTools Date: Wed, 31 Aug 2016 13:59:31 -0400 Subject: [PATCH 20/27] More fixes --- src/iie/DeathListener.java | 16 ++++++++++------ src/iie/HelloWorldPlugin.java | 14 ++++++++++++-- src/iie/publicstaticvoidmain.java | 18 +++++------------- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/iie/DeathListener.java b/src/iie/DeathListener.java index 36aa3c1..0c65131 100644 --- a/src/iie/DeathListener.java +++ b/src/iie/DeathListener.java @@ -8,7 +8,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.entity.PlayerDeathEvent; -import org.bukkit.event.player.PlayerJoinEvent; +import org.bukkit.event.player.PlayerLoginEvent; import org.bukkit.scoreboard.Score; public class DeathListener implements Listener { @@ -33,8 +33,7 @@ public class DeathListener implements Listener { if (Objects.equals(worldString, "hardcore")){ HelloWorldPlugin.deathMap.put(playerString, timeString); - Score score = HelloWorldPlugin.hardcoreTimeDead.getScore(playerString); - score.setScore((int) (System.currentTimeMillis()/1000)); + HelloWorldPlugin.hardcoreTimeDead.getScore(playerString).setScore((int) (System.currentTimeMillis()/1000)); //player.sendMessage(HelloWorldPlugin.deathMap.toString()); //player.sendMessage("Key saved: " + playerString); @@ -44,26 +43,31 @@ public class DeathListener implements Listener { } @EventHandler(priority = EventPriority.MONITOR) - public void onPlayerLogin(PlayerJoinEvent joinEvent){ + public void onPlayerLogin(PlayerLoginEvent loginEvent){ - Player player = joinEvent.getPlayer(); + Player player = loginEvent.getPlayer(); String playerString = (String) player.getName(); Score score = null; + player.sendMessage(playerString + " has joined"); + try{ score = HelloWorldPlugin.hardcoreTimeDead.getScore(playerString); - }catch(IllegalArgumentException throwable){ + player.sendMessage("hardcoreTimeDead = " + String.valueOf(score.getScore())); + }catch(IllegalArgumentException e){ score.setScore(0); + player.sendMessage("hardcoreTimeDead = " + String.valueOf(score.getScore())); } if (HelloWorldPlugin.deathMap.get(playerString) == null && score.getScore() != 0){ HelloWorldPlugin.deathMap.put(playerString, String.valueOf((score.getScore()) * 1000)); + player.sendMessage(HelloWorldPlugin.deathMap.get(playerString)); } } diff --git a/src/iie/HelloWorldPlugin.java b/src/iie/HelloWorldPlugin.java index 382729e..13e6cfc 100644 --- a/src/iie/HelloWorldPlugin.java +++ b/src/iie/HelloWorldPlugin.java @@ -18,8 +18,18 @@ public class HelloWorldPlugin extends JavaPlugin { public void onEnable(){ registerCommands(); getServer().getPluginManager().registerEvents(new DeathListener(this), this); - board = Bukkit.getServer().getScoreboardManager().getMainScoreboard(); - hardcoreTimeDead = board.registerNewObjective("hardcoreTimeDead", "dummy"); + + + board = Bukkit.getServer().getScoreboardManager().getMainScoreboard(); + try{ + board.getObjective("hardcoreTimeDead"); + }catch (IllegalArgumentException e){ + hardcoreTimeDead = board.registerNewObjective("hardcoreTimeDead", "dummy"); + }finally{ + hardcoreTimeDead = board.getObjective("hardcoreTimeDead"); + } + + } public void registerCommands(){ getCommand("HelloWorld").setExecutor(new HelloWorld(this)); diff --git a/src/iie/publicstaticvoidmain.java b/src/iie/publicstaticvoidmain.java index 65074d0..8be7eba 100644 --- a/src/iie/publicstaticvoidmain.java +++ b/src/iie/publicstaticvoidmain.java @@ -8,18 +8,8 @@ public class publicstaticvoidmain { public static void main(String[] args){ System.out.println("Hello World!"); - int test = 1234; - String testString = Integer.toString(test); - int test2 = Integer.parseInt(testString); - System.out.println(test2); - - if (test == 1234){ - test = 12345; - } - - test = (int) (System.currentTimeMillis()/1000); - System.out.println(test); - + int test = (int) (System.currentTimeMillis()/1000); + System.out.println(test); long currentTime = System.currentTimeMillis(); int currentTimeInt = (int) (currentTime/1000); @@ -37,7 +27,9 @@ public class publicstaticvoidmain { System.out.println(deathTime + " is a number"); System.out.println(deathMap.get("other")); - System.out.println("you are dead for the next " + ((86400000 - (currentTime - deathTime))/3600000) + " hours"); + System.out.println("you are dead for the next " + ((86400000 - (currentTime - deathTime))/3600000) + " hours"); + + From fb43e3c8d718e3e5b36715b02b885b79232bd977 Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Sun, 4 Sep 2016 21:22:17 -0400 Subject: [PATCH 21/27] Finalized the RandomTP --- plugin.yml | 4 +- src/alisolarflare/RandomTP.java | 45 ++++++++++++++++--- src/alisolarflare/listeners/CompassLobby.java | 26 +++++++++++ .../ConflictCompassCraftingListener.java | 18 +++++--- 4 files changed, 80 insertions(+), 13 deletions(-) create mode 100644 src/alisolarflare/listeners/CompassLobby.java diff --git a/plugin.yml b/plugin.yml index 13eb73d..cd81552 100644 --- a/plugin.yml +++ b/plugin.yml @@ -3,4 +3,6 @@ name: HelloWorldPlugin commands: HelloWorld: - description: Command that says Hello World! \ No newline at end of file + 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/alisolarflare/RandomTP.java b/src/alisolarflare/RandomTP.java index f9c1016..78b2094 100644 --- a/src/alisolarflare/RandomTP.java +++ b/src/alisolarflare/RandomTP.java @@ -3,10 +3,15 @@ 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{ + +public class RandomTP implements CommandExecutor{ private int conflictX; private int conflictZ; @@ -15,6 +20,12 @@ public class RandomTP{ 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){ @@ -121,26 +132,31 @@ public class RandomTP{ //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; } @@ -148,4 +164,21 @@ public class RandomTP{ //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 index ee2c355..ab26daf 100644 --- a/src/alisolarflare/listeners/ConflictCompassCraftingListener.java +++ b/src/alisolarflare/listeners/ConflictCompassCraftingListener.java @@ -14,21 +14,27 @@ 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"){ + if(event.getWhoClicked().getWorld().getName() != "hardcore") return false; - } + //INIT - targetItem ItemStack targetItem = event.getRecipe().getResult(); //SANITATION - NOT COMPASS - if(targetItem.getType() != Material.COMPASS){ + if(targetItem.getType() != Material.COMPASS) return false; - } + event.setCancelled(true); //GIVE - chainmail chestplate @@ -60,9 +66,9 @@ public class ConflictCompassCraftingListener implements Listener{ nearestPlayer = player; } } - if(nearestPlayer == null){ + if(nearestPlayer == null) return "METAL"; - } + return nearestPlayer.toString(); } } From d060bd118a8b7a884783d4bd214c8b1eaa9ae39c Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Sun, 4 Sep 2016 21:29:59 -0400 Subject: [PATCH 22/27] Revert "Finalized the RandomTP" This reverts commit fb43e3c8d718e3e5b36715b02b885b79232bd977. --- plugin.yml | 4 +- src/alisolarflare/RandomTP.java | 45 +++---------------- src/alisolarflare/listeners/CompassLobby.java | 26 ----------- .../ConflictCompassCraftingListener.java | 18 +++----- 4 files changed, 13 insertions(+), 80 deletions(-) delete mode 100644 src/alisolarflare/listeners/CompassLobby.java diff --git a/plugin.yml b/plugin.yml index cd81552..13eb73d 100644 --- a/plugin.yml +++ b/plugin.yml @@ -3,6 +3,4 @@ name: HelloWorldPlugin commands: HelloWorld: - description: Command that says Hello World! - debugRTP: - description: Command that randomly teleports someone inside the hardcore world \ No newline at end of file + description: Command that says Hello World! \ No newline at end of file diff --git a/src/alisolarflare/RandomTP.java b/src/alisolarflare/RandomTP.java index 78b2094..f9c1016 100644 --- a/src/alisolarflare/RandomTP.java +++ b/src/alisolarflare/RandomTP.java @@ -3,15 +3,10 @@ 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{ +public class RandomTP{ private int conflictX; private int conflictZ; @@ -20,12 +15,6 @@ public class RandomTP implements CommandExecutor{ 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){ @@ -132,31 +121,26 @@ public class RandomTP implements CommandExecutor{ //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; } @@ -164,21 +148,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/alisolarflare/listeners/CompassLobby.java b/src/alisolarflare/listeners/CompassLobby.java deleted file mode 100644 index a07f676..0000000 --- a/src/alisolarflare/listeners/CompassLobby.java +++ /dev/null @@ -1,26 +0,0 @@ -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 index ab26daf..ee2c355 100644 --- a/src/alisolarflare/listeners/ConflictCompassCraftingListener.java +++ b/src/alisolarflare/listeners/ConflictCompassCraftingListener.java @@ -14,27 +14,21 @@ 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") + if(event.getWhoClicked().getWorld().getName() != "hardcore"){ return false; - + } //INIT - targetItem ItemStack targetItem = event.getRecipe().getResult(); //SANITATION - NOT COMPASS - if(targetItem.getType() != Material.COMPASS) + if(targetItem.getType() != Material.COMPASS){ return false; - + } event.setCancelled(true); //GIVE - chainmail chestplate @@ -66,9 +60,9 @@ public class ConflictCompassCraftingListener implements Listener{ nearestPlayer = player; } } - if(nearestPlayer == null) + if(nearestPlayer == null){ return "METAL"; - + } return nearestPlayer.toString(); } } From 134b395ac8166351605621d916458fc0029ba366 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Wed, 31 Aug 2016 18:41:49 -0400 Subject: [PATCH 23/27] testcommit --- src/alisolarflare/RandomTP.java | 1 - src/iie/DeathListener.java | 46 +++++++++++++++++++++---------- src/iie/HelloWorld.java | 5 ++++ src/iie/HelloWorldPlugin.java | 32 +++++++++++++++------ src/iie/publicstaticvoidmain.java | 38 ------------------------- 5 files changed, 60 insertions(+), 62 deletions(-) delete mode 100644 src/iie/publicstaticvoidmain.java diff --git a/src/alisolarflare/RandomTP.java b/src/alisolarflare/RandomTP.java index f9c1016..046aae0 100644 --- a/src/alisolarflare/RandomTP.java +++ b/src/alisolarflare/RandomTP.java @@ -5,7 +5,6 @@ import org.bukkit.Material; import org.bukkit.World; import org.bukkit.entity.Player; - public class RandomTP{ private int conflictX; diff --git a/src/iie/DeathListener.java b/src/iie/DeathListener.java index 0c65131..cec2892 100644 --- a/src/iie/DeathListener.java +++ b/src/iie/DeathListener.java @@ -8,8 +8,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.entity.PlayerDeathEvent; -import org.bukkit.event.player.PlayerLoginEvent; -import org.bukkit.scoreboard.Score; +import org.bukkit.event.player.PlayerJoinEvent; public class DeathListener implements Listener { @@ -33,8 +32,18 @@ public class DeathListener implements Listener { if (Objects.equals(worldString, "hardcore")){ HelloWorldPlugin.deathMap.put(playerString, timeString); + + + if (HelloWorldPlugin.hardcoreTimeDead == null){ + player.sendMessage("Objective hardcoreTimeDead was null"); + }else if (HelloWorldPlugin.hardcoreTimeDead.getScore(playerString) == null){ + HelloWorldPlugin.hardcoreTimeDead.getScore(playerString).setScore(0); + player.sendMessage("Score for hardcoreTimeDead was null, set to " + String.valueOf(HelloWorldPlugin.hardcoreTimeDead.getScore(playerString).getScore())); + } + HelloWorldPlugin.hardcoreTimeDead.getScore(playerString).setScore((int) (System.currentTimeMillis()/1000)); + //player.sendMessage(HelloWorldPlugin.deathMap.toString()); //player.sendMessage("Key saved: " + playerString); //player.sendMessage("Data saved: " + HelloWorldPlugin.deathMap.get(playerString)); @@ -43,32 +52,39 @@ public class DeathListener implements Listener { } @EventHandler(priority = EventPriority.MONITOR) - public void onPlayerLogin(PlayerLoginEvent loginEvent){ + public void onPlayerJoin(PlayerJoinEvent JoinEvent){ - Player player = loginEvent.getPlayer(); + Player player = JoinEvent.getPlayer(); String playerString = (String) player.getName(); - Score score = null; player.sendMessage(playerString + " has joined"); - try{ - score = HelloWorldPlugin.hardcoreTimeDead.getScore(playerString); - player.sendMessage("hardcoreTimeDead = " + String.valueOf(score.getScore())); - }catch(IllegalArgumentException e){ - score.setScore(0); - player.sendMessage("hardcoreTimeDead = " + String.valueOf(score.getScore())); + if (HelloWorldPlugin.hardcoreTimeDead.getScore(playerString) != null){ + HelloWorldPlugin.deathMap.put(playerString, String.valueOf((HelloWorldPlugin.hardcoreTimeDead.getScore(playerString).getScore()) * 1000)); + player.sendMessage("getScore(playerString) was not null"); + }else{ + HelloWorldPlugin.hardcoreTimeDead.getScore(playerString).setScore(0); + HelloWorldPlugin.deathMap.put(playerString, String.valueOf(HelloWorldPlugin.hardcoreTimeDead.getScore(playerString).getScore())); } + + //try{ + // HelloWorldPlugin.hardcoreTimeDead.getScore(playerString); + // player.sendMessage("try"); + //}catch(IllegalArgumentException e){ + // HelloWorldPlugin.hardcoreTimeDead.getScore(playerString).setScore(1); + // player.sendMessage("catch"); + //}finally{ + // HelloWorldPlugin.deathMap.put(playerString, String.valueOf((HelloWorldPlugin.hardcoreTimeDead.getScore(playerString).getScore()) * 1000)); + // player.sendMessage("finally"); + //} + - if (HelloWorldPlugin.deathMap.get(playerString) == null && score.getScore() != 0){ - HelloWorldPlugin.deathMap.put(playerString, String.valueOf((score.getScore()) * 1000)); - player.sendMessage(HelloWorldPlugin.deathMap.get(playerString)); - } } diff --git a/src/iie/HelloWorld.java b/src/iie/HelloWorld.java index 8e3d5e4..b479e65 100644 --- a/src/iie/HelloWorld.java +++ b/src/iie/HelloWorld.java @@ -54,7 +54,12 @@ public class HelloWorld implements CommandExecutor { sender.sendMessage("you are dead for the next " + (86400000 - (currentTime - deathTime) ) /3600000 + " hours"); } + + + sender.sendMessage("Your hardcoreTimeDead score is " + String.valueOf(HelloWorldPlugin.hardcoreTimeDead.getScore(playername).getScore())); + + }else{ sender.sendMessage("You must be a player to use this command!"); } diff --git a/src/iie/HelloWorldPlugin.java b/src/iie/HelloWorldPlugin.java index 13e6cfc..1d7ae4c 100644 --- a/src/iie/HelloWorldPlugin.java +++ b/src/iie/HelloWorldPlugin.java @@ -16,23 +16,39 @@ public class HelloWorldPlugin extends JavaPlugin { public static AbstractMap deathMap = new HashMap(); public void onEnable(){ - registerCommands(); - getServer().getPluginManager().registerEvents(new DeathListener(this), this); - board = Bukkit.getServer().getScoreboardManager().getMainScoreboard(); try{ board.getObjective("hardcoreTimeDead"); - }catch (IllegalArgumentException e){ - hardcoreTimeDead = board.registerNewObjective("hardcoreTimeDead", "dummy"); - }finally{ - hardcoreTimeDead = board.getObjective("hardcoreTimeDead"); - } + }catch (NullPointerException e){ + hardcoreTimeDead = board.registerNewObjective("hardcoreTimeDead", "dummy"); + }finally{ + hardcoreTimeDead = board.getObjective("hardcoreTimeDead"); + } + board = Bukkit.getServer().getScoreboardManager().getMainScoreboard(); + if (board.getObjective("hardcoreTimeDead") != null){ + hardcoreTimeDead = board.getObjective("hardcoreTimeDead"); + }else{ + hardcoreTimeDead = board.registerNewObjective("hardcoreTimeDead", "dummy"); + + } + + registerCommands(); + getServer().getPluginManager().registerEvents(new DeathListener(this), this); + } public void registerCommands(){ getCommand("HelloWorld").setExecutor(new HelloWorld(this)); } } + +//try{ +// board.getObjective("hardcoreTimeDead"); +//}catch (IllegalArgumentException e){ +// hardcoreTimeDead = board.registerNewObjective("hardcoreTimeDead", "dummy"); +//}finally{ +// hardcoreTimeDead = board.getObjective("hardcoreTimeDead"); +//} \ No newline at end of file diff --git a/src/iie/publicstaticvoidmain.java b/src/iie/publicstaticvoidmain.java deleted file mode 100644 index 8be7eba..0000000 --- a/src/iie/publicstaticvoidmain.java +++ /dev/null @@ -1,38 +0,0 @@ -package iie; - -import java.util.AbstractMap; -import java.util.HashMap; - -public class publicstaticvoidmain { - - public static void main(String[] args){ - System.out.println("Hello World!"); - - int test = (int) (System.currentTimeMillis()/1000); - System.out.println(test); - - long currentTime = System.currentTimeMillis(); - int currentTimeInt = (int) (currentTime/1000); - - System.out.println(currentTime + " current time"); - System.out.println(currentTimeInt); - - - System.out.println(Long.parseLong("1472003809703")); - - AbstractMap deathMap = new HashMap(); - deathMap.put("test", "1472003809703"); - long deathTime = Long.parseLong(deathMap.get("test")); - System.out.println(deathMap.get("test")); - System.out.println(deathTime + " is a number"); - - System.out.println(deathMap.get("other")); - System.out.println("you are dead for the next " + ((86400000 - (currentTime - deathTime))/3600000) + " hours"); - - - - - - - } -} From 7c82d7879ac59e387a60c48cba13d0eb32535dc7 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sun, 4 Sep 2016 21:33:53 -0400 Subject: [PATCH 24/27] changed command to "hardcore" removed debug messages, removed usage of hashmap to rely entirely on scoreboard, --- plugin.yml | 4 +-- src/iie/DeathListener.java | 65 +++-------------------------------- src/iie/HelloWorld.java | 52 ++++++++++++---------------- src/iie/HelloWorldPlugin.java | 24 +++---------- src/iie/JoinListener.java | 33 ++++++++++++++++++ 5 files changed, 66 insertions(+), 112 deletions(-) create mode 100644 src/iie/JoinListener.java diff --git a/plugin.yml b/plugin.yml index 13eb73d..787dc91 100644 --- a/plugin.yml +++ b/plugin.yml @@ -2,5 +2,5 @@ version: 1.0.0 name: HelloWorldPlugin commands: - HelloWorld: - description: Command that says Hello World! \ No newline at end of file + hardcore: + description: Command that teleports you to hardcore world \ No newline at end of file diff --git a/src/iie/DeathListener.java b/src/iie/DeathListener.java index cec2892..34a943f 100644 --- a/src/iie/DeathListener.java +++ b/src/iie/DeathListener.java @@ -8,7 +8,6 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.entity.PlayerDeathEvent; -import org.bukkit.event.player.PlayerJoinEvent; public class DeathListener implements Listener { @@ -20,72 +19,18 @@ public class DeathListener implements Listener { @EventHandler(priority = EventPriority.MONITOR) public void onHardcoreDeath(PlayerDeathEvent deathEvent){ - String timeString = String.valueOf(System.currentTimeMillis()); + int currentTime = (int) ((System.currentTimeMillis())/1000); //divided by 1000 to fit within Integer range Player player = deathEvent.getEntity(); - String playerString = (String) player.getName(); + String playername = (String) player.getName(); Location location = player.getLocation(); String worldString = (String) location.getWorld().getName(); - //player.sendMessage(timeString); - //player.sendMessage(playerString); - //player.sendMessage(worldString); - if (Objects.equals(worldString, "hardcore")){ - HelloWorldPlugin.deathMap.put(playerString, timeString); - - if (HelloWorldPlugin.hardcoreTimeDead == null){ - player.sendMessage("Objective hardcoreTimeDead was null"); - }else if (HelloWorldPlugin.hardcoreTimeDead.getScore(playerString) == null){ - HelloWorldPlugin.hardcoreTimeDead.getScore(playerString).setScore(0); - player.sendMessage("Score for hardcoreTimeDead was null, set to " + String.valueOf(HelloWorldPlugin.hardcoreTimeDead.getScore(playerString).getScore())); - } + if (HelloWorldPlugin.hardcoreTimeDead.getScore(playername) == null) //null check + HelloWorldPlugin.hardcoreTimeDead.getScore(playername).setScore(0); //convert null to 0 - HelloWorldPlugin.hardcoreTimeDead.getScore(playerString).setScore((int) (System.currentTimeMillis()/1000)); - - - //player.sendMessage(HelloWorldPlugin.deathMap.toString()); - //player.sendMessage("Key saved: " + playerString); - //player.sendMessage("Data saved: " + HelloWorldPlugin.deathMap.get(playerString)); + HelloWorldPlugin.hardcoreTimeDead.getScore(playername).setScore(currentTime); } - } - - @EventHandler(priority = EventPriority.MONITOR) - public void onPlayerJoin(PlayerJoinEvent JoinEvent){ - - - - Player player = JoinEvent.getPlayer(); - String playerString = (String) player.getName(); - - player.sendMessage(playerString + " has joined"); - - - - if (HelloWorldPlugin.hardcoreTimeDead.getScore(playerString) != null){ - HelloWorldPlugin.deathMap.put(playerString, String.valueOf((HelloWorldPlugin.hardcoreTimeDead.getScore(playerString).getScore()) * 1000)); - player.sendMessage("getScore(playerString) was not null"); - }else{ - HelloWorldPlugin.hardcoreTimeDead.getScore(playerString).setScore(0); - HelloWorldPlugin.deathMap.put(playerString, String.valueOf(HelloWorldPlugin.hardcoreTimeDead.getScore(playerString).getScore())); - } - - - - //try{ - // HelloWorldPlugin.hardcoreTimeDead.getScore(playerString); - // player.sendMessage("try"); - //}catch(IllegalArgumentException e){ - // HelloWorldPlugin.hardcoreTimeDead.getScore(playerString).setScore(1); - // player.sendMessage("catch"); - //}finally{ - // HelloWorldPlugin.deathMap.put(playerString, String.valueOf((HelloWorldPlugin.hardcoreTimeDead.getScore(playerString).getScore()) * 1000)); - // player.sendMessage("finally"); - //} - - - - } - } diff --git a/src/iie/HelloWorld.java b/src/iie/HelloWorld.java index b479e65..dc91d63 100644 --- a/src/iie/HelloWorld.java +++ b/src/iie/HelloWorld.java @@ -1,6 +1,7 @@ package iie; import org.bukkit.Location; +import org.bukkit.Sound; import org.bukkit.World; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; @@ -20,55 +21,46 @@ public class HelloWorld implements CommandExecutor { - + if (sender instanceof Player){ - - long currentTime = System.currentTimeMillis(); + + Player player = (Player) sender; String playername = sender.getName(); - long deathTime = 0; - //sender.sendMessage("Playername: " + playername); - //sender.sendMessage("Data Imported: " + HelloWorldPlugin.deathMap.get(playername)); + + 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.deathMap.get(playername) != null){ - deathTime = Long.parseLong(HelloWorldPlugin.deathMap.get(playername)); - //sender.sendMessage("DeathTime: " + deathTime); - }else{ - sender.sendMessage("You have never died in hardcore"); - Player player = (Player) sender; - World hardcoreWorld = player.getServer().getWorld("hardcore"); - Location location = new Location(hardcoreWorld, 1280, 71, -179); - player.teleport(location); - } + 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 >= 86400000 && deathTime != 0){ - sender.sendMessage("You died " + (86400000 - (currentTime - deathTime) ) /3600000 + " hours ago. Ready to give it another shot?"); - Player player = (Player) sender; - World hardcoreWorld = player.getServer().getWorld("hardcore"); - Location location = new Location(hardcoreWorld, 1280, 71, -179); + if (currentTime - deathTime >= 86400 && deathTime != 0){ + sender.sendMessage("You died " + (86400 - (currentTime - deathTime)) /3600 + " hours ago. Ready to give it another shot?"); player.teleport(location); + // player.getWorld().playSound(player.getLocation(), Sound.AMBIENT_CAVE,0,0); I don't think this works, fix later }else if(deathTime == 0){ - sender.sendMessage("good luck"); + sender.sendMessage("You have never died in hardcore. Good luck!"); + player.teleport(location); + // player.getWorld().playSound(player.getLocation(), Sound.AMBIENT_CAVE,0,0); I don't think this works, fix later }else{ - sender.sendMessage("you are dead for the next " + (86400000 - (currentTime - deathTime) ) /3600000 + " hours"); + sender.sendMessage("you are dead for the next " + (86400 - (currentTime - deathTime) ) /3600 + " hours"); + // player.getWorld().playSound(player.getLocation(), Sound.AMBIENT_CAVE,0,0); I don't think this works, fix later + // replace sound with some other sound } - sender.sendMessage("Your hardcoreTimeDead score is " + String.valueOf(HelloWorldPlugin.hardcoreTimeDead.getScore(playername).getScore())); - - - }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 index 1d7ae4c..a7fe954 100644 --- a/src/iie/HelloWorldPlugin.java +++ b/src/iie/HelloWorldPlugin.java @@ -18,37 +18,21 @@ public class HelloWorldPlugin extends JavaPlugin { public void onEnable(){ - try{ - board.getObjective("hardcoreTimeDead"); - }catch (NullPointerException e){ - hardcoreTimeDead = board.registerNewObjective("hardcoreTimeDead", "dummy"); - }finally{ - hardcoreTimeDead = board.getObjective("hardcoreTimeDead"); - } - - board = Bukkit.getServer().getScoreboardManager().getMainScoreboard(); if (board.getObjective("hardcoreTimeDead") != null){ hardcoreTimeDead = board.getObjective("hardcoreTimeDead"); }else{ hardcoreTimeDead = board.registerNewObjective("hardcoreTimeDead", "dummy"); - } registerCommands(); + getServer().getPluginManager().registerEvents(new JoinListener(this), this); getServer().getPluginManager().registerEvents(new DeathListener(this), this); + } public void registerCommands(){ - getCommand("HelloWorld").setExecutor(new HelloWorld(this)); + getCommand("hardcore").setExecutor(new HelloWorld(this)); } -} - -//try{ -// board.getObjective("hardcoreTimeDead"); -//}catch (IllegalArgumentException e){ -// hardcoreTimeDead = board.registerNewObjective("hardcoreTimeDead", "dummy"); -//}finally{ -// hardcoreTimeDead = board.getObjective("hardcoreTimeDead"); -//} \ No newline at end of file +} \ No newline at end of file diff --git a/src/iie/JoinListener.java b/src/iie/JoinListener.java new file mode 100644 index 0000000..86512b1 --- /dev/null +++ b/src/iie/JoinListener.java @@ -0,0 +1,33 @@ +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.hardcoreTimeDead.getScore(playername) == null) //null check + HelloWorldPlugin.hardcoreTimeDead.getScore(playername).setScore(0); //convert null to 0 + + + //HelloWorldPlugin.deathMap.put(playername, String.valueOf(HelloWorldPlugin.hardcoreTimeDead.getScore(playername).getScore())); + + + } + +} From 59d8dc791cc69a7461c96b6c44ac3cd3d43ba0a7 Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Sun, 4 Sep 2016 21:52:27 -0400 Subject: [PATCH 25/27] Try to merge my commit, past the conflicts --- plugin.yml | 6 ++- src/alisolarflare/RandomTP.java | 45 ++++++++++++++++--- src/alisolarflare/listeners/CompassLobby.java | 26 +++++++++++ .../ConflictCompassCraftingListener.java | 18 +++++--- 4 files changed, 82 insertions(+), 13 deletions(-) create mode 100644 src/alisolarflare/listeners/CompassLobby.java diff --git a/plugin.yml b/plugin.yml index 787dc91..d8927be 100644 --- a/plugin.yml +++ b/plugin.yml @@ -3,4 +3,8 @@ name: HelloWorldPlugin commands: hardcore: - description: Command that teleports you to hardcore world \ No newline at end of file + 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/alisolarflare/RandomTP.java b/src/alisolarflare/RandomTP.java index 046aae0..d92800c 100644 --- a/src/alisolarflare/RandomTP.java +++ b/src/alisolarflare/RandomTP.java @@ -3,9 +3,14 @@ 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; -public class RandomTP{ +import iie.HelloWorldPlugin; + +public class RandomTP implements CommandExecutor{ private int conflictX; private int conflictZ; @@ -14,6 +19,12 @@ public class RandomTP{ 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){ @@ -120,26 +131,31 @@ public class RandomTP{ //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; } @@ -147,4 +163,21 @@ public class RandomTP{ //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 index ee2c355..ab26daf 100644 --- a/src/alisolarflare/listeners/ConflictCompassCraftingListener.java +++ b/src/alisolarflare/listeners/ConflictCompassCraftingListener.java @@ -14,21 +14,27 @@ 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"){ + if(event.getWhoClicked().getWorld().getName() != "hardcore") return false; - } + //INIT - targetItem ItemStack targetItem = event.getRecipe().getResult(); //SANITATION - NOT COMPASS - if(targetItem.getType() != Material.COMPASS){ + if(targetItem.getType() != Material.COMPASS) return false; - } + event.setCancelled(true); //GIVE - chainmail chestplate @@ -60,9 +66,9 @@ public class ConflictCompassCraftingListener implements Listener{ nearestPlayer = player; } } - if(nearestPlayer == null){ + if(nearestPlayer == null) return "METAL"; - } + return nearestPlayer.toString(); } } From 0dd474ce86d35528ea6af476590d6c1cb628264c Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Sun, 4 Sep 2016 23:08:57 -0400 Subject: [PATCH 26/27] edited stuff --- src/iie/HelloWorld.java | 1 - src/iie/HelloWorldPlugin.java | 36 +++++++++++++++-------------------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/src/iie/HelloWorld.java b/src/iie/HelloWorld.java index dc91d63..be0e354 100644 --- a/src/iie/HelloWorld.java +++ b/src/iie/HelloWorld.java @@ -1,7 +1,6 @@ package iie; import org.bukkit.Location; -import org.bukkit.Sound; import org.bukkit.World; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/iie/HelloWorldPlugin.java b/src/iie/HelloWorldPlugin.java index a7fe954..ed1e3b7 100644 --- a/src/iie/HelloWorldPlugin.java +++ b/src/iie/HelloWorldPlugin.java @@ -8,31 +8,25 @@ import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scoreboard.Objective; import org.bukkit.scoreboard.Scoreboard; +import alisolarflare.RandomTP; public class HelloWorldPlugin extends JavaPlugin { - + public static Scoreboard board; - public static Objective hardcoreTimeDead; - public static AbstractMap deathMap = new HashMap(); - - public void onEnable(){ - - - board = Bukkit.getServer().getScoreboardManager().getMainScoreboard(); - if (board.getObjective("hardcoreTimeDead") != null){ - hardcoreTimeDead = board.getObjective("hardcoreTimeDead"); - }else{ - hardcoreTimeDead = board.registerNewObjective("hardcoreTimeDead", "dummy"); - } - + public static Objective hardcoreTimeDead; + public static AbstractMap deathMap = new HashMap(); + + public void onEnable() { registerCommands(); - getServer().getPluginManager().registerEvents(new JoinListener(this), this); getServer().getPluginManager().registerEvents(new DeathListener(this), this); - - - } - public void registerCommands(){ - getCommand("hardcore").setExecutor(new HelloWorld(this)); + board = Bukkit.getServer().getScoreboardManager().getMainScoreboard(); + if (board.getObjective("hardcoreTimeDead") == null) + hardcoreTimeDead = board.registerNewObjective("hardcoreTimeDead", "dummy"); } -} \ No newline at end of file + public void registerCommands() { + getCommand("HelloWorld").setExecutor(new HelloWorld(this)); + getCommand("debugRTP").setExecutor(new RandomTP(this)); + } + +} From 1b166ae455e62e8358d2032cb2dc24ca86b60ce8 Mon Sep 17 00:00:00 2001 From: iie Date: Mon, 12 Sep 2016 06:05:00 +0200 Subject: [PATCH 27/27] Committing conflicting changes --- src/iie/DeathListener.java | 15 +++++++++---- src/iie/HelloWorld.java | 21 +++++++++++++----- src/iie/HelloWorldPlugin.java | 41 ++++++++++++++++++++++------------- src/iie/JoinListener.java | 23 ++++++++++++++++++-- 4 files changed, 73 insertions(+), 27 deletions(-) diff --git a/src/iie/DeathListener.java b/src/iie/DeathListener.java index 34a943f..ea67603 100644 --- a/src/iie/DeathListener.java +++ b/src/iie/DeathListener.java @@ -25,12 +25,19 @@ public class DeathListener implements Listener { 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")){ - - if (HelloWorldPlugin.hardcoreTimeDead.getScore(playername) == null) //null check - HelloWorldPlugin.hardcoreTimeDead.getScore(playername).setScore(0); //convert null to 0 - HelloWorldPlugin.hardcoreTimeDead.getScore(playername).setScore(currentTime); + 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 index be0e354..9e331cb 100644 --- a/src/iie/HelloWorld.java +++ b/src/iie/HelloWorld.java @@ -1,6 +1,10 @@ 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; @@ -26,6 +30,11 @@ public class HelloWorld implements CommandExecutor { 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); @@ -39,16 +48,16 @@ public class HelloWorld implements CommandExecutor { if (currentTime - deathTime >= 86400 && deathTime != 0){ - sender.sendMessage("You died " + (86400 - (currentTime - deathTime)) /3600 + " hours ago. Ready to give it another shot?"); + sender.sendMessage("You died " + ((currentTime - deathTime) /3600) + " hours ago. Good luck, " + playername + "."); player.teleport(location); - // player.getWorld().playSound(player.getLocation(), Sound.AMBIENT_CAVE,0,0); I don't think this works, fix later + player.getWorld().playSound(player.getLocation(), Sound.AMBIENT_CAVE,1F,1F); }else if(deathTime == 0){ - sender.sendMessage("You have never died in hardcore. Good luck!"); + sender.sendMessage("You have never died, good luck"); player.teleport(location); - // player.getWorld().playSound(player.getLocation(), Sound.AMBIENT_CAVE,0,0); I don't think this works, fix later + 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,0,0); I don't think this works, fix later + 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 } diff --git a/src/iie/HelloWorldPlugin.java b/src/iie/HelloWorldPlugin.java index ed1e3b7..a3a1995 100644 --- a/src/iie/HelloWorldPlugin.java +++ b/src/iie/HelloWorldPlugin.java @@ -8,25 +8,36 @@ import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scoreboard.Objective; import org.bukkit.scoreboard.Scoreboard; -import alisolarflare.RandomTP; public class HelloWorldPlugin extends JavaPlugin { - + public static Scoreboard board; public static Objective hardcoreTimeDead; - public static AbstractMap deathMap = new HashMap(); - - public void onEnable() { - registerCommands(); - getServer().getPluginManager().registerEvents(new DeathListener(this), this); - board = Bukkit.getServer().getScoreboardManager().getMainScoreboard(); - if (board.getObjective("hardcoreTimeDead") == null) + 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)); } - public void registerCommands() { - getCommand("HelloWorld").setExecutor(new HelloWorld(this)); - getCommand("debugRTP").setExecutor(new RandomTP(this)); - } - -} +} \ No newline at end of file diff --git a/src/iie/JoinListener.java b/src/iie/JoinListener.java index 86512b1..5bf6b1b 100644 --- a/src/iie/JoinListener.java +++ b/src/iie/JoinListener.java @@ -21,8 +21,27 @@ public class JoinListener implements Listener { String playername = (String) player.getName(); - if (HelloWorldPlugin.hardcoreTimeDead.getScore(playername) == null) //null check - HelloWorldPlugin.hardcoreTimeDead.getScore(playername).setScore(0); //convert null to 0 + 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()));