Compare commits
No commits in common. "master" and "0.9.9" have entirely different histories.
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,4 +2,3 @@ lib/
|
||||
target/
|
||||
*.iml
|
||||
.idea/
|
||||
bukkit-testserver/
|
||||
|
BIN
CraftincBorderProtection.jar
Normal file
BIN
CraftincBorderProtection.jar
Normal file
Binary file not shown.
621
GPLv3
621
GPLv3
@ -1,621 +0,0 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||
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
|
165
LGPLv3
165
LGPLv3
@ -1,165 +0,0 @@
|
||||
GNU LESSER GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
|
||||
This version of the GNU Lesser General Public License incorporates
|
||||
the terms and conditions of version 3 of the GNU General Public
|
||||
License, supplemented by the additional permissions listed below.
|
||||
|
||||
0. Additional Definitions.
|
||||
|
||||
As used herein, "this License" refers to version 3 of the GNU Lesser
|
||||
General Public License, and the "GNU GPL" refers to version 3 of the GNU
|
||||
General Public License.
|
||||
|
||||
"The Library" refers to a covered work governed by this License,
|
||||
other than an Application or a Combined Work as defined below.
|
||||
|
||||
An "Application" is any work that makes use of an interface provided
|
||||
by the Library, but which is not otherwise based on the Library.
|
||||
Defining a subclass of a class defined by the Library is deemed a mode
|
||||
of using an interface provided by the Library.
|
||||
|
||||
A "Combined Work" is a work produced by combining or linking an
|
||||
Application with the Library. The particular version of the Library
|
||||
with which the Combined Work was made is also called the "Linked
|
||||
Version".
|
||||
|
||||
The "Minimal Corresponding Source" for a Combined Work means the
|
||||
Corresponding Source for the Combined Work, excluding any source code
|
||||
for portions of the Combined Work that, considered in isolation, are
|
||||
based on the Application, and not on the Linked Version.
|
||||
|
||||
The "Corresponding Application Code" for a Combined Work means the
|
||||
object code and/or source code for the Application, including any data
|
||||
and utility programs needed for reproducing the Combined Work from the
|
||||
Application, but excluding the System Libraries of the Combined Work.
|
||||
|
||||
1. Exception to Section 3 of the GNU GPL.
|
||||
|
||||
You may convey a covered work under sections 3 and 4 of this License
|
||||
without being bound by section 3 of the GNU GPL.
|
||||
|
||||
2. Conveying Modified Versions.
|
||||
|
||||
If you modify a copy of the Library, and, in your modifications, a
|
||||
facility refers to a function or data to be supplied by an Application
|
||||
that uses the facility (other than as an argument passed when the
|
||||
facility is invoked), then you may convey a copy of the modified
|
||||
version:
|
||||
|
||||
a) under this License, provided that you make a good faith effort to
|
||||
ensure that, in the event an Application does not supply the
|
||||
function or data, the facility still operates, and performs
|
||||
whatever part of its purpose remains meaningful, or
|
||||
|
||||
b) under the GNU GPL, with none of the additional permissions of
|
||||
this License applicable to that copy.
|
||||
|
||||
3. Object Code Incorporating Material from Library Header Files.
|
||||
|
||||
The object code form of an Application may incorporate material from
|
||||
a header file that is part of the Library. You may convey such object
|
||||
code under terms of your choice, provided that, if the incorporated
|
||||
material is not limited to numerical parameters, data structure
|
||||
layouts and accessors, or small macros, inline functions and templates
|
||||
(ten or fewer lines in length), you do both of the following:
|
||||
|
||||
a) Give prominent notice with each copy of the object code that the
|
||||
Library is used in it and that the Library and its use are
|
||||
covered by this License.
|
||||
|
||||
b) Accompany the object code with a copy of the GNU GPL and this license
|
||||
document.
|
||||
|
||||
4. Combined Works.
|
||||
|
||||
You may convey a Combined Work under terms of your choice that,
|
||||
taken together, effectively do not restrict modification of the
|
||||
portions of the Library contained in the Combined Work and reverse
|
||||
engineering for debugging such modifications, if you also do each of
|
||||
the following:
|
||||
|
||||
a) Give prominent notice with each copy of the Combined Work that
|
||||
the Library is used in it and that the Library and its use are
|
||||
covered by this License.
|
||||
|
||||
b) Accompany the Combined Work with a copy of the GNU GPL and this license
|
||||
document.
|
||||
|
||||
c) For a Combined Work that displays copyright notices during
|
||||
execution, include the copyright notice for the Library among
|
||||
these notices, as well as a reference directing the user to the
|
||||
copies of the GNU GPL and this license document.
|
||||
|
||||
d) Do one of the following:
|
||||
|
||||
0) Convey the Minimal Corresponding Source under the terms of this
|
||||
License, and the Corresponding Application Code in a form
|
||||
suitable for, and under terms that permit, the user to
|
||||
recombine or relink the Application with a modified version of
|
||||
the Linked Version to produce a modified Combined Work, in the
|
||||
manner specified by section 6 of the GNU GPL for conveying
|
||||
Corresponding Source.
|
||||
|
||||
1) Use a suitable shared library mechanism for linking with the
|
||||
Library. A suitable mechanism is one that (a) uses at run time
|
||||
a copy of the Library already present on the user's computer
|
||||
system, and (b) will operate properly with a modified version
|
||||
of the Library that is interface-compatible with the Linked
|
||||
Version.
|
||||
|
||||
e) Provide Installation Information, but only if you would otherwise
|
||||
be required to provide such information under section 6 of the
|
||||
GNU GPL, and only to the extent that such information is
|
||||
necessary to install and execute a modified version of the
|
||||
Combined Work produced by recombining or relinking the
|
||||
Application with a modified version of the Linked Version. (If
|
||||
you use option 4d0, the Installation Information must accompany
|
||||
the Minimal Corresponding Source and Corresponding Application
|
||||
Code. If you use option 4d1, you must provide the Installation
|
||||
Information in the manner specified by section 6 of the GNU GPL
|
||||
for conveying Corresponding Source.)
|
||||
|
||||
5. Combined Libraries.
|
||||
|
||||
You may place library facilities that are a work based on the
|
||||
Library side by side in a single library together with other library
|
||||
facilities that are not Applications and are not covered by this
|
||||
License, and convey such a combined library under terms of your
|
||||
choice, if you do both of the following:
|
||||
|
||||
a) Accompany the combined library with a copy of the same work based
|
||||
on the Library, uncombined with any other library facilities,
|
||||
conveyed under the terms of this License.
|
||||
|
||||
b) Give prominent notice with the combined library that part of it
|
||||
is a work based on the Library, and explaining where to find the
|
||||
accompanying uncombined form of the same work.
|
||||
|
||||
6. Revised Versions of the GNU Lesser General Public License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions
|
||||
of the GNU Lesser 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
|
||||
Library as you received it specifies that a certain numbered version
|
||||
of the GNU Lesser General Public License "or any later version"
|
||||
applies to it, you have the option of following the terms and
|
||||
conditions either of that published version or of any later version
|
||||
published by the Free Software Foundation. If the Library as you
|
||||
received it does not specify a version number of the GNU Lesser
|
||||
General Public License, you may choose any version of the GNU Lesser
|
||||
General Public License ever published by the Free Software Foundation.
|
||||
|
||||
If the Library as you received it specifies that a proxy can decide
|
||||
whether future versions of the GNU Lesser General Public License shall
|
||||
apply, that proxy's public statement of acceptance of any version is
|
||||
permanent authorization for you to choose that version for the
|
||||
Library.
|
10
LICENSE.md
10
LICENSE.md
@ -1,10 +0,0 @@
|
||||
# GPLv3
|
||||
* All files except the files listed under LGPLv3 are licensed under GPLv3
|
||||
|
||||
full text of GPLv3 can be found in the file "GPLv3"
|
||||
|
||||
|
||||
# LGPLv3
|
||||
* src/main/java/de/craftinc/borderprotection/util/LocationSerializer2D.java
|
||||
|
||||
full text of LGPLv3 can be found in the file "LGPLv3"
|
@ -1,9 +1,6 @@
|
||||
# Craft Inc. BorderProtection
|
||||
craftinc-borderprotection
|
||||
=========================
|
||||
|
||||
A border protection plugin for bukkit. All players (except those with ignoreborders permission) cannot go beyond the border.
|
||||
|
||||
Read the [full user guide](https://craftinc.comff.net/border-protection/) for more information.
|
||||
|
||||
## License
|
||||
|
||||
This project is licensed under GPLv3 and some files are LGPLv3. For exact information see LICENSE.
|
||||
Full user guide can be found here: http://www.craftinc.de/border-protection/
|
||||
|
124
pom.xml
124
pom.xml
@ -1,81 +1,47 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>de.craftinc</groupId>
|
||||
<artifactId>CraftincBorderProtection</artifactId>
|
||||
<name>CraftInc-BorderProtection</name>
|
||||
<packaging>jar</packaging>
|
||||
<version>2.0</version>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
|
||||
<build>
|
||||
<finalName>${project.name}-${project.version}</finalName>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src/main/resources</directory>
|
||||
<filtering>true</filtering>
|
||||
</resource>
|
||||
</resources>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>copy-dependencies</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<outputDirectory>${project.build.directory}/lib</outputDirectory>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>exec-maven-plugin</artifactId>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<version>1.2.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>Run Test Bukkit Server</id>
|
||||
<phase>install</phase>
|
||||
<goals>
|
||||
<goal>exec</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<executable>${basedir}/scripts/test-deployment.sh</executable>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>spigot-repo</id>
|
||||
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<dependencies>
|
||||
<!--Spigot API-->
|
||||
<dependency>
|
||||
<groupId>org.spigotmc</groupId>
|
||||
<artifactId>spigot-api</artifactId>
|
||||
<version>1.10.2-R0.1-SNAPSHOT</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<!--Bukkit API-->
|
||||
<dependency>
|
||||
<groupId>org.bukkit</groupId>
|
||||
<artifactId>bukkit</artifactId>
|
||||
<version>1.10.2-R0.1-SNAPSHOT</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>CraftincBorderProtection</groupId>
|
||||
<artifactId>CraftincBorderProtection</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<version>0.9.9</version>
|
||||
<name>CraftincGates</name>
|
||||
<url>http://maven.apache.org</url>
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.bukkit</groupId>
|
||||
<artifactId>bukkit</artifactId>
|
||||
<version>RELEASE</version>
|
||||
<type>jar</type>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.10</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>2.3.2</version>
|
||||
<configuration>
|
||||
<source>1.6</source>
|
||||
<target>1.6</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>bukkit-repo</id>
|
||||
<url>http://repo.bukkit.org/content/groups/public</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
</project>
|
||||
|
@ -1,202 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Craft Inc. BorderProtection
|
||||
# Copyright (C) 2016 Paul Schulze
|
||||
#
|
||||
# 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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
SERVICE='craftbukkit-1.10.2.jar'
|
||||
|
||||
# numbers of CPU cores; used only for the parallel garbage collector threads
|
||||
CPU_COUNT=8
|
||||
|
||||
# maximum memory which the JAVA VM is allowed to allocate (M is megabyte)
|
||||
XMX=-Xmx10000M
|
||||
|
||||
# initial memory which the JAVA VM is allocating (M is megabyte)
|
||||
XMS=-Xms3000M
|
||||
|
||||
# Replace with path which contains your craftbukkit.jar
|
||||
MCPATH="$(dirname "$0")/../bukkit-testserver"
|
||||
|
||||
|
||||
|
||||
# ========================================================================
|
||||
# == Don't change anything below this line unless you know what you do. ==
|
||||
# ========================================================================
|
||||
BUKKIT="$MCPATH/$SERVICE"
|
||||
INVOCATION="java $XMX $XMS -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalPacing -XX:ParallelGCThreads=$CPU_COUNT -XX:+AggressiveOpts -jar $BUKKIT nogui"
|
||||
|
||||
if [[ "$MCPATH" == '/my/path/to/craftbukkit' ]]; then
|
||||
echo "Please configure the \"MCPATH\" variable in the $0 file." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
SCREEN_NAME="$(cat "$MCPATH/screen_name" 2> /dev/null)"
|
||||
if [[ -z "$SCREEN_NAME" ]]; then
|
||||
SCREEN_NAME="minecraft.$(head -c12 /dev/urandom | xxd -p)"
|
||||
echo -n "$SCREEN_NAME" > "$MCPATH/screen_name"
|
||||
fi
|
||||
|
||||
psgrep() {
|
||||
psgreptmp=$(mktemp)
|
||||
|
||||
ps auxww > "$psgreptmp"
|
||||
grep -v "$$" "$psgreptmp" | egrep --color=auto -i "$1"
|
||||
rm "$psgreptmp"
|
||||
}
|
||||
|
||||
send_to_screen() {
|
||||
screen -p 0 -S "$SCREEN_NAME" -X stuff "$1
|
||||
"
|
||||
}
|
||||
|
||||
mc_service_running() {
|
||||
psgrep "$SERVICE" | grep -v -i 'screen' | grep 'java' | grep -- "$XMX" | grep -- "$XMS" | grep "$BUKKIT" > /dev/null
|
||||
return $?
|
||||
}
|
||||
|
||||
mc_start() {
|
||||
if ! mc_status; then
|
||||
echo "Starting..."
|
||||
cd "$MCPATH"
|
||||
screen -dmS "$SCREEN_NAME" $INVOCATION
|
||||
sleep 2
|
||||
mc_status
|
||||
fi
|
||||
}
|
||||
|
||||
mc_stop() {
|
||||
if mc_status; then
|
||||
# echo "Sending message to users..."
|
||||
# send_to_screen 'say SERVER SHUTTING DOWN IN 10 SECONDS!'
|
||||
# sleep 10
|
||||
echo "Saving..."
|
||||
send_to_screen 'save-all'
|
||||
sleep 1
|
||||
echo "Stopping..."
|
||||
send_to_screen 'stop'
|
||||
sleep 3
|
||||
mc_status
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
mc_save() {
|
||||
if mc_status; then
|
||||
echo "Saving..."
|
||||
send_to_screen 'save-all'
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
mc_restart_or_start() {
|
||||
if mc_service_running; then
|
||||
mc_stop
|
||||
sleep 1
|
||||
mc_start
|
||||
else
|
||||
mc_start
|
||||
fi
|
||||
}
|
||||
|
||||
mc_reset_permissions() {
|
||||
if mc_status; then
|
||||
echo "Unbanning ddidderr..."
|
||||
send_to_screen 'pardon ddidderr'
|
||||
echo "Unbanning mice_on_drugs..."
|
||||
send_to_screen 'pardon mice_on_drugs'
|
||||
echo "Unbanning Mochaccino..."
|
||||
send_to_screen 'pardon Mochaccino'
|
||||
|
||||
echo "ddidder -> admin"
|
||||
send_to_screen 'pex user ddidderr group set admin'
|
||||
echo "mice_on_drugs -> mod"
|
||||
send_to_screen 'pex user mice_on_drugs group set mod'
|
||||
echo "Mochaccino -> mod"
|
||||
send_to_screen 'pex user Mochaccino group set mod'
|
||||
|
||||
echo "Reloading permissions..."
|
||||
send_to_screen 'pex reload'
|
||||
echo "DONE"
|
||||
fi
|
||||
}
|
||||
|
||||
mc_custom_command() {
|
||||
if mc_status; then
|
||||
if [[ -z "$1" ]]; then
|
||||
echo "You must specify a command." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Trying to issue command: \"$1\""
|
||||
send_to_screen "$1"
|
||||
tail -fn50 "$MCPATH/logs/latest.log"
|
||||
fi
|
||||
}
|
||||
|
||||
mc_status() {
|
||||
if mc_service_running; then
|
||||
echo "$SERVICE is running."
|
||||
return 0
|
||||
else
|
||||
echo "$SERVICE is stopped."
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
mc_online() {
|
||||
if mc_status; then
|
||||
send_to_screen 'list'
|
||||
sleep 2s
|
||||
tac "$MCPATH/logs/latest.log" | egrep -om 1 "There are.*players online"
|
||||
fi
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
mc_start
|
||||
;;
|
||||
stop)
|
||||
mc_stop
|
||||
;;
|
||||
restart)
|
||||
$0 stop
|
||||
sleep 2
|
||||
$0 start
|
||||
;;
|
||||
restart_or_start)
|
||||
mc_restart_or_start
|
||||
;;
|
||||
reset_permissions)
|
||||
mc_reset_permissions
|
||||
;;
|
||||
custom)
|
||||
mc_custom_command "${*:2}"
|
||||
;;
|
||||
online)
|
||||
mc_online
|
||||
;;
|
||||
status)
|
||||
mc_status
|
||||
;;
|
||||
save)
|
||||
mc_save
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|restart|save|online|status|reset_permissions}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
@ -1,57 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Craft Inc. BorderProtection
|
||||
# Copyright (C) 2016 Paul Schulze
|
||||
#
|
||||
# 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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
SCRIPT_DIR="$(dirname "$0")"
|
||||
|
||||
DEVELOPER="$(whoami)"
|
||||
|
||||
BUKKIT_DIR="$SCRIPT_DIR/../bukkit-testserver"
|
||||
PLUGIN_DIR="$SCRIPT_DIR/../bukkit-testserver/plugins"
|
||||
START_STOP_SCRIPT="$SCRIPT_DIR/minecraft.sh"
|
||||
BUILD_TOOLS_DIR="$BUKKIT_DIR/buildtools"
|
||||
|
||||
mkdir -p "$BUILD_TOOLS_DIR"
|
||||
# get build tools
|
||||
if [ ! -f "$BUILD_TOOLS_DIR/BuildTools.jar" ]; then
|
||||
wget -O- 'https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar' > "$BUILD_TOOLS_DIR/BuildTools.jar"
|
||||
fi
|
||||
|
||||
cp -f "$BUILD_TOOLS_DIR"/craftbukkit*.jar "$BUKKIT_DIR/"
|
||||
|
||||
# run build tools
|
||||
if [ ! -f "$BUKKIT_DIR"/craftbukkit*.jar ]; then
|
||||
cd "$BUILD_TOOLS_DIR"
|
||||
java -jar ./BuildTools.jar
|
||||
fi
|
||||
|
||||
echo 'eula=TRUE' > "$BUKKIT_DIR/eula.txt"
|
||||
|
||||
# TODO: This is a bad solution! Maven should write necessary information into an extra file.
|
||||
ARTIFACT_ID="$(grep -C5 '<groupId>de.craftinc' "$SCRIPT_DIR/../pom.xml" | grep '<name>' | sed 's/[ \t]*<name>//g' | sed 's/<\/name>[ \t]*//g')"
|
||||
|
||||
# TODO: This is a bad solution! Maven should write necessary information into an extra file.
|
||||
VERSION="$(grep -C5 '<groupId>de.craftinc' "$SCRIPT_DIR/../pom.xml" | grep '<version>' | sed 's/[ \t]*<version>//g' | sed 's/<\/version>[ \t]*//g')"
|
||||
|
||||
rm -rf "$PLUGIN_DIR"
|
||||
mkdir -p "$PLUGIN_DIR"
|
||||
|
||||
cp "$SCRIPT_DIR/../target/$ARTIFACT_ID-$VERSION".jar "$PLUGIN_DIR/"
|
||||
|
||||
echo -e "ddidderr\nmice_on_drugs\nMochaccino" > "$BUKKIT_DIR/ops.txt"
|
||||
|
||||
$START_STOP_SCRIPT restart_or_start
|
209
src/main/java/de/craftinc/borderprotection/BorderManager.java
Normal file
209
src/main/java/de/craftinc/borderprotection/BorderManager.java
Normal file
@ -0,0 +1,209 @@
|
||||
package de.craftinc.borderprotection;
|
||||
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Calendar;
|
||||
import java.util.HashMap;
|
||||
|
||||
public class BorderManager
|
||||
{
|
||||
/**
|
||||
* *********************************************************
|
||||
* GLOBAL VARIABLES
|
||||
* **********************************************************
|
||||
*/
|
||||
|
||||
private final String dataFileName = "data.json";
|
||||
|
||||
/**
|
||||
* Borders of all Worlds. String is World.getName(). Location is one point of the border. A border
|
||||
* consists of two points which create a rectangle.
|
||||
*/
|
||||
private HashMap<String, ArrayList<Location>> borders = null;
|
||||
|
||||
/**
|
||||
* For every player save the time when he got the last borderMessage
|
||||
*/
|
||||
public HashMap<String, Long> lastBorderMessage = new HashMap<String, Long>();
|
||||
|
||||
/**
|
||||
* The buffer in blocks which applies when a player is teleported inside the border. 0 means the player
|
||||
* will be teleported directly to the border.
|
||||
*/
|
||||
private double buffer = 0.5;
|
||||
|
||||
/**
|
||||
* A timeout for the border message. When a player tries to cross the border and sees the border message,
|
||||
* the earliest possible time the message will show up again is after <code>timeout</code> milliseconds.
|
||||
*/
|
||||
private Long timeout = 10000L;
|
||||
|
||||
/**
|
||||
* Serializer, which is used for loading and saving data to harddisk
|
||||
*/
|
||||
private Serializer serializer;
|
||||
|
||||
/**
|
||||
* *********************************************************
|
||||
* CONSTRUCTOR
|
||||
* **********************************************************
|
||||
*/
|
||||
public BorderManager()
|
||||
{
|
||||
// initialize Serializer and load data file
|
||||
serializer = new Serializer(new File(Plugin.getPlugin().getDataFolder(), dataFileName));
|
||||
borders = serializer.loadDataFile();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* *********************************************************
|
||||
* GETTERS AND SETTERS
|
||||
* **********************************************************
|
||||
*/
|
||||
|
||||
public Serializer getSerializer()
|
||||
{
|
||||
return serializer;
|
||||
}
|
||||
|
||||
public double getBuffer()
|
||||
{
|
||||
return buffer;
|
||||
}
|
||||
|
||||
public Long getTimeout()
|
||||
{
|
||||
return timeout;
|
||||
}
|
||||
|
||||
public HashMap<String, ArrayList<Location>> getBorders()
|
||||
{
|
||||
return borders;
|
||||
}
|
||||
|
||||
public void setBorder( String worldName, double border )
|
||||
{
|
||||
if ( borders == null )
|
||||
{
|
||||
borders = new HashMap<String, ArrayList<Location>>();
|
||||
}
|
||||
|
||||
World world = Plugin.getPlugin().getServer().getWorld(worldName);
|
||||
|
||||
// set two points which define a square
|
||||
borders.put(worldName, new ArrayList<Location>(Arrays.asList(
|
||||
new Location(world, border, 0, border),
|
||||
new Location(world, -border, 0, -border)
|
||||
)));
|
||||
}
|
||||
|
||||
public void setBorder( String worldName, String[] borderPoints )
|
||||
{
|
||||
if ( borders == null )
|
||||
{
|
||||
borders = new HashMap<String, ArrayList<Location>>();
|
||||
}
|
||||
|
||||
ArrayList<Location> locations = new ArrayList<Location>();
|
||||
World world = Plugin.getPlugin().getServer().getWorld(worldName);
|
||||
|
||||
for ( String borderPoint : borderPoints )
|
||||
{
|
||||
String[] point = borderPoint.split(",");
|
||||
locations.add(new Location(world, Double.parseDouble(point[0]), 0, Double.parseDouble(point[1])));
|
||||
}
|
||||
|
||||
borders.put(worldName, locations);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Checks if the given location is inside the border rectangle. Returns null if yes, otherwise new coordinates.
|
||||
*
|
||||
* @param location location to check
|
||||
* @param borderPoints points which define the border rectangle
|
||||
* @param buffer if the player will be teleported back, then he will be <code>buffer</code> far away
|
||||
* from the border he tried to cross
|
||||
* @return null if the player is inside, otherwise a new player location
|
||||
*/
|
||||
public Double[] checkBorder( Location location, ArrayList<Location> borderPoints, double buffer )
|
||||
{
|
||||
// New x and z: null by default
|
||||
Double[] newXZ = { null, null };
|
||||
|
||||
// check if player is withing the X borders
|
||||
newXZ[0] = _checkBorder(location.getX(), borderPoints.get(0).getX(), borderPoints.get(1).getX(), buffer);
|
||||
// check if player is withing the Z borders
|
||||
newXZ[1] = _checkBorder(location.getZ(), borderPoints.get(0).getZ(), borderPoints.get(1).getZ(), buffer);
|
||||
|
||||
// Do nothing, if no new coordinates have been calculated.
|
||||
if ( newXZ[0] == null && newXZ[1] == null )
|
||||
{
|
||||
return null;
|
||||
}
|
||||
return newXZ;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Checks if the given location is between one specific border pair.
|
||||
*
|
||||
* @param location part of the location coordinates
|
||||
* @param border1 one side of the rectangle
|
||||
* @param border2 opposite side of the rectangle
|
||||
* @return null if the location is inside, otherwise a new location
|
||||
*/
|
||||
public Double _checkBorder( double location, double border1, double border2, double buffer )
|
||||
{
|
||||
double bigBorder = Math.max(border1, border2);
|
||||
double smallBorder = Math.min(border1, border2);
|
||||
|
||||
// if location is between borders do nothing
|
||||
if ( location >= smallBorder && location <= bigBorder )
|
||||
{
|
||||
return null;
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( location > bigBorder )
|
||||
{
|
||||
// if location is outside of the bigBorder, teleport to the bigBorder
|
||||
return bigBorder - buffer;
|
||||
}
|
||||
else
|
||||
{
|
||||
// if location is outside of the smallBorder, teleport to the smallBorder
|
||||
return smallBorder + buffer;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Show the border message to a player and respect the timeout.
|
||||
*
|
||||
* @param player Player who will see the border message.
|
||||
*/
|
||||
public void showMessageWithTimeout( Player player, String message )
|
||||
{
|
||||
// get the current time
|
||||
Long now = Calendar.getInstance().getTimeInMillis();
|
||||
|
||||
if ( ( lastBorderMessage.get(player.getName()) != null &&
|
||||
now - getTimeout() > lastBorderMessage.get(player.getName()) ) ||
|
||||
lastBorderMessage.get(player.getName()) == null )
|
||||
{
|
||||
// show message
|
||||
player.sendMessage(message);
|
||||
|
||||
// set last sent message for this player to now
|
||||
lastBorderMessage.put(player.getName(), now);
|
||||
}
|
||||
}
|
||||
}
|
87
src/main/java/de/craftinc/borderprotection/Commands.java
Normal file
87
src/main/java/de/craftinc/borderprotection/Commands.java
Normal file
@ -0,0 +1,87 @@
|
||||
package de.craftinc.borderprotection;
|
||||
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class Commands implements CommandExecutor
|
||||
{
|
||||
private BorderManager borderManager;
|
||||
|
||||
public Commands( BorderManager borderManager )
|
||||
{
|
||||
this.borderManager = borderManager;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCommand( CommandSender sender, Command command, String label, String[] args )
|
||||
{
|
||||
// Check if command comes from a player.
|
||||
if ( !( sender instanceof Player ) )
|
||||
{
|
||||
sender.sendMessage(Messages.commandIssuedByNonPlayer);
|
||||
return true;
|
||||
}
|
||||
|
||||
// command for all actions
|
||||
if ( command.getName().equalsIgnoreCase("cibp") )
|
||||
{
|
||||
// help
|
||||
if ( args.length == 0 || ( args.length > 0 && args[0].equalsIgnoreCase("help") ) )
|
||||
{
|
||||
sender.sendMessage(Messages.helpGeneral);
|
||||
return true;
|
||||
}
|
||||
|
||||
// set
|
||||
if ( ( args.length == 2 || args.length == 3 ) && args[0].equalsIgnoreCase("set") )
|
||||
{
|
||||
if ( !sender.hasPermission("craftinc.borderprotection.set") )
|
||||
{
|
||||
sender.sendMessage(Messages.noPermissionSet);
|
||||
return false;
|
||||
}
|
||||
if ( args.length == 2 )
|
||||
{
|
||||
borderManager.setBorder(( (Player) sender ).getWorld().getName(), Double.parseDouble(args[1]));
|
||||
}
|
||||
else if ( args.length == 3 )
|
||||
{
|
||||
String[] borderDefinition = { args[1], args[2] };
|
||||
borderManager.setBorder(( (Player) sender ).getWorld().getName(), borderDefinition);
|
||||
}
|
||||
|
||||
// save the new border
|
||||
borderManager.getSerializer().saveDataFile(borderManager.getBorders());
|
||||
return true;
|
||||
}
|
||||
|
||||
// get
|
||||
if ( args.length == 1 && ( args[0].equalsIgnoreCase("get") || args[0].equalsIgnoreCase("info") ) )
|
||||
{
|
||||
String worldName = ( (Player) sender ).getWorld().getName();
|
||||
|
||||
// exit and send the player a message if no border is set
|
||||
if ( borderManager.getBorders() == null ||
|
||||
borderManager.getBorders().get(worldName) == null )
|
||||
{
|
||||
sender.sendMessage(Messages.borderInfoNoBorderSet);
|
||||
return true;
|
||||
}
|
||||
|
||||
ArrayList<Location> borderPoints = borderManager.getBorders()
|
||||
.get(worldName);
|
||||
String borderDef = borderPoints.get(0).getX() + "," + borderPoints.get(0).getZ() + " " +
|
||||
borderPoints.get(1).getX() + "," + borderPoints.get(1).getZ();
|
||||
|
||||
sender.sendMessage(Messages.borderInfo(worldName, borderDef));
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
@ -1,39 +1,11 @@
|
||||
/* Craft Inc. BorderProtection
|
||||
Copyright (C) 2016 Paul Schulze, Tobias Ottenweller
|
||||
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package de.craftinc.borderprotection;
|
||||
|
||||
import de.craftinc.borderprotection.borders.Border;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.util.Calendar;
|
||||
import java.util.HashMap;
|
||||
|
||||
public class Messages
|
||||
{
|
||||
private static final String NEWLINE = "\n";
|
||||
|
||||
private static final String pluginName = Plugin.instance.getDescription().getName();
|
||||
|
||||
/**
|
||||
* For every player and every message of that player save the time when he got the last one.
|
||||
*/
|
||||
private static final HashMap<String, HashMap<String, Long>> lastMessage = new HashMap<String, HashMap<String, Long>>();
|
||||
|
||||
private static String makeCmd( String command, String explanation, String... args )
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
@ -65,122 +37,41 @@ public class Messages
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
private static final String borderExplanation =
|
||||
private static String borderExplanation =
|
||||
"One day the holy mods and administrators will expand the border. It is then your mission to explore " +
|
||||
"strange new worlds, to seek out new life and new civilizations, to boldly go where no one has gone before.";
|
||||
|
||||
public static final String borderMessage =
|
||||
ChatColor.YELLOW + "Sorry Dude! " +
|
||||
ChatColor.WHITE + "This is the border... the final frontier! " + borderExplanation + NEWLINE +
|
||||
public static String borderMessage =
|
||||
"Sorry Dude! This is the border... the final frontier! " + borderExplanation + NEWLINE +
|
||||
makeCmd("/cibp get", "shows the borders of the current world");
|
||||
|
||||
public static final String borderTeleportMessage =
|
||||
ChatColor.YELLOW + "Sorry Dude! " +
|
||||
ChatColor.WHITE + "You cannot teleport outside the border. " + borderExplanation + NEWLINE +
|
||||
public static String borderTeleportMessage =
|
||||
"Sorry Dude! You cannot teleport outside the border. " + borderExplanation + NEWLINE +
|
||||
makeCmd("/cibp get", "shows the borders of the current world");
|
||||
|
||||
public static final String helpGeneral =
|
||||
ChatColor.GREEN + pluginName + " - Usage:" + NEWLINE +
|
||||
ChatColor.WHITE + "Commands are always related to the current world." + NEWLINE +
|
||||
public static String helpGeneral =
|
||||
ChatColor.GREEN + "CraftInc BorderProtection - Usage:" + NEWLINE +
|
||||
makeCmd("help", "shows this help") +
|
||||
makeCmd("get | info", "Shows information about the border.") +
|
||||
makeCmd("generate", "Generate all not existing chunks inside the border.") +
|
||||
makeCmd("cancelgenerate", "Cancels the generation of chunks.") +
|
||||
makeCmd("on | off", "Enables/disables the border.") +
|
||||
makeCmd("set", "Square border with distance (d) from 0,0.", "r", "<d>") +
|
||||
makeCmd("set", "Rectangle defined by two points. Point=x,z.", "r", "<p1>", "<p2>") +
|
||||
makeCmd("set", "Circle border with radius from 0,0.", "c", "<radius>") +
|
||||
makeCmd("set", "Circle defined by center and radius. Center=x,z.", "c", "<c>", "<r>");
|
||||
makeCmd("get | info", "shows the borders of the current world") +
|
||||
makeCmd("set", "Border rectangle edges will be this far away from point of origin.", "<integer>") +
|
||||
makeCmd("set", "Border rectangle is defined by the two points. A point is specified as: x,z",
|
||||
"<point1>", "<point2>");
|
||||
|
||||
public static final String borderCreationSuccessful
|
||||
= ChatColor.YELLOW + "New border was set " +
|
||||
ChatColor.GREEN + "successfully" +
|
||||
ChatColor.YELLOW + "!";
|
||||
public static String commandIssuedByNonPlayer
|
||||
= ChatColor.RED + "Only a player can use CraftInc BorderProtection commands!";
|
||||
|
||||
public static final String commandIssuedByNonPlayer
|
||||
= ChatColor.RED + "Only a player can use " + pluginName + " commands!";
|
||||
|
||||
public static String borderInfo( String worldName, Border border )
|
||||
public static String borderInfo( String worldName, String borderDef )
|
||||
{
|
||||
String borderEnabled;
|
||||
if ( border.isActive() )
|
||||
borderEnabled = ChatColor.GREEN + "enabled";
|
||||
else
|
||||
borderEnabled = ChatColor.RED + "disabled";
|
||||
|
||||
return ChatColor.WHITE + "Border of world " + ChatColor.YELLOW + worldName + ChatColor.WHITE + ": " + NEWLINE +
|
||||
ChatColor.YELLOW + "Type: " + ChatColor.WHITE + border.getBorderTypeString() + NEWLINE +
|
||||
border.getBorderInfoString() + NEWLINE +
|
||||
ChatColor.WHITE + "Border is " + borderEnabled + ChatColor.WHITE + ".";
|
||||
return ChatColor.WHITE + "Borders of world " +
|
||||
ChatColor.YELLOW + worldName +
|
||||
ChatColor.WHITE + ": " +
|
||||
ChatColor.YELLOW + borderDef;
|
||||
}
|
||||
|
||||
public static final String borderInfoNoBorderSet =
|
||||
ChatColor.YELLOW + "No border in this world.";
|
||||
public static String borderInfoNoBorderSet =
|
||||
ChatColor.YELLOW + "No border here.";
|
||||
|
||||
public static final String noPermissionSet =
|
||||
ChatColor.RED + "Sorry, you don't have permission to change the border.";
|
||||
|
||||
public static final String borderEnabled =
|
||||
ChatColor.YELLOW + "Border enabled.";
|
||||
|
||||
public static final String borderDisabled =
|
||||
ChatColor.YELLOW + "Border disabled.";
|
||||
|
||||
public static final String borderSaveException =
|
||||
ChatColor.RED + "Error: Could not save border on server. After the next reload this border will be lost!";
|
||||
|
||||
public static final String borderEnableDisableException =
|
||||
ChatColor.RED +
|
||||
"Error: Could not save border state on server. After the next reload this border state will be lost!";
|
||||
|
||||
public static final String generationCanceled =
|
||||
ChatColor.GREEN + "World generation canceled!";
|
||||
|
||||
public static final String generationNotCanceled =
|
||||
ChatColor.RED + "No world generation happening. Cannot cancel!";
|
||||
|
||||
public static final String generationAlreadyInProgress =
|
||||
ChatColor.YELLOW +
|
||||
"World generation is already in progress. It will continue after all players are logged out.";
|
||||
|
||||
public static final String generationStarted =
|
||||
ChatColor.GREEN + "World generation will start after all players left the server.";
|
||||
|
||||
public static final String generationCouldNotBeStarted =
|
||||
ChatColor.RED + "Could not start world generation! Is there a border?";
|
||||
|
||||
/**
|
||||
* Display a message to a player and then wait for timeout seconds before displaying it again.
|
||||
*
|
||||
* @param player Player who will see the message.
|
||||
* @param message The message String.
|
||||
* @param timeout Timeout in seconds until the message will be displayed earliest.
|
||||
*/
|
||||
public static void showMessageWithTimeout( final Player player, final String message, final Integer timeout )
|
||||
{
|
||||
// get the current time
|
||||
final Long now = Calendar.getInstance().getTimeInMillis();
|
||||
|
||||
if ( ( lastMessage.get(player.getName()) != null && lastMessage.get(player.getName()).get(message) != null &&
|
||||
now - timeout * 1000 > lastMessage.get(player.getName()).get(message) ) ||
|
||||
lastMessage.get(player.getName()) != null && lastMessage.get(player.getName()).get(message) == null ||
|
||||
lastMessage.get(player.getName()) == null )
|
||||
{
|
||||
// show message
|
||||
player.sendMessage(message);
|
||||
|
||||
// set last sent message for this player to now
|
||||
if ( lastMessage.get(player.getName()) == null )
|
||||
{
|
||||
lastMessage.put(player.getName(), new HashMap<String, Long>()
|
||||
{{
|
||||
put(message, now);
|
||||
}});
|
||||
}
|
||||
else
|
||||
{
|
||||
lastMessage.get(player.getName()).put(message, now);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
public static String noPermissionSet =
|
||||
ChatColor.RED + "Sorry, you don't have permission to set the border.";
|
||||
}
|
@ -0,0 +1,98 @@
|
||||
package de.craftinc.borderprotection;
|
||||
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.PlayerMoveEvent;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class PlayerMoveListener implements Listener
|
||||
{
|
||||
|
||||
private BorderManager borderManager;
|
||||
|
||||
public PlayerMoveListener( BorderManager borderManager )
|
||||
{
|
||||
this.borderManager = borderManager;
|
||||
}
|
||||
|
||||
private Double goUpUntilFreeSpot( Player player )
|
||||
{
|
||||
// go up in height until the player can stand in AIR
|
||||
Block footBlock = player.getLocation().getBlock();
|
||||
Block headBlock = player.getEyeLocation().getBlock();
|
||||
while ( footBlock.getType() != Material.AIR || headBlock.getType() != Material.AIR )
|
||||
{
|
||||
byte offset = 1;
|
||||
if ( headBlock.getType() != Material.AIR )
|
||||
{
|
||||
offset = 2;
|
||||
}
|
||||
footBlock = footBlock.getRelative(0, offset, 0);
|
||||
headBlock = headBlock.getRelative(0, offset, 0);
|
||||
}
|
||||
// set the y value to a spot where the player can stand free
|
||||
return (double) footBlock.getY();
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.NORMAL)
|
||||
public void onPlayerMove( PlayerMoveEvent e )
|
||||
{
|
||||
// do nothing if player has the ignoreborders permission
|
||||
if ( e.getPlayer().hasPermission("craftinc.borderprotection.ignoreborders") )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// do nothing if there are no border definitions at all
|
||||
if ( borderManager.getBorders() == null )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// player location
|
||||
Location playerLocation = e.getPlayer().getLocation();
|
||||
|
||||
// world where the player is in
|
||||
String worldName = e.getPlayer().getWorld().getName();
|
||||
|
||||
// borders of this world
|
||||
ArrayList<Location> borderPoints = borderManager.getBorders().get(worldName);
|
||||
|
||||
// do nothing if there are no borders for this specific world
|
||||
if ( borderPoints == null )
|
||||
return;
|
||||
|
||||
// change x or z. default: do not change
|
||||
Double[] newXZ;
|
||||
|
||||
// check if player is inside the borders. null if yes, otherwise a tuple which defines the new player position
|
||||
newXZ = borderManager.checkBorder(playerLocation, borderPoints, borderManager.getBuffer());
|
||||
|
||||
// Do nothing, if no new coordinates have been calculated.
|
||||
if ( newXZ == null )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// if one of the coordinates is null, set it to the player's value
|
||||
newXZ[0] = newXZ[0] == null ? playerLocation.getX() : newXZ[0];
|
||||
newXZ[1] = newXZ[1] == null ? playerLocation.getZ() : newXZ[1];
|
||||
|
||||
// change Y if necessary (when there is no free spot)
|
||||
Double newY = goUpUntilFreeSpot(e.getPlayer());
|
||||
|
||||
// teleport the player to the new X and Z coordinates
|
||||
e.getPlayer().teleport(
|
||||
new Location(e.getPlayer().getWorld(), newXZ[0], newY, newXZ[1], playerLocation.getYaw(),
|
||||
playerLocation.getPitch()));
|
||||
|
||||
// send a message to the player
|
||||
borderManager.showMessageWithTimeout(e.getPlayer(), Messages.borderMessage);
|
||||
}
|
||||
}
|
@ -0,0 +1,64 @@
|
||||
package de.craftinc.borderprotection;
|
||||
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.PlayerTeleportEvent;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class PlayerTeleportListener implements Listener
|
||||
{
|
||||
private BorderManager borderManager;
|
||||
|
||||
public PlayerTeleportListener( BorderManager borderManager )
|
||||
{
|
||||
this.borderManager = borderManager;
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.LOWEST)
|
||||
public void onPlayerMove( PlayerTeleportEvent e )
|
||||
{
|
||||
// do nothing if player has the ignoreborders permission
|
||||
if ( e.getPlayer().hasPermission("craftinc.borderprotection.ignoreborders") )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// do nothing if there are no border definitions at all
|
||||
if ( borderManager.getBorders() == null )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// target location
|
||||
Location targetLocation = e.getTo();
|
||||
|
||||
// world where the player is in
|
||||
String worldName = targetLocation.getWorld().getName();
|
||||
|
||||
// borders of this world
|
||||
ArrayList<Location> borderPoints = borderManager.getBorders().get(worldName);
|
||||
|
||||
// do nothing if there are no borders for this specific world
|
||||
if ( borderPoints == null )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// change x or z. default: do not change
|
||||
Double[] newXZ;
|
||||
|
||||
// check if target is inside the borders. null if yes, otherwise a tuple which defines the new position
|
||||
newXZ = borderManager.checkBorder(targetLocation, borderPoints, borderManager.getBuffer());
|
||||
|
||||
|
||||
// Cancel event, if new coordinates have been calculated.
|
||||
if ( newXZ != null )
|
||||
{
|
||||
e.setCancelled(true);
|
||||
borderManager.showMessageWithTimeout(e.getPlayer(), Messages.borderTeleportMessage);
|
||||
}
|
||||
}
|
||||
}
|
@ -1,41 +1,15 @@
|
||||
/* Craft Inc. BorderProtection
|
||||
Copyright (C) 2016 Paul Schulze, Tobias Ottenweller
|
||||
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package de.craftinc.borderprotection;
|
||||
|
||||
import de.craftinc.borderprotection.borders.CircBorder;
|
||||
import de.craftinc.borderprotection.borders.RectBorder;
|
||||
import de.craftinc.borderprotection.commands.CommandSwitch;
|
||||
import de.craftinc.borderprotection.events.PlayerJoinListener;
|
||||
import de.craftinc.borderprotection.events.PlayerMoveListener;
|
||||
import de.craftinc.borderprotection.events.PlayerQuitListener;
|
||||
import de.craftinc.borderprotection.events.PlayerTeleportListener;
|
||||
import org.bukkit.configuration.serialization.ConfigurationSerialization;
|
||||
import org.bukkit.plugin.PluginManager;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
|
||||
public class Plugin extends JavaPlugin
|
||||
{
|
||||
public static Plugin instance;
|
||||
private static JavaPlugin cibpPlugin;
|
||||
|
||||
@Override
|
||||
public void onLoad()
|
||||
public static JavaPlugin getPlugin()
|
||||
{
|
||||
ConfigurationSerialization.registerClass(RectBorder.class);
|
||||
ConfigurationSerialization.registerClass(CircBorder.class);
|
||||
return cibpPlugin;
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -46,23 +20,19 @@ public class Plugin extends JavaPlugin
|
||||
@Override
|
||||
public void onEnable()
|
||||
{
|
||||
Plugin.instance = this;
|
||||
Plugin.cibpPlugin = this;
|
||||
|
||||
// create listeners
|
||||
PlayerMoveListener playerMoveListener = new PlayerMoveListener();
|
||||
PlayerTeleportListener playerTeleportListener = new PlayerTeleportListener();
|
||||
PlayerJoinListener playerJoinListener = new PlayerJoinListener();
|
||||
PlayerQuitListener playerQuitListener = new PlayerQuitListener();
|
||||
BorderManager borderManager = new BorderManager();
|
||||
PlayerMoveListener playerMoveListener = new PlayerMoveListener(borderManager);
|
||||
PlayerTeleportListener playerTeleportListener = new PlayerTeleportListener(borderManager);
|
||||
|
||||
// commands
|
||||
CommandSwitch commandExecutor = new CommandSwitch();
|
||||
Commands commandExecutor = new Commands(borderManager);
|
||||
getCommand("cibp").setExecutor(commandExecutor);
|
||||
|
||||
// register listeners
|
||||
// listeners
|
||||
PluginManager pm = this.getServer().getPluginManager();
|
||||
pm.registerEvents(playerMoveListener, this);
|
||||
pm.registerEvents(playerTeleportListener, this);
|
||||
pm.registerEvents(playerJoinListener, this);
|
||||
pm.registerEvents(playerQuitListener, this);
|
||||
}
|
||||
}
|
||||
|
97
src/main/java/de/craftinc/borderprotection/Serializer.java
Normal file
97
src/main/java/de/craftinc/borderprotection/Serializer.java
Normal file
@ -0,0 +1,97 @@
|
||||
package de.craftinc.borderprotection;
|
||||
|
||||
import org.bukkit.Location;
|
||||
import org.json.simple.JSONArray;
|
||||
import org.json.simple.parser.JSONParser;
|
||||
import org.json.simple.parser.ParseException;
|
||||
|
||||
import java.io.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
||||
public class Serializer
|
||||
{
|
||||
private File dataFile;
|
||||
|
||||
public Serializer( File dataFile )
|
||||
{
|
||||
this.dataFile = dataFile;
|
||||
}
|
||||
|
||||
public HashMap<String, ArrayList<Location>> loadDataFile()
|
||||
{
|
||||
try
|
||||
{
|
||||
FileReader fr = new FileReader(dataFile);
|
||||
BufferedReader br = new BufferedReader(fr);
|
||||
StringBuilder fileContents = new StringBuilder();
|
||||
|
||||
String line;
|
||||
while ( ( line = br.readLine() ) != null )
|
||||
{
|
||||
fileContents.append(line);
|
||||
}
|
||||
|
||||
JSONParser jsonParser = new JSONParser();
|
||||
JSONArray json = (JSONArray) jsonParser.parse(fileContents.toString());
|
||||
|
||||
return Util.decodeJSON(json);
|
||||
}
|
||||
catch ( IOException e )
|
||||
{
|
||||
if ( e instanceof FileNotFoundException )
|
||||
{
|
||||
Plugin.getPlugin().getLogger().info("Data file not found.");
|
||||
}
|
||||
else
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
catch ( ParseException e )
|
||||
{
|
||||
Plugin.getPlugin().getLogger()
|
||||
.severe("Could not parse json data file. When you set up a new border, the corrupt data file will be overwritten!");
|
||||
e.printStackTrace();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public void saveDataFile( HashMap<String, ArrayList<Location>> data )
|
||||
{
|
||||
// if there is not data, do nothing and log it to console
|
||||
if ( data == null )
|
||||
{
|
||||
Plugin.getPlugin().getLogger().severe("Could not save data, because it is null");
|
||||
return;
|
||||
}
|
||||
|
||||
// create plugin directory if it doesn't exists
|
||||
if ( !Plugin.getPlugin().getDataFolder().exists() )
|
||||
{
|
||||
Plugin.getPlugin().getLogger().info("Creating plugin directory...");
|
||||
if ( !Plugin.getPlugin().getDataFolder().mkdir() )
|
||||
{
|
||||
Plugin.getPlugin().getLogger().severe("Could not create plugin directory");
|
||||
}
|
||||
else
|
||||
{
|
||||
Plugin.getPlugin().getLogger().info("Plugin directory created successfully");
|
||||
}
|
||||
}
|
||||
|
||||
JSONArray json = Util.encodeJSON(data);
|
||||
|
||||
// Write to file
|
||||
try
|
||||
{
|
||||
FileWriter fw = new FileWriter(dataFile);
|
||||
fw.write(json.toJSONString());
|
||||
fw.close();
|
||||
}
|
||||
catch ( IOException e )
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
90
src/main/java/de/craftinc/borderprotection/Util.java
Normal file
90
src/main/java/de/craftinc/borderprotection/Util.java
Normal file
@ -0,0 +1,90 @@
|
||||
package de.craftinc.borderprotection;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.json.simple.JSONArray;
|
||||
import org.json.simple.JSONObject;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
||||
public class Util
|
||||
{
|
||||
public static HashMap<String, ArrayList<Location>> decodeJSON( JSONArray json )
|
||||
{
|
||||
HashMap<String, ArrayList<Location>> data = new HashMap<String, ArrayList<Location>>();
|
||||
|
||||
for ( Object jsonEntry : json.toArray() )
|
||||
{
|
||||
JSONObject j = (JSONObject) jsonEntry;
|
||||
// // check if border for this world is enabled. continue if not
|
||||
// String enabled = (String) j.get("enabled");
|
||||
// if (enabled != "1") {
|
||||
// continue;
|
||||
// }
|
||||
String worldname = (String) j.get("worldname");
|
||||
ArrayList<Location> locations = new ArrayList<Location>();
|
||||
JSONArray borderPoints = (JSONArray) j.get("borderPoints");
|
||||
|
||||
for ( Object pointObj : borderPoints )
|
||||
{
|
||||
JSONArray point = (JSONArray) pointObj;
|
||||
|
||||
locations
|
||||
.add(new Location(Bukkit.getWorld(worldname), (Double) point.get(0), 0, (Double) point.get(1)));
|
||||
}
|
||||
|
||||
data.put(worldname, locations);
|
||||
}
|
||||
|
||||
if ( data.size() > 0 )
|
||||
{
|
||||
return data;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public static JSONArray encodeJSON( HashMap<String, ArrayList<Location>> data )
|
||||
{
|
||||
JSONArray json = new JSONArray();
|
||||
int i = 0;
|
||||
for ( ArrayList<Location> border : data.values() )
|
||||
{
|
||||
|
||||
// add point 1 as json array
|
||||
JSONArray point1 = new JSONArray();
|
||||
point1.add(0, border.get(0).getX());
|
||||
point1.add(1, border.get(0).getZ());
|
||||
|
||||
// add point 2 as json array
|
||||
JSONArray point2 = new JSONArray();
|
||||
point2.add(0, border.get(1).getX());
|
||||
point2.add(1, border.get(1).getZ());
|
||||
|
||||
// add both points to points json array
|
||||
JSONArray points = new JSONArray();
|
||||
points.add(point1);
|
||||
points.add(point2);
|
||||
|
||||
// Add points and worldname to world json object
|
||||
JSONObject borderOfAWorld = new JSONObject();
|
||||
try
|
||||
{
|
||||
borderOfAWorld.put("worldname", border.get(0).getWorld().getName());
|
||||
borderOfAWorld.put("borderPoints", points);
|
||||
json.add(i, borderOfAWorld);
|
||||
i++;
|
||||
}
|
||||
catch ( NullPointerException e )
|
||||
{
|
||||
if ( border.get(0).getWorld() == null )
|
||||
{
|
||||
Plugin.getPlugin().getLogger()
|
||||
.warning("A world is null. Ignoring this border (not saving this border).");
|
||||
}
|
||||
}
|
||||
}
|
||||
return json;
|
||||
}
|
||||
}
|
@ -1,145 +0,0 @@
|
||||
/* Craft Inc. BorderProtection
|
||||
Copyright (C) 2016 Paul Schulze, Tobias Ottenweller
|
||||
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package de.craftinc.borderprotection.borders;
|
||||
|
||||
import de.craftinc.borderprotection.Plugin;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public abstract class Border
|
||||
{
|
||||
private static final String dataFileName = "borders.yml";
|
||||
|
||||
private Boolean isActive;
|
||||
|
||||
private static final String isActiveKey = "enabled";
|
||||
private static final String bordersKey = "borders";
|
||||
|
||||
static final HashMap<World, Border> borders = new HashMap<World, Border>();
|
||||
|
||||
private static final File bordersFile = new File(Plugin.instance.getDataFolder(), dataFileName);
|
||||
private static final FileConfiguration bordersFileConf = YamlConfiguration.loadConfiguration(bordersFile);
|
||||
|
||||
/**
|
||||
* The buffer in blocks which applies when a player is teleported inside the border. 0 means the player
|
||||
* will be teleported directly to the border.
|
||||
*/
|
||||
static final double buffer = 0.5;
|
||||
|
||||
public static HashMap<World, Border> getBorders()
|
||||
{
|
||||
return borders;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a String which identifies the type of the border. Example: Rectangle
|
||||
*/
|
||||
public abstract String getBorderTypeString();
|
||||
|
||||
/**
|
||||
* Returns a formatted String (colors and newlines) which fits into the borderInfo message and describes
|
||||
* the border properties properly.
|
||||
*/
|
||||
public abstract String getBorderInfoString();
|
||||
|
||||
/**
|
||||
* Checks if the given location is inside or outside the border. If it is outside a new location (inside the border)
|
||||
* is returned, otherwise null.
|
||||
*
|
||||
* @param l Location to check if inside the border
|
||||
* @return null if l is inside the border otherwise a new Location which is inside
|
||||
*/
|
||||
public Location checkBorder( Location l )
|
||||
{
|
||||
return checkBorder(l, 0.0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if the given location is inside or outside the border. If it is outside a new location (inside the border)
|
||||
* is returned, otherwise null. Applies padding to the border. (Simulates a larger border using padding.)
|
||||
*
|
||||
* @param l Location to check if inside the border
|
||||
* @param padding number of Blocks of padding applied to the border.
|
||||
* @return null if l is inside the border otherwise a new Location which is inside
|
||||
*/
|
||||
public abstract Location checkBorder( Location l, double padding );
|
||||
|
||||
/**
|
||||
* Returns an array of two Location objects defining a rectangle bigger or at size of the border. There are no
|
||||
* locations outside the rectangle which are inside the border.
|
||||
*/
|
||||
public abstract Location[] getSurroundingRect();
|
||||
|
||||
public Boolean isActive()
|
||||
{
|
||||
return isActive;
|
||||
}
|
||||
|
||||
Border( Map<String, Object> map )
|
||||
{
|
||||
try
|
||||
{
|
||||
isActive = (Boolean) map.get(isActiveKey);
|
||||
}
|
||||
catch ( Exception e )
|
||||
{
|
||||
// FIXME
|
||||
Plugin.instance.getLogger().severe(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
Border()
|
||||
{
|
||||
// new borders are enabled by default
|
||||
isActive = true;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unused")
|
||||
public static void loadBorders()
|
||||
{
|
||||
bordersFileConf.getList(bordersKey);
|
||||
}
|
||||
|
||||
public static void saveBorders() throws IOException
|
||||
{
|
||||
bordersFileConf.set(bordersKey, new ArrayList<Object>(borders.values()));
|
||||
bordersFileConf.save(bordersFile);
|
||||
}
|
||||
|
||||
public void enable()
|
||||
{
|
||||
isActive = true;
|
||||
}
|
||||
|
||||
public void disable()
|
||||
{
|
||||
isActive = false;
|
||||
}
|
||||
|
||||
void serialize( Map<String, Object> map )
|
||||
{
|
||||
map.put(isActiveKey, isActive);
|
||||
}
|
||||
}
|
@ -1,134 +0,0 @@
|
||||
/* Craft Inc. BorderProtection
|
||||
Copyright (C) 2016 Paul Schulze, Tobias Ottenweller
|
||||
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package de.craftinc.borderprotection.borders;
|
||||
|
||||
import de.craftinc.borderprotection.Plugin;
|
||||
import de.craftinc.borderprotection.util.LocationSerializer2D;
|
||||
import de.craftinc.borderprotection.util.PlayerMovementUtil;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.configuration.serialization.ConfigurationSerializable;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class CircBorder extends Border implements ConfigurationSerializable
|
||||
{
|
||||
private Double radius;
|
||||
private Location center;
|
||||
|
||||
private static final String centerKey = "center";
|
||||
private static final String radiusKey = "radius";
|
||||
|
||||
@SuppressWarnings("unchecked unused")
|
||||
public CircBorder( Map<String, Object> map )
|
||||
{
|
||||
super(map);
|
||||
try
|
||||
{
|
||||
center = LocationSerializer2D.deserializeLocation((Map<String, Object>) map.get(centerKey));
|
||||
radius = (Double) map.get(radiusKey);
|
||||
|
||||
borders.put(center.getWorld(), this);
|
||||
}
|
||||
catch ( Exception e )
|
||||
{
|
||||
// FIXME
|
||||
Plugin.instance.getLogger().severe(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public CircBorder( Location center, Double radius )
|
||||
{
|
||||
super();
|
||||
|
||||
this.center = center;
|
||||
this.radius = radius;
|
||||
|
||||
borders.put(center.getWorld(), this);
|
||||
}
|
||||
|
||||
|
||||
@SuppressWarnings("unused")
|
||||
public Map<String, Object> serialize()
|
||||
{
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
super.serialize(map);
|
||||
map.put(centerKey, LocationSerializer2D.serializeLocation(center));
|
||||
map.put(radiusKey, radius);
|
||||
|
||||
return map;
|
||||
}
|
||||
|
||||
public String toString()
|
||||
{
|
||||
return "CircBorder(" + "center: " + center.getX() + "," + center.getZ() + ", radius: " + radius + ")";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getBorderTypeString()
|
||||
{
|
||||
return "Circle";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getBorderInfoString()
|
||||
{
|
||||
return ChatColor.YELLOW + "Center: " + ChatColor.WHITE + center.getX() + "," + center.getZ() + "\n" +
|
||||
ChatColor.YELLOW + "Raduis: " + ChatColor.WHITE + radius;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Location checkBorder( Location l, double padding )
|
||||
{
|
||||
double paddedRadius = radius + padding;
|
||||
|
||||
double distX = l.getX() - center.getX();
|
||||
double distZ = l.getZ() - center.getZ();
|
||||
|
||||
double distanceFromCenterSquared = distX * distX + distZ * distZ;
|
||||
double radiusSquared = paddedRadius * paddedRadius;
|
||||
|
||||
// inside the border
|
||||
if ( distanceFromCenterSquared <= radiusSquared )
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
// outside the border: it's ok to use square-root function here, because this only happens very few times
|
||||
double ratio = paddedRadius / Math.sqrt(distanceFromCenterSquared);
|
||||
double newX = center.getX() + ( ratio * distX );
|
||||
double newZ = center.getZ() + ( ratio * distZ );
|
||||
|
||||
Location newLocation = new Location(l.getWorld(), newX, l.getY(), newZ, l.getYaw(), l.getPitch());
|
||||
|
||||
// ensure that the player will not appear in a block
|
||||
// TODO: Should hook into another Plugin maybe or implement something better
|
||||
newLocation.setY(PlayerMovementUtil.goUpUntilFreeSpot(newLocation));
|
||||
|
||||
return newLocation;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Location[] getSurroundingRect()
|
||||
{
|
||||
Location l1 = new Location(center.getWorld(), center.getX() + radius, center.getY(), center.getX() + radius);
|
||||
Location l2 = new Location(center.getWorld(), center.getX() - radius, center.getY(), center.getX() - radius);
|
||||
|
||||
return new Location[] { l1, l2 };
|
||||
}
|
||||
}
|
@ -1,184 +0,0 @@
|
||||
/* Craft Inc. BorderProtection
|
||||
Copyright (C) 2016 Paul Schulze, Tobias Ottenweller
|
||||
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package de.craftinc.borderprotection.borders;
|
||||
|
||||
import de.craftinc.borderprotection.Plugin;
|
||||
import de.craftinc.borderprotection.util.LocationSerializer2D;
|
||||
import de.craftinc.borderprotection.util.PlayerMovementUtil;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.configuration.serialization.ConfigurationSerializable;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class RectBorder extends Border implements ConfigurationSerializable
|
||||
{
|
||||
private Location rectPoint1;
|
||||
private Location rectPoint2;
|
||||
|
||||
private static final String rectPoint1Name = "p1";
|
||||
private static final String rectPoint2Name = "p2";
|
||||
|
||||
@SuppressWarnings("unchecked unused")
|
||||
public RectBorder( Map<String, Object> map )
|
||||
{
|
||||
super(map);
|
||||
|
||||
try
|
||||
{
|
||||
rectPoint1 = LocationSerializer2D.deserializeLocation((Map<String, Object>) map.get(rectPoint1Name));
|
||||
rectPoint2 = LocationSerializer2D.deserializeLocation((Map<String, Object>) map.get(rectPoint2Name));
|
||||
|
||||
if ( rectPoint1.getWorld().equals(rectPoint2.getWorld()) )
|
||||
{
|
||||
borders.put(rectPoint1.getWorld(), this);
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new Exception("RectBorder points are at different worlds.");
|
||||
}
|
||||
}
|
||||
catch ( Exception e )
|
||||
{
|
||||
Plugin.instance.getLogger().severe(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public RectBorder( Location p1, Location p2 ) throws Exception
|
||||
{
|
||||
super();
|
||||
|
||||
rectPoint1 = p1;
|
||||
rectPoint2 = p2;
|
||||
|
||||
if ( rectPoint1.getWorld().equals(rectPoint2.getWorld()) )
|
||||
{
|
||||
borders.put(rectPoint1.getWorld(), this);
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new Exception("RectBorder points are at different worlds.");
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("unused")
|
||||
public Map<String, Object> serialize()
|
||||
{
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
super.serialize(map);
|
||||
map.put(rectPoint1Name, LocationSerializer2D.serializeLocation(rectPoint1));
|
||||
map.put(rectPoint2Name, LocationSerializer2D.serializeLocation(rectPoint2));
|
||||
|
||||
return map;
|
||||
}
|
||||
|
||||
|
||||
public String toString()
|
||||
{
|
||||
return "RectBorder(" + rectPoint1.getX() + "," + rectPoint1.getZ() + ";" + rectPoint2.getX() + "," +
|
||||
rectPoint2.getZ() + ")";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getBorderTypeString()
|
||||
{
|
||||
return "Rectangle";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getBorderInfoString()
|
||||
{
|
||||
return ChatColor.YELLOW + "Point 1: " + ChatColor.WHITE + rectPoint1.getX() + "," + rectPoint1.getZ() + "\n" +
|
||||
ChatColor.YELLOW + "Point 2: " + ChatColor.WHITE + rectPoint2.getX() + "," + rectPoint2.getZ();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Location checkBorder( Location l, double padding )
|
||||
{
|
||||
// New x and z: null by default
|
||||
Double[] newXZ = { null, null };
|
||||
|
||||
// check if player is withing the X borders
|
||||
newXZ[0] = _checkBorder(l.getX(), this.rectPoint1.getX(), this.rectPoint2.getX(), padding);
|
||||
// check if player is withing the Z borders
|
||||
newXZ[1] = _checkBorder(l.getZ(), this.rectPoint1.getZ(), this.rectPoint2.getZ(), padding);
|
||||
|
||||
// Do nothing, if no new coordinates have been calculated.
|
||||
if ( newXZ[0] == null && newXZ[1] == null )
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
// if one of the coordinates is null, set it to the player's value
|
||||
newXZ[0] = newXZ[0] == null ? l.getX() : newXZ[0];
|
||||
newXZ[1] = newXZ[1] == null ? l.getZ() : newXZ[1];
|
||||
|
||||
// new location
|
||||
Location newLocation = new Location(l.getWorld(), newXZ[0], l.getY(), newXZ[1], l.getYaw(), l.getPitch());
|
||||
|
||||
// change Y if necessary (when there is no free spot)
|
||||
newLocation.setY(PlayerMovementUtil.goUpUntilFreeSpot(newLocation));
|
||||
|
||||
return newLocation;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Checks if the given location is between one specific border pair.
|
||||
*
|
||||
* @param location part of the location coordinates
|
||||
* @param border1 one side of the rectangle
|
||||
* @param border2 opposite side of the rectangle
|
||||
* @param padding a padding (number of block) used to enlarge the border
|
||||
* @return null if the location is inside, otherwise a new location
|
||||
*/
|
||||
private static Double _checkBorder( double location, double border1, double border2, double padding )
|
||||
{
|
||||
double bigBorder = Math.max(border1, border2) + padding;
|
||||
double smallBorder = Math.min(border1, border2) - padding;
|
||||
|
||||
// if location is between borders do nothing
|
||||
if ( location >= smallBorder && location <= bigBorder )
|
||||
{
|
||||
return null;
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( location > bigBorder )
|
||||
{
|
||||
// if location is outside of the bigBorder, teleport to the bigBorder
|
||||
if ( buffer > bigBorder )
|
||||
return bigBorder;
|
||||
return bigBorder - buffer;
|
||||
}
|
||||
else
|
||||
{
|
||||
// if location is outside of the smallBorder, teleport to the smallBorder
|
||||
if ( buffer > Math.abs(smallBorder) )
|
||||
return smallBorder;
|
||||
return smallBorder + buffer;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Location[] getSurroundingRect()
|
||||
{
|
||||
return new Location[] { rectPoint1, rectPoint2 };
|
||||
}
|
||||
}
|
@ -1,61 +0,0 @@
|
||||
/* Craft Inc. BorderProtection
|
||||
Copyright (C) 2016 Paul Schulze
|
||||
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package de.craftinc.borderprotection.commands;
|
||||
|
||||
|
||||
import de.craftinc.borderprotection.Messages;
|
||||
import de.craftinc.borderprotection.util.ChunkGenerator;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
class CancelGenerateCommand implements SubCommand
|
||||
{
|
||||
public boolean execute( CommandSender sender, String[] parameters )
|
||||
{
|
||||
if ( !sender.hasPermission("craftinc.borderprotection.generate") )
|
||||
{
|
||||
sender.sendMessage(Messages.noPermissionSet);
|
||||
return false;
|
||||
}
|
||||
|
||||
World world = ( (Player) sender ).getWorld();
|
||||
|
||||
if ( !ChunkGenerator.isGenerating(world) )
|
||||
{
|
||||
sender.sendMessage(Messages.generationNotCanceled);
|
||||
}
|
||||
else
|
||||
{
|
||||
ChunkGenerator.cancelRender(world);
|
||||
sender.sendMessage(Messages.generationCanceled);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public List<String> commandNames()
|
||||
{
|
||||
ArrayList<String> names = new ArrayList<String>();
|
||||
names.add("cancelgenerate");
|
||||
|
||||
return names;
|
||||
}
|
||||
}
|
@ -1,85 +0,0 @@
|
||||
/* Craft Inc. BorderProtection
|
||||
Copyright (C) 2016 Paul Schulze, Tobias Ottenweller
|
||||
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package de.craftinc.borderprotection.commands;
|
||||
|
||||
import de.craftinc.borderprotection.Messages;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class CommandSwitch implements CommandExecutor
|
||||
{
|
||||
private final Map<String, SubCommand> subCommandsMap = new HashMap<String, SubCommand>();
|
||||
|
||||
public CommandSwitch()
|
||||
{
|
||||
registerCommand(new CancelGenerateCommand());
|
||||
registerCommand(new GenerateCommand());
|
||||
registerCommand(new GetCommand());
|
||||
registerCommand(new HelpCommand());
|
||||
registerCommand(new OnOffCommand());
|
||||
registerCommand(new SetCommand());
|
||||
}
|
||||
|
||||
private void registerCommand( SubCommand command )
|
||||
{
|
||||
for ( String commandName : command.commandNames() )
|
||||
{
|
||||
subCommandsMap.put(commandName, command);
|
||||
}
|
||||
}
|
||||
|
||||
public boolean onCommand( CommandSender sender, Command command, String label, String[] args )
|
||||
{
|
||||
// Check if command comes from a player.
|
||||
if ( !( sender instanceof Player ) )
|
||||
{
|
||||
sender.sendMessage(Messages.commandIssuedByNonPlayer);
|
||||
return true;
|
||||
}
|
||||
|
||||
boolean success = false;
|
||||
|
||||
// command for all actions
|
||||
if ( command.getName().equalsIgnoreCase("cibp") )
|
||||
{
|
||||
if ( args.length > 0 )
|
||||
{
|
||||
String lowerCaseSubCommandName = args[0].toLowerCase();
|
||||
SubCommand subCommand = subCommandsMap.get(lowerCaseSubCommandName);
|
||||
|
||||
if ( subCommand != null )
|
||||
{
|
||||
success = subCommand.execute(sender, args);
|
||||
}
|
||||
}
|
||||
|
||||
if ( !success )
|
||||
{
|
||||
subCommandsMap.get("help").execute(sender, args);
|
||||
}
|
||||
|
||||
return success;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
@ -1,66 +0,0 @@
|
||||
/* Craft Inc. BorderProtection
|
||||
Copyright (C) 2016 Paul Schulze
|
||||
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package de.craftinc.borderprotection.commands;
|
||||
|
||||
import de.craftinc.borderprotection.Messages;
|
||||
import de.craftinc.borderprotection.util.ChunkGenerator;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
class GenerateCommand implements SubCommand
|
||||
{
|
||||
public boolean execute( CommandSender sender, String[] parameters )
|
||||
{
|
||||
if ( !sender.hasPermission("craftinc.borderprotection.generate") )
|
||||
{
|
||||
sender.sendMessage(Messages.noPermissionSet);
|
||||
return false;
|
||||
}
|
||||
|
||||
World world = ( (Player) sender ).getWorld();
|
||||
|
||||
if ( ChunkGenerator.isGenerating(world) )
|
||||
{
|
||||
sender.sendMessage(Messages.generationAlreadyInProgress);
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( ChunkGenerator.generate(world) )
|
||||
{
|
||||
sender.sendMessage(Messages.generationStarted);
|
||||
}
|
||||
else
|
||||
{
|
||||
sender.sendMessage(Messages.generationCouldNotBeStarted);
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public List<String> commandNames()
|
||||
{
|
||||
ArrayList<String> names = new ArrayList<String>();
|
||||
names.add("generate");
|
||||
|
||||
return names;
|
||||
}
|
||||
}
|
@ -1,55 +0,0 @@
|
||||
/* Craft Inc. BorderProtection
|
||||
Copyright (C) 2016 Paul Schulze
|
||||
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package de.craftinc.borderprotection.commands;
|
||||
|
||||
import de.craftinc.borderprotection.Messages;
|
||||
import de.craftinc.borderprotection.borders.Border;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
class GetCommand implements SubCommand
|
||||
{
|
||||
public boolean execute( CommandSender sender, String[] parameters )
|
||||
{
|
||||
World world = ( (Player) sender ).getWorld();
|
||||
|
||||
// exit and send the player a message if no border is set
|
||||
if ( !Border.getBorders().containsKey(world) )
|
||||
{
|
||||
sender.sendMessage(Messages.borderInfoNoBorderSet);
|
||||
return true;
|
||||
}
|
||||
|
||||
Border border = Border.getBorders().get(world);
|
||||
|
||||
sender.sendMessage(Messages.borderInfo(world.getName(), border));
|
||||
return true;
|
||||
}
|
||||
|
||||
public List<String> commandNames()
|
||||
{
|
||||
ArrayList<String> names = new ArrayList<String>();
|
||||
names.add("get");
|
||||
names.add("info");
|
||||
|
||||
return names;
|
||||
}
|
||||
}
|
@ -1,40 +0,0 @@
|
||||
/* Craft Inc. BorderProtection
|
||||
Copyright (C) 2016 Paul Schulze
|
||||
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package de.craftinc.borderprotection.commands;
|
||||
|
||||
import de.craftinc.borderprotection.Messages;
|
||||
import org.bukkit.command.CommandSender;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class HelpCommand implements SubCommand
|
||||
{
|
||||
public boolean execute( CommandSender sender, String[] parameters )
|
||||
{
|
||||
sender.sendMessage(Messages.helpGeneral);
|
||||
return true;
|
||||
}
|
||||
|
||||
public List<String> commandNames()
|
||||
{
|
||||
ArrayList<String> names = new ArrayList<String>();
|
||||
names.add("help");
|
||||
|
||||
return names;
|
||||
}
|
||||
}
|
@ -1,82 +0,0 @@
|
||||
/* Craft Inc. BorderProtection
|
||||
Copyright (C) 2016 Paul Schulze
|
||||
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package de.craftinc.borderprotection.commands;
|
||||
|
||||
|
||||
import de.craftinc.borderprotection.Messages;
|
||||
import de.craftinc.borderprotection.borders.Border;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
class OnOffCommand implements SubCommand
|
||||
{
|
||||
public boolean execute( CommandSender sender, String[] parameters )
|
||||
{
|
||||
if ( !sender.hasPermission("craftinc.borderprotection.set") )
|
||||
{
|
||||
sender.sendMessage(Messages.noPermissionSet);
|
||||
return false;
|
||||
}
|
||||
|
||||
World world = ( (Player) sender ).getWorld();
|
||||
Border border = Border.getBorders().get(world);
|
||||
|
||||
if ( border != null )
|
||||
{
|
||||
if ( parameters[0].equalsIgnoreCase("on") )
|
||||
{
|
||||
border.enable();
|
||||
sender.sendMessage(Messages.borderEnabled);
|
||||
}
|
||||
else
|
||||
{
|
||||
border.disable();
|
||||
sender.sendMessage(Messages.borderDisabled);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
sender.sendMessage(Messages.borderInfoNoBorderSet);
|
||||
}
|
||||
|
||||
// save the changed border
|
||||
try
|
||||
{
|
||||
Border.saveBorders();
|
||||
}
|
||||
catch ( IOException e )
|
||||
{
|
||||
sender.sendMessage(Messages.borderEnableDisableException);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public List<String> commandNames()
|
||||
{
|
||||
ArrayList<String> names = new ArrayList<String>();
|
||||
names.add("on");
|
||||
names.add("off");
|
||||
|
||||
return names;
|
||||
}
|
||||
}
|
@ -1,142 +0,0 @@
|
||||
/* Craft Inc. BorderProtection
|
||||
Copyright (C) 2016 Paul Schulze
|
||||
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package de.craftinc.borderprotection.commands;
|
||||
|
||||
|
||||
import de.craftinc.borderprotection.Messages;
|
||||
import de.craftinc.borderprotection.borders.Border;
|
||||
import de.craftinc.borderprotection.borders.CircBorder;
|
||||
import de.craftinc.borderprotection.borders.RectBorder;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
class SetCommand implements SubCommand
|
||||
{
|
||||
public boolean execute( CommandSender sender, String[] parameters )
|
||||
{
|
||||
if ( !( parameters.length == 3 || parameters.length == 4 ) )
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if ( !sender.hasPermission("craftinc.borderprotection.set") )
|
||||
{
|
||||
sender.sendMessage(Messages.noPermissionSet);
|
||||
return false;
|
||||
}
|
||||
|
||||
World world = ( (Player) sender ).getWorld();
|
||||
|
||||
// set [r|c] <distance>
|
||||
if ( parameters.length == 3 )
|
||||
{
|
||||
try
|
||||
{
|
||||
Double distance = Double.parseDouble(parameters[2]);
|
||||
Border newBorder = null;
|
||||
|
||||
// rect border
|
||||
if ( parameters[1].equalsIgnoreCase("r") )
|
||||
{
|
||||
newBorder = new RectBorder(new Location(world, distance, 0, distance),
|
||||
new Location(world, -distance, 0, -distance));
|
||||
}
|
||||
// circ border
|
||||
else if ( parameters[1].equalsIgnoreCase("c") )
|
||||
{
|
||||
newBorder = new CircBorder(new Location(world, 0, 0, 0), distance);
|
||||
}
|
||||
|
||||
if ( newBorder != null )
|
||||
{
|
||||
sender.sendMessage(Messages.borderCreationSuccessful);
|
||||
sender.sendMessage(
|
||||
Messages.borderInfo(world.getName(), newBorder));
|
||||
}
|
||||
}
|
||||
catch ( Exception e )
|
||||
{
|
||||
sender.sendMessage(e.getMessage());
|
||||
}
|
||||
}
|
||||
// set r <point1> <point2> | set c <center> <radius>
|
||||
else
|
||||
{
|
||||
try
|
||||
{
|
||||
Border newBorder = null;
|
||||
|
||||
// rect border
|
||||
if ( parameters[1].equalsIgnoreCase("r") )
|
||||
{
|
||||
Double p1X = Double.parseDouble(parameters[2].split(",")[0]);
|
||||
Double p1Z = Double.parseDouble(parameters[2].split(",")[1]);
|
||||
Double p2X = Double.parseDouble(parameters[3].split(",")[0]);
|
||||
Double p2Z = Double.parseDouble(parameters[3].split(",")[1]);
|
||||
|
||||
newBorder = new RectBorder(new Location(world, p1X, 0, p1Z),
|
||||
new Location(world, p2X, 0, p2Z));
|
||||
}
|
||||
// circ border
|
||||
else if ( parameters[1].equalsIgnoreCase("c") )
|
||||
{
|
||||
Double centerX = Double.parseDouble(parameters[2].split(",")[0]);
|
||||
Double centerZ = Double.parseDouble(parameters[2].split(",")[1]);
|
||||
Double radius = Double.parseDouble(parameters[3]);
|
||||
|
||||
newBorder = new CircBorder(new Location(world, centerX, 0, centerZ), radius);
|
||||
}
|
||||
|
||||
if ( newBorder != null )
|
||||
{
|
||||
sender.sendMessage(Messages.borderCreationSuccessful);
|
||||
sender.sendMessage(
|
||||
Messages.borderInfo(world.getName(), newBorder));
|
||||
}
|
||||
}
|
||||
catch ( Exception e )
|
||||
{
|
||||
sender.sendMessage(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
// save the new border
|
||||
try
|
||||
{
|
||||
Border.saveBorders();
|
||||
}
|
||||
catch ( IOException e )
|
||||
{
|
||||
sender.sendMessage(Messages.borderSaveException);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public List<String> commandNames()
|
||||
{
|
||||
ArrayList<String> names = new ArrayList<String>();
|
||||
names.add("set");
|
||||
|
||||
return names;
|
||||
}
|
||||
}
|
@ -1,38 +0,0 @@
|
||||
/* Craft Inc. BorderProtection
|
||||
Copyright (C) 2016 Paul Schulze
|
||||
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package de.craftinc.borderprotection.commands;
|
||||
|
||||
|
||||
import org.bukkit.command.CommandSender;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
interface SubCommand
|
||||
{
|
||||
/**
|
||||
* @param sender The sender (player) who executed the command.
|
||||
* @param parameters All parameters for executing this subcommand. Includes the subcommand name at index 0.
|
||||
* @return Returns an boolean indicating if the subcommand got could be executed.
|
||||
*/
|
||||
boolean execute( CommandSender sender, String[] parameters );
|
||||
|
||||
/**
|
||||
* Returns a list of names of the command. All strings should be lowercase!
|
||||
*/
|
||||
List<String> commandNames();
|
||||
}
|
@ -1,33 +0,0 @@
|
||||
/* Craft Inc. BorderProtection
|
||||
Copyright (C) 2016 Paul Schulze
|
||||
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package de.craftinc.borderprotection.events;
|
||||
|
||||
import de.craftinc.borderprotection.util.ChunkGenerator;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.PlayerJoinEvent;
|
||||
|
||||
public class PlayerJoinListener implements Listener
|
||||
{
|
||||
@SuppressWarnings("unused")
|
||||
@EventHandler(priority = EventPriority.LOWEST)
|
||||
public void onPlayerLogin( PlayerJoinEvent e )
|
||||
{
|
||||
ChunkGenerator.pause();
|
||||
}
|
||||
}
|
@ -1,90 +0,0 @@
|
||||
/* Craft Inc. BorderProtection
|
||||
Copyright (C) 2016 Paul Schulze, Tobias Ottenweller
|
||||
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package de.craftinc.borderprotection.events;
|
||||
|
||||
import de.craftinc.borderprotection.Messages;
|
||||
import de.craftinc.borderprotection.borders.Border;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.PlayerMoveEvent;
|
||||
|
||||
public class PlayerMoveListener implements Listener
|
||||
{
|
||||
|
||||
|
||||
@SuppressWarnings("unused")
|
||||
@EventHandler(priority = EventPriority.LOWEST)
|
||||
public void onPlayerMove( PlayerMoveEvent e )
|
||||
{
|
||||
// do nothing if the event is already cancelled
|
||||
if ( e.isCancelled() )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// do nothing if player has the ignoreborders permission
|
||||
if ( e.getPlayer().hasPermission("craftinc.borderprotection.ignoreborders") )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// do nothing if there are no border definitions at all
|
||||
if ( Border.getBorders().isEmpty() )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// player location
|
||||
Location playerLocation = e.getPlayer().getLocation();
|
||||
|
||||
// world where the player is in
|
||||
World world = e.getPlayer().getWorld();
|
||||
|
||||
// Border of this world
|
||||
Border border = Border.getBorders().get(world);
|
||||
|
||||
// do nothing if there are no borders for this specific world
|
||||
if ( border == null )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// do nothing if border is disabled
|
||||
if ( !border.isActive() )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// check if player is inside the borders and get a new location if not
|
||||
Location destination = border.checkBorder(playerLocation);
|
||||
|
||||
// Do nothing, if no new location has been calculated.
|
||||
if ( destination == null )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// teleport the player to the new location within the borders
|
||||
e.getPlayer().teleport(destination);
|
||||
|
||||
// send a message to the player
|
||||
Messages.showMessageWithTimeout(e.getPlayer(), Messages.borderMessage, 10);
|
||||
}
|
||||
}
|
@ -1,37 +0,0 @@
|
||||
/* Craft Inc. BorderProtection
|
||||
Copyright (C) 2016 Paul Schulze, Tobias Ottenweller
|
||||
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package de.craftinc.borderprotection.events;
|
||||
|
||||
import de.craftinc.borderprotection.Plugin;
|
||||
import de.craftinc.borderprotection.util.ChunkGenerator;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.PlayerQuitEvent;
|
||||
|
||||
public class PlayerQuitListener implements Listener
|
||||
{
|
||||
@SuppressWarnings("unused")
|
||||
@EventHandler(priority = EventPriority.NORMAL)
|
||||
public void onPlayerQuit( PlayerQuitEvent e )
|
||||
{
|
||||
if ( Plugin.instance.getServer().getOnlinePlayers().size() == 1 )
|
||||
{
|
||||
ChunkGenerator.resume();
|
||||
}
|
||||
}
|
||||
}
|
@ -1,85 +0,0 @@
|
||||
/* Craft Inc. BorderProtection
|
||||
Copyright (C) 2016 Paul Schulze, Tobias Ottenweller
|
||||
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package de.craftinc.borderprotection.events;
|
||||
|
||||
import de.craftinc.borderprotection.Messages;
|
||||
import de.craftinc.borderprotection.borders.Border;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.player.PlayerTeleportEvent;
|
||||
|
||||
public class PlayerTeleportListener implements Listener
|
||||
{
|
||||
@SuppressWarnings("unused")
|
||||
@EventHandler(priority = EventPriority.LOWEST)
|
||||
public void onPlayerTeleport( PlayerTeleportEvent e )
|
||||
{
|
||||
// do nothing if the event is already cancelled
|
||||
if ( e.isCancelled() )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// do nothing if player has the ignoreborders permission
|
||||
if ( e.getPlayer().hasPermission("craftinc.borderprotection.ignoreborders") )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// do nothing if there are no border definitions at all
|
||||
if ( Border.getBorders().isEmpty() )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// target location
|
||||
Location targetLocation = e.getTo();
|
||||
|
||||
// world where the player is in
|
||||
World world = targetLocation.getWorld();
|
||||
|
||||
// borders of this world
|
||||
Border border = Border.getBorders().get(world);
|
||||
|
||||
// do nothing if there are no borders for this specific world
|
||||
if ( border == null )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// do nothing if rectBorder is disabled
|
||||
if ( !border.isActive() )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// check if player is inside the borders and get a new location if not
|
||||
Location destination = border.checkBorder(targetLocation);
|
||||
|
||||
// Do nothing, if no new location has been calculated.
|
||||
if ( destination == null )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
e.setCancelled(true);
|
||||
Messages.showMessageWithTimeout(e.getPlayer(), Messages.borderTeleportMessage, 10);
|
||||
}
|
||||
}
|
@ -1,289 +0,0 @@
|
||||
/* Craft Inc. BorderProtection
|
||||
Copyright (C) 2016 Paul Schulze, Tobias Ottenweller
|
||||
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package de.craftinc.borderprotection.util;
|
||||
|
||||
import de.craftinc.borderprotection.Plugin;
|
||||
import de.craftinc.borderprotection.borders.Border;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Chunk;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
||||
|
||||
import java.util.Calendar;
|
||||
import java.util.HashMap;
|
||||
|
||||
public class ChunkGenerator
|
||||
{
|
||||
private static final HashMap<World, Integer[]> chunkGenerationStatus = new HashMap<World, Integer[]>();
|
||||
private static boolean isPaused = true;
|
||||
private static final HashMap<World, Long> lastGenerationLogTime = new HashMap<World, Long>();
|
||||
|
||||
private static final long waitTicks = 5; // TODO: make adjustable via config file
|
||||
private static final int batchGenerationSize = 5; //TODO: make adjustable via config file
|
||||
private static final int paddingChunksAroundBorder = 15; // TODO: make adjustable via config file
|
||||
|
||||
public static void pause()
|
||||
{
|
||||
isPaused = true;
|
||||
}
|
||||
|
||||
public static void resume()
|
||||
{
|
||||
if ( isPaused )
|
||||
{
|
||||
isPaused = false;
|
||||
|
||||
for ( World w : chunkGenerationStatus.keySet() )
|
||||
{
|
||||
slowLoadNextChunk(w);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void cancelRender( World w )
|
||||
{
|
||||
if ( w == null )
|
||||
{
|
||||
throw new IllegalArgumentException("World 'w' must not be null!");
|
||||
}
|
||||
|
||||
chunkGenerationStatus.remove(w);
|
||||
}
|
||||
|
||||
public static boolean isGenerating( World w )
|
||||
{
|
||||
if ( w == null )
|
||||
{
|
||||
throw new IllegalArgumentException("World 'w' must not be null!");
|
||||
}
|
||||
|
||||
return chunkGenerationStatus.containsKey(w);
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts the generation of all chunks inside a border.
|
||||
*
|
||||
* @param w The world in which chunks will be generated. Must not be 'null'. An exception will be thrown otherwise!
|
||||
* @return A boolean indicating if the generation was successfully started. Will return false if no border exists
|
||||
* for a given world. Will return true if the generation was already running but will not restart the generation.
|
||||
*/
|
||||
public static boolean generate( World w )
|
||||
{
|
||||
if ( w == null )
|
||||
{
|
||||
throw new IllegalArgumentException("World 'w' must not be null!");
|
||||
}
|
||||
|
||||
Border border = Border.getBorders().get(w);
|
||||
|
||||
if ( border == null )
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
Location[] borderRect = border.getSurroundingRect();
|
||||
|
||||
int firstChunkX =
|
||||
( Math.min(borderRect[0].getBlockX(), borderRect[1].getBlockX()) >> 4 ) - paddingChunksAroundBorder;
|
||||
int firstChunkZ =
|
||||
( Math.min(borderRect[0].getBlockZ(), borderRect[1].getBlockZ()) >> 4 ) - paddingChunksAroundBorder;
|
||||
|
||||
firstChunkX--;
|
||||
|
||||
chunkGenerationStatus.put(w, new Integer[] { firstChunkX, firstChunkZ });
|
||||
// the actual generation will start when resume is called!
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static void slowLoadNextChunk( World w )
|
||||
{
|
||||
if ( w == null )
|
||||
{
|
||||
throw new IllegalArgumentException("World 'w' must not be null!");
|
||||
}
|
||||
|
||||
if ( isPaused )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
DelayedCall delayedCall = new DelayedCall();
|
||||
delayedCall.w = w;
|
||||
delayedCall.batchGenerationSize = batchGenerationSize;
|
||||
|
||||
Bukkit.getScheduler().scheduleSyncDelayedTask(Plugin.instance, delayedCall, waitTicks);
|
||||
}
|
||||
|
||||
/**
|
||||
* Will only load/generate the next chunks inside the border of the given world. Will stop if no border exists.
|
||||
*/
|
||||
static void loadNextChunk( World w )
|
||||
{
|
||||
if ( w == null )
|
||||
{
|
||||
throw new IllegalArgumentException("World 'w' must not be null!");
|
||||
}
|
||||
|
||||
Border border = Border.getBorders().get(w);
|
||||
|
||||
if ( border == null )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Integer[] lastGeneratedChunk = chunkGenerationStatus.get(w);
|
||||
|
||||
if ( lastGeneratedChunk == null )
|
||||
{
|
||||
return; // the generation got most likely canceled
|
||||
}
|
||||
|
||||
int chunkX = lastGeneratedChunk[0];
|
||||
int chunkZ = lastGeneratedChunk[1];
|
||||
|
||||
final Location[] borderRect = border.getSurroundingRect();
|
||||
final int minChunkX =
|
||||
( Math.min(borderRect[0].getBlockX(), borderRect[1].getBlockX()) >> 4 ) - paddingChunksAroundBorder;
|
||||
final int minChunkZ =
|
||||
( Math.min(borderRect[0].getBlockZ(), borderRect[1].getBlockZ()) >> 4 ) - paddingChunksAroundBorder;
|
||||
final int maxChunkX =
|
||||
( Math.max(borderRect[0].getBlockX(), borderRect[1].getBlockX()) >> 4 ) + paddingChunksAroundBorder;
|
||||
final int maxChunkZ =
|
||||
( Math.max(borderRect[0].getBlockZ(), borderRect[1].getBlockZ()) >> 4 ) + paddingChunksAroundBorder;
|
||||
|
||||
chunkX++;
|
||||
|
||||
while ( !chunkIsInsideBorder(chunkX, chunkZ, w, border)
|
||||
&& chunkZ <= maxChunkZ )
|
||||
{
|
||||
chunkX++;
|
||||
|
||||
if ( chunkX > maxChunkX )
|
||||
{
|
||||
chunkZ++;
|
||||
chunkX = minChunkX;
|
||||
}
|
||||
}
|
||||
|
||||
if ( chunkZ <= maxChunkZ )
|
||||
{
|
||||
chunkGenerationStatus.put(w, new Integer[] { chunkX, chunkZ });
|
||||
|
||||
Chunk chunk = w.getChunkAt(chunkX, chunkZ);
|
||||
chunk.load(true);
|
||||
loadSurroundingChunks(chunkX, chunkZ,
|
||||
w); // this will get the server to generate trees, … inside the new chunk
|
||||
|
||||
logProgress(minChunkX, maxChunkX, minChunkZ, maxChunkZ, chunkX, chunkZ, w);
|
||||
}
|
||||
else
|
||||
{
|
||||
Plugin.instance.getLogger().info("Finished generating Chunks for world " + w.getName());
|
||||
chunkGenerationStatus.remove(w);
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean chunkIsInsideBorder( int x, int z, World w, Border b )
|
||||
{
|
||||
double xLoc = (double) ( x << 4 ) + 8.0;
|
||||
double yLoc = 0.0;
|
||||
double zLoc = (double) ( z << 4 ) + 8.0;
|
||||
|
||||
double padding = (double) ( paddingChunksAroundBorder << 4 );
|
||||
Location l = new Location(w, xLoc, yLoc, zLoc);
|
||||
|
||||
return b.checkBorder(l, padding) == null;
|
||||
}
|
||||
|
||||
private static void loadSurroundingChunks( int x, int z, World w )
|
||||
{
|
||||
int radius = 1;
|
||||
|
||||
for ( int i = -radius; i < radius; i++ )
|
||||
{
|
||||
for ( int j = -radius; j < radius; j++ )
|
||||
{
|
||||
if ( j == 0 && i == 0 )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
w.loadChunk(i + x, j + z, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static void logProgress( int minChunkX, int maxChunkX, int minChunkZ, int maxChunkZ, int chunkX,
|
||||
int chunkZ, World world )
|
||||
{
|
||||
final Long now = Calendar.getInstance().getTimeInMillis();
|
||||
final Long lastLogTime = lastGenerationLogTime.get(world);
|
||||
|
||||
if ( lastLogTime == null || ( now - lastLogTime ) > 30000 )
|
||||
{
|
||||
lastGenerationLogTime.put(world, now);
|
||||
|
||||
final int numXChunks, offsetX;
|
||||
if ( ( ( maxChunkX > 0 ) && ( minChunkX > 0 ) ) || ( ( maxChunkX < 0 ) && ( minChunkX < 0 ) ) )
|
||||
{
|
||||
numXChunks = minChunkX * maxChunkX;
|
||||
offsetX = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
numXChunks = Math.abs(minChunkX) + maxChunkX;
|
||||
offsetX = Math.abs(minChunkX);
|
||||
}
|
||||
|
||||
final int numZChunks, offsetZ;
|
||||
if ( ( ( maxChunkZ > 0 ) && ( minChunkZ > 0 ) ) || ( ( maxChunkZ < 0 ) && ( minChunkZ < 0 ) ) )
|
||||
{
|
||||
numZChunks = minChunkZ * maxChunkZ;
|
||||
offsetZ = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
numZChunks = Math.abs(minChunkZ) + maxChunkZ;
|
||||
offsetZ = Math.abs(minChunkZ);
|
||||
}
|
||||
|
||||
final int totalNumChunks = numXChunks * numZChunks;
|
||||
final int currentChunk = ( ( offsetZ + chunkZ ) * numXChunks ) + offsetX + chunkX;
|
||||
Plugin.instance.getLogger()
|
||||
.info("Generation progress: " + currentChunk + "/" + totalNumChunks + " Chunks in World " +
|
||||
world.getName());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
class DelayedCall implements Runnable
|
||||
{
|
||||
public World w;
|
||||
int batchGenerationSize;
|
||||
|
||||
public void run()
|
||||
{
|
||||
for ( int i = 0; i < batchGenerationSize; i++ )
|
||||
{
|
||||
ChunkGenerator.loadNextChunk(w);
|
||||
}
|
||||
|
||||
ChunkGenerator.slowLoadNextChunk(w);
|
||||
}
|
||||
}
|
@ -1,93 +0,0 @@
|
||||
/* Craft Inc. BorderProtection
|
||||
Copyright (C) 2016 Tobias Ottenweller, Paul Schulze
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with this program (LGPLv3). If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package de.craftinc.borderprotection.util;
|
||||
|
||||
import de.craftinc.borderprotection.Plugin;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.World;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
public class LocationSerializer2D
|
||||
{
|
||||
private static final String worldKey = "world";
|
||||
private static final String xKey = "x";
|
||||
private static final String zKey = "z";
|
||||
|
||||
|
||||
private static World getWorld( String name ) throws Exception
|
||||
{
|
||||
World world = Plugin.instance.getServer().getWorld(name);
|
||||
|
||||
if ( world == null )
|
||||
{
|
||||
throw new Exception("World '" + name + "' does not exists anymore! Cannot get instance!");
|
||||
}
|
||||
|
||||
return world;
|
||||
}
|
||||
|
||||
|
||||
public static Map<String, Object> serializeLocation( Location l )
|
||||
{
|
||||
if ( l == null )
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
Map<String, Object> serializedLocation = new HashMap<String, Object>();
|
||||
|
||||
serializedLocation.put(worldKey, l.getWorld().getName());
|
||||
serializedLocation.put(xKey, l.getX());
|
||||
serializedLocation.put(zKey, l.getZ());
|
||||
|
||||
return serializedLocation;
|
||||
}
|
||||
|
||||
|
||||
public static Location deserializeLocation( Map<String, Object> map ) throws Exception
|
||||
{
|
||||
if ( map == null )
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
World w = getWorld((String) map.get(worldKey));
|
||||
|
||||
|
||||
// verbose loading of coordinates (they might be Double or Integer)
|
||||
Object objX = map.get(xKey);
|
||||
Object objZ = map.get(zKey);
|
||||
|
||||
double x, z;
|
||||
|
||||
if ( objX instanceof Integer )
|
||||
x = (double) (Integer) objX;
|
||||
else
|
||||
x = (Double) objX;
|
||||
|
||||
if ( objZ instanceof Integer )
|
||||
z = (double) (Integer) objZ;
|
||||
else
|
||||
z = (Double) objZ;
|
||||
|
||||
|
||||
return new Location(w, x, 0d, z);
|
||||
}
|
||||
}
|
@ -1,45 +0,0 @@
|
||||
/* Craft Inc. BorderProtection
|
||||
Copyright (C) 2016 Paul Schulze, Tobias Ottenweller
|
||||
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package de.craftinc.borderprotection.util;
|
||||
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.block.BlockFace;
|
||||
|
||||
public class PlayerMovementUtil
|
||||
{
|
||||
public static Double goUpUntilFreeSpot( Location l )
|
||||
{
|
||||
// FIXME: Player should not be placed above lava or other harmful Materials
|
||||
// go up in height until the player can stand in AIR
|
||||
Block footBlock = l.getBlock();
|
||||
Block headBlock = l.getBlock().getRelative(BlockFace.UP);
|
||||
while ( footBlock.getType() != Material.AIR || headBlock.getType() != Material.AIR )
|
||||
{
|
||||
byte offset = 1;
|
||||
if ( headBlock.getType() != Material.AIR )
|
||||
{
|
||||
offset = 2;
|
||||
}
|
||||
footBlock = footBlock.getRelative(0, offset, 0);
|
||||
headBlock = headBlock.getRelative(0, offset, 0);
|
||||
}
|
||||
// return the y value to a spot where the player can stand free
|
||||
return (double) footBlock.getY();
|
||||
}
|
||||
}
|
@ -1,38 +1,18 @@
|
||||
# Craft Inc. BorderProtection
|
||||
# Copyright (C) 2016 Paul Schulze, Tobias Ottenweller
|
||||
#
|
||||
# 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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
name: ${project.name}
|
||||
name: CraftincBorderProtection
|
||||
main: de.craftinc.borderprotection.Plugin
|
||||
version: ${project.version}
|
||||
softdepend: []
|
||||
authors: [ddidderr, mice_on_drugs]
|
||||
website: https://www.craftinc.de/plugins/borderprotection
|
||||
version: 0.9.9
|
||||
author: ddidderr
|
||||
website: http://www.craftinc.de/plugins/borderprotection
|
||||
|
||||
|
||||
commands:
|
||||
cibp:
|
||||
description: Shows help for Craft Inc. BorderProtection
|
||||
description: Shows help for CraftInc BorderProtection
|
||||
|
||||
permissions:
|
||||
craftinc.borderprotection.set:
|
||||
default: op
|
||||
default: false
|
||||
description: Allows to set the border for a world.
|
||||
craftinc.borderprotection.ignoreborders:
|
||||
default: false
|
||||
description: Allows to be everywhere on the map (ignoring the borders).
|
||||
craftinc.borderprotection.generate:
|
||||
default: op
|
||||
description: Allows to generate the complete world inside the border.
|
Loading…
x
Reference in New Issue
Block a user