From 943f32c9aeeacbff1a365be52bfe6857a0c94f1d Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Tue, 30 May 2017 21:17:11 +0200 Subject: [PATCH 01/14] Initial commit --- .gitignore | 22 ++ LICENSE | 674 +++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 2 + 3 files changed, 698 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..6143e53 --- /dev/null +++ b/.gitignore @@ -0,0 +1,22 @@ +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear +*.zip +*.tar.gz +*.rar + +# 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..494d1f2 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# RandomTeleport +Not randomly teleports players to random places. (RTP) /randomtp From 193dbb9365ce61a14c44292a83f54fe42f83275d Mon Sep 17 00:00:00 2001 From: iie Date: Sat, 27 May 2017 12:42:00 +0200 Subject: [PATCH 02/14] v1 --- .classpath | 6 ++ .gitignore | 3 + .project | 17 ++++ .settings/org.eclipse.jdt.core.prefs | 11 +++ src/randomTP/Main.java | 141 +++++++++++++++++++++++++++ src/randomTP/plugin.yml | 3 + 6 files changed, 181 insertions(+) create mode 100644 .classpath create mode 100644 .project create mode 100644 .settings/org.eclipse.jdt.core.prefs create mode 100644 src/randomTP/Main.java create mode 100644 src/randomTP/plugin.yml diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..fceb480 --- /dev/null +++ b/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/.gitignore b/.gitignore index 6143e53..b18c726 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,6 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* + +bin/ +target/ diff --git a/.project b/.project new file mode 100644 index 0000000..3ada7bc --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + RandomTeleport_ + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..3a21537 --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,11 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/src/randomTP/Main.java b/src/randomTP/Main.java new file mode 100644 index 0000000..769dcd7 --- /dev/null +++ b/src/randomTP/Main.java @@ -0,0 +1,141 @@ +package randomTP; + +import java.util.Random; + +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.World; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.craftbukkit.v1_11_R1.CraftWorld; +import org.bukkit.entity.Player; +import org.bukkit.plugin.java.JavaPlugin; + +import net.minecraft.server.v1_11_R1.WorldBorder; + +public class Main extends JavaPlugin +{ + private static final Random random = new Random(); + + private static World world; + private static WorldBorder border; + private static double size, + borderCenterX, + borderCenterZ; + + private static int x,z; + private static final int radius = 70, + diameter = radius * 2; + + private static Location center, + north, + south, + east, + west; + + private static boolean centerUsed, + northUsed, + southUsed, + eastUsed, + westUsed; + + private static StringBuffer availableDirections = new StringBuffer(5); + private static int dir; + + /*================================================================================================*/ + + public void onEnable() + { + world = Bukkit.getWorld("World"); + border = ((CraftWorld) world).getHandle().getWorldBorder(); + + size = border.getSize(); + borderCenterX = border.getCenterX(); + borderCenterZ = border.getCenterZ(); + + getCommand("randomtp").setExecutor(this); + } + + /*================================================================================================*/ + + public boolean onCommand(CommandSender sender, Command label, String command, String[] args) + { + if (sender.isOp()) return rtp(Bukkit.getPlayer(args[0])); + + else return false; + } + + /*================================================================================================*/ + + public synchronized boolean newLocation() + { + //MAXIMUM TEN THOUSAND ATTEMPTS + for (int i = 0; i < 10000; i++) + { + //CHOOSE A RANDOM LOCATION WITHIN THE WORLDBORDER, ALLOWING SPACE FOR OUTER POSITIONS + x = (int) Math.floor((random.nextDouble() - 0.5) * (size - diameter)) + center.getBlockX(); + z = (int) Math.floor((random.nextDouble() - 0.5) * (size - diameter)) + center.getBlockY(); + + //CHECK THAT CENTER AND OUTER POSITIONS DO NOT HAVE WATER AT THEIR HIGHEST BLOCKS + if (world.getHighestBlockAt( x , z ).getType() != Material.WATER && + world.getHighestBlockAt( x , z - radius ).getType() != Material.WATER && + world.getHighestBlockAt( x , z + radius ).getType() != Material.WATER && + world.getHighestBlockAt( x - radius , z ).getType() != Material.WATER && + world.getHighestBlockAt( x + radius , z ).getType() != Material.WATER) + { + //IF NEW LOCATION CHECKS OUT, RESET VALUES + availableDirections.setCharAt(0, (char) 1); + availableDirections.setCharAt(1, (char) 2); + availableDirections.setCharAt(2, (char) 3); + availableDirections.setCharAt(3, (char) 4); + availableDirections.setCharAt(4, (char) 5); + + center = world.getHighestBlockAt( x , z ).getLocation(); + north = world.getHighestBlockAt( x , z - radius ).getLocation(); + south = world.getHighestBlockAt( x , z + radius ).getLocation(); + east = world.getHighestBlockAt( x + radius , z ).getLocation(); + west = world.getHighestBlockAt( x - radius , z ).getLocation(); + + centerUsed = northUsed = southUsed = eastUsed = westUsed = false; + + return true; + } + } + return false; + } + + + public synchronized boolean rtp(Player player) + { + if (player == null) + return false; + + //IF ALL POSITIONS USED, CHOOSE NEW LOCATION, AND IF NEW LOCATION FAILS RETURN FALSE + if (centerUsed && northUsed && southUsed && eastUsed && westUsed && !newLocation()) + return false; + + //IF BORDER HAS CHANGED, CHOOSE NEW LOCATION, AND IF NEW LOCATION FAILS RETURN FALSE + if ((borderCenterX != (borderCenterX = border.getCenterX()) || + borderCenterZ != (borderCenterZ = border.getCenterZ()) || + size != (size = border.getSize())) && !newLocation()) + return false; + + //CHOOSE ONE OF THE FIVE POSITIONS RANDOMLY AND TELEPORT THE PLAYER THERE, THEN REMOVE THAT POSITION + switch(dir = availableDirections.charAt((int) Math.floor(random.nextDouble() * availableDirections.length()))) + { + case (char) 1: player.teleport(center); centerUsed = true; break; + case (char) 2: player.teleport(north ); northUsed = true; break; + case (char) 3: player.teleport(south ); southUsed = true; break; + case (char) 4: player.teleport(east ); eastUsed = true; break; + case (char) 5: player.teleport(west ); westUsed = true; break; + } + availableDirections.deleteCharAt(dir); + + //IF ALL POSITIONS USED, CHOOSE A NEW LOCATION FOR NEXT ROUND + if (centerUsed && northUsed && southUsed && eastUsed && westUsed) + newLocation(); + + return true; + } +} diff --git a/src/randomTP/plugin.yml b/src/randomTP/plugin.yml new file mode 100644 index 0000000..4061ef4 --- /dev/null +++ b/src/randomTP/plugin.yml @@ -0,0 +1,3 @@ +main: randomTP.Main +version: 1.0.0 +name: RandomTP \ No newline at end of file From 9cf9f5f72ec250d4608dcc739fb6040689c02ef3 Mon Sep 17 00:00:00 2001 From: iie Date: Sun, 28 May 2017 12:00:00 +0200 Subject: [PATCH 03/14] v2 --- src/randomTP/Main.java | 96 +++++++++++++++++++++-------------------- src/randomTP/plugin.yml | 5 ++- 2 files changed, 53 insertions(+), 48 deletions(-) diff --git a/src/randomTP/Main.java b/src/randomTP/Main.java index 769dcd7..bd144c5 100644 --- a/src/randomTP/Main.java +++ b/src/randomTP/Main.java @@ -1,7 +1,5 @@ package randomTP; -import java.util.Random; - import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; @@ -16,45 +14,45 @@ import net.minecraft.server.v1_11_R1.WorldBorder; public class Main extends JavaPlugin { - private static final Random random = new Random(); + private World world; + private WorldBorder border; + private double size, + borderCenterX, + borderCenterZ; - private static World world; - private static WorldBorder border; - private static double size, - borderCenterX, - borderCenterZ; + private int x,z; + private final int radius = 70; - private static int x,z; - private static final int radius = 70, - diameter = radius * 2; - - private static Location center, - north, - south, - east, - west; + private Location center, + north, + south, + east, + west; - private static boolean centerUsed, - northUsed, - southUsed, - eastUsed, - westUsed; + private boolean centerUsed, + northUsed, + southUsed, + eastUsed, + westUsed; - private static StringBuffer availableDirections = new StringBuffer(5); - private static int dir; + private StringBuilder availableDirections = new StringBuilder(5); + private char[] chars = {1,2,3,4,5}; + private int dir; /*================================================================================================*/ public void onEnable() { + getCommand("randomtp").setExecutor(this); + world = Bukkit.getWorld("World"); border = ((CraftWorld) world).getHandle().getWorldBorder(); - size = border.getSize(); + size = border.getSize() - (radius * 2); borderCenterX = border.getCenterX(); borderCenterZ = border.getCenterZ(); - getCommand("randomtp").setExecutor(this); + newLocation(); } /*================================================================================================*/ @@ -73,23 +71,20 @@ public class Main extends JavaPlugin //MAXIMUM TEN THOUSAND ATTEMPTS for (int i = 0; i < 10000; i++) { - //CHOOSE A RANDOM LOCATION WITHIN THE WORLDBORDER, ALLOWING SPACE FOR OUTER POSITIONS - x = (int) Math.floor((random.nextDouble() - 0.5) * (size - diameter)) + center.getBlockX(); - z = (int) Math.floor((random.nextDouble() - 0.5) * (size - diameter)) + center.getBlockY(); + //CHOOSE A RANDOM AREA WITHIN THE WORLDBORDER, ALLOWING SPACE FOR OUTER POSITIONS + x = (int) (Math.floor((Math.random() - 0.5) * size) + border.getCenterX()); + z = (int) (Math.floor((Math.random() - 0.5) * size) + border.getCenterZ()); //CHECK THAT CENTER AND OUTER POSITIONS DO NOT HAVE WATER AT THEIR HIGHEST BLOCKS - if (world.getHighestBlockAt( x , z ).getType() != Material.WATER && - world.getHighestBlockAt( x , z - radius ).getType() != Material.WATER && - world.getHighestBlockAt( x , z + radius ).getType() != Material.WATER && - world.getHighestBlockAt( x - radius , z ).getType() != Material.WATER && - world.getHighestBlockAt( x + radius , z ).getType() != Material.WATER) + if (!world.getHighestBlockAt( x , z ).getType().equals(Material.WATER) && + !world.getHighestBlockAt( x , z - radius ).getType().equals(Material.WATER) && + !world.getHighestBlockAt( x , z + radius ).getType().equals(Material.WATER) && + !world.getHighestBlockAt( x - radius , z ).getType().equals(Material.WATER) && + !world.getHighestBlockAt( x + radius , z ).getType().equals(Material.WATER)) { - //IF NEW LOCATION CHECKS OUT, RESET VALUES - availableDirections.setCharAt(0, (char) 1); - availableDirections.setCharAt(1, (char) 2); - availableDirections.setCharAt(2, (char) 3); - availableDirections.setCharAt(3, (char) 4); - availableDirections.setCharAt(4, (char) 5); + //IF NEW LOCATION IS VALID, RESET VALUES + availableDirections.setLength(0); + availableDirections.append(chars); center = world.getHighestBlockAt( x , z ).getLocation(); north = world.getHighestBlockAt( x , z - radius ).getLocation(); @@ -102,6 +97,8 @@ public class Main extends JavaPlugin return true; } } + centerUsed = northUsed = southUsed = eastUsed = westUsed = true; + return false; } @@ -111,18 +108,23 @@ public class Main extends JavaPlugin if (player == null) return false; - //IF ALL POSITIONS USED, CHOOSE NEW LOCATION, AND IF NEW LOCATION FAILS RETURN FALSE - if (centerUsed && northUsed && southUsed && eastUsed && westUsed && !newLocation()) - return false; + //IF NO POSITIONS AVAILABLE, OR BORDER HAS CHANGED, FIND NEW LOCATION + if (((centerUsed && northUsed && southUsed && eastUsed && westUsed) || - //IF BORDER HAS CHANGED, CHOOSE NEW LOCATION, AND IF NEW LOCATION FAILS RETURN FALSE - if ((borderCenterX != (borderCenterX = border.getCenterX()) || + borderCenterX != (borderCenterX = border.getCenterX()) || borderCenterZ != (borderCenterZ = border.getCenterZ()) || - size != (size = border.getSize())) && !newLocation()) + size != (size = border.getSize())) + + && !newLocation()) + { + //RETURN FALSE AND MESSAGE PLAYER IF UNABLE TO FIND NEW LOCATION. + player.sendMessage("could not find a location in 10,000 attempts"); + player.sendMessage("... sorry bud. I did try. 10,000 times."); return false; + } //CHOOSE ONE OF THE FIVE POSITIONS RANDOMLY AND TELEPORT THE PLAYER THERE, THEN REMOVE THAT POSITION - switch(dir = availableDirections.charAt((int) Math.floor(random.nextDouble() * availableDirections.length()))) + switch(availableDirections.charAt(dir = (int) Math.floor(Math.random() * availableDirections.length()))) { case (char) 1: player.teleport(center); centerUsed = true; break; case (char) 2: player.teleport(north ); northUsed = true; break; diff --git a/src/randomTP/plugin.yml b/src/randomTP/plugin.yml index 4061ef4..a694840 100644 --- a/src/randomTP/plugin.yml +++ b/src/randomTP/plugin.yml @@ -1,3 +1,6 @@ main: randomTP.Main version: 1.0.0 -name: RandomTP \ No newline at end of file +name: RandomTP +commands: + randomtp: + description: teleport player to random location within world border. Every five players teleport to the same general area, and then a new general area is randomly selected for the next five players. \ No newline at end of file From 29cfa66ae368f3dea175f48814d057e9952f890b Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Tue, 30 May 2017 22:16:36 +0200 Subject: [PATCH 04/14] Converted to Maven project --- .classpath | 20 ++++++++++-- .project | 6 ++++ .settings/org.eclipse.jdt.core.prefs | 1 + .settings/org.eclipse.m2e.core.prefs | 4 +++ pom.xml | 46 ++++++++++++++++++++++++++++ 5 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 .settings/org.eclipse.m2e.core.prefs create mode 100644 pom.xml diff --git a/.classpath b/.classpath index fceb480..be86bf9 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,20 @@ - - - + + + + + + + + + + + + + + + + + diff --git a/.project b/.project index 3ada7bc..159ef42 100644 --- a/.project +++ b/.project @@ -10,8 +10,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 3a21537..672496e 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -8,4 +8,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..acdc756 --- /dev/null +++ b/pom.xml @@ -0,0 +1,46 @@ + + 4.0.0 + TBMCPlugins + RandomTeleport + 0.0.1-SNAPSHOT + + src + + + src + + **/*.java + + + + + + maven-compiler-plugin + 3.5.1 + + 1.8 + 1.8 + + + + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + jitpack.io + https://jitpack.io/ + + + + + org.spigotmc + spigot-api + 1.9.2-R0.1-SNAPSHOT + provided + + + \ No newline at end of file From d5edd0cfe664e7800e0b877f3a699d66b14b92c9 Mon Sep 17 00:00:00 2001 From: iie Date: Wed, 31 May 2017 00:30:00 +0200 Subject: [PATCH 05/14] v3 --- src/randomTP/Main.java | 139 +++++++++++++++++++++++++++++------------ 1 file changed, 98 insertions(+), 41 deletions(-) diff --git a/src/randomTP/Main.java b/src/randomTP/Main.java index bd144c5..20276ab 100644 --- a/src/randomTP/Main.java +++ b/src/randomTP/Main.java @@ -4,6 +4,7 @@ import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; +import org.bukkit.block.Block; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.craftbukkit.v1_11_R1.CraftWorld; @@ -14,15 +15,25 @@ import net.minecraft.server.v1_11_R1.WorldBorder; public class Main extends JavaPlugin { - private World world; + private final int radius = 70; //set how far apart the five teleport positions are + + private CraftWorld world; private WorldBorder border; - private double size, + private double size, + usableSize, borderCenterX, borderCenterZ; - private int x,z; - private final int radius = 70; + private int x,z, + centerY, northY, southY, eastY, westY, + northZ, southZ, eastX, westX; + private Material centerGroundMaterial, centerHeadMaterial, + northGroundMaterial, northHeadMaterial, + southGroundMaterial, southHeadMaterial, + eastGroundMaterial, eastHeadMaterial, + westGroundMaterial, westHeadMaterial; + private Location center, north, south, @@ -43,17 +54,13 @@ public class Main extends JavaPlugin public void onEnable() { - getCommand("randomtp").setExecutor(this); - - world = Bukkit.getWorld("World"); - border = ((CraftWorld) world).getHandle().getWorldBorder(); - - size = border.getSize() - (radius * 2); - borderCenterX = border.getCenterX(); - borderCenterZ = border.getCenterZ(); + world = (CraftWorld) Bukkit.getWorld("World"); + border = world.getHandle().getWorldBorder(); newLocation(); - } + + getCommand("randomtp").setExecutor(this); + } /*================================================================================================*/ @@ -68,30 +75,79 @@ public class Main extends JavaPlugin public synchronized boolean newLocation() { + size = border.getSize(); + usableSize = size - (radius * 2); + borderCenterX = border.getCenterX(); + borderCenterZ = border.getCenterZ(); + //MAXIMUM TEN THOUSAND ATTEMPTS for (int i = 0; i < 10000; i++) { - //CHOOSE A RANDOM AREA WITHIN THE WORLDBORDER, ALLOWING SPACE FOR OUTER POSITIONS - x = (int) (Math.floor((Math.random() - 0.5) * size) + border.getCenterX()); - z = (int) (Math.floor((Math.random() - 0.5) * size) + border.getCenterZ()); + //RANDOMLY CHOOSE AN X AND Z WITHIN WORLD BORDER + x = (int) (Math.floor((Math.random() - 0.5) * usableSize) + border.getCenterX()); + z = (int) (Math.floor((Math.random() - 0.5) * usableSize) + border.getCenterZ()); - //CHECK THAT CENTER AND OUTER POSITIONS DO NOT HAVE WATER AT THEIR HIGHEST BLOCKS - if (!world.getHighestBlockAt( x , z ).getType().equals(Material.WATER) && - !world.getHighestBlockAt( x , z - radius ).getType().equals(Material.WATER) && - !world.getHighestBlockAt( x , z + radius ).getType().equals(Material.WATER) && - !world.getHighestBlockAt( x - radius , z ).getType().equals(Material.WATER) && - !world.getHighestBlockAt( x + radius , z ).getType().equals(Material.WATER)) + //GET OTHER COORDINATES + centerY = world.getHighestBlockYAt( x , z ); + northZ = z - radius; northY = world.getHighestBlockYAt( x , northZ ); + southZ = z + radius; southY = world.getHighestBlockYAt( x , southZ ); + eastX = x + radius; eastY = world.getHighestBlockYAt( eastX , z ); + westX = x - radius; westY = world.getHighestBlockYAt( westX , z ); + + //GET MATERIALS FOR GROUND AND HEAD-HEIGHT BLOCKS AT EACH POSITION + centerGroundMaterial = world.getBlockAt( x , centerY -1 , z ).getType(); + northGroundMaterial = world.getBlockAt( x , northY -1 , northZ ).getType(); + southGroundMaterial = world.getBlockAt( x , southY -1 , southZ ).getType(); + eastGroundMaterial = world.getBlockAt( eastX , eastY -1 , z ).getType(); + westGroundMaterial = world.getBlockAt( westX , westY -1 , z ).getType(); + + centerHeadMaterial = world.getBlockAt( x , centerY +1 , z ).getType(); + northHeadMaterial = world.getBlockAt( x , northY +1 , northZ ).getType(); + southHeadMaterial = world.getBlockAt( x , southY +1 , southZ ).getType(); + eastHeadMaterial = world.getBlockAt( eastX , eastY +1 , z ).getType(); + westHeadMaterial = world.getBlockAt( westX , westY +1 , z ).getType(); + + //CONFIRM THAT ALL FIVE POSITIONS ARE ON SOLID GROUND WITH AIR AT HEAD HEIGHT + if (centerHeadMaterial == Material.AIR && + northHeadMaterial == Material.AIR && + southHeadMaterial == Material.AIR && + eastHeadMaterial == Material.AIR && + westHeadMaterial == Material.AIR && + + centerGroundMaterial != Material.STATIONARY_WATER && + northGroundMaterial != Material.STATIONARY_WATER && + southGroundMaterial != Material.STATIONARY_WATER && + eastGroundMaterial != Material.STATIONARY_WATER && + westGroundMaterial != Material.STATIONARY_WATER && + + centerGroundMaterial != Material.WATER && + northGroundMaterial != Material.WATER && + southGroundMaterial != Material.WATER && + eastGroundMaterial != Material.WATER && + westGroundMaterial != Material.WATER && + + centerGroundMaterial != Material.STATIONARY_LAVA && + northGroundMaterial != Material.STATIONARY_LAVA && + southGroundMaterial != Material.STATIONARY_LAVA && + eastGroundMaterial != Material.STATIONARY_LAVA && + westGroundMaterial != Material.STATIONARY_LAVA && + + centerGroundMaterial != Material.LAVA && + northGroundMaterial != Material.LAVA && + southGroundMaterial != Material.LAVA && + eastGroundMaterial != Material.LAVA && + westGroundMaterial != Material.LAVA) { - //IF NEW LOCATION IS VALID, RESET VALUES + //IF LOCATION VALID, SET NEW POSITIONS AND RESET TRACKING VARIABLES + center = world.getBlockAt( x , centerY , z ).getLocation(); + north = world.getBlockAt( x , northY , northZ ).getLocation(); + south = world.getBlockAt( x , southY , southZ ).getLocation(); + east = world.getBlockAt( eastX , eastY , z ).getLocation(); + west = world.getBlockAt( westX , westY , z ).getLocation(); + availableDirections.setLength(0); availableDirections.append(chars); - center = world.getHighestBlockAt( x , z ).getLocation(); - north = world.getHighestBlockAt( x , z - radius ).getLocation(); - south = world.getHighestBlockAt( x , z + radius ).getLocation(); - east = world.getHighestBlockAt( x + radius , z ).getLocation(); - west = world.getHighestBlockAt( x - radius , z ).getLocation(); - centerUsed = northUsed = southUsed = eastUsed = westUsed = false; return true; @@ -102,28 +158,29 @@ public class Main extends JavaPlugin return false; } + /*================================================================================================*/ public synchronized boolean rtp(Player player) { if (player == null) return false; - //IF NO POSITIONS AVAILABLE, OR BORDER HAS CHANGED, FIND NEW LOCATION - if (((centerUsed && northUsed && southUsed && eastUsed && westUsed) || - - borderCenterX != (borderCenterX = border.getCenterX()) || - borderCenterZ != (borderCenterZ = border.getCenterZ()) || - size != (size = border.getSize())) + //IF BORDER HAS CHANGED, OR NO POSITIONS AVAILABLE, FIND NEW LOCATION + if ((centerUsed && northUsed && southUsed && eastUsed && westUsed) || + + (borderCenterX != border.getCenterX() || + borderCenterZ != border.getCenterZ() || + size != border.getSize()) && !newLocation()) { - //RETURN FALSE AND MESSAGE PLAYER IF UNABLE TO FIND NEW LOCATION. - player.sendMessage("could not find a location in 10,000 attempts"); - player.sendMessage("... sorry bud. I did try. 10,000 times."); + //MESSAGE PLAYER AND RETURN FALSE IF UNABLE TO FIND NEW LOCATION. + player.sendMessage("could not find location in 10,000 attempts"); + player.sendMessage("... sorry bud. I did try."); return false; } - //CHOOSE ONE OF THE FIVE POSITIONS RANDOMLY AND TELEPORT THE PLAYER THERE, THEN REMOVE THAT POSITION + //RANDOMLY SELECT ONE OF THE OPEN POSITIONS AND TELEPORT THE PLAYER THERE. THEN, REMOVE THE POSITION switch(availableDirections.charAt(dir = (int) Math.floor(Math.random() * availableDirections.length()))) { case (char) 1: player.teleport(center); centerUsed = true; break; @@ -132,9 +189,9 @@ public class Main extends JavaPlugin case (char) 4: player.teleport(east ); eastUsed = true; break; case (char) 5: player.teleport(west ); westUsed = true; break; } - availableDirections.deleteCharAt(dir); + availableDirections.deleteCharAt(dir); - //IF ALL POSITIONS USED, CHOOSE A NEW LOCATION FOR NEXT ROUND + //IF ALL 5 POSITIONS HAVE BEEN TELEPORTED TO, CHOOSE NEW LOCATION if (centerUsed && northUsed && southUsed && eastUsed && westUsed) newLocation(); From 442c32f17bf0e2dbb73434941eaf0817350e6772 Mon Sep 17 00:00:00 2001 From: iie Date: Wed, 31 May 2017 01:10:00 +0200 Subject: [PATCH 06/14] v4 --- src/randomTP/Main.java | 56 +++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/src/randomTP/Main.java b/src/randomTP/Main.java index 20276ab..cc5676b 100644 --- a/src/randomTP/Main.java +++ b/src/randomTP/Main.java @@ -108,35 +108,41 @@ public class Main extends JavaPlugin westHeadMaterial = world.getBlockAt( westX , westY +1 , z ).getType(); //CONFIRM THAT ALL FIVE POSITIONS ARE ON SOLID GROUND WITH AIR AT HEAD HEIGHT - if (centerHeadMaterial == Material.AIR && - northHeadMaterial == Material.AIR && - southHeadMaterial == Material.AIR && - eastHeadMaterial == Material.AIR && - westHeadMaterial == Material.AIR && + if (centerHeadMaterial .equals(Material.AIR) && + northHeadMaterial .equals(Material.AIR) && + southHeadMaterial .equals(Material.AIR) && + eastHeadMaterial .equals(Material.AIR) && + westHeadMaterial .equals(Material.AIR) && - centerGroundMaterial != Material.STATIONARY_WATER && - northGroundMaterial != Material.STATIONARY_WATER && - southGroundMaterial != Material.STATIONARY_WATER && - eastGroundMaterial != Material.STATIONARY_WATER && - westGroundMaterial != Material.STATIONARY_WATER && + !centerGroundMaterial.equals(Material.STATIONARY_WATER) && + !northGroundMaterial .equals(Material.STATIONARY_WATER) && + !southGroundMaterial .equals(Material.STATIONARY_WATER) && + !eastGroundMaterial .equals(Material.STATIONARY_WATER) && + !westGroundMaterial .equals(Material.STATIONARY_WATER) && - centerGroundMaterial != Material.WATER && - northGroundMaterial != Material.WATER && - southGroundMaterial != Material.WATER && - eastGroundMaterial != Material.WATER && - westGroundMaterial != Material.WATER && + !centerGroundMaterial.equals(Material.WATER) && + !northGroundMaterial .equals(Material.WATER) && + !southGroundMaterial .equals(Material.WATER) && + !eastGroundMaterial .equals(Material.WATER) && + !westGroundMaterial .equals(Material.WATER) && - centerGroundMaterial != Material.STATIONARY_LAVA && - northGroundMaterial != Material.STATIONARY_LAVA && - southGroundMaterial != Material.STATIONARY_LAVA && - eastGroundMaterial != Material.STATIONARY_LAVA && - westGroundMaterial != Material.STATIONARY_LAVA && + !centerGroundMaterial.equals(Material.STATIONARY_LAVA) && + !northGroundMaterial .equals(Material.STATIONARY_LAVA) && + !southGroundMaterial .equals(Material.STATIONARY_LAVA) && + !eastGroundMaterial .equals(Material.STATIONARY_LAVA) && + !westGroundMaterial .equals(Material.STATIONARY_LAVA) && - centerGroundMaterial != Material.LAVA && - northGroundMaterial != Material.LAVA && - southGroundMaterial != Material.LAVA && - eastGroundMaterial != Material.LAVA && - westGroundMaterial != Material.LAVA) + !centerGroundMaterial.equals(Material.LAVA) && + !northGroundMaterial .equals(Material.LAVA) && + !southGroundMaterial .equals(Material.LAVA) && + !eastGroundMaterial .equals(Material.LAVA) && + !westGroundMaterial .equals(Material.LAVA) && + + !centerGroundMaterial.equals(Material.AIR) && + !northGroundMaterial .equals(Material.AIR) && + !southGroundMaterial .equals(Material.AIR) && + !eastGroundMaterial .equals(Material.AIR) && + !westGroundMaterial .equals(Material.AIR)) { //IF LOCATION VALID, SET NEW POSITIONS AND RESET TRACKING VARIABLES center = world.getBlockAt( x , centerY , z ).getLocation(); From b8e9810e18e74edc58cc67338516ea3c694f4a73 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Wed, 31 May 2017 16:40:31 +0200 Subject: [PATCH 07/14] Moved plugin.yml --- src/randomTP/plugin.yml => plugin.yml | 0 pom.xml | 3 +++ 2 files changed, 3 insertions(+) rename src/randomTP/plugin.yml => plugin.yml (100%) diff --git a/src/randomTP/plugin.yml b/plugin.yml similarity index 100% rename from src/randomTP/plugin.yml rename to plugin.yml diff --git a/pom.xml b/pom.xml index acdc756..69254d8 100644 --- a/pom.xml +++ b/pom.xml @@ -13,6 +13,9 @@ **/*.java + + . + From 0b3743cb01d5f79215e4d90f2fb515a82007ecb0 Mon Sep 17 00:00:00 2001 From: iie Date: Wed, 31 May 2017 21:54:00 +0200 Subject: [PATCH 08/14] v5 --- src/randomTP/Main.java | 271 +++++++++++++++++++++++------------------ 1 file changed, 151 insertions(+), 120 deletions(-) diff --git a/src/randomTP/Main.java b/src/randomTP/Main.java index cc5676b..d18d59e 100644 --- a/src/randomTP/Main.java +++ b/src/randomTP/Main.java @@ -22,17 +22,19 @@ public class Main extends JavaPlugin private double size, usableSize, borderCenterX, - borderCenterZ; + borderCenterZ, + + x,z; + + private int centerX, centerZ, centerY, + northZ, southZ, eastX, westX, + northY, southY, eastY, westY; - private int x,z, - centerY, northY, southY, eastY, westY, - northZ, southZ, eastX, westX; - - private Material centerGroundMaterial, centerHeadMaterial, - northGroundMaterial, northHeadMaterial, - southGroundMaterial, southHeadMaterial, - eastGroundMaterial, eastHeadMaterial, - westGroundMaterial, westHeadMaterial; + private Material centerGroundMaterial, centerFeetMaterial, centerHeadMaterial, + northGroundMaterial, northFeetMaterial, northHeadMaterial, + southGroundMaterial, southFeetMaterial, southHeadMaterial, + eastGroundMaterial, eastFeetMaterial, eastHeadMaterial, + westGroundMaterial, westFeetMaterial, westHeadMaterial; private Location center, north, @@ -54,21 +56,61 @@ public class Main extends JavaPlugin public void onEnable() { - world = (CraftWorld) Bukkit.getWorld("World"); - border = world.getHandle().getWorldBorder(); - - newLocation(); - getCommand("randomtp").setExecutor(this); - } + + world = (CraftWorld) Bukkit.getWorld("World"); + border = world.getHandle().getWorldBorder(); + newLocation(); + } /*================================================================================================*/ public boolean onCommand(CommandSender sender, Command label, String command, String[] args) { - if (sender.isOp()) return rtp(Bukkit.getPlayer(args[0])); + if (sender.isOp()) return rtp(Bukkit.getPlayer(args[0])); else return false; + } + + /*================================================================================================*/ + + public synchronized boolean rtp(Player player) + { + if (player == null) + return false; - else return false; + //if border has changed, or no positions available, find new location + if ((centerUsed && northUsed && southUsed && eastUsed && westUsed) || + + (borderCenterX != border.getCenterX() || + borderCenterZ != border.getCenterZ() || + size != border.getSize()) + + && !newLocation()) + { + //message player and return false if unable to find new location + player.sendMessage("§c could not find a location in 10,000 attempts"); + player.sendMessage("§c (sorry bud... I did try!)"); + return false; + } + + //randomly select one of the open positions and teleport the player there, then remove the position + switch(availableDirections.charAt(dir = (int) Math.floor(Math.random() * availableDirections.length()))) + { + case (char) 1: player.teleport(center); centerUsed = true; break; + case (char) 2: player.teleport(north ); northUsed = true; break; + case (char) 3: player.teleport(south ); southUsed = true; break; + case (char) 4: player.teleport(east ); eastUsed = true; break; + case (char) 5: player.teleport(west ); westUsed = true; break; + } + availableDirections.deleteCharAt(dir); + + //imply that our server has a personality + player.sendMessage("§7 *poof*"); + + //if all 5 positions have been teleported to, choose a new location + if (centerUsed && northUsed && southUsed && eastUsed && westUsed) + newLocation(); + + return true; } /*================================================================================================*/ @@ -80,127 +122,116 @@ public class Main extends JavaPlugin borderCenterX = border.getCenterX(); borderCenterZ = border.getCenterZ(); - //MAXIMUM TEN THOUSAND ATTEMPTS + //maximum ten thousand attempts for (int i = 0; i < 10000; i++) { - //RANDOMLY CHOOSE AN X AND Z WITHIN WORLD BORDER - x = (int) (Math.floor((Math.random() - 0.5) * usableSize) + border.getCenterX()); - z = (int) (Math.floor((Math.random() - 0.5) * usableSize) + border.getCenterZ()); + //choose an x and z inside the current world border, allowing a margin for the outer positions + centerX = (int) (Math.floor((Math.random() - 0.5) * usableSize) + border.getCenterX()); + centerZ = (int) (Math.floor((Math.random() - 0.5) * usableSize) + border.getCenterZ()); - //GET OTHER COORDINATES - centerY = world.getHighestBlockYAt( x , z ); - northZ = z - radius; northY = world.getHighestBlockYAt( x , northZ ); - southZ = z + radius; southY = world.getHighestBlockYAt( x , southZ ); - eastX = x + radius; eastY = world.getHighestBlockYAt( eastX , z ); - westX = x - radius; westY = world.getHighestBlockYAt( westX , z ); + //get center of block + x = centerX + .5; + z = centerZ + .5; - //GET MATERIALS FOR GROUND AND HEAD-HEIGHT BLOCKS AT EACH POSITION - centerGroundMaterial = world.getBlockAt( x , centerY -1 , z ).getType(); - northGroundMaterial = world.getBlockAt( x , northY -1 , northZ ).getType(); - southGroundMaterial = world.getBlockAt( x , southY -1 , southZ ).getType(); - eastGroundMaterial = world.getBlockAt( eastX , eastY -1 , z ).getType(); - westGroundMaterial = world.getBlockAt( westX , westY -1 , z ).getType(); + //get other coordinates + northZ = centerZ - radius; + southZ = centerZ + radius; + eastX = centerX + radius; + westX = centerX - radius; - centerHeadMaterial = world.getBlockAt( x , centerY +1 , z ).getType(); - northHeadMaterial = world.getBlockAt( x , northY +1 , northZ ).getType(); - southHeadMaterial = world.getBlockAt( x , southY +1 , southZ ).getType(); - eastHeadMaterial = world.getBlockAt( eastX , eastY +1 , z ).getType(); - westHeadMaterial = world.getBlockAt( westX , westY +1 , z ).getType(); + centerY = world.getHighestBlockYAt( centerX , centerZ ); + northY = world.getHighestBlockYAt( centerX , northZ ); + southY = world.getHighestBlockYAt( centerX , southZ ); + eastY = world.getHighestBlockYAt( eastX , centerZ ); + westY = world.getHighestBlockYAt( westX , centerZ ); - //CONFIRM THAT ALL FIVE POSITIONS ARE ON SOLID GROUND WITH AIR AT HEAD HEIGHT - if (centerHeadMaterial .equals(Material.AIR) && - northHeadMaterial .equals(Material.AIR) && - southHeadMaterial .equals(Material.AIR) && - eastHeadMaterial .equals(Material.AIR) && - westHeadMaterial .equals(Material.AIR) && - - !centerGroundMaterial.equals(Material.STATIONARY_WATER) && - !northGroundMaterial .equals(Material.STATIONARY_WATER) && - !southGroundMaterial .equals(Material.STATIONARY_WATER) && - !eastGroundMaterial .equals(Material.STATIONARY_WATER) && - !westGroundMaterial .equals(Material.STATIONARY_WATER) && - - !centerGroundMaterial.equals(Material.WATER) && - !northGroundMaterial .equals(Material.WATER) && - !southGroundMaterial .equals(Material.WATER) && - !eastGroundMaterial .equals(Material.WATER) && - !westGroundMaterial .equals(Material.WATER) && + //get materials for ground, feet-height and head-height blocks at each of the five positions + centerGroundMaterial = world.getBlockAt( centerX , centerY -1 , centerZ ).getType(); + northGroundMaterial = world.getBlockAt( centerX , northY -1 , northZ ).getType(); + southGroundMaterial = world.getBlockAt( centerX , southY -1 , southZ ).getType(); + eastGroundMaterial = world.getBlockAt( eastX , eastY -1 , centerZ ).getType(); + westGroundMaterial = world.getBlockAt( westX , westY -1 , centerZ ).getType(); + + centerFeetMaterial = world.getBlockAt( centerX , centerY , centerZ ).getType(); + northFeetMaterial = world.getBlockAt( centerX , northY , northZ ).getType(); + southFeetMaterial = world.getBlockAt( centerX , southY , southZ ).getType(); + eastFeetMaterial = world.getBlockAt( eastX , eastY , centerZ ).getType(); + westFeetMaterial = world.getBlockAt( westX , westY , centerZ ).getType(); + + centerHeadMaterial = world.getBlockAt( centerX , centerY +1 , centerZ ).getType(); + northHeadMaterial = world.getBlockAt( centerX , northY +1 , northZ ).getType(); + southHeadMaterial = world.getBlockAt( centerX , southY +1 , southZ ).getType(); + eastHeadMaterial = world.getBlockAt( eastX , eastY +1 , centerZ ).getType(); + westHeadMaterial = world.getBlockAt( westX , westY +1 , centerZ ).getType(); + + //test that all five positions are on solid ground with air at head height + if (centerHeadMaterial == Material.AIR && + northHeadMaterial == Material.AIR && + southHeadMaterial == Material.AIR && + eastHeadMaterial == Material.AIR && + westHeadMaterial == Material.AIR && - !centerGroundMaterial.equals(Material.STATIONARY_LAVA) && - !northGroundMaterial .equals(Material.STATIONARY_LAVA) && - !southGroundMaterial .equals(Material.STATIONARY_LAVA) && - !eastGroundMaterial .equals(Material.STATIONARY_LAVA) && - !westGroundMaterial .equals(Material.STATIONARY_LAVA) && + centerFeetMaterial == Material.AIR && + northFeetMaterial == Material.AIR && + southFeetMaterial == Material.AIR && + eastFeetMaterial == Material.AIR && + westFeetMaterial == Material.AIR && - !centerGroundMaterial.equals(Material.LAVA) && - !northGroundMaterial .equals(Material.LAVA) && - !southGroundMaterial .equals(Material.LAVA) && - !eastGroundMaterial .equals(Material.LAVA) && - !westGroundMaterial .equals(Material.LAVA) && + centerGroundMaterial != Material.AIR && + northGroundMaterial != Material.AIR && + southGroundMaterial != Material.AIR && + eastGroundMaterial != Material.AIR && + westGroundMaterial != Material.AIR && - !centerGroundMaterial.equals(Material.AIR) && - !northGroundMaterial .equals(Material.AIR) && - !southGroundMaterial .equals(Material.AIR) && - !eastGroundMaterial .equals(Material.AIR) && - !westGroundMaterial .equals(Material.AIR)) + centerGroundMaterial != Material.STATIONARY_WATER && + northGroundMaterial != Material.STATIONARY_WATER && + southGroundMaterial != Material.STATIONARY_WATER && + eastGroundMaterial != Material.STATIONARY_WATER && + westGroundMaterial != Material.STATIONARY_WATER && + + centerGroundMaterial != Material.WATER && + northGroundMaterial != Material.WATER && + southGroundMaterial != Material.WATER && + eastGroundMaterial != Material.WATER && + westGroundMaterial != Material.WATER && + + centerGroundMaterial != Material.STATIONARY_LAVA && + northGroundMaterial != Material.STATIONARY_LAVA && + southGroundMaterial != Material.STATIONARY_LAVA && + eastGroundMaterial != Material.STATIONARY_LAVA && + westGroundMaterial != Material.STATIONARY_LAVA && + + centerGroundMaterial != Material.LAVA && + northGroundMaterial != Material.LAVA && + southGroundMaterial != Material.LAVA && + eastGroundMaterial != Material.LAVA && + westGroundMaterial != Material.LAVA) { - //IF LOCATION VALID, SET NEW POSITIONS AND RESET TRACKING VARIABLES - center = world.getBlockAt( x , centerY , z ).getLocation(); - north = world.getBlockAt( x , northY , northZ ).getLocation(); - south = world.getBlockAt( x , southY , southZ ).getLocation(); - east = world.getBlockAt( eastX , eastY , z ).getLocation(); - west = world.getBlockAt( westX , westY , z ).getLocation(); + //set new positions and reset + center = new Location( world, x , (double) centerY , z ); + north = new Location( world, x , (double) northY , northZ + .5 ); + south = new Location( world, x , (double) southY , southZ + .5 ); + east = new Location( world, eastX + .5 , (double) eastY , z ); + west = new Location( world, westX + .5 , (double) westY , z ); availableDirections.setLength(0); availableDirections.append(chars); - centerUsed = northUsed = southUsed = eastUsed = westUsed = false; + centerUsed = + northUsed = + southUsed = + eastUsed = + westUsed = false; return true; } } - centerUsed = northUsed = southUsed = eastUsed = westUsed = true; + centerUsed = + northUsed = + southUsed = + eastUsed = + westUsed = true; return false; } - - /*================================================================================================*/ - - public synchronized boolean rtp(Player player) - { - if (player == null) - return false; - - //IF BORDER HAS CHANGED, OR NO POSITIONS AVAILABLE, FIND NEW LOCATION - if ((centerUsed && northUsed && southUsed && eastUsed && westUsed) || - - (borderCenterX != border.getCenterX() || - borderCenterZ != border.getCenterZ() || - size != border.getSize()) - - && !newLocation()) - { - //MESSAGE PLAYER AND RETURN FALSE IF UNABLE TO FIND NEW LOCATION. - player.sendMessage("could not find location in 10,000 attempts"); - player.sendMessage("... sorry bud. I did try."); - return false; - } - - //RANDOMLY SELECT ONE OF THE OPEN POSITIONS AND TELEPORT THE PLAYER THERE. THEN, REMOVE THE POSITION - switch(availableDirections.charAt(dir = (int) Math.floor(Math.random() * availableDirections.length()))) - { - case (char) 1: player.teleport(center); centerUsed = true; break; - case (char) 2: player.teleport(north ); northUsed = true; break; - case (char) 3: player.teleport(south ); southUsed = true; break; - case (char) 4: player.teleport(east ); eastUsed = true; break; - case (char) 5: player.teleport(west ); westUsed = true; break; - } - availableDirections.deleteCharAt(dir); - - //IF ALL 5 POSITIONS HAVE BEEN TELEPORTED TO, CHOOSE NEW LOCATION - if (centerUsed && northUsed && southUsed && eastUsed && westUsed) - newLocation(); - - return true; - } } From b2ecc27f86cdc4f0e7c18c8d1fd647c0ba90e6d8 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Fri, 23 Jun 2017 17:49:49 +0200 Subject: [PATCH 09/14] Updated to 1.12 --- pom.xml | 8 +++++++- src/randomTP/Main.java | 6 ++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 69254d8..2309391 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,13 @@ org.spigotmc spigot-api - 1.9.2-R0.1-SNAPSHOT + 1.12-R0.1-SNAPSHOT + provided + + + org.bukkit + craftbukkit + 1.12-R0.1-SNAPSHOT provided diff --git a/src/randomTP/Main.java b/src/randomTP/Main.java index d18d59e..ecf2d50 100644 --- a/src/randomTP/Main.java +++ b/src/randomTP/Main.java @@ -3,15 +3,13 @@ package randomTP; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.World; -import org.bukkit.block.Block; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; -import org.bukkit.craftbukkit.v1_11_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_12_R1.CraftWorld; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; -import net.minecraft.server.v1_11_R1.WorldBorder; +import net.minecraft.server.v1_12_R1.WorldBorder; public class Main extends JavaPlugin { From 4ea2343cf478af7eaedb60c86752ff69b7851f47 Mon Sep 17 00:00:00 2001 From: iie Date: Wed, 5 Jul 2017 22:37:50 +0200 Subject: [PATCH 10/14] Added check for arg count and increased radius --- src/randomTP/Main.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/randomTP/Main.java b/src/randomTP/Main.java index ecf2d50..4476634 100644 --- a/src/randomTP/Main.java +++ b/src/randomTP/Main.java @@ -13,7 +13,7 @@ import net.minecraft.server.v1_12_R1.WorldBorder; public class Main extends JavaPlugin { - private final int radius = 70; //set how far apart the five teleport positions are + private final int radius = 300; //set how far apart the five teleport positions are private CraftWorld world; private WorldBorder border; @@ -65,7 +65,11 @@ public class Main extends JavaPlugin public boolean onCommand(CommandSender sender, Command label, String command, String[] args) { - if (sender.isOp()) return rtp(Bukkit.getPlayer(args[0])); else return false; + if (args.length == 0) return false; + + if (sender.isOp()) return rtp(Bukkit.getPlayer(args[0])); + + else return false; } /*================================================================================================*/ @@ -84,7 +88,7 @@ public class Main extends JavaPlugin && !newLocation()) { - //message player and return false if unable to find new location + //if unable to find new location, message player and return false player.sendMessage("§c could not find a location in 10,000 attempts"); player.sendMessage("§c (sorry bud... I did try!)"); return false; From 20d0e7f0fe9f55db2a1cf36cac40e8736e37114b Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Wed, 5 Jul 2017 23:18:16 +0200 Subject: [PATCH 11/14] Changed radius back The r70 commit --- src/randomTP/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/randomTP/Main.java b/src/randomTP/Main.java index 4476634..92947f0 100644 --- a/src/randomTP/Main.java +++ b/src/randomTP/Main.java @@ -13,7 +13,7 @@ import net.minecraft.server.v1_12_R1.WorldBorder; public class Main extends JavaPlugin { - private final int radius = 300; //set how far apart the five teleport positions are + private final int radius = 70; //set how far apart the five teleport positions are private CraftWorld world; private WorldBorder border; From c23e4db5e7077ef707222792641e16e0ef048b89 Mon Sep 17 00:00:00 2001 From: iie Date: Thu, 6 Jul 2017 00:12:05 +0200 Subject: [PATCH 12/14] Added message for non-OPs --- src/randomTP/Main.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/randomTP/Main.java b/src/randomTP/Main.java index 92947f0..7040e2d 100644 --- a/src/randomTP/Main.java +++ b/src/randomTP/Main.java @@ -69,15 +69,17 @@ public class Main extends JavaPlugin if (sender.isOp()) return rtp(Bukkit.getPlayer(args[0])); - else return false; + else sender.sendMessage("§7 hmm, " + sender.getName() + "... " + sender.getName() + "... nope, no operator permissions."); + + return false; } /*================================================================================================*/ public synchronized boolean rtp(Player player) { - if (player == null) - return false; + if (player == null) + return false; //Pretend it rtp'd an imaginary player successfully //if border has changed, or no positions available, find new location if ((centerUsed && northUsed && southUsed && eastUsed && westUsed) || From 9dcaaccc58fb53d94b03a74a70aee83ce4b68f80 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Thu, 6 Jul 2017 00:20:04 +0200 Subject: [PATCH 13/14] Added Travis deploy files --- .travis.yml | 26 ++++++++++++++++++++++++++ deploy.sh | 11 +++++++++++ 2 files changed, 37 insertions(+) create mode 100644 .travis.yml create mode 100644 deploy.sh diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..fb3af76 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,26 @@ +cache: + directories: + - $HOME/.m2/repository/org/bukkit/craftbukkit +before_install: | # Wget BuildTools and run if cached folder not found + if [ ! -d "$HOME/.m2/repository/org/bukkit/craftbukkit/1.12-R0.1-SNAPSHOT" ]; then + wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar + java -jar BuildTools.jar --rev 1.12 + fi + +language: java +jdk: + - oraclejdk8 +sudo: true +deploy: + # deploy develop to the staging environment + - provider: script + script: chmod +x deploy.sh && sh deploy.sh staging + on: + branch: dev + skip_cleanup: true + # deploy master to production + - provider: script + script: chmod +x deploy.sh && sh deploy.sh production + on: + branch: master + skip_cleanup: true diff --git a/deploy.sh b/deploy.sh new file mode 100644 index 0000000..636c48d --- /dev/null +++ b/deploy.sh @@ -0,0 +1,11 @@ +#!/bin/sh +FILENAME=$(find target/ ! -name '*original*' -name '*.jar') +echo Found file: $FILENAME + +if [ $1 = 'production' ]; then +echo Production mode +echo $UPLOAD_KEY > upload_key +chmod 400 upload_key +yes | scp -B -i upload_key -o StrictHostKeyChecking=no $FILENAME travis@server.figytuna.com:/minecraft/main/plugins +fi + From e08952a056dbf8bd8a4e9b5e8c8a1247dd1fd828 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Thu, 6 Jul 2017 00:35:54 +0200 Subject: [PATCH 14/14] Made deploy.sh ignore Spigot's jars --- deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.sh b/deploy.sh index 636c48d..1816df4 100644 --- a/deploy.sh +++ b/deploy.sh @@ -1,5 +1,5 @@ #!/bin/sh -FILENAME=$(find target/ ! -name '*original*' -name '*.jar') +FILENAME=$(find target/ -maxdepth 1 ! -name '*original*' -name '*.jar') echo Found file: $FILENAME if [ $1 = 'production' ]; then